Merge branch 'hotfix/23-trim-content-type-parameter' into develop

Forward port laminas#23
artemii-karkusha · Jul 28, 2020 · 69a371a · 69a371a
2 parents 2c87412 + f0b57c5
commit 69a371a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,7 +44,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#97](https://github.com/laminas/laminas-mail/pull/97) adds code to `Header\ContentType::addParameter()` to ensure the value is trimmed of whitespace, fixing issues whereby filenames might contain a leading or trailing space.
 
 ## 2.11.0 - 2020-06-30
 

diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -143,7 +143,7 @@ public function getType()
      */
     public function addParameter($name, $value)
     {
-        $name  = strtolower($name);
+        $name  = trim(strtolower($name));
         $value = (string) $value;
 
         if (! HeaderValue::isValid($name)) {

diff --git a/test/Header/ContentTypeTest.php b/test/Header/ContentTypeTest.php
@@ -222,6 +222,12 @@ public function testGetParameter()
         $this->assertSame('top', $header->getParameter('level'));
     }
 
+    public function testGetParameterWithSpaceTrimmed()
+    {
+        $header = ContentType::fromString('content-type: text/plain; level=top; name="logfile.log";');
+        $this->assertSame('logfile.log', $header->getParameter('name'));
+    }
+
     public function testGetParameterNotExists()
     {
         $header = ContentType::fromString('content-type: text/plain');