smarcet / JOSE4PHP

src/jws/impl/JWS.php

Unused Use Statements -1 removed lines

@@ -39,7 +39,6 @@
 use jwt\utils\JOSEHeaderSerializer;
 use jwt\utils\JWTClaimSetSerializer;
 use jwt\utils\JWTRawSerializer;
-use utils\json_types\JsonArray;
 use utils\json_types\JsonValue;
 use utils\json_types\StringOrURI;
 

Braces +42 added lines, -32 removed lines

@@ -79,8 +79,9 @@ 
 
         parent::__construct($header, $claim_set);
 
-        if(!is_null($payload))
-            $this->setPayload($payload);
+        if(!is_null($payload)) {
+                    $this->setPayload($payload);
+        }
 
         $this->signature = $signature;
     }
@@ -100,8 +101,9 @@ 
      */
     public function toCompactSerialization()
     {
-        if(!is_null($this->jwk->getId()))
-            $this->header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::KeyID, $this->jwk->getId()));
+        if(!is_null($this->jwk->getId())) {
+                    $this->header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::KeyID, $this->jwk->getId()));
+        }
 
         if($this->jwk instanceof IAsymmetricJWK)
         {
@@ -134,16 +136,19 @@ 
     public function sign()
     {
 
-        if(is_null($this->jwk))
-            throw new JWSInvalidJWKException;
+        if(is_null($this->jwk)) {
+                    throw new JWSInvalidJWKException;
+        }
 
-        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
-            throw new JWSInvalidJWKException(sprintf('use %s not supported.', $this->jwk->getKeyUse()->getString()));
+        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) {
+                    throw new JWSInvalidJWKException(sprintf('use %s not supported.', $this->jwk->getKeyUse()->getString()));
+        }
 
         $alg = DigitalSignatures_MACs_Registry::getInstance()->get($this->header->getAlgorithm()->getString());
 
-        if(is_null($alg))
-            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
+        if(is_null($alg)) {
+                    throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
+        }
 
         $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();
 
@@ -152,12 +157,10 @@ 
         if($alg instanceof DigitalSignatureAlgorithm)
         {
             $this->signature = $alg->sign($key, $secured_input_bytes);
-        }
-        else if($alg instanceof MAC_Algorithm )
+        } else if($alg instanceof MAC_Algorithm )
         {
             $this->signature = $alg->digest($key, $secured_input_bytes);
-        }
-        else
+        } else
         {
             throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
         }
@@ -171,15 +174,15 @@ 
      */
     public function getEncodedPayload()
     {
-        if(is_null($this->payload))
-            throw new JWSInvalidPayloadException('payload is not set!');
+        if(is_null($this->payload)) {
+                    throw new JWSInvalidPayloadException('payload is not set!');
+        }
 
         $enc_payload = '';
         if($this->payload->isClaimSet() && $this->payload instanceof IJWSPayloadClaimSetSpec)
         {
             $enc_payload = JWTClaimSetSerializer::serialize($this->payload->getClaimSet());
-        }
-        else
+        } else
         {
             $enc_payload = JWTRawSerializer::serialize($this->payload->getRaw());
         }
@@ -233,11 +236,12 @@ 
      */
     public function verify($original_alg)
     {
-        if(is_null($this->jwk))
-            throw new JWSInvalidJWKException;
+        if(is_null($this->jwk)) {
+                    throw new JWSInvalidJWKException;
+        }
 
-        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
-            throw new JWSInvalidJWKException
+        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) {
+                    throw new JWSInvalidJWKException
             (
                 sprintf
                 (
@@ -245,12 +249,14 @@ 
                     $this->jwk->getKeyUse()->getString()
                 )
             );
+        }
 
-        if(is_null($this->jwk->getAlgorithm()))
-            throw new InvalidJWKAlgorithm('algorithm intended for use with the key is not set! ');
+        if(is_null($this->jwk->getAlgorithm())) {
+                    throw new InvalidJWKAlgorithm('algorithm intended for use with the key is not set! ');
+        }
 
