AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move user validator methods

Browse Source
This commit is contained in:
Frederic Guillot
2016-01-11 21:08:37 -05:00
parent cec8491acd
commit f7e8bb8fa8
9 changed files with 195 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/User.php
View File

@@ -42,7 +42,7 @@ class User extends \Kanboard\Core\Base
'role' => $role, 'role' => $role,
); );
list($valid, ) = $this->user->validateCreation($values); list($valid, ) = $this->userValidator->validateCreation($values);
return $valid ? $this->user->create($values) : false; return $valid ? $this->user->create($values) : false;
} }
@@ -94,7 +94,7 @@ class User extends \Kanboard\Core\Base
} }
} }
list($valid, ) = $this->user->validateApiModification($values); list($valid, ) = $this->userValidator->validateApiModification($values);
return $valid && $this->user->update($values); return $valid && $this->user->update($values);
} }
} }

8
app/Controller/User.php
View File

@@ -108,7 +108,7 @@ class User extends Base
public function save() public function save()
{ {
$values = $this->request->getValues(); $values = $this->request->getValues();
list($valid, $errors) = $this->user->validateCreation($values); list($valid, $errors) = $this->userValidator->validateCreation($values);
if ($valid) { if ($valid) {
$project_id = empty($values['project_id']) ? 0 : $values['project_id']; $project_id = empty($values['project_id']) ? 0 : $values['project_id'];
@@ -329,7 +329,7 @@ class User extends Base
if ($this->request->isPost()) { if ($this->request->isPost()) {
$values = $this->request->getValues(); $values = $this->request->getValues();
list($valid, $errors) = $this->user->validatePasswordModification($values); list($valid, $errors) = $this->userValidator->validatePasswordModification($values);
if ($valid) { if ($valid) {
if ($this->user->update($values)) { if ($this->user->update($values)) {
@@ -371,7 +371,7 @@ class User extends Base
} }
} }
list($valid, $errors) = $this->user->validateModification($values); list($valid, $errors) = $this->userValidator->validateModification($values);
if ($valid) { if ($valid) {
if ($this->user->update($values)) { if ($this->user->update($values)) {
@@ -409,7 +409,7 @@ class User extends Base
if ($this->request->isPost()) { if ($this->request->isPost()) {
$values = $this->request->getValues() + array('disable_login_form' => 0, 'is_ldap_user' => 0); $values = $this->request->getValues() + array('disable_login_form' => 0, 'is_ldap_user' => 0);
list($valid, $errors) = $this->user->validateModification($values); list($valid, $errors) = $this->userValidator->validateModification($values);
if ($valid) { if ($valid) {
if ($this->user->update($values)) { if ($this->user->update($values)) {

128
app/Model/User.php
View File

@@ -369,132 +369,4 @@ class User extends Base
->eq('id', $user_id) ->eq('id', $user_id)
->save(array('token' => '')); ->save(array('token' => ''));
} }
/**
* Common validation rules
*
* @access private
* @return array
*/
private function commonValidationRules()
{
return array(
new Validators\MaxLength('role', t('The maximum length is %d characters', 25), 25),
new Validators\MaxLength('username', t('The maximum length is %d characters', 50), 50),
new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), self::TABLE, 'id'),
new Validators\Email('email', t('Email address invalid')),
new Validators\Integer('is_ldap_user', t('This value must be an integer')),
);
}
/**
* Common password validation rules
*
* @access private
* @return array
*/
private function commonPasswordValidationRules()
{
return array(
new Validators\Required('password', t('The password is required')),
new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6),
new Validators\Required('confirmation', t('The confirmation is required')),
new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')),
);
}
/**
* Validate user creation
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateCreation(array $values)
{
$rules = array(
new Validators\Required('username', t('The username is required')),
);
if (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) {
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
} else {
$v = new Validator($values, array_merge($rules, $this->commonValidationRules(), $this->commonPasswordValidationRules()));
}
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Validate user modification
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateModification(array $values)
{
$rules = array(
new Validators\Required('id', t('The user id is required')),
new Validators\Required('username', t('The username is required')),
);
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Validate user API modification
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateApiModification(array $values)
{
$rules = array(
new Validators\Required('id', t('The user id is required')),
);
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Validate password modification
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validatePasswordModification(array $values)
{
$rules = array(
new Validators\Required('id', t('The user id is required')),
new Validators\Required('current_password', t('The current password is required')),
);
$v = new Validator($values, array_merge($rules, $this->commonPasswordValidationRules()));
if ($v->execute()) {
if ($this->authenticationManager->passwordAuthentication($this->userSession->getUsername(), $values['current_password'], false)) {
return array(true, array());
} else {
return array(false, array('current_password' => array(t('Wrong password'))));
}
}
return array(false, $v->getErrors());
}
} }

1
app/ServiceProvider/ClassProvider.php
View File

@@ -87,6 +87,7 @@ class ClassProvider implements ServiceProviderInterface
), ),
'Validator' => array( 'Validator' => array(
'PasswordResetValidator', 'PasswordResetValidator',
'UserValidator',
), ),
'Core' => array( 'Core' => array(
'DateParser', 'DateParser',

18
app/Validator/Base.php
View File

@@ -2,6 +2,8 @@
namespace Kanboard\Validator; namespace Kanboard\Validator;
use SimpleValidator\Validators;
/** /**
* Base Validator * Base Validator
* *
@@ -33,4 +35,20 @@ class Base extends \Kanboard\Core\Base
return array($result, $errors); return array($result, $errors);
} }
/**
* Common password validation rules
*
* @access protected
* @return array
*/
protected function commonPasswordValidationRules()
{
return array(
new Validators\Required('password', t('The password is required')),
new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6),
new Validators\Required('confirmation', t('The confirmation is required')),
new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')),
);
}
} }

7
app/Validator/PasswordResetValidator.php
View File

@@ -35,12 +35,7 @@ class PasswordResetValidator extends Base
*/ */
public function validateModification(array $values) public function validateModification(array $values)
{ {
$v = new Validator($values, array( $v = new Validator($values, $this->commonPasswordValidationRules());
new Validators\Required('password', t('The password is required')),
new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6),
new Validators\Required('confirmation', t('The confirmation is required')),
new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')),
));
return array( return array(
$v->execute(), $v->execute(),

128
app/Validator/UserValidator.php Normal file
View File

@@ -0,0 +1,128 @@
<?php
namespace Kanboard\Validator;
use SimpleValidator\Validator;
use SimpleValidator\Validators;
use Kanboard\Model\User;
/**
* User Validator
*
* @package validator
* @author Frederic Guillot
*/
class UserValidator extends Base
{
/**
* Common validation rules
*
* @access private
* @return array
*/
private function commonValidationRules()
{
return array(
new Validators\MaxLength('role', t('The maximum length is %d characters', 25), 25),
new Validators\MaxLength('username', t('The maximum length is %d characters', 50), 50),
new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), User::TABLE, 'id'),
new Validators\Email('email', t('Email address invalid')),
new Validators\Integer('is_ldap_user', t('This value must be an integer')),
);
}
/**
* Validate user creation
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateCreation(array $values)
{
$rules = array(
new Validators\Required('username', t('The username is required')),
);
if (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) {
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
} else {
$v = new Validator($values, array_merge($rules, $this->commonValidationRules(), $this->commonPasswordValidationRules()));
}
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Validate user modification
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateModification(array $values)
{
$rules = array(
new Validators\Required('id', t('The user id is required')),
new Validators\Required('username', t('The username is required')),
);
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Validate user API modification
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateApiModification(array $values)
{
$rules = array(
new Validators\Required('id', t('The user id is required')),
);
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Validate password modification
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validatePasswordModification(array $values)
{
$rules = array(
new Validators\Required('id', t('The user id is required')),
new Validators\Required('current_password', t('The current password is required')),
);
$v = new Validator($values, array_merge($rules, $this->commonPasswordValidationRules()));
if ($v->execute()) {
if ($this->authenticationManager->passwordAuthentication($this->userSession->getUsername(), $values['current_password'], false)) {
return array(true, array());
} else {
return array(false, array('current_password' => array(t('Wrong password'))));
}
}
return array(false, $v->getErrors());
}
}

32
tests/units/Model/UserTest.php
View File

@@ -391,36 +391,4 @@ class UserTest extends Base
$this->assertEquals('toto', $user['username']); $this->assertEquals('toto', $user['username']);
$this->assertEmpty($user['token']); $this->assertEmpty($user['token']);
} }
public function testValidatePasswordModification()
{
$u = new User($this->container);
$this->container['sessionStorage']->user = array(
'id' => 1,
'role' => Role::APP_ADMIN,
'username' => 'admin',
);
$result = $u->validatePasswordModification(array());
$this->assertFalse($result[0]);
$result = $u->validatePasswordModification(array('id' => 1));
$this->assertFalse($result[0]);
$result = $u->validatePasswordModification(array('id' => 1, 'password' => '123456'));
$this->assertFalse($result[0]);
$result = $u->validatePasswordModification(array('id' => 1, 'password' => '123456', 'confirmation' => 'wrong'));
$this->assertFalse($result[0]);
$result = $u->validatePasswordModification(array('id' => 1, 'password' => '123456', 'confirmation' => '123456'));
$this->assertFalse($result[0]);
$result = $u->validatePasswordModification(array('id' => 1, 'password' => '123456', 'confirmation' => '123456', 'current_password' => 'wrong'));
$this->assertFalse($result[0]);
$result = $u->validatePasswordModification(array('id' => 1, 'password' => '123456', 'confirmation' => '123456', 'current_password' => 'admin'));
$this->assertTrue($result[0]);
}
} }

41
tests/units/Validator/UserValidatorTest.php Normal file
View File

@@ -0,0 +1,41 @@
<?php
require_once __DIR__.'/../Base.php';
use Kanboard\Validator\UserValidator;
use Kanboard\Core\Security\Role;
class UserValidatorTest extends Base
{
public function testValidatePasswordModification()
{
$validator = new UserValidator($this->container);
$this->container['sessionStorage']->user = array(
'id' => 1,
'role' => Role::APP_ADMIN,
'username' => 'admin',
);
$result = $validator->validatePasswordModification(array());
$this->assertFalse($result[0]);
$result = $validator->validatePasswordModification(array('id' => 1));
$this->assertFalse($result[0]);
$result = $validator->validatePasswordModification(array('id' => 1, 'password' => '123456'));
$this->assertFalse($result[0]);
$result = $validator->validatePasswordModification(array('id' => 1, 'password' => '123456', 'confirmation' => 'wrong'));
$this->assertFalse($result[0]);
$result = $validator->validatePasswordModification(array('id' => 1, 'password' => '123456', 'confirmation' => '123456'));
$this->assertFalse($result[0]);
$result = $validator->validatePasswordModification(array('id' => 1, 'password' => '123456', 'confirmation' => '123456', 'current_password' => 'wrong'));
$this->assertFalse($result[0]);
$result = $validator->validatePasswordModification(array('id' => 1, 'password' => '123456', 'confirmation' => '123456', 'current_password' => 'admin'));
$this->assertTrue($result[0]);
}
}