mirror of
https://github.com/caddyserver/caddy.git
synced 2025-06-01 09:02:50 +08:00
headers: Support default header values in Caddyfile with '?' (#3807)
* implement default values for header directive closes #3804 * remove `set_default` header op and rely on "require" handler instead This has the following advantages over the previous attempt: - It does not introduce a new operation for headers, but rather nicely extends over an existing feature in the header handler. - It removes the need to specify the header as "deferred" because it is already implicitely deferred by the use of the require handler. This should be less confusing to the user. * add integration test for header directive in caddyfile * bubble up errors when parsing caddyfile header directive * don't export unnecessarily and don't canonicalize headers unnecessarily * fix response headers not passed in blocks * caddyfile: fix clash when using default header in block Each header is now set in a separate handler so that it doesn't clash with other headers set/added/deleted in the same block. * caddyhttp: New idle_timeout default of 5m * reverseproxy: fix random hangs on http/2 requests with server push (#3875) see https://github.com/golang/go/issues/42534 * Refactor and cleanup with improvements * More specific link Co-authored-by: Matthew Holt <mholt@users.noreply.github.com> Co-authored-by: Денис Телюх <telyukh.denis@gmail.com>
This commit is contained in:
@ -14,8 +14,197 @@
|
||||
|
||||
package headers
|
||||
|
||||
import "testing"
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
func TestReqHeaders(t *testing.T) {
|
||||
// TODO: write tests
|
||||
"github.com/caddyserver/caddy/v2"
|
||||
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
|
||||
)
|
||||
|
||||
func TestHandler(t *testing.T) {
|
||||
for i, tc := range []struct {
|
||||
handler Handler
|
||||
reqHeader http.Header
|
||||
respHeader http.Header
|
||||
respStatusCode int
|
||||
expectedReqHeader http.Header
|
||||
expectedRespHeader http.Header
|
||||
}{
|
||||
{
|
||||
handler: Handler{
|
||||
Request: &HeaderOps{
|
||||
Add: http.Header{
|
||||
"Expose-Secrets": []string{"always"},
|
||||
},
|
||||
},
|
||||
},
|
||||
reqHeader: http.Header{
|
||||
"Expose-Secrets": []string{"i'm serious"},
|
||||
},
|
||||
expectedReqHeader: http.Header{
|
||||
"Expose-Secrets": []string{"i'm serious", "always"},
|
||||
},
|
||||
},
|
||||
{
|
||||
handler: Handler{
|
||||
Request: &HeaderOps{
|
||||
Set: http.Header{
|
||||
"Who-Wins": []string{"batman"},
|
||||
},
|
||||
},
|
||||
},
|
||||
reqHeader: http.Header{
|
||||
"Who-Wins": []string{"joker"},
|
||||
},
|
||||
expectedReqHeader: http.Header{
|
||||
"Who-Wins": []string{"batman"},
|
||||
},
|
||||
},
|
||||
{
|
||||
handler: Handler{
|
||||
Request: &HeaderOps{
|
||||
Delete: []string{"Kick-Me"},
|
||||
},
|
||||
},
|
||||
reqHeader: http.Header{
|
||||
"Kick-Me": []string{"if you can"},
|
||||
"Keep-Me": []string{"i swear i'm innocent"},
|
||||
},
|
||||
expectedReqHeader: http.Header{
|
||||
"Keep-Me": []string{"i swear i'm innocent"},
|
||||
},
|
||||
},
|
||||
{
|
||||
handler: Handler{
|
||||
Request: &HeaderOps{
|
||||
Replace: map[string][]Replacement{
|
||||
"Best-Server": {
|
||||
Replacement{
|
||||
Search: "NGINX",
|
||||
Replace: "the Caddy web server",
|
||||
},
|
||||
Replacement{
|
||||
SearchRegexp: `Apache(\d+)`,
|
||||
Replace: "Caddy",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
reqHeader: http.Header{
|
||||
"Best-Server": []string{"it's NGINX, undoubtedly", "I love Apache2"},
|
||||
},
|
||||
expectedReqHeader: http.Header{
|
||||
"Best-Server": []string{"it's the Caddy web server, undoubtedly", "I love Caddy"},
|
||||
},
|
||||
},
|
||||
{
|
||||
handler: Handler{
|
||||
Response: &RespHeaderOps{
|
||||
Require: &caddyhttp.ResponseMatcher{
|
||||
Headers: http.Header{
|
||||
"Cache-Control": nil,
|
||||
},
|
||||
},
|
||||
HeaderOps: &HeaderOps{
|
||||
Add: http.Header{
|
||||
"Cache-Control": []string{"no-cache"},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
respHeader: http.Header{},
|
||||
expectedRespHeader: http.Header{
|
||||
"Cache-Control": []string{"no-cache"},
|
||||
},
|
||||
},
|
||||
{
|
||||
handler: Handler{
|
||||
Response: &RespHeaderOps{
|
||||
Require: &caddyhttp.ResponseMatcher{
|
||||
Headers: http.Header{
|
||||
"Cache-Control": []string{"no-cache"},
|
||||
},
|
||||
},
|
||||
HeaderOps: &HeaderOps{
|
||||
Delete: []string{"Cache-Control"},
|
||||
},
|
||||
},
|
||||
},
|
||||
respHeader: http.Header{
|
||||
"Cache-Control": []string{"no-cache"},
|
||||
},
|
||||
expectedRespHeader: http.Header{},
|
||||
},
|
||||
{
|
||||
handler: Handler{
|
||||
Response: &RespHeaderOps{
|
||||
Require: &caddyhttp.ResponseMatcher{
|
||||
StatusCode: []int{5},
|
||||
},
|
||||
HeaderOps: &HeaderOps{
|
||||
Add: http.Header{
|
||||
"Fail-5xx": []string{"true"},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
respStatusCode: 503,
|
||||
respHeader: http.Header{},
|
||||
expectedRespHeader: http.Header{
|
||||
"Fail-5xx": []string{"true"},
|
||||
},
|
||||
},
|
||||
} {
|
||||
rr := httptest.NewRecorder()
|
||||
|
||||
req := &http.Request{Header: tc.reqHeader}
|
||||
repl := caddy.NewReplacer()
|
||||
ctx := context.WithValue(req.Context(), caddy.ReplacerCtxKey, repl)
|
||||
req = req.WithContext(ctx)
|
||||
|
||||
tc.handler.Provision(caddy.Context{})
|
||||
|
||||
next := nextHandler(func(w http.ResponseWriter, r *http.Request) error {
|
||||
for k, hdrs := range tc.respHeader {
|
||||
for _, v := range hdrs {
|
||||
w.Header().Add(k, v)
|
||||
}
|
||||
}
|
||||
|
||||
status := 200
|
||||
if tc.respStatusCode != 0 {
|
||||
status = tc.respStatusCode
|
||||
}
|
||||
w.WriteHeader(status)
|
||||
|
||||
if tc.expectedReqHeader != nil && !reflect.DeepEqual(r.Header, tc.expectedReqHeader) {
|
||||
return fmt.Errorf("expected request header %v, got %v", tc.expectedReqHeader, r.Header)
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
if err := tc.handler.ServeHTTP(rr, req, next); err != nil {
|
||||
t.Errorf("Test %d: %w", i, err)
|
||||
continue
|
||||
}
|
||||
|
||||
actual := rr.Header()
|
||||
if tc.expectedRespHeader != nil && !reflect.DeepEqual(actual, tc.expectedRespHeader) {
|
||||
t.Errorf("Test %d: expected response header %v, got %v", i, tc.expectedRespHeader, actual)
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type nextHandler func(http.ResponseWriter, *http.Request) error
|
||||
|
||||
func (f nextHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) error {
|
||||
return f(w, r)
|
||||
}
|
||||
|
Reference in New Issue
Block a user