diff --git a/backend/auth/auth.go b/backend/auth/auth.go index c3b143a8..a1121c6f 100644 --- a/backend/auth/auth.go +++ b/backend/auth/auth.go @@ -3,14 +3,13 @@ package auth import ( "net/http" - "github.com/gtsteffaniak/filebrowser/settings" "github.com/gtsteffaniak/filebrowser/users" ) // Auther is the authentication interface. type Auther interface { // Auth is called to authenticate a request. - Auth(r *http.Request, usr users.Store, stg *settings.Settings, srv *settings.Server) (*users.User, error) + Auth(r *http.Request, usr users.Store) (*users.User, error) // LoginPage indicates if this auther needs a login page. LoginPage() bool } diff --git a/backend/auth/hook.go b/backend/auth/hook.go index def9d3bc..0ae5d143 100644 --- a/backend/auth/hook.go +++ b/backend/auth/hook.go @@ -31,7 +31,7 @@ type HookAuth struct { } // Auth authenticates the user via a json in content body. -func (a *HookAuth) Auth(r *http.Request, usr users.Store, stg *settings.Settings, srv *settings.Server) (*users.User, error) { +func (a *HookAuth) Auth(r *http.Request, usr users.Store) (*users.User, error) { var cred hookCred if r.Body == nil { @@ -44,8 +44,8 @@ func (a *HookAuth) Auth(r *http.Request, usr users.Store, stg *settings.Settings } a.Users = usr - a.Settings = stg - a.Server = srv + a.Settings = &settings.GlobalConfiguration + a.Server = &settings.GlobalConfiguration.Server a.Cred = cred action, err := a.RunCommand() @@ -150,7 +150,6 @@ func (a *HookAuth) SaveUser() (*users.User, error) { if err != nil { return nil, err } - // create user with the provided credentials d := &users.User{ Username: a.Cred.Username, diff --git a/backend/auth/json.go b/backend/auth/json.go index ce7143de..d3734789 100644 --- a/backend/auth/json.go +++ b/backend/auth/json.go @@ -23,7 +23,8 @@ type JSONAuth struct { } // Auth authenticates the user via a json in content body. -func (a JSONAuth) Auth(r *http.Request, usr users.Store, stg *settings.Settings, srv *settings.Server) (*users.User, error) { +func (a JSONAuth) Auth(r *http.Request, usr users.Store) (*users.User, error) { + config := &settings.GlobalConfiguration var cred jsonCred if r.Body == nil { @@ -48,7 +49,7 @@ func (a JSONAuth) Auth(r *http.Request, usr users.Store, stg *settings.Settings, } } - u, err := usr.Get(srv.Root, cred.Username) + u, err := usr.Get(config.Server.Root, cred.Username) if err != nil || !users.CheckPwd(cred.Password, u.Password) { return nil, os.ErrPermission } diff --git a/backend/auth/none.go b/backend/auth/none.go index 6549780f..43688a26 100644 --- a/backend/auth/none.go +++ b/backend/auth/none.go @@ -14,8 +14,8 @@ const MethodNoAuth = "noauth" type NoAuth struct{} // Auth uses authenticates user 1. -func (a NoAuth) Auth(r *http.Request, usr users.Store, stg *settings.Settings, srv *settings.Server) (*users.User, error) { - return usr.Get(srv.Root, uint(1)) +func (a NoAuth) Auth(r *http.Request, usr users.Store) (*users.User, error) { + return usr.Get(settings.GlobalConfiguration.Server.Root, uint(1)) } // LoginPage tells that no auth doesn't require a login page. diff --git a/backend/auth/proxy.go b/backend/auth/proxy.go index a14e92a6..cf3e5936 100644 --- a/backend/auth/proxy.go +++ b/backend/auth/proxy.go @@ -4,8 +4,9 @@ import ( "net/http" "os" - "github.com/gtsteffaniak/filebrowser/errors" "github.com/gtsteffaniak/filebrowser/settings" + + "github.com/gtsteffaniak/filebrowser/errors" "github.com/gtsteffaniak/filebrowser/users" ) @@ -18,9 +19,9 @@ type ProxyAuth struct { } // Auth authenticates the user via an HTTP header. -func (a ProxyAuth) Auth(r *http.Request, usr users.Store, stg *settings.Settings, srv *settings.Server) (*users.User, error) { +func (a ProxyAuth) Auth(r *http.Request, usr users.Store) (*users.User, error) { username := r.Header.Get(a.Header) - user, err := usr.Get(srv.Root, username) + user, err := usr.Get(settings.GlobalConfiguration.Server.Root, username) if err == errors.ErrNotExist { return nil, os.ErrPermission } diff --git a/backend/cmd/config.go b/backend/cmd/config.go deleted file mode 100644 index 0555cc9b..00000000 --- a/backend/cmd/config.go +++ /dev/null @@ -1,162 +0,0 @@ -package cmd - -import ( - "encoding/json" - nerrors "errors" - "fmt" - "os" - "strings" - "text/tabwriter" - - "github.com/spf13/cobra" - "github.com/spf13/pflag" - - "github.com/gtsteffaniak/filebrowser/auth" - "github.com/gtsteffaniak/filebrowser/errors" - "github.com/gtsteffaniak/filebrowser/settings" -) - -func init() { - rootCmd.AddCommand(configCmd) -} - -var configCmd = &cobra.Command{ - Use: "config", - Short: "Configuration management utility", - Long: `Configuration management utility.`, - Args: cobra.NoArgs, -} - -func addConfigFlags(flags *pflag.FlagSet) { - addUserFlags(flags) - flags.BoolP("signup", "s", false, "allow users to signup") - flags.String("shell", "", "shell command to which other commands should be appended") - - flags.String("recaptcha.host", "https://www.google.com", "use another host for ReCAPTCHA. recaptcha.net might be useful in China") - flags.String("recaptcha.key", "", "ReCaptcha site key") - flags.String("recaptcha.secret", "", "ReCaptcha secret") - - flags.String("frontend.name", "", "replace 'File Browser' by this name") - flags.String("frontend.color", "", "set the theme color") - flags.String("frontend.files", "", "path to directory with images and custom styles") - flags.Bool("frontend.disableExternal", false, "disable external links such as GitHub links") - flags.Bool("frontend.disableUsedPercentage", false, "disable used disk percentage graph") -} - -//nolint:gocyclo -func getAuthentication() auth.Auther { - method := settings.GlobalConfiguration.Auth.Method - var defaultAuther map[string]interface{} - var auther auth.Auther - if method == "proxy" { - header := settings.GlobalConfiguration.Auth.Header - if header == "" { - header = defaultAuther["header"].(string) - } - - if header == "" { - checkErr(nerrors.New("you must set the flag 'auth.header' for method 'proxy'")) - } - - auther = &auth.ProxyAuth{Header: header} - } - - if method == "noauth" { - auther = &auth.NoAuth{} - } - - if method == "password" { - jsonAuth := &auth.JSONAuth{} - host := settings.GlobalConfiguration.Auth.Recaptcha.Host - key := settings.GlobalConfiguration.Auth.Recaptcha.Key - secret := settings.GlobalConfiguration.Auth.Recaptcha.Secret - - if key == "" { - if kmap, ok := defaultAuther["recaptcha"].(map[string]interface{}); ok { - key = kmap["key"].(string) - } - } - - if secret == "" { - if smap, ok := defaultAuther["recaptcha"].(map[string]interface{}); ok { - secret = smap["secret"].(string) - } - } - - if key != "" && secret != "" { - jsonAuth.ReCaptcha = &auth.ReCaptcha{ - Host: host, - Key: key, - Secret: secret, - } - } - auther = jsonAuth - } - - if method == "hook" { - command := settings.GlobalConfiguration.Auth.Command - - if command == "" { - command = defaultAuther["command"].(string) - } - - if command == "" { - checkErr(nerrors.New("you must set the flag 'auth.command' for method 'hook'")) - } - - auther = &auth.HookAuth{Command: command} - } - - if auther == nil { - panic(errors.ErrInvalidAuthMethod) - } - - return auther -} - -func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Auther) { - w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0) //nolint:gomnd - - fmt.Fprintf(w, "Sign up:\t%t\n", set.Signup) - fmt.Fprintf(w, "Create User Dir:\t%t\n", set.CreateUserDir) - fmt.Fprintf(w, "Auth method:\t%s\n", set.Auth.Method) - fmt.Fprintf(w, "Shell:\t%s\t\n", strings.Join(set.Shell, " ")) - fmt.Fprintln(w, "\nFrontend:") - fmt.Fprintf(w, "\tName:\t%s\n", set.Frontend.Name) - fmt.Fprintf(w, "\tFiles override:\t%s\n", set.Frontend.Files) - fmt.Fprintf(w, "\tDisable external links:\t%t\n", set.Frontend.DisableExternal) - fmt.Fprintf(w, "\tDisable used disk percentage graph:\t%t\n", set.Frontend.DisableUsedPercentage) - fmt.Fprintf(w, "\tColor:\t%s\n", set.Frontend.Color) - fmt.Fprintln(w, "\nServer:") - fmt.Fprintf(w, "\tLog:\t%s\n", ser.Log) - fmt.Fprintf(w, "\tBase URL:\t%s\n", ser.BaseURL) - fmt.Fprintf(w, "\tRoot:\t%s\n", ser.Root) - fmt.Fprintf(w, "\tSocket:\t%s\n", ser.Socket) - fmt.Fprintf(w, "\tAddress:\t%s\n", ser.Address) - fmt.Fprintf(w, "\tTLS Cert:\t%s\n", ser.TLSCert) - fmt.Fprintf(w, "\tTLS Key:\t%s\n", ser.TLSKey) - fmt.Fprintf(w, "\tExec Enabled:\t%t\n", ser.EnableExec) - fmt.Fprintln(w, "\nDefaults:") - fmt.Fprintf(w, "\tScope:\t%s\n", set.UserDefaults.Scope) - fmt.Fprintf(w, "\tLocale:\t%s\n", set.UserDefaults.Locale) - fmt.Fprintf(w, "\tView mode:\t%s\n", set.UserDefaults.ViewMode) - fmt.Fprintf(w, "\tSingle Click:\t%t\n", set.UserDefaults.SingleClick) - fmt.Fprintf(w, "\tCommands:\t%s\n", strings.Join(set.UserDefaults.Commands, " ")) - fmt.Fprintf(w, "\tSorting:\n") - fmt.Fprintf(w, "\t\tBy:\t%s\n", set.UserDefaults.Sorting.By) - fmt.Fprintf(w, "\t\tAsc:\t%t\n", set.UserDefaults.Sorting.Asc) - fmt.Fprintf(w, "\tPermissions:\n") - fmt.Fprintf(w, "\t\tAdmin:\t%t\n", set.UserDefaults.Perm.Admin) - fmt.Fprintf(w, "\t\tExecute:\t%t\n", set.UserDefaults.Perm.Execute) - fmt.Fprintf(w, "\t\tCreate:\t%t\n", set.UserDefaults.Perm.Create) - fmt.Fprintf(w, "\t\tRename:\t%t\n", set.UserDefaults.Perm.Rename) - fmt.Fprintf(w, "\t\tModify:\t%t\n", set.UserDefaults.Perm.Modify) - fmt.Fprintf(w, "\t\tDelete:\t%t\n", set.UserDefaults.Perm.Delete) - fmt.Fprintf(w, "\t\tShare:\t%t\n", set.UserDefaults.Perm.Share) - fmt.Fprintf(w, "\t\tDownload:\t%t\n", set.UserDefaults.Perm.Download) - w.Flush() - - b, err := json.MarshalIndent(auther, "", " ") - checkErr(err) - fmt.Printf("\nAuther configuration (raw):\n\n%s\n\n", string(b)) -} diff --git a/backend/cmd/config_cat.go b/backend/cmd/config_cat.go deleted file mode 100644 index 3f06eb9f..00000000 --- a/backend/cmd/config_cat.go +++ /dev/null @@ -1,25 +0,0 @@ -package cmd - -import ( - "github.com/spf13/cobra" -) - -func init() { - configCmd.AddCommand(configCatCmd) -} - -var configCatCmd = &cobra.Command{ - Use: "cat", - Short: "Prints the configuration", - Long: `Prints the configuration.`, - Args: cobra.NoArgs, - Run: python(func(cmd *cobra.Command, args []string, d pythonData) { - set, err := d.store.Settings.Get() - checkErr(err) - ser, err := d.store.Settings.GetServer() - checkErr(err) - auther, err := d.store.Auth.Get(set.Auth.Method) - checkErr(err) - printSettings(ser, set, auther) - }, pythonConfig{}), -} diff --git a/backend/cmd/config_export.go b/backend/cmd/config_export.go deleted file mode 100644 index a4d8ecff..00000000 --- a/backend/cmd/config_export.go +++ /dev/null @@ -1,37 +0,0 @@ -package cmd - -import ( - "github.com/spf13/cobra" -) - -func init() { - configCmd.AddCommand(configExportCmd) -} - -var configExportCmd = &cobra.Command{ - Use: "export ", - Short: "Export the configuration to a file", - Long: `Export the configuration to a file. The path must be for a -json or yaml file. This exported configuration can be changed, -and imported again with 'config import' command.`, - Args: jsonYamlArg, - Run: python(func(cmd *cobra.Command, args []string, d pythonData) { - settings, err := d.store.Settings.Get() - checkErr(err) - - server, err := d.store.Settings.GetServer() - checkErr(err) - - auther, err := d.store.Auth.Get(settings.Auth.Method) - checkErr(err) - - data := &settingsFile{ - Settings: settings, - Auther: auther, - Server: server, - } - - err = marshal(args[0], data) - checkErr(err) - }, pythonConfig{}), -} diff --git a/backend/cmd/config_import.go b/backend/cmd/config_import.go index 08ff806d..ed6702fc 100644 --- a/backend/cmd/config_import.go +++ b/backend/cmd/config_import.go @@ -3,9 +3,9 @@ package cmd import ( "encoding/json" "errors" + "log" "path/filepath" "reflect" - "log" "github.com/spf13/cobra" @@ -13,10 +13,6 @@ import ( "github.com/gtsteffaniak/filebrowser/settings" ) -func init() { - configCmd.AddCommand(configImportCmd) -} - type settingsFile struct { Settings *settings.Settings `json:"settings"` Server *settings.Server `json:"server"` @@ -61,7 +57,7 @@ The path must be for a json or yaml file.`, } else { rawAuther = file.Auther } - log.Println("config_import",file.Settings.Auth) + log.Println("config_import", file.Settings.Auth) var auther auth.Auther switch file.Settings.Auth.Method { case "password": @@ -79,7 +75,6 @@ The path must be for a json or yaml file.`, err = d.store.Auth.Save(auther) checkErr(err) - printSettings(file.Server, file.Settings, auther) }, pythonConfig{allowNoDB: true}), } diff --git a/backend/cmd/config_init.go b/backend/cmd/config_init.go index b3eaa3f7..758f3da5 100644 --- a/backend/cmd/config_init.go +++ b/backend/cmd/config_init.go @@ -5,14 +5,11 @@ import ( "github.com/spf13/cobra" + "github.com/gtsteffaniak/filebrowser/auth" + "github.com/gtsteffaniak/filebrowser/errors" "github.com/gtsteffaniak/filebrowser/settings" ) -func init() { - configCmd.AddCommand(configInitCmd) - addConfigFlags(configInitCmd.Flags()) -} - var configInitCmd = &cobra.Command{ Use: "init", Short: "Initialize a new database", @@ -38,6 +35,45 @@ Congratulations! You've set up your database to use with File Browser. Now add your first user via 'filebrowser users add' and then you just need to call the main command to boot up the server. `) - printSettings(&s.Server, &s, auther) }, pythonConfig{noDB: true}), } + +//nolint:gocyclo +func getAuthentication() auth.Auther { + method := settings.GlobalConfiguration.Auth.Method + var auther auth.Auther + if method == "proxy" { + header := settings.GlobalConfiguration.Auth.Header + auther = &auth.ProxyAuth{Header: header} + } + + if method == "noauth" { + auther = &auth.NoAuth{} + } + + if method == "password" { + jsonAuth := &auth.JSONAuth{} + host := settings.GlobalConfiguration.Auth.Recaptcha.Host + key := settings.GlobalConfiguration.Auth.Recaptcha.Key + secret := settings.GlobalConfiguration.Auth.Recaptcha.Secret + if key != "" && secret != "" { + jsonAuth.ReCaptcha = &auth.ReCaptcha{ + Host: host, + Key: key, + Secret: secret, + } + } + auther = jsonAuth + } + + if method == "hook" { + command := settings.GlobalConfiguration.Auth.Command + auther = &auth.HookAuth{Command: command} + } + + if auther == nil { + panic(errors.ErrInvalidAuthMethod) + } + + return auther +} diff --git a/backend/cmd/config_set.go b/backend/cmd/config_set.go deleted file mode 100644 index cb1b6917..00000000 --- a/backend/cmd/config_set.go +++ /dev/null @@ -1,74 +0,0 @@ -package cmd - -import ( - "github.com/spf13/cobra" - "github.com/spf13/pflag" -) - -func init() { - configCmd.AddCommand(configSetCmd) - addConfigFlags(configSetCmd.Flags()) -} - -var configSetCmd = &cobra.Command{ - Use: "set", - Short: "Updates the configuration", - Long: `Updates the configuration. Set the flags for the options -you want to change. Other options will remain unchanged.`, - Args: cobra.NoArgs, - Run: python(func(cmd *cobra.Command, args []string, d pythonData) { - flags := cmd.Flags() - set, err := d.store.Settings.Get() - checkErr(err) - - ser, err := d.store.Settings.GetServer() - checkErr(err) - - flags.Visit(func(flag *pflag.Flag) { - switch flag.Name { - case "baseurl": - ser.BaseURL = mustGetString(flags, flag.Name) - case "root": - ser.Root = mustGetString(flags, flag.Name) - case "socket": - ser.Socket = mustGetString(flags, flag.Name) - case "cert": - ser.TLSCert = mustGetString(flags, flag.Name) - case "key": - ser.TLSKey = mustGetString(flags, flag.Name) - case "address": - ser.Address = mustGetString(flags, flag.Name) - case "port": - ser.Port = 8080 - case "log": - ser.Log = mustGetString(flags, flag.Name) - case "signup": - set.Signup = mustGetBool(flags, flag.Name) - case "shell": - set.Shell = convertCmdStrToCmdArray(mustGetString(flags, flag.Name)) - case "frontend.name": - set.Frontend.Name = mustGetString(flags, flag.Name) - case "frontend.color": - set.Frontend.Color = mustGetString(flags, flag.Name) - case "frontend.disableExternal": - set.Frontend.DisableExternal = mustGetBool(flags, flag.Name) - case "frontend.disableUsedPercentage": - set.Frontend.DisableUsedPercentage = mustGetBool(flags, flag.Name) - case "frontend.files": - set.Frontend.Files = mustGetString(flags, flag.Name) - } - }) - - getUserDefaults(flags, &set.UserDefaults, false) - - // read the defaults - auther := getAuthentication() - err = d.store.Auth.Save(auther) - checkErr(err) - err = d.store.Settings.Save(set) - checkErr(err) - err = d.store.Settings.SaveServer(ser) - checkErr(err) - printSettings(ser, set, auther) - }, pythonConfig{}), -} diff --git a/backend/cmd/root.go b/backend/cmd/root.go index 970fde83..2e823472 100644 --- a/backend/cmd/root.go +++ b/backend/cmd/root.go @@ -210,50 +210,18 @@ func setupLog(logMethod string) { } func quickSetup(flags *pflag.FlagSet, d pythonData) { - set := &settings.Settings{ - Key: generateKey(), - Signup: false, - CreateUserDir: false, - UserHomeBasePath: settings.DefaultUsersHomeBasePath, - UserDefaults: settings.UserDefaults{ - Scope: ".", - Locale: "en", - SingleClick: false, - Perm: users.Permissions{ - Admin: false, - Execute: true, - Create: true, - Rename: true, - Modify: true, - Delete: true, - Share: true, - Download: true, - }, - }, - Frontend: settings.Frontend{}, - Commands: nil, - Shell: nil, - Rules: nil, - } + settings.GlobalConfiguration.Key = generateKey() var err error if settings.GlobalConfiguration.Auth.Method == "noauth" { - set.Auth.Method = "noauth" + settings.GlobalConfiguration.Auth.Method = "noauth" err = d.store.Auth.Save(&auth.NoAuth{}) } else { - set.Auth.Method = "password" + settings.GlobalConfiguration.Auth.Method = "password" err = d.store.Auth.Save(&auth.JSONAuth{}) } - err = d.store.Settings.Save(set) + err = d.store.Settings.Save(&settings.GlobalConfiguration) checkErr(err) - - ser := &settings.Server{ - BaseURL: getParam(flags, "baseurl"), - Log: getParam(flags, "log"), - TLSKey: getParam(flags, "key"), - TLSCert: getParam(flags, "cert"), - Root: getParam(flags, "root"), - } - err = d.store.Settings.SaveServer(ser) + err = d.store.Settings.SaveServer(&settings.GlobalConfiguration.Server) checkErr(err) username := getParam(flags, "username") @@ -274,7 +242,7 @@ func quickSetup(flags *pflag.FlagSet, d pythonData) { LockPassword: false, } - set.UserDefaults.Apply(user) + settings.GlobalConfiguration.UserDefaults.Apply(user) user.Perm.Admin = true err = d.store.Users.Save(user) diff --git a/backend/cmd/users_add.go b/backend/cmd/users_add.go index eac81240..0ba430eb 100644 --- a/backend/cmd/users_add.go +++ b/backend/cmd/users_add.go @@ -19,7 +19,6 @@ var usersAddCmd = &cobra.Command{ Run: python(func(cmd *cobra.Command, args []string, d pythonData) { s, err := d.store.Settings.Get() checkErr(err) - getUserDefaults(cmd.Flags(), &s.UserDefaults, false) password, err := users.HashPwd(args[1]) checkErr(err) diff --git a/backend/cmd/users_update.go b/backend/cmd/users_update.go index 09bb4b8d..04dd7ce5 100644 --- a/backend/cmd/users_update.go +++ b/backend/cmd/users_update.go @@ -49,7 +49,6 @@ options you want to change.`, Sorting: user.Sorting, Commands: user.Commands, } - getUserDefaults(flags, &defaults, false) user.Scope = defaults.Scope user.Locale = defaults.Locale user.ViewMode = defaults.ViewMode diff --git a/backend/settings/filebrowser.yaml b/backend/filebrowser.yaml similarity index 84% rename from backend/settings/filebrowser.yaml rename to backend/filebrowser.yaml index 8a5d8ddf..6a202701 100644 --- a/backend/settings/filebrowser.yaml +++ b/backend/filebrowser.yaml @@ -1,11 +1,11 @@ server: - indexingInterval: 5 - numImageProcessors: 2 + indexingInterval: 60 + numImageProcessors: 8 socket: "" tlsKey: "" tlsCert: "" - enableThumbnails: false - resizePreview: true + enableThumbnails: true + resizePreview: false typeDetectionByHeader: true port: 8080 baseURL: "/" @@ -21,7 +21,7 @@ auth: header: "" method: noauth command: "" - signup: false + signup: true shell: "" frontend: name: "" @@ -34,7 +34,7 @@ userDefaults: scope: "" locale: "" viewMode: "" - singleClick: true + singleClick: false sorting: by: "" asc: true diff --git a/backend/go.mod b/backend/go.mod index f2ab4898..63bde874 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -9,12 +9,11 @@ require ( github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 github.com/goccy/go-yaml v1.11.0 github.com/golang-jwt/jwt/v4 v4.5.0 + github.com/google/go-cmp v0.5.9 github.com/gorilla/mux v1.8.0 - github.com/gorilla/websocket v1.5.0 github.com/maruel/natural v1.1.0 github.com/marusama/semaphore/v2 v2.5.0 github.com/mholt/archiver/v3 v3.5.1 - github.com/pelletier/go-toml/v2 v2.0.9 github.com/shirou/gopsutil/v3 v3.23.7 github.com/spf13/afero v1.9.5 github.com/spf13/cobra v1.7.0 @@ -22,7 +21,6 @@ require ( github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce - go.etcd.io/bbolt v1.3.7 golang.org/x/crypto v0.12.0 golang.org/x/image v0.11.0 golang.org/x/text v0.12.0 @@ -51,6 +49,7 @@ require ( github.com/mattn/go-isatty v0.0.14 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/nwaples/rardecode v1.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.0.9 // indirect github.com/pierrec/lz4/v4 v4.1.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect @@ -60,6 +59,7 @@ require ( github.com/ulikunitz/xz v0.5.9 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect + go.etcd.io/bbolt v1.3.7 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect diff --git a/backend/go.sum b/backend/go.sum index ebb50138..5aa94277 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -178,8 +178,6 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= diff --git a/backend/http/auth.go b/backend/http/auth.go index 5ff0f656..53dda241 100644 --- a/backend/http/auth.go +++ b/backend/http/auth.go @@ -107,7 +107,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, d.server) + user, err := auther.Auth(r, d.store.Users) if err == os.ErrPermission { return http.StatusForbidden, nil } else if err != nil { @@ -177,6 +177,7 @@ var renewHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data }) func printToken(w http.ResponseWriter, _ *http.Request, d *data, user *users.User) (int, error) { + log.Printf("%#v", user) claims := &authToken{ User: userInfo{ ID: user.ID, diff --git a/backend/settings/config.go b/backend/settings/config.go index b2d2cd47..751b0406 100644 --- a/backend/settings/config.go +++ b/backend/settings/config.go @@ -1,43 +1,31 @@ package settings import ( - "fmt" "log" "os" - "path/filepath" "github.com/goccy/go-yaml" ) var GlobalConfiguration Settings +var configYml = "filebrowser.yaml" func Initialize() { - // Open and read the YAML file - yamlFile, err := os.Open("filebrowser.yaml") + yamlData := loadConfigFile() + GlobalConfiguration = setDefaults() + err := yaml.Unmarshal(yamlData, &GlobalConfiguration) if err != nil { - log.Println("Error opening config file: ", err) - log.Println("Using default config only") - // Get the current directory - dir, err := os.Getwd() - if err != nil { - fmt.Println("Error:", err) - return - } + log.Fatalf("Error unmarshaling YAML data: %v", err) + } +} - // Use the filepath package to join the directory and file names - err = filepath.Walk(dir, func(path string, info os.FileInfo, err error) error { - if err != nil { - fmt.Println("Error:", err) - return err - } - // Check if it's a regular file (not a directory) - if !info.IsDir() { - fmt.Println(path) - } - return nil - }) +func loadConfigFile() []byte { + // Open and read the YAML file + yamlFile, err := os.Open(configYml) + if err != nil { + log.Printf("Error opening config file: %v\nUsing default config only", err) setDefaults() - return + return []byte{} } defer yamlFile.Close() @@ -51,22 +39,16 @@ func Initialize() { if err != nil { log.Fatalf("Error reading YAML data: %v", err) } - // Unmarshal the YAML data into the Settings struct - err = yaml.Unmarshal(yamlData, &GlobalConfiguration) - if err != nil { - log.Fatalf("Error unmarshaling YAML data: %v", err) - } - // Now you have the Settings struct with values from the YAML file - // You can access the values like: defaultSettings.Key, defaultSettings.Server.Port, etc. + return yamlData } -func setDefaults() { - GlobalConfiguration = Settings{ +func setDefaults() Settings { + return Settings{ Signup: true, Server: Server{ IndexingInterval: 5, Port: 8080, - NumImageProcessors: 1, + NumImageProcessors: 4, BaseURL: "", }, Auth: Auth{ @@ -75,5 +57,8 @@ func setDefaults() { Host: "", }, }, + UserDefaults: UserDefaults{ + HideDotfiles: true, + }, } } diff --git a/backend/settings/settings_test.go b/backend/settings/settings_test.go index 5b9285d7..7eefacd7 100644 --- a/backend/settings/settings_test.go +++ b/backend/settings/settings_test.go @@ -1,10 +1,46 @@ package settings import ( + "log" "testing" + + "github.com/goccy/go-yaml" + "github.com/google/go-cmp/cmp" ) -func TestConfigLoad(t *testing.T) { - Initialize() - t.Log("Say bye") +func TestConfigLoadChanged(t *testing.T) { + configYml = "./testingConfig.yaml" + yamlData := loadConfigFile() + // Marshal the YAML data to a more human-readable format + newConfig := setDefaults() + GlobalConfiguration := setDefaults() + + err := yaml.Unmarshal(yamlData, &newConfig) + if err != nil { + log.Fatalf("Error unmarshaling YAML data: %v", err) + } + // Use go-cmp to compare the two structs + if diff := cmp.Diff(newConfig, GlobalConfiguration); diff == "" { + t.Errorf("No change when there should have been (-want +got):\n%s", diff) + } +} + +func TestConfigLoadSpecificValues(t *testing.T) { + configYml = "./testingConfig.yaml" + yamlData := loadConfigFile() + // Marshal the YAML data to a more human-readable format + newConfig := setDefaults() + GlobalConfiguration := setDefaults() + + err := yaml.Unmarshal(yamlData, &newConfig) + if err != nil { + log.Fatalf("Error unmarshaling YAML data: %v", err) + } + + if GlobalConfiguration.Auth.Method == newConfig.Auth.Method { + log.Fatalf("Differences should have been found, but were not on Auth method") + } + if GlobalConfiguration.UserDefaults.HideDotfiles == newConfig.UserDefaults.HideDotfiles { + log.Fatalf("Differences should have been found, but were not on Auth method") + } } diff --git a/backend/settings/structs.go b/backend/settings/structs.go index 7b05b531..84401379 100644 --- a/backend/settings/structs.go +++ b/backend/settings/structs.go @@ -64,7 +64,6 @@ type Server struct { Log string `json:"log"` Database string `json:"database"` Root string `json:"root"` - EnablePreviewResize bool `json:"enablePreviewResize"` } type Frontend struct { diff --git a/backend/settings/testingConfig.yaml b/backend/settings/testingConfig.yaml new file mode 100644 index 00000000..f2dd121d --- /dev/null +++ b/backend/settings/testingConfig.yaml @@ -0,0 +1,52 @@ +server: + indexingInterval: 5 + numImageProcessors: 4 + socket: "" + tlsKey: "" + tlsCert: "" + enableThumbnails: false + resizePreview: true + typeDetectionByHeader: true + port: 8080 + baseURL: "/" + address: "" + log: "stdout" + database: "database.db" + root: "/srv" +auth: + recaptcha: + host: "" + key: "" + secret: "" + header: "" + method: json + command: "" + signup: false + shell: "" +frontend: + name: "" + disableExternal: false + disableUsedPercentage: true + files: "" + theme: "" + color: "" +userDefaults: + scope: "" + locale: "" + viewMode: "" + singleClick: true + sorting: + by: "" + asc: true + perm: + admin: true + execute: true + create: true + rename: true + modify: true + delete: true + share: true + download: true + commands: [] + hideDotfiles: false + dateFormat: false diff --git a/backend/storage/bolt/utils.go b/backend/storage/bolt/utils.go index fa84e3c3..f0cc6253 100644 --- a/backend/storage/bolt/utils.go +++ b/backend/storage/bolt/utils.go @@ -1,12 +1,15 @@ package bolt import ( + "log" + "github.com/asdine/storm/v3" "github.com/gtsteffaniak/filebrowser/errors" ) func get(db *storm.DB, name string, to interface{}) error { + log.Printf("name, %v , to %#v", name, to) err := db.Get("config", name, to) if err == storm.ErrNotFound { return errors.ErrNotExist @@ -16,5 +19,6 @@ func get(db *storm.DB, name string, to interface{}) error { } func save(db *storm.DB, name string, from interface{}) error { + log.Printf("name, %v , from %#v", name, from) return db.Set("config", name, from) } diff --git a/frontend/src/views/settings/Global.vue b/frontend/src/views/settings/Global.vue index 3807dab6..ff1618f7 100644 --- a/frontend/src/views/settings/Global.vue +++ b/frontend/src/views/settings/Global.vue @@ -56,7 +56,7 @@

{{ $t("settings.disableExternalLinks") }} @@ -65,7 +65,7 @@

{{ $t("settings.disableUsedDiskPercentage") }} @@ -75,7 +75,7 @@

@@ -85,7 +85,7 @@

@@ -97,7 +97,7 @@