Solving a few problems found in code review

cakephp · Jun 3, 2014 · f0039fd · f0039fd
1 parent 260d046
commit f0039fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/Controller/Component/Auth/AbstractPasswordHasher.php b/src/Controller/Component/Auth/AbstractPasswordHasher.php
@@ -72,7 +72,7 @@ abstract public function check($password, $hashedPassword);
  * @return boolean
  */
 	public function needsRehash($password) {
-		return true;
+		return password_needs_rehash($password, PASSWORD_DEFAULT);
 	}
 
 }
diff --git a/src/Controller/Component/Auth/WeakPasswordHasher.php b/src/Controller/Component/Auth/WeakPasswordHasher.php
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         3.0
+ * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Controller\Component\Auth;
@@ -19,8 +19,8 @@
 
 /**
  * Password hashing class that use weak hashing algorithms. This class is
- * intended only to be used with legacy databases where passwords have not
- * been migrated yet to a stronger algorithm.
+ * intended only to be used with legacy databases where passwords have
+ * not been migrated to a stronger algorithm yet.
  *
  */
 class WeakPasswordHasher extends AbstractPasswordHasher {

diff --git a/tests/TestCase/Controller/Component/Auth/SimplePasswordHasherTest.php b/tests/TestCase/Controller/Component/Auth/SimplePasswordHasherTest.php
@@ -24,7 +24,7 @@
 class SimplePasswordHasherTest extends TestCase {
 
 /**
- * Tests that a pssword not produced by SimplePasswordHasher needs
+ * Tests that a password not produced by SimplePasswordHasher needs
  * to be rehashed
  *
  * @return void

diff --git a/tests/TestCase/Controller/Component/Auth/WeakPasswordHasherTest.php b/tests/TestCase/Controller/Component/Auth/WeakPasswordHasherTest.php
@@ -33,6 +33,7 @@ public function testNeedsRehash() {
 		$hasher = new WeakPasswordHasher();
 		$this->assertTrue($hasher->needsRehash(md5('foo')));
 		$this->assertTrue($hasher->needsRehash('bar'));
+		$this->assertFalse($hasher->needsRehash('$2y$10$juOA0XVFpvZa0KTxRxEYVuX5kIS7U1fKDRcxyYhhUQECN1oHYnBMy'));
 	}
 
 /**