From d53426b580a81f1f77c4e790da74951b15999f2e Mon Sep 17 00:00:00 2001 From: Graham Steffaniak <42989099+gtsteffaniak@users.noreply.github.com> Date: Tue, 10 Oct 2023 20:03:33 -0500 Subject: [PATCH] V0.2.1 - update signup (#47) Co-authored-by: Graham Steffaniak --- backend/cmd/root.go | 6 +- backend/filebrowser.yaml | 3 +- backend/http/auth.go | 8 +- backend/http/public_test.go | 6 +- backend/http/settings.go | 11 +- backend/http/static.go | 3 +- backend/settings/config.go | 9 +- backend/settings/dir.go | 4 +- backend/settings/dir_test.go | 23 +-- backend/settings/storage.go | 6 +- backend/settings/structs.go | 39 +++-- backend/storage/bolt/users.go | 2 - backend/users/password.go | 3 - configuration.md | 21 ++- .../public/img/icons/safari-pinned-tab.svg | 42 ----- frontend/public/img/logo.png | Bin 0 -> 15614 bytes frontend/public/img/logo.svg | 147 ------------------ frontend/public/index.html | 15 +- frontend/src/css/login.css | 2 +- frontend/src/utils/constants.js | 5 +- frontend/src/views/Login.vue | 6 +- frontend/src/views/Settings.vue | 2 +- frontend/src/views/files/Preview.vue | 7 +- frontend/src/views/settings/User.vue | 8 +- 24 files changed, 102 insertions(+), 276 deletions(-) delete mode 100644 frontend/public/img/icons/safari-pinned-tab.svg create mode 100644 frontend/public/img/logo.png delete mode 100644 frontend/public/img/logo.svg diff --git a/backend/cmd/root.go b/backend/cmd/root.go index 58493985..84080622 100644 --- a/backend/cmd/root.go +++ b/backend/cmd/root.go @@ -118,7 +118,7 @@ func cleanupHandler(listener net.Listener, c chan os.Signal) { //nolint:interfac } func quickSetup(d pythonData) { - settings.GlobalConfiguration.Key = generateKey() + settings.GlobalConfiguration.Auth.Key = generateKey() if settings.GlobalConfiguration.Auth.Method == "noauth" { err := d.store.Auth.Save(&auth.NoAuth{}) checkErr(err) @@ -131,8 +131,8 @@ func quickSetup(d pythonData) { checkErr(err) err = d.store.Settings.SaveServer(&settings.GlobalConfiguration.Server) checkErr(err) - username := settings.GlobalConfiguration.AdminUsername - password := settings.GlobalConfiguration.AdminPassword + username := settings.GlobalConfiguration.Auth.AdminUsername + password := settings.GlobalConfiguration.Auth.AdminPassword if username == "" || password == "" { log.Fatal("username and password cannot be empty during quick setup") } diff --git a/backend/filebrowser.yaml b/backend/filebrowser.yaml index 3fc41d26..4718e8a1 100644 --- a/backend/filebrowser.yaml +++ b/backend/filebrowser.yaml @@ -1,9 +1,10 @@ server: port: 8080 baseURL: "/" + root: "/Users/steffag/git/go" auth: method: password - signup: true + signup: false userDefaults: darkMode: true disableSettings: false diff --git a/backend/http/auth.go b/backend/http/auth.go index a2f67895..612efca6 100644 --- a/backend/http/auth.go +++ b/backend/http/auth.go @@ -55,7 +55,7 @@ func (e extractor) ExtractToken(r *http.Request) (string, error) { func withUser(fn handleFunc) handleFunc { return func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { keyFunc := func(token *jwt.Token) (interface{}, error) { - return d.settings.Key, nil + return d.settings.Auth.Key, nil } var tk authToken @@ -112,7 +112,7 @@ type signupBody struct { } var signupHandler = func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { - if !d.settings.Signup { + if !settings.GlobalConfiguration.Auth.Signup { return http.StatusMethodNotAllowed, nil } @@ -142,7 +142,7 @@ var signupHandler = func(w http.ResponseWriter, r *http.Request, d *data) (int, } user.Scope = userHome log.Printf("new user: %s, home dir: [%s].", user.Username, userHome) - + settings.GlobalConfiguration.UserDefaults.Apply(user) err = d.store.Users.Save(user) if err == errors.ErrExist { return http.StatusConflict, err @@ -168,7 +168,7 @@ func printToken(w http.ResponseWriter, _ *http.Request, d *data, user *users.Use } token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) - signed, err := token.SignedString(d.settings.Key) + signed, err := token.SignedString(d.settings.Auth.Key) if err != nil { return http.StatusInternalServerError, err } diff --git a/backend/http/public_test.go b/backend/http/public_test.go index 5c010e19..ad61a6d3 100644 --- a/backend/http/public_test.go +++ b/backend/http/public_test.go @@ -85,7 +85,11 @@ func TestPublicShareHandlerAuthentication(t *testing.T) { if err := storage.Users.Save(&users.User{Username: "username", Password: "pw"}); err != nil { t.Fatalf("failed to save user: %v", err) } - if err := storage.Settings.Save(&settings.Settings{Key: []byte("key")}); err != nil { + if err := storage.Settings.Save(&settings.Settings{ + Auth: settings.Auth{ + Key: []byte("key"), + }, + }); err != nil { t.Fatalf("failed to save settings: %v", err) } diff --git a/backend/http/settings.go b/backend/http/settings.go index 9591df5d..1acebf83 100644 --- a/backend/http/settings.go +++ b/backend/http/settings.go @@ -21,9 +21,9 @@ type settingsData struct { var settingsGetHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { data := &settingsData{ - Signup: d.settings.Signup, - CreateUserDir: d.settings.CreateUserDir, - UserHomeBasePath: d.settings.UserHomeBasePath, + Signup: settings.GlobalConfiguration.Auth.Signup, + CreateUserDir: settings.GlobalConfiguration.Server.CreateUserDir, + UserHomeBasePath: settings.GlobalConfiguration.Server.UserHomeBasePath, Defaults: d.settings.UserDefaults, Rules: d.settings.Rules, Frontend: d.settings.Frontend, @@ -41,9 +41,8 @@ var settingsPutHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, return http.StatusBadRequest, err } - d.settings.Signup = req.Signup - d.settings.CreateUserDir = req.CreateUserDir - d.settings.UserHomeBasePath = req.UserHomeBasePath + d.settings.Server.CreateUserDir = req.CreateUserDir + d.settings.Server.UserHomeBasePath = req.UserHomeBasePath d.settings.UserDefaults = req.Defaults d.settings.Rules = req.Rules d.settings.Frontend = req.Frontend diff --git a/backend/http/static.go b/backend/http/static.go index fa06de3a..f2f7b860 100644 --- a/backend/http/static.go +++ b/backend/http/static.go @@ -30,11 +30,12 @@ func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, fSys "Name": d.settings.Frontend.Name, "DisableExternal": d.settings.Frontend.DisableExternal, "DisableUsedPercentage": d.settings.Frontend.DisableUsedPercentage, + "darkMode": settings.GlobalConfiguration.UserDefaults.DarkMode, "Color": d.settings.Frontend.Color, "BaseURL": d.server.BaseURL, "Version": version.Version, "StaticURL": path.Join(d.server.BaseURL, "/static"), - "Signup": d.settings.Signup, + "Signup": settings.GlobalConfiguration.Auth.Signup, "NoAuth": d.settings.Auth.Method == "noauth", "AuthMethod": d.settings.Auth.Method, "LoginPage": auther.LoginPage(), diff --git a/backend/settings/config.go b/backend/settings/config.go index b7f7ef51..a4a839e5 100644 --- a/backend/settings/config.go +++ b/backend/settings/config.go @@ -45,9 +45,6 @@ func loadConfigFile(configFile string) []byte { func setDefaults() Settings { return Settings{ - Signup: true, - AdminUsername: "admin", - AdminPassword: "admin", Server: Server{ EnableThumbnails: true, EnableExec: false, @@ -60,8 +57,10 @@ func setDefaults() Settings { Root: "/srv", }, Auth: Auth{ - Method: "password", - Signup: true, + AdminUsername: "admin", + AdminPassword: "admin", + Method: "password", + Signup: true, Recaptcha: Recaptcha{ Host: "", }, diff --git a/backend/settings/dir.go b/backend/settings/dir.go index 25289ee4..369e74a1 100644 --- a/backend/settings/dir.go +++ b/backend/settings/dir.go @@ -21,13 +21,13 @@ var ( // MakeUserDir makes the user directory according to settings. func (s *Settings) MakeUserDir(username, userScope, serverRoot string) (string, error) { userScope = strings.TrimSpace(userScope) - if userScope == "" && s.CreateUserDir { + if userScope == "" && s.Server.CreateUserDir { username = cleanUsername(username) if username == "" || username == "-" || username == "." { log.Printf("create user: invalid user for home dir creation: [%s]", username) return "", errors.New("invalid user for home dir creation") } - userScope = path.Join(s.UserHomeBasePath, username) + userScope = path.Join(s.Server.UserHomeBasePath, username) } userScope = path.Join("/", userScope) diff --git a/backend/settings/dir_test.go b/backend/settings/dir_test.go index 1b3abc4e..fd28e5b1 100644 --- a/backend/settings/dir_test.go +++ b/backend/settings/dir_test.go @@ -8,7 +8,6 @@ import ( func TestSettings_MakeUserDir(t *testing.T) { type fields struct { - Key []byte Signup bool CreateUserDir bool UserHomeBasePath string @@ -40,20 +39,14 @@ func TestSettings_MakeUserDir(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { s := &Settings{ - Key: tt.fields.Key, - Signup: tt.fields.Signup, - CreateUserDir: tt.fields.CreateUserDir, - UserHomeBasePath: tt.fields.UserHomeBasePath, - Commands: tt.fields.Commands, - Shell: tt.fields.Shell, - AdminUsername: tt.fields.AdminUsername, - AdminPassword: tt.fields.AdminPassword, - Rules: tt.fields.Rules, - Server: tt.fields.Server, - Auth: tt.fields.Auth, - Frontend: tt.fields.Frontend, - Users: tt.fields.Users, - UserDefaults: tt.fields.UserDefaults, + Commands: tt.fields.Commands, + Shell: tt.fields.Shell, + Rules: tt.fields.Rules, + Server: tt.fields.Server, + Auth: tt.fields.Auth, + Frontend: tt.fields.Frontend, + Users: tt.fields.Users, + UserDefaults: tt.fields.UserDefaults, } got, err := s.MakeUserDir(tt.args.username, tt.args.userScope, tt.args.serverRoot) if (err != nil) != tt.wantErr { diff --git a/backend/settings/storage.go b/backend/settings/storage.go index f54acc62..522b6e0c 100644 --- a/backend/settings/storage.go +++ b/backend/settings/storage.go @@ -29,8 +29,8 @@ func (s *Storage) Get() (*Settings, error) { if err != nil { return nil, err } - if set.UserHomeBasePath == "" { - set.UserHomeBasePath = DefaultUsersHomeBasePath + if set.Server.UserHomeBasePath == "" { + set.Server.UserHomeBasePath = DefaultUsersHomeBasePath } return set, nil } @@ -45,7 +45,7 @@ var defaultEvents = []string{ // Save saves the settings for the current instance. func (s *Storage) Save(set *Settings) error { - if len(set.Key) == 0 { + if len(set.Auth.Key) == 0 { return errors.ErrEmptyKey } diff --git a/backend/settings/structs.go b/backend/settings/structs.go index 6afa9fda..03ea86ab 100644 --- a/backend/settings/structs.go +++ b/backend/settings/structs.go @@ -6,29 +6,26 @@ import ( ) type Settings struct { - Key []byte `json:"key"` - Signup bool `json:"signup"` - CreateUserDir bool `json:"createUserDir"` - UserHomeBasePath string `json:"userHomeBasePath"` - Commands map[string][]string `json:"commands"` - Shell []string `json:"shell"` - AdminUsername string `json:"adminUsername"` - AdminPassword string `json:"adminPassword"` - Rules []rules.Rule `json:"rules"` - Server Server `json:"server"` - Auth Auth `json:"auth"` - Frontend Frontend `json:"frontend"` - Users []UserDefaults `json:"users,omitempty"` - UserDefaults UserDefaults `json:"userDefaults"` + Commands map[string][]string `json:"commands"` + Shell []string `json:"shell"` + Rules []rules.Rule `json:"rules"` + Server Server `json:"server"` + Auth Auth `json:"auth"` + Frontend Frontend `json:"frontend"` + Users []UserDefaults `json:"users,omitempty"` + UserDefaults UserDefaults `json:"userDefaults"` } type Auth struct { - Recaptcha Recaptcha `json:"recaptcha"` - Header string `json:"header"` - Method string `json:"method"` - Command string `json:"command"` - Signup bool `json:"signup"` - Shell string `json:"shell"` + Recaptcha Recaptcha `json:"recaptcha"` + Header string `json:"header"` + Method string `json:"method"` + Command string `json:"command"` + Signup bool `json:"signup"` + Shell string `json:"shell"` + AdminUsername string `json:"adminUsername"` + AdminPassword string `json:"adminPassword"` + Key []byte `json:"key"` } type Recaptcha struct { @@ -54,6 +51,8 @@ type Server struct { Log string `json:"log"` Database string `json:"database"` Root string `json:"root"` + UserHomeBasePath string `json:"userHomeBasePath"` + CreateUserDir bool `json:"createUserDir"` } type Frontend struct { diff --git a/backend/storage/bolt/users.go b/backend/storage/bolt/users.go index c4837136..b7eeaac4 100644 --- a/backend/storage/bolt/users.go +++ b/backend/storage/bolt/users.go @@ -2,7 +2,6 @@ package bolt import ( "fmt" - "log" "reflect" "github.com/asdine/storm/v3" @@ -74,7 +73,6 @@ func (st usersBackend) Update(user *users.User, fields ...string) error { } func (st usersBackend) Save(user *users.User) error { - log.Println("userinfo", user.Password) pass, err := users.HashPwd(user.Password) if err != nil { return err diff --git a/backend/users/password.go b/backend/users/password.go index e5b5f72b..d7ef250a 100644 --- a/backend/users/password.go +++ b/backend/users/password.go @@ -1,14 +1,11 @@ package users import ( - "log" - "golang.org/x/crypto/bcrypt" ) // HashPwd hashes a password. func HashPwd(password string) (string, error) { - log.Println("hashing password", password) bytes, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) return string(bytes), err } diff --git a/configuration.md b/configuration.md index 802ef80c..6284522e 100644 --- a/configuration.md +++ b/configuration.md @@ -7,10 +7,11 @@ This document covers the available configuration options, their defaults, and ho Here is an expanded config file which includes all possible configurations: ``` -signup: false adminUsername: admin adminPassword: admin server: + CreateUserDir: false + UserHomeBasePath: "" indexingInterval: 5 numImageProcessors: 4 socket: "" @@ -33,6 +34,7 @@ auth: header: "" method: json command: "" + signup: false shell: "" frontend: name: "" @@ -67,7 +69,6 @@ userDefaults: Here are the defaults if nothing is set: ``` -signup: true adminUsername: admin adminPassword: admin server: @@ -107,12 +108,6 @@ userDefaults: ## About each configuration -- `Signup`: This boolean value indicates whether user signup is enabled on the login page. NOTE: Be mindful of `userDefaults` settings if enabled. Default: `false` - -- `AdminUsername`: This is the username of the admin user. Default: `admin` - -- `AdminPassword`: This is the password of the admin user. Default: `admin` - ### Server configuration settings - `indexingInterval`: This is the time in minutes the system waits before checking for filesystem changes. Default: `5` @@ -143,6 +138,10 @@ userDefaults: - `root`: This is the root directory path. Default: `/srv` +- `CreateUserDir`: Boolean to create user directory on user creation. Default: `false` + +- `UserHomeBasePath`: String to define user home directory base path. Default: `""` + ### Auth configuration settings - `recaptcha`: @@ -166,6 +165,12 @@ userDefaults: - `shell`: This is the shell configuration. +- `Signup`: This boolean value indicates whether user signup is enabled on the login page. NOTE: Be mindful of `userDefaults` settings if enabled. Default: `false` + +- `AdminUsername`: This is the username of the admin user. Default: `admin` + +- `AdminPassword`: This is the password of the admin user. Default: `admin` + ### Frontend configuration settings - `name`: This is the name of the frontend. diff --git a/frontend/public/img/icons/safari-pinned-tab.svg b/frontend/public/img/icons/safari-pinned-tab.svg deleted file mode 100644 index 0119c21a..00000000 --- a/frontend/public/img/icons/safari-pinned-tab.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - - - - - - diff --git a/frontend/public/img/logo.png b/frontend/public/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..50b30a60f90d54ae4afe92ce536637127eeda45c GIT binary patch literal 15614 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 AJ^%m! literal 0 HcmV?d00001 diff --git a/frontend/public/img/logo.svg b/frontend/public/img/logo.svg deleted file mode 100644 index 5e78eccf..00000000 --- a/frontend/public/img/logo.svg +++ /dev/null @@ -1,147 +0,0 @@ - -image/svg+xml - - - - - \ No newline at end of file diff --git a/frontend/public/index.html b/frontend/public/index.html index d8cbd347..b6da58f5 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -120,17 +120,22 @@
-
+ [{[ if .darkMode -]}] +
- - [{[ if .darkMode -]}] - - [{[ end ]}] + [{[ else ]}] +
+ +
[{[ end ]}] [{[ if .CSS -]}] [{[ end ]}] diff --git a/frontend/src/css/login.css b/frontend/src/css/login.css index b97ae7cd..322396b1 100644 --- a/frontend/src/css/login.css +++ b/frontend/src/css/login.css @@ -1,5 +1,5 @@ #login { - background: #fff; + background: var(--background); position: fixed; top: 0; left: 0; diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index d1bd6a3e..58a8679f 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -3,11 +3,12 @@ const disableExternal = window.FileBrowser.DisableExternal; const disableUsedPercentage = window.FileBrowser.DisableUsedPercentage; const baseURL = window.FileBrowser.BaseURL; const staticURL = window.FileBrowser.StaticURL; +const darkMode = window.FileBrowser.darkMode; const recaptcha = window.FileBrowser.ReCaptcha; const recaptchaKey = window.FileBrowser.ReCaptchaKey; const signup = window.FileBrowser.Signup; const version = window.FileBrowser.Version; -const logoURL = `${staticURL}/img/logo.svg`; +const logoURL = `${staticURL}/img/logo.png`; const noAuth = window.FileBrowser.NoAuth; const authMethod = window.FileBrowser.AuthMethod; const loginPage = window.FileBrowser.LoginPage; @@ -16,6 +17,7 @@ const resizePreview = window.FileBrowser.ResizePreview; const enableExec = window.FileBrowser.EnableExec; const origin = window.location.origin; +console.log(window.FileBrowser) export { name, disableExternal, @@ -33,4 +35,5 @@ export { resizePreview, enableExec, origin, + darkMode }; diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue index 51e5d1cb..57021133 100644 --- a/frontend/src/views/Login.vue +++ b/frontend/src/views/Login.vue @@ -1,5 +1,5 @@