Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-05-21 06:16:31 -04:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix issue #1346 {path} logging {uri} and add {rewrite_uri} placeholder (#1481)

Browse Source 
* Fixed issue with {path} actually {uri}

* Test added for path rewrite

* add in uri_escaped

* added rewrite_uri and test

* fix broken test.  Just checks for existance of rewrite header

* gitignore

* Use context to store uri value

* ignore .vscode

* tidy up, removal of comments and invalidated tests

* Remove commented out code.

* added comment as requested by lint

* fixed spelling mistake

* clarified code with variable name

* added context for uri and test

* added TODO comment to move consts
This commit is contained in:
Toby Allen
2017-03-11 21:59:47 +00:00
committed by Matt Holt
parent 6aa0e30af3
commit cfe52084aa
8 changed files with 78 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
caddyhttp/httpserver/replacer.go
+25 -5
View File
@@ -240,15 +240,23 @@ func (r *replacer) getSubstitution(key string) string {
case "{path}":
// if a rewrite has happened, the original URI should be used as the path
// rather than the rewritten URI
path := r.request.Header.Get("Caddy-Rewrite-Original-URI")
if path == "" {
var path string
origpath, _ := r.request.Context().Value(caddy.URIxRewriteCtxKey).(string)
if origpath == "" {
path = r.request.URL.Path
} else {
parsedURL, _ := url.Parse(origpath)
path = parsedURL.Path
}
return path
case "{path_escaped}":
path := r.request.Header.Get("Caddy-Rewrite-Original-URI")
if path == "" {
var path string
origpath, _ := r.request.Context().Value(caddy.URIxRewriteCtxKey).(string)
if origpath == "" {
path = r.request.URL.Path
} else {
parsedURL, _ := url.Parse(origpath)
path = parsedURL.Path
}
return url.QueryEscape(path)
case "{rewrite_path}":
@@ -276,8 +284,20 @@ func (r *replacer) getSubstitution(key string) string {
}
return port
case "{uri}":
return r.request.URL.RequestURI()
uri, _ := r.request.Context().Value(caddy.URIxRewriteCtxKey).(string)
if uri == "" {
uri = r.request.URL.RequestURI()
}
return uri
case "{uri_escaped}":
uri, _ := r.request.Context().Value(caddy.URIxRewriteCtxKey).(string)
if uri == "" {
uri = r.request.URL.RequestURI()
}
return url.QueryEscape(uri)
case "{rewrite_uri}":
return r.request.URL.RequestURI()
case "{rewrite_uri_escaped}":
return url.QueryEscape(r.request.URL.RequestURI())
case "{when}":
return now().Format(timeFormat)