blackbeard420/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-03-09 23:49:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

caddyhttp: Set Content-Type for static response (#4999)

Browse Source
This commit is contained in:
Matt Holt 2022-08-31 09:43:46 -06:00 committed by GitHub
parent 687a4b9e81
commit 2d5a30b908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/caddyhttp/staticresp.go
View File

@ -88,10 +88,18 @@ type StaticResponse struct {
// if needing to use a placeholder, a string. // if needing to use a placeholder, a string.
StatusCode WeakString `json:"status_code,omitempty"` StatusCode WeakString `json:"status_code,omitempty"`
// Header fields to set on the response. // Header fields to set on the response; overwrites any existing
// header fields of the same names after normalization.
Headers http.Header `json:"headers,omitempty"` Headers http.Header `json:"headers,omitempty"`
// The response body. // The response body. If non-empty, the Content-Type header may
// be added automatically if it is not explicitly configured nor
// already set on the response; the default value is
// "text/plain; charset=utf-8" unless the body is a valid JSON object
// or array, in which case the value will be "application/json".
// Other than those common special cases the Content-Type header
// should be set explicitly if it is desired because MIME sniffing
// is disabled for safety.
Body string `json:"body,omitempty"` Body string `json:"body,omitempty"`
// If true, the server will close the client's connection // If true, the server will close the client's connection
@ -114,10 +122,10 @@ func (StaticResponse) CaddyModule() caddy.ModuleInfo {
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax: // UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
// //
// respond [<matcher>] <status>|<body> [<status>] { // respond [<matcher>] <status>|<body> [<status>] {
// body <text> // body <text>
// close // close
// } // }
// //
// If there is just one argument (other than the matcher), it is considered // If there is just one argument (other than the matcher), it is considered
// to be a status code if it's a valid positive integer of 3 digits. // to be a status code if it's a valid positive integer of 3 digits.
@ -186,7 +194,23 @@ func (s StaticResponse) ServeHTTP(w http.ResponseWriter, r *http.Request, _ Hand
w.Header()[field] = newVals w.Header()[field] = newVals
} }
// do not allow Go to sniff the content-type // implicitly set Content-Type header if we can do so safely
// (this allows templates handler to eval templates successfully
// or for clients to render JSON properly which is very common)
body := repl.ReplaceKnown(s.Body, "")
if body != "" && w.Header().Get("Content-Type") == "" {
content := strings.TrimSpace(s.Body)
if len(content) > 2 &&
(content[0] == '{' && content[len(content)-1] == '}' ||
(content[0] == '[' && content[len(content)-1] == ']')) &&
json.Valid([]byte(content)) {
w.Header().Set("Content-Type", "application/json")
} else {
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
}
}
// do not allow Go to sniff the content-type, for safety
if w.Header().Get("Content-Type") == "" { if w.Header().Get("Content-Type") == "" {
w.Header()["Content-Type"] = nil w.Header()["Content-Type"] = nil
} }
@ -213,8 +237,8 @@ func (s StaticResponse) ServeHTTP(w http.ResponseWriter, r *http.Request, _ Hand
w.WriteHeader(statusCode) w.WriteHeader(statusCode)
// write response body // write response body
if s.Body != "" { if body != "" {
fmt.Fprint(w, repl.ReplaceKnown(s.Body, "")) fmt.Fprint(w, body)
} }
return nil return nil