Fix detached and non-encoded non-UTF8 string (#495)

Fix detached and non-encoded non-UTF8 string

Author: Spomky

src/Component/Encryption/JWELoader.php

@@ -11,6 +11,9 @@
 use RuntimeException;
 use Throwable;
 
+/**
+ * @see \Jose\Tests\Component\Encryption\JWELoaderTest
+ */
 class JWELoader
 {
     public function __construct(

src/Component/Signature/JWS.php

@@ -8,6 +8,9 @@
 use Jose\Component\Core\JWT;
 use function count;
 
+/**
+ * @see \Jose\Tests\Component\Signature\JWSTest
+ */
 class JWS implements JWT
 {
     /**

src/Component/Signature/JWSBuilder.php

@@ -69,9 +69,6 @@ public function create(): self
      */
     public function withPayload(string $payload, bool $isPayloadDetached = false): self
     {
-        if (mb_detect_encoding($payload, 'UTF-8', true) === false) {
-            throw new InvalidArgumentException('The payload must be encoded in UTF-8');
-        }
         $clone = clone $this;
         $clone->payload = $payload;
         $clone->isPayloadDetached = $isPayloadDetached;
@@ -124,6 +121,13 @@ public function build(): JWS
         $encodedPayload = $this->isPayloadEncoded === false ? $this->payload : Base64UrlSafe::encodeUnpadded(
             $this->payload
         );
+
+        if ($this->isPayloadEncoded === false && $this->isPayloadDetached === false) {
+            mb_detect_encoding($this->payload, 'UTF-8', true) !== false || throw new InvalidArgumentException(
+                'The payload must be encoded in UTF-8'
+            );
+        }
+
         $jws = new JWS($this->payload, $encodedPayload, $this->isPayloadDetached);
         foreach ($this->signatures as $signature) {
             /** @var MacAlgorithm|SignatureAlgorithm $algorithm */

src/Component/Signature/JWSLoader.php

@@ -11,6 +11,9 @@
 use Jose\Component\Signature\Serializer\JWSSerializerManager;
 use Throwable;
 
+/**
+ * @see \Jose\Tests\Component\Signature\JWSLoaderTest
+ */
 class JWSLoader
 {
     public function __construct(

tests/Component/Encryption/CompressionTestCase.php renamed to tests/Component/Encryption/CompressionTest.php

@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class CompressionTestCase extends EncryptionTestCase
+final class CompressionTest extends EncryptionTestCase
 {
     #[Test]
     public function getValidCompressionAlgorithm(): void

tests/Component/Encryption/ECDHESWithX25519EncryptionTestCase.php renamed to tests/Component/Encryption/ECDHESWithX25519EncryptionTest.php

@@ -12,7 +12,7 @@
  *
  * @internal
  */
-final class ECDHESWithX25519EncryptionTestCase extends EncryptionTestCase
+final class ECDHESWithX25519EncryptionTest extends EncryptionTestCase
 {
     /**
      * @see https://tools.ietf.org/html/rfc7516#appendix-B

tests/Component/Encryption/EncrypterTestCase.php renamed to tests/Component/Encryption/EncrypterTest.php

@@ -14,7 +14,7 @@
 /**
  * @internal
  */
-final class EncrypterTestCase extends EncryptionTestCase
+final class EncrypterTest extends EncryptionTestCase
 {
     #[Test]
     public function encryptWithJWTInput(): void

tests/Component/Encryption/InvalidCurveAttackTestCase.php renamed to tests/Component/Encryption/InvalidCurveAttackTest.php

@@ -10,7 +10,7 @@
 /**
  * @internal
  */
-final class InvalidCurveAttackTestCase extends EncryptionTestCase
+final class InvalidCurveAttackTest extends EncryptionTestCase
 {
     #[Test]
     public function curveCheckNegativeP256AttackPt1(): void

tests/Component/Encryption/JWEFlattenedTestCase.php renamed to tests/Component/Encryption/JWEFlattenedTest.php

@@ -11,7 +11,7 @@
 /**
  * @internal
  */
-final class JWEFlattenedTestCase extends EncryptionTestCase
+final class JWEFlattenedTest extends EncryptionTestCase
 {
     /**
      * @see https://tools.ietf.org/html/rfc7516#appendix-A.5

tests/Component/Encryption/JWELoaderTestCase.php renamed to tests/Component/Encryption/JWELoaderTest.php

@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class JWELoaderTestCase extends EncryptionTestCase
+final class JWELoaderTest extends EncryptionTestCase
 {
     private ?JWELoader $jweLoader = null;