Merge branch 'altcha-lib-20'

Author: tito10047

config/services.yml

@@ -29,8 +29,6 @@ services:
       $hmacKeySignature: '%altcha.hmacKeySignature%'
       $requestStack: '@request_stack'
       $driverKeyProvider: '@Tito10047\AltchaBundle\Service\DriverKeyProviderInterface'
-      $solveChallengeResolver: '@Tito10047\AltchaBundle\Service\SolveChallengeResolverInterface'
-      $challengeOptionResolver: '@Tito10047\AltchaBundle\Service\ChallengeResolverInterface'
   Tito10047\AltchaBundle\Controller\AltchaChallengeController:
     public: true
     autowire: true

config/services_sentinel.yml

@@ -16,6 +16,6 @@ services:
       $verifySignatureUrl: '%altcha.sentinel.verify_signature_url%'
       $httpClient: '@altcha.sentinel.http_client'
       $requestStack: '@request_stack'
-      $hmacKey: '%altcha.hmacKey%'
+      $driverKeyProvider: '@Tito10047\AltchaBundle\Service\DriverKeyProviderInterface'
     calls:
       - setLogger: ['@?logger']

src/Service/SolveChallengeResolver.php

@@ -19,7 +19,7 @@ class SolveChallengeResolver implements SolveChallengeResolverInterface{
 	public function __construct(
 		private readonly ChallengeResolverInterface $challengeResolver,
 		private readonly string $hmacSignature,
-		private readonly string $hmacKeySignature,
+		private readonly ?string $hmacKeySignature,
 		private readonly float $timeout
 	) {
 	}

src/Validator/AltchaSentinelValidator.php

@@ -5,7 +5,10 @@
 namespace Tito10047\AltchaBundle\Validator;
 
 use AltchaOrg\Altcha\Altcha;
+use AltchaOrg\Altcha\Challenge;
+use AltchaOrg\Altcha\ChallengeParameters;
 use AltchaOrg\Altcha\Payload;
+use AltchaOrg\Altcha\Solution;
 use AltchaOrg\Altcha\VerifySolutionOptions;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
@@ -33,8 +36,6 @@ public function __construct(
 		private readonly string                          $hmacSignature,
 		private readonly string                          $hmacKeySignature,
 		private readonly DriverKeyProviderInterface      $driverKeyProvider,
-		private readonly SolveChallengeResolverInterface $solveChallengeResolver,
-		private readonly ChallengeResolverInterface      $challengeOptionResolver
 	) {
 	}
 
@@ -92,15 +93,20 @@ public function validate(mixed $value, Constraint $constraint): void {
 
 				return;
 			}
-			$solution  = $this->solveChallengeResolver->solveChallenge();
-			$challenge = $this->challengeOptionResolver->getChallenge();
+			$payload = json_decode($altchaJson, true, 512, JSON_THROW_ON_ERROR);
 
-			$payload = new Payload($challenge, $solution);
-			$result  = (new Altcha(
+			$result = (new Altcha(
 				hmacSignatureSecret: $this->hmacSignature,
 				hmacKeySignatureSecret: $this->hmacKeySignature,
 			))->verifySolution(new VerifySolutionOptions(
-				payload: $payload,
+				payload: new Payload(new Challenge(
+					parameters:ChallengeParameters::fromArray($payload["challenge"]["parameters"]??[]) ,
+					signature: $payload["challenge"]["signature"]??"",
+				), new Solution(
+					counter: $payload["solution"]["counter"]??10,
+					derivedKey: $payload["solution"]["derivedKey"]??"",
+					time: $payload["solution"]["time"]??0,
+				)),
 				algorithm: $this->driverKeyProvider->getAlgorithm(),
 			));
 

src/Validator/AltchaValidator.php

@@ -6,11 +6,16 @@
 
 use AltchaOrg\Altcha\Algorithm\Pbkdf2;
 use AltchaOrg\Altcha\Altcha;
+use AltchaOrg\Altcha\Challenge;
+use AltchaOrg\Altcha\ChallengeParameters;
 use AltchaOrg\Altcha\Payload;
+use AltchaOrg\Altcha\Solution;
 use AltchaOrg\Altcha\VerifySolutionOptions;
+use Random\RandomException;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Tito10047\AltchaBundle\Controller\AltchaChallengeController;
 use Tito10047\AltchaBundle\Service\ChallengeResolverInterface;
 use Tito10047\AltchaBundle\Service\DriverKeyProviderInterface;
 use Tito10047\AltchaBundle\Service\SolveChallengeResolverInterface;
@@ -20,28 +25,28 @@ final class AltchaValidator extends ConstraintValidator
     public function __construct(
         private readonly bool $enable,
         private readonly string $hmacSignature,
-        private readonly string $hmacKeySignature,
+        private readonly ?string $hmacKeySignature,
         private readonly RequestStack $requestStack,
         private readonly DriverKeyProviderInterface $driverKeyProvider,
-		private readonly SolveChallengeResolverInterface $solveChallengeResolver,
-		private readonly ChallengeResolverInterface $challengeOptionResolver
     ) {
     }
 
-    /**
-     * Checks if the passed value is valid.
-     *
-     * @param mixed      $value      The value that should be validated
-     * @param Constraint $constraint The constraint for the validation
-     */
+	/**
+	 * Checks if the passed value is valid.
+	 *
+	 * @param mixed      $value      The value that should be validated
+	 * @param Constraint $constraint The constraint for the validation
+	 *
+	 * @throws RandomException
+	 */
     public function validate(mixed $value, Constraint $constraint): void
     {
         if (false === $this->enable) {
             return;
         }
+		$request = $this->requestStack->getCurrentRequest();
 
         if (!$value) {
-            $request = $this->requestStack->getCurrentRequest();
             $value = $request?->request->get('altcha');
         }
 
@@ -72,14 +77,20 @@ public function validate(mixed $value, Constraint $constraint): void
 			return;
 		}
 
-		$solution = $this->solveChallengeResolver->solveChallenge();
-		$challenge = $this->challengeOptionResolver->getChallenge();
+
 
 		$result = (new Altcha(
 			hmacSignatureSecret: $this->hmacSignature,
 			hmacKeySignatureSecret: $this->hmacKeySignature,
 		))->verifySolution(new VerifySolutionOptions(
-			payload: new Payload($challenge, $solution),
+			payload: new Payload(new Challenge(
+				parameters:ChallengeParameters::fromArray($payload["challenge"]["parameters"]??[]) ,
+				signature: $payload["challenge"]["signature"]??"",
+			), new Solution(
+				counter: $payload["solution"]["counter"]??10,
+				derivedKey: $payload["solution"]["derivedKey"]??"",
+				time: $payload["solution"]["time"]??0,
+			)),
 			algorithm: $this->driverKeyProvider->getAlgorithm(),
 		));