mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
Subdomain app routing derived the app identity from httpapi.RequestHost, which returned the client-supplied X-Forwarded-Host header verbatim. No middleware validated or stripped that header, so a request from an untrusted peer could forge it. Since the application_connect cookie is scoped to the wildcard apps domain, JavaScript in a share=authenticated app could fetch() with a forged X-Forwarded-Host pointing at a victim's owner-only app; coderd routed and authorized the request as the victim and returned the private app response same-origin to the attacker. Replace RequestHost with httpmw.EffectiveHost, which honors X-Forwarded-Host only when the original socket peer is a configured trusted origin, otherwise falling back to the received Host header. This ties host trust to the same RealIPConfig model already used for X-Forwarded-For and -Proto. Wire it into HandleSubdomain for both coderd and wsproxy, and log both the effective host and the raw received_host. Add coverage: EffectiveHost unit tests assert the trust decision uses the socket peer rather than the spoofable forwarded client IP, and a HandleSubdomain test confirms a forged X-Forwarded-Host from an untrusted peer never reaches token resolution. Refs: https://linear.app/codercom/issue/PLAT-259
427 lines
12 KiB
Go
427 lines
12 KiB
Go
package loggermw
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"slices"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"cdr.dev/slog/v3"
|
|
"github.com/coder/coder/v2/coderd/rbac"
|
|
"github.com/coder/coder/v2/coderd/tracing"
|
|
"github.com/coder/coder/v2/testutil"
|
|
"github.com/coder/websocket"
|
|
)
|
|
|
|
func TestRequestLogger_WriteLog(t *testing.T) {
|
|
t.Parallel()
|
|
ctx := context.Background()
|
|
|
|
sink := testutil.NewFakeSink(t)
|
|
logger := sink.Logger()
|
|
logCtx := NewRequestLogger(logger, "GET", time.Now())
|
|
|
|
// Add custom fields
|
|
logCtx.WithFields(
|
|
slog.F("custom_field", "custom_value"),
|
|
)
|
|
|
|
// Write log for 200 status
|
|
logCtx.WriteLog(ctx, http.StatusOK)
|
|
|
|
entries := sink.Entries()
|
|
require.Len(t, entries, 1, "log was written twice")
|
|
|
|
require.Equal(t, entries[0].Message, "GET")
|
|
|
|
require.Equal(t, entries[0].Fields[0].Value, "custom_value")
|
|
|
|
// Attempt to write again (should be skipped).
|
|
logCtx.WriteLog(ctx, http.StatusInternalServerError)
|
|
|
|
entries = sink.Entries()
|
|
require.Len(t, entries, 1, "log was written twice")
|
|
}
|
|
|
|
func TestLoggerMiddleware_SingleRequest(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
sink := testutil.NewFakeSink(t)
|
|
logger := sink.Logger()
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
|
|
defer cancel()
|
|
|
|
// Create a test handler to simulate an HTTP request
|
|
testHandler := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
|
|
rw.WriteHeader(http.StatusOK)
|
|
_, _ = rw.Write([]byte("OK"))
|
|
})
|
|
|
|
// Wrap the test handler with the Logger middleware
|
|
loggerMiddleware := Logger(logger, nil)
|
|
wrappedHandler := loggerMiddleware(testHandler)
|
|
|
|
// Create a test HTTP request
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, "/test-path", nil)
|
|
require.NoError(t, err, "failed to create request")
|
|
|
|
sw := &tracing.StatusWriter{ResponseWriter: httptest.NewRecorder()}
|
|
|
|
// Serve the request
|
|
wrappedHandler.ServeHTTP(sw, req)
|
|
|
|
entries := sink.Entries()
|
|
require.Len(t, entries, 1, "log was written twice")
|
|
|
|
require.Equal(t, entries[0].Message, "GET")
|
|
|
|
fieldsMap := make(map[string]any)
|
|
for _, field := range entries[0].Fields {
|
|
fieldsMap[field.Name] = field.Value
|
|
}
|
|
|
|
// Check that the log contains the expected fields
|
|
requiredFields := []string{"host", "received_host", "path", "proto", "remote_addr", "start", "took", "status_code", "user_agent", "latency_ms"}
|
|
for _, field := range requiredFields {
|
|
_, exists := fieldsMap[field]
|
|
require.True(t, exists, "field %q is missing in log fields", field)
|
|
}
|
|
|
|
require.Len(t, entries[0].Fields, len(requiredFields), "log should contain only the required fields")
|
|
|
|
// Check value of the status code
|
|
require.Equal(t, fieldsMap["status_code"], http.StatusOK)
|
|
}
|
|
|
|
func TestLoggerMiddleware_HostFields(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
sink := testutil.NewFakeSink(t)
|
|
logger := sink.Logger()
|
|
|
|
testHandler := http.HandlerFunc(func(rw http.ResponseWriter, _ *http.Request) {
|
|
rw.WriteHeader(http.StatusOK)
|
|
})
|
|
|
|
loggerMiddleware := Logger(logger, func(_ *http.Request) string {
|
|
return "effective.test"
|
|
})
|
|
wrappedHandler := loggerMiddleware(testHandler)
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "http://received.test/path", nil)
|
|
|
|
sw := &tracing.StatusWriter{ResponseWriter: httptest.NewRecorder()}
|
|
wrappedHandler.ServeHTTP(sw, req)
|
|
|
|
entries := sink.Entries()
|
|
require.Len(t, entries, 1, "expected exactly one log entry")
|
|
|
|
fieldsMap := make(map[string]any)
|
|
for _, field := range entries[0].Fields {
|
|
fieldsMap[field.Name] = field.Value
|
|
}
|
|
|
|
require.Equal(t, "effective.test", fieldsMap["host"])
|
|
require.Equal(t, "received.test", fieldsMap["received_host"])
|
|
}
|
|
|
|
func TestLoggerMiddleware_WebSocket(t *testing.T) {
|
|
t.Parallel()
|
|
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
|
|
defer cancel()
|
|
|
|
sink := testutil.NewFakeSink(t)
|
|
logger := sink.Logger()
|
|
done := make(chan struct{})
|
|
logged := make(chan struct{})
|
|
wg := sync.WaitGroup{}
|
|
// Create a test handler to simulate a WebSocket connection
|
|
testHandler := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
|
|
conn, err := websocket.Accept(rw, r, nil)
|
|
if !assert.NoError(t, err, "failed to accept websocket") {
|
|
return
|
|
}
|
|
defer conn.Close(websocket.StatusGoingAway, "")
|
|
|
|
requestLgr := RequestLoggerFromContext(r.Context())
|
|
requestLgr.WriteLog(r.Context(), http.StatusSwitchingProtocols)
|
|
close(logged)
|
|
// Block so we can be sure the end of the middleware isn't being called.
|
|
wg.Wait()
|
|
})
|
|
|
|
// Wrap the test handler with the Logger middleware
|
|
loggerMiddleware := Logger(logger, nil)
|
|
wrappedHandler := loggerMiddleware(testHandler)
|
|
|
|
// RequestLogger expects the ResponseWriter to be *tracing.StatusWriter
|
|
customHandler := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
|
|
defer close(done)
|
|
sw := &tracing.StatusWriter{ResponseWriter: rw}
|
|
wrappedHandler.ServeHTTP(sw, r)
|
|
})
|
|
|
|
srv := httptest.NewServer(customHandler)
|
|
defer srv.Close()
|
|
wg.Add(1)
|
|
// nolint: bodyclose
|
|
conn, _, err := websocket.Dial(ctx, srv.URL, nil)
|
|
require.NoError(t, err, "failed to dial WebSocket")
|
|
defer conn.Close(websocket.StatusNormalClosure, "")
|
|
|
|
// Wait for the log from within the handler.
|
|
_ = testutil.TryReceive(ctx, t, logged)
|
|
entries := sink.Entries()
|
|
require.Len(t, entries, 1, "expected exactly one log entry after WriteLog")
|
|
require.Equal(t, entries[0].Message, "GET")
|
|
|
|
// Signal the websocket handler to return (and read to handle the close frame)
|
|
wg.Done()
|
|
_, _, err = conn.Read(ctx)
|
|
require.ErrorAs(t, err, &websocket.CloseError{}, "websocket read should fail with close error")
|
|
|
|
// Wait for the request to finish completely and verify we only logged once
|
|
_ = testutil.TryReceive(ctx, t, done)
|
|
entries = sink.Entries()
|
|
require.Len(t, entries, 1, "log was written twice")
|
|
}
|
|
|
|
func TestRequestLogger_HTTPRouteParams(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
sink := testutil.NewFakeSink(t)
|
|
logger := sink.Logger()
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
|
|
defer cancel()
|
|
|
|
chiCtx := chi.NewRouteContext()
|
|
chiCtx.URLParams.Add("workspace", "test-workspace")
|
|
chiCtx.URLParams.Add("agent", "test-agent")
|
|
|
|
ctx = context.WithValue(ctx, chi.RouteCtxKey, chiCtx)
|
|
|
|
// Create a test handler to simulate an HTTP request
|
|
testHandler := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
|
|
rw.WriteHeader(http.StatusOK)
|
|
_, _ = rw.Write([]byte("OK"))
|
|
})
|
|
|
|
// Wrap the test handler with the Logger middleware
|
|
loggerMiddleware := Logger(logger, nil)
|
|
wrappedHandler := loggerMiddleware(testHandler)
|
|
|
|
// Create a test HTTP request
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, "/test-path/}", nil)
|
|
require.NoError(t, err, "failed to create request")
|
|
|
|
sw := &tracing.StatusWriter{ResponseWriter: httptest.NewRecorder()}
|
|
|
|
// Serve the request
|
|
wrappedHandler.ServeHTTP(sw, req)
|
|
|
|
entries := sink.Entries()
|
|
require.Len(t, entries, 1, "expected exactly one log entry")
|
|
fieldsMap := make(map[string]any)
|
|
for _, field := range entries[0].Fields {
|
|
fieldsMap[field.Name] = field.Value
|
|
}
|
|
|
|
// Check that the log contains the expected fields
|
|
requiredFields := []string{"workspace", "agent"}
|
|
for _, field := range requiredFields {
|
|
_, exists := fieldsMap["params_"+field]
|
|
require.True(t, exists, "field %q is missing in log fields", field)
|
|
}
|
|
}
|
|
|
|
func TestRequestLogger_RouteParamsLogging(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
params map[string]string
|
|
expectedFields []string
|
|
}{
|
|
{
|
|
name: "EmptyParams",
|
|
params: map[string]string{},
|
|
expectedFields: []string{},
|
|
},
|
|
{
|
|
name: "SingleParam",
|
|
params: map[string]string{
|
|
"workspace": "test-workspace",
|
|
},
|
|
expectedFields: []string{"params_workspace"},
|
|
},
|
|
{
|
|
name: "MultipleParams",
|
|
params: map[string]string{
|
|
"workspace": "test-workspace",
|
|
"agent": "test-agent",
|
|
"user": "test-user",
|
|
},
|
|
expectedFields: []string{"params_workspace", "params_agent", "params_user"},
|
|
},
|
|
{
|
|
name: "EmptyValueParam",
|
|
params: map[string]string{
|
|
"workspace": "test-workspace",
|
|
"agent": "",
|
|
},
|
|
expectedFields: []string{"params_workspace"},
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
sink := testutil.NewFakeSink(t)
|
|
logger := sink.Logger()
|
|
|
|
// Create a route context with the test parameters
|
|
chiCtx := chi.NewRouteContext()
|
|
for key, value := range tt.params {
|
|
chiCtx.URLParams.Add(key, value)
|
|
}
|
|
|
|
ctx := context.WithValue(context.Background(), chi.RouteCtxKey, chiCtx)
|
|
logCtx := NewRequestLogger(logger, "GET", time.Now())
|
|
|
|
// Write the log
|
|
logCtx.WriteLog(ctx, http.StatusOK)
|
|
|
|
entries := sink.Entries()
|
|
require.Len(t, entries, 1, "expected exactly one log entry")
|
|
|
|
// Convert fields to map for easier checking
|
|
fieldsMap := make(map[string]any)
|
|
for _, field := range entries[0].Fields {
|
|
fieldsMap[field.Name] = field.Value
|
|
}
|
|
|
|
// Verify expected fields are present
|
|
for _, field := range tt.expectedFields {
|
|
value, exists := fieldsMap[field]
|
|
require.True(t, exists, "field %q should be present in log", field)
|
|
require.Equal(t, tt.params[strings.TrimPrefix(field, "params_")], value, "field %q has incorrect value", field)
|
|
}
|
|
|
|
// Verify no unexpected fields are present
|
|
for field := range fieldsMap {
|
|
if field == "took" || field == "status_code" || field == "latency_ms" {
|
|
continue // Skip standard fields
|
|
}
|
|
require.True(t, slices.Contains(tt.expectedFields, field), "unexpected field %q in log", field)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestSafeQueryParams(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
params url.Values
|
|
expected map[string]interface{}
|
|
}{
|
|
{
|
|
name: "safe parameters",
|
|
params: url.Values{
|
|
"page": []string{"1"},
|
|
"limit": []string{"10"},
|
|
"filter": []string{"active"},
|
|
"sort": []string{"name"},
|
|
"offset": []string{"2"},
|
|
"ids": []string{"some-id,another-id", "second-param"},
|
|
"template_ids": []string{"some-id,another-id", "second-param"},
|
|
},
|
|
expected: map[string]interface{}{
|
|
"query_page": "1",
|
|
"query_limit": "10",
|
|
"query_offset": "2",
|
|
"query_ids_count": "3",
|
|
"query_template_ids_count": "3",
|
|
},
|
|
},
|
|
{
|
|
name: "unknown/sensitive parameters",
|
|
params: url.Values{
|
|
"token": []string{"secret-token"},
|
|
"api_key": []string{"secret-key"},
|
|
"coder_signed_app_token": []string{"jwt-token"},
|
|
"coder_application_connect_api_key": []string{"encrypted-key"},
|
|
"client_secret": []string{"oauth-secret"},
|
|
"code": []string{"auth-code"},
|
|
},
|
|
expected: map[string]interface{}{},
|
|
},
|
|
{
|
|
name: "mixed parameters",
|
|
params: url.Values{
|
|
"page": []string{"1"},
|
|
"token": []string{"secret"},
|
|
"filter": []string{"active"},
|
|
},
|
|
expected: map[string]interface{}{
|
|
"query_page": "1",
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
tt := tt
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
fields := safeQueryParams(tt.params)
|
|
|
|
// Convert fields to map for easier comparison
|
|
result := make(map[string]interface{})
|
|
for _, field := range fields {
|
|
result[field.Name] = field.Value
|
|
}
|
|
|
|
require.Equal(t, tt.expected, result)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRequestLogger_AuthContext(t *testing.T) {
|
|
t.Parallel()
|
|
ctx := context.Background()
|
|
|
|
sink := testutil.NewFakeSink(t)
|
|
logger := sink.Logger()
|
|
logCtx := NewRequestLogger(logger, "GET", time.Now())
|
|
|
|
logCtx.WithAuthContext(rbac.Subject{
|
|
ID: "test-user-id",
|
|
FriendlyName: "test name",
|
|
Email: "test@coder.com",
|
|
Type: rbac.SubjectTypeUser,
|
|
})
|
|
|
|
logCtx.WriteLog(ctx, http.StatusOK)
|
|
|
|
entries := sink.Entries()
|
|
require.Len(t, entries, 1, "log was written twice")
|
|
require.Equal(t, entries[0].Message, "GET")
|
|
require.Equal(t, entries[0].Fields[0].Value, "test-user-id")
|
|
require.Equal(t, entries[0].Fields[1].Value, "test name")
|
|
require.Equal(t, entries[0].Fields[2].Value, "test@coder.com")
|
|
}
|