goc_marek/ps_shop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cookie -- not working

Browse Source
This commit is contained in:
Marek Goc
2026-05-12 11:25:32 +02:00
parent 669d24c6a3
commit 8c4e664ca8
23 changed files with 836 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/http/handlers/navigation_test.go
+23
View File
@@ -0,0 +1,23 @@
package handlers
import (
"net/http/httptest"
"testing"
pscatalog "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/catalog"
)
func TestAssignMarketSwitchLinksUsesCountryCurrencyID(t *testing.T) {
req := httptest.NewRequest("GET", "https://shop.example.com/pl/product/test", nil)
locale := pscatalog.HeaderLocaleData{
Countries: []pscatalog.LocaleOption{
{ID: 36, Code: "PL", CurrencyID: 6, Label: "Polska PLN"},
},
}
assignMarketSwitchLinks(req, &locale)
if got := locale.Countries[0].URL; got != "/pl/product/test?market=36%3APL%3A6" {
t.Fatalf("market url = %q, want %q", got, "/pl/product/test?market=36%3APL%3A6")
}
}
internal/http/middleware/market_test.go
+55
View File
@@ -0,0 +1,55 @@
package middleware
import (
"testing"
pscookie "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/cookie"
)
func TestApplyRequestMarketUsesSelectedCountryCurrency(t *testing.T) {
session := &pscookie.SessionContext{
Values: map[string]string{
"date_add": "2026-05-12 10:28:57",
"id_guest": "10",
"id_connections": "11",
"id_lang": "2",
"id_language": "2",
"id_currency": "1",
"id_shop": "1",
"id_cart": "55",
"checksum": "old",
},
OrderedKeys: []string{"date_add", "id_lang", "id_language", "id_currency", "id_guest", "id_connections", "id_shop", "id_cart", "checksum"},
}
applyRequestMarket(session, marketSelection{
CountryID: 36,
CountryISO: "PL",
CurrencyID: 6,
})
if got := session.Values["iso_code_country"]; got != "PL" {
t.Fatalf("iso_code_country = %q, want %q", got, "PL")
}
if _, ok := session.Values["id_country"]; ok {
t.Fatalf("id_country should not be persisted in anonymous market cookie")
}
if got := session.Values["id_currency"]; got != "6" {
t.Fatalf("id_currency = %q, want %q", got, "6")
}
if session.CurrencyID == nil || *session.CurrencyID != 6 {
t.Fatalf("CurrencyID = %v, want 6", session.CurrencyID)
}
if _, ok := session.Values["id_shop"]; ok {
t.Fatalf("id_shop should not be persisted in anonymous market cookie")
}
if _, ok := session.Values["id_cart"]; ok {
t.Fatalf("id_cart should not be persisted in anonymous market cookie")
}
wantOrder := []string{"date_add", "id_lang", "id_language", "iso_code_country", "id_currency", "id_guest", "id_connections", "checksum"}
for i, key := range wantOrder {
if i >= len(session.OrderedKeys) || session.OrderedKeys[i] != key {
t.Fatalf("OrderedKeys[%d] = %q, want %q; full=%v", i, session.OrderedKeys[i], key, session.OrderedKeys)
}
}
}
internal/http/middleware/session.go
+81 -57
View File
@@ -4,10 +4,7 @@ import (
"context"
"fmt"
"hash/crc32"
"net"
"net/http"
"net/url"
"path"
"strconv"
"strings"
@@ -21,6 +18,14 @@ type AnonymousSessionInitializer interface {
NewAnonymous(ctx context.Context, req *http.Request, cookieName string) (*pscookie.SessionContext, error)
}
type SessionExpiryRefresher interface {
RefreshExpiry(ctx context.Context, session *pscookie.SessionContext) error
}
type SessionCookieNameResolver interface {
ResolveCookieName(ctx context.Context, req *http.Request) (string, error)
}
type LanguageResolver interface {
ResolveLanguageID(ctx context.Context, req *http.Request, fallback int64) int64
}
@@ -31,11 +36,22 @@ type ProductRouteMatcher interface {
func Session(cfg psconfig.Config, codec pscookie.Codec, initializer AnonymousSessionInitializer, languageResolver LanguageResolver, matcher ProductRouteMatcher) echo.MiddlewareFunc {
ownership := cfg.ParseRouteOwnership()
expiryRefresher, _ := initializer.(SessionExpiryRefresher)
cookieNameResolver, _ := initializer.(SessionCookieNameResolver)
return func(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {
ownedRoute := ownsProductRoute(ownership.ProductPrefixes, c.Request().URL.Path, matcher)
configuredCookieName := cfg.DeriveCookieName(requestCookieHost(c.Request()))
if cookieNameResolver != nil {
resolvedCookieName, err := cookieNameResolver.ResolveCookieName(c.Request().Context(), c.Request())
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("prestashop cookie name resolution failed: %v", err))
}
if strings.TrimSpace(resolvedCookieName) != "" {
configuredCookieName = resolvedCookieName
}
}
cookieName, rawCookie := findPrestaShopCookie(c.Request(), configuredCookieName)
if cookieName == "" {
cookieName = configuredCookieName
@@ -66,12 +82,17 @@ func Session(cfg psconfig.Config, codec pscookie.Codec, initializer AnonymousSes
applyRequestMarket(session, requestMarketSelection(c.Request()))
}
if ownedRoute && shouldSetSessionCookie(rawCookie, session) {
if expiryRefresher != nil {
if err := expiryRefresher.RefreshExpiry(c.Request().Context(), session); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("prestashop session expiry refresh failed: %v", err))
}
}
encoded, err := codec.Encode(session)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "prestashop cookie encode failed")
}
session.RawCookie = encoded
setPrestaShopCookie(c.Request(), c.Response(), ownership.ProductPrefixes, cookieName, encoded)
setPrestaShopCookie(c.Request(), c.Response(), session, cookieName, encoded)
if redirectURL, ok := clearMarketSelectionURL(c.Request()); ok {
return c.Redirect(http.StatusSeeOther, redirectURL)
}
@@ -213,19 +234,18 @@ func applyRequestMarket(session *pscookie.SessionContext, selection marketSelect
session.CurrencyID = int64Ptr(selection.CurrencyID)
session.Values["iso_code_country"] = selection.CountryISO
if selection.CountryID > 0 {
session.Values["id_country"] = strconv.FormatInt(selection.CountryID, 10)
session.OrderedKeys = ensureOrderedKey(session.OrderedKeys, "id_country", 5)
}
session.Values["id_currency"] = strconv.FormatInt(selection.CurrencyID, 10)
delete(session.Values, "id_country")
session.OrderedKeys = ensureOrderedKey(session.OrderedKeys, "iso_code_country", 4)
session.OrderedKeys = ensureOrderedKey(session.OrderedKeys, "id_currency", 6)
session.OrderedKeys = removeOrderedKey(session.OrderedKeys, "id_country")
session.OrderedKeys = ensureOrderedKey(session.OrderedKeys, "id_currency", 5)
if !session.IsLoggedIn {
if checksum := anonymousSessionChecksum(session, sessionLanguageID(session)); checksum != "" {
session.Values["checksum"] = checksum
session.OrderedKeys = ensureOrderedKey(session.OrderedKeys, "checksum", len(session.OrderedKeys))
}
trimAnonymousCookieValues(session)
session.OrderedKeys = ensureOrderedKey(session.OrderedKeys, "id_guest", 6)
session.OrderedKeys = ensureOrderedKey(session.OrderedKeys, "id_connections", 7)
session.OrderedKeys = removeOrderedKey(session.OrderedKeys, "checksum")
session.OrderedKeys = ensureOrderedKey(session.OrderedKeys, "checksum", len(session.OrderedKeys))
}
session.Plaintext = ""
@@ -284,6 +304,46 @@ func ensureOrderedKey(keys []string, key string, index int) []string {
return keys
}
func removeOrderedKey(keys []string, key string) []string {
for i, existing := range keys {
if existing == key {
return append(keys[:i], keys[i+1:]...)
}
}
return keys
}
func trimAnonymousCookieValues(session *pscookie.SessionContext) {
if session == nil || session.Values == nil {
return
}
allowed := map[string]struct{}{
"date_add": {},
"id_lang": {},
"id_language": {},
"iso_code_country": {},
"id_currency": {},
"id_guest": {},
"id_connections": {},
"checksum": {},
}
for key := range session.Values {
if _, ok := allowed[key]; !ok {
delete(session.Values, key)
}
}
filtered := make([]string, 0, len(session.OrderedKeys))
for _, key := range session.OrderedKeys {
if _, ok := allowed[key]; ok {
filtered = append(filtered, key)
}
}
session.OrderedKeys = filtered
}
func int64Ptr(value int64) *int64 {
if value == 0 {
return nil
@@ -353,53 +413,17 @@ func clearMarketSelectionURL(req *http.Request) (string, bool) {
return cleanPath, true
}
func setPrestaShopCookie(req *http.Request, res *echo.Response, ownedPrefixes []string, name, value string) {
http.SetCookie(res.Writer, &http.Cookie{
Name: name,
Value: value,
Path: requestCookiePath(req.URL.Path, ownedPrefixes),
Domain: requestCookieDomain(req),
Secure: requestCookieSecure(req),
HttpOnly: true,
SameSite: http.SameSiteLaxMode,
})
}
func requestCookiePath(requestPath string, ownedPrefixes []string) string {
for _, prefix := range ownedPrefixes {
if prefix == "" || !strings.HasPrefix(requestPath, prefix) {
continue
}
base := path.Clean(strings.TrimSuffix(prefix, "/"))
if base == "." || base == "/" {
return "/"
}
parent := path.Dir(base)
if parent == "." {
return "/"
}
if !strings.HasSuffix(parent, "/") {
parent += "/"
}
return parent
func setPrestaShopCookie(req *http.Request, res *echo.Response, session *pscookie.SessionContext, name, value string) {
maxAge := 1
if session != nil && session.ExpiresAt != nil {
maxAge = int(session.ExpiresAt.UTC().Unix())
}
return "/"
}
func requestCookieDomain(req *http.Request) string {
host := requestCookieHost(req)
if host == "" {
return ""
header := fmt.Sprintf("%s=%s; path=/; max-age=%d; HttpOnly; SameSite=Lax", name, value, maxAge)
if requestCookieSecure(req) {
header += "; Secure"
}
if parsed, err := url.Parse("http://" + host); err == nil {
host = parsed.Hostname()
}
host = strings.TrimSpace(strings.TrimPrefix(host, "."))
if host == "" || strings.EqualFold(host, "localhost") || net.ParseIP(host) != nil {
return ""
}
return host
res.Header().Add(echo.HeaderSetCookie, header)
}
func requestCookieHost(req *http.Request) string {
internal/http/middleware/session_test.go
+36
View File
@@ -0,0 +1,36 @@
package middleware
import (
"net/http"
"net/http/httptest"
"strings"
"testing"
"time"
"github.com/labstack/echo/v4"
pscookie "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/cookie"
)
func TestSetPrestaShopCookiePersistsExpiry(t *testing.T) {
e := echo.New()
req := httptest.NewRequest(http.MethodGet, "https://shop.example.com/product/test", nil)
rec := httptest.NewRecorder()
res := e.NewContext(req, rec).Response()
expiresAt := time.Now().UTC().Add(4 * time.Hour).Truncate(time.Second)
setPrestaShopCookie(req, res, &pscookie.SessionContext{
ExpiresAt: &expiresAt,
}, "PrestaShop-test", "value")
setCookie := rec.Header().Get("Set-Cookie")
if !strings.Contains(setCookie, "max-age=") {
t.Fatalf("Set-Cookie missing max-age: %q", setCookie)
}
if strings.Contains(setCookie, "Expires=") {
t.Fatalf("Set-Cookie should not include Expires: %q", setCookie)
}
if !strings.Contains(setCookie, "path=/") {
t.Fatalf("Set-Cookie missing path=/: %q", setCookie)
}
}