fix: Attach signature if exists in all message

src/ConcernsRecipient.php

@@ -8,6 +8,7 @@
 use LightSaml\Model\Protocol as LightSaml;
 use LightSaml\Binding\BindingFactory;
 use LightSaml\Context\Profile\MessageContext;
+use LightSaml\Model\XmlDSig\SignatureStringReader;
 use Litesaml\Exceptions\SamlException;
 use Litesaml\Models\Descriptors\Role;
 use Litesaml\Models\Messages\Attribute;
@@ -16,6 +17,7 @@
 use Litesaml\Models\Messages\LogoutRequest;
 use Litesaml\Models\Messages\LogoutResponse;
 use Litesaml\Models\Messages\Message;
+use Litesaml\Models\Messages\Signature;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
 trait ConcernsRecipient
@@ -44,7 +46,8 @@ public function handleAuthnResponse(SymfonyRequest $request): AuthnResponse
         return new AuthnResponse(
             id: $message->getID(),
             issuer: $message->getIssuer()->getValue(),
-            attributes: $attributes
+            attributes: $attributes,
+            signature: $this->extractSignature($message),
         );
     }
 
@@ -59,6 +62,7 @@ public function handleAuthnRequest(SymfonyRequest $request): AuthnRequest
         return new AuthnRequest(
             id: $message->getID(),
             issuer: $message->getIssuer()->getValue(),
+            signature: $this->extractSignature($message),
         );
     }
 
@@ -73,6 +77,7 @@ public function handleLogoutRequest(SymfonyRequest $request): LogoutRequest
         return new LogoutRequest(
             id: $message->getID(),
             issuer: $message->getIssuer()->getValue(),
+            signature: $this->extractSignature($message),
         );
     }
 
@@ -84,13 +89,10 @@ public function handleLogoutResponse(SymfonyRequest $request): LogoutResponse
             throw new SamlException('Wrong request received');
         }
 
-        /** @var \LightSaml\Model\XmlDSig\SignatureXmlReader $signatureReader */
-        $signatureReader = $message->getSignature();
-
         return new LogoutResponse(
             id: $message->getID(),
             issuer: $message->getIssuer()->getValue(),
-            signature: $signatureReader?->getSignature()
+            signature: $this->extractSignature($message),
         );
     }
 
@@ -105,7 +107,13 @@ public function validateSignature(Message $message, Role $issuer): bool
                 (new X509Certificate())->loadPem($issuer->signing->publicKey->toPem())
             );
 
-            if (! $message->signature->verify($key)) {
+            $signatureReader = new SignatureStringReader(
+                $message->signature->value,
+                $message->signature->algorithm,
+                $message->signature->data,
+            );
+
+            if (! $signatureReader->validate($key)) {
                 return false;
             }
 
@@ -131,4 +139,20 @@ private function unpack(SymfonyRequest $request): LightSaml\SamlMessage
 
         return $message;
     }
+
+    private function extractSignature(LightSaml\SamlMessage $message): ?Signature
+    {
+        /** @var \LightSaml\Model\XmlDSig\SignatureStringReader $signatureReader */
+        $signatureReader = $message->getSignature();
+
+        if (! $signatureReader) {
+            return null;
+        }
+
+        return new Signature(
+            value: $signatureReader->getSignature(),
+            algorithm: $signatureReader->getAlgorithm(),
+            data: $signatureReader->getData()
+        );
+    }
 }

src/Models/Messages/Message.php

@@ -11,5 +11,5 @@ abstract class Message extends DataTransferObject
 
     public string $issuer;
 
-    public ?XMLSecurityDSig $signature;
+    public ?Signature $signature;
 }

src/Models/Messages/Signature.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Litesaml\Models\Messages;
+
+use Bluestone\DataTransferObject\DataTransferObject;
+
+class Signature extends DataTransferObject
+{
+    public string $value;
+    public string $algorithm;
+    public string $data;
+}