From 271c05878a2943d40e15a5f5c69f2528d01cf74b Mon Sep 17 00:00:00 2001 From: Florent Morselli Date: Mon, 8 Feb 2016 17:02:16 -0500 Subject: [PATCH] Applied fixes from StyleCI --- src/ClaimChecker/ClaimCheckerInterface.php | 2 +- src/ClaimChecker/ClaimCheckerManager.php | 2 +- .../ClaimCheckerManagerInterface.php | 2 +- src/Decrypter.php | 1 - src/Encrypter.php | 1 - src/Factory/DecrypterFactory.php | 4 +-- src/Factory/VerifierFactory.php | 2 +- src/Verifier.php | 3 +- tests/RFC7520/ECDSASignatureTest.php | 6 ++-- tests/RFC7520/HMACSignatureTest.php | 32 +++++++++---------- tests/RFC7520/MultipleSignaturesTest.php | 30 ++++++++--------- tests/RFC7520/RSA15SignatureTest.php | 30 ++++++++--------- tests/RFC7520/RSAPSSSignatureTest.php | 26 +++++++-------- tests/Stub/ClaimCheckerManager.php | 11 ++++++- tests/Stub/IssuerChecker.php | 9 ++++++ tests/Stub/SubjectChecker.php | 9 ++++++ 16 files changed, 97 insertions(+), 73 deletions(-) diff --git a/src/ClaimChecker/ClaimCheckerInterface.php b/src/ClaimChecker/ClaimCheckerInterface.php index 400c130d..618a83cc 100644 --- a/src/ClaimChecker/ClaimCheckerInterface.php +++ b/src/ClaimChecker/ClaimCheckerInterface.php @@ -14,7 +14,7 @@ use Jose\Object\JWTInterface; /** - * Interface ClaimCheckerInterface + * Interface ClaimCheckerInterface. */ interface ClaimCheckerInterface { diff --git a/src/ClaimChecker/ClaimCheckerManager.php b/src/ClaimChecker/ClaimCheckerManager.php index 8b9dcfdc..42101b80 100644 --- a/src/ClaimChecker/ClaimCheckerManager.php +++ b/src/ClaimChecker/ClaimCheckerManager.php @@ -14,7 +14,7 @@ use Jose\Object\JWTInterface; /** - * Class ClaimCheckerManager + * Class ClaimCheckerManager. */ class ClaimCheckerManager implements ClaimCheckerManagerInterface { diff --git a/src/ClaimChecker/ClaimCheckerManagerInterface.php b/src/ClaimChecker/ClaimCheckerManagerInterface.php index 8adc6f63..b56bfbd2 100644 --- a/src/ClaimChecker/ClaimCheckerManagerInterface.php +++ b/src/ClaimChecker/ClaimCheckerManagerInterface.php @@ -14,7 +14,7 @@ use Jose\Object\JWTInterface; /** - * Interface ClaimCheckerManagerInterface + * Interface ClaimCheckerManagerInterface. */ interface ClaimCheckerManagerInterface { diff --git a/src/Decrypter.php b/src/Decrypter.php index 37bf54f0..d3f9c7ea 100644 --- a/src/Decrypter.php +++ b/src/Decrypter.php @@ -93,7 +93,6 @@ public function decryptUsingKeySet(JWEInterface &$jwe, JWKSetInterface $jwk_set) $cek = $this->decryptCEK($key_encryption_algorithm, $content_encryption_algorithm, $jwk, $recipient, $complete_headers); if (null !== $cek) { if (true === $this->decryptPayload($jwe, $cek, $content_encryption_algorithm, $complete_headers)) { - return $i; }; } diff --git a/src/Encrypter.php b/src/Encrypter.php index 21864e0d..088ad346 100644 --- a/src/Encrypter.php +++ b/src/Encrypter.php @@ -117,7 +117,6 @@ private function encryptJWE(JWEInterface &$jwe, JWKInterface $recipient_key, JWKInterface $sender_key = null ) { - if (!empty($jwe->getSharedProtectedHeaders())) { $jwe = $jwe->withEncodedSharedProtectedHeaders(Base64Url::encode(json_encode($jwe->getSharedProtectedHeaders()))); } diff --git a/src/Factory/DecrypterFactory.php b/src/Factory/DecrypterFactory.php index c5cc369d..290b99fe 100644 --- a/src/Factory/DecrypterFactory.php +++ b/src/Factory/DecrypterFactory.php @@ -16,8 +16,8 @@ final class DecrypterFactory { /** - * @param string[] $algorithms - * @param string[] $compression_methods + * @param string[] $algorithms + * @param string[] $compression_methods * * @return \Jose\DecrypterInterface */ diff --git a/src/Factory/VerifierFactory.php b/src/Factory/VerifierFactory.php index 9569dcd0..28823ace 100644 --- a/src/Factory/VerifierFactory.php +++ b/src/Factory/VerifierFactory.php @@ -16,7 +16,7 @@ final class VerifierFactory { /** - * @param string[] $algorithms + * @param string[] $algorithms * * @return \Jose\VerifierInterface */ diff --git a/src/Verifier.php b/src/Verifier.php index f3a38a7a..0b255701 100644 --- a/src/Verifier.php +++ b/src/Verifier.php @@ -31,7 +31,7 @@ final class Verifier implements VerifierInterface /** * Loader constructor. * - * @param \Jose\Algorithm\JWAManagerInterface $jwa_manager + * @param \Jose\Algorithm\JWAManagerInterface $jwa_manager */ public function __construct(JWAManagerInterface $jwa_manager) { @@ -74,7 +74,6 @@ public function verifyWithKeySet(JWSInterface $jws, JWKSetInterface $jwk_set, $d $this->checkKeyUsage($jwk, 'verification'); $this->checkKeyAlgorithm($jwk, $algorithm->getAlgorithmName()); if (true === $algorithm->verify($jwk, $input, $signature->getSignature())) { - return $i; } } catch (\Exception $e) { diff --git a/tests/RFC7520/ECDSASignatureTest.php b/tests/RFC7520/ECDSASignatureTest.php index 85df41f8..d651e99c 100644 --- a/tests/RFC7520/ECDSASignatureTest.php +++ b/tests/RFC7520/ECDSASignatureTest.php @@ -46,7 +46,7 @@ public function testES512() 'crv' => 'P-521', 'x' => 'AHKZLLOsCOzz5cY97ewNUajB957y-C-U88c3v13nmGZx6sYl_oJXu9A5RkTKqjqvjyekWF-7ytDyRXYgCF5cj0Kt', 'y' => 'AdymlHvOiLxXkEhayXQnNCvDX4h9htZaCJN34kfmC6pV5OhQHiraVySsUdaQkAgDPrwQrJmbnX9cwlGfP-HqHZR1', - "d" => "AAhRON2r9cqXX1hg-RoI6R1tX5p2rUAYdmpHZoC1XNM56KtscrX6zbKipQrCW9CGZH3T4ubpnoTKLDYJ_fF3_rJt", + 'd' => 'AAhRON2r9cqXX1hg-RoI6R1tX5p2rUAYdmpHZoC1XNM56KtscrX6zbKipQrCW9CGZH3T4ubpnoTKLDYJ_fF3_rJt', ]); /* @@ -54,8 +54,8 @@ public function testES512() * @see https://tools.ietf.org/html/rfc7520#section-4.3.2 */ $headers = [ - "alg" => "ES512", - "kid" => "bilbo.baggins@hobbiton.example" + 'alg' => 'ES512', + 'kid' => 'bilbo.baggins@hobbiton.example', ]; $jws = JWSFactory::createJWS($payload); diff --git a/tests/RFC7520/HMACSignatureTest.php b/tests/RFC7520/HMACSignatureTest.php index f1de88c9..f0f2d65c 100644 --- a/tests/RFC7520/HMACSignatureTest.php +++ b/tests/RFC7520/HMACSignatureTest.php @@ -53,8 +53,8 @@ public function testHS256() * @see https://tools.ietf.org/html/rfc7520#section-4.4.2 */ $headers = [ - "alg" => "HS256", - "kid" => "018c0ae5-4d9b-471b-bfd6-eef314bc7037" + 'alg' => 'HS256', + 'kid' => '018c0ae5-4d9b-471b-bfd6-eef314bc7037', ]; $jws = JWSFactory::createJWS($payload); @@ -74,8 +74,8 @@ public function testHS256() $this->assertEquals($expected_compact_json, $jws->toCompactJSON(0)); // We decode the json to compare the 2 arrays otherwise the test may fail as the order may be different - $this->assertEquals(json_decode($expected_flattened_json,true), json_decode($jws->toFlattenedJSON(0),true)); - $this->assertEquals(json_decode($expected_json,true), json_decode($jws->toJSON(),true)); + $this->assertEquals(json_decode($expected_flattened_json, true), json_decode($jws->toFlattenedJSON(0), true)); + $this->assertEquals(json_decode($expected_json, true), json_decode($jws->toJSON(), true)); $loaded_compact_json = Loader::load($expected_compact_json); $this->assertEquals(0, $verifer->verifyWithKey($loaded_compact_json, $key)); @@ -112,8 +112,8 @@ public function testHS256WithDetachedPayload() * @see https://tools.ietf.org/html/rfc7520#section-4.5.2 */ $headers = [ - "alg" => "HS256", - "kid" => "018c0ae5-4d9b-471b-bfd6-eef314bc7037" + 'alg' => 'HS256', + 'kid' => '018c0ae5-4d9b-471b-bfd6-eef314bc7037', ]; $jws = JWSFactory::createJWSWithDetachedPayload($payload, $encoded_payload); @@ -133,9 +133,9 @@ public function testHS256WithDetachedPayload() $this->assertEquals($expected_compact_json, $jws->toCompactJSON(0)); // We decode the json to compare the 2 arrays otherwise the test may fail as the order may be different - $this->assertEquals(json_decode($expected_flattened_json,true), json_decode($jws->toFlattenedJSON(0),true)); + $this->assertEquals(json_decode($expected_flattened_json, true), json_decode($jws->toFlattenedJSON(0), true)); - $this->assertEquals(json_decode($expected_json,true), json_decode($jws->toJSON(),true)); + $this->assertEquals(json_decode($expected_json, true), json_decode($jws->toJSON(), true)); $loaded_compact_json = Loader::load($expected_compact_json); $this->assertEquals(0, $verifer->verifyWithKey($loaded_compact_json, $key, $encoded_payload)); @@ -172,10 +172,10 @@ public function testHS256WithUnprotectedHeaders() * @see https://tools.ietf.org/html/rfc7520#section-4.6.2 */ $protected_headers = [ - "alg" => "HS256", + 'alg' => 'HS256', ]; $unprotected_headers = [ - "kid" => "018c0ae5-4d9b-471b-bfd6-eef314bc7037", + 'kid' => '018c0ae5-4d9b-471b-bfd6-eef314bc7037', ]; $jws = JWSFactory::createJWS($payload); @@ -192,8 +192,8 @@ public function testHS256WithUnprotectedHeaders() $expected_json = '{"payload":"SXTigJlzIGEgZGFuZ2Vyb3VzIGJ1c2luZXNzLCBGcm9kbywgZ29pbmcgb3V0IHlvdXIgZG9vci4gWW91IHN0ZXAgb250byB0aGUgcm9hZCwgYW5kIGlmIHlvdSBkb24ndCBrZWVwIHlvdXIgZmVldCwgdGhlcmXigJlzIG5vIGtub3dpbmcgd2hlcmUgeW91IG1pZ2h0IGJlIHN3ZXB0IG9mZiB0by4","signatures":[{"protected":"eyJhbGciOiJIUzI1NiJ9","header":{"kid":"018c0ae5-4d9b-471b-bfd6-eef314bc7037"},"signature":"bWUSVaxorn7bEF1djytBd0kHv70Ly5pvbomzMWSOr20"}]}'; // We decode the json to compare the 2 arrays otherwise the test may fail as the order may be different - $this->assertEquals(json_decode($expected_flattened_json,true), json_decode($jws->toFlattenedJSON(0),true)); - $this->assertEquals(json_decode($expected_json,true), json_decode($jws->toJSON(),true)); + $this->assertEquals(json_decode($expected_flattened_json, true), json_decode($jws->toFlattenedJSON(0), true)); + $this->assertEquals(json_decode($expected_json, true), json_decode($jws->toJSON(), true)); $loaded_flattened_json = Loader::load($expected_flattened_json); $this->assertEquals(0, $verifer->verifyWithKey($loaded_flattened_json, $key)); @@ -227,8 +227,8 @@ public function testHS256WithoutProtectedHeaders() * @see https://tools.ietf.org/html/rfc7520#section-4.7.2 */ $unprotected_headers = [ - "alg" => "HS256", - "kid" => "018c0ae5-4d9b-471b-bfd6-eef314bc7037", + 'alg' => 'HS256', + 'kid' => '018c0ae5-4d9b-471b-bfd6-eef314bc7037', ]; $jws = JWSFactory::createJWS($payload); @@ -245,8 +245,8 @@ public function testHS256WithoutProtectedHeaders() $expected_json = '{"payload":"SXTigJlzIGEgZGFuZ2Vyb3VzIGJ1c2luZXNzLCBGcm9kbywgZ29pbmcgb3V0IHlvdXIgZG9vci4gWW91IHN0ZXAgb250byB0aGUgcm9hZCwgYW5kIGlmIHlvdSBkb24ndCBrZWVwIHlvdXIgZmVldCwgdGhlcmXigJlzIG5vIGtub3dpbmcgd2hlcmUgeW91IG1pZ2h0IGJlIHN3ZXB0IG9mZiB0by4","signatures":[{"header":{"alg":"HS256","kid":"018c0ae5-4d9b-471b-bfd6-eef314bc7037"},"signature":"xuLifqLGiblpv9zBpuZczWhNj1gARaLV3UxvxhJxZuk"}]}'; // We decode the json to compare the 2 arrays otherwise the test may fail as the order may be different - $this->assertEquals(json_decode($expected_flattened_json,true), json_decode($jws->toFlattenedJSON(0),true)); - $this->assertEquals(json_decode($expected_json,true), json_decode($jws->toJSON(),true)); + $this->assertEquals(json_decode($expected_flattened_json, true), json_decode($jws->toFlattenedJSON(0), true)); + $this->assertEquals(json_decode($expected_json, true), json_decode($jws->toJSON(), true)); $loaded_flattened_json = Loader::load($expected_flattened_json); $this->assertEquals(0, $verifer->verifyWithKey($loaded_flattened_json, $key)); diff --git a/tests/RFC7520/MultipleSignaturesTest.php b/tests/RFC7520/MultipleSignaturesTest.php index 1288f78c..5fc2a413 100644 --- a/tests/RFC7520/MultipleSignaturesTest.php +++ b/tests/RFC7520/MultipleSignaturesTest.php @@ -36,17 +36,17 @@ public function testMultipleSignatures() $jws = JWSFactory::createJWS($payload); $rsa_private_key = new JWK([ - "kty" => "RSA", - "kid" => "bilbo.baggins@hobbiton.example", - "use" => "sig", - "n" => "n4EPtAOCc9AlkeQHPzHStgAbgs7bTZLwUBZdR8_KuKPEHLd4rHVTeT-O-XV2jRojdNhxJWTDvNd7nqQ0VEiZQHz_AJmSCpMaJMRBSFKrKb2wqVwGU_NsYOYL-QtiWN2lbzcEe6XC0dApr5ydQLrHqkHHig3RBordaZ6Aj-oBHqFEHYpPe7Tpe-OfVfHd1E6cS6M1FZcD1NNLYD5lFHpPI9bTwJlsde3uhGqC0ZCuEHg8lhzwOHrtIQbS0FVbb9k3-tVTU4fg_3L_vniUFAKwuCLqKnS2BYwdq_mzSnbLY7h_qixoR7jig3__kRhuaxwUkRz5iaiQkqgc5gHdrNP5zw", - "e" => "AQAB", - "d" => "bWUC9B-EFRIo8kpGfh0ZuyGPvMNKvYWNtB_ikiH9k20eT-O1q_I78eiZkpXxXQ0UTEs2LsNRS-8uJbvQ-A1irkwMSMkK1J3XTGgdrhCku9gRldY7sNA_AKZGh-Q661_42rINLRCe8W-nZ34ui_qOfkLnK9QWDDqpaIsA-bMwWWSDFu2MUBYwkHTMEzLYGqOe04noqeq1hExBTHBOBdkMXiuFhUq1BU6l-DqEiWxqg82sXt2h-LMnT3046AOYJoRioz75tSUQfGCshWTBnP5uDjd18kKhyv07lhfSJdrPdM5Plyl21hsFf4L_mHCuoFau7gdsPfHPxxjVOcOpBrQzwQ", - "p" => "3Slxg_DwTXJcb6095RoXygQCAZ5RnAvZlno1yhHtnUex_fp7AZ_9nRaO7HX_-SFfGQeutao2TDjDAWU4Vupk8rw9JR0AzZ0N2fvuIAmr_WCsmGpeNqQnev1T7IyEsnh8UMt-n5CafhkikzhEsrmndH6LxOrvRJlsPp6Zv8bUq0k", - "q" => "uKE2dh-cTf6ERF4k4e_jy78GfPYUIaUyoSSJuBzp3Cubk3OCqs6grT8bR_cu0Dm1MZwWmtdqDyI95HrUeq3MP15vMMON8lHTeZu2lmKvwqW7anV5UzhM1iZ7z4yMkuUwFWoBvyY898EXvRD-hdqRxHlSqAZ192zB3pVFJ0s7pFc", - "dp" => "B8PVvXkvJrj2L-GYQ7v3y9r6Kw5g9SahXBwsWUzp19TVlgI-YV85q1NIb1rxQtD-IsXXR3-TanevuRPRt5OBOdiMGQp8pbt26gljYfKU_E9xn-RULHz0-ed9E9gXLKD4VGngpz-PfQ_q29pk5xWHoJp009Qf1HvChixRX59ehik", - "dq" => "CLDmDGduhylc9o7r84rEUVn7pzQ6PF83Y-iBZx5NT-TpnOZKF1pErAMVeKzFEl41DlHHqqBLSM0W1sOFbwTxYWZDm6sI6og5iTbwQGIC3gnJKbi_7k_vJgGHwHxgPaX2PnvP-zyEkDERuf-ry4c_Z11Cq9AqC2yeL6kdKT1cYF8", - "qi" => "3PiqvXQN0zwMeE-sBvZgi289XP9XCQF3VWqPzMKnIgQp7_Tugo6-NZBKCQsMf3HaEGBjTVJs_jcK8-TRXvaKe-7ZMaQj8VfBdYkssbu0NKDDhjJ-GtiseaDVWt7dcH0cfwxgFUHpQh7FoCrjFJ6h6ZEpMF6xmujs4qMpPz8aaI4", + 'kty' => 'RSA', + 'kid' => 'bilbo.baggins@hobbiton.example', + 'use' => 'sig', + 'n' => 'n4EPtAOCc9AlkeQHPzHStgAbgs7bTZLwUBZdR8_KuKPEHLd4rHVTeT-O-XV2jRojdNhxJWTDvNd7nqQ0VEiZQHz_AJmSCpMaJMRBSFKrKb2wqVwGU_NsYOYL-QtiWN2lbzcEe6XC0dApr5ydQLrHqkHHig3RBordaZ6Aj-oBHqFEHYpPe7Tpe-OfVfHd1E6cS6M1FZcD1NNLYD5lFHpPI9bTwJlsde3uhGqC0ZCuEHg8lhzwOHrtIQbS0FVbb9k3-tVTU4fg_3L_vniUFAKwuCLqKnS2BYwdq_mzSnbLY7h_qixoR7jig3__kRhuaxwUkRz5iaiQkqgc5gHdrNP5zw', + 'e' => 'AQAB', + 'd' => 'bWUC9B-EFRIo8kpGfh0ZuyGPvMNKvYWNtB_ikiH9k20eT-O1q_I78eiZkpXxXQ0UTEs2LsNRS-8uJbvQ-A1irkwMSMkK1J3XTGgdrhCku9gRldY7sNA_AKZGh-Q661_42rINLRCe8W-nZ34ui_qOfkLnK9QWDDqpaIsA-bMwWWSDFu2MUBYwkHTMEzLYGqOe04noqeq1hExBTHBOBdkMXiuFhUq1BU6l-DqEiWxqg82sXt2h-LMnT3046AOYJoRioz75tSUQfGCshWTBnP5uDjd18kKhyv07lhfSJdrPdM5Plyl21hsFf4L_mHCuoFau7gdsPfHPxxjVOcOpBrQzwQ', + 'p' => '3Slxg_DwTXJcb6095RoXygQCAZ5RnAvZlno1yhHtnUex_fp7AZ_9nRaO7HX_-SFfGQeutao2TDjDAWU4Vupk8rw9JR0AzZ0N2fvuIAmr_WCsmGpeNqQnev1T7IyEsnh8UMt-n5CafhkikzhEsrmndH6LxOrvRJlsPp6Zv8bUq0k', + 'q' => 'uKE2dh-cTf6ERF4k4e_jy78GfPYUIaUyoSSJuBzp3Cubk3OCqs6grT8bR_cu0Dm1MZwWmtdqDyI95HrUeq3MP15vMMON8lHTeZu2lmKvwqW7anV5UzhM1iZ7z4yMkuUwFWoBvyY898EXvRD-hdqRxHlSqAZ192zB3pVFJ0s7pFc', + 'dp' => 'B8PVvXkvJrj2L-GYQ7v3y9r6Kw5g9SahXBwsWUzp19TVlgI-YV85q1NIb1rxQtD-IsXXR3-TanevuRPRt5OBOdiMGQp8pbt26gljYfKU_E9xn-RULHz0-ed9E9gXLKD4VGngpz-PfQ_q29pk5xWHoJp009Qf1HvChixRX59ehik', + 'dq' => 'CLDmDGduhylc9o7r84rEUVn7pzQ6PF83Y-iBZx5NT-TpnOZKF1pErAMVeKzFEl41DlHHqqBLSM0W1sOFbwTxYWZDm6sI6og5iTbwQGIC3gnJKbi_7k_vJgGHwHxgPaX2PnvP-zyEkDERuf-ry4c_Z11Cq9AqC2yeL6kdKT1cYF8', + 'qi' => '3PiqvXQN0zwMeE-sBvZgi289XP9XCQF3VWqPzMKnIgQp7_Tugo6-NZBKCQsMf3HaEGBjTVJs_jcK8-TRXvaKe-7ZMaQj8VfBdYkssbu0NKDDhjJ-GtiseaDVWt7dcH0cfwxgFUHpQh7FoCrjFJ6h6ZEpMF6xmujs4qMpPz8aaI4', ]); /* @@ -60,7 +60,7 @@ public function testMultipleSignatures() 'alg' => 'RS256', ], [ - "kid" => "bilbo.baggins@hobbiton.example", + 'kid' => 'bilbo.baggins@hobbiton.example', ] ); @@ -71,7 +71,7 @@ public function testMultipleSignatures() 'crv' => 'P-521', 'x' => 'AHKZLLOsCOzz5cY97ewNUajB957y-C-U88c3v13nmGZx6sYl_oJXu9A5RkTKqjqvjyekWF-7ytDyRXYgCF5cj0Kt', 'y' => 'AdymlHvOiLxXkEhayXQnNCvDX4h9htZaCJN34kfmC6pV5OhQHiraVySsUdaQkAgDPrwQrJmbnX9cwlGfP-HqHZR1', - "d" => "AAhRON2r9cqXX1hg-RoI6R1tX5p2rUAYdmpHZoC1XNM56KtscrX6zbKipQrCW9CGZH3T4ubpnoTKLDYJ_fF3_rJt", + 'd' => 'AAhRON2r9cqXX1hg-RoI6R1tX5p2rUAYdmpHZoC1XNM56KtscrX6zbKipQrCW9CGZH3T4ubpnoTKLDYJ_fF3_rJt', ]); /* @@ -84,7 +84,7 @@ public function testMultipleSignatures() [], [ 'alg' => 'ES512', - "kid" => "bilbo.baggins@hobbiton.example", + 'kid' => 'bilbo.baggins@hobbiton.example', ] ); @@ -105,7 +105,7 @@ public function testMultipleSignatures() $symmetric_key, [ 'alg' => 'HS256', - "kid" => "018c0ae5-4d9b-471b-bfd6-eef314bc7037", + 'kid' => '018c0ae5-4d9b-471b-bfd6-eef314bc7037', ] ); diff --git a/tests/RFC7520/RSA15SignatureTest.php b/tests/RFC7520/RSA15SignatureTest.php index 29edd370..b8806446 100644 --- a/tests/RFC7520/RSA15SignatureTest.php +++ b/tests/RFC7520/RSA15SignatureTest.php @@ -37,17 +37,17 @@ public function testRS256() */ $payload = "It\xe2\x80\x99s a dangerous business, Frodo, going out your door. You step onto the road, and if you don't keep your feet, there\xe2\x80\x99s no knowing where you might be swept off to."; $private_key = new JWK([ - "kty" => "RSA", - "kid" => "bilbo.baggins@hobbiton.example", - "use" => "sig", - "n" => "n4EPtAOCc9AlkeQHPzHStgAbgs7bTZLwUBZdR8_KuKPEHLd4rHVTeT-O-XV2jRojdNhxJWTDvNd7nqQ0VEiZQHz_AJmSCpMaJMRBSFKrKb2wqVwGU_NsYOYL-QtiWN2lbzcEe6XC0dApr5ydQLrHqkHHig3RBordaZ6Aj-oBHqFEHYpPe7Tpe-OfVfHd1E6cS6M1FZcD1NNLYD5lFHpPI9bTwJlsde3uhGqC0ZCuEHg8lhzwOHrtIQbS0FVbb9k3-tVTU4fg_3L_vniUFAKwuCLqKnS2BYwdq_mzSnbLY7h_qixoR7jig3__kRhuaxwUkRz5iaiQkqgc5gHdrNP5zw", - "e" => "AQAB", - "d" => "bWUC9B-EFRIo8kpGfh0ZuyGPvMNKvYWNtB_ikiH9k20eT-O1q_I78eiZkpXxXQ0UTEs2LsNRS-8uJbvQ-A1irkwMSMkK1J3XTGgdrhCku9gRldY7sNA_AKZGh-Q661_42rINLRCe8W-nZ34ui_qOfkLnK9QWDDqpaIsA-bMwWWSDFu2MUBYwkHTMEzLYGqOe04noqeq1hExBTHBOBdkMXiuFhUq1BU6l-DqEiWxqg82sXt2h-LMnT3046AOYJoRioz75tSUQfGCshWTBnP5uDjd18kKhyv07lhfSJdrPdM5Plyl21hsFf4L_mHCuoFau7gdsPfHPxxjVOcOpBrQzwQ", - "p" => "3Slxg_DwTXJcb6095RoXygQCAZ5RnAvZlno1yhHtnUex_fp7AZ_9nRaO7HX_-SFfGQeutao2TDjDAWU4Vupk8rw9JR0AzZ0N2fvuIAmr_WCsmGpeNqQnev1T7IyEsnh8UMt-n5CafhkikzhEsrmndH6LxOrvRJlsPp6Zv8bUq0k", - "q" => "uKE2dh-cTf6ERF4k4e_jy78GfPYUIaUyoSSJuBzp3Cubk3OCqs6grT8bR_cu0Dm1MZwWmtdqDyI95HrUeq3MP15vMMON8lHTeZu2lmKvwqW7anV5UzhM1iZ7z4yMkuUwFWoBvyY898EXvRD-hdqRxHlSqAZ192zB3pVFJ0s7pFc", - "dp" => "B8PVvXkvJrj2L-GYQ7v3y9r6Kw5g9SahXBwsWUzp19TVlgI-YV85q1NIb1rxQtD-IsXXR3-TanevuRPRt5OBOdiMGQp8pbt26gljYfKU_E9xn-RULHz0-ed9E9gXLKD4VGngpz-PfQ_q29pk5xWHoJp009Qf1HvChixRX59ehik", - "dq" => "CLDmDGduhylc9o7r84rEUVn7pzQ6PF83Y-iBZx5NT-TpnOZKF1pErAMVeKzFEl41DlHHqqBLSM0W1sOFbwTxYWZDm6sI6og5iTbwQGIC3gnJKbi_7k_vJgGHwHxgPaX2PnvP-zyEkDERuf-ry4c_Z11Cq9AqC2yeL6kdKT1cYF8", - "qi" => "3PiqvXQN0zwMeE-sBvZgi289XP9XCQF3VWqPzMKnIgQp7_Tugo6-NZBKCQsMf3HaEGBjTVJs_jcK8-TRXvaKe-7ZMaQj8VfBdYkssbu0NKDDhjJ-GtiseaDVWt7dcH0cfwxgFUHpQh7FoCrjFJ6h6ZEpMF6xmujs4qMpPz8aaI4", + 'kty' => 'RSA', + 'kid' => 'bilbo.baggins@hobbiton.example', + 'use' => 'sig', + 'n' => 'n4EPtAOCc9AlkeQHPzHStgAbgs7bTZLwUBZdR8_KuKPEHLd4rHVTeT-O-XV2jRojdNhxJWTDvNd7nqQ0VEiZQHz_AJmSCpMaJMRBSFKrKb2wqVwGU_NsYOYL-QtiWN2lbzcEe6XC0dApr5ydQLrHqkHHig3RBordaZ6Aj-oBHqFEHYpPe7Tpe-OfVfHd1E6cS6M1FZcD1NNLYD5lFHpPI9bTwJlsde3uhGqC0ZCuEHg8lhzwOHrtIQbS0FVbb9k3-tVTU4fg_3L_vniUFAKwuCLqKnS2BYwdq_mzSnbLY7h_qixoR7jig3__kRhuaxwUkRz5iaiQkqgc5gHdrNP5zw', + 'e' => 'AQAB', + 'd' => 'bWUC9B-EFRIo8kpGfh0ZuyGPvMNKvYWNtB_ikiH9k20eT-O1q_I78eiZkpXxXQ0UTEs2LsNRS-8uJbvQ-A1irkwMSMkK1J3XTGgdrhCku9gRldY7sNA_AKZGh-Q661_42rINLRCe8W-nZ34ui_qOfkLnK9QWDDqpaIsA-bMwWWSDFu2MUBYwkHTMEzLYGqOe04noqeq1hExBTHBOBdkMXiuFhUq1BU6l-DqEiWxqg82sXt2h-LMnT3046AOYJoRioz75tSUQfGCshWTBnP5uDjd18kKhyv07lhfSJdrPdM5Plyl21hsFf4L_mHCuoFau7gdsPfHPxxjVOcOpBrQzwQ', + 'p' => '3Slxg_DwTXJcb6095RoXygQCAZ5RnAvZlno1yhHtnUex_fp7AZ_9nRaO7HX_-SFfGQeutao2TDjDAWU4Vupk8rw9JR0AzZ0N2fvuIAmr_WCsmGpeNqQnev1T7IyEsnh8UMt-n5CafhkikzhEsrmndH6LxOrvRJlsPp6Zv8bUq0k', + 'q' => 'uKE2dh-cTf6ERF4k4e_jy78GfPYUIaUyoSSJuBzp3Cubk3OCqs6grT8bR_cu0Dm1MZwWmtdqDyI95HrUeq3MP15vMMON8lHTeZu2lmKvwqW7anV5UzhM1iZ7z4yMkuUwFWoBvyY898EXvRD-hdqRxHlSqAZ192zB3pVFJ0s7pFc', + 'dp' => 'B8PVvXkvJrj2L-GYQ7v3y9r6Kw5g9SahXBwsWUzp19TVlgI-YV85q1NIb1rxQtD-IsXXR3-TanevuRPRt5OBOdiMGQp8pbt26gljYfKU_E9xn-RULHz0-ed9E9gXLKD4VGngpz-PfQ_q29pk5xWHoJp009Qf1HvChixRX59ehik', + 'dq' => 'CLDmDGduhylc9o7r84rEUVn7pzQ6PF83Y-iBZx5NT-TpnOZKF1pErAMVeKzFEl41DlHHqqBLSM0W1sOFbwTxYWZDm6sI6og5iTbwQGIC3gnJKbi_7k_vJgGHwHxgPaX2PnvP-zyEkDERuf-ry4c_Z11Cq9AqC2yeL6kdKT1cYF8', + 'qi' => '3PiqvXQN0zwMeE-sBvZgi289XP9XCQF3VWqPzMKnIgQp7_Tugo6-NZBKCQsMf3HaEGBjTVJs_jcK8-TRXvaKe-7ZMaQj8VfBdYkssbu0NKDDhjJ-GtiseaDVWt7dcH0cfwxgFUHpQh7FoCrjFJ6h6ZEpMF6xmujs4qMpPz8aaI4', ]); /* @@ -55,8 +55,8 @@ public function testRS256() * @see https://tools.ietf.org/html/rfc7520#section-4.1.2 */ $headers = [ - "alg" => "RS256", - "kid" => "bilbo.baggins@hobbiton.example" + 'alg' => 'RS256', + 'kid' => 'bilbo.baggins@hobbiton.example', ]; $jws = JWSFactory::createJWS($payload); @@ -76,8 +76,8 @@ public function testRS256() $this->assertEquals($expected_compact_json, $jws->toCompactJSON(0)); // We decode the json to compare the 2 arrays otherwise the test may fail as the order may be different - $this->assertEquals(json_decode($expected_flattened_json,true), json_decode($jws->toFlattenedJSON(0),true)); - $this->assertEquals(json_decode($expected_json,true), json_decode($jws->toJSON(),true)); + $this->assertEquals(json_decode($expected_flattened_json, true), json_decode($jws->toFlattenedJSON(0), true)); + $this->assertEquals(json_decode($expected_json, true), json_decode($jws->toJSON(), true)); $loaded_compact_json = Loader::load($expected_compact_json); $this->assertEquals(0, $verifer->verifyWithKey($loaded_compact_json, $private_key)); diff --git a/tests/RFC7520/RSAPSSSignatureTest.php b/tests/RFC7520/RSAPSSSignatureTest.php index 6899b30a..973a5607 100644 --- a/tests/RFC7520/RSAPSSSignatureTest.php +++ b/tests/RFC7520/RSAPSSSignatureTest.php @@ -40,17 +40,17 @@ public function testPS384() */ $payload = "It\xe2\x80\x99s a dangerous business, Frodo, going out your door. You step onto the road, and if you don't keep your feet, there\xe2\x80\x99s no knowing where you might be swept off to."; $private_key = new JWK([ - "kty" => "RSA", - "kid" => "bilbo.baggins@hobbiton.example", - "use" => "sig", - "n" => "n4EPtAOCc9AlkeQHPzHStgAbgs7bTZLwUBZdR8_KuKPEHLd4rHVTeT-O-XV2jRojdNhxJWTDvNd7nqQ0VEiZQHz_AJmSCpMaJMRBSFKrKb2wqVwGU_NsYOYL-QtiWN2lbzcEe6XC0dApr5ydQLrHqkHHig3RBordaZ6Aj-oBHqFEHYpPe7Tpe-OfVfHd1E6cS6M1FZcD1NNLYD5lFHpPI9bTwJlsde3uhGqC0ZCuEHg8lhzwOHrtIQbS0FVbb9k3-tVTU4fg_3L_vniUFAKwuCLqKnS2BYwdq_mzSnbLY7h_qixoR7jig3__kRhuaxwUkRz5iaiQkqgc5gHdrNP5zw", - "e" => "AQAB", - "d" => "bWUC9B-EFRIo8kpGfh0ZuyGPvMNKvYWNtB_ikiH9k20eT-O1q_I78eiZkpXxXQ0UTEs2LsNRS-8uJbvQ-A1irkwMSMkK1J3XTGgdrhCku9gRldY7sNA_AKZGh-Q661_42rINLRCe8W-nZ34ui_qOfkLnK9QWDDqpaIsA-bMwWWSDFu2MUBYwkHTMEzLYGqOe04noqeq1hExBTHBOBdkMXiuFhUq1BU6l-DqEiWxqg82sXt2h-LMnT3046AOYJoRioz75tSUQfGCshWTBnP5uDjd18kKhyv07lhfSJdrPdM5Plyl21hsFf4L_mHCuoFau7gdsPfHPxxjVOcOpBrQzwQ", - "p" => "3Slxg_DwTXJcb6095RoXygQCAZ5RnAvZlno1yhHtnUex_fp7AZ_9nRaO7HX_-SFfGQeutao2TDjDAWU4Vupk8rw9JR0AzZ0N2fvuIAmr_WCsmGpeNqQnev1T7IyEsnh8UMt-n5CafhkikzhEsrmndH6LxOrvRJlsPp6Zv8bUq0k", - "q" => "uKE2dh-cTf6ERF4k4e_jy78GfPYUIaUyoSSJuBzp3Cubk3OCqs6grT8bR_cu0Dm1MZwWmtdqDyI95HrUeq3MP15vMMON8lHTeZu2lmKvwqW7anV5UzhM1iZ7z4yMkuUwFWoBvyY898EXvRD-hdqRxHlSqAZ192zB3pVFJ0s7pFc", - "dp" => "B8PVvXkvJrj2L-GYQ7v3y9r6Kw5g9SahXBwsWUzp19TVlgI-YV85q1NIb1rxQtD-IsXXR3-TanevuRPRt5OBOdiMGQp8pbt26gljYfKU_E9xn-RULHz0-ed9E9gXLKD4VGngpz-PfQ_q29pk5xWHoJp009Qf1HvChixRX59ehik", - "dq" => "CLDmDGduhylc9o7r84rEUVn7pzQ6PF83Y-iBZx5NT-TpnOZKF1pErAMVeKzFEl41DlHHqqBLSM0W1sOFbwTxYWZDm6sI6og5iTbwQGIC3gnJKbi_7k_vJgGHwHxgPaX2PnvP-zyEkDERuf-ry4c_Z11Cq9AqC2yeL6kdKT1cYF8", - "qi" => "3PiqvXQN0zwMeE-sBvZgi289XP9XCQF3VWqPzMKnIgQp7_Tugo6-NZBKCQsMf3HaEGBjTVJs_jcK8-TRXvaKe-7ZMaQj8VfBdYkssbu0NKDDhjJ-GtiseaDVWt7dcH0cfwxgFUHpQh7FoCrjFJ6h6ZEpMF6xmujs4qMpPz8aaI4", + 'kty' => 'RSA', + 'kid' => 'bilbo.baggins@hobbiton.example', + 'use' => 'sig', + 'n' => 'n4EPtAOCc9AlkeQHPzHStgAbgs7bTZLwUBZdR8_KuKPEHLd4rHVTeT-O-XV2jRojdNhxJWTDvNd7nqQ0VEiZQHz_AJmSCpMaJMRBSFKrKb2wqVwGU_NsYOYL-QtiWN2lbzcEe6XC0dApr5ydQLrHqkHHig3RBordaZ6Aj-oBHqFEHYpPe7Tpe-OfVfHd1E6cS6M1FZcD1NNLYD5lFHpPI9bTwJlsde3uhGqC0ZCuEHg8lhzwOHrtIQbS0FVbb9k3-tVTU4fg_3L_vniUFAKwuCLqKnS2BYwdq_mzSnbLY7h_qixoR7jig3__kRhuaxwUkRz5iaiQkqgc5gHdrNP5zw', + 'e' => 'AQAB', + 'd' => 'bWUC9B-EFRIo8kpGfh0ZuyGPvMNKvYWNtB_ikiH9k20eT-O1q_I78eiZkpXxXQ0UTEs2LsNRS-8uJbvQ-A1irkwMSMkK1J3XTGgdrhCku9gRldY7sNA_AKZGh-Q661_42rINLRCe8W-nZ34ui_qOfkLnK9QWDDqpaIsA-bMwWWSDFu2MUBYwkHTMEzLYGqOe04noqeq1hExBTHBOBdkMXiuFhUq1BU6l-DqEiWxqg82sXt2h-LMnT3046AOYJoRioz75tSUQfGCshWTBnP5uDjd18kKhyv07lhfSJdrPdM5Plyl21hsFf4L_mHCuoFau7gdsPfHPxxjVOcOpBrQzwQ', + 'p' => '3Slxg_DwTXJcb6095RoXygQCAZ5RnAvZlno1yhHtnUex_fp7AZ_9nRaO7HX_-SFfGQeutao2TDjDAWU4Vupk8rw9JR0AzZ0N2fvuIAmr_WCsmGpeNqQnev1T7IyEsnh8UMt-n5CafhkikzhEsrmndH6LxOrvRJlsPp6Zv8bUq0k', + 'q' => 'uKE2dh-cTf6ERF4k4e_jy78GfPYUIaUyoSSJuBzp3Cubk3OCqs6grT8bR_cu0Dm1MZwWmtdqDyI95HrUeq3MP15vMMON8lHTeZu2lmKvwqW7anV5UzhM1iZ7z4yMkuUwFWoBvyY898EXvRD-hdqRxHlSqAZ192zB3pVFJ0s7pFc', + 'dp' => 'B8PVvXkvJrj2L-GYQ7v3y9r6Kw5g9SahXBwsWUzp19TVlgI-YV85q1NIb1rxQtD-IsXXR3-TanevuRPRt5OBOdiMGQp8pbt26gljYfKU_E9xn-RULHz0-ed9E9gXLKD4VGngpz-PfQ_q29pk5xWHoJp009Qf1HvChixRX59ehik', + 'dq' => 'CLDmDGduhylc9o7r84rEUVn7pzQ6PF83Y-iBZx5NT-TpnOZKF1pErAMVeKzFEl41DlHHqqBLSM0W1sOFbwTxYWZDm6sI6og5iTbwQGIC3gnJKbi_7k_vJgGHwHxgPaX2PnvP-zyEkDERuf-ry4c_Z11Cq9AqC2yeL6kdKT1cYF8', + 'qi' => '3PiqvXQN0zwMeE-sBvZgi289XP9XCQF3VWqPzMKnIgQp7_Tugo6-NZBKCQsMf3HaEGBjTVJs_jcK8-TRXvaKe-7ZMaQj8VfBdYkssbu0NKDDhjJ-GtiseaDVWt7dcH0cfwxgFUHpQh7FoCrjFJ6h6ZEpMF6xmujs4qMpPz8aaI4', ]); /* @@ -58,8 +58,8 @@ public function testPS384() * @see https://tools.ietf.org/html/rfc7520#section-4.2.2 */ $headers = [ - "alg" => "PS384", - "kid" => "bilbo.baggins@hobbiton.example" + 'alg' => 'PS384', + 'kid' => 'bilbo.baggins@hobbiton.example', ]; $jws = JWSFactory::createJWS($payload); diff --git a/tests/Stub/ClaimCheckerManager.php b/tests/Stub/ClaimCheckerManager.php index 801f851c..d771f133 100644 --- a/tests/Stub/ClaimCheckerManager.php +++ b/tests/Stub/ClaimCheckerManager.php @@ -1,5 +1,14 @@