smarcet / JOSE4PHP

src/jwe/impl/JWE.php

Braces +60 added lines, -39 removed lines

@@ -97,8 +97,9 @@ 
     protected function __construct(IJWEJOSEHeader $header, IJWSPayloadSpec $payload = null)
     {
         $this->header = $header;
-        if(!is_null($payload))
-            $this->setPayload($payload);
+        if(!is_null($payload)) {
+                    $this->setPayload($payload);
+        }
     }
 
     /**
@@ -154,8 +155,9 @@ 
             $this->decrypt();
         }
 
-        if (is_null($this->payload))
-            $this->payload = JWSPayloadFactory::build('');
+        if (is_null($this->payload)) {
+                    $this->payload = JWSPayloadFactory::build('');
+        }
 
         return ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw():'';
     }
@@ -208,16 +210,21 @@ 
      */
     private function getKeyManagementMode(EncryptionAlgorithm $alg)
     {
-        if($alg instanceof KeyEncryption)
-            return KeyManagementModeValues::KeyEncryption;
-        if($alg instanceof KeyWrapping)
-            return KeyManagementModeValues::KeyWrapping;
-        if($alg instanceof DirectKeyAgreement)
-            return KeyManagementModeValues::DirectKeyAgreement;
-        if($alg instanceof KeyAgreementWithKeyWrapping)
-            return KeyManagementModeValues::KeyAgreementWithKeyWrapping;
-        if($alg instanceof DirectEncryption)
-            return KeyManagementModeValues::DirectEncryption;
+        if($alg instanceof KeyEncryption) {
+                    return KeyManagementModeValues::KeyEncryption;
+        }
+        if($alg instanceof KeyWrapping) {
+                    return KeyManagementModeValues::KeyWrapping;
+        }
+        if($alg instanceof DirectKeyAgreement) {
+                    return KeyManagementModeValues::DirectKeyAgreement;
+        }
+        if($alg instanceof KeyAgreementWithKeyWrapping) {
+                    return KeyManagementModeValues::KeyAgreementWithKeyWrapping;
+        }
+        if($alg instanceof DirectEncryption) {
+                    return KeyManagementModeValues::DirectEncryption;
+        }
     }
 
     /**
@@ -232,11 +239,12 @@ 
     private function encrypt()
     {
 
-        if (is_null($this->jwk))
-            throw new JWEInvalidRecipientKeyException;
+        if (is_null($this->jwk)) {
+                    throw new JWEInvalidRecipientKeyException;
+        }
 
-        if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString())
-            throw new InvalidJWKAlgorithm
+        if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString()) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -245,16 +253,18 @@ 
                     $this->header->getAlgorithm()->getString()
                 )
             );
+        }
 
         $recipient_public_key     = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::EncryptContent);
 
         $key_management_algorithm = KeyManagementAlgorithms_Registry::getInstance()->get($this->header->getAlgorithm()->getString());
 
-        if (is_null($key_management_algorithm))
-            throw new JWEUnsupportedKeyManagementAlgorithmException(sprintf('alg %s', $this->header->getAlgorithm()->getString()));
+        if (is_null($key_management_algorithm)) {
+                    throw new JWEUnsupportedKeyManagementAlgorithmException(sprintf('alg %s', $this->header->getAlgorithm()->getString()));
+        }
 
-        if($key_management_algorithm->getKeyType() !== $recipient_public_key->getAlgorithm())
-            throw new InvalidKeyTypeAlgorithmException
+        if($key_management_algorithm->getKeyType() !== $recipient_public_key->getAlgorithm()) {
+                    throw new InvalidKeyTypeAlgorithmException
             (
                 sprintf
                 (
@@ -263,14 +273,15 @@ 
                     $recipient_public_key->getAlgorithm()
                 )
             );
+        }
 
         $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get
         (
             $this->header->getEncryptionAlgorithm()->getString()
         );
 
-        if (is_null($content_encryption_algorithm))
-            throw new JWEUnsupportedContentEncryptionAlgorithmException
+        if (is_null($content_encryption_algorithm)) {
+                    throw new JWEUnsupportedContentEncryptionAlgorithmException
             (
                 sprintf
                 (
@@ -278,6 +289,7 @@ 
                     $this->header->getEncryptionAlgorithm()->getString()
                 )
             );
+        }
 
         $key_management_mode = $this->getKeyManagementMode($key_management_algorithm);
 
@@ -350,8 +362,8 @@ 
         $key_management_mode   = $this->getKeyManagementMode($alg);
         $recipient_private_key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::DecryptContentAndValidateDecryption);
 
-        if($alg->getKeyType() !== $recipient_private_key->getAlgorithm())
-            throw new InvalidKeyTypeAlgorithmException
+        if($alg->getKeyType() !== $recipient_private_key->getAlgorithm()) {
+                    throw new InvalidKeyTypeAlgorithmException
             (
                 sprintf
                 (
@@ -360,6 +372,7 @@ 
                     $recipient_private_key->getAlgorithm()
                 )
             );
+        }
 
         switch($key_management_mode){
             /**
@@ -383,14 +396,16 @@ 
              */
             case KeyManagementModeValues::DirectEncryption:
             {
-                if (!empty($this->enc_cek))
-                    throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.');
+                if (!empty($this->enc_cek)) {
+                                    throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.');
+                }
                 return $recipient_private_key;
             }
             case KeyManagementModeValues::DirectKeyAgreement:
             {
-                if (!empty($this->enc_cek))
-                    throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.');
+                if (!empty($this->enc_cek)) {
+                                    throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.');
+                }
                 throw new \Exception('unsupported Key Management Mode!');
             }
         }
