v0.34.7

src/cache/policy/request.rs

@@ -44,6 +44,21 @@ fn directives(headers: &HeaderMap) -> Option<HashMap<String, Option<String>>> {
     }
     Some(result)
 }
+pub fn request_freshness_headers<'a>(
+    headers: &'a HeaderMap,
+    settings: &Settings,
+) -> std::borrow::Cow<'a, HeaderMap> {
+    if !settings.varnish_compatible
+        || (!headers.contains_key("cache-control") && !headers.contains_key("pragma"))
+    {
+        return std::borrow::Cow::Borrowed(headers);
+    }
+    let mut freshness = headers.clone();
+    freshness.remove("cache-control");
+    freshness.remove("pragma");
+    std::borrow::Cow::Owned(freshness)
+}
+
 pub fn only_if_cached(headers: &HeaderMap) -> bool {
     headers
         .get_all("cache-control")
@@ -158,6 +173,11 @@ pub fn request_policy(
             return RequestPolicy::Bypass(reason);
         }
     }
+    // Varnish builtin.vcl performs a cache lookup without interpreting
+    // client Cache-Control or Pragma. Security bypasses above still apply.
+    if settings.varnish_compatible {
+        return RequestPolicy::Use;
+    }
     let Some(control) = directives(headers) else {
         return RequestPolicy::Bypass("request_cache_control_invalid");
     };
@@ -346,7 +366,24 @@ pub fn varies_on(headers: &HeaderMap, wanted: &str) -> bool {
     })
 }
 
-pub fn response_reason(status: StatusCode, headers: &HeaderMap) -> &'static str {
+pub fn surrogate_no_store(headers: &HeaderMap) -> bool {
+    headers.get_all("surrogate-control").iter().any(|value| {
+        value.to_str().ok().is_some_and(|text| {
+            text.split([',', ';']).any(|part| {
+                part.trim()
+                    .split_once('=')
+                    .map_or(part.trim(), |(key, _)| key.trim())
+                    .eq_ignore_ascii_case("no-store")
+            })
+        })
+    })
+}
+
+pub fn response_reason(
+    status: StatusCode,
+    headers: &HeaderMap,
+    settings: &Settings,
+) -> &'static str {
     if status != StatusCode::OK {
         return "response_status";
     }
@@ -367,6 +404,14 @@ pub fn response_reason(status: StatusCode, headers: &HeaderMap) -> &'static str
             return "response_cache_control";
         }
     }
+    if settings.varnish_compatible {
+        if control.contains_key("no-cache") {
+            return "response_cache_control";
+        }
+        if surrogate_no_store(headers) {
+            return "response_surrogate_control";
+        }
+    }
     for value in headers.get_all("vary") {
         if value.to_str().ok().is_none_or(|value| {
             value.split(',').any(|name| {