review changes

apollo-router/Cargo.toml

@@ -52,7 +52,7 @@ docs_rs = ["router-bridge/docs_rs"]
 # and not yet ready for production use.
 telemetry_next = []
 
-experimental_hyper_fork = []
+experimental_hyper_header_limits = []
 
 # is set when ci builds take place. It allows us to disable some tests when CI is running on certain platforms.
 ci = []

apollo-router/src/axum_factory/axum_http_server_factory.rs

@@ -304,7 +304,7 @@ impl HttpServerFactory for AxumHttpServerFactory {
             http_config.http1_keep_alive(true);
             http_config.http1_header_read_timeout(Duration::from_secs(10));
 
-            #[cfg(feature = "experimental_hyper_fork")]
+            #[cfg(feature = "experimental_hyper_header_limits")]
             if let Some(max_headers) = configuration.limits.experimental_http1_max_request_headers {
                 http_config.http1_max_headers(max_headers);
             }

apollo-router/src/configuration/mod.rs

@@ -492,11 +492,11 @@ impl Configuration {
 
 impl Configuration {
     pub(crate) fn validate(self) -> Result<Self, ConfigurationError> {
-        #[cfg(not(feature = "experimental_hyper_fork"))]
+        #[cfg(not(feature = "experimental_hyper_header_limits"))]
         if self.limits.experimental_http1_max_request_headers.is_some() {
             return Err(ConfigurationError::InvalidConfiguration {
-                message: "'limits.experimental_http1_max_request_headers' requires 'experimental_hyper_fork' feature",
-                error: "enable 'experimental_hyper_fork' feature in order to use 'limits.experimental_http1_max_request_headers'".to_string(),
+                message: "'limits.experimental_http1_max_request_headers' requires 'experimental_hyper_header_limits' feature",
+                error: "enable 'experimental_hyper_header_limits' feature in order to use 'limits.experimental_http1_max_request_headers'".to_string(),
             });
         }
 

apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap

@@ -1318,15 +1318,15 @@ snapshot_kind: text
       "additionalProperties": false,
       "description": "Configuration for operation limits, parser limits, HTTP limits, etc.",
       "properties": {
-        "experimental_http1_max_buf_size": {
+        "experimental_http1_max_request_buf_size": {
           "default": null,
-          "description": "Set the maximum buffer size for the HTTP1 connection.\n\nDefault is ~400kb.",
+          "description": "Limit the maximum buffer size for the HTTP1 connection.\n\nDefault is ~400kb.",
           "nullable": true,
           "type": "string"
         },
-        "experimental_http1_max_headers": {
+        "experimental_http1_max_request_headers": {
           "default": null,
-          "description": "Set the maximum number of headers for HTTP1 protocol\n\nIf server receives more headers than the buffer size, it responds to the client with \"431 Request Header Fields Too Large\".\n\nDefault is 100.",
+          "description": "Limit the maximum number of headers of incoming HTTP1 requests. Default is 100.\n\nIf router receives more headers than the buffer size, it responds to the client with \"431 Request Header Fields Too Large\".",
           "format": "uint",
           "minimum": 0.0,
           "nullable": true,

apollo-router/tests/integration/supergraph.rs

@@ -5,7 +5,7 @@ use tower::BoxError;
 
 use crate::integration::IntegrationTest;
 
-#[cfg(not(feature = "experimental_hyper_fork"))]
+#[cfg(not(feature = "experimental_hyper_header_limits"))]
 #[tokio::test(flavor = "multi_thread")]
 async fn test_supergraph_error_http1_max_headers_config() -> Result<(), BoxError> {
     let mut router = IntegrationTest::builder()
@@ -19,12 +19,12 @@ async fn test_supergraph_error_http1_max_headers_config() -> Result<(), BoxError
         .await;
 
     router.start().await;
-    router.assert_log_contains("'limits.experimental_http1_max_request_headers' requires 'experimental_hyper_fork' feature: enable 'experimental_hyper_fork' feature in order to use 'limits.experimental_http1_max_request_headers'").await;
+    router.assert_log_contains("'limits.experimental_http1_max_request_headers' requires 'experimental_hyper_header_limits' feature: enable 'experimental_hyper_header_limits' feature in order to use 'limits.experimental_http1_max_request_headers'").await;
     router.assert_not_started().await;
     Ok(())
 }
 
-#[cfg(feature = "experimental_hyper_fork")]
+#[cfg(feature = "experimental_hyper_header_limits")]
 #[tokio::test(flavor = "multi_thread")]
 async fn test_supergraph_errors_on_http1_max_headers() -> Result<(), BoxError> {
     let mut router = IntegrationTest::builder()
@@ -52,7 +52,7 @@ async fn test_supergraph_errors_on_http1_max_headers() -> Result<(), BoxError> {
     Ok(())
 }
 
-#[cfg(feature = "experimental_hyper_fork")]
+#[cfg(feature = "experimental_hyper_header_limits")]
 #[tokio::test(flavor = "multi_thread")]
 async fn test_supergraph_allow_to_change_http1_max_headers() -> Result<(), BoxError> {
     let mut router = IntegrationTest::builder()

docs/source/reference/router/configuration.mdx

@@ -1114,8 +1114,8 @@ The router rejects any request that violates at least one of these limits.
 limits:
   # Network-based limits
   http_max_request_bytes: 2000000 # Default value: 2 MB
-  experimental_http1_max_headers: 200 # Default value: 100
-  experimental_http1_max_buf_size: 800kb # Default value: 400kb
+  experimental_http1_max_request_headers: 200 # Default value: 100
+  experimental_http1_max_request_buf_size: 800kb # Default value: 400kb
 
   # Parser-based limits
   parser_max_tokens: 15000 # Default value

docs/source/routing/security/request-limits.mdx

@@ -15,8 +15,8 @@ For enhanced security, the GraphOS Router can reject requests that violate any o
 limits:
   # Network-based limits
   http_max_request_bytes: 2000000 # Default value: 2 MB
-  experimental_http1_max_headers: 200 # Default value: 100
-  experimental_http1_max_buf_size: 800kb # Default value: 400kb
+  experimental_http1_max_request_headers: 200 # Default value: 100
+  experimental_http1_max_request_buf_size: 800kb # Default value: 400kb
 
   # Parser-based limits
   parser_max_tokens: 15000 # Default value