diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-16 12:22:51 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-16 12:22:51 +0100 |
| commit | e27b69f42a4d23ceb2f19050366a3f7d91887c69 (patch) | |
| tree | a21cf015ef02dfa72321be46ae54bcd65fc71fb6 | |
| parent | c9db08873f1e1d9f9f89da181d5aa374464fc250 (diff) | |
| parent | 63022f3c59f01ac1456cde4e837c1431a6664691 (diff) | |
| download | forums-e27b69f42a4d23ceb2f19050366a3f7d91887c69.tar forums-e27b69f42a4d23ceb2f19050366a3f7d91887c69.tar.gz forums-e27b69f42a4d23ceb2f19050366a3f7d91887c69.tar.bz2 forums-e27b69f42a4d23ceb2f19050366a3f7d91887c69.tar.xz forums-e27b69f42a4d23ceb2f19050366a3f7d91887c69.zip | |
Merge pull request #3136 from marc1706/ticket/13332
[ticket/13332] Pass user row to passwords manager check method
* marc1706/ticket/13332:
[ticket/13332] Fix auth provider tests
[ticket/13332] Remove useless $result assignment
[ticket/13332] Pass user row to passwords manager check method
| -rw-r--r-- | phpBB/phpbb/auth/provider/db.php | 6 | ||||
| -rw-r--r-- | tests/auth/provider_db_test.php | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 722eeffa9a..ba67c11e75 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -87,7 +87,7 @@ class db extends \phpbb\auth\provider\base $username_clean = utf8_clean_string($username); - $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type, user_login_attempts + $sql = 'SELECT * FROM ' . USERS_TABLE . " WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'"; $result = $this->db->sql_query($sql); @@ -123,7 +123,7 @@ class db extends \phpbb\auth\provider\base 'username_clean' => $username_clean, ); $sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $this->db->sql_build_array('INSERT', $attempt_data); - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); } else { @@ -175,7 +175,7 @@ class db extends \phpbb\auth\provider\base } // Check password ... - if ($this->passwords_manager->check($password, $row['user_password'])) + if ($this->passwords_manager->check($password, $row['user_password'], $row)) { // Check for old password hash... if ($this->passwords_manager->convert_flag || strlen($row['user_password']) == 32) diff --git a/tests/auth/provider_db_test.php b/tests/auth/provider_db_test.php index e33eae6b54..09ca0816bf 100644 --- a/tests/auth/provider_db_test.php +++ b/tests/auth/provider_db_test.php @@ -78,7 +78,14 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case ), ); - $this->assertEquals($expected, $provider->login('foobar', 'example')); + $login_return = $provider->login('foobar', 'example'); + $this->assertEquals($expected['status'], $login_return['status']); + $this->assertEquals($expected['error_msg'], $login_return['error_msg']); + + foreach ($expected['user_row'] as $key => $value) + { + $this->assertEquals($value, $login_return['user_row'][$key]); + } // Check if convert works $login_return = $provider->login('foobar2', 'example'); |