-        if(!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue())
-            throw new JWSInvalidJWKException
+        if(!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue()) {
+                    throw new JWSInvalidJWKException
             (
                 sprintf
                 (
@@ -259,16 +265,18 @@ 
                     $this->jwk->getId()->getValue()
                 )
             );
+        }
 
         $alg = DigitalSignatures_MACs_Registry::getInstance()->get($original_alg);
 
-        if(is_null($alg))
-            throw new JWSNotSupportedAlgorithm(sprintf('algo %s', $original_alg));
+        if(is_null($alg)) {
+                    throw new JWSNotSupportedAlgorithm(sprintf('algo %s', $original_alg));
+        }
 
         $former_alg = $this->header->getAlgorithm()->getString();
 
-        if($former_alg != $original_alg)
-            throw new JWSNotSupportedAlgorithm
+        if($former_alg != $original_alg) {
+                    throw new JWSNotSupportedAlgorithm
             (
                 sprintf
                 (
@@ -277,9 +285,10 @@ 
                     $original_alg
                 )
             );
+        }
 
-        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg)
-            throw new InvalidJWKAlgorithm
+        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -288,6 +297,7 @@ 
                     $original_alg
                 )
             );
+        }
 
         $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();
 

src/jwa/cryptographic_algorithms/macs/HSMAC_Algorithm.php

Braces +6 added lines, -3 removed lines

@@ -37,8 +37,9 @@ 
      */
     public function digest(SharedKey $key, $message){
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if($this->getMinKeyLen() > $key->getBitLength()) {
+                    throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        }
 
         return hash_hmac($this->getHashingAlgorithm(), $message, $key->getSecret(), true);
     }
@@ -52,7 +53,9 @@ 
      * @throws InvalidKeyTypeAlgorithmException
      */
     public function verify(Key $key, $message, $digest){
-        if(!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException;
+        if(!($key instanceof SharedKey)) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
         return $digest === $this->digest($key, $message);
     }

src/jwa/cryptographic_algorithms/ContentEncryptionAlgorithms_Registry.php

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
      * @return null|ContentEncryptionAlgorithm
      */
     public function get($alg) {
-        if (!$this->isSupported($alg)) return null;
+        if (!$this->isSupported($alg)) {
+         return null;
+        }
         return $this->algorithms[$alg];
     }
 }
\ No newline at end of file

src/jwa/cryptographic_algorithms/digital_signatures/rsa/RSA_Algorithm.php

Braces +18 added lines, -8 removed lines

@@ -45,14 +45,19 @@ 
      */
     public function sign(PrivateKey $private_key, $message)
     {
-        if(!($private_key instanceof RSAPrivateKey)) throw new InvalidKeyTypeAlgorithmException;
+        if(!($private_key instanceof RSAPrivateKey)) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
-        if($this->getMinKeyLen() > $private_key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $private_key->getBitLength()));
+        if($this->getMinKeyLen() > $private_key->getBitLength()) {
+                    throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $private_key->getBitLength()));
+        }
 
         $res = $this->rsa_impl->loadKey($private_key->getEncoded());
 
-        if(!$res) throw new InvalidKeyTypeAlgorithmException;
+        if(!$res) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
         $this->rsa_impl->setHash($this->getHashingAlgorithm());
         $this->rsa_impl->setMGFHash($this->getHashingAlgorithm());
@@ -70,14 +75,19 @@ 
      */
     public function verify(Key $key, $message, $signature)
     {
-        if(!($key instanceof RSAPublicKey)) throw new InvalidKeyTypeAlgorithmException;
+        if(!($key instanceof RSAPublicKey)) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if($this->getMinKeyLen() > $key->getBitLength()) {
+                    throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        }
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res) throw new InvalidKeyTypeAlgorithmException;
+        if(!$res) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
         $this->rsa_impl->setHash($this->getHashingAlgorithm());
         $this->rsa_impl->setMGFHash($this->getHashingAlgorithm());

src/jwa/cryptographic_algorithms/key_management/rsa/RSA_KeyManagementAlgorithm.php

Braces +24 added lines, -16 removed lines

