Disable directory listing for Hugo file server

Fix #1400

diff --git a/commands/server.go b/commands/server.go
index 66cd9f7804f3d8e5e22ac4e163672cf6f58ce68c..31ccb1e1148c1205ce2c132219a0431d7c940926 100644 (file)
--- a/commands/server.go
+++ b/commands/server.go
@@ -49,6 +49,26 @@ serve them up.`,
        //Run: server,
 }
 
+type filesOnlyFs struct {
+       fs http.FileSystem
+}
+
+type noDirFile struct {
+       http.File
+}
+
+func (fs filesOnlyFs) Open(name string) (http.File, error) {
+       f, err := fs.fs.Open(name)
+       if err != nil {
+               return nil, err
+       }
+       return noDirFile{f}, nil
+}
+
+func (f noDirFile) Readdir(count int) ([]os.FileInfo, error) {
+       return nil, nil
+}
+
 func init() {
        serverCmd.Flags().IntVarP(&serverPort, "port", "p", 1313, "port on which the server will listen")
        serverCmd.Flags().StringVarP(&serverInterface, "bind", "", "127.0.0.1", "interface to which the server will bind")
@@ -125,7 +145,8 @@ func serve(port int) {
        jww.FEEDBACK.Println("Serving pages from " + helpers.AbsPathify(viper.GetString("PublishDir")))
 
        httpFs := &afero.HttpFs{SourceFs: hugofs.DestinationFS}
-       fileserver := http.FileServer(httpFs.Dir(helpers.AbsPathify(viper.GetString("PublishDir"))))
+       fs := filesOnlyFs{httpFs.Dir(helpers.AbsPathify(viper.GetString("PublishDir")))}
+       fileserver := http.FileServer(fs)
 
        // We're only interested in the path
        u, err := url.Parse(viper.GetString("BaseURL"))