shortcut
/
enhancedfileserver
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add optino to disable automatic directory indexes

This commit is contained in:
Your Name 2018-11-06 15:46:28 +00:00
parent 6abbcf4acb
commit 9bc1fdea39
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -4,5 +4,7 @@ This package is designed to enhance Go's built-in http file server function and
Where the native function's file listing was just an alphabetical set of files, this one adds file size, date, owner/group, and sorting capability. Where the native function's file listing was just an alphabetical set of files, this one adds file size, date, owner/group, and sorting capability.
This should be a drop-in replacement and is largely based on the original code. See the included example for a simple use, This can be a drop-in replacement and is largely based on the original code. See the included example for a simple use,
or https://gitto.work/shortcut/httphere for something more practical. or https://gitto.work/shortcut/httphere for something more practical.
Optionally, you can elect to not generate an automatic directory index by using FileServerNoIndex() in place of FileServer().

19
enhanced-file-server.go
View File

@ -497,7 +497,7 @@ func checkPreconditions(w http.ResponseWriter, r *http.Request, modtime time.Tim
} }
// name is '/'-separated, not filepath.Separator. // name is '/'-separated, not filepath.Separator.
func serveFile(w http.ResponseWriter, r *http.Request, fs http.FileSystem, name string, redirect bool) { func serveFile(w http.ResponseWriter, r *http.Request, fs http.FileSystem, name string, redirect bool, index bool) {
const indexPage = "/index.html" const indexPage = "/index.html"
// redirect .../index.html to .../ // redirect .../index.html to .../
@ -565,7 +565,7 @@ func serveFile(w http.ResponseWriter, r *http.Request, fs http.FileSystem, name
} }
// Still a directory? (we didn't find an index.html file) // Still a directory? (we didn't find an index.html file)
if d.IsDir() { if d.IsDir() && index {
if checkIfModifiedSince(r, d.ModTime()) == condFalse { if checkIfModifiedSince(r, d.ModTime()) == condFalse {
writeNotModified(w) writeNotModified(w)
return return
@ -573,6 +573,10 @@ func serveFile(w http.ResponseWriter, r *http.Request, fs http.FileSystem, name
w.Header().Set("Last-Modified", d.ModTime().UTC().Format(http.TimeFormat)) w.Header().Set("Last-Modified", d.ModTime().UTC().Format(http.TimeFormat))
dirList(w, r, f) dirList(w, r, f)
return return
} else if d.IsDir() {
http.Error(w, "Forbidden", http.StatusForbidden)
return
} }
// serveContent will check modification time // serveContent will check modification time
@ -648,7 +652,8 @@ func containsDotDot(v string) bool {
func isSlashRune(r rune) bool { return r == '/' || r == '\\' } func isSlashRune(r rune) bool { return r == '/' || r == '\\' }
type fileHandler struct { type fileHandler struct {
root http.FileSystem root http.FileSystem
index bool
} }
// FileServer returns a handler that serves HTTP requests // FileServer returns a handler that serves HTTP requests
@ -663,7 +668,11 @@ type fileHandler struct {
// ending in "/index.html" to the same path, without the final // ending in "/index.html" to the same path, without the final
// "index.html". // "index.html".
func FileServer(root http.FileSystem) http.Handler { func FileServer(root http.FileSystem) http.Handler {
return &fileHandler{root} return &fileHandler{root, true}
}
func FileServerNoIndex(root http.FileSystem) http.Handler {
return &fileHandler{root, false}
} }
func (f *fileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (f *fileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@ -672,7 +681,7 @@ func (f *fileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
upath = "/" + upath upath = "/" + upath
r.URL.Path = upath r.URL.Path = upath
} }
serveFile(w, r, f.root, path.Clean(upath), true) serveFile(w, r, f.root, path.Clean(upath), true, f.index)
} }
// httpRange specifies the byte range to be sent to the client. // httpRange specifies the byte range to be sent to the client.