("$showError")!;
const router = useRouter();
@@ -209,6 +222,12 @@ const drop = async (event: Event) => {
};
const itemClick = (event: Event | KeyboardEvent) => {
+ // If long press was triggered, prevent normal click behavior
+ if (longPressTriggered.value) {
+ longPressTriggered.value = false;
+ return;
+ }
+
if (
singleClick.value &&
!(event as KeyboardEvent).ctrlKey &&
@@ -281,4 +300,76 @@ const getExtension = (fileName: string): string => {
}
return fileName.substring(lastDotIndex);
};
+
+// Long-press helper functions
+const startLongPress = (clientX: number, clientY: number) => {
+ startPosition.value = { x: clientX, y: clientY };
+ longPressTimer.value = window.setTimeout(() => {
+ handleLongPress();
+ }, longPressDelay.value);
+};
+
+const cancelLongPress = () => {
+ if (longPressTimer.value !== null) {
+ window.clearTimeout(longPressTimer.value);
+ longPressTimer.value = null;
+ }
+ startPosition.value = null;
+};
+
+const handleLongPress = () => {
+ if (singleClick.value) {
+ longPressTriggered.value = true;
+ click(new Event("longpress"));
+ }
+ cancelLongPress();
+};
+
+const checkMovement = (clientX: number, clientY: number): boolean => {
+ if (!startPosition.value) return false;
+
+ const deltaX = Math.abs(clientX - startPosition.value.x);
+ const deltaY = Math.abs(clientY - startPosition.value.y);
+
+ return deltaX > moveThreshold.value || deltaY > moveThreshold.value;
+};
+
+// Event handlers
+const handleMouseDown = (event: MouseEvent) => {
+ if (event.button === 0) {
+ startLongPress(event.clientX, event.clientY);
+ }
+};
+
+const handleMouseUp = () => {
+ cancelLongPress();
+};
+
+const handleMouseLeave = () => {
+ cancelLongPress();
+};
+
+const handleTouchStart = (event: TouchEvent) => {
+ if (event.touches.length === 1) {
+ const touch = event.touches[0];
+ startLongPress(touch.clientX, touch.clientY);
+ }
+};
+
+const handleTouchEnd = () => {
+ cancelLongPress();
+};
+
+const handleTouchCancel = () => {
+ cancelLongPress();
+};
+
+const handleTouchMove = (event: TouchEvent) => {
+ if (event.touches.length === 1 && startPosition.value) {
+ const touch = event.touches[0];
+ if (checkMovement(touch.clientX, touch.clientY)) {
+ cancelLongPress();
+ }
+ }
+};
diff --git a/frontend/src/components/prompts/FileList.vue b/frontend/src/components/prompts/FileList.vue
index 6a10a127..6d3321b2 100644
--- a/frontend/src/components/prompts/FileList.vue
+++ b/frontend/src/components/prompts/FileList.vue
@@ -31,9 +31,16 @@ import { useFileStore } from "@/stores/file";
import url from "@/utils/url";
import { files } from "@/api";
+import { StatusError } from "@/api/utils.js";
export default {
name: "file-list",
+ props: {
+ exclude: {
+ type: Array,
+ default: () => [],
+ },
+ },
data: function () {
return {
items: [],
@@ -43,6 +50,7 @@ export default {
},
selected: null,
current: window.location.pathname,
+ nextAbortController: new AbortController(),
};
},
inject: ["$showError"],
@@ -56,7 +64,13 @@ export default {
mounted() {
this.fillOptions(this.req);
},
+ unmounted() {
+ this.abortOngoingNext();
+ },
methods: {
+ abortOngoingNext() {
+ this.nextAbortController.abort();
+ },
fillOptions(req) {
// Sets the current path and resets
// the current items.
@@ -82,6 +96,7 @@ export default {
// move options.
for (const item of req.items) {
if (!item.isDir) continue;
+ if (this.exclude?.includes(item.url)) continue;
this.items.push({
name: item.name,
@@ -94,8 +109,17 @@ export default {
// just clicked in and fill the options with its
// content.
const uri = event.currentTarget.dataset.url;
-
- files.fetch(uri).then(this.fillOptions).catch(this.$showError);
+ this.abortOngoingNext();
+ this.nextAbortController = new AbortController();
+ files
+ .fetch(uri, this.nextAbortController.signal)
+ .then(this.fillOptions)
+ .catch((e) => {
+ if (e instanceof StatusError && e.is_canceled) {
+ return;
+ }
+ this.$showError(e);
+ });
},
touchstart(event) {
const url = event.currentTarget.dataset.url;
diff --git a/frontend/src/components/prompts/Help.vue b/frontend/src/components/prompts/Help.vue
index a5c5d138..1d99eeed 100644
--- a/frontend/src/components/prompts/Help.vue
+++ b/frontend/src/components/prompts/Help.vue
@@ -11,7 +11,7 @@
DEL - {{ $t("help.del") }}
ESC - {{ $t("help.esc") }}
CTRL + S - {{ $t("help.ctrl.s") }}
- CTRL + F - {{ $t("help.ctrl.f") }}
+ CTRL + SHIFT + F - {{ $t("help.ctrl.f") }}
CTRL + Click - {{ $t("help.ctrl.click") }}
Click - {{ $t("help.click") }}
Double click - {{ $t("help.doubleClick") }}
diff --git a/frontend/src/components/prompts/Move.vue b/frontend/src/components/prompts/Move.vue
index 6591d09d..7b2fd615 100644
--- a/frontend/src/components/prompts/Move.vue
+++ b/frontend/src/components/prompts/Move.vue
@@ -8,6 +8,7 @@
@@ -76,6 +77,11 @@ export default {
computed: {
...mapState(useFileStore, ["req", "selected"]),
...mapState(useAuthStore, ["user"]),
+ excludedFolders() {
+ return this.selected
+ .filter((idx) => this.req.items[idx].isDir)
+ .map((idx) => this.req.items[idx].url);
+ },
},
methods: {
...mapActions(useLayoutStore, ["showHover", "closeHovers"]),
diff --git a/frontend/src/components/prompts/Share.vue b/frontend/src/components/prompts/Share.vue
index 99c82f74..3ce2b1fd 100644
--- a/frontend/src/components/prompts/Share.vue
+++ b/frontend/src/components/prompts/Share.vue
@@ -32,16 +32,6 @@
content_paste
- |
-
- |
| 
-
-
[](https://github.com/filebrowser/filebrowser/actions/workflows/main.yaml)
-[](https://goreportcard.com/report/github.com/filebrowser/filebrowser)
-[](http://godoc.org/github.com/filebrowser/filebrowser)
-[](https://github.com/filebrowser/filebrowser/releases/latest)
-[](http://webchat.freenode.net/?channels=%23filebrowser)
+[](https://goreportcard.com/report/github.com/filebrowser/filebrowser)
+[](http://godoc.org/github.com/filebrowser/filebrowser)
+[](https://github.com/filebrowser/filebrowser/releases/latest)
+[](http://webchat.freenode.net/?channels=%23filebrowser)
-filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files. It allows the creation of multiple users and each user can have its own directory. It can be used as a standalone app.
+File Browser provides a file managing interface within a specified directory and it can be used to upload, delete, preview and edit your files. It is a **create-your-own-cloud**-kind of software where you can just install it on your server, direct it to a path and access your files through a nice web interface.
+
+## Documentation
+
+Documentation on how to install, configure, and contribute to this project is hosted at [filebrowser.org](https://filebrowser.org).
+
+## Project Status
> [!WARNING]
>
@@ -25,28 +29,10 @@ filebrowser provides a file managing interface within a specified directory and
[issues]: https://github.com/filebrowser/filebrowser/issues
[discussions]: https://github.com/filebrowser/filebrowser/discussions
-## Demo
-
-URL: https://demo.filebrowser.org/
-
-Credentials: `demo`/`demo`
-
-## Features
-
-Please refer to our docs at [https://filebrowser.org/features](https://filebrowser.org/features)
-
-## Install
-
-For installation instructions please refer to our docs at [https://filebrowser.org/installation](https://filebrowser.org/installation).
-
-## Configuration
-
-[Authentication Method](https://filebrowser.org/configuration/authentication-method) - You can change the way the user authenticates with the filebrowser server
-
-[Command Runner](https://filebrowser.org/configuration/command-runner) - The command runner is a feature that enables you to execute any shell command you want before or after a certain event.
-
-[Custom Branding](https://filebrowser.org/configuration/custom-branding) - You can customize your File Browser installation by change its name to any other you want, by adding a global custom style sheet and by using your own logotype if you want.
-
## Contributing
-If you're interested in contributing to this project, our docs are best places to start [https://filebrowser.org/contributing](https://filebrowser.org/contributing).
+Contributions are always welcome. To start contributing to this project, read our [guidelines](CONTRIBUTING.md) first.
+
+## License
+
+[Apache License 2.0](LICENSE) © File Browser Contributors
diff --git a/SECURITY.md b/SECURITY.md
index a36dee40..490a9bea 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -12,7 +12,9 @@ currently being supported with security updates.
## Reporting a Vulnerability
-Vulnerabilities should be reported to filebrowser@googlegroups.com - which is a private, maintainer-only group. Maintainers will attempt to respond to/confirm reports within 2-3 days, but if you believe your report to be "critical" to user safety and security, please note as such in the subject. We have tens of thousands of users using our software, and take security vulnerabilities seriously.
+Vulnerabilities with critical impact should be reported on the [Security](https://github.com/filebrowser/filebrowser/security) page of this repository, which is a private way of communicating vulnerabilities to maintainers. This project is in maintenance-only mode and it can take a while until someone gets back to you.
+
+If it is not a critical vulnerability, please open an issue and we will categorize it as a security issue. By giving visibility, we can get more help from the community at fixing such issues.
When reporting an issue, where possible, please provide at least:
@@ -21,6 +23,4 @@ When reporting an issue, where possible, please provide at least:
* Steps to reproduce
* Your recommended remediation(s), if any.
-The FileBrowser team is a volunteer-only effort, and may reach back out for clarification.
-
-> Note: Please do not open public issues for security issues, as GitHub does not provide facility for private issues, and deleting the issue makes it hard to triage/respond back to the reporter.
+The File Browser team is a volunteer-only effort, and may reach back out for clarification.
diff --git a/auth/hook.go b/auth/hook.go
index c659e57b..849a923d 100644
--- a/auth/hook.go
+++ b/auth/hook.go
@@ -150,7 +150,7 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
}
if u == nil {
- pass, err := users.HashPwd(a.Cred.Password)
+ pass, err := users.ValidateAndHashPwd(a.Cred.Password, a.Settings.MinimumPasswordLength)
if err != nil {
return nil, err
}
@@ -186,7 +186,7 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
// update the password when it doesn't match the current
if p {
- pass, err := users.HashPwd(a.Cred.Password)
+ pass, err := users.ValidateAndHashPwd(a.Cred.Password, a.Settings.MinimumPasswordLength)
if err != nil {
return nil, err
}
diff --git a/auth/proxy.go b/auth/proxy.go
index 0e954309..301aa292 100644
--- a/auth/proxy.go
+++ b/auth/proxy.go
@@ -1,7 +1,6 @@
package auth
import (
- "crypto/rand"
"errors"
"net/http"
@@ -29,15 +28,14 @@ func (a ProxyAuth) Auth(r *http.Request, usr users.Store, setting *settings.Sett
}
func (a ProxyAuth) createUser(usr users.Store, setting *settings.Settings, srv *settings.Server, username string) (*users.User, error) {
- const passwordSize = 32
- randomPasswordBytes := make([]byte, passwordSize)
- _, err := rand.Read(randomPasswordBytes)
+ const randomPasswordLength = settings.DefaultMinimumPasswordLength + 10
+ pwd, err := users.RandomPwd(randomPasswordLength)
if err != nil {
return nil, err
}
var hashedRandomPassword string
- hashedRandomPassword, err = users.HashPwd(string(randomPasswordBytes))
+ hashedRandomPassword, err = users.ValidateAndHashPwd(pwd, setting.MinimumPasswordLength)
if err != nil {
return nil, err
}
diff --git a/cmd/config.go b/cmd/config.go
index de55c28e..3ee8dab8 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -32,6 +32,7 @@ func addConfigFlags(flags *pflag.FlagSet) {
addUserFlags(flags)
flags.BoolP("signup", "s", false, "allow users to signup")
flags.Bool("create-user-dir", false, "generate user's home directory automatically")
+ flags.Uint("minimum-password-length", settings.DefaultMinimumPasswordLength, "minimum password length for new users")
flags.String("shell", "", "shell command to which other commands should be appended")
flags.String("auth.method", string(auth.MethodJSONAuth), "authentication type")
@@ -144,6 +145,7 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut
fmt.Fprintf(w, "Sign up:\t%t\n", set.Signup)
fmt.Fprintf(w, "Create User Dir:\t%t\n", set.CreateUserDir)
+ fmt.Fprintf(w, "Minimum Password Length:\t%d\n", set.MinimumPasswordLength)
fmt.Fprintf(w, "Auth method:\t%s\n", set.AuthMethod)
fmt.Fprintf(w, "Shell:\t%s\t\n", strings.Join(set.Shell, " "))
fmt.Fprintln(w, "\nBranding:")
diff --git a/cmd/config_import.go b/cmd/config_import.go
index ab1ccaf5..6c609481 100644
--- a/cmd/config_import.go
+++ b/cmd/config_import.go
@@ -56,7 +56,7 @@ The path must be for a json or yaml file.`,
checkErr(err)
var rawAuther interface{}
- if filepath.Ext(args[0]) != ".json" { //nolint:goconst
+ if filepath.Ext(args[0]) != ".json" {
rawAuther = cleanUpInterfaceMap(file.Auther.(map[interface{}]interface{}))
} else {
rawAuther = file.Auther
diff --git a/cmd/config_init.go b/cmd/config_init.go
index 60a0f37b..d9710514 100644
--- a/cmd/config_init.go
+++ b/cmd/config_init.go
@@ -29,12 +29,13 @@ override the options.`,
authMethod, auther := getAuthentication(flags)
s := &settings.Settings{
- Key: generateKey(),
- Signup: mustGetBool(flags, "signup"),
- CreateUserDir: mustGetBool(flags, "create-user-dir"),
- Shell: convertCmdStrToCmdArray(mustGetString(flags, "shell")),
- AuthMethod: authMethod,
- Defaults: defaults,
+ Key: generateKey(),
+ Signup: mustGetBool(flags, "signup"),
+ CreateUserDir: mustGetBool(flags, "create-user-dir"),
+ MinimumPasswordLength: mustGetUint(flags, "minimum-password-length"),
+ Shell: convertCmdStrToCmdArray(mustGetString(flags, "shell")),
+ AuthMethod: authMethod,
+ Defaults: defaults,
Branding: settings.Branding{
Name: mustGetString(flags, "branding.name"),
DisableExternal: mustGetBool(flags, "branding.disableExternal"),
diff --git a/cmd/config_set.go b/cmd/config_set.go
index 23ff7e1b..05816795 100644
--- a/cmd/config_set.go
+++ b/cmd/config_set.go
@@ -51,6 +51,8 @@ you want to change. Other options will remain unchanged.`,
set.Shell = convertCmdStrToCmdArray(mustGetString(flags, flag.Name))
case "create-user-dir":
set.CreateUserDir = mustGetBool(flags, flag.Name)
+ case "minimum-password-length":
+ set.MinimumPasswordLength = mustGetUint(flags, flag.Name)
case "branding.name":
set.Branding.Name = mustGetString(flags, flag.Name)
case "branding.color":
diff --git a/cmd/root.go b/cmd/root.go
index 125f443d..4b6819b7 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,6 +1,7 @@
package cmd
import (
+ "context"
"crypto/tls"
"errors"
"io"
@@ -13,6 +14,7 @@ import (
"path/filepath"
"strings"
"syscall"
+ "time"
homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/afero"
@@ -48,7 +50,7 @@ func init() {
persistent.StringP("database", "d", "./filebrowser.db", "database path")
flags.Bool("noauth", false, "use the noauth auther when using quick setup")
flags.String("username", "admin", "username for the first user when using quick config")
- flags.String("password", "", "hashed password for the first user when using quick config (default \"admin\")")
+ flags.String("password", "", "hashed password for the first user when using quick config")
addServerFlags(flags)
}
@@ -61,14 +63,14 @@ func addServerFlags(flags *pflag.FlagSet) {
flags.StringP("key", "k", "", "tls key")
flags.StringP("root", "r", ".", "root to prepend to relative paths")
flags.String("socket", "", "socket to listen to (cannot be used with address, port, cert nor key flags)")
- flags.Uint32("socket-perm", 0666, "unix socket file permissions") //nolint:gomnd
+ flags.Uint32("socket-perm", 0666, "unix socket file permissions")
flags.StringP("baseurl", "b", "", "base url")
flags.String("cache-dir", "", "file cache directory (disabled if empty)")
flags.String("token-expiration-time", "2h", "user session timeout")
- flags.Int("img-processors", 4, "image processors count") //nolint:gomnd
+ flags.Int("img-processors", 4, "image processors count") //nolint:mnd
flags.Bool("disable-thumbnails", false, "disable image thumbnails")
flags.Bool("disable-preview-resize", false, "disable resize of image previews")
- flags.Bool("disable-exec", false, "disables Command Runner feature")
+ flags.Bool("disable-exec", true, "disables Command Runner feature")
flags.Bool("disable-type-detection-by-header", false, "disables type detection by reading file headers")
}
@@ -129,7 +131,7 @@ user created with the credentials from options "username" and "password".`,
cacheDir, err := cmd.Flags().GetString("cache-dir")
checkErr(err)
if cacheDir != "" {
- if err := os.MkdirAll(cacheDir, 0700); err != nil { //nolint:govet,gomnd
+ if err := os.MkdirAll(cacheDir, 0700); err != nil { //nolint:govet
log.Fatalf("can't make directory %s: %s", cacheDir, err)
}
fileCache = diskcache.New(afero.NewOsFs(), cacheDir)
@@ -167,10 +169,6 @@ user created with the credentials from options "username" and "password".`,
checkErr(err)
}
- sigc := make(chan os.Signal, 1)
- signal.Notify(sigc, os.Interrupt, syscall.SIGTERM)
- go cleanupHandler(listener, sigc)
-
assetsFs, err := fs.Sub(frontend.Assets(), "dist")
if err != nil {
panic(err)
@@ -182,18 +180,31 @@ user created with the credentials from options "username" and "password".`,
defer listener.Close()
log.Println("Listening on", listener.Addr().String())
- //nolint: gosec
- if err := http.Serve(listener, handler); err != nil {
- log.Fatal(err)
+ srv := &http.Server{
+ Handler: handler,
+ ReadHeaderTimeout: 60 * time.Second,
}
- }, pythonConfig{allowNoDB: true}),
-}
-func cleanupHandler(listener net.Listener, c chan os.Signal) { //nolint:interfacer
- sig := <-c
- log.Printf("Caught signal %s: shutting down.", sig)
- listener.Close()
- os.Exit(0)
+ go func() {
+ if err := srv.Serve(listener); !errors.Is(err, http.ErrServerClosed) {
+ log.Fatalf("HTTP server error: %v", err)
+ }
+
+ log.Println("Stopped serving new connections.")
+ }()
+
+ sigc := make(chan os.Signal, 1)
+ signal.Notify(sigc, os.Interrupt, syscall.SIGTERM)
+ <-sigc
+
+ shutdownCtx, shutdownRelease := context.WithTimeout(context.Background(), 10*time.Second) //nolint:mnd
+ defer shutdownRelease()
+
+ if err := srv.Shutdown(shutdownCtx); err != nil {
+ log.Fatalf("HTTP shutdown error: %v", err)
+ }
+ log.Println("Graceful shutdown complete.")
+ }, pythonConfig{allowNoDB: true}),
}
//nolint:gocyclo
@@ -201,42 +212,42 @@ func getRunParams(flags *pflag.FlagSet, st *storage.Storage) *settings.Server {
server, err := st.Settings.GetServer()
checkErr(err)
- if val, set := getParamB(flags, "root"); set {
+ if val, set := getStringParamB(flags, "root"); set {
server.Root = val
}
- if val, set := getParamB(flags, "baseurl"); set {
+ if val, set := getStringParamB(flags, "baseurl"); set {
server.BaseURL = val
}
- if val, set := getParamB(flags, "log"); set {
+ if val, set := getStringParamB(flags, "log"); set {
server.Log = val
}
isSocketSet := false
isAddrSet := false
- if val, set := getParamB(flags, "address"); set {
+ if val, set := getStringParamB(flags, "address"); set {
server.Address = val
isAddrSet = isAddrSet || set
}
- if val, set := getParamB(flags, "port"); set {
+ if val, set := getStringParamB(flags, "port"); set {
server.Port = val
isAddrSet = isAddrSet || set
}
- if val, set := getParamB(flags, "key"); set {
+ if val, set := getStringParamB(flags, "key"); set {
server.TLSKey = val
isAddrSet = isAddrSet || set
}
- if val, set := getParamB(flags, "cert"); set {
+ if val, set := getStringParamB(flags, "cert"); set {
server.TLSCert = val
isAddrSet = isAddrSet || set
}
- if val, set := getParamB(flags, "socket"); set {
+ if val, set := getStringParamB(flags, "socket"); set {
server.Socket = val
isSocketSet = isSocketSet || set
}
@@ -250,33 +261,69 @@ func getRunParams(flags *pflag.FlagSet, st *storage.Storage) *settings.Server {
server.Socket = ""
}
- _, disableThumbnails := getParamB(flags, "disable-thumbnails")
+ disableThumbnails := getBoolParam(flags, "disable-thumbnails")
server.EnableThumbnails = !disableThumbnails
- _, disablePreviewResize := getParamB(flags, "disable-preview-resize")
+ disablePreviewResize := getBoolParam(flags, "disable-preview-resize")
server.ResizePreview = !disablePreviewResize
- _, disableTypeDetectionByHeader := getParamB(flags, "disable-type-detection-by-header")
+ disableTypeDetectionByHeader := getBoolParam(flags, "disable-type-detection-by-header")
server.TypeDetectionByHeader = !disableTypeDetectionByHeader
- _, disableExec := getParamB(flags, "disable-exec")
+ disableExec := getBoolParam(flags, "disable-exec")
server.EnableExec = !disableExec
- if val, set := getParamB(flags, "token-expiration-time"); set {
+ if server.EnableExec {
+ log.Println("WARNING: Command Runner feature enabled!")
+ log.Println("WARNING: This feature has known security vulnerabilities and should not")
+ log.Println("WARNING: you fully understand the risks involved. For more information")
+ log.Println("WARNING: read https://github.com/filebrowser/filebrowser/issues/5199")
+ }
+
+ if val, set := getStringParamB(flags, "token-expiration-time"); set {
server.TokenExpirationTime = val
}
return server
}
-// getParamB returns a parameter as a string and a boolean to tell if it is different from the default
+// getBoolParamB returns a parameter as a string and a boolean to tell if it is different from the default
//
// NOTE: we could simply bind the flags to viper and use IsSet.
// Although there is a bug on Viper that always returns true on IsSet
// if a flag is binded. Our alternative way is to manually check
// the flag and then the value from env/config/gotten by viper.
// https://github.com/spf13/viper/pull/331
-func getParamB(flags *pflag.FlagSet, key string) (string, bool) {
+func getBoolParamB(flags *pflag.FlagSet, key string) (value, ok bool) {
+ value, _ = flags.GetBool(key)
+
+ // If set on Flags, use it.
+ if flags.Changed(key) {
+ return value, true
+ }
+
+ // If set through viper (env, config), return it.
+ if v.IsSet(key) {
+ return v.GetBool(key), true
+ }
+
+ // Otherwise use default value on flags.
+ return value, false
+}
+
+func getBoolParam(flags *pflag.FlagSet, key string) bool {
+ val, _ := getBoolParamB(flags, key)
+ return val
+}
+
+// getStringParamB returns a parameter as a string and a boolean to tell if it is different from the default
+//
+// NOTE: we could simply bind the flags to viper and use IsSet.
+// Although there is a bug on Viper that always returns true on IsSet
+// if a flag is binded. Our alternative way is to manually check
+// the flag and then the value from env/config/gotten by viper.
+// https://github.com/spf13/viper/pull/331
+func getStringParamB(flags *pflag.FlagSet, key string) (string, bool) {
value, _ := flags.GetString(key)
// If set on Flags, use it.
@@ -293,8 +340,8 @@ func getParamB(flags *pflag.FlagSet, key string) (string, bool) {
return value, false
}
-func getParam(flags *pflag.FlagSet, key string) string {
- val, _ := getParamB(flags, key)
+func getStringParam(flags *pflag.FlagSet, key string) string {
+ val, _ := getStringParamB(flags, key)
return val
}
@@ -318,10 +365,11 @@ func setupLog(logMethod string) {
func quickSetup(flags *pflag.FlagSet, d pythonData) {
set := &settings.Settings{
- Key: generateKey(),
- Signup: false,
- CreateUserDir: false,
- UserHomeBasePath: settings.DefaultUsersHomeBasePath,
+ Key: generateKey(),
+ Signup: false,
+ CreateUserDir: false,
+ MinimumPasswordLength: settings.DefaultMinimumPasswordLength,
+ UserHomeBasePath: settings.DefaultUsersHomeBasePath,
Defaults: settings.UserDefaults{
Scope: ".",
Locale: "en",
@@ -349,7 +397,7 @@ func quickSetup(flags *pflag.FlagSet, d pythonData) {
}
var err error
- if _, noauth := getParamB(flags, "noauth"); noauth {
+ if _, noauth := getStringParamB(flags, "noauth"); noauth {
set.AuthMethod = auth.MethodNoAuth
err = d.store.Auth.Save(&auth.NoAuth{})
} else {
@@ -362,29 +410,29 @@ func quickSetup(flags *pflag.FlagSet, d pythonData) {
checkErr(err)
ser := &settings.Server{
- BaseURL: getParam(flags, "baseurl"),
- Port: getParam(flags, "port"),
- Log: getParam(flags, "log"),
- TLSKey: getParam(flags, "key"),
- TLSCert: getParam(flags, "cert"),
- Address: getParam(flags, "address"),
- Root: getParam(flags, "root"),
+ BaseURL: getStringParam(flags, "baseurl"),
+ Port: getStringParam(flags, "port"),
+ Log: getStringParam(flags, "log"),
+ TLSKey: getStringParam(flags, "key"),
+ TLSCert: getStringParam(flags, "cert"),
+ Address: getStringParam(flags, "address"),
+ Root: getStringParam(flags, "root"),
}
err = d.store.Settings.SaveServer(ser)
checkErr(err)
- username := getParam(flags, "username")
- password := getParam(flags, "password")
+ username := getStringParam(flags, "username")
+ password := getStringParam(flags, "password")
if password == "" {
var pwd string
- pwd, err = users.RandomPwd()
+ pwd, err = users.RandomPwd(set.MinimumPasswordLength)
checkErr(err)
- log.Println("Generated random admin password for quick setup:", pwd)
+ log.Println("Randomly generated password for user 'admin':", pwd)
- password, err = users.HashPwd(pwd)
+ password, err = users.ValidateAndHashPwd(pwd, set.MinimumPasswordLength)
checkErr(err)
}
@@ -420,6 +468,7 @@ func initConfig() {
v.SetEnvPrefix("FB")
v.AutomaticEnv()
v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+ v.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
if err := v.ReadInConfig(); err != nil {
var configParseError v.ConfigParseError
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
index 83a0729c..f6966e2e 100644
--- a/cmd/upgrade.go
+++ b/cmd/upgrade.go
@@ -25,7 +25,7 @@ this version.`,
flags := cmd.Flags()
oldDB := mustGetString(flags, "old.database")
oldConf := mustGetString(flags, "old.config")
- err := importer.Import(oldDB, oldConf, getParam(flags, "database"))
+ err := importer.Import(oldDB, oldConf, getStringParam(flags, "database"))
checkErr(err)
},
}
diff --git a/cmd/users_add.go b/cmd/users_add.go
index e7f132ed..c3b8af28 100644
--- a/cmd/users_add.go
+++ b/cmd/users_add.go
@@ -21,7 +21,7 @@ var usersAddCmd = &cobra.Command{
checkErr(err)
getUserDefaults(cmd.Flags(), &s.Defaults, false)
- password, err := users.HashPwd(args[1])
+ password, err := users.ValidateAndHashPwd(args[1], s.MinimumPasswordLength)
checkErr(err)
user := &users.User{
diff --git a/cmd/users_update.go b/cmd/users_update.go
index 822bb6dc..2c58c4af 100644
--- a/cmd/users_update.go
+++ b/cmd/users_update.go
@@ -27,8 +27,10 @@ options you want to change.`,
password := mustGetString(flags, "password")
newUsername := mustGetString(flags, "username")
+ s, err := d.store.Settings.Get()
+ checkErr(err)
+
var (
- err error
user *users.User
)
@@ -64,7 +66,7 @@ options you want to change.`,
}
if password != "" {
- user.Password, err = users.HashPwd(password)
+ user.Password, err = users.ValidateAndHashPwd(password, s.MinimumPasswordLength)
checkErr(err)
}
diff --git a/cmd/utils.go b/cmd/utils.go
index 78f48d13..909a1558 100644
--- a/cmd/utils.go
+++ b/cmd/utils.go
@@ -14,6 +14,7 @@ import (
"github.com/spf13/pflag"
yaml "gopkg.in/yaml.v2"
+ "github.com/filebrowser/filebrowser/v2/files"
"github.com/filebrowser/filebrowser/v2/settings"
"github.com/filebrowser/filebrowser/v2/storage"
"github.com/filebrowser/filebrowser/v2/storage/bolt"
@@ -72,7 +73,7 @@ func dbExists(path string) (bool, error) {
d := filepath.Dir(path)
_, err = os.Stat(d)
if os.IsNotExist(err) {
- if err := os.MkdirAll(d, 0700); err != nil { //nolint:govet,gomnd
+ if err := os.MkdirAll(d, 0700); err != nil { //nolint:govet
return false, err
}
return false, nil
@@ -86,7 +87,7 @@ func python(fn pythonFunc, cfg pythonConfig) cobraFunc {
return func(cmd *cobra.Command, args []string) {
data := pythonData{hadDB: true}
- path := getParam(cmd.Flags(), "database")
+ path := getStringParam(cmd.Flags(), "database")
absPath, err := filepath.Abs(path)
if err != nil {
panic(err)
@@ -105,7 +106,7 @@ func python(fn pythonFunc, cfg pythonConfig) cobraFunc {
log.Println("Using database: " + absPath)
data.hadDB = exists
- db, err := storm.Open(path)
+ db, err := storm.Open(path, storm.BoltOptions(files.PermFile, nil))
checkErr(err)
defer db.Close()
data.store, err = bolt.NewStorage(db)
@@ -124,7 +125,7 @@ func marshal(filename string, data interface{}) error {
encoder := json.NewEncoder(fd)
encoder.SetIndent("", " ")
return encoder.Encode(data)
- case ".yml", ".yaml": //nolint:goconst
+ case ".yml", ".yaml":
encoder := yaml.NewEncoder(fd)
return encoder.Encode(data)
default:
diff --git a/diskcache/file_cache.go b/diskcache/file_cache.go
index 5c1fb427..cd5e27c7 100644
--- a/diskcache/file_cache.go
+++ b/diskcache/file_cache.go
@@ -37,11 +37,11 @@ func (f *FileCache) Store(_ context.Context, key string, value []byte) error {
defer mu.Unlock()
fileName := f.getFileName(key)
- if err := f.fs.MkdirAll(filepath.Dir(fileName), 0700); err != nil { //nolint:gomnd
+ if err := f.fs.MkdirAll(filepath.Dir(fileName), 0700); err != nil {
return err
}
- if err := afero.WriteFile(f.fs, fileName, value, 0700); err != nil { //nolint:gomnd
+ if err := afero.WriteFile(f.fs, fileName, value, 0700); err != nil {
return err
}
diff --git a/docker/alpine/init.sh b/docker/alpine/init.sh
new file mode 100755
index 00000000..4dc5908a
--- /dev/null
+++ b/docker/alpine/init.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# Ensure configuration exists
+if [ ! -f "/config/settings.json" ]; then
+ cp -a /defaults/settings.json /config/settings.json
+fi
+
+exec "$@"
diff --git a/docker/root/defaults/settings.json b/docker/common/defaults/settings.json
similarity index 100%
rename from docker/root/defaults/settings.json
rename to docker/common/defaults/settings.json
diff --git a/docker/common/healthcheck.sh b/docker/common/healthcheck.sh
new file mode 100755
index 00000000..e0ab1e65
--- /dev/null
+++ b/docker/common/healthcheck.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+PORT=${FB_PORT:-$(jq -r .port /config/settings.json)}
+ADDRESS=${FB_ADDRESS:-$(jq -r .address /config/settings.json)}
+ADDRESS=${ADDRESS:-localhost}
+
+curl -f http://$ADDRESS:$PORT/health || exit 1
diff --git a/docker/root/etc/services.d/filebrowser/run b/docker/root/etc/services.d/filebrowser/run
deleted file mode 100755
index 1d633757..00000000
--- a/docker/root/etc/services.d/filebrowser/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-exec s6-setuidgid abc filebrowser -c /config/settings.json -d /database/filebrowser.db;
\ No newline at end of file
diff --git a/docker/root/custom-cont-init.d/20-config b/docker/s6/custom-cont-init.d/20-config
similarity index 80%
rename from docker/root/custom-cont-init.d/20-config
rename to docker/s6/custom-cont-init.d/20-config
index 80bec7cd..a4ba52cf 100755
--- a/docker/root/custom-cont-init.d/20-config
+++ b/docker/s6/custom-cont-init.d/20-config
@@ -1,9 +1,6 @@
#!/usr/bin/with-contenv bash
-# make folders
-mkdir -p /database
-
-# copy config
+# Ensure configuration exists
if [ ! -f "/config/settings.json" ]; then
cp -a /defaults/settings.json /config/settings.json
fi
diff --git a/docker/s6/etc/services.d/filebrowser/run b/docker/s6/etc/services.d/filebrowser/run
new file mode 100755
index 00000000..f4f2fb8e
--- /dev/null
+++ b/docker/s6/etc/services.d/filebrowser/run
@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+exec s6-setuidgid abc filebrowser -c /config/settings.json;
diff --git a/errors/errors.go b/errors/errors.go
index 5ec364c0..5fd760c2 100644
--- a/errors/errors.go
+++ b/errors/errors.go
@@ -1,12 +1,16 @@
package errors
-import "errors"
+import (
+ "errors"
+ "fmt"
+)
var (
ErrEmptyKey = errors.New("empty key")
ErrExist = errors.New("the resource already exists")
ErrNotExist = errors.New("the resource does not exist")
ErrEmptyPassword = errors.New("password is empty")
+ ErrEasyPassword = errors.New("password is too easy")
ErrEmptyUsername = errors.New("username is empty")
ErrEmptyRequest = errors.New("empty request")
ErrScopeIsRelative = errors.New("scope is a relative path")
@@ -19,3 +23,11 @@ var (
ErrSourceIsParent = errors.New("source is parent")
ErrRootUserDeletion = errors.New("user with id 1 can't be deleted")
)
+
+type ErrShortPassword struct {
+ MinimumLength uint
+}
+
+func (e ErrShortPassword) Error() string {
+ return fmt.Sprintf("password is too short, minimum length is %d", e.MinimumLength)
+}
diff --git a/files/file.go b/files/file.go
index 03b3a6f9..1ba1cd58 100644
--- a/files/file.go
+++ b/files/file.go
@@ -27,8 +27,8 @@ import (
"github.com/filebrowser/filebrowser/v2/rules"
)
-const PermFile = 0644
-const PermDir = 0755
+const PermFile = 0640
+const PermDir = 0750
var (
reSubDirs = regexp.MustCompile("(?i)^sub(s|titles)$")
@@ -86,6 +86,11 @@ func NewFileInfo(opts *FileOptions) (*FileInfo, error) {
return nil, err
}
+ // Do not expose the name of root directory.
+ if file.Path == "/" {
+ file.Name = ""
+ }
+
if opts.Expand {
if file.IsDir {
if err := file.readListing(opts.Checker, opts.ReadHeader); err != nil { //nolint:govet
@@ -217,7 +222,6 @@ func (i *FileInfo) RealPath() string {
return i.Path
}
-//nolint:goconst
func (i *FileInfo) detectType(modify, saveContent, readHeader bool) error {
if IsNamedPipe(i.Mode) {
i.Type = "blob"
@@ -314,7 +318,7 @@ func (i *FileInfo) readFirstBytes() []byte {
}
defer reader.Close()
- buffer := make([]byte, 512) //nolint:gomnd
+ buffer := make([]byte, 512)
n, err := reader.Read(buffer)
if err != nil && !errors.Is(err, io.EOF) {
log.Print(err)
diff --git a/files/listing.go b/files/listing.go
index bd16afdd..ad60e51e 100644
--- a/files/listing.go
+++ b/files/listing.go
@@ -16,8 +16,6 @@ type Listing struct {
}
// ApplySort applies the sort order using .Order and .Sort
-//
-//nolint:goconst
func (l Listing) ApplySort() {
// Check '.Order' to know how to sort
if !l.Sorting.Asc {
diff --git a/frontend/index.html b/frontend/index.html
index 02c303ae..3b54dcdf 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -10,18 +10,10 @@