Added option to disable directory listing in cli

Author: denny241

cmd/path.go

@@ -5,6 +5,7 @@ package cmd
 import (
 	"errors"
 
+	"github.com/loophole/cli/config"
 	"github.com/loophole/cli/internal/app/loophole"
 	lm "github.com/loophole/cli/internal/app/loophole/models"
 	"github.com/loophole/cli/internal/pkg/communication"
@@ -55,6 +56,7 @@ To expose local directory (e.g. /data/my-data) simply use 'loophole path /data/m
 }
 
 func init() {
+	dirCmd.PersistentFlags().BoolVar(&config.Config.Display.DisableDirectoryListing, "disable-directory-listing", false, "Disable showing all files when navigating to directories without index.html")
 	initServeCommand(dirCmd)
 	rootCmd.AddCommand(dirCmd)
 }

config/config.go

@@ -15,8 +15,9 @@ type OAuthConfig struct {
 
 // DisplayConfig defines the display switches shape
 type DisplayConfig struct {
-	Verbose bool `json:"verbose"`
-	QR      bool `json:"qr"`
+	DisableDirectoryListing bool `json:"disabledirectorylisting"`
+	Verbose                 bool `json:"verbose"`
+	QR                      bool `json:"qr"`
 }
 
 // ApplicationConfig defines the application config shape

internal/pkg/httpserver/httpserver.go

@@ -6,8 +6,10 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"net/url"
+	"path/filepath"
 
 	auth "github.com/abbot/go-http-auth"
+	"github.com/loophole/cli/config"
 	lm "github.com/loophole/cli/internal/app/loophole/models"
 	"github.com/loophole/cli/internal/pkg/urlmaker"
 	"golang.org/x/crypto/bcrypt"
@@ -18,6 +20,34 @@ const (
 	logoURL = "https://raw.githubusercontent.com/loophole/website/master/static/img/logo.png"
 )
 
+type customFileSystem struct {
+	fs http.FileSystem
+}
+
+func (cfs customFileSystem) Open(path string) (http.File, error) {
+	f, err := cfs.fs.Open(path)
+	if err != nil {
+		return nil, err
+	}
+
+	s, err := f.Stat()
+	if err != nil {
+		return nil, err
+	}
+	if s.IsDir() {
+		index := filepath.Join(path, "index.html")
+		if _, err := cfs.fs.Open(index); err != nil {
+			closeErr := f.Close()
+			if closeErr != nil {
+				return nil, err
+			}
+			return nil, err
+		}
+	}
+
+	return f, nil
+}
+
 type ServerBuilder interface {
 	WithSiteID(string) ServerBuilder
 	WithDomain(string) ServerBuilder
@@ -177,7 +207,12 @@ func (ssb *staticServerBuilder) WithBasicAuth(username string, password string)
 }
 
 func (ssb *staticServerBuilder) Build() (*http.Server, error) {
-	fs := http.FileServer(http.Dir(ssb.directory))
+	var fs http.Handler
+	if config.Config.Display.DisableDirectoryListing {
+		fs = http.FileServer(customFileSystem{http.Dir(ssb.directory)})
+	} else {
+		fs = http.FileServer(http.Dir(ssb.directory))
+	}
 
 	var server *http.Server