Adapted std lib file server and gutted it

2 files changed, 80 insertions, 2 deletions

diff --git a/server/fileserver.go b/server/fileserver.go
new file mode 100644
index 000000000..88df75641
--- /dev/null
+++ b/server/fileserver.go
@@ -0,0 +1,78 @@
+package server
+
+import (
+	"net/http"
+	"path"
+	"strings"
+
+	"github.com/mholt/caddy/middleware/browse"
+)
+
+// This FileServer is adapted from the one in net/http
+// by the Go authors. Some modifications have been made.
+//
+// License:
+//
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+func FileServer(root http.FileSystem) http.Handler {
+	return &fileHandler{root}
+}
+
+type fileHandler struct {
+	root http.FileSystem
+}
+
+func (f *fileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	upath := r.URL.Path
+	if !strings.HasPrefix(upath, "/") {
+		upath = "/" + upath
+		r.URL.Path = upath
+	}
+	serveFile(w, r, f.root, path.Clean(upath), true)
+}
+
+// name is '/'-separated, not filepath.Separator.
+func serveFile(w http.ResponseWriter, r *http.Request, fs http.FileSystem, name string, redirect bool) {
+	f, err := fs.Open(name)
+	if err != nil {
+		// TODO expose actual error?
+		http.NotFound(w, r)
+		return
+	}
+	defer f.Close()
+
+	d, err1 := f.Stat()
+	if err1 != nil {
+		// TODO expose actual error?
+		http.NotFound(w, r)
+		return
+	}
+
+	// use contents of an index file, if present, for directory
+	if d.IsDir() {
+		for _, indexPage := range browse.IndexPages {
+			index := strings.TrimSuffix(name, "/") + "/" + indexPage
+			ff, err := fs.Open(index)
+			if err == nil {
+				defer ff.Close()
+				dd, err := ff.Stat()
+				if err == nil {
+					name = index
+					d = dd
+					f = ff
+					break
+				}
+			}
+		}
+	}
+
+	// Still a directory? (we didn't find an index file)
+	if d.IsDir() {
+		http.NotFound(w, r) // 404 instead of 403 to hide the fact that the folder exists
+		return
+	}
+
+	http.ServeContent(w, r, d.Name(), d.ModTime(), f)
+}
diff --git a/server/server.go b/server/server.go
index ebe42cf24..ecb596449 100644
--- a/server/server.go
+++ b/server/server.go
@@ -101,7 +101,7 @@ func (s *Server) Log(v ...interface{}) {
 // on its config. This method should be called last before
 // ListenAndServe begins.
 func (s *Server) buildStack() error {
-	s.fileServer = http.FileServer(http.Dir(s.config.Root))
+	s.fileServer = FileServer(http.Dir(s.config.Root))
 
 	for _, start := range s.config.Startup {
 		err := start()
@@ -112,7 +112,7 @@ func (s *Server) buildStack() error {
 
 	// TODO: We only compile middleware for the "/" scope.
 	// Partial support for multiple location contexts already
-	// exists in the parser and config levels, but until full
+	// exists at the parser and config levels, but until full
 	// support is implemented, this is all we do right here.
 	s.compile(s.config.Middleware["/"])