[pdm-devel] [PATCH proxmox v3 05/21] auth-api: check for new prefixed cookies as well

[Shannon Sterz <s.sterz@proxmox.com>]

this makes sure that newly generated cookies that are prefixed with,
for example, `__Host-`, for security purposes, are correctly picked
up on. otherwise, the new cookies would not be able to yield proper
authentication.

currently this still falls back to insecure non-prefixed cookies. we
should deprecate them in the long-term and remove this fallback.

Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
 proxmox-auth-api/src/api/mod.rs | 36 ++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/proxmox-auth-api/src/api/mod.rs b/proxmox-auth-api/src/api/mod.rs
index b75c8602..32d18299 100644
--- a/proxmox-auth-api/src/api/mod.rs
+++ b/proxmox-auth-api/src/api/mod.rs
@@ -203,18 +203,36 @@ fn extract_auth_data(
     auth_context: &dyn AuthContext,
     headers: &http::HeaderMap,
 ) -> Option<AuthData> {
-    if let Some(raw_cookie) = headers.get(http::header::COOKIE) {
-        if let Ok(cookie) = raw_cookie.to_str() {
-            if let Some(ticket) = extract_cookie(cookie, auth_context.auth_cookie_name()) {
-                let csrf_token = match headers.get("CSRFPreventionToken").map(|v| v.to_str()) {
-                    Some(Ok(v)) => Some(v.to_owned()),
-                    _ => None,
-                };
-                return Some(AuthData::User(UserAuthData { ticket, csrf_token }));
-            }
+    let mut ticket = None;
+    let cookie_name = auth_context.auth_cookie_name();
+    let host_cookie = auth_context.prefixed_auth_cookie_name();
+    let cookies = headers
+        .get_all(http::header::COOKIE)
+        .iter()
+        .filter_map(|c| c.to_str().ok());
+
+    for cookie in cookies {
+        // check if we got a `__Host-` prefixed cookie first and break the loop if we do so we use
+        // that cookie.
+        if let Some(extracted_ticket) = extract_cookie(cookie, host_cookie) {
+            ticket = Some(extracted_ticket);
+            break;
+        // if no such prefixed cookie exists, try to fall back to a non-prefixed one
+        // TODO: remove this once we do not support less secure non-prefixed cookies anymore
+        } else if let Some(extracted_ticket) = extract_cookie(cookie, cookie_name) {
+            ticket = Some(extracted_ticket)
         }
     }
 
+    if let Some(ticket) = ticket {
+        let csrf_token = match headers.get("CSRFPreventionToken").map(|v| v.to_str()) {
+            Some(Ok(v)) => Some(v.to_owned()),
+            _ => None,
+        };
+
+        return Some(AuthData::User(UserAuthData { ticket, csrf_token }));
+    }
+
     let token_prefix = auth_context.auth_token_prefix();
     match headers.get(http::header::AUTHORIZATION).map(|v| v.to_str()) {
         Some(Ok(v)) => {
-- 
2.39.5



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel