fix build and lint errors

cmd/config_set.go

@@ -44,7 +44,6 @@ you want to change.`,
 		getUserDefaults(cmd, &s.Defaults, false)
 
 		var auther auth.Auther
-		var err error
 		if hasAuth {
 			s.AuthMethod, auther = getAuthentication(cmd)
 			err = d.store.Auth.Save(auther)

cmd/root.go

@@ -159,7 +159,8 @@ user created with the credentials from options "username" and "password".`,
 	}, pythonConfig{allowNoDB: true}),
 }
 
-func runtimeNonDefaults() (m map[string]string) {
+func runtimeNonDefaults() map[string]string {
+	m := map[string]string{}
 	for k, d := range settings.RuntimeDefaults {
 		if x, ok := settings.RuntimeCfg[k]; ok && (x != d) {
 			log.Println(fmt.Sprintf("Non-default value for key '%s': %s [default: %s]", k, x, d))
@@ -170,7 +171,7 @@ func runtimeNonDefaults() (m map[string]string) {
 		log.Println("Generate random 256 bit key")
 		m["key"] = string(generateRandomBytes(64)) // 256 bit
 	}
-	return
+	return m
 }
 
 func quickSetup(d pythonData) {

cmd/rules.go

@@ -42,8 +42,11 @@ func runRules(st *storage.Storage, cmd *cobra.Command, users func(*users.User),
 		return
 	}
 
+	s, err := st.Settings.Get()
+	checkErr(err)
+
 	if global != nil {
-		global(settings)
+		global(s)
 	}
 
 	printRules(s.Rules, id)

cmd/users_update.go

@@ -25,10 +25,11 @@ options you want to change.`,
 		password := mustGetString(cmd, "password")
 		newUsername := mustGetString(cmd, "username")
 
-		var err error
+		var (
-		var user *users.User
+			err  error
+			user *users.User
+		)
 
-		var err error
 		if id != 0 {
 			user, err = d.store.Users.Get("", id)
 		} else {

cmd/utils.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/asdine/storm"
+	"github.com/filebrowser/filebrowser/v2/settings"
 	"github.com/filebrowser/filebrowser/v2/storage"
 	"github.com/filebrowser/filebrowser/v2/storage/bolt"
 	"github.com/spf13/cobra"
@@ -86,7 +87,7 @@ func python(fn pythonFunc, cfg pythonConfig) cobraFunc {
 	return func(cmd *cobra.Command, args []string) {
 		data := pythonData{hadDB: true}
 
-		path := v.GetString("database")
+		path := settings.RuntimeCfg["database"]
 		_, err := os.Stat(path)
 
 		if os.IsNotExist(err) {

http/auth.go

@@ -92,7 +92,7 @@ var loginHandler = func(w http.ResponseWriter, r *http.Request, d *data) (int, e
 		return http.StatusInternalServerError, err
 	}
 
-	user, err := auther.Auth(r, d.store.Users, d.Settings.Root)
+	user, err := auther.Auth(r, d.store.Users, settings.RuntimeCfg["root"])
 	if err == os.ErrPermission {
 		return http.StatusForbidden, nil
 	} else if err != nil {

settings/runtime.go

@@ -1,15 +1,15 @@
-package settings
+package settings
-
+
-// RuntimeDefaults defines default values for runtime parameters
+// RuntimeDefaults defines default values for runtime parameters
-var RuntimeDefaults = map[string]string{
+var RuntimeDefaults = map[string]string{
-	"root":    ".",
+	"root":    ".",
-	"baseurl": "",
+	"baseurl": "",
-	"address": "127.0.0.1",
+	"address": "127.0.0.1",
-	"port":    "8080",
+	"port":    "8080",
-	"cert":    "",
+	"cert":    "",
-	"key":     "",
+	"key":     "",
-	"log":     "stdout",
+	"log":     "stdout",
-}
+}
-
+
-// RuntimeCfg contains parameters to be used at runtime
+// RuntimeCfg contains parameters to be used at runtime
-var RuntimeCfg = map[string]string{}
+var RuntimeCfg = map[string]string{}

settings/storage.go

@@ -1,6 +1,9 @@
 package settings
 
 import (
+	"strings"
+
+	"github.com/filebrowser/filebrowser/v2/errors"
 	"github.com/filebrowser/filebrowser/v2/rules"
 	"github.com/filebrowser/filebrowser/v2/users"
 )
@@ -36,13 +39,18 @@ var defaultEvents = []string{
 
 // Save saves the settings for the current instance.
 func (s *Storage) Save(set *Settings) error {
-	/*
+	if u, ok := set.Runtime["baseurl"]; ok {
-		set.BaseURL = strings.TrimSuffix(set.BaseURL, "/")
+		set.Runtime["baseurl"] = strings.TrimSuffix(u, "/")
+	}
 
-		if len(set.Key) == 0 {
+	if k, ok := set.Runtime["key"]; ok {
+		if len(k) == 0 {
 			return errors.ErrEmptyKey
 		}
-	*/
+	} else {
+		return errors.ErrEmptyKey
+	}
+
 	if set.Defaults.Locale == "" {
 		set.Defaults.Locale = "en"
 	}

storage/bolt/importer/conf.go

@@ -109,8 +109,10 @@ func importConf(db *storm.DB, path string, sto *storage.Storage) error {
 	}
 
 	s := &settings.Settings{
-		//Key:     key,
+		Runtime: map[string]string{
-		//BaseURL: cfg.BaseURL,
+			"key":     string(key),
+			"baseurl": cfg.BaseURL,
+		},
 		Signup: false,
 		Defaults: settings.UserDefaults{
 			Scope:    cfg.Defaults.Scope,