Merge pull request tiamo#34 from robsonala/master

Fix verify (binary) + change setBody
astralab-hq · Jan 21, 2022 · ae566fa · ae566fa
2 parents 73239e8 + 3549832
commit ae566fa
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "php": "^7.1 || ^7.2 || ^7.3 || ^7.4 || ^8.0",
         "ext-openssl": "*",
         "ext-zlib": "*",
+        "ext-ctype": "*",
         "guzzlehttp/guzzle": "^6.5 || ^7.0",
         "phpseclib/phpseclib": "^3.0.8",
         "psr/log": "^1.1"

diff --git a/src/CryptoHelper.php b/src/CryptoHelper.php
@@ -97,6 +97,11 @@ public static function sign($data, $cert, $privateKey = null, $headers = [], $mi
     public static function verify($data, $caInfo = null, $rootCerts = [])
     {
         if ($data instanceof MimePart) {
+            $temp = MimePart::createIfBinaryPart($data);
+            if ($temp !== null) {
+                $data = $temp;
+            }
+
             $data = self::getTempFilename((string) $data);
         }
 

diff --git a/src/MimePart.php b/src/MimePart.php
@@ -103,6 +103,31 @@ public static function fromString($rawMessage, $saveRaw = true)
         return new static($payload['headers'], $payload['body'], $saveRaw ? $rawMessage : null);
     }
 
+    /**
+     * Recreate message with base64 if part is binary
+     *
+     * @param self $message
+     *
+     * @return null|self
+     */
+    public static function createIfBinaryPart(self $message): ?self
+    {
+        $hasBinary = false;
+
+        $temp = new self($message->getHeaders());
+        foreach ($message->getParts() as $part) {
+            if (Utils::isBinary($part->getBody())) {
+                $hasBinary = true;
+                $recreatedPart = new self($part->getHeaders(), Utils::encodeBase64($part->getBody()));
+                $temp->addPart($recreatedPart);
+            } else {
+                $temp->addPart($part);
+            }
+        }
+
+        return $hasBinary ? $temp : null;
+    }
+
     /**
      * @return bool
      */
@@ -321,7 +346,21 @@ public function setBody($body)
                 array_pop($parts); // remove unecessary last element
 
                 foreach ($parts as $part) {
-                    $part = preg_replace('/^\r?\n|\r?\n$/','',$part);
+                    //$part = preg_replace('/^\r?\n|\r?\n$/','',$part);
+                    // Using substr instead of preg_replace as that option is removing multiple break lines instead of only one
+
+                    // /^\r?\n/
+                    if (substr($part, 0, 2) === "\r\n") {
+                        $part = substr($part, 2);
+                    } elseif (substr($part, 0, 1) === "\n") {
+                        $part = substr($part, 1);
+                    }
+                    // /\r?\n$/
+                    if (substr($part, -2) === "\r\n") {
+                        $part = substr($part, 0, -2);
+                    } elseif (substr($part, -1) === "\n") {
+                        $part = substr($part, 0, -1);
+                    }
 
                     $this->addPart($part);
                 }

diff --git a/src/Utils.php b/src/Utils.php
@@ -328,4 +328,18 @@ public static function fixEncoding($s)
         // removes xD800-xDFFF, x110000 and higher
         return htmlspecialchars_decode(htmlspecialchars($s, ENT_NOQUOTES | ENT_IGNORE, 'UTF-8'), ENT_NOQUOTES);
     }
+
+    /**
+     * Verify if the content is binary
+     *
+     * @param mixed $str
+     *
+     * @return bool
+     */
+    public static function isBinary($str): bool
+    {
+        $str = str_ireplace(["\t","\n","\r"], ["","",""], $str);
+
+        return is_string($str) && ctype_print($str) === false;
+    }
 }
diff --git a/tests/Unit/CryptoHelperTest.php b/tests/Unit/CryptoHelperTest.php
@@ -39,12 +39,8 @@ public function testSign()
         self::assertTrue($hasSignature);
     }
 
-    /**
-     * TODO: verify binary data.
-     */
-    public function testVerify()
+    public function testVerifyBase64()
     {
-        // $contents = $this->loadFixture('si_signed.mdn');
         $contents = $this->loadFixture('signed-msg.txt');
         $payload = MimePart::fromString($contents);
 
@@ -54,6 +50,17 @@ public function testVerify()
         self::assertTrue(CryptoHelper::verify($payload, $certs['cert']));
     }
 
+    public function testVerifyBinary()
+    {
+        $contents = $this->loadFixture('si_signed.mdn');
+        $payload = MimePart::fromString($contents);
+
+        $certs = $this->getCerts();
+
+        self::assertTrue($payload->isSigned());
+        self::assertTrue(CryptoHelper::verify($payload, $certs['cert']));
+    }
+
     public function testEncrypt()
     {
         $payload = $this->initMessage();

diff --git a/tests/Unit/ManagementTest.php b/tests/Unit/ManagementTest.php
@@ -57,7 +57,7 @@ public function testProcessMessage()
         self::assertTrue($message->getEncrypted());
         self::assertTrue($message->getSigned());
         self::assertSame($message->getMic(), 'oVDpnrSnpq+V99dXaarQ9HFyRUaFNsp9tdBBSmRhX4s=, sha256');
-        self::assertSame((string) $processedPayload, Utils::canonicalize($this->loadFixture('test.edi')));
+        self::assertSame(trim((string) $processedPayload), Utils::canonicalize($this->loadFixture('test.edi')));
     }
 
     public function testProcessMessageBiggerMessage()

diff --git a/tests/Unit/MimePartTest.php b/tests/Unit/MimePartTest.php
@@ -141,4 +141,20 @@ public function testBodyWithoutHeaders(): void
         self::assertEmpty($res->getHeaders());
         self::assertStringStartsWith('UNB+UNOA', $res->getBody());
     }
+
+    public function testCreateIfBinaryPartNotBinary(): void
+    {
+        $contents = $this->loadFixture('signed-msg.txt');
+        $payload = MimePart::fromString($contents);
+
+        self::assertNull(MimePart::createIfBinaryPart($payload));
+    }
+
+    public function testCreateIfBinaryPartBinary(): void
+    {
+        $contents = $this->loadFixture('si_signed.mdn');
+        $payload = MimePart::fromString($contents);
+
+        self::assertInstanceOf(MimePart::class, MimePart::createIfBinaryPart($payload));
+    }
 }
diff --git a/tests/fixtures/test.edi b/tests/fixtures/test.edi
@@ -25,4 +25,4 @@ PRI+AAA:3.85'
 UNS+S'
 CNT+2:3'
 UNT+26+1'
-UNZ+1+5'
+UNZ+1+5'