Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

genRandomSalt should take an argument.

This commit is contained in:
Alan Plum 2015-07-14 16:41:18 +02:00
parent 999fde5957
commit c9e193e2b8
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/common/modules/org/arangodb/crypto.js
View File

@ -138,7 +138,7 @@ exports.genRandomAlphaNumbers = function (value) {
}; };
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief Generates a string containing numbers and characters (length 8). /// @brief Generates a string of a given length containing ASCII characters.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
exports.genRandomSalt = function (value) { exports.genRandomSalt = function (value) {

15
lib/V8/v8-utils.cpp
View File

@ -2039,20 +2039,25 @@ static void JS_RandomAlphaNum (const v8::FunctionCallbackInfo<v8::Value>& args)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief generates a salt /// @brief generates a salt
/// ///
/// @FUN{internal.genRandomSalt()} /// @FUN{internal.genRandomSalt(@FA{length})}
/// ///
/// Generates a string containing numbers and characters (length 8). /// Generates a string of a given @FA{length} containing ASCII characters.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void JS_RandomSalt (const v8::FunctionCallbackInfo<v8::Value>& args) { static void JS_RandomSalt (const v8::FunctionCallbackInfo<v8::Value>& args) {
TRI_V8_TRY_CATCH_BEGIN(isolate); TRI_V8_TRY_CATCH_BEGIN(isolate);
v8::HandleScope scope(isolate); v8::HandleScope scope(isolate);
if (args.Length() != 0) { if (args.Length() != 1 || ! args[0]->IsNumber()) {
TRI_V8_THROW_EXCEPTION_USAGE("genRandomSalt()"); TRI_V8_THROW_EXCEPTION_USAGE("genRandomSalt(<length>)");
} }
string str = JSSaltGenerator.random(8); int length = (int) TRI_ObjectToInt64(args[0]);
if (length <= 0 || length > 65536) {
TRI_V8_THROW_EXCEPTION_MESSAGE(TRI_ERROR_BAD_PARAMETER, "<length> must be between 0 and 65536");
}
string str = JSSaltGenerator.random(length);
TRI_V8_RETURN_STD_STRING(str); TRI_V8_RETURN_STD_STRING(str);
TRI_V8_TRY_CATCH_END TRI_V8_TRY_CATCH_END
} }