mirror of
https://github.com/caddyserver/caddy.git
synced 2025-05-31 00:06:04 +08:00
caddyhttp: Implement http.request.uuid placeholder (#4285)
This commit is contained in:
@ -40,6 +40,7 @@ import (
|
||||
|
||||
"github.com/caddyserver/caddy/v2"
|
||||
"github.com/caddyserver/caddy/v2/modules/caddytls"
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
// NewTestReplacer creates a replacer for an http.Request
|
||||
@ -54,6 +55,7 @@ func NewTestReplacer(req *http.Request) *caddy.Replacer {
|
||||
|
||||
func addHTTPVarsToReplacer(repl *caddy.Replacer, req *http.Request, w http.ResponseWriter) {
|
||||
SetVar(req.Context(), "start_time", time.Now())
|
||||
SetVar(req.Context(), "uuid", new(requestID))
|
||||
|
||||
httpVars := func(key string) (interface{}, bool) {
|
||||
if req != nil {
|
||||
@ -146,6 +148,9 @@ func addHTTPVarsToReplacer(repl *caddy.Replacer, req *http.Request, w http.Respo
|
||||
case "http.request.duration":
|
||||
start := GetVar(req.Context(), "start_time").(time.Time)
|
||||
return time.Since(start), true
|
||||
case "http.request.uuid":
|
||||
id := GetVar(req.Context(), "uuid").(*requestID)
|
||||
return id.String(), true
|
||||
case "http.request.body":
|
||||
if req.Body == nil {
|
||||
return "", true
|
||||
@ -400,6 +405,20 @@ func getTLSPeerCert(cs *tls.ConnectionState) *x509.Certificate {
|
||||
return cs.PeerCertificates[0]
|
||||
}
|
||||
|
||||
type requestID struct {
|
||||
value string
|
||||
}
|
||||
|
||||
// Lazy generates UUID string or return cached value if present
|
||||
func (rid *requestID) String() string {
|
||||
if rid.value == "" {
|
||||
if id, err := uuid.NewRandom(); err == nil {
|
||||
rid.value = id.String()
|
||||
}
|
||||
}
|
||||
return rid.value
|
||||
}
|
||||
|
||||
const (
|
||||
reqCookieReplPrefix = "http.request.cookie."
|
||||
reqHeaderReplPrefix = "http.request.header."
|
||||
|
Reference in New Issue
Block a user