@@ -409,13 +424,16 @@ 
      */
     private function decrypt()
     {
-        if (is_null($this->jwk))
-            throw new JWEInvalidRecipientKeyException();
+        if (is_null($this->jwk)) {
+                    throw new JWEInvalidRecipientKeyException();
+        }
 
-        if (!$this->should_decrypt) return $this;
+        if (!$this->should_decrypt) {
+         return $this;
+        }
 
-        if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString())
-            throw new InvalidJWKAlgorithm
+        if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString()) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -424,14 +442,15 @@ 
                     $this->header->getAlgorithm()->getString()
                 )
             );
+        }
 
         $key_management_algorithm = KeyManagementAlgorithms_Registry::getInstance()->get
         (
             $this->header->getAlgorithm()->getString()
         );
 
-        if (is_null($key_management_algorithm))
-            throw new JWEUnsupportedKeyManagementAlgorithmException
+        if (is_null($key_management_algorithm)) {
+                    throw new JWEUnsupportedKeyManagementAlgorithmException
             (
                 sprintf
                 (
@@ -439,14 +458,15 @@ 
                     $this->header->getAlgorithm()->getString()
                 )
             );
+        }
 
         $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get
         (
             $this->header->getEncryptionAlgorithm()->getString()
         );
 
-        if (is_null($content_encryption_algorithm))
-            throw new JWEUnsupportedContentEncryptionAlgorithmException
+        if (is_null($content_encryption_algorithm)) {
+                    throw new JWEUnsupportedContentEncryptionAlgorithmException
             (
                 sprintf
                 (
@@ -454,6 +474,7 @@ 
                     $this->header->getEncryptionAlgorithm()->getString()
                 )
             );
+        }
 
         $this->cek = $this->decryptJWEEncryptedKey($key_management_algorithm);
 

src/jws/impl/JWS.php

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,16 +174,16 @@ 
      */
     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 instanceof IJWSPayloadClaimSetSpec)
         {
             $enc_payload = JWTClaimSetSerializer::serialize($this->payload->getClaimSet());
-        }
-        else if($this->payload instanceof IJWSPayloadRawSpec)
+        } else if($this->payload instanceof IJWSPayloadRawSpec)
         {
             $enc_payload = JWTRawSerializer::serialize($this->payload->getRaw());
         }
@@ -234,11 +237,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
                 (
@@ -246,12 +250,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
                 (
@@ -260,16 +266,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
                 (
@@ -278,9 +286,10 @@ 
                     $original_alg
                 )
             );
+        }
 
-        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg)
-            throw new InvalidJWKAlgorithm
+        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -289,6 +298,7 @@ 
                     $original_alg
                 )
             );
+        }
 
         $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();