Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 24h timeformat for expire and last-modified header #2904

Merged
merged 2 commits into from Nov 3, 2022
Merged

Fix 24h timeformat for expire and last-modified header #2904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14567ae
Fix 24h timeformat encoding for expire and last-modified header
patrick-zippenfenig Nov 3, 2022
08d3ec9
Merge branch 'main' into header-24h-timeformat
0xTim Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sources/Vapor/HTTP/Headers/HTTPHeaderExpires.swift
View file
Open in desktop
Expand Up @@ -10,20 +10,20 @@ extension HTTPHeaders {
let fmt = DateFormatter()
fmt.locale = Locale(identifier: "en_US_POSIX")
fmt.timeZone = TimeZone(secondsFromGMT: 0)
fmt.dateFormat = "EEE, dd MMM yyyy hh:mm:ss zzz"
fmt.dateFormat = "EEE, dd MMM yyyy HH:mm:ss zzz"

if let date = fmt.date(from: dateString) {
return .init(expires: date)
}

// Obsolete RFC 850 format
fmt.dateFormat = "EEEE, dd-MMM-yy hh:mm:ss zzz"
fmt.dateFormat = "EEEE, dd-MMM-yy HH:mm:ss zzz"
if let date = fmt.date(from: dateString) {
return .init(expires: date)
}

// Obsolete ANSI C asctime() format
fmt.dateFormat = "EEE MMM d hh:mm:s yyyy"
fmt.dateFormat = "EEE MMM d HH:mm:s yyyy"
if let date = fmt.date(from: dateString) {
return .init(expires: date)
}
Expand All @@ -40,7 +40,7 @@ extension HTTPHeaders {
let fmt = DateFormatter()
fmt.locale = Locale(identifier: "en_US_POSIX")
fmt.timeZone = TimeZone(secondsFromGMT: 0)
fmt.dateFormat = "EEE, dd MMM yyyy hh:mm:ss zzz"
fmt.dateFormat = "EEE, dd MMM yyyy HH:mm:ss zzz"

return fmt.string(from: expires)
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/Vapor/HTTP/Headers/HTTPHeaderLastModified.swift
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ extension HTTPHeaders {
let fmt = DateFormatter()
fmt.locale = Locale(identifier: "en_US_POSIX")
fmt.timeZone = TimeZone(secondsFromGMT: 0)
fmt.dateFormat = "EEE, dd MMM yyyy hh:mm:ss zzz"
fmt.dateFormat = "EEE, dd MMM yyyy HH:mm:ss zzz"

guard let date = fmt.date(from: dateString) else {
return nil
Expand All @@ -22,7 +22,7 @@ extension HTTPHeaders {
let fmt = DateFormatter()
fmt.locale = Locale(identifier: "en_US_POSIX")
fmt.timeZone = TimeZone(secondsFromGMT: 0)
fmt.dateFormat = "EEE, dd MMM yyyy hh:mm:ss zzz"
fmt.dateFormat = "EEE, dd MMM yyyy HH:mm:ss zzz"

return fmt.string(from: self.value)
}
Expand Down
6 changes: 3 additions & 3 deletions Tests/VaporTests/HTTPCacheTests.swift
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@ class HTTPCacheTests: XCTestCase {

func testPreferredFormat() {
let expires = "Sun, 06 Nov 1994 08:49:37 GMT"
let format = "EEE, dd MMM yyyy hh:mm:ss zzz"
let format = "EEE, dd MMM yyyy HH:mm:ss zzz"
let required = dateFromFormat(format: format, dateStr: expires)
let headers = HTTPHeaders(dictionaryLiteral: ("Expires", expires))
let response = ClientResponse(status: .ok, headers: headers)
Expand All @@ -66,7 +66,7 @@ class HTTPCacheTests: XCTestCase {

func testObsoleteFormatOne() {
let expires = "Sunday, 06-Nov-94 08:49:37 GMT"
let format = "EEEE, dd-MMM-yy hh:mm:ss zzz"
let format = "EEEE, dd-MMM-yy HH:mm:ss zzz"
let required = dateFromFormat(format: format, dateStr: expires)
let headers = HTTPHeaders(dictionaryLiteral: ("Expires", expires))
let response = ClientResponse(status: .ok, headers: headers)
Expand All @@ -76,7 +76,7 @@ class HTTPCacheTests: XCTestCase {

func testObsoleteFormatTwo() {
let expires = "Sun Nov 6 08:49:37 1994"
let format = "EEE MMM d hh:mm:s yyyy"
let format = "EEE MMM d HH:mm:s yyyy"
let required = dateFromFormat(format: format, dateStr: expires)
let headers = HTTPHeaders(dictionaryLiteral: ("Expires", expires))
let response = ClientResponse(status: .ok, headers: headers)
Expand Down
24 changes: 24 additions & 0 deletions Tests/VaporTests/HTTPHeaderTests.swift
View file
Open in desktop
Expand Up @@ -394,4 +394,28 @@ final class HTTPHeaderTests: XCTestCase {
headers.links = links
XCTAssertEqual(headers.first(name: .link), #"<https://localhost/?a=1>; rel=next, <https://localhost/?a=2>; rel=last; custom1=whatever, </?a=-1>; rel=related, </?a=-2>; rel=related"#)
}

/// Test parse and serialize of `Last-Modified` header
func testLastModifiedHeader() throws {
var headers = HTTPHeaders()
headers.lastModified = HTTPHeaders.LastModified(value: Date(timeIntervalSince1970: 18*3600))
guard let date = headers.lastModified else {
XCTFail("HTTPHeaders.LastModified parsing failed")
return
}
XCTAssertEqual(date.value.timeIntervalSince1970, 18*3600)
XCTAssertEqual(date.serialize(), "Thu, 01 Jan 1970 18:00:00 GMT")
}

/// Test parse and serialize of `Expires` header
func testExpiresHeader() throws {
var headers = HTTPHeaders()
headers.expires = HTTPHeaders.Expires(expires: Date(timeIntervalSince1970: 18*3600))
guard let date = headers.expires else {
XCTFail("HTTPHeaders.Expires parsing failed")
return
}
XCTAssertEqual(date.expires.timeIntervalSince1970, 18*3600)
XCTAssertEqual(date.serialize(), "Thu, 01 Jan 1970 18:00:00 GMT")
}
}