support periods in directive keys (#2372)

vapor · May 28, 2020 · 6dfdb34 · 6dfdb34
1 parent 77b84cf
commit 6dfdb34
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Sources/Vapor/HTTP/Headers/HTTPHeaders+Directive.swift b/Sources/Vapor/HTTP/Headers/HTTPHeaders+Directive.swift
@@ -224,9 +224,12 @@ private extension Character {
     static var underscore: Self {
         .init("_")
     }
+    static var period: Self {
+        .init(".")
+    }
 
     var isDirectiveKey: Bool {
-        self.isLetter || self.isNumber || self == .dash || self == .underscore
+        self.isLetter || self.isNumber || self == .dash || self == .underscore || self == .period
     }
 }
 

diff --git a/Tests/VaporTests/HTTPHeaderTests.swift b/Tests/VaporTests/HTTPHeaderTests.swift
@@ -176,6 +176,15 @@ final class HTTPHeaderValueTests: XCTestCase {
         XCTAssertEqual(headers.cookie?["oauth2_consent_csrf"]?.string, "MTU4NjkzNzgwMnxEdi1CQkFFQ180SUFBUkFCRUFBQVB2LUNBQUVHYzNSeWFXNW5EQVlBQkdOemNtWUdjM1J5YVc1bkRDSUFJR1ExWVRnM09USmhOamRsWXpSbU4yRmhOR1UwTW1KaU5tRXpPRGczTmpjMHweHbVecAf193ev3_1Tcf60iY9jSsq5-IQxGTyoztRTfg==")
     }
 
+    func testCookie_dotParsing() throws {
+        let headers = HTTPHeaders([
+            ("cookie", "cookie_one=1;cookie.two=2")
+        ])
+
+        XCTAssertEqual(headers.cookie?["cookie_one"]?.string, "1")
+        XCTAssertEqual(headers.cookie?["cookie.two"]?.string, "2")
+    }
+
     func testMediaTypeMainTypeCaseInsensitive() throws {
         let lower = HTTPMediaType(type: "foo", subType: "")
         let upper = HTTPMediaType(type: "FOO", subType: "")