Merge pull request #12 from Pudge601/v2.x

Throw InvalidArgumentException when decoding nonsense data

Author: Spomky

src/Base64Url.php

@@ -34,10 +34,17 @@ public static function encode(string $data, bool $usePadding = false): string
     /**
      * @param string $data The data to decode
      *
+     * @throws \InvalidArgumentException
+     *
      * @return string The data decoded
      */
     public static function decode(string $data): string
     {
-        return \base64_decode(\strtr($data, '-_', '+/'), true);
+        $decoded = \base64_decode(\strtr($data, '-_', '+/'), true);
+        if ($decoded === false) {
+            throw new \InvalidArgumentException('Invalid data provided');
+        }
+
+        return $decoded;
     }
 }

tests/Base64UrlTest.php

@@ -109,4 +109,24 @@ public function getTestBadVectors(): array
             ],
         ];
     }
+
+    /**
+     * @dataProvider getTestNonsenseVectors
+     *
+     * @test
+     */
+    public function nonsenseInput(string $input): void
+    {
+        static::expectException(\InvalidArgumentException::class);
+        Base64Url::decode($input);
+    }
+
+    public function getTestNonsenseVectors(): array
+    {
+        return [
+            [
+                'cxr0fdsezrewklerewxoz423ocfsa3bw432yjydsa9lhdsalw',
+            ],
+        ];
+    }
 }