melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: sanitize proxy error messages and observability

Browse Source
This commit is contained in:
mkelvers
2026-07-05 23:08:44 +02:00
parent 0abee703a1
commit 7278676a2e
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/playback/handler/proxy_request.go
View File

@@ -13,12 +13,12 @@ import (
func newProxyRequest(ctx context.Context, targetURL string, referer string) (*http.Request, error) { func newProxyRequest(ctx context.Context, targetURL string, referer string) (*http.Request, error) {
if err := proxytarget.Validate(targetURL); err != nil { if err := proxytarget.Validate(targetURL); err != nil {
return nil, fmt.Errorf("validate proxy target %q: %w", targetURL, err) return nil, fmt.Errorf("validate proxy target: %w", err)
} }
req, err := http.NewRequestWithContext(ctx, http.MethodGet, targetURL, nil) req, err := http.NewRequestWithContext(ctx, http.MethodGet, targetURL, nil)
if err != nil { if err != nil {
return nil, fmt.Errorf("build proxy request for %q: %w", targetURL, err) return nil, fmt.Errorf("build proxy request: %w", err)
} }
if referer != "" { if referer != "" {

10
internal/playback/handler/proxy_subtitle.go
View File

@@ -34,8 +34,9 @@ func (h *PlaybackHandler) HandleProxySubtitle(c *gin.Context) {
resp, err := h.proxyClient.Do(req) resp, err := h.proxyClient.Do(req)
if err != nil { if err != nil {
if !errors.Is(err, context.Canceled) { if !errors.Is(err, context.Canceled) {
observability.ErrorContext(c.Request.Context(), "proxy_subtitle_upstream_failed", "playback", "", map[string]any{"target_url": targetURL}, err) safeErr := errors.New("subtitle upstream request failed")
recordPrivateGinError(c, err) observability.ErrorContext(c.Request.Context(), "proxy_subtitle_upstream_failed", "playback", "", nil, safeErr)
recordPrivateGinError(c, safeErr)
} }
c.Status(http.StatusBadGateway) c.Status(http.StatusBadGateway)
return return
@@ -46,8 +47,9 @@ func (h *PlaybackHandler) HandleProxySubtitle(c *gin.Context) {
body, err := io.ReadAll(io.LimitReader(resp.Body, netutil.MiB2)) body, err := io.ReadAll(io.LimitReader(resp.Body, netutil.MiB2))
if err != nil { if err != nil {
observability.ErrorContext(c.Request.Context(), "proxy_subtitle_read_failed", "playback", "", map[string]any{"target_url": targetURL}, err) safeErr := errors.New("subtitle response read failed")
recordPrivateGinError(c, err) observability.ErrorContext(c.Request.Context(), "proxy_subtitle_read_failed", "playback", "", nil, safeErr)
recordPrivateGinError(c, safeErr)
c.Status(http.StatusBadGateway) c.Status(http.StatusBadGateway)
return return
} }

3
internal/server/observability.go
View File

@@ -13,6 +13,9 @@ func RequestLogger() gin.HandlerFunc {
start := time.Now() start := time.Now()
path := c.Request.URL.Path path := c.Request.URL.Path
query := c.Request.URL.RawQuery query := c.Request.URL.RawQuery
if c.Request.URL.Path == "/watch/proxy/stream" || c.Request.URL.Path == "/watch/proxy/subtitle" {
query = ""
}
c.Next() c.Next()

6
internal/server/server_test.go
View File

@@ -149,7 +149,7 @@ func TestRequestLoggerLogsFailedStreamProxy(t *testing.T) {
} }
} }
func TestRequestLoggerLogsProxyTokenQuery(t *testing.T) { func TestRequestLoggerRedactsProxyTokenQuery(t *testing.T) {
gin.SetMode(gin.TestMode) gin.SetMode(gin.TestMode)
var logs bytes.Buffer var logs bytes.Buffer
@@ -172,8 +172,8 @@ func TestRequestLoggerLogsProxyTokenQuery(t *testing.T) {
t.Fatalf("status = %d, want %d", rec.Code, http.StatusForbidden) t.Fatalf("status = %d, want %d", rec.Code, http.StatusForbidden)
} }
got := logs.String() got := logs.String()
if !strings.Contains(got, `query="lang=en&token=secret-token"`) { if strings.Contains(got, "secret-token") || strings.Contains(got, "query=") {
t.Fatalf("log line missing raw query: %s", got) t.Fatalf("log leaked proxy query: %s", got)
} }
} }