sop / jwx

lib/JWX/JWS/JWS.php

Indentation +263 added lines, -263 removed lines

@@ -21,287 +21,287 @@
  */
 class JWS
 {
-    /**
-     * Protected header.
-     *
-     * @var Header
-     */
-    protected $_protectedHeader;
+	/**
+	 * Protected header.
+	 *
+	 * @var Header
+	 */
+	protected $_protectedHeader;
 
-    /**
-     * Payload.
-     *
-     * @var string
-     */
-    protected $_payload;
+	/**
+	 * Payload.
+	 *
+	 * @var string
+	 */
+	protected $_payload;
 
-    /**
-     * Input value for the signature computation.
-     *
-     * @var string
-     */
-    protected $_signatureInput;
+	/**
+	 * Input value for the signature computation.
+	 *
+	 * @var string
+	 */
+	protected $_signatureInput;
 
-    /**
-     * Signature.
-     *
-     * @var string
-     */
-    protected $_signature;
+	/**
+	 * Signature.
+	 *
+	 * @var string
+	 */
+	protected $_signature;
 
-    /**
-     * Constructor.
-     *
-     * @param Header $protected_header JWS Protected Header
-     * @param string $payload          JWS Payload
-     * @param string $signature_input  Input value for the signature computation
-     * @param string $signature        JWS Signature
-     */
-    protected function __construct(Header $protected_header, string $payload,
-        string $signature_input, string $signature)
-    {
-        $this->_protectedHeader = $protected_header;
-        $this->_payload = $payload;
-        $this->_signatureInput = $signature_input;
-        $this->_signature = $signature;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Header $protected_header JWS Protected Header
+	 * @param string $payload          JWS Payload
+	 * @param string $signature_input  Input value for the signature computation
+	 * @param string $signature        JWS Signature
+	 */
+	protected function __construct(Header $protected_header, string $payload,
+		string $signature_input, string $signature)
+	{
+		$this->_protectedHeader = $protected_header;
+		$this->_payload = $payload;
+		$this->_signatureInput = $signature_input;
+		$this->_signature = $signature;
+	}
 
-    /**
-     * Convert JWS to string.
-     *
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->toCompact();
-    }
+	/**
+	 * Convert JWS to string.
+	 *
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->toCompact();
+	}
 
-    /**
-     * Initialize from a compact serialization.
-     *
-     * @param string $data
-     *
-     * @return self
-     */
-    public static function fromCompact(string $data): self
-    {
-        return self::fromParts(explode('.', $data));
-    }
+	/**
+	 * Initialize from a compact serialization.
+	 *
+	 * @param string $data
+	 *
+	 * @return self
+	 */
+	public static function fromCompact(string $data): self
+	{
+		return self::fromParts(explode('.', $data));
+	}
 
-    /**
-     * Initialize from the parts of a compact serialization.
-     *
-     * @param array $parts
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return self
-     */
-    public static function fromParts(array $parts): self
-    {
-        if (3 !== count($parts)) {
-            throw new \UnexpectedValueException(
-                'Invalid JWS compact serialization.');
-        }
-        $header = Header::fromJSON(Base64::urlDecode($parts[0]));
-        $b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
-        $payload = $b64 ? Base64::urlDecode($parts[1]) : $parts[1];
-        $signature_input = $parts[0] . '.' . $parts[1];
-        $signature = Base64::urlDecode($parts[2]);
-        return new self($header, $payload, $signature_input, $signature);
-    }
+	/**
+	 * Initialize from the parts of a compact serialization.
+	 *
+	 * @param array $parts
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return self
+	 */
+	public static function fromParts(array $parts): self
+	{
+		if (3 !== count($parts)) {
+			throw new \UnexpectedValueException(
+				'Invalid JWS compact serialization.');
+		}
+		$header = Header::fromJSON(Base64::urlDecode($parts[0]));
+		$b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
+		$payload = $b64 ? Base64::urlDecode($parts[1]) : $parts[1];
+		$signature_input = $parts[0] . '.' . $parts[1];
+		$signature = Base64::urlDecode($parts[2]);
+		return new self($header, $payload, $signature_input, $signature);
+	}
 
-    /**
-     * Initialize by signing the payload with given algorithm.
-     *
-     * @param string             $payload JWS Payload
-     * @param SignatureAlgorithm $algo    Signature algorithm
-     * @param null|Header        $header  Desired header. Algorithm specific
-     *                                    parameters are added automatically.
-     *
-     * @throws \RuntimeException If signature computation fails
-     *
-     * @return self
-     */
-    public static function sign(string $payload, SignatureAlgorithm $algo,
-        ?Header $header = null): self
-    {
-        if (!isset($header)) {
-            $header = new Header();
-        }
-        $header = $header->withParameters(...$algo->headerParameters());
-        // ensure that if b64 parameter is used, it's marked critical
-        if ($header->hasB64Payload()) {
-            if (!$header->hasCritical()) {
-                $crit = new CriticalParameter(JWTParameter::P_B64);
-            } else {
-                $crit = $header->critical()->withParamName(JWTParameter::P_B64);
-            }
-            $header = $header->withParameters($crit);
-        }
-        $signature_input = self::_generateSignatureInput($payload, $header);
-        $signature = $algo->computeSignature($signature_input);
-        return new self($header, $payload, $signature_input, $signature);
-    }
+	/**
+	 * Initialize by signing the payload with given algorithm.
+	 *
+	 * @param string             $payload JWS Payload
+	 * @param SignatureAlgorithm $algo    Signature algorithm
+	 * @param null|Header        $header  Desired header. Algorithm specific
+	 *                                    parameters are added automatically.
+	 *
+	 * @throws \RuntimeException If signature computation fails
+	 *
+	 * @return self
+	 */
+	public static function sign(string $payload, SignatureAlgorithm $algo,
+		?Header $header = null): self
+	{
+		if (!isset($header)) {
+			$header = new Header();
+		}
+		$header = $header->withParameters(...$algo->headerParameters());
+		// ensure that if b64 parameter is used, it's marked critical
+		if ($header->hasB64Payload()) {
+			if (!$header->hasCritical()) {
+				$crit = new CriticalParameter(JWTParameter::P_B64);
+			} else {
+				$crit = $header->critical()->withParamName(JWTParameter::P_B64);
+			}
+			$header = $header->withParameters($crit);
+		}
+		$signature_input = self::_generateSignatureInput($payload, $header);
+		$signature = $algo->computeSignature($signature_input);
+		return new self($header, $payload, $signature_input, $signature);
+	}
 
-    /**
-     * Get JOSE header.
-     *
-     * @return JOSE
-     */
-    public function header(): JOSE
-    {
-        return new JOSE($this->_protectedHeader);
-    }
+	/**
+	 * Get JOSE header.
+	 *
+	 * @return JOSE
+	 */
+	public function header(): JOSE
+	{
+		return new JOSE($this->_protectedHeader);
+	}
 
-    /**
-     * Get the signature algorithm name.
-     *
-     * @return string
-     */
-    public function algorithmName(): string
-    {
-        return $this->header()->algorithm()->value();
-    }
+	/**
+	 * Get the signature algorithm name.
+	 *
+	 * @return string
+	 */
+	public function algorithmName(): string
+	{
+		return $this->header()->algorithm()->value();
+	}
 
-    /**
-     * Check whether JWS is unsecured, that is, contains no signature.
-     *
-     * @return bool
-     */
-    public function isUnsecured(): bool
-    {
-        return JWA::ALGO_NONE === $this->algorithmName();
-    }
+	/**
+	 * Check whether JWS is unsecured, that is, contains no signature.
+	 *
+	 * @return bool
+	 */
+	public function isUnsecured(): bool
+	{
+		return JWA::ALGO_NONE === $this->algorithmName();
+	}
 
-    /**
-     * Get the payload.
-     *
-     * @return string
-     */
-    public function payload(): string
-    {
-        return $this->_payload;
-    }
+	/**
+	 * Get the payload.
+	 *
+	 * @return string
+	 */
+	public function payload(): string
+	{
+		return $this->_payload;
+	}
 
-    /**
-     * Get the signature.
-     *
-     * @return string
-     */
-    public function signature(): string
-    {
-        return $this->_signature;
-    }
+	/**
+	 * Get the signature.
+	 *
+	 * @return string
+	 */
+	public function signature(): string
+	{
+		return $this->_signature;
+	}
 
-    /**
-     * Validate the signature using explicit algorithm.
-     *
-     * @param SignatureAlgorithm $algo
-     *
-     * @throws \UnexpectedValueException If using different signature algorithm
-     *                                   then specified by the header
-     * @throws \RuntimeException         If signature computation fails
-     *
-     * @return bool True if signature is valid
-     */
-    public function validate(SignatureAlgorithm $algo): bool
-    {
-        if ($algo->algorithmParamValue() !== $this->algorithmName()) {
-            throw new \UnexpectedValueException('Invalid signature algorithm.');
-        }
-        return $algo->validateSignature($this->_signatureInput, $this->_signature);
-    }
+	/**
+	 * Validate the signature using explicit algorithm.
+	 *
+	 * @param SignatureAlgorithm $algo
+	 *
+	 * @throws \UnexpectedValueException If using different signature algorithm
+	 *                                   then specified by the header
+	 * @throws \RuntimeException         If signature computation fails
+	 *
+	 * @return bool True if signature is valid
+	 */
+	public function validate(SignatureAlgorithm $algo): bool
+	{
+		if ($algo->algorithmParamValue() !== $this->algorithmName()) {
+			throw new \UnexpectedValueException('Invalid signature algorithm.');
+		}
+		return $algo->validateSignature($this->_signatureInput, $this->_signature);
+	}
 
-    /**
-     * Validate the signature using the given JWK.
-     *
-     * Signature algorithm is determined from the header.
-     *
-     * @param JWK $jwk JSON Web Key
-     *
-     * @throws \RuntimeException If algorithm initialization fails
-     *
-     * @return bool True if signature is valid
-     */
-    public function validateWithJWK(JWK $jwk): bool
-    {
-        $algo = SignatureAlgorithm::fromJWK($jwk, $this->header());
-        return $this->validate($algo);
-    }
+	/**
+	 * Validate the signature using the given JWK.
+	 *
+	 * Signature algorithm is determined from the header.
+	 *
+	 * @param JWK $jwk JSON Web Key
+	 *
+	 * @throws \RuntimeException If algorithm initialization fails
+	 *
+	 * @return bool True if signature is valid
+	 */
+	public function validateWithJWK(JWK $jwk): bool
+	{
+		$algo = SignatureAlgorithm::fromJWK($jwk, $this->header());
+		return $this->validate($algo);
+	}
 
-    /**
-     * Validate the signature using a key from the given JWK set.
-     *
-     * Correct key shall be sought by the key ID indicated by the header.
-     *
-     * @param JWKSet $set Set of JSON Web Keys
-     *
-     * @throws \RuntimeException If algorithm initialization fails
-     *
-     * @return bool True if signature is valid
-     */
-    public function validateWithJWKSet(JWKSet $set): bool
-    {
-        if (!count($set)) {
-            throw new \RuntimeException('No keys.');
-        }
-        $factory = new SignatureAlgorithmFactory($this->header());
-        $algo = $factory->algoByKeys($set);
-        return $this->validate($algo);
-    }
+	/**
+	 * Validate the signature using a key from the given JWK set.
+	 *
+	 * Correct key shall be sought by the key ID indicated by the header.
+	 *
+	 * @param JWKSet $set Set of JSON Web Keys
+	 *
+	 * @throws \RuntimeException If algorithm initialization fails
+	 *
+	 * @return bool True if signature is valid
+	 */
+	public function validateWithJWKSet(JWKSet $set): bool
+	{
+		if (!count($set)) {
+			throw new \RuntimeException('No keys.');
+		}
+		$factory = new SignatureAlgorithmFactory($this->header());
+		$algo = $factory->algoByKeys($set);
+		return $this->validate($algo);
+	}
 
-    /**
-     * Convert to compact serialization.
-     *
-     * @return string
-     */
-    public function toCompact(): string
-    {
-        return Base64::urlEncode($this->_protectedHeader->toJSON()) . '.' .
-             $this->_encodedPayload() . '.' .
-             Base64::urlEncode($this->_signature);
-    }
+	/**
+	 * Convert to compact serialization.
+	 *
+	 * @return string
+	 */
+	public function toCompact(): string
+	{
+		return Base64::urlEncode($this->_protectedHeader->toJSON()) . '.' .
+			 $this->_encodedPayload() . '.' .
+			 Base64::urlEncode($this->_signature);
+	}
 
-    /**
-     * Convert to compact serialization with payload detached.
-     *
-     * @return string
-     */
-    public function toCompactDetached(): string
-    {
-        return Base64::urlEncode($this->_protectedHeader->toJSON()) . '..' .
-             Base64::urlEncode($this->_signature);
-    }
+	/**
+	 * Convert to compact serialization with payload detached.
+	 *
+	 * @return string
+	 */
+	public function toCompactDetached(): string
+	{
+		return Base64::urlEncode($this->_protectedHeader->toJSON()) . '..' .
+			 Base64::urlEncode($this->_signature);
+	}
 
-    /**
-     * Get the payload encoded for serialization.
-     *
-     * @return string
-     */
-    protected function _encodedPayload(): string
-    {
-        $b64 = true;
-        if ($this->_protectedHeader->hasB64Payload()) {
-            $b64 = $this->_protectedHeader->B64Payload()->value();
-        }
-        return $b64 ? Base64::urlEncode($this->_payload) : $this->_payload;
-    }
+	/**
+	 * Get the payload encoded for serialization.
+	 *
+	 * @return string
+	 */
+	protected function _encodedPayload(): string
+	{
+		$b64 = true;
+		if ($this->_protectedHeader->hasB64Payload()) {
+			$b64 = $this->_protectedHeader->B64Payload()->value();
+		}
+		return $b64 ? Base64::urlEncode($this->_payload) : $this->_payload;
+	}
 
-    /**
-     * Generate input for the signature computation.
-     *
-     * @param string $payload Payload
-     * @param Header $header  Protected header
-     *
-     * @return string
-     */
-    protected static function _generateSignatureInput(string $payload,
-        Header $header): string
-    {
-        $b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
-        $data = Base64::urlEncode($header->toJSON()) . '.';
-        $data .= $b64 ? Base64::urlEncode($payload) : $payload;
-        return $data;
-    }
+	/**
+	 * Generate input for the signature computation.
+	 *
+	 * @param string $payload Payload
+	 * @param Header $header  Protected header
+	 *
+	 * @return string
+	 */
+	protected static function _generateSignatureInput(string $payload,
+		Header $header): string
+	{
+		$b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
+		$data = Base64::urlEncode($header->toJSON()) . '.';
+		$data .= $b64 ? Base64::urlEncode($payload) : $payload;
+		return $data;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS;
 

lib/JWX/JWS/Algorithm/OpenSSLSignatureAlgorithm.php

Indentation +76 added lines, -76 removed lines

@@ -14,88 +14,88 @@
  */
 abstract class OpenSSLSignatureAlgorithm extends SignatureAlgorithm
 {
-    /**
-     * Public key.
-     *
-     * @var PublicKeyJWK
-     */
-    protected $_publicKey;
+	/**
+	 * Public key.
+	 *
+	 * @var PublicKeyJWK
+	 */
+	protected $_publicKey;
 
-    /**
-     * Private key.
-     *
-     * @var null|PrivateKeyJWK
-     */
-    protected $_privateKey;
+	/**
+	 * Private key.
+	 *
+	 * @var null|PrivateKeyJWK
+	 */
+	protected $_privateKey;
 
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \LogicException   If private key was not provided
-     * @throws \RuntimeException For generic errors
-     */
-    public function computeSignature(string $data): string
-    {
-        /*
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws \LogicException   If private key was not provided
+	 * @throws \RuntimeException For generic errors
+	 */
+	public function computeSignature(string $data): string
+	{
+		/*
          * NOTE: OpenSSL uses PKCS #1 v1.5 padding by default, so no explicit
          * padding is required by sign and verify operations.
          */
-        if (!isset($this->_privateKey)) {
-            throw new \LogicException('Private key not set.');
-        }
-        $key = openssl_pkey_get_private($this->_privateKey->toPEM()->string());
-        if (false === $key) {
-            throw new \RuntimeException(
-                'openssl_pkey_get_private() failed: ' .
-                     $this->_getLastOpenSSLError());
-        }
-        $result = @openssl_sign($data, $signature, $key, $this->_mdMethod());
-        if (!$result) {
-            throw new \RuntimeException(
-                'openssl_sign() failed: ' . $this->_getLastOpenSSLError());
-        }
-        return $signature;
-    }
+		if (!isset($this->_privateKey)) {
+			throw new \LogicException('Private key not set.');
+		}
+		$key = openssl_pkey_get_private($this->_privateKey->toPEM()->string());
+		if (false === $key) {
+			throw new \RuntimeException(
+				'openssl_pkey_get_private() failed: ' .
+					 $this->_getLastOpenSSLError());
+		}
+		$result = @openssl_sign($data, $signature, $key, $this->_mdMethod());
+		if (!$result) {
+			throw new \RuntimeException(
+				'openssl_sign() failed: ' . $this->_getLastOpenSSLError());
+		}
+		return $signature;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \RuntimeException For generic errors
-     */
-    public function validateSignature(string $data, string $signature): bool
-    {
-        $key = openssl_pkey_get_public($this->_publicKey->toPEM()->string());
-        if (false === $key) {
-            throw new \RuntimeException(
-                'openssl_pkey_get_public() failed: ' .
-                     $this->_getLastOpenSSLError());
-        }
-        $result = @openssl_verify($data, $signature, $key, $this->_mdMethod());
-        if (false === $result || -1 == $result) {
-            throw new \RuntimeException(
-                'openssl_verify() failed: ' . $this->_getLastOpenSSLError());
-        }
-        return 1 == $result;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws \RuntimeException For generic errors
+	 */
+	public function validateSignature(string $data, string $signature): bool
+	{
+		$key = openssl_pkey_get_public($this->_publicKey->toPEM()->string());
+		if (false === $key) {
+			throw new \RuntimeException(
+				'openssl_pkey_get_public() failed: ' .
+					 $this->_getLastOpenSSLError());
+		}
+		$result = @openssl_verify($data, $signature, $key, $this->_mdMethod());
+		if (false === $result || -1 == $result) {
+			throw new \RuntimeException(
+				'openssl_verify() failed: ' . $this->_getLastOpenSSLError());
+		}
+		return 1 == $result;
+	}
 
-    /**
-     * Get the signature algorithm identifier supported by OpenSSL.
-     *
-     * @return int
-     */
-    abstract protected function _mdMethod(): int;
+	/**
+	 * Get the signature algorithm identifier supported by OpenSSL.
+	 *
+	 * @return int
+	 */
+	abstract protected function _mdMethod(): int;
 
-    /**
-     * Get the last OpenSSL error message.
-     *
-     * @return null|string
-     */
-    protected function _getLastOpenSSLError(): ?string
-    {
-        $msg = null;
-        while (false !== ($err = openssl_error_string())) {
-            $msg = $err;
-        }
-        return $msg;
-    }
+	/**
+	 * Get the last OpenSSL error message.
+	 *
+	 * @return null|string
+	 */
+	protected function _getLastOpenSSLError(): ?string
+	{
+		$msg = null;
+		while (false !== ($err = openssl_error_string())) {
+			$msg = $err;
+		}
+		return $msg;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/SignatureAlgorithmFactory.php

Indentation +83 added lines, -83 removed lines

@@ -15,91 +15,91 @@
  */
 class SignatureAlgorithmFactory
 {
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = [
-        JWA::ALGO_HS256 => HS256Algorithm::class,
-        JWA::ALGO_HS384 => HS384Algorithm::class,
-        JWA::ALGO_HS512 => HS512Algorithm::class,
-        JWA::ALGO_RS256 => RS256Algorithm::class,
-        JWA::ALGO_RS384 => RS384Algorithm::class,
-        JWA::ALGO_RS512 => RS512Algorithm::class,
-        JWA::ALGO_ES256 => ES256Algorithm::class,
-        JWA::ALGO_ES384 => ES384Algorithm::class,
-        JWA::ALGO_ES512 => ES512Algorithm::class,
-    ];
-    /**
-     * Header.
-     *
-     * @var Header
-     */
-    protected $_header;
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = [
+		JWA::ALGO_HS256 => HS256Algorithm::class,
+		JWA::ALGO_HS384 => HS384Algorithm::class,
+		JWA::ALGO_HS512 => HS512Algorithm::class,
+		JWA::ALGO_RS256 => RS256Algorithm::class,
+		JWA::ALGO_RS384 => RS384Algorithm::class,
+		JWA::ALGO_RS512 => RS512Algorithm::class,
+		JWA::ALGO_ES256 => ES256Algorithm::class,
+		JWA::ALGO_ES384 => ES384Algorithm::class,
+		JWA::ALGO_ES512 => ES512Algorithm::class,
+	];
+	/**
+	 * Header.
+	 *
+	 * @var Header
+	 */
+	protected $_header;
 
-    /**
-     * Constructor.
-     *
-     * @param Header $header
-     */
-    public function __construct(Header $header)
-    {
-        $this->_header = $header;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Header $header
+	 */
+	public function __construct(Header $header)
+	{
+		$this->_header = $header;
+	}
 
-    /**
-     * Get signature algorithm by given JWK.
-     *
-     * @param JWK $jwk
-     *
-     * @return SignatureAlgorithm
-     */
-    public function algoByKey(JWK $jwk): SignatureAlgorithm
-    {
-        $alg = JWA::deriveAlgorithmName($this->_header, $jwk);
-        $cls = self::_algoClassByName($alg);
-        return $cls::fromJWK($jwk, $this->_header);
-    }
+	/**
+	 * Get signature algorithm by given JWK.
+	 *
+	 * @param JWK $jwk
+	 *
+	 * @return SignatureAlgorithm
+	 */
+	public function algoByKey(JWK $jwk): SignatureAlgorithm
+	{
+		$alg = JWA::deriveAlgorithmName($this->_header, $jwk);
+		$cls = self::_algoClassByName($alg);
+		return $cls::fromJWK($jwk, $this->_header);
+	}
 
-    /**
-     * Get signature algorithm using a matching key from given JWK set.
-     *
-     * @param JWKSet $set
-     *
-     * @throws \UnexpectedValueException If a key cannot be found
-     *
-     * @return SignatureAlgorithm
-     */
-    public function algoByKeys(JWKSet $set): SignatureAlgorithm
-    {
-        if (!$this->_header->hasKeyID()) {
-            throw new \UnexpectedValueException('No key ID paremeter.');
-        }
-        $id = $this->_header->keyID()->value();
-        if (!$set->hasKeyID($id)) {
-            throw new \UnexpectedValueException("No key for ID '{$id}'.");
-        }
-        return $this->algoByKey($set->keyByID($id));
-    }
+	/**
+	 * Get signature algorithm using a matching key from given JWK set.
+	 *
+	 * @param JWKSet $set
+	 *
+	 * @throws \UnexpectedValueException If a key cannot be found
+	 *
+	 * @return SignatureAlgorithm
+	 */
+	public function algoByKeys(JWKSet $set): SignatureAlgorithm
+	{
+		if (!$this->_header->hasKeyID()) {
+			throw new \UnexpectedValueException('No key ID paremeter.');
+		}
+		$id = $this->_header->keyID()->value();
+		if (!$set->hasKeyID($id)) {
+			throw new \UnexpectedValueException("No key for ID '{$id}'.");
+		}
+		return $this->algoByKey($set->keyByID($id));
+	}
 
-    /**
-     * Get the algorithm implementation class name by an algorithm name.
-     *
-     * @param string $alg Algorithm name
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return string Class name
-     */
-    private static function _algoClassByName(string $alg): string
-    {
-        if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException(
-                "Algorithm '{$alg}' not supported.");
-        }
-        return self::MAP_ALGO_TO_CLASS[$alg];
-    }
+	/**
+	 * Get the algorithm implementation class name by an algorithm name.
+	 *
+	 * @param string $alg Algorithm name
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return string Class name
+	 */
+	private static function _algoClassByName(string $alg): string
+	{
+		if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException(
+				"Algorithm '{$alg}' not supported.");
+		}
+		return self::MAP_ALGO_TO_CLASS[$alg];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/ES256Algorithm.php

Indentation +21 added lines, -21 removed lines

@@ -14,27 +14,27 @@
  */
 class ES256Algorithm extends ECDSAAlgorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_ES256;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_ES256;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _curveName(): string
-    {
-        return CurveParameter::CURVE_P256;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _curveName(): string
+	{
+		return CurveParameter::CURVE_P256;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _mdMethod(): int
-    {
-        return OPENSSL_ALGO_SHA256;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod(): int
+	{
+		return OPENSSL_ALGO_SHA256;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/HS512Algorithm.php

Indentation +14 added lines, -14 removed lines

@@ -13,19 +13,19 @@
  */
 class HS512Algorithm extends HMACAlgorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_HS512;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_HS512;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo(): string
-    {
-        return 'sha512';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo(): string
+	{
+		return 'sha512';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/NoneAlgorithm.php

Indentation +29 added lines, -29 removed lines

@@ -16,36 +16,36 @@
  */
 class NoneAlgorithm extends SignatureAlgorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_NONE;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_NONE;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function computeSignature(string $data): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function computeSignature(string $data): string
+	{
+		return '';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function validateSignature(string $data, string $signature): bool
-    {
-        return '' === $signature;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function validateSignature(string $data, string $signature): bool
+	{
+		return '' === $signature;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            [AlgorithmParameter::fromAlgorithm($this)]);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			[AlgorithmParameter::fromAlgorithm($this)]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/RSASSAPKCS1Algorithm.php

Indentation +71 added lines, -71 removed lines

@@ -19,80 +19,80 @@
  */
 abstract class RSASSAPKCS1Algorithm extends OpenSSLSignatureAlgorithm
 {
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = [
-        JWA::ALGO_RS256 => RS256Algorithm::class,
-        JWA::ALGO_RS384 => RS384Algorithm::class,
-        JWA::ALGO_RS512 => RS512Algorithm::class,
-    ];
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = [
+		JWA::ALGO_RS256 => RS256Algorithm::class,
+		JWA::ALGO_RS384 => RS384Algorithm::class,
+		JWA::ALGO_RS512 => RS512Algorithm::class,
+	];
 
-    /**
-     * Constructor.
-     *
-     * @param RSAPublicKeyJWK  $pub_key
-     * @param RSAPrivateKeyJWK $priv_key
-     */
-    protected function __construct(RSAPublicKeyJWK $pub_key,
-        RSAPrivateKeyJWK $priv_key = null)
-    {
-        $this->_publicKey = $pub_key;
-        $this->_privateKey = $priv_key;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param RSAPublicKeyJWK  $pub_key
+	 * @param RSAPrivateKeyJWK $priv_key
+	 */
+	protected function __construct(RSAPublicKeyJWK $pub_key,
+		RSAPrivateKeyJWK $priv_key = null)
+	{
+		$this->_publicKey = $pub_key;
+		$this->_privateKey = $priv_key;
+	}
 
-    /**
-     * Initialize from a public key.
-     *
-     * @param RSAPublicKeyJWK $jwk
-     *
-     * @return self
-     */
-    public static function fromPublicKey(RSAPublicKeyJWK $jwk): self
-    {
-        return new static($jwk);
-    }
+	/**
+	 * Initialize from a public key.
+	 *
+	 * @param RSAPublicKeyJWK $jwk
+	 *
+	 * @return self
+	 */
+	public static function fromPublicKey(RSAPublicKeyJWK $jwk): self
+	{
+		return new static($jwk);
+	}
 
-    /**
-     * Initialize from a private key.
-     *
-     * @param RSAPrivateKeyJWK $jwk
-     *
-     * @return self
-     */
-    public static function fromPrivateKey(RSAPrivateKeyJWK $jwk): self
-    {
-        return new static($jwk->publicKey(), $jwk);
-    }
+	/**
+	 * Initialize from a private key.
+	 *
+	 * @param RSAPrivateKeyJWK $jwk
+	 *
+	 * @return self
+	 */
+	public static function fromPrivateKey(RSAPrivateKeyJWK $jwk): self
+	{
+		return new static($jwk->publicKey(), $jwk);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public static function fromJWK(JWK $jwk, Header $header): SignatureAlgorithm
-    {
-        $alg = JWA::deriveAlgorithmName($header, $jwk);
-        if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException("Unsupported algorithm '{$alg}'.");
-        }
-        $cls = self::MAP_ALGO_TO_CLASS[$alg];
-        if ($jwk->has(...RSAPrivateKeyJWK::MANAGED_PARAMS)) {
-            return $cls::fromPrivateKey(RSAPrivateKeyJWK::fromJWK($jwk));
-        }
-        return $cls::fromPublicKey(RSAPublicKeyJWK::fromJWK($jwk));
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	public static function fromJWK(JWK $jwk, Header $header): SignatureAlgorithm
+	{
+		$alg = JWA::deriveAlgorithmName($header, $jwk);
+		if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException("Unsupported algorithm '{$alg}'.");
+		}
+		$cls = self::MAP_ALGO_TO_CLASS[$alg];
+		if ($jwk->has(...RSAPrivateKeyJWK::MANAGED_PARAMS)) {
+			return $cls::fromPrivateKey(RSAPrivateKeyJWK::fromJWK($jwk));
+		}
+		return $cls::fromPublicKey(RSAPublicKeyJWK::fromJWK($jwk));
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            [AlgorithmParameter::fromAlgorithm($this)]);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			[AlgorithmParameter::fromAlgorithm($this)]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/RS512Algorithm.php

Indentation +14 added lines, -14 removed lines

@@ -13,19 +13,19 @@
  */
 class RS512Algorithm extends RSASSAPKCS1Algorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_RS512;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_RS512;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _mdMethod(): int
-    {
-        return OPENSSL_ALGO_SHA512;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod(): int
+	{
+		return OPENSSL_ALGO_SHA512;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/HS384Algorithm.php

Indentation +14 added lines, -14 removed lines

@@ -13,19 +13,19 @@
  */
 class HS384Algorithm extends HMACAlgorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_HS384;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_HS384;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo(): string
-    {
-        return 'sha384';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo(): string
+	{
+		return 'sha384';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;