Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ability to restrict the maximum password length for Phalcon\Security::checkHash() #1261

Merged
merged 2 commits into from Sep 20, 2013
Merged

Ability to restrict the maximum password length for Phalcon\Security::checkHash() #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52c0efb
Ability to restrict the maximum password length for Phalcon\Security:…
sjinks Sep 20, 2013
8fd185c
Regression test
sjinks Sep 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions ext/security.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,16 +260,32 @@ PHP_METHOD(Phalcon_Security, hash){
*
* @param string $password
* @param string $passwordHash
* @param int $maxPasswordLength
* @return boolean
*/
PHP_METHOD(Phalcon_Security, checkHash){

zval *password, *password_hash, *hash;
zval *password, *password_hash, *hash, *max_pass_length = NULL;

PHALCON_MM_GROW();

phalcon_fetch_params(1, 2, 0, &password, &password_hash);
phalcon_fetch_params(0, 2, 1, &password, &password_hash, &max_pass_length);

if (Z_TYPE_P(password) != IS_STRING) {
PHALCON_SEPARATE_PARAM_NMO(password);
convert_to_string(password);
}

if (max_pass_length) {
if (Z_TYPE_P(max_pass_length) != IS_LONG) {
PHALCON_SEPARATE_PARAM_NMO(max_pass_length);
convert_to_long(max_pass_length);
}

if (Z_LVAL_P(max_pass_length) > 0 && Z_STRLEN_P(password) > Z_LVAL_P(max_pass_length)) {
RETURN_FALSE;
}
}

PHALCON_MM_GROW();
PHALCON_INIT_VAR(hash);
phalcon_call_func_p2(hash, "crypt", password, password_hash);
is_equal_function(return_value, hash, password_hash TSRMLS_CC);
Expand Down
1 change: 1 addition & 0 deletions ext/security.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_security_checkhash, 0, 0, 2)
ZEND_ARG_INFO(0, password)
ZEND_ARG_INFO(0, passwordHash)
ZEND_ARG_INFO(0, maxPasswordLength)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_security_islegacyhash, 0, 0, 1)
Expand Down
18 changes: 18 additions & 0 deletions ext/tests/issue-1261.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--TEST--
Ability to restrict the maximum password length for Phalcon\Security::checkHash() - https://github.com/phalcon/cphalcon/pull/1261
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php
$s = new \Phalcon\Security();
$hash = $s->hash('password', 10);
echo var_export((bool)$s->checkHash('password', $hash), 0), PHP_EOL;
echo var_export((bool)$s->checkHash('password', $hash, 0), 0), PHP_EOL;
echo var_export((bool)$s->checkHash('password', $hash, 8), 0), PHP_EOL;
echo var_export((bool)$s->checkHash('password', $hash, 7), 0), PHP_EOL;
?>
--EXPECT--
true
true
true
false