sop / jwx

lib/JWX/JWK/Parameter/OtherPrimesInfoParameter.php

Indentation +10 added lines, -10 removed lines

@@ -12,15 +12,15 @@
  */
 class OtherPrimesInfoParameter extends JWKParameter
 {
-    use ArrayParameterValue;
+	use ArrayParameterValue;
     
-    /**
-     * Constructor.
-     *
-     * @param array[] ...$primes
-     */
-    public function __construct(...$primes)
-    {
-        parent::__construct(self::PARAM_OTHER_PRIMES_INFO, $primes);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param array[] ...$primes
+	 */
+	public function __construct(...$primes)
+	{
+		parent::__construct(self::PARAM_OTHER_PRIMES_INFO, $primes);
+	}
 }

lib/JWX/JWT/Claim/ExpirationTimeClaim.php

Indentation +13 added lines, -13 removed lines

@@ -13,18 +13,18 @@
  */
 class ExpirationTimeClaim extends RegisteredClaim
 {
-    use NumericDateClaim;
-    use ReferenceTimeValidation;
+	use NumericDateClaim;
+	use ReferenceTimeValidation;
     
-    /**
-     * Constructor.
-     *
-     * @param int $exp_time Expiration time
-     */
-    public function __construct($exp_time)
-    {
-        // validate that claim is after the constraint (reference time)
-        parent::__construct(self::NAME_EXPIRATION_TIME, intval($exp_time),
-            new GreaterValidator());
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $exp_time Expiration time
+	 */
+	public function __construct($exp_time)
+	{
+		// validate that claim is after the constraint (reference time)
+		parent::__construct(self::NAME_EXPIRATION_TIME, intval($exp_time),
+			new GreaterValidator());
+	}
 }

lib/JWX/JWT/Claim/RegisteredClaim.php

Indentation +77 added lines, -77 removed lines

@@ -9,85 +9,85 @@
  */
 abstract class RegisteredClaim extends Claim
 {
-    // JWT claims
-    const NAME_ISSUER = "iss";
-    const NAME_SUBJECT = "sub";
-    const NAME_AUDIENCE = "aud";
-    const NAME_EXPIRATION_TIME = "exp";
-    const NAME_NOT_BEFORE = "nbf";
-    const NAME_ISSUED_AT = "iat";
-    const NAME_JWT_ID = "jti";
+	// JWT claims
+	const NAME_ISSUER = "iss";
+	const NAME_SUBJECT = "sub";
+	const NAME_AUDIENCE = "aud";
+	const NAME_EXPIRATION_TIME = "exp";
+	const NAME_NOT_BEFORE = "nbf";
+	const NAME_ISSUED_AT = "iat";
+	const NAME_JWT_ID = "jti";
     
-    // OpenID claims
-    const NAME_FULL_NAME = "name";
-    const NAME_GIVEN_NAME = "given_name";
-    const NAME_FAMILY_NAME = "family_name";
-    const NAME_MIDDLE_NAME = "middle_name";
-    const NAME_NICKNAME = "nickname";
-    const NAME_PREFERRED_USERNAME = "preferred_username";
-    const NAME_PROFILE_URL = "profile";
-    const NAME_PICTURE_URL = "picture";
-    const NAME_WEBSITE_URL = "website";
-    const NAME_EMAIL = "email";
-    const NAME_EMAIL_VERIFIED = "email_verified";
-    const NAME_GENDER = "gender";
-    const NAME_BIRTHDATE = "birthdate";
-    const NAME_TIMEZONE = "zoneinfo";
-    const NAME_LOCALE = "locale";
-    const NAME_PHONE_NUMBER = "phone_number";
-    const NAME_PHONE_NUMBER_VERIFIED = "phone_number_verified";
-    const NAME_ADDRESS = "address";
-    const NAME_UPDATED_AT = "updated_at";
-    const NAME_AUTHORIZED_PARTY = "azp";
-    const NAME_NONCE = "nonce";
-    const NAME_AUTH_TIME = "auth_time";
-    const NAME_ACCESS_TOKEN_HASH = "at_hash";
-    const NAME_CODE_HASH = "c_hash";
-    const NAME_ACR = "acr";
-    const NAME_AMR = "amr";
-    const NAME_SUB_JWK = "sub_jwk";
+	// OpenID claims
+	const NAME_FULL_NAME = "name";
+	const NAME_GIVEN_NAME = "given_name";
+	const NAME_FAMILY_NAME = "family_name";
+	const NAME_MIDDLE_NAME = "middle_name";
+	const NAME_NICKNAME = "nickname";
+	const NAME_PREFERRED_USERNAME = "preferred_username";
+	const NAME_PROFILE_URL = "profile";
+	const NAME_PICTURE_URL = "picture";
+	const NAME_WEBSITE_URL = "website";
+	const NAME_EMAIL = "email";
+	const NAME_EMAIL_VERIFIED = "email_verified";
+	const NAME_GENDER = "gender";
+	const NAME_BIRTHDATE = "birthdate";
+	const NAME_TIMEZONE = "zoneinfo";
+	const NAME_LOCALE = "locale";
+	const NAME_PHONE_NUMBER = "phone_number";
+	const NAME_PHONE_NUMBER_VERIFIED = "phone_number_verified";
+	const NAME_ADDRESS = "address";
+	const NAME_UPDATED_AT = "updated_at";
+	const NAME_AUTHORIZED_PARTY = "azp";
+	const NAME_NONCE = "nonce";
+	const NAME_AUTH_TIME = "auth_time";
+	const NAME_ACCESS_TOKEN_HASH = "at_hash";
+	const NAME_CODE_HASH = "c_hash";
+	const NAME_ACR = "acr";
+	const NAME_AMR = "amr";
+	const NAME_SUB_JWK = "sub_jwk";
     
-    /**
-     * Mapping from registered claim name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_NAME_TO_CLASS = array(
-        /* @formatter:off */
-        self::NAME_ISSUER => IssuerClaim::class,
-        self::NAME_SUBJECT => SubjectClaim::class,
-        self::NAME_AUDIENCE => AudienceClaim::class,
-        self::NAME_EXPIRATION_TIME => ExpirationTimeClaim::class,
-        self::NAME_NOT_BEFORE => NotBeforeClaim::class,
-        self::NAME_ISSUED_AT => IssuedAtClaim::class,
-        self::NAME_JWT_ID => JWTIDClaim::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from registered claim name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_NAME_TO_CLASS = array(
+		/* @formatter:off */
+		self::NAME_ISSUER => IssuerClaim::class,
+		self::NAME_SUBJECT => SubjectClaim::class,
+		self::NAME_AUDIENCE => AudienceClaim::class,
+		self::NAME_EXPIRATION_TIME => ExpirationTimeClaim::class,
+		self::NAME_NOT_BEFORE => NotBeforeClaim::class,
+		self::NAME_ISSUED_AT => IssuedAtClaim::class,
+		self::NAME_JWT_ID => JWTIDClaim::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * Defined here for type strictness. Parameters are passed to the
-     * superclass.
-     *
-     * @param mixed ...$args
-     */
-    public function __construct(...$args)
-    {
-        parent::__construct((string) $args[0], $args[1],
-            isset($args[2]) ? $args[2] : null);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * Defined here for type strictness. Parameters are passed to the
+	 * superclass.
+	 *
+	 * @param mixed ...$args
+	 */
+	public function __construct(...$args)
+	{
+		parent::__construct((string) $args[0], $args[1],
+			isset($args[2]) ? $args[2] : null);
+	}
     
-    /**
-     * Initialize concrete claim instance from a JSON value.
-     *
-     * @param mixed $value
-     * @return RegisteredClaim
-     */
-    public static function fromJSONValue($value)
-    {
-        return new static($value);
-    }
+	/**
+	 * Initialize concrete claim instance from a JSON value.
+	 *
+	 * @param mixed $value
+	 * @return RegisteredClaim
+	 */
+	public static function fromJSONValue($value)
+	{
+		return new static($value);
+	}
 }

lib/JWX/JWT/Parameter/ReplicatedClaimParameter.php

Indentation +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@
  */
 class ReplicatedClaimParameter extends JWTParameter
 {
-    /**
-     * Constructor.
-     *
-     * @param Claim $claim
-     */
-    public function __construct(Claim $claim)
-    {
-        parent::__construct($claim->name(), $claim->value());
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Claim $claim
+	 */
+	public function __construct(Claim $claim)
+	{
+		parent::__construct($claim->name(), $claim->value());
+	}
 }

lib/JWX/Parameter/Feature/ArrayParameterValue.php

Indentation +20 added lines, -20 removed lines

@@ -7,25 +7,25 @@
  */
 trait ArrayParameterValue
 {
-    /**
-     * Constructor.
-     *
-     * @param mixed ...$values
-     */
-    abstract public function __construct(...$values);
+	/**
+	 * Constructor.
+	 *
+	 * @param mixed ...$values
+	 */
+	abstract public function __construct(...$values);
     
-    /**
-     * Initialize from a JSON value.
-     *
-     * @param array $value
-     * @return static
-     */
-    public static function fromJSONValue($value)
-    {
-        if (!is_array($value)) {
-            throw new \UnexpectedValueException(
-                get_called_class() . " expects an array parameter.");
-        }
-        return new static(...$value);
-    }
+	/**
+	 * Initialize from a JSON value.
+	 *
+	 * @param array $value
+	 * @return static
+	 */
+	public static function fromJSONValue($value)
+	{
+		if (!is_array($value)) {
+			throw new \UnexpectedValueException(
+				get_called_class() . " expects an array parameter.");
+		}
+		return new static(...$value);
+	}
 }

lib/JWX/JWS/Algorithm/HMACAlgorithm.php

Indentation +81 added lines, -81 removed lines

@@ -18,92 +18,92 @@
  */
 abstract class HMACAlgorithm extends SignatureAlgorithm
 {
-    /**
-     * Shared secret key.
-     *
-     * @var string $_key
-     */
-    protected $_key;
+	/**
+	 * Shared secret key.
+	 *
+	 * @var string $_key
+	 */
+	protected $_key;
     
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_HS256 => HS256Algorithm::class, 
-        JWA::ALGO_HS384 => HS384Algorithm::class, 
-        JWA::ALGO_HS512 => HS512Algorithm::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_HS256 => HS256Algorithm::class, 
+		JWA::ALGO_HS384 => HS384Algorithm::class, 
+		JWA::ALGO_HS512 => HS512Algorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Get algorithm name recognized by the Hash extension.
-     *
-     * @return string
-     */
-    abstract protected function _hashAlgo(): string;
+	/**
+	 * Get algorithm name recognized by the Hash extension.
+	 *
+	 * @return string
+	 */
+	abstract protected function _hashAlgo(): string;
     
-    /**
-     * Constructor.
-     *
-     * @param string $key Shared secret key
-     */
-    public function __construct(string $key)
-    {
-        $this->_key = $key;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $key Shared secret key
+	 */
+	public function __construct(string $key)
+	{
+		$this->_key = $key;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public static function fromJWK(JWK $jwk, Header $header): self
-    {
-        $jwk = SymmetricKeyJWK::fromJWK($jwk);
-        $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];
-        return new $cls($jwk->key());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public static function fromJWK(JWK $jwk, Header $header): self
+	{
+		$jwk = SymmetricKeyJWK::fromJWK($jwk);
+		$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];
+		return new $cls($jwk->key());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function computeSignature(string $data): string
-    {
-        $result = @hash_hmac($this->_hashAlgo(), $data, $this->_key, true);
-        if (false === $result) {
-            $err = error_get_last();
-            $msg = isset($err) && __FILE__ == $err['file'] ? $err['message'] : null;
-            throw new \RuntimeException($msg ?? 'hash_hmac() failed.');
-        }
-        return $result;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function computeSignature(string $data): string
+	{
+		$result = @hash_hmac($this->_hashAlgo(), $data, $this->_key, true);
+		if (false === $result) {
+			$err = error_get_last();
+			$msg = isset($err) && __FILE__ == $err['file'] ? $err['message'] : null;
+			throw new \RuntimeException($msg ?? 'hash_hmac() failed.');
+		}
+		return $result;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function validateSignature(string $data, string $signature): bool
-    {
-        return $this->computeSignature($data) === $signature;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function validateSignature(string $data, string $signature): bool
+	{
+		return $this->computeSignature($data) === $signature;
+	}
     
-    /**
-     *
-     * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this)));
-    }
+	/**
+	 *
+	 * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this)));
+	}
 }

lib/JWX/JWS/Algorithm/HS256Algorithm.php

Indentation +16 added lines, -16 removed lines

@@ -13,21 +13,21 @@
  */
 class HS256Algorithm extends HMACAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo(): string
-    {
-        return "sha256";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo(): string
+	{
+		return "sha256";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_HS256;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_HS256;
+	}
 }

lib/JWX/JWS/Algorithm/OpenSSLSignatureAlgorithm.php

Indentation +81 added lines, -81 removed lines

@@ -12,90 +12,90 @@
  */
 abstract class OpenSSLSignatureAlgorithm extends SignatureAlgorithm
 {
-    /**
-     * Public key.
-     *
-     * @var \JWX\JWK\Asymmetric\PublicKeyJWK $_publicKey
-     */
-    protected $_publicKey;
+	/**
+	 * Public key.
+	 *
+	 * @var \JWX\JWK\Asymmetric\PublicKeyJWK $_publicKey
+	 */
+	protected $_publicKey;
     
-    /**
-     * Private key.
-     *
-     * @var \JWX\JWK\Asymmetric\PrivateKeyJWK|null $_privateKey
-     */
-    protected $_privateKey;
+	/**
+	 * Private key.
+	 *
+	 * @var \JWX\JWK\Asymmetric\PrivateKeyJWK|null $_privateKey
+	 */
+	protected $_privateKey;
     
-    /**
-     * Get the message digest method name supported by OpenSSL.
-     *
-     * @return string
-     */
-    abstract protected function _mdMethod(): string;
+	/**
+	 * Get the message digest method name supported by OpenSSL.
+	 *
+	 * @return string
+	 */
+	abstract protected function _mdMethod(): string;
     
-    /**
-     *
-     * @see \JWX\JWS\SignatureAlgorithm::computeSignature()
-     * @throws \LogicException If private key was not provided
-     * @throws \RuntimeException For generic errors
-     * @return string
-     */
-    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 (!$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;
-    }
+	/**
+	 *
+	 * @see \JWX\JWS\SignatureAlgorithm::computeSignature()
+	 * @throws \LogicException If private key was not provided
+	 * @throws \RuntimeException For generic errors
+	 * @return string
+	 */
+	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 (!$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;
+	}
     
-    /**
-     *
-     * @see \JWX\JWS\SignatureAlgorithm::validateSignature()
-     * @throws \RuntimeException For generic errors
-     * @return bool
-     */
-    public function validateSignature(string $data, string $signature): bool
-    {
-        $key = openssl_pkey_get_public($this->_publicKey->toPEM()->string());
-        if (!$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 $result == 1;
-    }
+	/**
+	 *
+	 * @see \JWX\JWS\SignatureAlgorithm::validateSignature()
+	 * @throws \RuntimeException For generic errors
+	 * @return bool
+	 */
+	public function validateSignature(string $data, string $signature): bool
+	{
+		$key = openssl_pkey_get_public($this->_publicKey->toPEM()->string());
+		if (!$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 $result == 1;
+	}
     
-    /**
-     * Get the last OpenSSL error message.
-     *
-     * @return string|null
-     */
-    protected function _getLastOpenSSLError()
-    {
-        $msg = null;
-        while (false !== ($err = openssl_error_string())) {
-            $msg = $err;
-        }
-        return $msg;
-    }
+	/**
+	 * Get the last OpenSSL error message.
+	 *
+	 * @return string|null
+	 */
+	protected function _getLastOpenSSLError()
+	{
+		$msg = null;
+		while (false !== ($err = openssl_error_string())) {
+			$msg = $err;
+		}
+		return $msg;
+	}
 }

lib/JWX/JWS/Algorithm/HS384Algorithm.php

Indentation +16 added lines, -16 removed lines

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