Skip to content

Commit 8939c36

Browse files
SpomkySpomky
committed
StandardJsonConverter to JsonConverter adn exp/iat/nbf not header checkers anymore
1 parent f0c028a commit 8939c36

File tree

33 files changed

+86
-310
lines changed

33 files changed

+86
-310
lines changed

‎composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"ext-gmp": "*",
3131
"ext-mbstring": "*",
3232
"lib-openssl": "*",
33-
"fgrosse/phpasn1": "^2.0",
3433
"paragonie/sodium_compat": "^1.1",
3534
"spomky-labs/aes-key-wrap": "^4.0",
3635
"spomky-labs/base64url": "^1.0",
@@ -43,16 +42,17 @@
4342
"require-dev": {
4443
"ext-curl": "*",
4544
"bjeavons/zxcvbn-php": "^0.3.0",
45+
"fgrosse/phpasn1": "^2.0",
46+
"php-http/guzzle6-adapter": "^1.1.1",
4647
"php-http/httplug": "^1.1",
4748
"php-http/httplug-bundle": "^1.7",
4849
"php-http/message-factory": "^1.0",
49-
"php-http/guzzle6-adapter": "^1.1.1",
5050
"phpbench/phpbench": "^0.13.0",
5151
"phpunit/phpunit": "^6.0",
5252
"satooshi/php-coveralls": "^1.0",
53+
"symfony/browser-kit": "^3.3",
5354
"symfony/finder": "^3.3",
54-
"symfony/yaml": "^3.3",
55-
"symfony/browser-kit": "^3.3"
55+
"symfony/yaml": "^3.3"
5656
},
5757
"replace": {
5858
"web-token/jwt-core": "self.version",
@@ -76,7 +76,7 @@
7676
},
7777
"extra": {
7878
"branch-alias": {
79-
"dev-master": "1.0.x-dev"
79+
"dev-master": "0.0.x-dev"
8080
}
8181
},
8282
"config": {

‎performance/JWE/EncryptionBench.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Jose\Component\Checker\IssuedAtChecker;
1919
use Jose\Component\Checker\NotBeforeChecker;
2020
use Jose\Component\Core\Converter\JsonConverterInterface;
21-
use Jose\Component\Core\Converter\StandardJsonConverter;
21+
use Jose\Component\Core\Converter\JsonConverter;
2222
use Jose\Component\Core\AlgorithmManager;
2323
use Jose\Component\Core\JWK;
2424
use Jose\Component\Core\JWKSet;
@@ -73,7 +73,7 @@ abstract class EncryptionBench
7373

7474
public function init()
7575
{
76-
$this->jsonConverter = new StandardJsonConverter();
76+
$this->jsonConverter = new JsonConverter();
7777
$this->keyEncryptionAlgorithmsManager = AlgorithmManager::create([
7878
new KeyEncryption\A128KW(),
7979
new KeyEncryption\A192KW(),

‎performance/JWS/SignatureBench.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Jose\Component\Checker\IssuedAtChecker;
1919
use Jose\Component\Checker\NotBeforeChecker;
2020
use Jose\Component\Core\Converter\JsonConverterInterface;
21-
use Jose\Component\Core\Converter\StandardJsonConverter;
21+
use Jose\Component\Core\Converter\JsonConverter;
2222
use Jose\Component\Core\AlgorithmManager;
2323
use Jose\Component\Core\JWK;
2424
use Jose\Component\Signature\Algorithm;
@@ -64,7 +64,7 @@ abstract class SignatureBench
6464

6565
public function init()
6666
{
67-
$this->jsonConverter = new StandardJsonConverter();
67+
$this->jsonConverter = new JsonConverter();
6868
$this->signatureAlgorithmsManager = AlgorithmManager::create([
6969
new Algorithm\HS256(),
7070
new Algorithm\HS384(),

‎src/Bundle/Checker/Resources/config/checkers.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,12 @@ services:
1212

1313
Jose\Component\Checker\ExpirationTimeChecker:
1414
tags:
15-
- { name: 'jose.checker.header', alias: 'exp' }
1615
- { name: 'jose.checker.claim', alias: 'exp' }
1716

1817
Jose\Component\Checker\IssuedAtChecker:
1918
tags:
20-
- { name: 'jose.checker.header', alias: 'iat' }
2119
- { name: 'jose.checker.claim', alias: 'iat' }
2220

2321
Jose\Component\Checker\NotBeforeChecker:
2422
tags:
25-
- { name: 'jose.checker.header', alias: 'nbf' }
2623
- { name: 'jose.checker.claim', alias: 'nbf' }

‎src/Bundle/Checker/Tests/TestBundle/DependencyInjection/TestExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ public function load(array $configs, ContainerBuilder $container)
4040
public function prepend(ContainerBuilder $container)
4141
{
4242
ConfigurationHelper::addClaimChecker($container, 'checker2', ['exp', 'iat', 'nbf', 'custom_checker'], true);
43-
ConfigurationHelper::addHeaderChecker($container, 'checker2', ['exp', 'iat', 'nbf', 'custom_checker'], true);
43+
ConfigurationHelper::addHeaderChecker($container, 'checker2', ['custom_checker'], true);
4444
}
4545
}

‎src/Bundle/Checker/Tests/config/config_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jose:
1717
header_checkers:
1818
checker1:
1919
is_public: true
20-
headers: ['exp', 'iat', 'nbf', 'custom_checker']
20+
headers: ['custom_checker']

‎src/Bundle/Encryption/Tests/JWEComputationTest.php‎

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Jose\Bundle\Encryption\Tests;
1515

16-
use Jose\Component\Core\Converter\StandardJsonConverter;
16+
use Jose\Component\Core\Converter\JsonConverter;
1717
use Jose\Component\Core\JWK;
1818
use Jose\Component\Encryption\JWEBuilder;
1919
use Jose\Component\Encryption\JWELoader;
@@ -42,15 +42,14 @@ public function testCreateAndLoadAToken()
4242
/** @var JWELoader $loader */
4343
$loader = $container->get('jose.jwe_loader.loader1');
4444

45-
$serializer = new CompactSerializer(new StandardJsonConverter());
45+
$serializer = new CompactSerializer(new JsonConverter());
4646

4747
$jwe = $builder
4848
->create()
4949
->withPayload('Hello World!')
5050
->withSharedProtectedHeaders([
5151
'alg' => 'A256KW',
5252
'enc' => 'A256CBC-HS512',
53-
'exp' => time() + 3600,
5453
])
5554
->addRecipient($jwk)
5655
->build();
@@ -61,42 +60,4 @@ public function testCreateAndLoadAToken()
6160
self::assertEquals(0, $index);
6261
self::assertEquals('Hello World!', $loaded->getPayload());
6362
}
64-
65-
/**
66-
* @expectedException \InvalidArgumentException
67-
* @expectedExceptionMessage Unable to decrypt the JWE.
68-
*/
69-
public function testUnableToLoadAnExpiredToken()
70-
{
71-
$client = static::createClient();
72-
$container = $client->getContainer();
73-
74-
$jwk = JWK::create([
75-
'kty' => 'oct',
76-
'k' => '3pWc2vAZpHoV7XmCT-z2hWhdQquwQwW5a3XTojbf87c',
77-
]);
78-
79-
/** @var JWEBuilder $builder */
80-
$builder = $container->get('jose.jwe_builder.builder1');
81-
82-
/** @var JWELoader $loader */
83-
$loader = $container->get('jose.jwe_loader.loader1');
84-
85-
$serializer = new CompactSerializer(new StandardJsonConverter());
86-
87-
$jwe = $builder
88-
->create()
89-
->withPayload('Hello World!')
90-
->withSharedProtectedHeaders([
91-
'alg' => 'A256KW',
92-
'enc' => 'A256CBC-HS512',
93-
'exp' => time() - 3600,
94-
])
95-
->addRecipient($jwk)
96-
->build();
97-
$token = $serializer->serialize($jwe, 0);
98-
99-
$loaded = $loader->load($token);
100-
$loader->decryptUsingKey($loaded, $jwk, $index);
101-
}
10263
}

‎src/Bundle/Encryption/Tests/JWELoaderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testJWELoaderFactoryCanCreateAJWELoader()
3838
/** @var JWELoaderFactory $jweFactory */
3939
$jweFactory = $client->getContainer()->get(JWELoaderFactory::class);
4040

41-
$jwe = $jweFactory->create(['RSA1_5'], ['A256GCM'], ['DEF'], ['iat', 'exp', 'nbf'], ['jwe_compact', 'jwe_json_general', 'jwe_json_flattened']);
41+
$jwe = $jweFactory->create(['RSA1_5'], ['A256GCM'], ['DEF'], [], ['jwe_compact', 'jwe_json_general', 'jwe_json_flattened']);
4242

4343
self::assertInstanceOf(JWELoader::class, $jwe);
4444
}

‎src/Bundle/Encryption/Tests/TestBundle/DependencyInjection/TestExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ public function load(array $configs, ContainerBuilder $container)
4040
public function prepend(ContainerBuilder $container)
4141
{
4242
ConfigurationHelper::addJWEBuilder($container, 'builder2', ['RSA-OAEP-256'], ['A128GCM'], ['DEF'], true);
43-
ConfigurationHelper::addJWELoader($container, 'loader2', ['RSA-OAEP-256'], ['A128GCM'], ['DEF'], ['exp', 'iat', 'nbf'], ['jwe_compact', 'jwe_json_general', 'jwe_json_flattened'], true);
43+
ConfigurationHelper::addJWELoader($container, 'loader2', ['RSA-OAEP-256'], ['A128GCM'], ['DEF'], [], ['jwe_compact', 'jwe_json_general', 'jwe_json_flattened'], true);
4444
}
4545
}

‎src/Bundle/Encryption/Tests/config/config_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ jose:
1919
loader1:
2020
key_encryption_algorithms: ['RSA-OAEP-256', 'A256KW']
2121
content_encryption_algorithms: ['A256CBC-HS512']
22-
header_checkers: ['iat', 'exp', 'nbf']
22+
header_checkers: []
2323
serializers: ['jwe_compact', 'jwe_json_general', 'jwe_json_flattened']
2424
is_public: true

0 commit comments

Comments
 (0)