sop / jwx

lib/JWX/JWE/KeyAlgorithm/A128KWAlgorithm.php

Indentation +24 added lines, -24 removed lines

@@ -15,30 +15,30 @@
  */
 class A128KWAlgorithm extends AESKWAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _kekSize(): int
-    {
-        return 16;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _kekSize(): int
+	{
+		return 16;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _AESKWAlgo(): AESKeyWrapAlgorithm
-    {
-        return new AESKW128();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _AESKWAlgo(): AESKeyWrapAlgorithm
+	{
+		return new AESKW128();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_A128KW;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_A128KW;
+	}
 }

lib/JWX/Util/UUIDv4.php

Indentation +56 added lines, -56 removed lines

@@ -30,32 +30,32 @@ 
  */
 class UUIDv4
 {
-    /**
-     * UUID.
-     *
-     * @var string $_uuid
-     */
-    protected $_uuid;
+	/**
+	 * UUID.
+	 *
+	 * @var string $_uuid
+	 */
+	protected $_uuid;
     
-    /**
-     * Constructor.
-     *
-     * @param string $uuid UUIDv4 in canonical hexadecimal format
-     */
-    public function __construct(string $uuid)
-    {
-        // @todo Check that UUID is version 4
-        $this->_uuid = $uuid;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uuid UUIDv4 in canonical hexadecimal format
+	 */
+	public function __construct(string $uuid)
+	{
+		// @todo Check that UUID is version 4
+		$this->_uuid = $uuid;
+	}
     
-    /**
-     * Create new random UUIDv4.
-     *
-     * @return self
-     */
-    public static function createRandom(): self
-    {
-        /*
+	/**
+	 * Create new random UUIDv4.
+	 *
+	 * @return self
+	 */
+	public static function createRandom(): self
+	{
+		/*
          1. Set the two most significant bits (bits 6 and 7) of
          the clock_seq_hi_and_reserved to zero and one, respectively.
          
@@ -66,38 +66,38 @@ 
          3. Set all the other bits to randomly (or pseudo-randomly)
          chosen values.
          */
-        $uuid = sprintf("%04x%04x-%04x-%04x-%02x%02x-%04x%04x%04x",
-            // time_low
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), 
-            // time_mid
-            mt_rand(0, 0xffff), 
-            // time_hi_and_version
-            mt_rand(0, 0x0fff) | 0x4000, 
-            // clk_seq_hi_res
-            mt_rand(0, 0x3f) | 0x80, 
-            // clk_seq_low
-            mt_rand(0, 0xff), 
-            // node
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
-        return new self($uuid);
-    }
+		$uuid = sprintf("%04x%04x-%04x-%04x-%02x%02x-%04x%04x%04x",
+			// time_low
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), 
+			// time_mid
+			mt_rand(0, 0xffff), 
+			// time_hi_and_version
+			mt_rand(0, 0x0fff) | 0x4000, 
+			// clk_seq_hi_res
+			mt_rand(0, 0x3f) | 0x80, 
+			// clk_seq_low
+			mt_rand(0, 0xff), 
+			// node
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+		return new self($uuid);
+	}
     
-    /**
-     * Get UUIDv4 in canonical form.
-     *
-     * @return string
-     */
-    public function canonical(): string
-    {
-        return $this->_uuid;
-    }
+	/**
+	 * Get UUIDv4 in canonical form.
+	 *
+	 * @return string
+	 */
+	public function canonical(): string
+	{
+		return $this->_uuid;
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->canonical();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->canonical();
+	}
 }

lib/JWX/Util/BigInt.php

Indentation +75 added lines, -75 removed lines

@@ -9,86 +9,86 @@
  */
 class BigInt
 {
-    /**
-     * Number.
-     *
-     * @var resource|\GMP $_num
-     */
-    protected $_num;
+	/**
+	 * Number.
+	 *
+	 * @var resource|\GMP $_num
+	 */
+	protected $_num;
     
-    /**
-     * Constructor.
-     *
-     * @param resource|\GMP $num GMP number
-     */
-    protected function __construct($num)
-    {
-        $this->_num = $num;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param resource|\GMP $num GMP number
+	 */
+	protected function __construct($num)
+	{
+		$this->_num = $num;
+	}
     
-    /**
-     * Initialize from a base10 number.
-     *
-     * @param string|int $number
-     * @return self
-     */
-    public static function fromBase10($number): self
-    {
-        $num = gmp_init($number, 10);
-        return new self($num);
-    }
+	/**
+	 * Initialize from a base10 number.
+	 *
+	 * @param string|int $number
+	 * @return self
+	 */
+	public static function fromBase10($number): self
+	{
+		$num = gmp_init($number, 10);
+		return new self($num);
+	}
     
-    /**
-     * Initialize from a base256 number.
-     *
-     * Base64 number is an octet string of big endian, most significant word
-     * first integer.
-     *
-     * @param string $octets
-     * @return self
-     */
-    public static function fromBase256(string $octets): self
-    {
-        $num = gmp_import($octets, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        return new self($num);
-    }
+	/**
+	 * Initialize from a base256 number.
+	 *
+	 * Base64 number is an octet string of big endian, most significant word
+	 * first integer.
+	 *
+	 * @param string $octets
+	 * @return self
+	 */
+	public static function fromBase256(string $octets): self
+	{
+		$num = gmp_import($octets, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		return new self($num);
+	}
     
-    /**
-     * Convert to base10 string.
-     *
-     * @return string
-     */
-    public function base10(): string
-    {
-        return gmp_strval($this->_num, 10);
-    }
+	/**
+	 * Convert to base10 string.
+	 *
+	 * @return string
+	 */
+	public function base10(): string
+	{
+		return gmp_strval($this->_num, 10);
+	}
     
-    /**
-     * Convert to base16 string.
-     *
-     * @return string
-     */
-    public function base16(): string
-    {
-        return gmp_strval($this->_num, 16);
-    }
+	/**
+	 * Convert to base16 string.
+	 *
+	 * @return string
+	 */
+	public function base16(): string
+	{
+		return gmp_strval($this->_num, 16);
+	}
     
-    /**
-     * Convert to base256 string.
-     *
-     * @return string
-     */
-    public function base256(): string
-    {
-        return gmp_export($this->_num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-    }
+	/**
+	 * Convert to base256 string.
+	 *
+	 * @return string
+	 */
+	public function base256(): string
+	{
+		return gmp_export($this->_num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->base10();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->base10();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      */
     public static function fromBase256(string $octets): self
     {
-        $num = gmp_import($octets, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+        $num = gmp_import($octets, 1, GMP_MSW_FIRST|GMP_BIG_ENDIAN);
         return new self($num);
     }
     
@@ -80,7 +80,7 @@ 
      */
     public function base256(): string
     {
-        return gmp_export($this->_num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+        return gmp_export($this->_num, 1, GMP_MSW_FIRST|GMP_BIG_ENDIAN);
     }
     
     /**

lib/JWX/Util/Base64.php

Indentation +95 added lines, -95 removed lines

@@ -9,104 +9,104 @@
  */
 class Base64
 {
-    /**
-     * Encode a string using base64url variant.
-     *
-     * @link https://en.wikipedia.org/wiki/Base64#URL_applications
-     * @param string $data
-     * @return string
-     */
-    public static function urlEncode(string $data): string
-    {
-        return strtr(rtrim(self::encode($data), "="), "+/", "-_");
-    }
+	/**
+	 * Encode a string using base64url variant.
+	 *
+	 * @link https://en.wikipedia.org/wiki/Base64#URL_applications
+	 * @param string $data
+	 * @return string
+	 */
+	public static function urlEncode(string $data): string
+	{
+		return strtr(rtrim(self::encode($data), "="), "+/", "-_");
+	}
     
-    /**
-     * Decode a string using base64url variant.
-     *
-     * @link https://en.wikipedia.org/wiki/Base64#URL_applications
-     * @param string $data
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    public static function urlDecode(string $data): string
-    {
-        $data = strtr($data, "-_", "+/");
-        switch (strlen($data) % 4) {
-            case 0:
-                break;
-            case 2:
-                $data .= "==";
-                break;
-            case 3:
-                $data .= "=";
-                break;
-            default:
-                throw new \UnexpectedValueException(
-                    "Malformed base64url encoding.");
-        }
-        return self::decode($data);
-    }
+	/**
+	 * Decode a string using base64url variant.
+	 *
+	 * @link https://en.wikipedia.org/wiki/Base64#URL_applications
+	 * @param string $data
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	public static function urlDecode(string $data): string
+	{
+		$data = strtr($data, "-_", "+/");
+		switch (strlen($data) % 4) {
+			case 0:
+				break;
+			case 2:
+				$data .= "==";
+				break;
+			case 3:
+				$data .= "=";
+				break;
+			default:
+				throw new \UnexpectedValueException(
+					"Malformed base64url encoding.");
+		}
+		return self::decode($data);
+	}
     
-    /**
-     * Check whether string is validly base64url encoded.
-     *
-     * @link https://en.wikipedia.org/wiki/Base64#URL_applications
-     * @param string $data
-     * @return bool
-     */
-    public static function isValidURLEncoding(string $data): bool
-    {
-        return preg_match('#^[A-Za-z0-9\-_]*$#', $data) == 1;
-    }
+	/**
+	 * Check whether string is validly base64url encoded.
+	 *
+	 * @link https://en.wikipedia.org/wiki/Base64#URL_applications
+	 * @param string $data
+	 * @return bool
+	 */
+	public static function isValidURLEncoding(string $data): bool
+	{
+		return preg_match('#^[A-Za-z0-9\-_]*$#', $data) == 1;
+	}
     
-    /**
-     * Encode a string in base64.
-     *
-     * @link https://tools.ietf.org/html/rfc4648#section-4
-     * @param string $data
-     * @throws \RuntimeException If encoding fails
-     * @return string
-     */
-    public static function encode(string $data): string
-    {
-        $ret = @base64_encode($data);
-        if (!is_string($ret)) {
-            $err = error_get_last();
-            $msg = isset($err) && __FILE__ == $err['file'] ? $err['message'] : null;
-            throw new \RuntimeException($msg ?? "base64_encode() failed.");
-        }
-        return $ret;
-    }
+	/**
+	 * Encode a string in base64.
+	 *
+	 * @link https://tools.ietf.org/html/rfc4648#section-4
+	 * @param string $data
+	 * @throws \RuntimeException If encoding fails
+	 * @return string
+	 */
+	public static function encode(string $data): string
+	{
+		$ret = @base64_encode($data);
+		if (!is_string($ret)) {
+			$err = error_get_last();
+			$msg = isset($err) && __FILE__ == $err['file'] ? $err['message'] : null;
+			throw new \RuntimeException($msg ?? "base64_encode() failed.");
+		}
+		return $ret;
+	}
     
-    /**
-     * Decode a string from base64 encoding.
-     *
-     * @link https://tools.ietf.org/html/rfc4648#section-4
-     * @param string $data
-     * @throws \RuntimeException If decoding fails
-     * @return string
-     */
-    public static function decode(string $data): string
-    {
-        $ret = base64_decode($data, true);
-        if (!is_string($ret)) {
-            $err = error_get_last();
-            $msg = isset($err) && __FILE__ == $err['file'] ? $err['message'] : null;
-            throw new \RuntimeException($msg ?? "base64_decode() failed.");
-        }
-        return $ret;
-    }
+	/**
+	 * Decode a string from base64 encoding.
+	 *
+	 * @link https://tools.ietf.org/html/rfc4648#section-4
+	 * @param string $data
+	 * @throws \RuntimeException If decoding fails
+	 * @return string
+	 */
+	public static function decode(string $data): string
+	{
+		$ret = base64_decode($data, true);
+		if (!is_string($ret)) {
+			$err = error_get_last();
+			$msg = isset($err) && __FILE__ == $err['file'] ? $err['message'] : null;
+			throw new \RuntimeException($msg ?? "base64_decode() failed.");
+		}
+		return $ret;
+	}
     
-    /**
-     * Check whether string is validly base64 encoded.
-     *
-     * @link https://tools.ietf.org/html/rfc4648#section-4
-     * @param string $data
-     * @return bool
-     */
-    public static function isValid(string $data): bool
-    {
-        return preg_match('#^[A-Za-z0-9+/]*={0,2}$#', $data) == 1;
-    }
+	/**
+	 * Check whether string is validly base64 encoded.
+	 *
+	 * @link https://tools.ietf.org/html/rfc4648#section-4
+	 * @param string $data
+	 * @return bool
+	 */
+	public static function isValid(string $data): bool
+	{
+		return preg_match('#^[A-Za-z0-9+/]*={0,2}$#', $data) == 1;
+	}
 }

lib/JWX/JWK/Asymmetric/PrivateKeyJWK.php

Indentation +39 added lines, -39 removed lines

@@ -18,46 +18,46 @@
  */
 abstract class PrivateKeyJWK extends JWK
 {
-    /**
-     * Get the public key component of the asymmetric key pair.
-     *
-     * @return PublicKeyJWK
-     */
-    abstract public function publicKey(): PublicKeyJWK;
+	/**
+	 * Get the public key component of the asymmetric key pair.
+	 *
+	 * @return PublicKeyJWK
+	 */
+	abstract public function publicKey(): PublicKeyJWK;
     
-    /**
-     * Convert private key to PEM.
-     *
-     * @return PEM
-     */
-    abstract public function toPEM(): PEM;
+	/**
+	 * Convert private key to PEM.
+	 *
+	 * @return PEM
+	 */
+	abstract public function toPEM(): PEM;
     
-    /**
-     * Initialize from a PrivateKey object.
-     *
-     * @param PrivateKey $priv_key Private key
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromPrivateKey(PrivateKey $priv_key): PrivateKeyJWK
-    {
-        if ($priv_key instanceof RSAPrivateKey) {
-            return RSAPrivateKeyJWK::fromRSAPrivateKey($priv_key);
-        }
-        if ($priv_key instanceof ECPrivateKey) {
-            return ECPrivateKeyJWK::fromECPrivateKey($priv_key);
-        }
-        throw new \UnexpectedValueException("Unsupported private key.");
-    }
+	/**
+	 * Initialize from a PrivateKey object.
+	 *
+	 * @param PrivateKey $priv_key Private key
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromPrivateKey(PrivateKey $priv_key): PrivateKeyJWK
+	{
+		if ($priv_key instanceof RSAPrivateKey) {
+			return RSAPrivateKeyJWK::fromRSAPrivateKey($priv_key);
+		}
+		if ($priv_key instanceof ECPrivateKey) {
+			return ECPrivateKeyJWK::fromECPrivateKey($priv_key);
+		}
+		throw new \UnexpectedValueException("Unsupported private key.");
+	}
     
-    /**
-     * Initialize from a PrivateKeyInfo object.
-     *
-     * @param PrivateKeyInfo $pki PrivateKeyInfo
-     * @return self
-     */
-    public static function fromPrivateKeyInfo(PrivateKeyInfo $pki): PrivateKeyJWK
-    {
-        return self::fromPrivateKey($pki->privateKey());
-    }
+	/**
+	 * Initialize from a PrivateKeyInfo object.
+	 *
+	 * @param PrivateKeyInfo $pki PrivateKeyInfo
+	 * @return self
+	 */
+	public static function fromPrivateKeyInfo(PrivateKeyInfo $pki): PrivateKeyJWK
+	{
+		return self::fromPrivateKey($pki->privateKey());
+	}
 }

lib/JWX/JWK/Asymmetric/PublicKeyJWK.php

Indentation +33 added lines, -33 removed lines

@@ -18,39 +18,39 @@
  */
 abstract class PublicKeyJWK extends JWK
 {
-    /**
-     * Convert public key to PEM.
-     *
-     * @return PEM
-     */
-    abstract public function toPEM(): PEM;
+	/**
+	 * Convert public key to PEM.
+	 *
+	 * @return PEM
+	 */
+	abstract public function toPEM(): PEM;
     
-    /**
-     * Initialize from a PublicKey object.
-     *
-     * @param PublicKey $pub_key Public key
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromPublicKey(PublicKey $pub_key): PublicKeyJWK
-    {
-        if ($pub_key instanceof RSAPublicKey) {
-            return RSAPublicKeyJWK::fromRSAPublicKey($pub_key);
-        }
-        if ($pub_key instanceof ECPublicKey) {
-            return ECPublicKeyJWK::fromECPublicKey($pub_key);
-        }
-        throw new \UnexpectedValueException("Unsupported public key.");
-    }
+	/**
+	 * Initialize from a PublicKey object.
+	 *
+	 * @param PublicKey $pub_key Public key
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromPublicKey(PublicKey $pub_key): PublicKeyJWK
+	{
+		if ($pub_key instanceof RSAPublicKey) {
+			return RSAPublicKeyJWK::fromRSAPublicKey($pub_key);
+		}
+		if ($pub_key instanceof ECPublicKey) {
+			return ECPublicKeyJWK::fromECPublicKey($pub_key);
+		}
+		throw new \UnexpectedValueException("Unsupported public key.");
+	}
     
-    /**
-     * Initialize from a PublicKeyInfo object.
-     *
-     * @param PublicKeyInfo $pki Public key info
-     * @return self
-     */
-    public static function fromPublicKeyInfo(PublicKeyInfo $pki): PublicKeyJWK
-    {
-        return self::fromPublicKey($pki->publicKey());
-    }
+	/**
+	 * Initialize from a PublicKeyInfo object.
+	 *
+	 * @param PublicKeyInfo $pki Public key info
+	 * @return self
+	 */
+	public static function fromPublicKeyInfo(PublicKeyInfo $pki): PublicKeyJWK
+	{
+		return self::fromPublicKey($pki->publicKey());
+	}
 }

lib/JWX/JWK/JWKSet.php

Indentation +223 added lines, -223 removed lines

@@ -13,227 +13,227 @@
  */
 class JWKSet implements \Countable, \IteratorAggregate
 {
-    /**
-     * JWK objects.
-     *
-     * @var JWK[] $_jwks
-     */
-    protected $_jwks;
-    
-    /**
-     * Additional members.
-     *
-     * @var array $_additional
-     */
-    protected $_additional;
-    
-    /**
-     * JWK mappings.
-     *
-     * @var array
-     */
-    private $_mappings = array();
-    
-    /**
-     * Constructor.
-     *
-     * @param JWK ...$jwks
-     */
-    public function __construct(JWK ...$jwks)
-    {
-        $this->_jwks = $jwks;
-        $this->_additional = array();
-    }
-    
-    /**
-     * Reset internal cache variables on clone.
-     */
-    public function __clone()
-    {
-        $this->_mappings = array();
-    }
-    
-    /**
-     * Initialize from an array representing a JSON object.
-     *
-     * @param array $members
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromArray(array $members): self
-    {
-        if (!isset($members["keys"]) || !is_array($members["keys"])) {
-            throw new \UnexpectedValueException(
-                "JWK Set must have a 'keys' member.");
-        }
-        $jwks = array_map(
-            function ($jwkdata) {
-                return JWK::fromArray($jwkdata);
-            }, $members["keys"]);
-        unset($members["keys"]);
-        $obj = new self(...$jwks);
-        $obj->_additional = $members;
-        return $obj;
-    }
-    
-    /**
-     * Initialize from a JSON string.
-     *
-     * @param string $json
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromJSON(string $json): self
-    {
-        $members = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
-        if (!is_array($members)) {
-            throw new \UnexpectedValueException("Invalid JSON.");
-        }
-        return self::fromArray($members);
-    }
-    
-    /**
-     * Get self with keys added.
-     *
-     * @param JWK ...$keys JWK objects
-     * @return self
-     */
-    public function withKeys(JWK ...$keys): self
-    {
-        $obj = clone $this;
-        $obj->_jwks = array_merge($obj->_jwks, $keys);
-        return $obj;
-    }
-    
-    /**
-     * Get all JWK's in a set.
-     *
-     * @return JWK[]
-     */
-    public function keys(): array
-    {
-        return $this->_jwks;
-    }
-    
-    /**
-     * Get the first JWK in the set.
-     *
-     * @throws \LogicException
-     * @return JWK
-     */
-    public function first(): JWK
-    {
-        if (!count($this->_jwks)) {
-            throw new \LogicException("No keys.");
-        }
-        return $this->_jwks[0];
-    }
-    
-    /**
-     * Get JWK by key ID.
-     *
-     * @param string $id
-     * @return JWK|null Null if not found
-     */
-    protected function _getKeyByID(string $id)
-    {
-        $map = $this->_getMapping(JWKParameter::PARAM_KEY_ID);
-        return isset($map[$id]) ? $map[$id] : null;
-    }
-    
-    /**
-     * Check whether set has a JWK with a given key ID.
-     *
-     * @param string $id
-     * @return bool
-     */
-    public function hasKeyID(string $id): bool
-    {
-        return $this->_getKeyByID($id) !== null;
-    }
-    
-    /**
-     * Get a JWK by a key ID.
-     *
-     * @param string $id
-     * @throws \LogicException
-     * @return JWK
-     */
-    public function keyByID(string $id): JWK
-    {
-        $jwk = $this->_getKeyByID($id);
-        if (!$jwk) {
-            throw new \LogicException("No key ID $id.");
-        }
-        return $jwk;
-    }
-    
-    /**
-     * Get mapping from parameter values of given parameter name to JWK.
-     *
-     * Later duplicate value shall override earlier JWK.
-     *
-     * @param string $name Parameter name
-     * @return array
-     */
-    protected function _getMapping(string $name): array
-    {
-        if (!isset($this->_mappings[$name])) {
-            $mapping = array();
-            foreach ($this->_jwks as $jwk) {
-                if ($jwk->has($name)) {
-                    $key = (string) $jwk->get($name)->value();
-                    $mapping[$key] = $jwk;
-                }
-            }
-            $this->_mappings[$name] = $mapping;
-        }
-        return $this->_mappings[$name];
-    }
-    
-    /**
-     * Convert to array.
-     *
-     * @return array
-     */
-    public function toArray(): array
-    {
-        $data = $this->_additional;
-        $data["keys"] = array_map(
-            function (JWK $jwk) {
-                return $jwk->toArray();
-            }, $this->_jwks);
-        return $data;
-    }
-    
-    /**
-     * Convert to JSON.
-     *
-     * @return string
-     */
-    public function toJSON(): string
-    {
-        return json_encode((object) $this->toArray(), JSON_UNESCAPED_SLASHES);
-    }
-    
-    /**
-     * Get the number of keys.
-     *
-     * @see \Countable::count()
-     */
-    public function count(): int
-    {
-        return count($this->_jwks);
-    }
-    
-    /**
-     * Get iterator for JWK objects.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_jwks);
-    }
+	/**
+	 * JWK objects.
+	 *
+	 * @var JWK[] $_jwks
+	 */
+	protected $_jwks;
+    
+	/**
+	 * Additional members.
+	 *
+	 * @var array $_additional
+	 */
+	protected $_additional;
+    
+	/**
+	 * JWK mappings.
+	 *
+	 * @var array
+	 */
+	private $_mappings = array();
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param JWK ...$jwks
+	 */
+	public function __construct(JWK ...$jwks)
+	{
+		$this->_jwks = $jwks;
+		$this->_additional = array();
+	}
+    
+	/**
+	 * Reset internal cache variables on clone.
+	 */
+	public function __clone()
+	{
+		$this->_mappings = array();
+	}
+    
+	/**
+	 * Initialize from an array representing a JSON object.
+	 *
+	 * @param array $members
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromArray(array $members): self
+	{
+		if (!isset($members["keys"]) || !is_array($members["keys"])) {
+			throw new \UnexpectedValueException(
+				"JWK Set must have a 'keys' member.");
+		}
+		$jwks = array_map(
+			function ($jwkdata) {
+				return JWK::fromArray($jwkdata);
+			}, $members["keys"]);
+		unset($members["keys"]);
+		$obj = new self(...$jwks);
+		$obj->_additional = $members;
+		return $obj;
+	}
+    
+	/**
+	 * Initialize from a JSON string.
+	 *
+	 * @param string $json
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromJSON(string $json): self
+	{
+		$members = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
+		if (!is_array($members)) {
+			throw new \UnexpectedValueException("Invalid JSON.");
+		}
+		return self::fromArray($members);
+	}
+    
+	/**
+	 * Get self with keys added.
+	 *
+	 * @param JWK ...$keys JWK objects
+	 * @return self
+	 */
+	public function withKeys(JWK ...$keys): self
+	{
+		$obj = clone $this;
+		$obj->_jwks = array_merge($obj->_jwks, $keys);
+		return $obj;
+	}
+    
+	/**
+	 * Get all JWK's in a set.
+	 *
+	 * @return JWK[]
+	 */
+	public function keys(): array
+	{
+		return $this->_jwks;
+	}
+    
+	/**
+	 * Get the first JWK in the set.
+	 *
+	 * @throws \LogicException
+	 * @return JWK
+	 */
+	public function first(): JWK
+	{
+		if (!count($this->_jwks)) {
+			throw new \LogicException("No keys.");
+		}
+		return $this->_jwks[0];
+	}
+    
+	/**
+	 * Get JWK by key ID.
+	 *
+	 * @param string $id
+	 * @return JWK|null Null if not found
+	 */
+	protected function _getKeyByID(string $id)
+	{
+		$map = $this->_getMapping(JWKParameter::PARAM_KEY_ID);
+		return isset($map[$id]) ? $map[$id] : null;
+	}
+    
+	/**
+	 * Check whether set has a JWK with a given key ID.
+	 *
+	 * @param string $id
+	 * @return bool
+	 */
+	public function hasKeyID(string $id): bool
+	{
+		return $this->_getKeyByID($id) !== null;
+	}
+    
+	/**
+	 * Get a JWK by a key ID.
+	 *
+	 * @param string $id
+	 * @throws \LogicException
+	 * @return JWK
+	 */
+	public function keyByID(string $id): JWK
+	{
+		$jwk = $this->_getKeyByID($id);
+		if (!$jwk) {
+			throw new \LogicException("No key ID $id.");
+		}
+		return $jwk;
+	}
+    
+	/**
+	 * Get mapping from parameter values of given parameter name to JWK.
+	 *
+	 * Later duplicate value shall override earlier JWK.
+	 *
+	 * @param string $name Parameter name
+	 * @return array
+	 */
+	protected function _getMapping(string $name): array
+	{
+		if (!isset($this->_mappings[$name])) {
+			$mapping = array();
+			foreach ($this->_jwks as $jwk) {
+				if ($jwk->has($name)) {
+					$key = (string) $jwk->get($name)->value();
+					$mapping[$key] = $jwk;
+				}
+			}
+			$this->_mappings[$name] = $mapping;
+		}
+		return $this->_mappings[$name];
+	}
+    
+	/**
+	 * Convert to array.
+	 *
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		$data = $this->_additional;
+		$data["keys"] = array_map(
+			function (JWK $jwk) {
+				return $jwk->toArray();
+			}, $this->_jwks);
+		return $data;
+	}
+    
+	/**
+	 * Convert to JSON.
+	 *
+	 * @return string
+	 */
+	public function toJSON(): string
+	{
+		return json_encode((object) $this->toArray(), JSON_UNESCAPED_SLASHES);
+	}
+    
+	/**
+	 * Get the number of keys.
+	 *
+	 * @see \Countable::count()
+	 */
+	public function count(): int
+	{
+		return count($this->_jwks);
+	}
+    
+	/**
+	 * Get iterator for JWK objects.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_jwks);
+	}
 }

lib/JWX/JWK/JWK.php

Indentation +169 added lines, -169 removed lines

@@ -14,187 +14,187 @@
  */
 class JWK implements \Countable, \IteratorAggregate
 {
-    use TypedJWK;
+	use TypedJWK;
     
-    /**
-     * Parameters.
-     *
-     * @var JWKParameter[] $_parameters
-     */
-    protected $_parameters;
+	/**
+	 * Parameters.
+	 *
+	 * @var JWKParameter[] $_parameters
+	 */
+	protected $_parameters;
     
-    /**
-     * Constructor.
-     *
-     * @param JWKParameter ...$params
-     */
-    public function __construct(JWKParameter ...$params)
-    {
-        $this->_parameters = array();
-        foreach ($params as $param) {
-            $this->_parameters[$param->name()] = $param;
-        }
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param JWKParameter ...$params
+	 */
+	public function __construct(JWKParameter ...$params)
+	{
+		$this->_parameters = array();
+		foreach ($params as $param) {
+			$this->_parameters[$param->name()] = $param;
+		}
+	}
     
-    /**
-     * Initialize from an array representing a JSON object.
-     *
-     * @param array $members
-     * @return self
-     */
-    public static function fromArray(array $members): self
-    {
-        $params = array();
-        foreach ($members as $name => $value) {
-            $params[] = JWKParameter::fromNameAndValue($name, $value);
-        }
-        return new static(...$params);
-    }
+	/**
+	 * Initialize from an array representing a JSON object.
+	 *
+	 * @param array $members
+	 * @return self
+	 */
+	public static function fromArray(array $members): self
+	{
+		$params = array();
+		foreach ($members as $name => $value) {
+			$params[] = JWKParameter::fromNameAndValue($name, $value);
+		}
+		return new static(...$params);
+	}
     
-    /**
-     * Initialize from a JSON string.
-     *
-     * @param string $json
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromJSON(string $json): self
-    {
-        $members = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
-        if (!is_array($members)) {
-            throw new \UnexpectedValueException("Invalid JSON.");
-        }
-        return static::fromArray($members);
-    }
+	/**
+	 * Initialize from a JSON string.
+	 *
+	 * @param string $json
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromJSON(string $json): self
+	{
+		$members = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
+		if (!is_array($members)) {
+			throw new \UnexpectedValueException("Invalid JSON.");
+		}
+		return static::fromArray($members);
+	}
     
-    /**
-     * Initialize from another JWK.
-     *
-     * Allows casting to subclass by late static binding.
-     *
-     * @param JWK $jwk
-     * @return self
-     */
-    public static function fromJWK(JWK $jwk): self
-    {
-        return new static(...array_values($jwk->_parameters));
-    }
+	/**
+	 * Initialize from another JWK.
+	 *
+	 * Allows casting to subclass by late static binding.
+	 *
+	 * @param JWK $jwk
+	 * @return self
+	 */
+	public static function fromJWK(JWK $jwk): self
+	{
+		return new static(...array_values($jwk->_parameters));
+	}
     
-    /**
-     * Get self with parameters added.
-     *
-     * @param JWKParameter ...$params
-     * @return self
-     */
-    public function withParameters(JWKParameter ...$params): self
-    {
-        $obj = clone $this;
-        foreach ($params as $param) {
-            $obj->_parameters[$param->name()] = $param;
-        }
-        return $obj;
-    }
+	/**
+	 * Get self with parameters added.
+	 *
+	 * @param JWKParameter ...$params
+	 * @return self
+	 */
+	public function withParameters(JWKParameter ...$params): self
+	{
+		$obj = clone $this;
+		foreach ($params as $param) {
+			$obj->_parameters[$param->name()] = $param;
+		}
+		return $obj;
+	}
     
-    /**
-     * Get all parameters.
-     *
-     * @return JWKParameter[]
-     */
-    public function parameters(): array
-    {
-        return $this->_parameters;
-    }
+	/**
+	 * Get all parameters.
+	 *
+	 * @return JWKParameter[]
+	 */
+	public function parameters(): array
+	{
+		return $this->_parameters;
+	}
     
-    /**
-     * Get self with given key ID added to parameters.
-     *
-     * @param string $id Key ID as a string
-     * @return self
-     */
-    public function withKeyID(string $id): self
-    {
-        return $this->withParameters(new KeyIDParameter($id));
-    }
+	/**
+	 * Get self with given key ID added to parameters.
+	 *
+	 * @param string $id Key ID as a string
+	 * @return self
+	 */
+	public function withKeyID(string $id): self
+	{
+		return $this->withParameters(new KeyIDParameter($id));
+	}
     
-    /**
-     * Whether parameters are present.
-     *
-     * Returns false if any of the given parameters is not set.
-     *
-     * @param string ...$names Parameter names
-     * @return bool
-     */
-    public function has(string ...$names): bool
-    {
-        foreach ($names as $name) {
-            if (!isset($this->_parameters[$name])) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Whether parameters are present.
+	 *
+	 * Returns false if any of the given parameters is not set.
+	 *
+	 * @param string ...$names Parameter names
+	 * @return bool
+	 */
+	public function has(string ...$names): bool
+	{
+		foreach ($names as $name) {
+			if (!isset($this->_parameters[$name])) {
+				return false;
+			}
+		}
+		return true;
+	}
     
-    /**
-     * Get a parameter.
-     *
-     * @param string $name Parameter name
-     * @throws \LogicException
-     * @return JWKParameter
-     */
-    public function get(string $name): JWKParameter
-    {
-        if (!$this->has($name)) {
-            throw new \LogicException("Parameter $name doesn't exists.");
-        }
-        return $this->_parameters[$name];
-    }
+	/**
+	 * Get a parameter.
+	 *
+	 * @param string $name Parameter name
+	 * @throws \LogicException
+	 * @return JWKParameter
+	 */
+	public function get(string $name): JWKParameter
+	{
+		if (!$this->has($name)) {
+			throw new \LogicException("Parameter $name doesn't exists.");
+		}
+		return $this->_parameters[$name];
+	}
     
-    /**
-     * Convert to array.
-     *
-     * @return array Parameter values keyed by parameter names
-     */
-    public function toArray(): array
-    {
-        $a = array();
-        foreach ($this->_parameters as $param) {
-            $a[$param->name()] = $param->value();
-        }
-        return $a;
-    }
+	/**
+	 * Convert to array.
+	 *
+	 * @return array Parameter values keyed by parameter names
+	 */
+	public function toArray(): array
+	{
+		$a = array();
+		foreach ($this->_parameters as $param) {
+			$a[$param->name()] = $param->value();
+		}
+		return $a;
+	}
     
-    /**
-     * Convert to JSON.
-     *
-     * @return string
-     */
-    public function toJSON(): string
-    {
-        $data = $this->toArray();
-        if (empty($data)) {
-            return "";
-        }
-        return json_encode((object) $data, JSON_UNESCAPED_SLASHES);
-    }
+	/**
+	 * Convert to JSON.
+	 *
+	 * @return string
+	 */
+	public function toJSON(): string
+	{
+		$data = $this->toArray();
+		if (empty($data)) {
+			return "";
+		}
+		return json_encode((object) $data, JSON_UNESCAPED_SLASHES);
+	}
     
-    /**
-     * Get the number of parameters.
-     *
-     * @see \Countable::count()
-     */
-    public function count(): int
-    {
-        return count($this->_parameters);
-    }
+	/**
+	 * Get the number of parameters.
+	 *
+	 * @see \Countable::count()
+	 */
+	public function count(): int
+	{
+		return count($this->_parameters);
+	}
     
-    /**
-     * Get iterator for the parameters.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_parameters);
-    }
+	/**
+	 * Get iterator for the parameters.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_parameters);
+	}
 }

lib/JWX/JWK/RSA/RSAPrivateKeyJWK.php

Indentation +117 added lines, -117 removed lines

@@ -29,126 +29,126 @@
  */
 class RSAPrivateKeyJWK extends PrivateKeyJWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @internal
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = array(
-        /* @formatter:off */
-        JWKParameter::PARAM_KEY_TYPE,
-        JWKParameter::PARAM_MODULUS,
-        JWKParameter::PARAM_EXPONENT,
-        JWKParameter::PARAM_PRIVATE_EXPONENT,
-        JWKParameter::PARAM_FIRST_PRIME_FACTOR,
-        JWKParameter::PARAM_SECOND_PRIME_FACTOR,
-        JWKParameter::PARAM_FIRST_FACTOR_CRT_EXPONENT,
-        JWKParameter::PARAM_SECOND_FACTOR_CRT_EXPONENT,
-        JWKParameter::PARAM_FIRST_CRT_COEFFICIENT
-        /* @formatter:on */
-    );
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @internal
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = array(
+		/* @formatter:off */
+		JWKParameter::PARAM_KEY_TYPE,
+		JWKParameter::PARAM_MODULUS,
+		JWKParameter::PARAM_EXPONENT,
+		JWKParameter::PARAM_PRIVATE_EXPONENT,
+		JWKParameter::PARAM_FIRST_PRIME_FACTOR,
+		JWKParameter::PARAM_SECOND_PRIME_FACTOR,
+		JWKParameter::PARAM_FIRST_FACTOR_CRT_EXPONENT,
+		JWKParameter::PARAM_SECOND_FACTOR_CRT_EXPONENT,
+		JWKParameter::PARAM_FIRST_CRT_COEFFICIENT
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * @param JWKParameter ...$params
-     * @throws \UnexpectedValueException If missing required parameter
-     */
-    public function __construct(JWKParameter ...$params)
-    {
-        parent::__construct(...$params);
-        foreach (self::MANAGED_PARAMS as $name) {
-            if (!$this->has($name)) {
-                throw new \UnexpectedValueException("Missing '$name' parameter.");
-            }
-        }
-        if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_RSA) {
-            throw new \UnexpectedValueException("Invalid key type.");
-        }
-        // cast private exponent to correct class
-        $key = JWKParameter::PARAM_PRIVATE_EXPONENT;
-        $this->_parameters[$key] = new PrivateExponentParameter(
-            $this->_parameters[$key]->value());
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param JWKParameter ...$params
+	 * @throws \UnexpectedValueException If missing required parameter
+	 */
+	public function __construct(JWKParameter ...$params)
+	{
+		parent::__construct(...$params);
+		foreach (self::MANAGED_PARAMS as $name) {
+			if (!$this->has($name)) {
+				throw new \UnexpectedValueException("Missing '$name' parameter.");
+			}
+		}
+		if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_RSA) {
+			throw new \UnexpectedValueException("Invalid key type.");
+		}
+		// cast private exponent to correct class
+		$key = JWKParameter::PARAM_PRIVATE_EXPONENT;
+		$this->_parameters[$key] = new PrivateExponentParameter(
+			$this->_parameters[$key]->value());
+	}
     
-    /**
-     * Initialize from RSAPrivateKey.
-     *
-     * @param RSAPrivateKey $pk
-     * @return self
-     */
-    public static function fromRSAPrivateKey(RSAPrivateKey $pk): self
-    {
-        $n = ModulusParameter::fromNumber($pk->modulus());
-        $e = ExponentParameter::fromNumber($pk->publicExponent());
-        $d = PrivateExponentParameter::fromNumber($pk->privateExponent());
-        $p = FirstPrimeFactorParameter::fromNumber($pk->prime1());
-        $q = SecondPrimeFactorParameter::fromNumber($pk->prime2());
-        $dp = FirstFactorCRTExponentParameter::fromNumber($pk->exponent1());
-        $dq = SecondFactorCRTExponentParameter::fromNumber($pk->exponent2());
-        $qi = FirstCRTCoefficientParameter::fromNumber($pk->coefficient());
-        $key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_RSA);
-        return new self($key_type, $n, $e, $d, $p, $q, $dp, $dq, $qi);
-    }
+	/**
+	 * Initialize from RSAPrivateKey.
+	 *
+	 * @param RSAPrivateKey $pk
+	 * @return self
+	 */
+	public static function fromRSAPrivateKey(RSAPrivateKey $pk): self
+	{
+		$n = ModulusParameter::fromNumber($pk->modulus());
+		$e = ExponentParameter::fromNumber($pk->publicExponent());
+		$d = PrivateExponentParameter::fromNumber($pk->privateExponent());
+		$p = FirstPrimeFactorParameter::fromNumber($pk->prime1());
+		$q = SecondPrimeFactorParameter::fromNumber($pk->prime2());
+		$dp = FirstFactorCRTExponentParameter::fromNumber($pk->exponent1());
+		$dq = SecondFactorCRTExponentParameter::fromNumber($pk->exponent2());
+		$qi = FirstCRTCoefficientParameter::fromNumber($pk->coefficient());
+		$key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_RSA);
+		return new self($key_type, $n, $e, $d, $p, $q, $dp, $dq, $qi);
+	}
     
-    /**
-     * Initialize from PEM.
-     *
-     * @param PEM $pem
-     * @return self
-     */
-    public static function fromPEM(PEM $pem): self
-    {
-        return self::fromRSAPrivateKey(RSAPrivateKey::fromPEM($pem));
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem): self
+	{
+		return self::fromRSAPrivateKey(RSAPrivateKey::fromPEM($pem));
+	}
     
-    /**
-     * Get public key component.
-     *
-     * @return RSAPublicKeyJWK
-     */
-    public function publicKey(): PublicKeyJWK
-    {
-        $kty = $this->keyTypeParameter();
-        $n = $this->modulusParameter();
-        $e = $this->exponentParameter();
-        return new RSAPublicKeyJWK($kty, $n, $e);
-    }
+	/**
+	 * Get public key component.
+	 *
+	 * @return RSAPublicKeyJWK
+	 */
+	public function publicKey(): PublicKeyJWK
+	{
+		$kty = $this->keyTypeParameter();
+		$n = $this->modulusParameter();
+		$e = $this->exponentParameter();
+		return new RSAPublicKeyJWK($kty, $n, $e);
+	}
     
-    /**
-     * Convert JWK to PEM.
-     *
-     * @return PEM
-     */
-    public function toPEM(): PEM
-    {
-        $n = $this->modulusParameter()
-            ->number()
-            ->base10();
-        $e = $this->exponentParameter()
-            ->number()
-            ->base10();
-        $d = $this->privateExponentParameter()
-            ->number()
-            ->base10();
-        $p = $this->firstPrimeFactorParameter()
-            ->number()
-            ->base10();
-        $q = $this->secondPrimeFactorParameter()
-            ->number()
-            ->base10();
-        $dp = $this->firstFactorCRTExponentParameter()
-            ->number()
-            ->base10();
-        $dq = $this->secondFactorCRTExponentParameter()
-            ->number()
-            ->base10();
-        $qi = $this->firstCRTCoefficientParameter()
-            ->number()
-            ->base10();
-        $pk = new RSAPrivateKey($n, $e, $d, $p, $q, $dp, $dq, $qi);
-        return PrivateKeyInfo::fromPrivateKey($pk)->toPEM();
-    }
+	/**
+	 * Convert JWK to PEM.
+	 *
+	 * @return PEM
+	 */
+	public function toPEM(): PEM
+	{
+		$n = $this->modulusParameter()
+			->number()
+			->base10();
+		$e = $this->exponentParameter()
+			->number()
+			->base10();
+		$d = $this->privateExponentParameter()
+			->number()
+			->base10();
+		$p = $this->firstPrimeFactorParameter()
+			->number()
+			->base10();
+		$q = $this->secondPrimeFactorParameter()
+			->number()
+			->base10();
+		$dp = $this->firstFactorCRTExponentParameter()
+			->number()
+			->base10();
+		$dq = $this->secondFactorCRTExponentParameter()
+			->number()
+			->base10();
+		$qi = $this->firstCRTCoefficientParameter()
+			->number()
+			->base10();
+		$pk = new RSAPrivateKey($n, $e, $d, $p, $q, $dp, $dq, $qi);
+		return PrivateKeyInfo::fromPrivateKey($pk)->toPEM();
+	}
 }