X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FUtilsTest.php;h=6a7870c4620ac5cd3bbf2a838f108c27755dd411;hb=209aa96e7e32d810db30d2eb437cef2280c5cad6;hp=e39ce6be096d10f692b98b1c66d3f6d5ef287f6d;hpb=ce8e248ab04a035c2824bee6af91aed49d623a6a;p=github%2Fshaarli%2FShaarli.git

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index e39ce6be..6a7870c4 100644
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -4,12 +4,94 @@
  */
 
 require_once 'application/Utils.php';
+require_once 'tests/utils/ReferenceSessionIdHashes.php';
+
+// Initialize reference data before PHPUnit starts a session
+ReferenceSessionIdHashes::genAllHashes();
+
 
 /**
  * Unitary tests for Shaarli utilities
  */
 class UtilsTest extends PHPUnit_Framework_TestCase
 {
+    // Session ID hashes
+    protected static $sidHashes = null;
+
+    // Log file
+    protected static $testLogFile = 'tests.log';
+
+    // Expected log date format
+    protected static $dateFormat = 'Y/m/d H:i:s';
+    
+
+    /**
+     * Assign reference data
+     */
+    public static function setUpBeforeClass()
+    {
+        self::$sidHashes = ReferenceSessionIdHashes::getHashes();
+    }
+
+    /**
+     * Resets test data before each test
+     */
+    protected function setUp()
+    {
+        if (file_exists(self::$testLogFile)) {
+            unlink(self::$testLogFile);
+        }
+    }
+
+    /**
+     * Returns a list of the elements from the last logged entry
+     *
+     * @return list (date, ip address, message)
+     */
+    protected function getLastLogEntry()
+    {
+        $logFile = file(self::$testLogFile);
+        return explode(' - ', trim(array_pop($logFile), PHP_EOL));
+    }
+
+    /**
+     * Log a message to a file - IPv4 client address
+     */
+    public function testLogmIp4()
+    {
+        $logMessage = 'IPv4 client connected';
+        logm(self::$testLogFile, '127.0.0.1', $logMessage);
+        list($date, $ip, $message) = $this->getLastLogEntry();
+
+        $this->assertInstanceOf(
+            'DateTime',
+            DateTime::createFromFormat(self::$dateFormat, $date)
+        );
+        $this->assertTrue(
+            filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false
+        );
+        $this->assertEquals($logMessage, $message);
+    }
+
+    /**
+     * Log a message to a file - IPv6 client address
+     */
+    public function testLogmIp6()
+    {
+        $logMessage = 'IPv6 client connected';
+        logm(self::$testLogFile, '2001:db8::ff00:42:8329', $logMessage);
+        list($date, $ip, $message) = $this->getLastLogEntry();
+
+        $this->assertInstanceOf(
+            'DateTime',
+            DateTime::createFromFormat(self::$dateFormat, $date)
+        );
+        $this->assertTrue(
+            filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false
+        );
+        $this->assertEquals($logMessage, $message);
+    }
+
     /**
      * Represent a link by its hash
      */
@@ -102,6 +184,8 @@ class UtilsTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($ref, generateLocation($ref, 'localhost'));
         $ref = 'http://localhost:8080/?test';
         $this->assertEquals($ref, generateLocation($ref, 'localhost:8080'));
+        $ref = '?localreferer#hash';
+        $this->assertEquals($ref, generateLocation($ref, 'localhost:8080'));
     }
 
     /**
@@ -121,42 +205,41 @@ class UtilsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Check supported PHP versions
+     * Test is_session_id_valid with a valid ID - TEST ALL THE HASHES!
+     *
+     * This tests extensively covers all hash algorithms / bit representations
      */
-    public function testCheckSupportedPHPVersion()
+    public function testIsAnyHashSessionIdValid()
     {
-        $minVersion = '5.3';
-        checkPHPVersion($minVersion, '5.4.32');
-        checkPHPVersion($minVersion, '5.5');
-        checkPHPVersion($minVersion, '5.6.10');
+        foreach (self::$sidHashes as $algo => $bpcs) {
+            foreach ($bpcs as $bpc => $hash) {
+                $this->assertTrue(is_session_id_valid($hash));
+            }
+        }
     }
 
     /**
-     * Check a unsupported PHP version
-     * @expectedException              Exception
-     * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
+     * Test is_session_id_valid with a valid ID - SHA-1 hashes
      */
-    public function testCheckSupportedPHPVersion51()
+    public function testIsSha1SessionIdValid()
     {
-        checkPHPVersion('5.3', '5.1.0');
+        $this->assertTrue(is_session_id_valid(sha1('shaarli')));
     }
 
     /**
-     * Check another unsupported PHP version
-     * @expectedException              Exception
-     * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
+     * Test is_session_id_valid with a valid ID - SHA-256 hashes
      */
-    public function testCheckSupportedPHPVersion52()
+    public function testIsSha256SessionIdValid()
     {
-        checkPHPVersion('5.3', '5.2');
+        $this->assertTrue(is_session_id_valid(hash('sha256', 'shaarli')));
     }
 
     /**
-     * Test is_session_id_valid with a valid ID.
+     * Test is_session_id_valid with a valid ID - SHA-512 hashes
      */
-    public function testIsSessionIdValid()
+    public function testIsSha512SessionIdValid()
     {
-        $this->assertTrue(is_session_id_valid('123456789012345678901234567890az'));
+        $this->assertTrue(is_session_id_valid(hash('sha512', 'shaarli')));
     }
 
     /**
@@ -166,6 +249,8 @@ class UtilsTest extends PHPUnit_Framework_TestCase
     {
         $this->assertFalse(is_session_id_valid(''));
         $this->assertFalse(is_session_id_valid(array()));
-        $this->assertFalse(is_session_id_valid('c0ZqcWF3VFE2NmJBdm1HMVQ0ZHJ3UmZPbTFsNGhkNHI='));
+        $this->assertFalse(
+            is_session_id_valid('c0ZqcWF3VFE2NmJBdm1HMVQ0ZHJ3UmZPbTFsNGhkNHI=')
+        );
     }
 }