Add specific exceptions for checking claims. Fix bad tests for exp and nbf. RE: firebase#20

Author: Brendan Abbott

Authentication/JWT.php

@@ -64,21 +64,22 @@ public static function decode($jwt, $key = null, $verify = true)
 
             // Check the signature
             if (!JWT::verify("$headb64.$bodyb64", $sig, $key, $header->alg)) {
-                throw new UnexpectedValueException('Signature verification failed');
+                throw new SignatureInvalidException('Signature verification failed');
             }
 
             // Check token expiry time if defined.
             if (isset($payload->exp) && time() >= $payload->exp) {
-                throw new UnexpectedValueException('Expired token');
+                throw new ExpiredException('Expired token');
             }
 
             // Check if the nbf if it is defined.
             if (isset($payload->nbf) && $payload->nbf > time()) {
-                throw new UnexpectedValueException(
+                throw new TooEarlyException(
                     'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->nbf)
                 );
             }
         }
+
         return $payload;
     }
 

Exceptions/ExpiredException.php

@@ -0,0 +1,6 @@
+<?php
+
+class ExpiredException extends UnexpectedValueException
+{
+
+}

Exceptions/SignatureInvalidException.php

@@ -0,0 +1,6 @@
+<?php
+
+class SignatureInvalidException extends UnexpectedValueException
+{
+
+}

Exceptions/TooEarlyException.php

@@ -0,0 +1,6 @@
+<?php
+
+class TooEarlyException extends UnexpectedValueException
+{
+
+}

composer.json

@@ -19,7 +19,7 @@
         "php": ">=5.2.0"
     },
     "autoload": {
-        "classmap": ["Authentication/"]
+        "classmap": ["Authentication/", "Exceptions/"]
     },
     "target-dir": "Firebase/PHP-JWT",
     "minimum-stability": "dev"

tests/JWTTest.php

@@ -37,22 +37,22 @@ public function testMalformedJsonThrowsException()
 
     public function testExpiredToken()
     {
-        $this->setExpectedException('UnexpectedValueException');
+        $this->setExpectedException('ExpiredException');
         $payload = array(
             "message" => "abc",
             "exp" => time() - 20); // time in the past
         $encoded = JWT::encode($payload, 'my_key');
-        JWT::decode($encoded);
+        JWT::decode($encoded, 'my_key');
     }
 
     public function testTooEarlyToken()
     {
-        $this->setExpectedException('UnexpectedValueException');
+        $this->setExpectedException('TooEarlyException');
         $payload = array(
             "message" => "abc",
             "nbf" => time() + 20); // time in the past
         $encoded = JWT::encode($payload, 'my_key');
-        JWT::decode($encoded);
+        JWT::decode($encoded, 'my_key');
     }
 
     public function testValidToken()
@@ -82,7 +82,7 @@ public function testInvalidToken()
             "message" => "abc",
             "exp" => time() + 20); // time in the future
         $encoded = JWT::encode($payload, 'my_key');
-        $this->setExpectedException('UnexpectedValueException');
+        $this->setExpectedException('SignatureInvalidException');
         $decoded = JWT::decode($encoded, 'my_key2');
     }