web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enforce a configurable minimum password length when registering

Browse Source
This commit is contained in:
ansuz
2017-09-07 17:43:58 +02:00
parent ef30b0bc42
commit bca9ba66cb
5 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/credential.js
View File

@@ -5,6 +5,13 @@ define([
var Cred = {};
var Scrypt = window.scrypt;
Cred.MINIMUM_PASSWORD_LENGTH = typeof(AppConfig.minimum_password_length) === 'number'?
AppConfig.minimum_password_length: 8;
Cred.isLongEnoughPassword = function (passwd) {
return passwd.length >= Cred.MINIMUM_PASSWORD_LENGTH;
};
var isString = Cred.isString = function (x) {
return typeof(x) === 'string';
};

1
www/common/login.js
View File

@@ -88,6 +88,7 @@ define([
// validate inputs
if (!Cred.isValidUsername(uname)) { return void cb('INVAL_USER'); }
if (!Cred.isValidPassword(passwd)) { return void cb('INVAL_PASS'); }
if (!Cred.isLongEnoughPassword(passwd)) { return void cb('PASS_TOO_SHORT'); }
Cred.deriveFromPassphrase(uname, passwd, 128, function (bytes) {
// results...

15
www/register/main.js
View File

@@ -7,7 +7,7 @@ define([
'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
'less!/customize/src/less/loading.less',
], function ($, Login, Cryptpad, Test) {
], function ($, Login, Cryptpad, Test, Cred) {
var Messages = Cryptpad.Messages;
$(function () {
@@ -138,7 +138,8 @@ define([
// We need a setTimeout(cb, 0) otherwise the loading screen is only displayed after hashing the password
window.setTimeout(function () {
Login.loginOrRegister(uname, passwd, true, function (err, result) {
var proxy = result.proxy;
var proxy;
if (result) { proxy = result.proxy; }
if (err) {
switch (err) {
@@ -163,6 +164,16 @@ define([
});
});
break;
case 'PASS_TOO_SHORT':
Cryptpad.removeLoadingScreen(function () {
var warning = Messages._getKey('register_passwordTooShort', [
Cred.MINIMUM_PASSWORD_LENGTH
]);
Cryptpad.alert(warning, function () {
registering = false;
});
});
break;
case 'ALREADY_REGISTERED':
// logMeIn should reset registering = false
Cryptpad.removeLoadingScreen(function () {