Changeset 541 for trunk/tests/AuthSQLTest.php

Timestamp:

Aug 12, 2015 12:22:54 AM (9 years ago)

Author:

anonymous

Message:

v2.2.0-3: Fixed auth password hashing verification issues. Updated hyperlinkTxt() with option. Updated tests.

File:

• trunk/tests/AuthSQLTest.php (modified) (4 diffs)

trunk/tests/AuthSQLTest.php

@@ -71 +71 @@
         ");
         $_SESSION = AuthSQLTest::$shared_session;
+
+        // Sessions require client IP addr.
+        $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
     }
 
@@ -206 +209 @@
     function test_generatepassword()
     {
-        $result = $this->Auth_SQL->generatepassword('xCVcvd');
-        $this->assertRegExp('/[bcdfghjklmnprstvwxzBCDFGHJKLMNPRSTVWXZaeiouyAEIOUY0123456789!@#%&*-=+.?][bcdfghjklmnprstvwxzBCDFGHJKLMNPRSTVWXZ][aeiouyAEIOUY][bcdfghjklmnprstvwxz][aeiouy][0123456789]/', $result, 'Generated password does not match intended pattern');
+        $result = $this->Auth_SQL->generatepassword(10);
+        $this->assertEquals(14, strlen($result));
     }
 
     function test_encryptpassword()
     {
-        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_MD5));
-        $result = $this->Auth_SQL->encryptpassword('123');
+        $result = $this->Auth_SQL->encryptpassword('123', null, Auth_SQL::ENCRYPT_MD5);
         $this->assertEquals('202cb962ac59075b964b07152d234b70', $result);
-
-        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_MD5_HARDENED));
-        $result = $this->Auth_SQL->encryptpassword('123');
-        $this->assertEquals('c55e4ac608a8768ecd758fab971b0646', $result);
-
-        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_SHA1));
-        $result = $this->Auth_SQL->encryptpassword('123');
+        $this->assertTrue($this->Auth_SQL->verifyPassword('123', $result, Auth_SQL::ENCRYPT_MD5));
+
+        $result = $this->Auth_SQL->encryptpassword('123', null, Auth_SQL::ENCRYPT_MD5_HARDENED);
+        $this->assertEquals('1f0f8d357a96eb97f24371ebf53dcaf6', $result);
+        $this->assertTrue($this->Auth_SQL->verifyPassword('123', $result, Auth_SQL::ENCRYPT_MD5_HARDENED));
+
+        $result = $this->Auth_SQL->encryptpassword('123', null, Auth_SQL::ENCRYPT_SHA1);
         $this->assertEquals('40bd001563085fc35165329ea1ff5c5ecbdbbeef', $result);
-
-        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_SHA1_HARDENED));
-        $result = $this->Auth_SQL->encryptpassword('123');
-        $this->assertEquals('33d90af96a5928ac93cbd41fc436e8c55d2768c2', $result);
-
-        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_PLAINTEXT));
-        $result = $this->Auth_SQL->encryptpassword('123');
+        $this->assertTrue($this->Auth_SQL->verifyPassword('123', $result, Auth_SQL::ENCRYPT_SHA1));
+
+        $result = $this->Auth_SQL->encryptpassword('123', null, Auth_SQL::ENCRYPT_SHA1_HARDENED);
+        $this->assertEquals('1d086fcae3dd941e0f1371148502d03e96ab536f', $result);
+        $this->assertTrue($this->Auth_SQL->verifyPassword('123', $result, Auth_SQL::ENCRYPT_SHA1_HARDENED));
+
+        $result = $this->Auth_SQL->encryptpassword('123', null, Auth_SQL::ENCRYPT_PLAINTEXT);
         $this->assertEquals('123', $result);
-
-        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_CRYPT));
-        $result = $this->Auth_SQL->encryptpassword('123', 'saltstring');
-        $this->assertEquals('saEZ6MlWYV9nQ', $result);
+        $this->assertTrue($this->Auth_SQL->verifyPassword('123', $result, Auth_SQL::ENCRYPT_PLAINTEXT));
+
+        $result = $this->Auth_SQL->encryptpassword('123', 'saltstring', Auth_SQL::ENCRYPT_CRYPT);
+        $this->assertTrue($this->Auth_SQL->verifyPassword('123', $result, Auth_SQL::ENCRYPT_CRYPT));
+
+        if (function_exists('password_hash')) {
+            // Only available in PHP >= 5.5
+            $result = $this->Auth_SQL->encryptpassword('123', 'saltstring', Auth_SQL::ENCRYPT_PASSWORD_BCRYPT);
+            $this->assertTrue($this->Auth_SQL->verifyPassword('123', $result, Auth_SQL::ENCRYPT_PASSWORD_BCRYPT));
+
+            $result = $this->Auth_SQL->encryptpassword('123', 'saltstring', Auth_SQL::ENCRYPT_PASSWORD_DEFAULT);
+            $this->assertTrue($this->Auth_SQL->verifyPassword('123', $result, Auth_SQL::ENCRYPT_PASSWORD_DEFAULT));
+        }
     }
 
@@ -241 +252 @@
         $db =& DB::getInstance();
 
-        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_SHA1_HARDENED));
+        $this->Auth_SQL->setParam(array('hash_type' => Auth_SQL::ENCRYPT_SHA1_HARDENED));
         $this->Auth_SQL->setpassword(null, '123');
         $qid = $db->query("
@@ -248 +259 @@
         ");
         list($pass) = mysql_fetch_row($qid);
-        $this->assertEquals('33d90af96a5928ac93cbd41fc436e8c55d2768c2', $pass);
+        $this->assertEquals('1d086fcae3dd941e0f1371148502d03e96ab536f', $pass);
     }