Skip to content

Refactor HTTP header configuration to use server.http.max structure and remove middleware-level limits #8286

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
merged 4 commits into from
Sep 17, 2025
+254 −538
Merged

Refactor HTTP header configuration to use server.http.max structure and remove middleware-level limits #8286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbbd679
Initial plan
Copilot Sep 17, 2025
c6d8905
Remove middleware-level header limits from limits plugin and document…
Copilot Sep 17, 2025
b26abc0
Refactor server.http configuration to use max sub-configuration
Copilot Sep 17, 2025
ab13f2e
Add backward compatibility support for old server.http field names
Copilot Sep 17, 2025
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
2 changes: 1 addition & 1 deletion apollo-router/src/axum_factory/axum_http_server_factory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ where
}));

// Add header size limit middleware
if let Some(max_header_size) = configuration.server.http.max_header_size {
if let Some(max_header_size) = configuration.server.http.effective_max().header_size {
tracing::debug!(?max_header_size, "Adding header size limit middleware");
router = router.layer(HeaderSizeLimitLayer::new(Some(max_header_size)));
}
Expand Down
8 changes: 5 additions & 3 deletions apollo-router/src/axum_factory/listeners.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,17 @@ fn get_effective_http_config(
legacy_max_headers: Option<usize>,
legacy_max_buf_size: Option<ByteSize>,
) -> (Option<usize>, Option<ByteSize>, Option<ByteSize>, Option<ByteSize>) {
let effective_max = server_config.effective_max();

// For backward compatibility, prefer server config over legacy config
let effective_max_headers = server_config.max_headers.or(legacy_max_headers);
let effective_max_headers = effective_max.headers.or(legacy_max_headers);

// Use legacy_max_buf_size for HTTP/1 buffer size (different from header size)
let effective_max_buf_size = legacy_max_buf_size;

// New server-specific configuration
let effective_max_header_size = server_config.max_header_size;
let effective_max_header_list_size = server_config.max_header_list_size;
let effective_max_header_size = effective_max.header_size;
let effective_max_header_list_size = effective_max.header_list_size;

(effective_max_headers, effective_max_buf_size, effective_max_header_size, effective_max_header_list_size)
}
Expand Down
Loading