Merge pull request #70 from paragonie/improve-test-coverage

Add test case to prevent regressions

Author: paragonie-security

tests/Base64Test.php

@@ -137,7 +137,7 @@ protected function getNextChar(string $c): string
         );
     }
 
-    public function testUnpadded()
+    public function testUnpadded(): void
     {
         for ($i = 1; $i < 32; ++$i) {
             $random = random_bytes($i);
@@ -160,11 +160,27 @@ public static function invalidCharactersProvider(): array
         ];
     }
 
+    /**
+     * Detect issue underlying #67 with ext-sodium
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function testStrictPaddingSodium(): void
+    {
+        for ($i = 1; $i < 32; ++$i) {
+            $random = random_bytes($i);
+            $encoded = Base64::encode($random);
+            $decoded = Base64::decode($encoded, true);
+            $this->assertSame($decoded, $random);
+        }
+    }
+
     /**
      * @dataProvider invalidCharactersProvider
      */
     #[DataProvider("invalidCharactersProvider")]
-    public function testInvalidCharacters(string $encoded)
+    public function testInvalidCharacters(string $encoded): void
     {
         $this->expectException(RangeException::class);
         Base64::decode($encoded);

tests/Base64UrlSafeTest.php

@@ -120,6 +120,22 @@ public static function invalidCharactersProvider(): array
         ];
     }
 
+    /**
+     * Detect issue underlying #67 with ext-sodium
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function testStrictPaddingSodium(): void
+    {
+        for ($i = 1; $i < 32; ++$i) {
+            $random = random_bytes($i);
+            $encoded = Base64UrlSafe::encode($random);
+            $decoded = Base64UrlSafe::decode($encoded, true);
+            $this->assertSame($decoded, $random);
+        }
+    }
+
     /**
      * @dataProvider invalidCharactersProvider
      */