From 1ba3c1b0e463c8c741071f95611a52df0495d668 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 6 Nov 2018 15:53:06 +0000
Subject: [PATCH] Add options for query log and disabling automatic directory
 index generation

---
 main.go | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/main.go b/main.go
index 765ae17..5235a9b 100644
--- a/main.go
+++ b/main.go
@@ -10,39 +10,51 @@ import (
 )
 
 type config struct {
-	Listen   string
-	Port     int
-	Username string
-	Password string
+	listen   string
+	port     int
+	username string
+	password string
+	noindex  bool
+	log      bool
 }
 
 var c config
 
 func init() {
-	flag.StringVar(&c.Listen, "listen", "0.0.0.0", "IP address to listen.")
-	flag.IntVar(&c.Port, "port", 8000, "Listen port for interface (ports below 1024 may require super user privileges)")
-	flag.StringVar(&c.Username, "username", "", "Require this username tp access")
-	flag.StringVar(&c.Password, "password", "", "Require this password to access interface")
+	flag.StringVar(&c.listen, "listen", "0.0.0.0", "IP address to listen.")
+	flag.IntVar(&c.port, "port", 8000, "Listen port for interface (ports below 1024 may require super user privileges)")
+	flag.StringVar(&c.username, "username", "", "Require this username tp access")
+	flag.StringVar(&c.password, "password", "", "Require this password to access interface")
+	flag.BoolVar(&c.noindex, "noindex", false, "Disable directory indexing")
+	flag.BoolVar(&c.log, "log", false, "Enable simple request log")
 	flag.Parse()
 }
 
 func main() {
 	r := mux.NewRouter()
-	r.Use(BasicAuth)
-	r.Use(QueryLog)
+	if c.username != "" && c.password != "" {
+		r.Use(BasicAuth)
+	}
+	if c.log {
+		r.Use(QueryLog)
+	}
 
-	r.PathPrefix("/").Handler(http.StripPrefix("/", enhancedfileserver.FileServer(http.Dir("./"))))
+	if c.noindex {
+		r.PathPrefix("/").Handler(http.StripPrefix("/", enhancedfileserver.FileServerNoIndex(http.Dir("./"))))
+	} else {
+		r.PathPrefix("/").Handler(http.StripPrefix("/", enhancedfileserver.FileServer(http.Dir("./"))))
+	}
 
-	a := fmt.Sprintf("%s:%d", c.Listen, c.Port)
+	a := fmt.Sprintf("%s:%d", c.listen, c.port)
 
 	log.Fatal(http.ListenAndServe(a, r))
 }
 
 func BasicAuth(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if c.Username != "" && c.Password != "" {
+		if c.username != "" && c.password != "" {
 			user, pass, ok := r.BasicAuth()
-			if !ok || user != c.Username || pass != c.Password {
+			if !ok || user != c.username || pass != c.password {
 				w.Header().Set("WWW-Authenticate", `Basic realm="mydomains"`)
 
 				http.Error(w, "Unauthorized", http.StatusUnauthorized)