0.34.6_repo_cleanup

src/cache/policy/request.rs

@@ -1,4 +1,3 @@
-/// Reject malformed/duplicate directives instead of guessing their meaning.
 fn directives(headers: &HeaderMap) -> Option<HashMap<String, Option<String>>> {
     let mut result = HashMap::new();
     for header in headers.get_all("cache-control") {
@@ -11,8 +10,6 @@ fn directives(headers: &HeaderMap) -> Option<HashMap<String, Option<String>>> {
                 Some((k, v)) => {
                     let v = v.trim();
                     let value = if v.starts_with('"') {
-                        // Fail closed on truncated/escaped/compound values. Quoted
-                        // commas need not be supported by this conservative cache.
                         let inner = v.strip_prefix('"')?.strip_suffix('"')?;
                         if inner.contains(['"', '\\']) {
                             return None;
@@ -39,10 +36,6 @@ fn directives(headers: &HeaderMap) -> Option<HashMap<String, Option<String>>> {
                 return None;
             }
             if key == "immutable" {
-                // RFC 8246: immutable has no meaningful argument and duplicate
-                // occurrences are equivalent to one occurrence. Preserve only
-                // the presence of the directive instead of invalidating the
-                // complete Cache-Control field.
                 result.entry(key).or_insert(None);
             } else if result.insert(key, value).is_some() {
                 return None;
@@ -111,7 +104,11 @@ pub fn forced_request_policy(
     }
     for key in ["if-match", "if-unmodified-since", "upgrade"] {
         if headers.contains_key(key) {
-            return RequestPolicy::Bypass(if key == "upgrade" { "request_upgrade" } else { "request_precondition" });
+            return RequestPolicy::Bypass(if key == "upgrade" {
+                "request_upgrade"
+            } else {
+                "request_precondition"
+            });
         }
     }
     RequestPolicy::Use
@@ -150,8 +147,6 @@ pub fn request_policy(
     for (key, reason) in [
         ("authorization", "request_authorization"),
         ("cookie", "request_cookie"),
-        // Preconditions other than cache validators can produce 412 and must be
-        // evaluated by the origin until RustProxy implements the full precondition set.
         ("if-match", "request_precondition"),
         ("if-unmodified-since", "request_precondition"),
         ("upgrade", "request_upgrade"),
@@ -166,15 +161,9 @@ pub fn request_policy(
     let Some(control) = directives(headers) else {
         return RequestPolicy::Bypass("request_cache_control_invalid");
     };
-    // RFC 9111: request no-store forbids using a stored response and storing this
-    // exchange. It is the hard client-side cache bypass.
     if control.contains_key("no-store") {
         return RequestPolicy::Bypass("request_no_store");
     }
-    // no-cache does not mean no-store. It requires successful validation before a
-    // stored response can be reused. max-age/min-fresh are evaluated against the
-    // cached representation during lookup; only max-age=0 is an unconditional
-    // request-side validation signal.
     if control.contains_key("no-cache") {
         return RequestPolicy::Revalidate("request_no_cache");
     }
@@ -200,8 +189,6 @@ pub fn request_policy(
             return RequestPolicy::Bypass("request_cache_control_invalid");
         }
     }
-    // HTTP/1.0 Pragma: no-cache is a revalidation request when Cache-Control did
-    // not already define the policy. Other Pragma values do not disable caching.
     if !headers.contains_key("cache-control") && pragma_no_cache(headers) {
         return RequestPolicy::Revalidate("request_pragma_no_cache");
     }
@@ -295,8 +282,6 @@ fn single_if_none_match_matches(headers: &HeaderMap, etag: &str) -> bool {
         && token != "*"
         && weak_etag(token).is_some_and(|candidate| candidate == target)
 }
-/// Varnish-like client-side conditional delivery for a selected cached response.
-/// If-None-Match takes precedence over If-Modified-Since.
 pub fn conditional_not_modified(request: &HeaderMap, response: &HeaderMap) -> bool {
     if request.contains_key("if-none-match") {
         return response
@@ -326,11 +311,8 @@ pub fn make_not_modified(mut response: Response) -> Response {
     }
     response
 }
-/// Merge a successful backend 304 into the stored representation metadata.
 pub fn merge_revalidated_headers(cached: &HeaderMap, validation: &HeaderMap) -> HeaderMap {
     let mut merged = cached.clone();
-    // A new validation starts a new age calculation. Preserve origin Age only if
-    // it is explicitly supplied by the 304 response.
     if !validation.contains_key("age") {
         merged.remove("age");
     }
@@ -364,7 +346,6 @@ pub fn varies_on(headers: &HeaderMap, wanted: &str) -> bool {
     })
 }
 
-/// Explains rejected storage; it never relaxes origin or transformed policies.
 pub fn response_reason(status: StatusCode, headers: &HeaderMap) -> &'static str {
     if status != StatusCode::OK {
         return "response_status";