From eae9da5e4c022003fc7439f6e3221381c34d8364 Mon Sep 17 00:00:00 2001
From: Mark Laing <mark.laing@canonical.com>
Date: Wed, 4 Jun 2025 10:18:32 +0100
Subject: [PATCH] pkg/http: Use `secureCookieFunc` when checking a cookie (if
 set).

Signed-off-by: Mark Laing <mark.laing@canonical.com>
---
 pkg/http/cookie.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/http/cookie.go b/pkg/http/cookie.go
index cbd9655..661d81a 100644
--- a/pkg/http/cookie.go
+++ b/pkg/http/cookie.go
@@ -69,8 +69,17 @@ func (c *CookieHandler) CheckCookie(r *http.Request, name string) (string, error
 	if err != nil {
 		return "", err
 	}
+
+	secureCookie := c.securecookie
+	if c.IsRequestAware() {
+		secureCookie, err = c.secureCookieFunc(r)
+		if err != nil {
+			return "", err
+		}
+	}
+
 	var value string
-	if err := c.securecookie.Decode(name, cookie.Value, &value); err != nil {
+	if err := secureCookie.Decode(name, cookie.Value, &value); err != nil {
 		return "", err
 	}
 	return value, nil