Просмотр исходного кода

Merge pull request #664 from weseek/fix/662-allow-weak-password

fix #662: Login Form rejects weak password
Yuki Takei 7 лет назад
Родитель
Сommit
f8cce6d6d5
4 измененных файлов с 11 добавлено и 11 удалено
  1. 3 3
      src/server/form/invited.js
  2. 3 3
      src/server/form/login.js
  3. 2 2
      src/server/form/me/password.js
  4. 3 3
      src/server/form/register.js

+ 3 - 3
src/server/form/invited.js

@@ -1,10 +1,10 @@
 'use strict';
 'use strict';
 
 
-var form = require('express-form')
-  , field = form.field;
+const form = require('express-form');
+const field = form.field;
 
 
 module.exports = form(
 module.exports = form(
-  field('invitedForm.username').required().is(/^[\da-zA-Z\-_\.]+$/),
+  field('invitedForm.username').required().is(/^[\da-zA-Z\-_.]+$/),
   field('invitedForm.name').required(),
   field('invitedForm.name').required(),
   field('invitedForm.password').required().is(/^[\x20-\x7F]{6,}$/)
   field('invitedForm.password').required().is(/^[\x20-\x7F]{6,}$/)
 );
 );

+ 3 - 3
src/server/form/login.js

@@ -1,9 +1,9 @@
 'use strict';
 'use strict';
 
 
-var form = require('express-form')
-  , field = form.field;
+const form = require('express-form');
+const field = form.field;
 
 
 module.exports = form(
 module.exports = form(
   field('loginForm.username').required(),
   field('loginForm.username').required(),
-  field('loginForm.password').required().is(/^[\x20-\x7F]{6,}$/)
+  field('loginForm.password').required()
 );
 );

+ 2 - 2
src/server/form/me/password.js

@@ -1,7 +1,7 @@
 'use strict';
 'use strict';
 
 
-var form = require('express-form')
-  , field = form.field;
+const form = require('express-form');
+const field = form.field;
 
 
 module.exports = form(
 module.exports = form(
   field('mePassword.oldPassword'),
   field('mePassword.oldPassword'),

+ 3 - 3
src/server/form/register.js

@@ -1,10 +1,10 @@
 'use strict';
 'use strict';
 
 
-var form = require('express-form')
-  , field = form.field;
+const form = require('express-form');
+const field = form.field;
 
 
 module.exports = form(
 module.exports = form(
-  field('registerForm.username').required().is(/^[\da-zA-Z\-_\.]+$/),
+  field('registerForm.username').required().is(/^[\da-zA-Z\-_.]+$/),
   field('registerForm.name').required(),
   field('registerForm.name').required(),
   field('registerForm.email').required(),
   field('registerForm.email').required(),
   field('registerForm.password').required().is(/^[\x20-\x7F]{6,}$/),
   field('registerForm.password').required().is(/^[\x20-\x7F]{6,}$/),