diff options
Diffstat (limited to 'modules/caddyhttp/fileserver')
| -rw-r--r-- | modules/caddyhttp/fileserver/browse.go | 4 | ||||
| -rw-r--r-- | modules/caddyhttp/fileserver/browselisting.go | 2 | ||||
| -rw-r--r-- | modules/caddyhttp/fileserver/matcher.go | 4 | ||||
| -rw-r--r-- | modules/caddyhttp/fileserver/staticfiles.go | 4 | 
4 files changed, 7 insertions, 7 deletions
| diff --git a/modules/caddyhttp/fileserver/browse.go b/modules/caddyhttp/fileserver/browse.go index aa8372e..e5e137f 100644 --- a/modules/caddyhttp/fileserver/browse.go +++ b/modules/caddyhttp/fileserver/browse.go @@ -52,7 +52,7 @@ func (fsrv *FileServer) serveBrowse(dirPath string, w http.ResponseWriter, r *ht  	}  	defer dir.Close() -	repl := r.Context().Value(caddy.ReplacerCtxKey).(caddy.Replacer) +	repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)  	// calling path.Clean here prevents weird breadcrumbs when URL paths are sketchy like /%2e%2e%2f  	listing, err := fsrv.loadDirectoryContents(dir, path.Clean(r.URL.Path), repl) @@ -87,7 +87,7 @@ func (fsrv *FileServer) serveBrowse(dirPath string, w http.ResponseWriter, r *ht  	return nil  } -func (fsrv *FileServer) loadDirectoryContents(dir *os.File, urlPath string, repl caddy.Replacer) (browseListing, error) { +func (fsrv *FileServer) loadDirectoryContents(dir *os.File, urlPath string, repl *caddy.Replacer) (browseListing, error) {  	files, err := dir.Readdir(-1)  	if err != nil {  		return browseListing{}, err diff --git a/modules/caddyhttp/fileserver/browselisting.go b/modules/caddyhttp/fileserver/browselisting.go index b2349f8..9c7c4a2 100644 --- a/modules/caddyhttp/fileserver/browselisting.go +++ b/modules/caddyhttp/fileserver/browselisting.go @@ -27,7 +27,7 @@ import (  	"github.com/dustin/go-humanize"  ) -func (fsrv *FileServer) directoryListing(files []os.FileInfo, canGoUp bool, urlPath string, repl caddy.Replacer) browseListing { +func (fsrv *FileServer) directoryListing(files []os.FileInfo, canGoUp bool, urlPath string, repl *caddy.Replacer) browseListing {  	filesToHide := fsrv.transformHidePaths(repl)  	var ( diff --git a/modules/caddyhttp/fileserver/matcher.go b/modules/caddyhttp/fileserver/matcher.go index 5ca97f2..6c1e880 100644 --- a/modules/caddyhttp/fileserver/matcher.go +++ b/modules/caddyhttp/fileserver/matcher.go @@ -126,7 +126,7 @@ func (m MatchFile) Validate() error {  //    - http.matchers.file.relative  //    - http.matchers.file.absolute  func (m MatchFile) Match(r *http.Request) bool { -	repl := r.Context().Value(caddy.ReplacerCtxKey).(caddy.Replacer) +	repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)  	rel, abs, matched := m.selectFile(r)  	if matched {  		repl.Set("http.matchers.file.relative", rel) @@ -140,7 +140,7 @@ func (m MatchFile) Match(r *http.Request) bool {  // It returns the root-relative path to the matched file, the full  // or absolute path, and whether a match was made.  func (m MatchFile) selectFile(r *http.Request) (rel, abs string, matched bool) { -	repl := r.Context().Value(caddy.ReplacerCtxKey).(caddy.Replacer) +	repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)  	root := repl.ReplaceAll(m.Root, ".") diff --git a/modules/caddyhttp/fileserver/staticfiles.go b/modules/caddyhttp/fileserver/staticfiles.go index f2722ba..d6cf4d6 100644 --- a/modules/caddyhttp/fileserver/staticfiles.go +++ b/modules/caddyhttp/fileserver/staticfiles.go @@ -106,7 +106,7 @@ func (fsrv *FileServer) Provision(ctx caddy.Context) error {  }  func (fsrv *FileServer) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyhttp.Handler) error { -	repl := r.Context().Value(caddy.ReplacerCtxKey).(caddy.Replacer) +	repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)  	filesToHide := fsrv.transformHidePaths(repl) @@ -293,7 +293,7 @@ func mapDirOpenError(originalErr error, name string) error {  // transformHidePaths performs replacements for all the elements of  // fsrv.Hide and returns a new list of the transformed values. -func (fsrv *FileServer) transformHidePaths(repl caddy.Replacer) []string { +func (fsrv *FileServer) transformHidePaths(repl *caddy.Replacer) []string {  	hide := make([]string, len(fsrv.Hide))  	for i := range fsrv.Hide {  		hide[i] = repl.ReplaceAll(fsrv.Hide[i], "") | 
