Compare commits

..

4 Commits

Author SHA1 Message Date
user
a80b7ac0a6 refactor: export SanitizeTail and DefaultLogTail directly instead of wrapping
- Rename sanitizeTail → SanitizeTail (exported)
- Rename defaultLogTail → DefaultLogTail (exported)
- Delete export_test.go (no longer needed)
- Update test to reference handlers.SanitizeTail/DefaultLogTail directly
2026-02-15 22:14:12 -08:00
clawbot
69a5a8c298 fix: resolve all golangci-lint issues (fixes #32) 2026-02-15 22:13:12 -08:00
07ac71974c Merge pull request 'fix: set DestroySession MaxAge to -1 instead of -1*time.Second (closes #39)' (#50) from clawbot/upaas:fix/destroy-session-maxage into main
Reviewed-on: #50
2026-02-16 07:09:25 +01:00
cdd7e3fd3a fix: set DestroySession MaxAge to -1 instead of -1*time.Second (closes #39)
The gorilla/sessions MaxAge field expects seconds, not nanoseconds.
Previously MaxAge was set to -1000000000 (-1 * time.Second in nanoseconds),
which worked by accident since any negative value deletes the cookie.
Changed to the conventional value of -1.
2026-02-15 22:07:57 -08:00
5 changed files with 50 additions and 25 deletions

View File

@ -382,22 +382,22 @@ func (h *Handlers) HandleAppDeployments() http.HandlerFunc {
}
}
// defaultLogTail is the default number of log lines to fetch.
const defaultLogTail = "500"
// DefaultLogTail is the default number of log lines to fetch.
const DefaultLogTail = "500"
// maxLogTail is the maximum allowed value for the tail parameter.
const maxLogTail = 500
// sanitizeTail validates and clamps the tail query parameter.
// SanitizeTail validates and clamps the tail query parameter.
// It returns a numeric string clamped to maxLogTail, or the default if invalid.
func sanitizeTail(raw string) string {
func SanitizeTail(raw string) string {
if raw == "" {
return defaultLogTail
return DefaultLogTail
}
n, err := strconv.Atoi(raw)
if err != nil || n < 1 {
return defaultLogTail
return DefaultLogTail
}
if n > maxLogTail {
@ -428,7 +428,7 @@ func (h *Handlers) HandleAppLogs() http.HandlerFunc {
return
}
tail := sanitizeTail(request.URL.Query().Get("tail"))
tail := SanitizeTail(request.URL.Query().Get("tail"))
logs, logsErr := h.docker.ContainerLogs(
request.Context(),

View File

@ -1,9 +0,0 @@
package handlers
// ExportedSanitizeTail wraps sanitizeTail for external tests.
func ExportedSanitizeTail(input string) string {
return sanitizeTail(input)
}
// ExportedDefaultLogTail exports defaultLogTail for external tests.
const ExportedDefaultLogTail = defaultLogTail

View File

@ -14,16 +14,16 @@ func TestSanitizeTail(t *testing.T) {
input string
expected string
}{
{"empty uses default", "", handlers.ExportedDefaultLogTail},
{"empty uses default", "", handlers.DefaultLogTail},
{"valid small number", "50", "50"},
{"valid max boundary", "500", "500"},
{"exceeds max clamped", "501", "500"},
{"very large clamped", "999999", "500"},
{"non-numeric uses default", "abc", handlers.ExportedDefaultLogTail},
{"all keyword uses default", "all", handlers.ExportedDefaultLogTail},
{"negative uses default", "-1", handlers.ExportedDefaultLogTail},
{"zero uses default", "0", handlers.ExportedDefaultLogTail},
{"float uses default", "1.5", handlers.ExportedDefaultLogTail},
{"non-numeric uses default", "abc", handlers.DefaultLogTail},
{"all keyword uses default", "all", handlers.DefaultLogTail},
{"negative uses default", "-1", handlers.DefaultLogTail},
{"zero uses default", "0", handlers.DefaultLogTail},
{"float uses default", "1.5", handlers.DefaultLogTail},
{"one is valid", "1", "1"},
}
@ -31,7 +31,7 @@ func TestSanitizeTail(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
got := handlers.ExportedSanitizeTail(tc.input)
got := handlers.SanitizeTail(tc.input)
if got != tc.expected {
t.Errorf("sanitizeTail(%q) = %q, want %q", tc.input, got, tc.expected)
}

View File

@ -10,7 +10,6 @@ import (
"log/slog"
"net/http"
"strings"
"time"
"github.com/gorilla/sessions"
"go.uber.org/fx"
@ -269,7 +268,7 @@ func (svc *Service) DestroySession(
return fmt.Errorf("failed to get session: %w", err)
}
session.Options.MaxAge = -1 * int(time.Second)
session.Options.MaxAge = -1
saveErr := session.Save(request, respWriter)
if saveErr != nil {

View File

@ -369,3 +369,38 @@ func TestAuthenticate(testingT *testing.T) {
assert.ErrorIs(t, err, auth.ErrInvalidCredentials)
})
}
func TestDestroySessionMaxAge(testingT *testing.T) {
testingT.Parallel()
testingT.Run("sets MaxAge to exactly -1", func(t *testing.T) {
t.Parallel()
svc, cleanup := setupTestService(t)
defer cleanup()
recorder := httptest.NewRecorder()
request := httptest.NewRequest(http.MethodGet, "/", nil)
err := svc.DestroySession(recorder, request)
require.NoError(t, err)
// Check the Set-Cookie header to verify MaxAge is -1 (immediate expiry).
// With MaxAge = -1, the cookie should have Max-Age=0 in the HTTP header
// (per http.Cookie semantics: negative MaxAge means delete now).
cookies := recorder.Result().Cookies()
require.NotEmpty(t, cookies, "expected a Set-Cookie header")
found := false
for _, c := range cookies {
if c.MaxAge < 0 {
found = true
break
}
}
assert.True(t, found, "expected a cookie with negative MaxAge (deletion)")
})
}