From 6f0f159ba56adeb6e2cbbb408651419b87f20856 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Thu, 16 Jul 2020 19:25:37 -0600 Subject: caddyhttp: Add {http.request.body} placeholder --- modules/caddyhttp/replacer.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'modules/caddyhttp/replacer.go') diff --git a/modules/caddyhttp/replacer.go b/modules/caddyhttp/replacer.go index f595021..3f4a808 100644 --- a/modules/caddyhttp/replacer.go +++ b/modules/caddyhttp/replacer.go @@ -15,6 +15,7 @@ package caddyhttp import ( + "bytes" "context" "crypto/ecdsa" "crypto/ed25519" @@ -25,6 +26,8 @@ import ( "crypto/x509" "encoding/asn1" "fmt" + "io" + "io/ioutil" "net" "net/http" "net/textproto" @@ -136,6 +139,24 @@ func addHTTPVarsToReplacer(repl *caddy.Replacer, req *http.Request, w http.Respo return dir, true case "http.request.uri.query": return req.URL.RawQuery, true + case "http.request.body": + if req.Body == nil { + return "", true + } + // normally net/http will close the body for us, but since we + // are replacing it with a fake one, we have to ensure we close + // the real body ourselves when we're done + defer req.Body.Close() + // read the request body into a buffer (can't pool because we + // don't know its lifetime and would have to make a copy anyway) + buf := new(bytes.Buffer) + _, err := io.Copy(buf, req.Body) + if err != nil { + return "", true + } + // replace real body with buffered data + req.Body = ioutil.NopCloser(buf) + return buf.String(), true // original request, before any internal changes case "http.request.orig_method": -- cgit v1.2.3