Parse set-cookie expires with trailing GMT (JuliaWeb#1035)

* Parse set-cookie expires with trailing GMT

* Test if addcookie! matches readsetcookies

Author: gustafsson

src/cookies.jl

@@ -215,7 +215,9 @@ end
 
 iscookienamevalid(raw) = raw == "" ? false : any(isurlchar, raw)
 
-const AlternateRFC1123Format = Dates.DateFormat("e, dd-uuu-yyyy HH:MM:SS G\\MT")
+gmtformat(::DateFormat{S,T}) where {S,T} = Dates.DateFormat(string(S, " G\\MT"))
+const AlternateRFC1123GMTFormat = gmtformat(dateformat"e, dd-uuu-yyyy HH:MM:SS")
+const RFC1123GMTFormat = gmtformat(Dates.RFC1123Format)
 
 # readSetCookies parses all "Set-Cookie" values from
 # the header h and returns the successfully parsed Cookies.
@@ -287,10 +289,10 @@ function readsetcookies(h::Headers)
             elseif lowerattr == "expires"
                 c.rawexpires = val
                 try
-                    c.expires = Dates.DateTime(val, Dates.RFC1123Format)
+                    c.expires = Dates.DateTime(val, RFC1123GMTFormat)
                 catch
                     try
-                        c.expires = Dates.DateTime(val, AlternateRFC1123Format)
+                        c.expires = Dates.DateTime(val, AlternateRFC1123GMTFormat)
                     catch
                         continue
                     end

test/client.jl

@@ -88,8 +88,7 @@ end
         url = "https://$httpbin/cookies/delete?hey"
         r = HTTP.get(url, socket_type_tls=tls)
         cookies = HTTP.Cookies.getcookies!(HTTP.COOKIEJAR, URI(url))
-        @test length(cookies) == 2
-        @test cookies[2].value == ""
+        @test length(cookies) == 1
     end
 
     @testset "Client Streaming Test" begin

test/cookies.jl

@@ -71,8 +71,12 @@ using Sockets, Test
             (["Set-Cookie" => "Cookie-1=v\$1"], [HTTP.Cookie("Cookie-1", "v\$1")]),
             (["Set-Cookie" => "NID=99=YsDT5i3E-CXax-; expires=Wed, 23-Nov-2011 01:05:03 GMT; path=/; domain=.google.ch; HttpOnly"],
             [HTTP.Cookie("NID", "99=YsDT5i3E-CXax-"; path="/", domain=".google.ch", httponly=true, expires=HTTP.Dates.DateTime(2011, 11, 23, 1, 5, 3, 0))]),
+            (["Set-Cookie" => "NID=99=YsDT5i3E-CXax-; expires=Wed, 23 Nov 2011 01:05:03 GMT; path=/; domain=.google.ch; HttpOnly"],
+            [HTTP.Cookie("NID", "99=YsDT5i3E-CXax-"; path="/", domain=".google.ch", httponly=true, expires=HTTP.Dates.DateTime(2011, 11, 23, 1, 5, 3, 0))]),
             (["Set-Cookie" => ".ASPXAUTH=7E3AA; expires=Wed, 07-Mar-2012 14:25:06 GMT; path=/; HttpOnly"],
             [HTTP.Cookie(".ASPXAUTH", "7E3AA"; path="/", expires=HTTP.Dates.DateTime(2012, 3, 7, 14, 25, 6, 0), httponly=true)]),
+            (["Set-Cookie" => ".ASPXAUTH=7E3AA; expires=Wed, 07 Mar 2012 14:25:06 GMT; path=/; HttpOnly"],
+            [HTTP.Cookie(".ASPXAUTH", "7E3AA"; path="/", expires=HTTP.Dates.DateTime(2012, 3, 7, 14, 25, 6, 0), httponly=true)]),
             (["Set-Cookie" => "ASP.NET_SessionId=foo; path=/; HttpOnly"],
             [HTTP.Cookie("ASP.NET_SessionId", "foo"; path="/", httponly=true)]),
             (["Set-Cookie" => "samesitedefault=foo; SameSite"], [HTTP.Cookie("samesitedefault", "foo"; samesite=HTTP.Cookies.SameSiteDefaultMode)]),
@@ -264,16 +268,19 @@ using Sockets, Test
 
     @testset "addcookie!" begin
         r = HTTP.Request("GET", "/")
-        c = HTTP.Cookie("NID", "99=YsDT5i3E-CXax-"; path="/", domain=".google.ch", httponly=true, expires=HTTP.Dates.DateTime(2011, 11, 23, 1, 5, 3, 0))
+        c        = HTTP.Cookie("NID", "99=YsDT5i3E-CXax-"; path="/", domain=".google.ch", httponly=true, expires=HTTP.Dates.DateTime(2011, 11, 23, 1, 5, 3, 0))
+        c_parsed = HTTP.Cookie("NID", "99=YsDT5i3E-CXax-"; path="/", domain="google.ch", httponly=true, expires=HTTP.Dates.DateTime(2011, 11, 23, 1, 5, 3, 0))
         HTTP.addcookie!(r, c)
         @test HTTP.header(r, "Cookie") == "NID=99=YsDT5i3E-CXax-"
         HTTP.addcookie!(r, c)
         @test HTTP.header(r, "Cookie") == "NID=99=YsDT5i3E-CXax-; NID=99=YsDT5i3E-CXax-"
         r = HTTP.Response(200)
         HTTP.addcookie!(r, c)
         @test HTTP.header(r, "Set-Cookie") == "NID=99=YsDT5i3E-CXax-; Path=/; Domain=google.ch; Expires=Wed, 23 Nov 2011 01:05:03 GMT; HttpOnly"
+        @test [c_parsed] == HTTP.Cookies.readsetcookies(["Set-Cookie" => HTTP.header(r, "Set-Cookie")])
         HTTP.addcookie!(r, c)
         @test HTTP.headers(r, "Set-Cookie") == ["NID=99=YsDT5i3E-CXax-; Path=/; Domain=google.ch; Expires=Wed, 23 Nov 2011 01:05:03 GMT; HttpOnly", "NID=99=YsDT5i3E-CXax-; Path=/; Domain=google.ch; Expires=Wed, 23 Nov 2011 01:05:03 GMT; HttpOnly"]
+        @test [c_parsed, c_parsed] == HTTP.Cookies.readsetcookies(["Set-Cookie"] .=> HTTP.headers(r, "Set-Cookie"))
     end
 end