Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix maximum password length

Browse Source
This commit is contained in:
printempw 2018-06-18 21:50:32 +08:00
parent 53fd30f093
commit b7a2d368f7
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/SetupController.php
View File

@ -60,7 +60,7 @@ class SetupController extends Controller
{ {
$this->validate($request, [ $this->validate($request, [
'email' => 'required|email', 'email' => 'required|email',
'password' => 'required|min:8|max:16|confirmed', 'password' => 'required|min:8|max:32|confirmed',
'site_name' => 'required' 'site_name' => 'required'
]); ]);

10
app/Http/Controllers/UserController.php
View File

@ -113,7 +113,7 @@ class UserController extends Controller
switch ($action) { switch ($action) {
case 'nickname': case 'nickname':
$this->validate($request, [ $this->validate($request, [
'new_nickname' => 'required|nickname|max:255' 'new_nickname' => 'required|no_special_chars|max:255'
]); ]);
$nickname = $request->input('new_nickname'); $nickname = $request->input('new_nickname');
@ -127,8 +127,8 @@ class UserController extends Controller
case 'password': case 'password':
$this->validate($request, [ $this->validate($request, [
'current_password' => 'required|min:6|max:16', 'current_password' => 'required|min:6|max:32',
'new_password' => 'required|min:8|max:16' 'new_password' => 'required|min:8|max:32'
]); ]);
if (! $this->user->verifyPassword($request->input('current_password'))) if (! $this->user->verifyPassword($request->input('current_password')))
@ -149,7 +149,7 @@ class UserController extends Controller
case 'email': case 'email':
$this->validate($request, [ $this->validate($request, [
'new_email' => 'required|email', 'new_email' => 'required|email',
'password' => 'required|min:6|max:16' 'password' => 'required|min:6|max:32'
]); ]);
if ($users->get($request->input('new_email'), 'email')) { if ($users->get($request->input('new_email'), 'email')) {
@ -171,7 +171,7 @@ class UserController extends Controller
case 'delete': case 'delete':
$this->validate($request, [ $this->validate($request, [
'password' => 'required|min:6|max:16' 'password' => 'required|min:6|max:32'
]); ]);
if (! $this->user->verifyPassword($request->input('password'))) if (! $this->user->verifyPassword($request->input('password')))

20
tests/UserControllerTest.php
View File

@ -173,7 +173,8 @@ class UserControllerTest extends TestCase
// Too short current password // Too short current password
$this->post('/user/profile', [ $this->post('/user/profile', [
'action' => 'password', 'action' => 'password',
'current_password' => '1' 'current_password' => '1',
'new_password' => '12345678'
], [ ], [
'X-Requested-With' => 'XMLHttpRequest' 'X-Requested-With' => 'XMLHttpRequest'
])->seeJson([ ])->seeJson([
@ -184,12 +185,13 @@ class UserControllerTest extends TestCase
// Too long current password // Too long current password
$this->post('/user/profile', [ $this->post('/user/profile', [
'action' => 'password', 'action' => 'password',
'current_password' => str_random(17) 'current_password' => str_random(33),
'new_password' => '12345678'
], [ ], [
'X-Requested-With' => 'XMLHttpRequest' 'X-Requested-With' => 'XMLHttpRequest'
])->seeJson([ ])->seeJson([
'errno' => 1, 'errno' => 1,
'msg' => trans('validation.max.string', ['attribute' => 'current password', 'max' => 16]) 'msg' => trans('validation.max.string', ['attribute' => 'current password', 'max' => 32])
]); ]);
// Too short new password // Too short new password
@ -208,12 +210,12 @@ class UserControllerTest extends TestCase
$this->post('/user/profile', [ $this->post('/user/profile', [
'action' => 'password', 'action' => 'password',
'current_password' => '12345678', 'current_password' => '12345678',
'new_password' => str_random(17) 'new_password' => str_random(33)
], [ ], [
'X-Requested-With' => 'XMLHttpRequest' 'X-Requested-With' => 'XMLHttpRequest'
])->seeJson([ ])->seeJson([
'errno' => 1, 'errno' => 1,
'msg' => trans('validation.max.string', ['attribute' => 'new password', 'max' => 16]) 'msg' => trans('validation.max.string', ['attribute' => 'new password', 'max' => 32])
]); ]);
// Wrong old password // Wrong old password
@ -283,12 +285,12 @@ class UserControllerTest extends TestCase
$this->post('/user/profile', [ $this->post('/user/profile', [
'action' => 'email', 'action' => 'email',
'new_email' => 'a@b.c', 'new_email' => 'a@b.c',
'password' => str_random(17) 'password' => str_random(33)
], [ ], [
'X-Requested-With' => 'XMLHttpRequest' 'X-Requested-With' => 'XMLHttpRequest'
])->seeJson([ ])->seeJson([
'errno' => 1, 'errno' => 1,
'msg' => trans('validation.max.string', ['attribute' => 'password', 'max' => 16]) 'msg' => trans('validation.max.string', ['attribute' => 'password', 'max' => 32])
]); ]);
// Use a duplicated email // Use a duplicated email
@ -356,12 +358,12 @@ class UserControllerTest extends TestCase
// Too long current password // Too long current password
$this->post('/user/profile', [ $this->post('/user/profile', [
'action' => 'delete', 'action' => 'delete',
'password' => str_random(17) 'password' => str_random(33)
], [ ], [
'X-Requested-With' => 'XMLHttpRequest' 'X-Requested-With' => 'XMLHttpRequest'
])->seeJson([ ])->seeJson([
'errno' => 1, 'errno' => 1,
'msg' => trans('validation.max.string', ['attribute' => 'password', 'max' => 16]) 'msg' => trans('validation.max.string', ['attribute' => 'password', 'max' => 32])
]); ]);
// Wrong password // Wrong password