mirror of
https://github.com/caddyserver/caddy.git
synced 2026-10-08 05:49:40 -04:00
when a request exceeds the request_body max_size limit, the request_body handler wraps the http.MaxBytesError into a caddyhttp.HandlerError carrying status 413, but the {http.request.body} and {http.request.body_base64} placeholders ran io.Copy with the error ignored, so they silently returned the truncated prefix as though it were the complete body. docs promise a 413 for reads past max_size, and silently truncating is a bad failure mode in templates and vars_regexp where the body value drives decisions. see #7691 and the narrow follow-up prescribed when #7692 was closed
reading the body now returns a dedicated RequestBodyLimitError marker instead of a generic HandlerError, and only when the read failure is actually the max_size limit. the consumers (template placeholder function, vars and vars_regexp matchers) recognize exactly that marker and wrap it in a status carrying handler error so the oversized request fails with 413, while every unrelated error value keeps its old behavior: templates still render it as text and the vars matchers still match on its error text. the surfaced error is stripped of its generated id and stack trace so a placeholder stringified into a response body cannot leak the call stack
negative regressions prove an unrelated HandlerError in templates, vars and vars_regexp does not start controlling request handling, plus integration tests for the template and vars_regexp 413 paths
ai assisted (GLM agent) under Abdel's direction and local verification
Signed-off-by: Abdel <hktitof@gmail.com>
227 lines
7.4 KiB
Go
227 lines
7.4 KiB
Go
// Copyright 2015 Matthew Holt and The Caddy Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package caddyhttp
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/caddyserver/caddy/v2"
|
|
)
|
|
|
|
func newVarsTestRequest(t *testing.T, target string, headers http.Header, vars map[string]any) (*http.Request, *caddy.Replacer) {
|
|
t.Helper()
|
|
|
|
if target == "" {
|
|
target = "https://example.com/test"
|
|
}
|
|
|
|
req := httptest.NewRequest(http.MethodGet, target, nil)
|
|
req.Header = headers
|
|
|
|
repl := caddy.NewReplacer()
|
|
ctx := context.WithValue(req.Context(), caddy.ReplacerCtxKey, repl)
|
|
if vars == nil {
|
|
vars = make(map[string]any)
|
|
}
|
|
// Inject vars directly so these tests exercise matcher-side handling of
|
|
// already-resolved values, not VarsMiddleware placeholder expansion.
|
|
ctx = context.WithValue(ctx, VarsCtxKey, vars)
|
|
req = req.WithContext(ctx)
|
|
|
|
addHTTPVarsToReplacer(repl, req, httptest.NewRecorder())
|
|
|
|
return req, repl
|
|
}
|
|
|
|
func TestVarsMatcherDoesNotExpandResolvedValues(t *testing.T) {
|
|
t.Setenv("CADDY_VARS_TEST_SECRET", "topsecret")
|
|
|
|
for _, tc := range []struct {
|
|
name string
|
|
target string
|
|
match VarsMatcher
|
|
headers http.Header
|
|
vars map[string]any
|
|
expect bool
|
|
}{
|
|
{
|
|
name: "literal variable value containing placeholder syntax is not re-expanded",
|
|
match: VarsMatcher{"secret": []string{"topsecret"}},
|
|
vars: map[string]any{"secret": "{env.CADDY_VARS_TEST_SECRET}"},
|
|
expect: false,
|
|
},
|
|
{
|
|
name: "placeholder key value containing placeholder syntax is not re-expanded",
|
|
match: VarsMatcher{"{http.request.header.X-Input}": []string{"topsecret"}},
|
|
headers: http.Header{"X-Input": []string{"{env.CADDY_VARS_TEST_SECRET}"}},
|
|
expect: false,
|
|
},
|
|
{
|
|
name: "query placeholder value containing placeholder syntax is not re-expanded",
|
|
target: "https://example.com/test?foo=%7Benv.CADDY_VARS_TEST_SECRET%7D",
|
|
match: VarsMatcher{"{http.request.uri.query.foo}": []string{"topsecret"}},
|
|
expect: false,
|
|
},
|
|
{
|
|
name: "matcher values still expand placeholders",
|
|
match: VarsMatcher{"secret": []string{"{env.CADDY_VARS_TEST_SECRET}"}},
|
|
vars: map[string]any{"secret": "topsecret"},
|
|
expect: true,
|
|
},
|
|
} {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
req, _ := newVarsTestRequest(t, tc.target, tc.headers, tc.vars)
|
|
|
|
actual, err := tc.match.MatchWithError(req)
|
|
if err != nil {
|
|
t.Fatalf("MatchWithError() error = %v", err)
|
|
}
|
|
|
|
if actual != tc.expect {
|
|
t.Fatalf("MatchWithError() = %t, want %t", actual, tc.expect)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestMatchVarsREDoesNotExpandResolvedValues(t *testing.T) {
|
|
t.Setenv("CADDY_VARS_TEST_SECRET", "topsecret")
|
|
|
|
for _, tc := range []struct {
|
|
name string
|
|
target string
|
|
match MatchVarsRE
|
|
headers http.Header
|
|
vars map[string]any
|
|
expect bool
|
|
}{
|
|
{
|
|
name: "literal variable value containing placeholder syntax is not re-expanded",
|
|
match: MatchVarsRE{"secret": &MatchRegexp{Pattern: "^topsecret$"}},
|
|
vars: map[string]any{"secret": "{env.CADDY_VARS_TEST_SECRET}"},
|
|
expect: false,
|
|
},
|
|
{
|
|
name: "placeholder key value containing placeholder syntax is not re-expanded",
|
|
match: MatchVarsRE{"{http.request.header.X-Input}": &MatchRegexp{Pattern: "^topsecret$"}},
|
|
headers: http.Header{"X-Input": []string{"{env.CADDY_VARS_TEST_SECRET}"}},
|
|
expect: false,
|
|
},
|
|
{
|
|
name: "query placeholder value containing placeholder syntax is not re-expanded",
|
|
target: "https://example.com/test?foo=%7Benv.CADDY_VARS_TEST_SECRET%7D",
|
|
match: MatchVarsRE{"{http.request.uri.query.foo}": &MatchRegexp{Pattern: "^topsecret$"}},
|
|
expect: false,
|
|
},
|
|
} {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
err := tc.match.Provision(caddy.Context{})
|
|
if err != nil {
|
|
t.Fatalf("Provision() error = %v", err)
|
|
}
|
|
|
|
err = tc.match.Validate()
|
|
if err != nil {
|
|
t.Fatalf("Validate() error = %v", err)
|
|
}
|
|
|
|
req, _ := newVarsTestRequest(t, tc.target, tc.headers, tc.vars)
|
|
|
|
actual, err := tc.match.MatchWithError(req)
|
|
if err != nil {
|
|
t.Fatalf("MatchWithError() error = %v", err)
|
|
}
|
|
|
|
if actual != tc.expect {
|
|
t.Fatalf("MatchWithError() = %t, want %t", actual, tc.expect)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
// TestVarsMatchersTreatErrorsByType verifies the error handling split in the
|
|
// vars matchers: only the request-body limit marker aborts request handling,
|
|
// while unrelated errors are matched on their text exactly like before.
|
|
func TestVarsMatchersTreatErrorsByType(t *testing.T) {
|
|
unrelated := HandlerError{Err: errors.New("boom"), StatusCode: http.StatusInternalServerError}
|
|
bodyLimit := RequestBodyLimitError{Err: &http.MaxBytesError{Limit: 10}}
|
|
|
|
t.Run("vars matcher matches unrelated errors on text like before", func(t *testing.T) {
|
|
req, _ := newVarsTestRequest(t, "", nil, map[string]any{"k": unrelated})
|
|
matched, err := (VarsMatcher{"k": []string{unrelated.Error()}}).MatchWithError(req)
|
|
if err != nil {
|
|
t.Fatalf("unrelated handler errors must not control request handling but got %v", err)
|
|
}
|
|
if !matched {
|
|
t.Error("expected a text match like before")
|
|
}
|
|
})
|
|
|
|
t.Run("vars regexp matcher matches unrelated errors on text like before", func(t *testing.T) {
|
|
req, _ := newVarsTestRequest(t, "", nil, map[string]any{"k": unrelated})
|
|
re := MatchVarsRE{"k": &MatchRegexp{Pattern: "^.*HTTP 500.*$"}}
|
|
if err := re.Provision(caddy.Context{}); err != nil {
|
|
t.Fatalf("provisioning the regexp: %v", err)
|
|
}
|
|
matched, err := re.MatchWithError(req)
|
|
if err != nil {
|
|
t.Fatalf("unrelated handler errors must not control request handling but got %v", err)
|
|
}
|
|
if !matched {
|
|
t.Error("expected the error text to match the regexp like before")
|
|
}
|
|
})
|
|
|
|
t.Run("body limit marker is the only propagated error", func(t *testing.T) {
|
|
req, _ := newVarsTestRequest(t, "", nil, map[string]any{"k": bodyLimit})
|
|
|
|
matched, err := (VarsMatcher{"k": []string{"x"}}).MatchWithError(req)
|
|
var marker RequestBodyLimitError
|
|
if err == nil || !errors.As(err, &marker) {
|
|
t.Fatalf("expected the body limit marker from the vars matcher but got %v", err)
|
|
}
|
|
handlerErr, ok := err.(HandlerError)
|
|
if !ok || handlerErr.StatusCode != http.StatusRequestEntityTooLarge {
|
|
t.Errorf("expected a 413 handler error carrying the marker but got %v", err)
|
|
}
|
|
if matched {
|
|
t.Error("no vars match should happen when the marker aborts")
|
|
}
|
|
|
|
re := MatchVarsRE{"k": &MatchRegexp{Pattern: ".*"}}
|
|
if err := re.Provision(caddy.Context{}); err != nil {
|
|
t.Fatalf("provisioning the regexp: %v", err)
|
|
}
|
|
matched, err = re.MatchWithError(req)
|
|
if err == nil || !errors.As(err, &marker) {
|
|
t.Fatalf("expected the body limit marker from the regexp matcher too but got %v", err)
|
|
}
|
|
handlerErr, ok = err.(HandlerError)
|
|
if !ok || handlerErr.StatusCode != http.StatusRequestEntityTooLarge {
|
|
t.Errorf("expected a 413 handler error carrying the marker but got %v", err)
|
|
}
|
|
if matched {
|
|
t.Error("no regexp match should happen when the marker aborts")
|
|
}
|
|
})
|
|
}
|