removing dir listings from fs

badorigin.go

@@ -62,8 +62,9 @@ func (s *Servers) LaunchServers() {
 	r.PathPrefix("/error/{code}/{message}").HandlerFunc(errorHandler)
 
 	// Static File server
-	fs := http.FileServer(http.Dir(s.ContentRoot))
-	r.PathPrefix("/").Handler(fs)
+	//	fs := http.FileServer(NoDirectoryListingFS{http.Dir(s.ContentRoot)})
+	//	r.PathPrefix("/").Handler(fs)
+	r.PathPrefix("/").Handler(NoDirFS(s.ContentRoot, ""))
 
 	// middleware
 	r.Use(logging)

filesystem.go

@@ -0,0 +1,34 @@
+package badorigin
+
+import (
+	"net/http"
+	"strings"
+)
+
+// NoDirFS creates a handler for a File Server that doesn't
+// return directory listings.
+func NoDirFS(root_dir, path string) http.HandlerFunc {
+	fs := http.FileServer(CustomFS{http.Dir(root_dir)})
+	return http.StripPrefix(strings.TrimRight(path, "/"), fs).ServeHTTP
+}
+
+type CustomFS struct {
+	fs http.FileSystem
+}
+
+func (fs CustomFS) Open(path string) (http.File, error) {
+	f, err := fs.fs.Open(path)
+	if err != nil {
+		return nil, err
+	}
+
+	s, err := f.Stat()
+	if s.IsDir() {
+		index := strings.TrimSuffix(path, "/") + "/index.html"
+		if _, err := fs.fs.Open(index); err != nil {
+			return nil, err
+		}
+	}
+
+	return f, nil
+}