Skip to content

Parse RFC 9651-like date headers #37224

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

Merged
bclozel merged 1 commit into from
Sep 4, 2026
Merged

Parse RFC 9651-like date headers #37224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions spring-web/src/main/java/org/springframework/http/HttpHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoField;
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Base64;
Expand Down Expand Up @@ -435,7 +437,9 @@ public class HttpHeaders implements Serializable {
private static final DateTimeFormatter[] DATE_PARSERS = new DateTimeFormatter[] {
DateTimeFormatter.RFC_1123_DATE_TIME,
DateTimeFormatter.ofPattern("EEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss yyyy", Locale.US).withZone(GMT)
DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss yyyy", Locale.US).withZone(GMT),
// RFC 9651: Structured Field Values for HTTP
new DateTimeFormatterBuilder().appendLiteral('@').appendValue(ChronoField.INSTANT_SECONDS).toFormatter(Locale.US).withZone(GMT)
};


Expand Down Expand Up @@ -1621,7 +1625,7 @@ private long getFirstDate(String headerName, boolean rejectInvalid) {
// No header value sent at all
return null;
}
if (headerValue.length() >= 3) {
if (headerValue.length() >= 3 || headerValue.startsWith("@")) {
// Short "0" or "-1" like values are never valid HTTP date headers...
// Let's only bother with DateTimeFormatter parsing for long enough values.

Expand Down
33 changes: 33 additions & 0 deletions spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@

import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;

import static java.util.stream.Collectors.toList;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -654,6 +657,36 @@ void bearerAuth() {
assertThat(authorization).isEqualTo("Bearer foo");
}

@ParameterizedTest
@CsvSource(value = {
"@0,0",
"@1,1000",
"@10,10000",
"@-1,-1000",
"@1659578233,1659578233000", // Example from RFC
"@-62135596800,-62135596800000", // Example from RFC
"@253402214400,253402214400000", // Example from RFC
})
void rfc9651Dates_valid(String value, long timestampMillis) {
headers.set("Deprecation", value);
assertThat(headers.getFirstDate("Deprecation")).isEqualTo(timestampMillis);
}

@ParameterizedTest
@ValueSource(strings = {
"@",
" @1",
"@ 1",
"@0000-",
"@15+",
"@12p",
"@0x15",
})
void rfc9651Dates_invalid(String value) {
headers.set("Deprecation", value);
assertThatIllegalArgumentException().isThrownBy(() -> headers.getFirstDate("Deprecation"));
}


@Nested
class MapEntriesTests {
Expand Down
Loading