mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-27 06:03:48 +03:00
a5ebec0041
Previously, all matchers in a route would be evaluated before any handlers were executed, and a composite route of the matching routes would be created. This made rewrites especially tricky, since the only way to defer later matchers' evaluation was to wrap them in a subroute, or to invoke a "rehandle" which often caused bugs. Instead, this new sequential design evaluates each route's matchers then its handlers in lock-step; matcher-handlers-matcher-handlers... If the first matching route consists of a rewrite, then the second route will be evaluated against the rewritten request, rather than the original one, and so on. This should do away with any need for rehandling. I've also taken this opportunity to avoid adding new values to the request context in the handler chain, as this creates a copy of the Request struct, which may possibly lead to bugs like it has in the past (see PR #1542, PR #1481, and maybe issue #2463). We now add all the expected context values in the top-level handler at the server, then any new values can be added to the variable table via the VarsCtxKey context key, or just the GetVar/SetVar functions. In particular, we are using this facility to convey dial information in the reverse proxy. Had to be careful in one place as the middleware compilation logic has changed, and moved a bit. We no longer compile a middleware chain per- request; instead, we can compile it at provision-time, and defer only the evaluation of matchers to request-time, which should slightly improve performance. Doing this, however, we take advantage of multiple function closures, and we also changed the use of HandlerFunc (function pointer) to Handler (interface)... this led to a situation where, if we aren't careful, allows one request routed a certain way to permanently change the "next" handler for all/most other requests! We avoid this by making a copy of the interface value (which is a lightweight pointer copy) and using exclusively that within our wrapped handlers. This way, the original stack frame is preserved in a "read-only" fashion. The comments in the code describe this phenomenon. This may very well be a breaking change for some configurations, however I do not expect it to impact many people. I will make it clear in the release notes that this change has occurred.
111 lines
3 KiB
Go
111 lines
3 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 (
|
|
"fmt"
|
|
mathrand "math/rand"
|
|
"path"
|
|
"runtime"
|
|
"strings"
|
|
|
|
"github.com/caddyserver/caddy/v2"
|
|
)
|
|
|
|
// Error is a convenient way for a Handler to populate the
|
|
// essential fields of a HandlerError. If err is itself a
|
|
// HandlerError, then any essential fields that are not
|
|
// set will be populated.
|
|
func Error(statusCode int, err error) HandlerError {
|
|
const idLen = 9
|
|
if he, ok := err.(HandlerError); ok {
|
|
if he.ID == "" {
|
|
he.ID = randString(idLen, true)
|
|
}
|
|
if he.Trace == "" {
|
|
he.Trace = trace()
|
|
}
|
|
if he.StatusCode == 0 {
|
|
he.StatusCode = statusCode
|
|
}
|
|
return he
|
|
}
|
|
return HandlerError{
|
|
ID: randString(idLen, true),
|
|
StatusCode: statusCode,
|
|
Err: err,
|
|
Trace: trace(),
|
|
}
|
|
}
|
|
|
|
// HandlerError is a serializable representation of
|
|
// an error from within an HTTP handler.
|
|
type HandlerError struct {
|
|
Err error // the original error value and message
|
|
StatusCode int // the HTTP status code to associate with this error
|
|
|
|
ID string // generated; for identifying this error in logs
|
|
Trace string // produced from call stack
|
|
}
|
|
|
|
func (e HandlerError) Error() string {
|
|
var s string
|
|
if e.ID != "" {
|
|
s += fmt.Sprintf("{id=%s}", e.ID)
|
|
}
|
|
if e.Trace != "" {
|
|
s += " " + e.Trace
|
|
}
|
|
if e.StatusCode != 0 {
|
|
s += fmt.Sprintf(": HTTP %d", e.StatusCode)
|
|
}
|
|
if e.Err != nil {
|
|
s += ": " + e.Err.Error()
|
|
}
|
|
return strings.TrimSpace(s)
|
|
}
|
|
|
|
// randString returns a string of n random characters.
|
|
// It is not even remotely secure OR a proper distribution.
|
|
// But it's good enough for some things. It excludes certain
|
|
// confusing characters like I, l, 1, 0, O, etc. If sameCase
|
|
// is true, then uppercase letters are excluded.
|
|
func randString(n int, sameCase bool) string {
|
|
if n <= 0 {
|
|
return ""
|
|
}
|
|
dict := []byte("abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRTUVWXY23456789")
|
|
if sameCase {
|
|
dict = []byte("abcdefghijkmnpqrstuvwxyz0123456789")
|
|
}
|
|
b := make([]byte, n)
|
|
for i := range b {
|
|
b[i] = dict[mathrand.Int63()%int64(len(dict))]
|
|
}
|
|
return string(b)
|
|
}
|
|
|
|
func trace() string {
|
|
if pc, file, line, ok := runtime.Caller(2); ok {
|
|
filename := path.Base(file)
|
|
pkgAndFuncName := path.Base(runtime.FuncForPC(pc).Name())
|
|
return fmt.Sprintf("%s (%s:%d)", pkgAndFuncName, filename, line)
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// ErrorCtxKey is the context key to use when storing
|
|
// an error (for use with context.Context).
|
|
const ErrorCtxKey = caddy.CtxKey("handler_chain_error")
|