@@ -47,19 +47,23 @@ 
      */
     public function encrypt(Key $key, $message)
     {
-        if(!($key instanceof RSAPublicKey))
-            throw new InvalidKeyTypeAlgorithmException('key is not public');
+        if(!($key instanceof RSAPublicKey)) {
+                    throw new InvalidKeyTypeAlgorithmException('key is not public');
+        }
 
-        if($key->getFormat() !== 'PKCS8')
-            throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        if($key->getFormat() !== 'PKCS8') {
+                    throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        }
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
-            throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        if(!$res) {
+                    throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        }
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
-            throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        if($this->rsa_impl->getSize() < $this->getMinKeyLen()) {
+                    throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        }
 
         return $this->rsa_impl->encrypt($message);
     }
@@ -72,20 +76,24 @@ 
      */
     public function decrypt(Key $key, $enc_message){
 
-        if(!($key instanceof RSAPrivateKey))
-            throw new InvalidKeyTypeAlgorithmException('key is not private');
+        if(!($key instanceof RSAPrivateKey)) {
+                    throw new InvalidKeyTypeAlgorithmException('key is not private');
+        }
 
 
-        if($key->getFormat() !== 'PKCS1')
-            throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        if($key->getFormat() !== 'PKCS1') {
+                    throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        }
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
-            throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        if(!$res) {
+                    throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        }
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
-            throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        if($this->rsa_impl->getSize() < $this->getMinKeyLen()) {
+                    throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        }
 
         return $this->rsa_impl->decrypt($enc_message);
     }

src/jwa/cryptographic_algorithms/content_encryption/AES_CBC_HS/AES_CBC_HMAC_SHA2_Algorithm.php

Braces +6 added lines, -4 removed lines

@@ -60,8 +60,9 @@ 
     {
         $key_len = strlen($key);
 
-        if($this->getMinKeyLen() > ByteUtil::bitLength($key_len))
-            throw new InvalidKeyLengthAlgorithmException;
+        if($this->getMinKeyLen() > ByteUtil::bitLength($key_len)) {
+                    throw new InvalidKeyLengthAlgorithmException;
+        }
 
         $enc_key_len = $key_len / 2;
         // ENC_KEY = final ENC_KEY_LEN octets of K
@@ -133,8 +134,9 @@ 
      */
     public function decrypt($cypher_text, $key, $iv, $aad, $tag)
     {
-        if(!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag))
-            throw new InvalidAuthenticationTagException;
+        if(!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag)) {
+                    throw new InvalidAuthenticationTagException;
+        }
 
         $enc_key_len = strlen($key) / 2;
         // ENC_KEY = final ENC_KEY_LEN octets of K

src/jwt/impl/JWT.php

Braces +6 added lines, -2 removed lines

@@ -108,9 +108,13 @@
     {
         $now = new \DateTime();
         $exp = $this->getClaimSet()->getExpirationTime()->getDateTime();
-        if($exp < $now) return true;
+        if($exp < $now) {
+         return true;
+        }
         $iat = $this->getClaimSet()->getIssuedAt()->getDateTime();
-        if($iat > $now) return true;
+        if($iat > $now) {
+         return true;
+        }
         $diff = $now->getTimestamp() - $iat->getTimestamp();
         return $diff > $tolerance;
     }

src/jwt/impl/JWTSerializer.php

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
 
         $e_parts = explode(IBasicJWT::SegmentSeparator, $input);
 
-        if(count($e_parts) < 2)
-            throw new InvalidJWTException(sprintf('%s has only 2 or less encoded parts!'));
+        if(count($e_parts) < 2) {
+                    throw new InvalidJWTException(sprintf('%s has only 2 or less encoded parts!'));
+        }
         $e_header    = $e_parts[0];
         $e_payload   = $e_parts[1];
         $e_signature = count($e_parts)>2 ? $e_parts[2] : '';

src/jwt/impl/JWTClaimSet.php

Braces +3 added lines, -2 removed lines

@@ -123,8 +123,9 @@
      */
     public function addClaim(JWTClaim $claim)
     {
-        if (isset($this->set[$claim->getName()]))
-            throw new ClaimAlreadyExistsException($claim->getName());
+        if (isset($this->set[$claim->getName()])) {
+                    throw new ClaimAlreadyExistsException($claim->getName());
+        }
 
         $this->set[$claim->getName()] = $claim->getValue();
     }