2017-09-23 00:56:58 -05:00
|
|
|
// Copyright 2015 Light Code Labs, LLC
|
|
|
|
//
|
|
|
|
// 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.
|
|
|
|
|
Rewrote Caddy from the ground up; initial commit of 0.9 branch
These changes span work from the last ~4 months in an effort to make
Caddy more extensible, reduce the coupling between its components, and
lay a more robust foundation of code going forward into 1.0. A bunch of
new features have been added, too, with even higher future potential.
The most significant design change is an overall inversion of
dependencies. Instead of the caddy package knowing about the server
and the notion of middleware and config, the caddy package exposes an
interface that other components plug into. This does introduce more
indirection when reading the code, but every piece is very modular and
pluggable. Even the HTTP server is pluggable.
The caddy package has been moved to the top level, and main has been
pushed into a subfolder called caddy. The actual logic of the main
file has been pushed even further into caddy/caddymain/run.go so that
custom builds of Caddy can be 'go get'able.
The HTTPS logic was surgically separated into two parts to divide the
TLS-specific code and the HTTPS-specific code. The caddytls package can
now be used by any type of server that needs TLS, not just HTTP. I also
added the ability to customize nearly every aspect of TLS at the site
level rather than all sites sharing the same TLS configuration. Not all
of this flexibility is exposed in the Caddyfile yet, but it may be in
the future. Caddy can also generate self-signed certificates in memory
for the convenience of a developer working on localhost who wants HTTPS.
And Caddy now supports the DNS challenge, assuming at least one DNS
provider is plugged in.
Dozens, if not hundreds, of other minor changes swept through the code
base as I literally started from an empty main function, copying over
functions or files as needed, then adjusting them to fit in the new
design. Most tests have been restored and adapted to the new API,
but more work is needed there.
A lot of what was "impossible" before is now possible, or can be made
possible with minimal disruption of the code. For example, it's fairly
easy to make plugins hook into another part of the code via callbacks.
Plugins can do more than just be directives; we now have plugins that
customize how the Caddyfile is loaded (useful when you need to get your
configuration from a remote store).
Site addresses no longer need be just a host and port. They can have a
path, allowing you to scope a configuration to a specific path. There is
no inheretance, however; each site configuration is distinct.
Thanks to amazing work by Lucas Clemente, this commit adds experimental
QUIC support. Turn it on using the -quic flag; your browser may have
to be configured to enable it.
Almost everything is here, but you will notice that most of the middle-
ware are missing. After those are transferred over, we'll be ready for
beta tests.
I'm very excited to get this out. Thanks for everyone's help and
patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
|
|
|
package httpserver
|
2015-01-13 14:43:45 -05:00
|
|
|
|
|
|
|
import (
|
2016-08-10 09:36:16 -05:00
|
|
|
"bytes"
|
2016-08-10 21:43:26 -05:00
|
|
|
"io"
|
2016-08-10 09:04:57 -05:00
|
|
|
"io/ioutil"
|
2015-03-27 00:39:36 -05:00
|
|
|
"net"
|
2015-01-13 14:43:45 -05:00
|
|
|
"net/http"
|
2016-06-07 12:06:24 -05:00
|
|
|
"net/http/httputil"
|
2015-12-24 03:00:10 -05:00
|
|
|
"net/url"
|
2016-04-16 12:03:56 -05:00
|
|
|
"os"
|
2015-09-20 02:49:55 -05:00
|
|
|
"path"
|
2015-01-13 14:43:45 -05:00
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
"time"
|
2017-02-28 07:54:12 -05:00
|
|
|
|
|
|
|
"github.com/mholt/caddy"
|
2015-01-13 14:43:45 -05:00
|
|
|
)
|
|
|
|
|
2016-06-07 12:06:24 -05:00
|
|
|
// requestReplacer is a strings.Replacer which is used to
|
|
|
|
// encode literal \r and \n characters and keep everything
|
|
|
|
// on one line
|
|
|
|
var requestReplacer = strings.NewReplacer(
|
|
|
|
"\r", "\\r",
|
|
|
|
"\n", "\\n",
|
|
|
|
)
|
|
|
|
|
2017-01-14 17:54:27 -05:00
|
|
|
var now = time.Now
|
|
|
|
|
2015-05-03 14:43:50 -05:00
|
|
|
// Replacer is a type which can replace placeholder
|
2015-01-13 14:43:45 -05:00
|
|
|
// substrings in a string with actual values from a
|
2016-03-20 22:56:13 -05:00
|
|
|
// http.Request and ResponseRecorder. Always use
|
|
|
|
// NewReplacer to get one of these. Any placeholders
|
|
|
|
// made with Set() should overwrite existing values if
|
|
|
|
// the key is already used.
|
2015-05-03 14:43:50 -05:00
|
|
|
type Replacer interface {
|
|
|
|
Replace(string) string
|
2015-12-30 14:42:03 -05:00
|
|
|
Set(key, value string)
|
2015-05-03 14:43:50 -05:00
|
|
|
}
|
|
|
|
|
2016-03-20 22:56:13 -05:00
|
|
|
// replacer implements Replacer. customReplacements
|
|
|
|
// is used to store custom replacements created with
|
|
|
|
// Set() until the time of replacement, at which point
|
|
|
|
// they will be used to overwrite other replacements
|
|
|
|
// if there is a name conflict.
|
2015-07-24 11:11:34 -05:00
|
|
|
type replacer struct {
|
2016-08-18 21:36:10 -05:00
|
|
|
customReplacements map[string]string
|
2016-03-20 22:56:13 -05:00
|
|
|
emptyValue string
|
|
|
|
responseRecorder *ResponseRecorder
|
2016-08-18 21:36:10 -05:00
|
|
|
request *http.Request
|
2016-08-19 00:09:22 -05:00
|
|
|
requestBody *limitWriter
|
|
|
|
}
|
|
|
|
|
|
|
|
type limitWriter struct {
|
|
|
|
w bytes.Buffer
|
|
|
|
remain int
|
|
|
|
}
|
|
|
|
|
|
|
|
func newLimitWriter(max int) *limitWriter {
|
|
|
|
return &limitWriter{
|
|
|
|
w: bytes.Buffer{},
|
|
|
|
remain: max,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (lw *limitWriter) Write(p []byte) (int, error) {
|
|
|
|
// skip if we are full
|
|
|
|
if lw.remain <= 0 {
|
|
|
|
return len(p), nil
|
|
|
|
}
|
|
|
|
if n := len(p); n > lw.remain {
|
|
|
|
p = p[:lw.remain]
|
|
|
|
}
|
|
|
|
n, err := lw.w.Write(p)
|
|
|
|
lw.remain -= n
|
|
|
|
return n, err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (lw *limitWriter) String() string {
|
|
|
|
return lw.w.String()
|
2015-07-24 11:11:34 -05:00
|
|
|
}
|
2015-01-13 14:43:45 -05:00
|
|
|
|
2016-03-20 22:56:13 -05:00
|
|
|
// NewReplacer makes a new replacer based on r and rr which
|
|
|
|
// are used for request and response placeholders, respectively.
|
|
|
|
// Request placeholders are created immediately, whereas
|
|
|
|
// response placeholders are not created until Replace()
|
|
|
|
// is invoked. rr may be nil if it is not available.
|
|
|
|
// emptyValue should be the string that is used in place
|
|
|
|
// of empty string (can still be empty string).
|
2016-02-20 16:52:42 -05:00
|
|
|
func NewReplacer(r *http.Request, rr *ResponseRecorder, emptyValue string) Replacer {
|
2017-11-07 12:10:03 -05:00
|
|
|
repl := &replacer{
|
|
|
|
request: r,
|
|
|
|
responseRecorder: rr,
|
|
|
|
emptyValue: emptyValue,
|
2016-08-19 00:09:22 -05:00
|
|
|
}
|
2017-11-07 12:10:03 -05:00
|
|
|
|
|
|
|
// extract customReplacements from a request replacer when present.
|
|
|
|
if existing, ok := r.Context().Value(ReplacerCtxKey).(*replacer); ok {
|
|
|
|
repl.requestBody = existing.requestBody
|
|
|
|
repl.customReplacements = existing.customReplacements
|
|
|
|
} else {
|
|
|
|
// if there is no existing replacer, build one from scratch.
|
|
|
|
rb := newLimitWriter(MaxLogBodySize)
|
|
|
|
if r.Body != nil {
|
|
|
|
r.Body = struct {
|
|
|
|
io.Reader
|
|
|
|
io.Closer
|
|
|
|
}{io.TeeReader(r.Body, rb), io.Closer(r.Body)}
|
|
|
|
}
|
|
|
|
repl.requestBody = rb
|
|
|
|
repl.customReplacements = make(map[string]string)
|
2015-05-03 14:38:06 -05:00
|
|
|
}
|
2017-11-07 12:10:03 -05:00
|
|
|
|
|
|
|
return repl
|
2015-01-13 14:43:45 -05:00
|
|
|
}
|
|
|
|
|
2016-08-11 18:08:49 -05:00
|
|
|
func canLogRequest(r *http.Request) bool {
|
2016-08-10 09:04:57 -05:00
|
|
|
if r.Method == "POST" || r.Method == "PUT" {
|
|
|
|
for _, cType := range r.Header[headerContentType] {
|
|
|
|
// the cType could have charset and other info
|
2016-09-24 13:09:28 -05:00
|
|
|
if strings.Contains(cType, contentTypeJSON) || strings.Contains(cType, contentTypeXML) {
|
2016-08-11 18:08:49 -05:00
|
|
|
return true
|
2016-08-10 09:04:57 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-08-11 18:08:49 -05:00
|
|
|
return false
|
2016-08-10 09:04:57 -05:00
|
|
|
}
|
|
|
|
|
2015-01-30 00:52:21 -05:00
|
|
|
// Replace performs a replacement of values on s and returns
|
2015-01-13 14:43:45 -05:00
|
|
|
// the string with the replaced values.
|
2016-03-20 22:56:13 -05:00
|
|
|
func (r *replacer) Replace(s string) string {
|
2016-06-29 07:41:52 -05:00
|
|
|
// Do not attempt replacements if no placeholder is found.
|
|
|
|
if !strings.ContainsAny(s, "{}") {
|
|
|
|
return s
|
|
|
|
}
|
|
|
|
|
2016-08-18 21:36:10 -05:00
|
|
|
result := ""
|
|
|
|
for {
|
|
|
|
idxStart := strings.Index(s, "{")
|
|
|
|
if idxStart == -1 {
|
|
|
|
// no placeholder anymore
|
|
|
|
break
|
2016-08-08 11:14:53 -05:00
|
|
|
}
|
2016-08-18 21:36:10 -05:00
|
|
|
idxEnd := strings.Index(s[idxStart:], "}")
|
|
|
|
if idxEnd == -1 {
|
|
|
|
// unpaired placeholder
|
2015-12-31 14:31:30 -05:00
|
|
|
break
|
2015-12-31 14:12:16 -05:00
|
|
|
}
|
2016-08-18 21:36:10 -05:00
|
|
|
idxEnd += idxStart
|
2015-01-13 14:43:45 -05:00
|
|
|
|
2016-08-18 21:36:10 -05:00
|
|
|
// get a replacement
|
|
|
|
placeholder := s[idxStart : idxEnd+1]
|
|
|
|
replacement := r.getSubstitution(placeholder)
|
|
|
|
|
|
|
|
// append prefix + replacement
|
|
|
|
result += s[:idxStart] + replacement
|
|
|
|
|
|
|
|
// strip out scanned parts
|
|
|
|
s = s[idxEnd+1:]
|
2015-01-13 14:43:45 -05:00
|
|
|
}
|
2015-12-31 14:12:16 -05:00
|
|
|
|
2016-08-18 21:36:10 -05:00
|
|
|
// append unscanned parts
|
|
|
|
return result + s
|
2015-01-13 14:43:45 -05:00
|
|
|
}
|
|
|
|
|
2016-08-08 11:14:53 -05:00
|
|
|
func roundDuration(d time.Duration) time.Duration {
|
|
|
|
if d >= time.Millisecond {
|
|
|
|
return round(d, time.Millisecond)
|
|
|
|
} else if d >= time.Microsecond {
|
|
|
|
return round(d, time.Microsecond)
|
|
|
|
}
|
|
|
|
|
|
|
|
return d
|
|
|
|
}
|
|
|
|
|
|
|
|
// round rounds d to the nearest r
|
|
|
|
func round(d, r time.Duration) time.Duration {
|
|
|
|
if r <= 0 {
|
|
|
|
return d
|
|
|
|
}
|
|
|
|
neg := d < 0
|
|
|
|
if neg {
|
|
|
|
d = -d
|
|
|
|
}
|
|
|
|
if m := d % r; m+m < r {
|
|
|
|
d = d - m
|
|
|
|
} else {
|
|
|
|
d = d + r - m
|
|
|
|
}
|
|
|
|
if neg {
|
|
|
|
return -d
|
|
|
|
}
|
|
|
|
return d
|
|
|
|
}
|
|
|
|
|
2016-08-18 21:36:10 -05:00
|
|
|
// getSubstitution retrieves value from corresponding key
|
|
|
|
func (r *replacer) getSubstitution(key string) string {
|
|
|
|
// search custom replacements first
|
|
|
|
if value, ok := r.customReplacements[key]; ok {
|
|
|
|
return value
|
|
|
|
}
|
|
|
|
|
2016-09-28 03:54:53 -05:00
|
|
|
// search request headers then
|
|
|
|
if key[1] == '>' {
|
|
|
|
want := key[2 : len(key)-1]
|
|
|
|
for key, values := range r.request.Header {
|
|
|
|
// Header placeholders (case-insensitive)
|
|
|
|
if strings.EqualFold(key, want) {
|
|
|
|
return strings.Join(values, ",")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-02-15 23:59:24 -05:00
|
|
|
// next check for cookies
|
|
|
|
if key[1] == '~' {
|
|
|
|
name := key[2 : len(key)-1]
|
|
|
|
if cookie, err := r.request.Cookie(name); err == nil {
|
|
|
|
return cookie.Value
|
|
|
|
}
|
|
|
|
}
|
2017-03-03 01:25:28 -05:00
|
|
|
// next check for query argument
|
|
|
|
if key[1] == '?' {
|
|
|
|
query := r.request.URL.Query()
|
|
|
|
name := key[2 : len(key)-1]
|
|
|
|
return query.Get(name)
|
|
|
|
}
|
2016-09-28 03:54:53 -05:00
|
|
|
|
|
|
|
// search default replacements in the end
|
2016-08-18 21:36:10 -05:00
|
|
|
switch key {
|
|
|
|
case "{method}":
|
|
|
|
return r.request.Method
|
|
|
|
case "{scheme}":
|
|
|
|
if r.request.TLS != nil {
|
|
|
|
return "https"
|
|
|
|
}
|
|
|
|
return "http"
|
|
|
|
case "{hostname}":
|
|
|
|
name, err := os.Hostname()
|
|
|
|
if err != nil {
|
|
|
|
return r.emptyValue
|
|
|
|
}
|
|
|
|
return name
|
|
|
|
case "{host}":
|
|
|
|
return r.request.Host
|
|
|
|
case "{hostonly}":
|
|
|
|
host, _, err := net.SplitHostPort(r.request.Host)
|
|
|
|
if err != nil {
|
|
|
|
return r.request.Host
|
|
|
|
}
|
|
|
|
return host
|
|
|
|
case "{path}":
|
httpserver/all: Clean up and standardize request URL handling (#1633)
* httpserver/all: Clean up and standardize request URL handling
The HTTP server now always creates a context value on the request which
is a copy of the request's URL struct. It should not be modified by
middlewares, but it is safe to get the value out of the request and make
changes to it locally-scoped. Thus, the value in the context always
stores the original request URL information as it was received. Any
rewrites that happen will be to the request's URL field directly.
The HTTP server no longer cleans /sanitizes the request URL. It made too
many strong assumptions and ended up making a lot of middleware more
complicated, including upstream proxying (and fastcgi). To alleviate
this complexity, we no longer change the request URL. Middlewares are
responsible to access the disk safely by using http.Dir or, if not
actually opening files, they can use httpserver.SafePath().
I'm hoping this will address issues with #1624, #1584, #1582, and others.
* staticfiles: Fix test on Windows
@abiosoft: I still can't figure out exactly what this is for. 😅
* Use (potentially) changed URL for browse redirects, as before
* Use filepath.ToSlash, clean up a couple proxy test cases
* Oops, fix variable name
2017-05-02 00:11:10 -05:00
|
|
|
u, _ := r.request.Context().Value(OriginalURLCtxKey).(url.URL)
|
|
|
|
return u.Path
|
2016-08-18 21:36:10 -05:00
|
|
|
case "{path_escaped}":
|
httpserver/all: Clean up and standardize request URL handling (#1633)
* httpserver/all: Clean up and standardize request URL handling
The HTTP server now always creates a context value on the request which
is a copy of the request's URL struct. It should not be modified by
middlewares, but it is safe to get the value out of the request and make
changes to it locally-scoped. Thus, the value in the context always
stores the original request URL information as it was received. Any
rewrites that happen will be to the request's URL field directly.
The HTTP server no longer cleans /sanitizes the request URL. It made too
many strong assumptions and ended up making a lot of middleware more
complicated, including upstream proxying (and fastcgi). To alleviate
this complexity, we no longer change the request URL. Middlewares are
responsible to access the disk safely by using http.Dir or, if not
actually opening files, they can use httpserver.SafePath().
I'm hoping this will address issues with #1624, #1584, #1582, and others.
* staticfiles: Fix test on Windows
@abiosoft: I still can't figure out exactly what this is for. 😅
* Use (potentially) changed URL for browse redirects, as before
* Use filepath.ToSlash, clean up a couple proxy test cases
* Oops, fix variable name
2017-05-02 00:11:10 -05:00
|
|
|
u, _ := r.request.Context().Value(OriginalURLCtxKey).(url.URL)
|
|
|
|
return url.QueryEscape(u.Path)
|
2017-06-24 15:54:35 -05:00
|
|
|
case "{request_id}":
|
|
|
|
reqid, _ := r.request.Context().Value(RequestIDCtxKey).(string)
|
|
|
|
return reqid
|
2017-01-24 00:15:27 -05:00
|
|
|
case "{rewrite_path}":
|
|
|
|
return r.request.URL.Path
|
|
|
|
case "{rewrite_path_escaped}":
|
2016-08-18 21:36:10 -05:00
|
|
|
return url.QueryEscape(r.request.URL.Path)
|
|
|
|
case "{query}":
|
httpserver/all: Clean up and standardize request URL handling (#1633)
* httpserver/all: Clean up and standardize request URL handling
The HTTP server now always creates a context value on the request which
is a copy of the request's URL struct. It should not be modified by
middlewares, but it is safe to get the value out of the request and make
changes to it locally-scoped. Thus, the value in the context always
stores the original request URL information as it was received. Any
rewrites that happen will be to the request's URL field directly.
The HTTP server no longer cleans /sanitizes the request URL. It made too
many strong assumptions and ended up making a lot of middleware more
complicated, including upstream proxying (and fastcgi). To alleviate
this complexity, we no longer change the request URL. Middlewares are
responsible to access the disk safely by using http.Dir or, if not
actually opening files, they can use httpserver.SafePath().
I'm hoping this will address issues with #1624, #1584, #1582, and others.
* staticfiles: Fix test on Windows
@abiosoft: I still can't figure out exactly what this is for. 😅
* Use (potentially) changed URL for browse redirects, as before
* Use filepath.ToSlash, clean up a couple proxy test cases
* Oops, fix variable name
2017-05-02 00:11:10 -05:00
|
|
|
u, _ := r.request.Context().Value(OriginalURLCtxKey).(url.URL)
|
|
|
|
return u.RawQuery
|
2016-08-18 21:36:10 -05:00
|
|
|
case "{query_escaped}":
|
httpserver/all: Clean up and standardize request URL handling (#1633)
* httpserver/all: Clean up and standardize request URL handling
The HTTP server now always creates a context value on the request which
is a copy of the request's URL struct. It should not be modified by
middlewares, but it is safe to get the value out of the request and make
changes to it locally-scoped. Thus, the value in the context always
stores the original request URL information as it was received. Any
rewrites that happen will be to the request's URL field directly.
The HTTP server no longer cleans /sanitizes the request URL. It made too
many strong assumptions and ended up making a lot of middleware more
complicated, including upstream proxying (and fastcgi). To alleviate
this complexity, we no longer change the request URL. Middlewares are
responsible to access the disk safely by using http.Dir or, if not
actually opening files, they can use httpserver.SafePath().
I'm hoping this will address issues with #1624, #1584, #1582, and others.
* staticfiles: Fix test on Windows
@abiosoft: I still can't figure out exactly what this is for. 😅
* Use (potentially) changed URL for browse redirects, as before
* Use filepath.ToSlash, clean up a couple proxy test cases
* Oops, fix variable name
2017-05-02 00:11:10 -05:00
|
|
|
u, _ := r.request.Context().Value(OriginalURLCtxKey).(url.URL)
|
|
|
|
return url.QueryEscape(u.RawQuery)
|
2016-08-18 21:36:10 -05:00
|
|
|
case "{fragment}":
|
httpserver/all: Clean up and standardize request URL handling (#1633)
* httpserver/all: Clean up and standardize request URL handling
The HTTP server now always creates a context value on the request which
is a copy of the request's URL struct. It should not be modified by
middlewares, but it is safe to get the value out of the request and make
changes to it locally-scoped. Thus, the value in the context always
stores the original request URL information as it was received. Any
rewrites that happen will be to the request's URL field directly.
The HTTP server no longer cleans /sanitizes the request URL. It made too
many strong assumptions and ended up making a lot of middleware more
complicated, including upstream proxying (and fastcgi). To alleviate
this complexity, we no longer change the request URL. Middlewares are
responsible to access the disk safely by using http.Dir or, if not
actually opening files, they can use httpserver.SafePath().
I'm hoping this will address issues with #1624, #1584, #1582, and others.
* staticfiles: Fix test on Windows
@abiosoft: I still can't figure out exactly what this is for. 😅
* Use (potentially) changed URL for browse redirects, as before
* Use filepath.ToSlash, clean up a couple proxy test cases
* Oops, fix variable name
2017-05-02 00:11:10 -05:00
|
|
|
u, _ := r.request.Context().Value(OriginalURLCtxKey).(url.URL)
|
|
|
|
return u.Fragment
|
2016-08-18 21:36:10 -05:00
|
|
|
case "{proto}":
|
|
|
|
return r.request.Proto
|
|
|
|
case "{remote}":
|
|
|
|
host, _, err := net.SplitHostPort(r.request.RemoteAddr)
|
|
|
|
if err != nil {
|
|
|
|
return r.request.RemoteAddr
|
|
|
|
}
|
|
|
|
return host
|
|
|
|
case "{port}":
|
|
|
|
_, port, err := net.SplitHostPort(r.request.RemoteAddr)
|
|
|
|
if err != nil {
|
|
|
|
return r.emptyValue
|
|
|
|
}
|
|
|
|
return port
|
|
|
|
case "{uri}":
|
httpserver/all: Clean up and standardize request URL handling (#1633)
* httpserver/all: Clean up and standardize request URL handling
The HTTP server now always creates a context value on the request which
is a copy of the request's URL struct. It should not be modified by
middlewares, but it is safe to get the value out of the request and make
changes to it locally-scoped. Thus, the value in the context always
stores the original request URL information as it was received. Any
rewrites that happen will be to the request's URL field directly.
The HTTP server no longer cleans /sanitizes the request URL. It made too
many strong assumptions and ended up making a lot of middleware more
complicated, including upstream proxying (and fastcgi). To alleviate
this complexity, we no longer change the request URL. Middlewares are
responsible to access the disk safely by using http.Dir or, if not
actually opening files, they can use httpserver.SafePath().
I'm hoping this will address issues with #1624, #1584, #1582, and others.
* staticfiles: Fix test on Windows
@abiosoft: I still can't figure out exactly what this is for. 😅
* Use (potentially) changed URL for browse redirects, as before
* Use filepath.ToSlash, clean up a couple proxy test cases
* Oops, fix variable name
2017-05-02 00:11:10 -05:00
|
|
|
u, _ := r.request.Context().Value(OriginalURLCtxKey).(url.URL)
|
|
|
|
return u.RequestURI()
|
2016-08-18 21:36:10 -05:00
|
|
|
case "{uri_escaped}":
|
httpserver/all: Clean up and standardize request URL handling (#1633)
* httpserver/all: Clean up and standardize request URL handling
The HTTP server now always creates a context value on the request which
is a copy of the request's URL struct. It should not be modified by
middlewares, but it is safe to get the value out of the request and make
changes to it locally-scoped. Thus, the value in the context always
stores the original request URL information as it was received. Any
rewrites that happen will be to the request's URL field directly.
The HTTP server no longer cleans /sanitizes the request URL. It made too
many strong assumptions and ended up making a lot of middleware more
complicated, including upstream proxying (and fastcgi). To alleviate
this complexity, we no longer change the request URL. Middlewares are
responsible to access the disk safely by using http.Dir or, if not
actually opening files, they can use httpserver.SafePath().
I'm hoping this will address issues with #1624, #1584, #1582, and others.
* staticfiles: Fix test on Windows
@abiosoft: I still can't figure out exactly what this is for. 😅
* Use (potentially) changed URL for browse redirects, as before
* Use filepath.ToSlash, clean up a couple proxy test cases
* Oops, fix variable name
2017-05-02 00:11:10 -05:00
|
|
|
u, _ := r.request.Context().Value(OriginalURLCtxKey).(url.URL)
|
|
|
|
return url.QueryEscape(u.RequestURI())
|
2017-03-11 16:59:47 -05:00
|
|
|
case "{rewrite_uri}":
|
|
|
|
return r.request.URL.RequestURI()
|
|
|
|
case "{rewrite_uri_escaped}":
|
2016-08-18 21:36:10 -05:00
|
|
|
return url.QueryEscape(r.request.URL.RequestURI())
|
|
|
|
case "{when}":
|
2017-01-14 17:54:27 -05:00
|
|
|
return now().Format(timeFormat)
|
|
|
|
case "{when_iso}":
|
|
|
|
return now().UTC().Format(timeFormatISOUTC)
|
2017-07-05 14:43:54 -05:00
|
|
|
case "{when_unix}":
|
|
|
|
return strconv.FormatInt(now().Unix(), 10)
|
2016-08-18 21:36:10 -05:00
|
|
|
case "{file}":
|
|
|
|
_, file := path.Split(r.request.URL.Path)
|
|
|
|
return file
|
|
|
|
case "{dir}":
|
|
|
|
dir, _ := path.Split(r.request.URL.Path)
|
|
|
|
return dir
|
|
|
|
case "{request}":
|
|
|
|
dump, err := httputil.DumpRequest(r.request, false)
|
|
|
|
if err != nil {
|
|
|
|
return r.emptyValue
|
|
|
|
}
|
|
|
|
return requestReplacer.Replace(string(dump))
|
|
|
|
case "{request_body}":
|
|
|
|
if !canLogRequest(r.request) {
|
|
|
|
return r.emptyValue
|
|
|
|
}
|
2016-08-19 00:09:22 -05:00
|
|
|
_, err := ioutil.ReadAll(r.request.Body)
|
2016-08-18 21:36:10 -05:00
|
|
|
if err != nil {
|
2017-05-17 10:57:11 -05:00
|
|
|
if err == ErrMaxBytesExceeded {
|
2016-11-03 19:25:49 -05:00
|
|
|
return r.emptyValue
|
|
|
|
}
|
2016-08-18 21:36:10 -05:00
|
|
|
}
|
2016-08-19 00:09:22 -05:00
|
|
|
return requestReplacer.Replace(r.requestBody.String())
|
2017-02-17 16:07:57 -05:00
|
|
|
case "{mitm}":
|
2017-02-28 07:54:12 -05:00
|
|
|
if val, ok := r.request.Context().Value(caddy.CtxKey("mitm")).(bool); ok {
|
2017-02-17 16:07:57 -05:00
|
|
|
if val {
|
|
|
|
return "likely"
|
|
|
|
}
|
2017-04-29 19:28:18 -05:00
|
|
|
return "unlikely"
|
2017-02-17 16:07:57 -05:00
|
|
|
}
|
|
|
|
return "unknown"
|
2016-08-18 21:36:10 -05:00
|
|
|
case "{status}":
|
|
|
|
if r.responseRecorder == nil {
|
|
|
|
return r.emptyValue
|
|
|
|
}
|
|
|
|
return strconv.Itoa(r.responseRecorder.status)
|
|
|
|
case "{size}":
|
|
|
|
if r.responseRecorder == nil {
|
|
|
|
return r.emptyValue
|
|
|
|
}
|
|
|
|
return strconv.Itoa(r.responseRecorder.size)
|
|
|
|
case "{latency}":
|
|
|
|
if r.responseRecorder == nil {
|
|
|
|
return r.emptyValue
|
|
|
|
}
|
|
|
|
return roundDuration(time.Since(r.responseRecorder.start)).String()
|
2016-10-05 23:02:45 -05:00
|
|
|
case "{latency_ms}":
|
|
|
|
if r.responseRecorder == nil {
|
|
|
|
return r.emptyValue
|
|
|
|
}
|
|
|
|
elapsedDuration := time.Since(r.responseRecorder.start)
|
|
|
|
return strconv.FormatInt(convertToMilliseconds(elapsedDuration), 10)
|
2016-08-18 21:36:10 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return r.emptyValue
|
|
|
|
}
|
|
|
|
|
2016-10-05 23:02:45 -05:00
|
|
|
//convertToMilliseconds returns the number of milliseconds in the given duration
|
|
|
|
func convertToMilliseconds(d time.Duration) int64 {
|
|
|
|
return d.Nanoseconds() / 1e6
|
|
|
|
}
|
|
|
|
|
2016-03-20 22:56:13 -05:00
|
|
|
// Set sets key to value in the r.customReplacements map.
|
|
|
|
func (r *replacer) Set(key, value string) {
|
2016-08-18 21:36:10 -05:00
|
|
|
r.customReplacements["{"+key+"}"] = value
|
2015-12-30 14:42:03 -05:00
|
|
|
}
|
|
|
|
|
2015-01-13 14:43:45 -05:00
|
|
|
const (
|
2016-08-10 09:04:57 -05:00
|
|
|
timeFormat = "02/Jan/2006:15:04:05 -0700"
|
2017-01-14 17:54:27 -05:00
|
|
|
timeFormatISOUTC = "2006-01-02T15:04:05Z" // ISO 8601 with timezone to be assumed as UTC
|
2016-08-10 09:04:57 -05:00
|
|
|
headerContentType = "Content-Type"
|
|
|
|
contentTypeJSON = "application/json"
|
|
|
|
contentTypeXML = "application/xml"
|
2016-08-18 17:37:40 -05:00
|
|
|
// MaxLogBodySize limits the size of logged request's body
|
|
|
|
MaxLogBodySize = 100 * 1024
|
2015-01-13 14:43:45 -05:00
|
|
|
)
|