Start with JWK

Author: cicnavi

src/Jwk/Factories/JwkDecoratorFactory.php

@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\OpenID\Jwk\Factories;
+
+use Jose\Component\Core\JWK;
+use Jose\Component\KeyManagement\JWKFactory;
+use SimpleSAML\OpenID\Jwk\JwkDecorator;
+
+class JwkDecoratorFactory
+{
+    /**
+     * @param mixed[] $data
+     */
+    public function fromData(array $data): JwkDecorator
+    {
+        return new JwkDecorator(
+            new JWK($data),
+        );
+    }
+
+    /**
+     * @param non-empty-string $path
+     * @param mixed[] $additionalData
+     */
+    public function fromPkcs1Or8KeyFile(
+        string $path,
+        ?string $password = null,
+        array $additionalData = [],
+    ): JwkDecorator {
+        return new JwkDecorator(
+            JWKFactory::createFromKeyFile($path, $password, $additionalData),
+        );
+    }
+
+    /**
+     * @param non-empty-string $key
+     * @param mixed[] $additionalData
+     */
+    public function fromPkcs1Or8Key(
+        string $key,
+        ?string $password = null,
+        array $additionalData = [],
+    ): JwkDecorator {
+        return new JwkDecorator(
+            JWKFactory::createFromKey($key, $password, $additionalData),
+        );
+    }
+
+    /**
+     * @param non-empty-string $path
+     * @param mixed[] $additionalData
+     */
+    public function fromPkcs12CertificateFile(
+        string $path,
+        string $password = '',
+        array $additionalData = [],
+    ): JwkDecorator {
+        return new JwkDecorator(
+            JWKFactory::createFromPKCS12CertificateFile($path, $password, $additionalData),
+        );
+    }
+
+    /**
+     * @param non-empty-string $path
+     * @param mixed[] $additionalData
+     */
+    public function fromX509CertificateFile(
+        string $path,
+        array $additionalData = [],
+    ): JwkDecorator {
+        return new JwkDecorator(
+            JWKFactory::createFromCertificateFile($path, $additionalData),
+        );
+    }
+
+    /**
+     * @param non-empty-string $certificate
+     * @param mixed[] $additionalData
+     */
+    public function fromX509Certificate(
+        string $certificate,
+        array $additionalData = [],
+    ): JwkDecorator {
+        return new JwkDecorator(
+            JWKFactory::createFromCertificate($certificate, $additionalData),
+        );
+    }
+}

src/Jwk/JwkDecorator.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\OpenID\Jwk;
+
+use Jose\Component\Core\JWK;
+
+class JwkDecorator
+{
+    public function __construct(
+        protected readonly JWK $jwk,
+    ) {
+    }
+
+    public function jwk(): JWK
+    {
+        return $this->jwk;
+    }
+}

src/Jwks.php

@@ -202,6 +202,8 @@ public function jwsDecoratorBuilder(): JwsDecoratorBuilder
     {
         return $this->jwsDecoratorBuilder ??= $this->jwsDecoratorBuilderFactory()->build(
             $this->jwsSerializerManagerDecorator(),
+            $this->algorithmManagerDecorator(),
+            $this->helpers(),
         );
     }
 

src/Jws/Factories/JwsDecoratorBuilderFactory.php

@@ -16,8 +16,7 @@ public function build(
         JwsSerializerManagerDecorator $jwsSerializerManagerDecorator,
         AlgorithmManagerDecorator $algorithmManagerDecorator,
         Helpers $helpers,
-    ): JwsDecoratorBuilder
-    {
+    ): JwsDecoratorBuilder {
         return new JwsDecoratorBuilder(
             $jwsSerializerManagerDecorator,
             new JWSBuilder($algorithmManagerDecorator->algorithmManager()),

src/Jws/JwsDecoratorBuilder.php

@@ -5,8 +5,11 @@
 namespace SimpleSAML\OpenID\Jws;
 
 use Jose\Component\Signature\JWSBuilder;
+use SimpleSAML\OpenID\Algorithms\SignatureAlgorithmEnum;
+use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 use SimpleSAML\OpenID\Exceptions\JwsException;
 use SimpleSAML\OpenID\Helpers;
+use SimpleSAML\OpenID\Jwk\JwkDecorator;
 use SimpleSAML\OpenID\Serializers\JwsSerializerManagerDecorator;
 use Throwable;
 
@@ -30,4 +33,34 @@ public function fromToken(string $token): JwsDecorator
             throw new JwsException('Unable to parse token.', (int)$throwable->getCode(), $throwable);
         }
     }
+
+    /**
+     * @param array<non-empty-string,mixed> $payload
+     * @param array<non-empty-string,mixed> $header
+     * @throws \SimpleSAML\OpenID\Exceptions\JwsException
+     */
+    public function fromData(
+        JwkDecorator $signatureJwkDecorator,
+        SignatureAlgorithmEnum $signatureAlgorithm,
+        array $payload,
+        array $header,
+    ): JwsDecorator {
+        $header = array_merge(
+            $header,
+            [ClaimsEnum::Alg->value => $signatureAlgorithm->value],
+        );
+
+        try {
+            return new JwsDecorator(
+                $this->jwsBuilder->create()->withPayload(
+                    $this->helpers->json()->encode($payload),
+                )->addSignature(
+                    $signatureJwkDecorator->jwk(),
+                    $header,
+                )->build(),
+            );
+        } catch (Throwable $throwable) {
+            throw new JwsException('Unable to build JWS.', (int)$throwable->getCode(), $throwable);
+        }
+    }
 }

src/VerifiableCredentials/Factories/JwtVcJsonFactory.php

@@ -5,11 +5,12 @@
 namespace SimpleSAML\OpenID\VerifiableCredentials\Factories;
 
 use SimpleSAML\OpenID\Jws\Factories\ParsedJwsFactory;
-use SimpleSAML\OpenID\VerifiableCredentials\JwtVcJson;
 
 class JwtVcJsonFactory extends ParsedJwsFactory
 {
-    public function fromData(): JwtVcJson
-    {
-    }
-}
+    // TODO mivanci Continue
+//    public function fromData(): JwtVcJson
+//    {
+//        return new JwtVcJson();
+//    }
+}

src/VerifiableCredentials/JwtVcJson.php

@@ -13,4 +13,4 @@ public function getCredentialFormatIdentifier(): CredentialFormatIdentifiersEnum
     {
         return CredentialFormatIdentifiersEnum::JwtVcJson;
     }
-}
+}

src/VerifiableCredentials/VerifiableCredentialInterface.php

@@ -6,5 +6,4 @@
 
 interface VerifiableCredentialInterface
 {
-
-}
+}

tests/src/FederationTest.php

@@ -38,8 +38,8 @@
 use SimpleSAML\OpenID\Jws\Factories\JwsDecoratorBuilderFactory;
 use SimpleSAML\OpenID\Jws\Factories\JwsVerifierDecoratorFactory;
 use SimpleSAML\OpenID\Jws\Factories\ParsedJwsFactory;
-use SimpleSAML\OpenID\Jws\JwsFetcher;
 use SimpleSAML\OpenID\Jws\JwsDecoratorBuilder;
+use SimpleSAML\OpenID\Jws\JwsFetcher;
 use SimpleSAML\OpenID\Jws\JwsVerifierDecorator;
 use SimpleSAML\OpenID\Serializers\JwsSerializerManagerDecorator;
 use SimpleSAML\OpenID\SupportedAlgorithms;