@@ -32,8 +32,7 @@ |
||
32 | 32 | */ |
33 | 33 | const Key = 'k'; |
34 | 34 | |
35 | - public static $valid_algorithms_values = array |
|
36 | - ( |
|
35 | + public static $valid_algorithms_values = array( |
|
37 | 36 | JSONWebSignatureAndEncryptionAlgorithms::HS256, |
38 | 37 | JSONWebSignatureAndEncryptionAlgorithms::HS384, |
39 | 38 | JSONWebSignatureAndEncryptionAlgorithms::HS512, |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | /** |
27 | 27 | * @return \Math_BigInteger |
28 | 28 | */ |
29 | - public function toBigInt(){ |
|
29 | + public function toBigInt() { |
|
30 | 30 | $b64 = new Base64UrlRepresentation(); |
31 | 31 | $hex = bin2hex($b64->decode($this->value)); |
32 | 32 | return new \Math_BigInteger('0x'.$hex, 16); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * @param \Math_BigInteger $big_int |
37 | 37 | * @return Base64urlUInt |
38 | 38 | */ |
39 | - public static function fromBigInt(\Math_BigInteger $big_int){ |
|
39 | + public static function fromBigInt(\Math_BigInteger $big_int) { |
|
40 | 40 | $b64 = new Base64UrlRepresentation(); |
41 | 41 | $input = $big_int->toBytes(); |
42 | 42 | return new Base64urlUInt($b64->encode($input)); |
@@ -305,11 +305,11 @@ |
||
305 | 305 | } |
306 | 306 | |
307 | 307 | /** |
308 | - * @param IJOSEHeader $header |
|
309 | - * @param IJWSPayloadSpec $payload |
|
310 | - * @param string $signature |
|
311 | - * @return IJWS |
|
312 | - */ |
|
308 | + * @param IJOSEHeader $header |
|
309 | + * @param IJWSPayloadSpec $payload |
|
310 | + * @param string $signature |
|
311 | + * @return IJWS |
|
312 | + */ |
|
313 | 313 | static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null , $signature = '') |
314 | 314 | { |
315 | 315 | return new JWS($header, $payload, $signature ); |
@@ -72,14 +72,14 @@ discard block |
||
72 | 72 | |
73 | 73 | $claim_set = null; |
74 | 74 | |
75 | - if(!is_null($payload) && $payload->isClaimSet() && $payload instanceof IJWSPayloadClaimSetSpec) { |
|
75 | + if (!is_null($payload) && $payload->isClaimSet() && $payload instanceof IJWSPayloadClaimSetSpec) { |
|
76 | 76 | $header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::Type, new StringOrURI('JWT'))); |
77 | 77 | $claim_set = $payload->getClaimSet(); |
78 | 78 | } |
79 | 79 | |
80 | 80 | parent::__construct($header, $claim_set); |
81 | 81 | |
82 | - if(!is_null($payload)) |
|
82 | + if (!is_null($payload)) |
|
83 | 83 | $this->setPayload($payload); |
84 | 84 | |
85 | 85 | $this->signature = $signature; |
@@ -100,21 +100,18 @@ discard block |
||
100 | 100 | */ |
101 | 101 | public function toCompactSerialization() |
102 | 102 | { |
103 | - if(!is_null($this->jwk->getId())) |
|
103 | + if (!is_null($this->jwk->getId())) |
|
104 | 104 | $this->header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::KeyID, $this->jwk->getId())); |
105 | 105 | |
106 | - if($this->jwk instanceof IAsymmetricJWK) |
|
106 | + if ($this->jwk instanceof IAsymmetricJWK) |
|
107 | 107 | { |
108 | 108 | // we should add the public key on the header |
109 | 109 | $public_key = clone $this->jwk; |
110 | 110 | |
111 | - $this->header->addHeader |
|
112 | - ( |
|
113 | - new JOSEHeaderParam |
|
114 | - ( |
|
111 | + $this->header->addHeader( |
|
112 | + new JOSEHeaderParam( |
|
115 | 113 | RegisteredJOSEHeaderNames::JSONWebKey, |
116 | - new JsonValue |
|
117 | - ( |
|
114 | + new JsonValue( |
|
118 | 115 | $public_key->setVisibility(JSONWebKeyVisibility::PublicOnly) |
119 | 116 | ) |
120 | 117 | ) |
@@ -134,32 +131,32 @@ discard block |
||
134 | 131 | public function sign() |
135 | 132 | { |
136 | 133 | |
137 | - if(is_null($this->jwk)) |
|
134 | + if (is_null($this->jwk)) |
|
138 | 135 | throw new JWSInvalidJWKException; |
139 | 136 | |
140 | - if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) |
|
137 | + if ($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) |
|
141 | 138 | throw new JWSInvalidJWKException(sprintf('use %s not supported.', $this->jwk->getKeyUse()->getString())); |
142 | 139 | |
143 | 140 | $alg = DigitalSignatures_MACs_Registry::getInstance()->get($this->header->getAlgorithm()->getString()); |
144 | 141 | |
145 | - if(is_null($alg)) |
|
146 | - throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString())); |
|
142 | + if (is_null($alg)) |
|
143 | + throw new JWSNotSupportedAlgorithm(sprintf('alg %s.', $this->header->getAlgorithm()->getString())); |
|
147 | 144 | |
148 | - $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload(); |
|
145 | + $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header).IBasicJWT::SegmentSeparator.$this->getEncodedPayload(); |
|
149 | 146 | |
150 | - $key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::ComputeDigitalSignatureOrMAC); |
|
147 | + $key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::ComputeDigitalSignatureOrMAC); |
|
151 | 148 | |
152 | - if($alg instanceof DigitalSignatureAlgorithm) |
|
149 | + if ($alg instanceof DigitalSignatureAlgorithm) |
|
153 | 150 | { |
154 | 151 | $this->signature = $alg->sign($key, $secured_input_bytes); |
155 | 152 | } |
156 | - else if($alg instanceof MAC_Algorithm ) |
|
153 | + else if ($alg instanceof MAC_Algorithm) |
|
157 | 154 | { |
158 | 155 | $this->signature = $alg->digest($key, $secured_input_bytes); |
159 | 156 | } |
160 | 157 | else |
161 | 158 | { |
162 | - throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString())); |
|
159 | + throw new JWSNotSupportedAlgorithm(sprintf('alg %s.', $this->header->getAlgorithm()->getString())); |
|
163 | 160 | } |
164 | 161 | |
165 | 162 | return $this; |
@@ -171,16 +168,16 @@ discard block |
||
171 | 168 | */ |
172 | 169 | public function getEncodedPayload() |
173 | 170 | { |
174 | - if(is_null($this->payload)) |
|
171 | + if (is_null($this->payload)) |
|
175 | 172 | throw new JWSInvalidPayloadException('payload is not set!'); |
176 | 173 | |
177 | 174 | $enc_payload = ''; |
178 | 175 | |
179 | - if($this->payload instanceof IJWSPayloadClaimSetSpec) |
|
176 | + if ($this->payload instanceof IJWSPayloadClaimSetSpec) |
|
180 | 177 | { |
181 | 178 | $enc_payload = JWTClaimSetSerializer::serialize($this->payload->getClaimSet()); |
182 | 179 | } |
183 | - else if($this->payload instanceof IJWSPayloadRawSpec) |
|
180 | + else if ($this->payload instanceof IJWSPayloadRawSpec) |
|
184 | 181 | { |
185 | 182 | $enc_payload = JWTRawSerializer::serialize($this->payload->getRaw()); |
186 | 183 | } |
@@ -234,27 +231,23 @@ discard block |
||
234 | 231 | */ |
235 | 232 | public function verify($original_alg) |
236 | 233 | { |
237 | - if(is_null($this->jwk)) |
|
234 | + if (is_null($this->jwk)) |
|
238 | 235 | throw new JWSInvalidJWKException; |
239 | 236 | |
240 | - if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) |
|
241 | - throw new JWSInvalidJWKException |
|
242 | - ( |
|
243 | - sprintf |
|
244 | - ( |
|
237 | + if ($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) |
|
238 | + throw new JWSInvalidJWKException( |
|
239 | + sprintf( |
|
245 | 240 | 'use %s not supported ', |
246 | 241 | $this->jwk->getKeyUse()->getString() |
247 | 242 | ) |
248 | 243 | ); |
249 | 244 | |
250 | - if(is_null($this->jwk->getAlgorithm())) |
|
245 | + if (is_null($this->jwk->getAlgorithm())) |
|
251 | 246 | throw new InvalidJWKAlgorithm('algorithm intended for use with the key is not set! '); |
252 | 247 | |
253 | - if(!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue()) |
|
254 | - throw new JWSInvalidJWKException |
|
255 | - ( |
|
256 | - sprintf |
|
257 | - ( |
|
248 | + if (!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue()) |
|
249 | + throw new JWSInvalidJWKException( |
|
250 | + sprintf( |
|
258 | 251 | 'original kid %s - current kid %s', |
259 | 252 | $this->header->getKeyID()->getValue(), |
260 | 253 | $this->jwk->getId()->getValue() |
@@ -263,34 +256,30 @@ discard block |
||
263 | 256 | |
264 | 257 | $alg = DigitalSignatures_MACs_Registry::getInstance()->get($original_alg); |
265 | 258 | |
266 | - if(is_null($alg)) |
|
259 | + if (is_null($alg)) |
|
267 | 260 | throw new JWSNotSupportedAlgorithm(sprintf('algo %s', $original_alg)); |
268 | 261 | |
269 | 262 | $former_alg = $this->header->getAlgorithm()->getString(); |
270 | 263 | |
271 | - if($former_alg != $original_alg) |
|
272 | - throw new JWSNotSupportedAlgorithm |
|
273 | - ( |
|
274 | - sprintf |
|
275 | - ( |
|
264 | + if ($former_alg != $original_alg) |
|
265 | + throw new JWSNotSupportedAlgorithm( |
|
266 | + sprintf( |
|
276 | 267 | 'former alg %s - original alg %s', |
277 | 268 | $former_alg, |
278 | 269 | $original_alg |
279 | 270 | ) |
280 | 271 | ); |
281 | 272 | |
282 | - if($this->jwk->getAlgorithm()->getValue() !== $original_alg) |
|
283 | - throw new InvalidJWKAlgorithm |
|
284 | - ( |
|
285 | - sprintf |
|
286 | - ( |
|
273 | + if ($this->jwk->getAlgorithm()->getValue() !== $original_alg) |
|
274 | + throw new InvalidJWKAlgorithm( |
|
275 | + sprintf( |
|
287 | 276 | 'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to secure the JWS %s', |
288 | 277 | $this->jwk->getAlgorithm()->getValue(), |
289 | 278 | $original_alg |
290 | 279 | ) |
291 | 280 | ); |
292 | 281 | |
293 | - $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload(); |
|
282 | + $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header).IBasicJWT::SegmentSeparator.$this->getEncodedPayload(); |
|
294 | 283 | |
295 | 284 | // use public key / secret |
296 | 285 | $key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::VerifyDigitalSignatureOrMAC); |
@@ -311,9 +300,9 @@ discard block |
||
311 | 300 | * @param string $signature |
312 | 301 | * @return IJWS |
313 | 302 | */ |
314 | - static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null , $signature = '') |
|
303 | + static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null, $signature = '') |
|
315 | 304 | { |
316 | - return new JWS($header, $payload, $signature ); |
|
305 | + return new JWS($header, $payload, $signature); |
|
317 | 306 | } |
318 | 307 | |
319 | 308 | /** |
@@ -321,9 +310,8 @@ discard block |
||
321 | 310 | */ |
322 | 311 | public function take() |
323 | 312 | { |
324 | - $payload = ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw() : $this->claim_set; |
|
325 | - return array |
|
326 | - ( |
|
313 | + $payload = ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw() : $this->claim_set; |
|
314 | + return array( |
|
327 | 315 | $this->header, |
328 | 316 | $payload, |
329 | 317 | $this->signature |
@@ -79,8 +79,9 @@ discard block |
||
79 | 79 | |
80 | 80 | parent::__construct($header, $claim_set); |
81 | 81 | |
82 | - if(!is_null($payload)) |
|
83 | - $this->setPayload($payload); |
|
82 | + if(!is_null($payload)) { |
|
83 | + $this->setPayload($payload); |
|
84 | + } |
|
84 | 85 | |
85 | 86 | $this->signature = $signature; |
86 | 87 | } |
@@ -100,8 +101,9 @@ discard block |
||
100 | 101 | */ |
101 | 102 | public function toCompactSerialization() |
102 | 103 | { |
103 | - if(!is_null($this->jwk->getId())) |
|
104 | - $this->header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::KeyID, $this->jwk->getId())); |
|
104 | + if(!is_null($this->jwk->getId())) { |
|
105 | + $this->header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::KeyID, $this->jwk->getId())); |
|
106 | + } |
|
105 | 107 | |
106 | 108 | if($this->jwk instanceof IAsymmetricJWK) |
107 | 109 | { |
@@ -134,16 +136,19 @@ discard block |
||
134 | 136 | public function sign() |
135 | 137 | { |
136 | 138 | |
137 | - if(is_null($this->jwk)) |
|
138 | - throw new JWSInvalidJWKException; |
|
139 | + if(is_null($this->jwk)) { |
|
140 | + throw new JWSInvalidJWKException; |
|
141 | + } |
|
139 | 142 | |
140 | - if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) |
|
141 | - throw new JWSInvalidJWKException(sprintf('use %s not supported.', $this->jwk->getKeyUse()->getString())); |
|
143 | + if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) { |
|
144 | + throw new JWSInvalidJWKException(sprintf('use %s not supported.', $this->jwk->getKeyUse()->getString())); |
|
145 | + } |
|
142 | 146 | |
143 | 147 | $alg = DigitalSignatures_MACs_Registry::getInstance()->get($this->header->getAlgorithm()->getString()); |
144 | 148 | |
145 | - if(is_null($alg)) |
|
146 | - throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString())); |
|
149 | + if(is_null($alg)) { |
|
150 | + throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString())); |
|
151 | + } |
|
147 | 152 | |
148 | 153 | $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload(); |
149 | 154 | |
@@ -152,12 +157,10 @@ discard block |
||
152 | 157 | if($alg instanceof DigitalSignatureAlgorithm) |
153 | 158 | { |
154 | 159 | $this->signature = $alg->sign($key, $secured_input_bytes); |
155 | - } |
|
156 | - else if($alg instanceof MAC_Algorithm ) |
|
160 | + } else if($alg instanceof MAC_Algorithm ) |
|
157 | 161 | { |
158 | 162 | $this->signature = $alg->digest($key, $secured_input_bytes); |
159 | - } |
|
160 | - else |
|
163 | + } else |
|
161 | 164 | { |
162 | 165 | throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString())); |
163 | 166 | } |
@@ -171,16 +174,16 @@ discard block |
||
171 | 174 | */ |
172 | 175 | public function getEncodedPayload() |
173 | 176 | { |
174 | - if(is_null($this->payload)) |
|
175 | - throw new JWSInvalidPayloadException('payload is not set!'); |
|
177 | + if(is_null($this->payload)) { |
|
178 | + throw new JWSInvalidPayloadException('payload is not set!'); |
|
179 | + } |
|
176 | 180 | |
177 | 181 | $enc_payload = ''; |
178 | 182 | |
179 | 183 | if($this->payload instanceof IJWSPayloadClaimSetSpec) |
180 | 184 | { |
181 | 185 | $enc_payload = JWTClaimSetSerializer::serialize($this->payload->getClaimSet()); |
182 | - } |
|
183 | - else if($this->payload instanceof IJWSPayloadRawSpec) |
|
186 | + } else if($this->payload instanceof IJWSPayloadRawSpec) |
|
184 | 187 | { |
185 | 188 | $enc_payload = JWTRawSerializer::serialize($this->payload->getRaw()); |
186 | 189 | } |
@@ -234,11 +237,12 @@ discard block |
||
234 | 237 | */ |
235 | 238 | public function verify($original_alg) |
236 | 239 | { |
237 | - if(is_null($this->jwk)) |
|
238 | - throw new JWSInvalidJWKException; |
|
240 | + if(is_null($this->jwk)) { |
|
241 | + throw new JWSInvalidJWKException; |
|
242 | + } |
|
239 | 243 | |
240 | - if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) |
|
241 | - throw new JWSInvalidJWKException |
|
244 | + if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) { |
|
245 | + throw new JWSInvalidJWKException |
|
242 | 246 | ( |
243 | 247 | sprintf |
244 | 248 | ( |
@@ -246,12 +250,14 @@ discard block |
||
246 | 250 | $this->jwk->getKeyUse()->getString() |
247 | 251 | ) |
248 | 252 | ); |
253 | + } |
|
249 | 254 | |
250 | - if(is_null($this->jwk->getAlgorithm())) |
|
251 | - throw new InvalidJWKAlgorithm('algorithm intended for use with the key is not set! '); |
|
255 | + if(is_null($this->jwk->getAlgorithm())) { |
|
256 | + throw new InvalidJWKAlgorithm('algorithm intended for use with the key is not set! '); |
|
257 | + } |
|
252 | 258 | |
253 | - if(!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue()) |
|
254 | - throw new JWSInvalidJWKException |
|
259 | + if(!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue()) { |
|
260 | + throw new JWSInvalidJWKException |
|
255 | 261 | ( |
256 | 262 | sprintf |
257 | 263 | ( |
@@ -260,16 +266,18 @@ discard block |
||
260 | 266 | $this->jwk->getId()->getValue() |
261 | 267 | ) |
262 | 268 | ); |
269 | + } |
|
263 | 270 | |
264 | 271 | $alg = DigitalSignatures_MACs_Registry::getInstance()->get($original_alg); |
265 | 272 | |
266 | - if(is_null($alg)) |
|
267 | - throw new JWSNotSupportedAlgorithm(sprintf('algo %s', $original_alg)); |
|
273 | + if(is_null($alg)) { |
|
274 | + throw new JWSNotSupportedAlgorithm(sprintf('algo %s', $original_alg)); |
|
275 | + } |
|
268 | 276 | |
269 | 277 | $former_alg = $this->header->getAlgorithm()->getString(); |
270 | 278 | |
271 | - if($former_alg != $original_alg) |
|
272 | - throw new JWSNotSupportedAlgorithm |
|
279 | + if($former_alg != $original_alg) { |
|
280 | + throw new JWSNotSupportedAlgorithm |
|
273 | 281 | ( |
274 | 282 | sprintf |
275 | 283 | ( |
@@ -278,9 +286,10 @@ discard block |
||
278 | 286 | $original_alg |
279 | 287 | ) |
280 | 288 | ); |
289 | + } |
|
281 | 290 | |
282 | - if($this->jwk->getAlgorithm()->getValue() !== $original_alg) |
|
283 | - throw new InvalidJWKAlgorithm |
|
291 | + if($this->jwk->getAlgorithm()->getValue() !== $original_alg) { |
|
292 | + throw new InvalidJWKAlgorithm |
|
284 | 293 | ( |
285 | 294 | sprintf |
286 | 295 | ( |
@@ -289,6 +298,7 @@ discard block |
||
289 | 298 | $original_alg |
290 | 299 | ) |
291 | 300 | ); |
301 | + } |
|
292 | 302 | |
293 | 303 | $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload(); |
294 | 304 |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | protected function __construct(IJWEJOSEHeader $header, IJWSPayloadSpec $payload = null) |
98 | 98 | { |
99 | 99 | $this->header = $header; |
100 | - if(!is_null($payload)) |
|
100 | + if (!is_null($payload)) |
|
101 | 101 | $this->setPayload($payload); |
102 | 102 | } |
103 | 103 | |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | if (is_null($this->payload)) |
158 | 158 | $this->payload = JWSPayloadFactory::build(''); |
159 | 159 | |
160 | - return ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw():''; |
|
160 | + return ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw() : ''; |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | /** |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | * the result be the JWE Encrypted Key. |
183 | 183 | */ |
184 | 184 | $key_management_mode = $this->getKeyManagementMode($alg); |
185 | - switch($key_management_mode){ |
|
185 | + switch ($key_management_mode) { |
|
186 | 186 | case KeyManagementModeValues::KeyEncryption: |
187 | 187 | case KeyManagementModeValues::KeyWrapping: |
188 | 188 | case KeyManagementModeValues::KeyAgreementWithKeyWrapping: |
@@ -208,15 +208,15 @@ discard block |
||
208 | 208 | */ |
209 | 209 | private function getKeyManagementMode(EncryptionAlgorithm $alg) |
210 | 210 | { |
211 | - if($alg instanceof KeyEncryption) |
|
211 | + if ($alg instanceof KeyEncryption) |
|
212 | 212 | return KeyManagementModeValues::KeyEncryption; |
213 | - if($alg instanceof KeyWrapping) |
|
213 | + if ($alg instanceof KeyWrapping) |
|
214 | 214 | return KeyManagementModeValues::KeyWrapping; |
215 | - if($alg instanceof DirectKeyAgreement) |
|
215 | + if ($alg instanceof DirectKeyAgreement) |
|
216 | 216 | return KeyManagementModeValues::DirectKeyAgreement; |
217 | - if($alg instanceof KeyAgreementWithKeyWrapping) |
|
217 | + if ($alg instanceof KeyAgreementWithKeyWrapping) |
|
218 | 218 | return KeyManagementModeValues::KeyAgreementWithKeyWrapping; |
219 | - if($alg instanceof DirectEncryption) |
|
219 | + if ($alg instanceof DirectEncryption) |
|
220 | 220 | return KeyManagementModeValues::DirectEncryption; |
221 | 221 | } |
222 | 222 | |
@@ -235,11 +235,9 @@ discard block |
||
235 | 235 | if (is_null($this->jwk)) |
236 | 236 | throw new JWEInvalidRecipientKeyException; |
237 | 237 | |
238 | - if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString()) |
|
239 | - throw new InvalidJWKAlgorithm |
|
240 | - ( |
|
241 | - sprintf |
|
242 | - ( |
|
238 | + if ($this->jwk->getAlgorithm()->getValue() !== $this->header->getAlgorithm()->getString()) |
|
239 | + throw new InvalidJWKAlgorithm( |
|
240 | + sprintf( |
|
243 | 241 | 'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to encrypt or determine the value of the CEK %s', |
244 | 242 | $this->jwk->getAlgorithm()->getValue(), |
245 | 243 | $this->header->getAlgorithm()->getString() |
@@ -253,27 +251,22 @@ discard block |
||
253 | 251 | if (is_null($key_management_algorithm)) |
254 | 252 | throw new JWEUnsupportedKeyManagementAlgorithmException(sprintf('alg %s', $this->header->getAlgorithm()->getString())); |
255 | 253 | |
256 | - if($key_management_algorithm->getKeyType() !== $recipient_public_key->getAlgorithm()) |
|
257 | - throw new InvalidKeyTypeAlgorithmException |
|
258 | - ( |
|
259 | - sprintf |
|
260 | - ( |
|
254 | + if ($key_management_algorithm->getKeyType() !== $recipient_public_key->getAlgorithm()) |
|
255 | + throw new InvalidKeyTypeAlgorithmException( |
|
256 | + sprintf( |
|
261 | 257 | 'key should be for alg %s, %s instead.', |
262 | 258 | $key_management_algorithm->getKeyType(), |
263 | 259 | $recipient_public_key->getAlgorithm() |
264 | 260 | ) |
265 | 261 | ); |
266 | 262 | |
267 | - $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get |
|
268 | - ( |
|
263 | + $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get( |
|
269 | 264 | $this->header->getEncryptionAlgorithm()->getString() |
270 | 265 | ); |
271 | 266 | |
272 | 267 | if (is_null($content_encryption_algorithm)) |
273 | - throw new JWEUnsupportedContentEncryptionAlgorithmException |
|
274 | - ( |
|
275 | - sprintf |
|
276 | - ( |
|
268 | + throw new JWEUnsupportedContentEncryptionAlgorithmException( |
|
269 | + sprintf( |
|
277 | 270 | 'enc %s', |
278 | 271 | $this->header->getEncryptionAlgorithm()->getString() |
279 | 272 | ) |
@@ -281,8 +274,7 @@ discard block |
||
281 | 274 | |
282 | 275 | $key_management_mode = $this->getKeyManagementMode($key_management_algorithm); |
283 | 276 | |
284 | - $this->cek = ContentEncryptionKeyFactory::build |
|
285 | - ( |
|
277 | + $this->cek = ContentEncryptionKeyFactory::build( |
|
286 | 278 | $recipient_public_key, |
287 | 279 | $key_management_mode, |
288 | 280 | $content_encryption_algorithm |
@@ -296,7 +288,7 @@ discard block |
||
296 | 288 | * algorithm); otherwise, let the JWE Initialization Vector be the |
297 | 289 | * empty octet sequence. |
298 | 290 | */ |
299 | - $this->iv = ''; |
|
291 | + $this->iv = ''; |
|
300 | 292 | |
301 | 293 | if (!is_null($iv_size = $content_encryption_algorithm->getIVSize())) |
302 | 294 | { |
@@ -305,7 +297,7 @@ discard block |
||
305 | 297 | // We encrypt the payload and get the tag |
306 | 298 | $jwt_shared_protected_header = JOSEHeaderSerializer::serialize($this->header); |
307 | 299 | |
308 | - $payload = ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw():''; |
|
300 | + $payload = ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw() : ''; |
|
309 | 301 | $zip = $this->header->getCompressionAlgorithm(); |
310 | 302 | /** |
311 | 303 | * If a "zip" parameter was included, compress the plaintext using |
@@ -313,10 +305,10 @@ discard block |
||
313 | 305 | * sequence representing the compressed plaintext; otherwise, let M |
314 | 306 | * be the octet sequence representing the plaintext. |
315 | 307 | */ |
316 | - if(!is_null($zip)) |
|
308 | + if (!is_null($zip)) |
|
317 | 309 | { |
318 | 310 | $compression__algorithm = CompressionAlgorithms_Registry::getInstance()->get($zip->getValue()); |
319 | - $payload = $compression__algorithm->compress($payload); |
|
311 | + $payload = $compression__algorithm->compress($payload); |
|
320 | 312 | } |
321 | 313 | |
322 | 314 | /** |
@@ -326,8 +318,7 @@ discard block |
||
326 | 318 | * JWE Authentication Tag (which is the Authentication Tag output |
327 | 319 | * from the encryption operation). |
328 | 320 | */ |
329 | - list($this->cipher_text, $this->tag) = $content_encryption_algorithm->encrypt |
|
330 | - ( |
|
321 | + list($this->cipher_text, $this->tag) = $content_encryption_algorithm->encrypt( |
|
331 | 322 | $payload, |
332 | 323 | $this->cek->getEncoded(), |
333 | 324 | $this->iv, |
@@ -345,23 +336,21 @@ discard block |
||
345 | 336 | * @throws InvalidKeyTypeAlgorithmException |
346 | 337 | * @throws \Exception |
347 | 338 | */ |
348 | - private function decryptJWEEncryptedKey(EncryptionAlgorithm $alg){ |
|
339 | + private function decryptJWEEncryptedKey(EncryptionAlgorithm $alg) { |
|
349 | 340 | |
350 | 341 | $key_management_mode = $this->getKeyManagementMode($alg); |
351 | 342 | $recipient_private_key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::DecryptContentAndValidateDecryption); |
352 | 343 | |
353 | - if($alg->getKeyType() !== $recipient_private_key->getAlgorithm()) |
|
354 | - throw new InvalidKeyTypeAlgorithmException |
|
355 | - ( |
|
356 | - sprintf |
|
357 | - ( |
|
344 | + if ($alg->getKeyType() !== $recipient_private_key->getAlgorithm()) |
|
345 | + throw new InvalidKeyTypeAlgorithmException( |
|
346 | + sprintf( |
|
358 | 347 | 'key should be for alg %s, %s instead.', |
359 | 348 | $alg->getKeyType(), |
360 | 349 | $recipient_private_key->getAlgorithm() |
361 | 350 | ) |
362 | 351 | ); |
363 | 352 | |
364 | - switch($key_management_mode){ |
|
353 | + switch ($key_management_mode) { |
|
365 | 354 | /** |
366 | 355 | * When Key Wrapping, Key Encryption, or Key Agreement with Key |
367 | 356 | * Wrapping are employed, decrypt the JWE Encrypted Key to produce |
@@ -414,42 +403,34 @@ discard block |
||
414 | 403 | |
415 | 404 | if (!$this->should_decrypt) return $this; |
416 | 405 | |
417 | - if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString()) |
|
418 | - throw new InvalidJWKAlgorithm |
|
419 | - ( |
|
420 | - sprintf |
|
421 | - ( |
|
406 | + if ($this->jwk->getAlgorithm()->getValue() !== $this->header->getAlgorithm()->getString()) |
|
407 | + throw new InvalidJWKAlgorithm( |
|
408 | + sprintf( |
|
422 | 409 | 'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to encrypt or determine the value of the CEK %s', |
423 | 410 | $this->jwk->getAlgorithm()->getValue(), |
424 | 411 | $this->header->getAlgorithm()->getString() |
425 | 412 | ) |
426 | 413 | ); |
427 | 414 | |
428 | - $key_management_algorithm = KeyManagementAlgorithms_Registry::getInstance()->get |
|
429 | - ( |
|
415 | + $key_management_algorithm = KeyManagementAlgorithms_Registry::getInstance()->get( |
|
430 | 416 | $this->header->getAlgorithm()->getString() |
431 | 417 | ); |
432 | 418 | |
433 | 419 | if (is_null($key_management_algorithm)) |
434 | - throw new JWEUnsupportedKeyManagementAlgorithmException |
|
435 | - ( |
|
436 | - sprintf |
|
437 | - ( |
|
420 | + throw new JWEUnsupportedKeyManagementAlgorithmException( |
|
421 | + sprintf( |
|
438 | 422 | 'alg %s', |
439 | 423 | $this->header->getAlgorithm()->getString() |
440 | 424 | ) |
441 | 425 | ); |
442 | 426 | |
443 | - $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get |
|
444 | - ( |
|
427 | + $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get( |
|
445 | 428 | $this->header->getEncryptionAlgorithm()->getString() |
446 | 429 | ); |
447 | 430 | |
448 | 431 | if (is_null($content_encryption_algorithm)) |
449 | - throw new JWEUnsupportedContentEncryptionAlgorithmException |
|
450 | - ( |
|
451 | - sprintf |
|
452 | - ( |
|
432 | + throw new JWEUnsupportedContentEncryptionAlgorithmException( |
|
433 | + sprintf( |
|
453 | 434 | 'enc %s', |
454 | 435 | $this->header->getEncryptionAlgorithm()->getString() |
455 | 436 | ) |
@@ -470,8 +451,7 @@ discard block |
||
470 | 451 | * rejecting the input without emitting any decrypted output if the |
471 | 452 | * JWE Authentication Tag is incorrect. |
472 | 453 | */ |
473 | - $plain_text = $content_encryption_algorithm->decrypt |
|
474 | - ( |
|
454 | + $plain_text = $content_encryption_algorithm->decrypt( |
|
475 | 455 | $this->cipher_text, |
476 | 456 | $this->cek->getEncoded(), |
477 | 457 | $this->iv, |
@@ -479,12 +459,12 @@ discard block |
||
479 | 459 | $this->tag |
480 | 460 | ); |
481 | 461 | |
482 | - $zip = $this->header->getCompressionAlgorithm(); |
|
462 | + $zip = $this->header->getCompressionAlgorithm(); |
|
483 | 463 | /** |
484 | 464 | * If a "zip" parameter was included, uncompress the decrypted |
485 | 465 | * plaintext using the specified compression algorithm. |
486 | 466 | */ |
487 | - if(!is_null($zip)) |
|
467 | + if (!is_null($zip)) |
|
488 | 468 | { |
489 | 469 | $compression__algorithm = CompressionAlgorithms_Registry::getInstance()->get($zip->getValue()); |
490 | 470 | $plain_text = $compression__algorithm->uncompress($plain_text); |
@@ -97,8 +97,9 @@ discard block |
||
97 | 97 | protected function __construct(IJWEJOSEHeader $header, IJWSPayloadSpec $payload = null) |
98 | 98 | { |
99 | 99 | $this->header = $header; |
100 | - if(!is_null($payload)) |
|
101 | - $this->setPayload($payload); |
|
100 | + if(!is_null($payload)) { |
|
101 | + $this->setPayload($payload); |
|
102 | + } |
|
102 | 103 | } |
103 | 104 | |
104 | 105 | /** |
@@ -154,8 +155,9 @@ discard block |
||
154 | 155 | $this->decrypt(); |
155 | 156 | } |
156 | 157 | |
157 | - if (is_null($this->payload)) |
|
158 | - $this->payload = JWSPayloadFactory::build(''); |
|
158 | + if (is_null($this->payload)) { |
|
159 | + $this->payload = JWSPayloadFactory::build(''); |
|
160 | + } |
|
159 | 161 | |
160 | 162 | return ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw():''; |
161 | 163 | } |
@@ -208,16 +210,21 @@ discard block |
||
208 | 210 | */ |
209 | 211 | private function getKeyManagementMode(EncryptionAlgorithm $alg) |
210 | 212 | { |
211 | - if($alg instanceof KeyEncryption) |
|
212 | - return KeyManagementModeValues::KeyEncryption; |
|
213 | - if($alg instanceof KeyWrapping) |
|
214 | - return KeyManagementModeValues::KeyWrapping; |
|
215 | - if($alg instanceof DirectKeyAgreement) |
|
216 | - return KeyManagementModeValues::DirectKeyAgreement; |
|
217 | - if($alg instanceof KeyAgreementWithKeyWrapping) |
|
218 | - return KeyManagementModeValues::KeyAgreementWithKeyWrapping; |
|
219 | - if($alg instanceof DirectEncryption) |
|
220 | - return KeyManagementModeValues::DirectEncryption; |
|
213 | + if($alg instanceof KeyEncryption) { |
|
214 | + return KeyManagementModeValues::KeyEncryption; |
|
215 | + } |
|
216 | + if($alg instanceof KeyWrapping) { |
|
217 | + return KeyManagementModeValues::KeyWrapping; |
|
218 | + } |
|
219 | + if($alg instanceof DirectKeyAgreement) { |
|
220 | + return KeyManagementModeValues::DirectKeyAgreement; |
|
221 | + } |
|
222 | + if($alg instanceof KeyAgreementWithKeyWrapping) { |
|
223 | + return KeyManagementModeValues::KeyAgreementWithKeyWrapping; |
|
224 | + } |
|
225 | + if($alg instanceof DirectEncryption) { |
|
226 | + return KeyManagementModeValues::DirectEncryption; |
|
227 | + } |
|
221 | 228 | } |
222 | 229 | |
223 | 230 | /** |
@@ -232,11 +239,12 @@ discard block |
||
232 | 239 | private function encrypt() |
233 | 240 | { |
234 | 241 | |
235 | - if (is_null($this->jwk)) |
|
236 | - throw new JWEInvalidRecipientKeyException; |
|
242 | + if (is_null($this->jwk)) { |
|
243 | + throw new JWEInvalidRecipientKeyException; |
|
244 | + } |
|
237 | 245 | |
238 | - if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString()) |
|
239 | - throw new InvalidJWKAlgorithm |
|
246 | + if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString()) { |
|
247 | + throw new InvalidJWKAlgorithm |
|
240 | 248 | ( |
241 | 249 | sprintf |
242 | 250 | ( |
@@ -245,16 +253,18 @@ discard block |
||
245 | 253 | $this->header->getAlgorithm()->getString() |
246 | 254 | ) |
247 | 255 | ); |
256 | + } |
|
248 | 257 | |
249 | 258 | $recipient_public_key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::EncryptContent); |
250 | 259 | |
251 | 260 | $key_management_algorithm = KeyManagementAlgorithms_Registry::getInstance()->get($this->header->getAlgorithm()->getString()); |
252 | 261 | |
253 | - if (is_null($key_management_algorithm)) |
|
254 | - throw new JWEUnsupportedKeyManagementAlgorithmException(sprintf('alg %s', $this->header->getAlgorithm()->getString())); |
|
262 | + if (is_null($key_management_algorithm)) { |
|
263 | + throw new JWEUnsupportedKeyManagementAlgorithmException(sprintf('alg %s', $this->header->getAlgorithm()->getString())); |
|
264 | + } |
|
255 | 265 | |
256 | - if($key_management_algorithm->getKeyType() !== $recipient_public_key->getAlgorithm()) |
|
257 | - throw new InvalidKeyTypeAlgorithmException |
|
266 | + if($key_management_algorithm->getKeyType() !== $recipient_public_key->getAlgorithm()) { |
|
267 | + throw new InvalidKeyTypeAlgorithmException |
|
258 | 268 | ( |
259 | 269 | sprintf |
260 | 270 | ( |
@@ -263,14 +273,15 @@ discard block |
||
263 | 273 | $recipient_public_key->getAlgorithm() |
264 | 274 | ) |
265 | 275 | ); |
276 | + } |
|
266 | 277 | |
267 | 278 | $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get |
268 | 279 | ( |
269 | 280 | $this->header->getEncryptionAlgorithm()->getString() |
270 | 281 | ); |
271 | 282 | |
272 | - if (is_null($content_encryption_algorithm)) |
|
273 | - throw new JWEUnsupportedContentEncryptionAlgorithmException |
|
283 | + if (is_null($content_encryption_algorithm)) { |
|
284 | + throw new JWEUnsupportedContentEncryptionAlgorithmException |
|
274 | 285 | ( |
275 | 286 | sprintf |
276 | 287 | ( |
@@ -278,6 +289,7 @@ discard block |
||
278 | 289 | $this->header->getEncryptionAlgorithm()->getString() |
279 | 290 | ) |
280 | 291 | ); |
292 | + } |
|
281 | 293 | |
282 | 294 | $key_management_mode = $this->getKeyManagementMode($key_management_algorithm); |
283 | 295 | |
@@ -350,8 +362,8 @@ discard block |
||
350 | 362 | $key_management_mode = $this->getKeyManagementMode($alg); |
351 | 363 | $recipient_private_key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::DecryptContentAndValidateDecryption); |
352 | 364 | |
353 | - if($alg->getKeyType() !== $recipient_private_key->getAlgorithm()) |
|
354 | - throw new InvalidKeyTypeAlgorithmException |
|
365 | + if($alg->getKeyType() !== $recipient_private_key->getAlgorithm()) { |
|
366 | + throw new InvalidKeyTypeAlgorithmException |
|
355 | 367 | ( |
356 | 368 | sprintf |
357 | 369 | ( |
@@ -360,6 +372,7 @@ discard block |
||
360 | 372 | $recipient_private_key->getAlgorithm() |
361 | 373 | ) |
362 | 374 | ); |
375 | + } |
|
363 | 376 | |
364 | 377 | switch($key_management_mode){ |
365 | 378 | /** |
@@ -383,14 +396,16 @@ discard block |
||
383 | 396 | */ |
384 | 397 | case KeyManagementModeValues::DirectEncryption: |
385 | 398 | { |
386 | - if (!empty($this->enc_cek)) |
|
387 | - throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.'); |
|
399 | + if (!empty($this->enc_cek)) { |
|
400 | + throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.'); |
|
401 | + } |
|
388 | 402 | return $recipient_private_key; |
389 | 403 | } |
390 | 404 | case KeyManagementModeValues::DirectKeyAgreement: |
391 | 405 | { |
392 | - if (!empty($this->enc_cek)) |
|
393 | - throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.'); |
|
406 | + if (!empty($this->enc_cek)) { |
|
407 | + throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.'); |
|
408 | + } |
|
394 | 409 | throw new \Exception('unsupported Key Management Mode!'); |
395 | 410 | } |
396 | 411 | } |
@@ -409,13 +424,16 @@ discard block |
||
409 | 424 | */ |
410 | 425 | private function decrypt() |
411 | 426 | { |
412 | - if (is_null($this->jwk)) |
|
413 | - throw new JWEInvalidRecipientKeyException(); |
|
427 | + if (is_null($this->jwk)) { |
|
428 | + throw new JWEInvalidRecipientKeyException(); |
|
429 | + } |
|
414 | 430 | |
415 | - if (!$this->should_decrypt) return $this; |
|
431 | + if (!$this->should_decrypt) { |
|
432 | + return $this; |
|
433 | + } |
|
416 | 434 | |
417 | - if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString()) |
|
418 | - throw new InvalidJWKAlgorithm |
|
435 | + if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString()) { |
|
436 | + throw new InvalidJWKAlgorithm |
|
419 | 437 | ( |
420 | 438 | sprintf |
421 | 439 | ( |
@@ -424,14 +442,15 @@ discard block |
||
424 | 442 | $this->header->getAlgorithm()->getString() |
425 | 443 | ) |
426 | 444 | ); |
445 | + } |
|
427 | 446 | |
428 | 447 | $key_management_algorithm = KeyManagementAlgorithms_Registry::getInstance()->get |
429 | 448 | ( |
430 | 449 | $this->header->getAlgorithm()->getString() |
431 | 450 | ); |
432 | 451 | |
433 | - if (is_null($key_management_algorithm)) |
|
434 | - throw new JWEUnsupportedKeyManagementAlgorithmException |
|
452 | + if (is_null($key_management_algorithm)) { |
|
453 | + throw new JWEUnsupportedKeyManagementAlgorithmException |
|
435 | 454 | ( |
436 | 455 | sprintf |
437 | 456 | ( |
@@ -439,14 +458,15 @@ discard block |
||
439 | 458 | $this->header->getAlgorithm()->getString() |
440 | 459 | ) |
441 | 460 | ); |
461 | + } |
|
442 | 462 | |
443 | 463 | $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get |
444 | 464 | ( |
445 | 465 | $this->header->getEncryptionAlgorithm()->getString() |
446 | 466 | ); |
447 | 467 | |
448 | - if (is_null($content_encryption_algorithm)) |
|
449 | - throw new JWEUnsupportedContentEncryptionAlgorithmException |
|
468 | + if (is_null($content_encryption_algorithm)) { |
|
469 | + throw new JWEUnsupportedContentEncryptionAlgorithmException |
|
450 | 470 | ( |
451 | 471 | sprintf |
452 | 472 | ( |
@@ -454,6 +474,7 @@ discard block |
||
454 | 474 | $this->header->getEncryptionAlgorithm()->getString() |
455 | 475 | ) |
456 | 476 | ); |
477 | + } |
|
457 | 478 | |
458 | 479 | $this->cek = $this->decryptJWEEncryptedKey($key_management_algorithm); |
459 | 480 |
@@ -31,7 +31,7 @@ |
||
31 | 31 | /** |
32 | 32 | * @param string $compact_format |
33 | 33 | */ |
34 | - public function __construct($compact_format){ |
|
34 | + public function __construct($compact_format) { |
|
35 | 35 | $this->compact_format = $compact_format; |
36 | 36 | } |
37 | 37 |