Bug/types as string (#58)

Key type can be of type string
web-auth · Jul 26, 2023 · 269f22d · 269f22d
1 parent 00d4cef
commit 269f22d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -45,11 +45,6 @@ parameters:
             count: 1
             path: src/BigInteger.php
 
-        -
-            message: "#^Cannot cast mixed to int\\.$#"
-            count: 1
-            path: src/Key/Ec2Key.php
-
         -
             message: "#^Cannot cast mixed to string\\.$#"
             count: 2
@@ -85,11 +80,6 @@ parameters:
             count: 1
             path: src/Key/Key.php
 
-        -
-            message: "#^Cannot cast mixed to int\\.$#"
-            count: 1
-            path: src/Key/OkpKey.php
-
         -
             message: "#^Method Cose\\\\Key\\\\OkpKey\\:\\:curve\\(\\) should return int\\|string but returns mixed\\.$#"
             count: 1
@@ -105,11 +95,6 @@ parameters:
             count: 1
             path: src/Key/OkpKey.php
 
-        -
-            message: "#^Cannot cast mixed to int\\.$#"
-            count: 1
-            path: src/Key/RsaKey.php
-
         -
             message: "#^Method Cose\\\\Key\\\\RsaKey\\:\\:QInv\\(\\) should return string but returns mixed\\.$#"
             count: 1

diff --git a/src/Algorithm/Mac/Hmac.php b/src/Algorithm/Mac/Hmac.php
@@ -32,7 +32,7 @@ abstract protected function getSignatureLength(): int;
 
     private function checKey(Key $key): void
     {
-        if ($key->type() !== Key::TYPE_OCT) {
+        if ($key->type() !== Key::TYPE_OCT && $key->type() !== Key::TYPE_NAME_OCT) {
             throw new InvalidArgumentException('Invalid key. Must be of type symmetric');
         }
 

diff --git a/src/Key/Ec2Key.php b/src/Key/Ec2Key.php
@@ -82,7 +82,7 @@ class Ec2Key extends Key
     public function __construct(array $data)
     {
         parent::__construct($data);
-        if (! isset($data[self::TYPE]) || (int) $data[self::TYPE] !== self::TYPE_EC2) {
+        if ($data[self::TYPE] !== self::TYPE_EC2 && $data[self::TYPE] !== self::TYPE_NAME_EC2) {
             throw new InvalidArgumentException('Invalid EC2 key. The key type does not correspond to an EC2 key');
         }
         if (! isset($data[self::DATA_CURVE], $data[self::DATA_X], $data[self::DATA_Y])) {

diff --git a/src/Key/Key.php b/src/Key/Key.php
@@ -19,6 +19,14 @@ class Key
 
     public const TYPE_OCT = 4;
 
+    public const TYPE_NAME_OKP = 'OKP';
+
+    public const TYPE_NAME_EC2 = 'EC';
+
+    public const TYPE_NAME_RSA = 'RSA';
+
+    public const TYPE_NAME_OCT = 'oct';
+
     public const KID = 2;
 
     public const ALG = 3;

diff --git a/src/Key/OkpKey.php b/src/Key/OkpKey.php
@@ -44,7 +44,7 @@ class OkpKey extends Key
     public function __construct(array $data)
     {
         parent::__construct($data);
-        if (! isset($data[self::TYPE]) || (int) $data[self::TYPE] !== self::TYPE_OKP) {
+        if ($data[self::TYPE] !== self::TYPE_OKP && $data[self::TYPE] !== self::TYPE_NAME_OKP) {
             throw new InvalidArgumentException('Invalid OKP key. The key type does not correspond to an OKP key');
         }
         if (! isset($data[self::DATA_CURVE], $data[self::DATA_X])) {

diff --git a/src/Key/RsaKey.php b/src/Key/RsaKey.php
@@ -48,7 +48,7 @@ class RsaKey extends Key
     public function __construct(array $data)
     {
         parent::__construct($data);
-        if (! isset($data[self::TYPE]) || (int) $data[self::TYPE] !== self::TYPE_RSA) {
+        if ($data[self::TYPE] !== self::TYPE_RSA && $data[self::TYPE] !== self::TYPE_NAME_RSA) {
             throw new InvalidArgumentException('Invalid RSA key. The key type does not correspond to a RSA key');
         }
         if (! isset($data[self::DATA_N], $data[self::DATA_E])) {