fix: clean server struct once it gets to the handler

License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>

Former-commit-id: a9d9c2cd9a5fffa71409ebb0867faa3a0aca6e9f [formerly c3359cf3ff2633945a9c8dd5ea8eff5a77484364] [formerly 8921b27f322e426cf2f2f07dc682e1fffca162e0 [formerly f1c86054b3]]
Former-commit-id: 078633f5c5b1aaeafd6b078b5e006c5e05f19c84 [formerly 9013496a12cda3bef58215a3f5df4eeeaa677eb1]
Former-commit-id: 420076748685f1b8a23053c5fe159bc5e86942d3

http/http.go

@@ -14,8 +14,9 @@ type modifyRequest struct {
 }
 
 func NewHandler(storage *storage.Storage, server *settings.Server) (http.Handler, error) {
-	r := mux.NewRouter()
+	server.Clean()
 
+	r := mux.NewRouter()
 	index, static := getStaticHandlers(storage, server)
 
 	monkey := func(fn handleFunc, prefix string) http.Handler {

settings/settings.go

@@ -1,6 +1,10 @@
 package settings
 
-import "github.com/filebrowser/filebrowser/v2/rules"
+import (
+	"strings"
+
+	"github.com/filebrowser/filebrowser/v2/rules"
+)
 
 // AuthMethod describes an authentication method.
 type AuthMethod string
@@ -17,6 +21,11 @@ type Settings struct {
 	Rules      []rules.Rule        `json:"rules"`
 }
 
+// GetRules implements rules.Provider.
+func (s *Settings) GetRules() []rules.Rule {
+	return s.Rules
+}
+
 // Server specific settings.
 type Server struct {
 	Root    string `json:"root"`
@@ -28,7 +37,7 @@ type Server struct {
 	Log     string `json:"log"`
 }
 
-// GetRules implements rules.Provider.
+// Clean cleans any variables that might need cleaning.
-func (s *Settings) GetRules() []rules.Rule {
+func (s *Server) Clean() {
-	return s.Rules
+	s.BaseURL = strings.TrimSuffix(s.BaseURL, "/")
 }

settings/storage.go

@@ -1,8 +1,6 @@
 package settings
 
 import (
-	"strings"
-
 	"github.com/filebrowser/filebrowser/v2/errors"
 	"github.com/filebrowser/filebrowser/v2/rules"
 	"github.com/filebrowser/filebrowser/v2/users"
@@ -94,6 +92,6 @@ func (s *Storage) GetServer() (*Server, error) {
 
 // SaveServer wraps StorageBackend.SaveServer and adds some verification.
 func (s *Storage) SaveServer(ser *Server) error {
-	ser.BaseURL = strings.TrimSuffix(ser.BaseURL, "/")
+	ser.Clean()
 	return s.back.SaveServer(ser)
 }

storage/bolt/importer/conf.go

@@ -99,7 +99,6 @@ func readConf(path string) (*oldConf, error) {
 }
 
 func importConf(db *storm.DB, path string, sto *storage.Storage) error {
-
 	cfg, err := readConf(path)
 	if err != nil {
 		return err