Disable cache by default, allow disabling CORS handler

Author: maetthu

cmd/root.go

@@ -67,13 +67,21 @@ var rootCmd = &cobra.Command{
 		log.Printf("Listening for HTTPS connections on %s", addr)
 		log.Printf("Serving from directory %s", dir)
 
+		handler := logger(http.FileServer(http.Dir(dir)))
+
 		// permit some CORS stuff
-		corsHandler := cors.New(cors.Options{
-			AllowCredentials: true,
-			AllowOriginFunc: func(origin string) bool {return true},
-		})
+		if disableCORS, _ := cmd.Flags().GetBool("no-cors"); !disableCORS {
+			handler = cors.New(cors.Options{
+				AllowCredentials: true,
+				AllowOriginFunc: func(origin string) bool {return true},
+			}).Handler(handler)
+		}
+
+		// Disable browser cache?
+		if cache, _ := cmd.Flags().GetBool("cache"); !cache {
+			handler = nocache(handler)
+		}
 
-		handler := corsHandler.Handler(logger(http.FileServer(http.Dir(dir))))
 		log.Fatal(http.ListenAndServeTLS(addr, certFile, keyFile, handler))
 	},
 }
@@ -87,12 +95,21 @@ func Execute() {
 
 func init(){
 	rootCmd.Flags().StringP("listen", "l", ":8443", "Listen address")
-	//rootCmd.Flags().Bool("version", false, "Print version and exit")
+	rootCmd.Flags().Bool("no-cors", false, "Disable CORS handling")
+	rootCmd.Flags().Bool("cache", false, "Enable client side caching")
 }
 
 func logger(handler http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		log.Printf( "%s \"%s %s %s\"\n", r.RemoteAddr, r.Method, r.URL, r.Proto)
 		handler.ServeHTTP(w, r)
 	})
-}
+}
+
+func nocache(handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Add("Cache-Control", "no-store")
+		handler.ServeHTTP(w, r)
+	})
+}
+