Merge pull request #47 from veewee/base64-enhancements

Fix base64Binary decoding for unpadded and whitespace-containing input

Author: veewee

src/Encoder/SimpleType/Base64BinaryTypeEncoder.php

@@ -3,9 +3,10 @@
 
 namespace Soap\Encoding\Encoder\SimpleType;
 
+use Psl\Encoding\Base64\Variant;
+use Psl\Regex;
 use Soap\Encoding\Encoder\Context;
 use Soap\Encoding\Encoder\XmlEncoder;
-use Soap\Encoding\Restriction\WhitespaceRestriction;
 use VeeWee\Reflecta\Iso\Iso;
 use function Psl\Encoding\Base64\decode;
 use function Psl\Encoding\Base64\encode;
@@ -22,7 +23,7 @@ public function iso(Context $context): Iso
     {
         return (new Iso(
             static fn (string $value): string => encode($value),
-            static fn (string $value): string => WhitespaceRestriction::collapse(decode($value)),
+            static fn (string $value): string => decode(Regex\replace($value, '/\s+/', ''), Variant::Standard, false),
         ));
     }
 }

tests/Unit/Encoder/SimpleType/Base64BinaryTypeEncoderTest.php

@@ -4,6 +4,7 @@
 namespace Soap\Encoding\Test\Unit\Encoder\SimpleType;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Soap\Encoding\Encoder\SimpleType\Base64BinaryTypeEncoder;
 use Soap\Encoding\Test\Unit\Encoder\AbstractEncoderTests;
 use Soap\Engine\Metadata\Model\XsdType;
@@ -24,4 +25,43 @@ public static function provideIsomorphicCases(): iterable
             'data' => 'hello',
         ];
     }
+
+    /**
+     * @return iterable<string, array{xml: string, data: string}>
+     */
+    public static function provideBase64WithWhitespaceCases(): iterable
+    {
+        $data = 'hello world, this is a longer string for base64 wrapping';
+        $encoded = base64_encode($data);
+
+        yield 'with-line-breaks' => [
+            'xml' => chunk_split($encoded, 76, "\r\n"),
+            'data' => $data,
+        ];
+
+        yield 'with-spaces' => [
+            'xml' => chunk_split($encoded, 20, " "),
+            'data' => $data,
+        ];
+
+        yield 'with-mixed-whitespace' => [
+            'xml' => chunk_split($encoded, 30, "\n\t"),
+            'data' => $data,
+        ];
+
+        yield 'without-padding' => [
+            'xml' => rtrim(base64_encode('hello world'), '='),
+            'data' => 'hello world',
+        ];
+    }
+
+    #[DataProvider('provideBase64WithWhitespaceCases')]
+    public function test_it_can_decode_base64_with_whitespace(string $xml, string $data): void
+    {
+        $encoder = new Base64BinaryTypeEncoder();
+        $context = self::createContext(XsdType::guess('base64Binary'));
+        $iso = $encoder->iso($context);
+
+        static::assertEquals($data, $iso->from($xml));
+    }
 }