Skip to content

feat: add static filename and info served by fileserver to context vars #6983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arthurpro wants to merge 1 commit into from
+11 −0
Closed

feat: add static filename and info served by fileserver to context vars #6983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions modules/caddyhttp/fileserver/staticfiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ func init() {
caddy.RegisterModule(FileServer{})
}

const FileServerFilenameVarKey = "fileserver_filename"
const FileServerFileinfoVarKey = "fileserver_fileinfo"

// FileServer implements a handler that serves static files.
//
// The path of the file to serve is constructed by joining the site root
Expand Down Expand Up @@ -559,6 +562,14 @@ func (fsrv *FileServer) ServeHTTP(w http.ResponseWriter, r *http.Request, next c
w = statusOverrideResponseWriter{ResponseWriter: w, code: statusCodeOverride}
}

// add filename and file info to the request context vars so that other middlewares
// can find out what static file has been served by the fileserver.
// middlewares can access the vars as follows:
// caddyhttp.GetVar(r.Context(), fileserver.FileServerFilenameVarKey).(string)
// caddyhttp.GetVar(r.Context(), fileserver.FileServerFileinfoVarKey).(fs.FileInfo)
caddyhttp.SetVar(r.Context(), FileServerFilenameVarKey, filename)
caddyhttp.SetVar(r.Context(), FileServerFileinfoVarKey, info)

// let the standard library do what it does best; note, however,
// that errors generated by ServeContent are written immediately
// to the response, so we cannot handle them (but errors there
Expand Down