Compare commits
4 Commits
8417f8f795
...
a80b7ac0a6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a80b7ac0a6 | ||
|
|
69a5a8c298 | ||
| 07ac71974c | |||
| cdd7e3fd3a |
@ -382,22 +382,22 @@ func (h *Handlers) HandleAppDeployments() http.HandlerFunc {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// defaultLogTail is the default number of log lines to fetch.
|
// DefaultLogTail is the default number of log lines to fetch.
|
||||||
const defaultLogTail = "500"
|
const DefaultLogTail = "500"
|
||||||
|
|
||||||
// maxLogTail is the maximum allowed value for the tail parameter.
|
// maxLogTail is the maximum allowed value for the tail parameter.
|
||||||
const maxLogTail = 500
|
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.
|
// 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 == "" {
|
if raw == "" {
|
||||||
return defaultLogTail
|
return DefaultLogTail
|
||||||
}
|
}
|
||||||
|
|
||||||
n, err := strconv.Atoi(raw)
|
n, err := strconv.Atoi(raw)
|
||||||
if err != nil || n < 1 {
|
if err != nil || n < 1 {
|
||||||
return defaultLogTail
|
return DefaultLogTail
|
||||||
}
|
}
|
||||||
|
|
||||||
if n > maxLogTail {
|
if n > maxLogTail {
|
||||||
@ -428,7 +428,7 @@ func (h *Handlers) HandleAppLogs() http.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
tail := sanitizeTail(request.URL.Query().Get("tail"))
|
tail := SanitizeTail(request.URL.Query().Get("tail"))
|
||||||
|
|
||||||
logs, logsErr := h.docker.ContainerLogs(
|
logs, logsErr := h.docker.ContainerLogs(
|
||||||
request.Context(),
|
request.Context(),
|
||||||
|
|||||||
@ -1,7 +1,9 @@
|
|||||||
package handlers
|
package handlers_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"git.eeqj.de/sneak/upaas/internal/handlers"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestSanitizeTail(t *testing.T) {
|
func TestSanitizeTail(t *testing.T) {
|
||||||
@ -12,16 +14,16 @@ func TestSanitizeTail(t *testing.T) {
|
|||||||
input string
|
input string
|
||||||
expected string
|
expected string
|
||||||
}{
|
}{
|
||||||
{"empty uses default", "", defaultLogTail},
|
{"empty uses default", "", handlers.DefaultLogTail},
|
||||||
{"valid small number", "50", "50"},
|
{"valid small number", "50", "50"},
|
||||||
{"valid max boundary", "500", "500"},
|
{"valid max boundary", "500", "500"},
|
||||||
{"exceeds max clamped", "501", "500"},
|
{"exceeds max clamped", "501", "500"},
|
||||||
{"very large clamped", "999999", "500"},
|
{"very large clamped", "999999", "500"},
|
||||||
{"non-numeric uses default", "abc", defaultLogTail},
|
{"non-numeric uses default", "abc", handlers.DefaultLogTail},
|
||||||
{"all keyword uses default", "all", defaultLogTail},
|
{"all keyword uses default", "all", handlers.DefaultLogTail},
|
||||||
{"negative uses default", "-1", defaultLogTail},
|
{"negative uses default", "-1", handlers.DefaultLogTail},
|
||||||
{"zero uses default", "0", defaultLogTail},
|
{"zero uses default", "0", handlers.DefaultLogTail},
|
||||||
{"float uses default", "1.5", defaultLogTail},
|
{"float uses default", "1.5", handlers.DefaultLogTail},
|
||||||
{"one is valid", "1", "1"},
|
{"one is valid", "1", "1"},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -29,7 +31,7 @@ func TestSanitizeTail(t *testing.T) {
|
|||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
got := sanitizeTail(tc.input)
|
got := handlers.SanitizeTail(tc.input)
|
||||||
if got != tc.expected {
|
if got != tc.expected {
|
||||||
t.Errorf("sanitizeTail(%q) = %q, want %q", tc.input, got, tc.expected)
|
t.Errorf("sanitizeTail(%q) = %q, want %q", tc.input, got, tc.expected)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,7 +10,6 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/gorilla/sessions"
|
"github.com/gorilla/sessions"
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
@ -269,7 +268,7 @@ func (svc *Service) DestroySession(
|
|||||||
return fmt.Errorf("failed to get session: %w", err)
|
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)
|
saveErr := session.Save(request, respWriter)
|
||||||
if saveErr != nil {
|
if saveErr != nil {
|
||||||
|
|||||||
@ -369,3 +369,38 @@ func TestAuthenticate(testingT *testing.T) {
|
|||||||
assert.ErrorIs(t, err, auth.ErrInvalidCredentials)
|
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)")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user