chore: update goreleaser docker settings

.github/CODEOWNERS

@@ -1 +1,5 @@
-* @filebrowser/maintainers
+# These owners will be the default owners for everything in the repo.
+# Unless a later match takes precedence, @o1egl will be requested for
+# review when someone opens a pull request.
+
+*       @o1egl @hacdias

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,7 +10,7 @@
 
 Before submitting your PR, please indicate which issues are either fixed or closed by this PR. See [GitHub Help: Closing issues using keywords](https://help.github.com/articles/closing-issues-via-commit-messages/).
 
-- [ ] I am aware the project is currently in **maintenance-only** mode and new feature requests won't be accepted. See [README](https://github.com/filebrowser/community/blob/master/README.md)
+- [ ] I am aware the project is currently in maintenance-only mode. See [README](https://github.com/filebrowser/community/blob/master/README.md)
 - [ ] I am aware that translations MUST be made through [Transifex](https://app.transifex.com/file-browser/file-browser/) and that this PR is NOT a translation update
 - [ ] I am making a PR against the `master` branch.
 - [ ] I am sure File Browser can be successfully built. See [builds](https://github.com/filebrowser/community/blob/master/builds.md) and [development](https://github.com/filebrowser/community/blob/master/development.md).

.github/workflows/ci.yaml

@@ -1,133 +0,0 @@
-name: Continuous Integration
-
-on:
-  push:
-    branches:
-      - "master"
-    tags:
-      - "v*"
-  pull_request:
-
-jobs:
-  lint-frontend:
-    name: Lint Frontend
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v6
-        with:
-          package_json_file: "frontend/package.json"
-      - uses: actions/setup-node@v6
-        with:
-          node-version: "24.x"
-          cache: "pnpm"
-          cache-dependency-path: "frontend/pnpm-lock.yaml"
-      - working-directory: frontend
-        run: |
-          pnpm install --frozen-lockfile
-          pnpm run lint
-
-  test-frontend:
-    name: Test Frontend
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v6
-        with:
-          package_json_file: "frontend/package.json"
-      - uses: actions/setup-node@v6
-        with:
-          node-version: "24.x"
-          cache: "pnpm"
-          cache-dependency-path: "frontend/pnpm-lock.yaml"
-      - working-directory: frontend
-        run: |
-          pnpm install --frozen-lockfile
-          pnpm run test
-
-  lint-backend:
-    name: Lint Backend
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
-        with:
-          go-version: "1.26.x"
-      - uses: golangci/golangci-lint-action@v9
-        with:
-          version: "latest"
-
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
-        with:
-          go-version: "1.26.x"
-      - run: go test --race ./...
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v6
-        with:
-          go-version: '1.26'
-      - uses: pnpm/action-setup@v6
-        with:
-          package_json_file: "frontend/package.json"
-      - uses: actions/setup-node@v6
-        with:
-          node-version: "24.x"
-          cache: "pnpm"
-          cache-dependency-path: "frontend/pnpm-lock.yaml"
-      - name: Install Task
-        uses: go-task/setup-task@v2
-      - run: task build
-
-  release:
-    name: Release
-    needs: ["lint-frontend", "lint-backend", "test", "build"]
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v6
-        with:
-          go-version: '1.26'
-      - uses: pnpm/action-setup@v6
-        with:
-          package_json_file: "frontend/package.json"
-      - uses: actions/setup-node@v6
-        with:
-          node-version: "24.x"
-          cache: "pnpm"
-          cache-dependency-path: "frontend/pnpm-lock.yaml"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-      - name: Install Task
-        uses: go-task/setup-task@v2
-      - run: task build:frontend
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v7
-        with:
-          version: latest
-          args: release --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-
-
-

.github/workflows/docs.yml

@@ -1,52 +0,0 @@
-name: Docs
-
-on:
-  pull_request:
-    paths:
-      - 'www'
-      - '*.md'
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: Build Docs
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-      - name: Install Task
-        uses: go-task/setup-task@v2
-      - name: Build site
-        run: task docs
-
-  build-and-release:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-    name: Build and Release Docs
-    permissions:
-      pages: write
-      id-token: write
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-      - name: Install Task
-        uses: go-task/setup-task@v2
-      - name: Build site
-        run: task docs
-      - name: Upload static files as artifact
-        uses: actions/upload-pages-artifact@v5
-        with:
-          path: www/public
-      - name: Deploy to GitHub Pages
-        uses: actions/deploy-pages@v5

.github/workflows/main.yaml

@@ -0,0 +1,105 @@
+name: main
+
+on:
+  push:
+    branches:
+      - "master"
+    tags:
+      - "v*"
+  pull_request:
+
+jobs:
+  # linters
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+        with:
+          package_json_file: "frontend/package.json"
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+          cache: "pnpm"
+          cache-dependency-path: "frontend/pnpm-lock.yaml"
+      - run: make lint-frontend
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.24'
+      - run: make lint-backend
+  lint:
+    runs-on: ubuntu-latest
+    needs: [lint-frontend, lint-backend]
+    steps:
+      - run: echo "done"
+
+  # tests
+  test-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+        with:
+          package_json_file: "frontend/package.json"
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+          cache: "pnpm"
+          cache-dependency-path: "frontend/pnpm-lock.yaml"
+      - run: make test-frontend
+  test-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.24'
+      - run: make test-backend
+  test:
+    runs-on: ubuntu-latest
+    needs: [test-frontend, test-backend]
+    steps:
+      - run: echo "done"
+
+  # release
+  release:
+    runs-on: ubuntu-latest
+    needs: [lint, test]
+    if: startsWith(github.event.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+      - uses: pnpm/action-setup@v4
+        with:
+          package_json_file: "frontend/package.json"
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+          cache: "pnpm"
+          cache-dependency-path: "frontend/pnpm-lock.yaml"
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Build frontend
+        run: make build-frontend
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}

.github/workflows/pr-lint.yaml

@@ -13,15 +13,15 @@ permissions:
 
 jobs:
   main:
-    name: Validate Title
+    name: Validate PR title
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v6
+      - uses: amannn/action-semantic-pull-request@v5
         id: lint_pr_title
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: marocchino/sticky-pull-request-comment@v3
+      - uses: marocchino/sticky-pull-request-comment@v2
         # When the previous steps fails, the workflow would stop. By adding this
         # condition you can continue the execution with the populated error message.
         if: always() && (steps.lint_pr_title.outputs.error_message != null)
@@ -40,7 +40,7 @@ jobs:
 
       # Delete a previous comment when the issue has been resolved
       - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
-        uses: marocchino/sticky-pull-request-comment@v3
+        uses: marocchino/sticky-pull-request-comment@v2
         with:
           header: pr-title-lint-error
-          delete: true
+          delete: true

.github/workflows/site-pr.yml

@@ -0,0 +1,20 @@
+name: Build Site
+
+on:
+  pull_request:
+    paths:
+      - 'www'
+      - '*.md'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build site
+        run: make site

.github/workflows/site-publish.yml

@@ -0,0 +1,32 @@
+name: Build and Deploy Site
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    permissions:
+      contents: read
+      deployments: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build site
+        run: make site
+
+      - name: Deploy to Cloudflare Pages
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages deploy www/public --project-name=${{ secrets.CLOUDFLARE_PROJECT_NAME }}
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -35,5 +35,10 @@ build/
 /frontend/dist/*
 !/frontend/dist/.gitkeep
 
+# Playwright files
+/frontend/test-results/
+/frontend/playwright-report/
+/frontend/playwright/.cache/
+
 default.nix
 Dockerfile.dev

.golangci.yml

@@ -1,14 +1,132 @@
 version: "2"
 
 linters:
-  default: standard
+  # inverted configuration with `default: all` and `disable` is not scalable during updates of golangci-lint
+  default: none
   enable:
+    - bodyclose
+    - dogsled
+    - dupl
+    - errcheck
+    - errorlint
+    - exhaustive
+    - funlen
+    - gocheckcompilerdirectives
+    - gochecknoinits
     - gocritic
+    - gocyclo
+    - godox
+    - goprintffuncname
+    - gosec
     - govet
+    - ineffassign
+    - lll
+    - misspell
+    - mnd
+    - nakedret
+    - nolintlint
+    - prealloc
     - revive
+    - rowserrcheck
+    - staticcheck
+    - testifylint
+    - unconvert
+    - unparam
+    - unused
+    - whitespace
+  settings:
+    dupl:
+      threshold: 100
+    exhaustive:
+      default-signifies-exhaustive: false
+    funlen:
+      lines: 100
+      statements: 50
+    gocritic:
+      disabled-checks:
+        - dupImport # https://github.com/go-critic/go-critic/issues/845
+        - ifElseChain
+        - octalLiteral
+        - whyNoLint
+        - wrapperFunc
+      enabled-tags:
+        - diagnostic
+        - experimental
+        - opinionated
+        - performance
+        - style
+    gocyclo:
+      min-complexity: 15
+    govet:
+      enable:
+        - nilness
+        - shadow
+    lll:
+      line-length: 140
+    misspell:
+      locale: US
+    mnd:
+      # don't include the "operation" and "assign"
+      checks:
+        - argument
+        - case
+        - condition
+        - return
+      ignored-numbers:
+        - "0"
+        - "1"
+        - "2"
+        - "3"
+        - "0666"
+        - "0700"
+        - "0700"
+      ignored-functions:
+        - strings.SplitN
+        - make
+    nolintlint:
+      allow-unused: false # report any unused nolint directives
+      require-explanation: false # require an explanation for nolint directives
+      require-specific: true # require nolint directives to be specific about which linter is being skipped
+    staticcheck:
+      checks:
+        - "all"
+        - "-QF*"
   exclusions:
+    generated: lax
     presets:
-      - std-error-handling
       - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - gochecknoinits
+        path: cmd/.*.go
+      - linters:
+          - dupl
+          - funlen
+          - gochecknoinits
+          - gocyclo
+          - lll
+          - scopelint
+        path: .*_test.go
+      - linters:
+          - misspell
+        text: "[aA]uther"
+      - linters:
+          - mnd
+        text: strconv.Parse
+    paths:
+      - frontend/
+
+formatters:
+  enable:
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/filebrowser/filebrowser
+  exclusions:
+    generated: lax
     paths:
       - frontend/

.goreleaser.yml

@@ -17,7 +17,6 @@ builds:
       - linux
       - windows
       - freebsd
-      - openbsd
     goarch:
       - amd64
       - "386"
@@ -31,12 +30,6 @@ builds:
     ignore:
       - goos: darwin
         goarch: "386"
-      # Experimental, may not work properly
-      - goos: openbsd
-        goarch: riscv64
-      # Broken as of Go 1.24, deprecated as of Go 1.26
-      - goos: windows
-        goarch: arm
       - goos: freebsd
         goarch: arm
 
@@ -47,144 +40,47 @@ archives:
       - goos: windows
         formats: ["zip"]
 
-dockers:
-  # Alpine docker images
-  - dockerfile: Dockerfile
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.name={{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.source={{.GitURL}}"
-      - "--platform=linux/amd64"
-    goos: linux
-    goarch: amd64
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-amd64"
-      - "filebrowser/filebrowser:v{{ .Major }}-amd64"
+dockers_v2:
+  - id: filebrowser
+    images:
+      - "filebrowser/filebrowser"
+    dockerfile: Dockerfile
+    tags:
+      - "latest"
+      - "{{ .Tag }}"
+      - "v{{ .Major }}"
+    labels:
+      org.opencontainers.image.created: "{{.Date}}"
+      org.opencontainers.image.name: "{{.ProjectName}}"
+      org.opencontainers.image.revision: "{{.FullCommit}}"
+      org.opencontainers.image.version: "{{.Version}}"
+      org.opencontainers.image.source: "{{.GitURL}}"
     extra_files:
       - docker
-  - dockerfile: Dockerfile
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.name={{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.source={{.GitURL}}"
-      - "--platform=linux/arm64"
-    goos: linux
-    goarch: arm64
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-arm64"
-      - "filebrowser/filebrowser:v{{ .Major }}-arm64"
+    platforms:
+      - linux/amd64
+      - linux/arm64
+      - linux/arm/v6
+      - linux/arm/v7
+  - id: filebrowser-s6
+    images:
+      - "filebrowser/filebrowser"
+    dockerfile: Dockerfile.s6
+    tags:
+      - "s6"
+      - "{{ .Tag }}-s6"
+      - "v{{ .Major }}-s6"
+    labels:
+      org.opencontainers.image.created: "{{.Date}}"
+      org.opencontainers.image.name: "{{.ProjectName}}"
+      org.opencontainers.image.revision: "{{.FullCommit}}"
+      org.opencontainers.image.version: "{{.Version}}"
+      org.opencontainers.image.source: "{{.GitURL}}"
     extra_files:
       - docker
-  - dockerfile: Dockerfile
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.name={{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.source={{.GitURL}}"
-      - "--platform=linux/arm/v6"
-    goos: linux
-    goarch: arm
-    goarm: "6"
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-armv6"
-      - "filebrowser/filebrowser:v{{ .Major }}-armv6"
-    extra_files:
-      - docker
-  - dockerfile: Dockerfile
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.name={{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.source={{.GitURL}}"
-      - "--platform=linux/arm/v7"
-    goos: linux
-    goarch: arm
-    goarm: "7"
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-armv7"
-      - "filebrowser/filebrowser:v{{ .Major }}-armv7"
-    extra_files:
-      - docker
-
-  ## s6-overlay docker images
-  - dockerfile: Dockerfile.s6
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.name={{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.source={{.GitURL}}"
-      - "--platform=linux/amd64"
-    goos: linux
-    goarch: amd64
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-amd64-s6"
-      - "filebrowser/filebrowser:v{{ .Major }}-amd64-s6"
-    extra_files:
-      - docker
-  - dockerfile: Dockerfile.s6
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.name={{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.source={{.GitURL}}"
-      - "--platform=linux/arm64"
-    goos: linux
-    goarch: arm64
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-arm64-s6"
-      - "filebrowser/filebrowser:v{{ .Major }}-arm64-s6"
-    extra_files:
-      - docker
-
-docker_manifests:
-  - name_template: "filebrowser/filebrowser:latest"
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-amd64"
-      - "filebrowser/filebrowser:{{ .Tag }}-arm64"
-      - "filebrowser/filebrowser:{{ .Tag }}-armv7"
-  - name_template: "filebrowser/filebrowser:{{ .Tag }}"
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-amd64"
-      - "filebrowser/filebrowser:{{ .Tag }}-arm64"
-      - "filebrowser/filebrowser:{{ .Tag }}-armv7"
-  - name_template: "filebrowser/filebrowser:v{{ .Major }}"
-    image_templates:
-      - "filebrowser/filebrowser:v{{ .Major }}-amd64"
-      - "filebrowser/filebrowser:v{{ .Major }}-arm64"
-      - "filebrowser/filebrowser:v{{ .Major }}-armv7"
-  ## s6 image manifests
-  - name_template: "filebrowser/filebrowser:s6"
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-amd64-s6"
-      - "filebrowser/filebrowser:{{ .Tag }}-arm64-s6"
-  - name_template: "filebrowser/filebrowser:{{ .Tag }}-s6"
-    image_templates:
-      - "filebrowser/filebrowser:{{ .Tag }}-amd64-s6"
-      - "filebrowser/filebrowser:{{ .Tag }}-arm64-s6"
-  - name_template: "filebrowser/filebrowser:v{{ .Major }}-s6"
-    image_templates:
-      - "filebrowser/filebrowser:v{{ .Major }}-amd64-s6"
-      - "filebrowser/filebrowser:v{{ .Major }}-arm64-s6"
+    platforms:
+      - linux/amd64
+      - linux/arm64
 
 homebrew_casks:
   - name: filebrowser

CHANGELOG.md

@@ -1,539 +1,6 @@
 # Changelog
 
-All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
-
-## [2.63.18](https://github.com/filebrowser/filebrowser/compare/v2.63.17...v2.63.18) (2026-07-04)
-
-
-### Bug Fixes
-
-* avoid recursive conflict checks for copy and move ([#6009](https://github.com/filebrowser/filebrowser/issues/6009)) ([dfc2e88](https://github.com/filebrowser/filebrowser/commit/dfc2e887e1a19d54984a0d7e39a2a63caf73ef19))
-* deduplicate PT language ([4470288](https://github.com/filebrowser/filebrowser/commit/4470288ba1828a14453a99348fd22c62aa0b9460))
-* **preview:** keep the EPUB table-of-contents button clear of the header ([#6010](https://github.com/filebrowser/filebrowser/issues/6010)) ([aac2516](https://github.com/filebrowser/filebrowser/commit/aac25166378422135e624e305c410c54a39374fb))
-
-## [2.63.17](https://github.com/filebrowser/filebrowser/compare/v2.63.16...v2.63.17) (2026-06-27)
-
-
-### Bug Fixes
-
-* **auth:** reject signup when normalized home dir collides (GHSA-7rc3-g7h6-22m7) ([883a36f](https://github.com/filebrowser/filebrowser/commit/883a36f02fcb69566a8628cb47f18fdc73348387))
-* match admin share paths by owner scope ([#5992](https://github.com/filebrowser/filebrowser/issues/5992)) ([43a404c](https://github.com/filebrowser/filebrowser/commit/43a404ca69bf25553bfbbb2b446f0f53077c6302))
-* normalize recursive listing paths to forward slashes ([#6003](https://github.com/filebrowser/filebrowser/issues/6003)) ([2472fbc](https://github.com/filebrowser/filebrowser/commit/2472fbcd30502606feb11fbc8b8dc4f3803e6641))
-* preserve SRT subtitle line breaks ([#6002](https://github.com/filebrowser/filebrowser/issues/6002)) ([d9cf2f0](https://github.com/filebrowser/filebrowser/commit/d9cf2f0100d2c4892cad8e339eacca96df1aa5b6))
-* **raw:** neutralize backslashes in archive entry names (GHSA-83xp-526h-j3ww) ([8503ba6](https://github.com/filebrowser/filebrowser/commit/8503ba61ff51d48a7313896483d130eb6a5abfe0))
-* **share:** delete exact directory share on trailing-slash delete (GHSA-pp88-jhwj-5qh5) ([f30fca6](https://github.com/filebrowser/filebrowser/commit/f30fca636c1af9ef401e9a82ff60391cb3db97e1))
-* **share:** stop exposing password hash and bypass token in share API (GHSA-833g-cqhp-h72j) ([ec13054](https://github.com/filebrowser/filebrowser/commit/ec130546713c44cd24556907552ac554c7f809c9))
-
-## [2.63.16](https://github.com/filebrowser/filebrowser/compare/v2.63.15...v2.63.16) (2026-06-23)
-
-
-### Bug Fixes
-
-* dangling symlink, write, delete scope bugs ([64511ce](https://github.com/filebrowser/filebrowser/commit/64511ce45e3be379e965f7f4fb0929a068d5bb81))
-* restore symlink behavior as opt-in followExternalSymlinks ([a106392](https://github.com/filebrowser/filebrowser/commit/a1063925e15ef27f9d5dc26aae371bbf52af608c))
-
-## [2.63.15](https://github.com/filebrowser/filebrowser/compare/v2.63.14...v2.63.15) (2026-06-13)
-
-
-### Bug Fixes
-
-* restore ScopedFs RealPath ([#5986](https://github.com/filebrowser/filebrowser/issues/5986)) ([403d2bb](https://github.com/filebrowser/filebrowser/commit/403d2bbd3357aa57e78745b52dcdad3490901bb3))
-
-## [2.63.14](https://github.com/filebrowser/filebrowser/compare/v2.63.13...v2.63.14) (2026-06-07)
-
-
-### Bug Fixes
-
-* recursive check ([3406d3d](https://github.com/filebrowser/filebrowser/commit/3406d3d7f98dfc3c16e4ff7ff4a87e3bdfe221dd))
-
-
-### Refactorings
-
-* ScopedFs to avoid escaping symlinks ([7c2c0a1](https://github.com/filebrowser/filebrowser/commit/7c2c0a11b31b2bb214d741005a0b02b1764208b3))
-
-## [2.63.13](https://github.com/filebrowser/filebrowser/compare/v2.63.12...v2.63.13) (2026-06-06)
-
-
-### Bug Fixes
-
-* copy/move allow overwrite ([a1a514d](https://github.com/filebrowser/filebrowser/commit/a1a514dcbb216d2080412c5354eea1e1fb033050))
-
-
-### Refactorings
-
-* cleanup and simplify upload.ts ([5f7311d](https://github.com/filebrowser/filebrowser/commit/5f7311d32437e98d7c14c7b307a4f68109275535))
-
-## [2.63.12](https://github.com/filebrowser/filebrowser/compare/v2.63.11...v2.63.12) (2026-06-04)
-
-
-### Bug Fixes
-
-* await copy move conflict detection ([#5978](https://github.com/filebrowser/filebrowser/issues/5978)) ([c1abe8f](https://github.com/filebrowser/filebrowser/commit/c1abe8f561208bf36bde70879d1a15ef9de998fa))
-* keep mobile file sort controls visible ([#5977](https://github.com/filebrowser/filebrowser/issues/5977)) ([0bb2768](https://github.com/filebrowser/filebrowser/commit/0bb2768754d11b865d68e72dcd7cebb232a6308a))
-* skip inaccessible children when listing directories ([#5958](https://github.com/filebrowser/filebrowser/issues/5958)) ([7b7ff8a](https://github.com/filebrowser/filebrowser/commit/7b7ff8ae8f97393b2e6ae6e061c1f780077c32b6))
-
-## [2.63.11](https://github.com/filebrowser/filebrowser/compare/v2.63.10...v2.63.11) (2026-06-04)
-
-
-### Bug Fixes
-
-* incomplete fix for symlinked directories let scopes users and public-share recipients read and write files outside of scope ([3471ec2](https://github.com/filebrowser/filebrowser/commit/3471ec2c4b6473831c72ee889cb3c1a6849a1fb1))
-
-## [2.63.10](https://github.com/filebrowser/filebrowser/compare/v2.63.9...v2.63.10) (2026-06-03)
-
-
-### Bug Fixes
-
-* allow writes when user scope resolves to filesystem root ([6b04cbf](https://github.com/filebrowser/filebrowser/commit/6b04cbf5e9db1f5b9c0b1624843607ce2881cfc4))
-
-## [2.63.9](https://github.com/filebrowser/filebrowser/compare/v2.63.8...v2.63.9) (2026-06-03)
-
-
-### Bug Fixes
-
-* force octet-stream for attachment downloads ([#5942](https://github.com/filebrowser/filebrowser/issues/5942)) ([103acd1](https://github.com/filebrowser/filebrowser/commit/103acd15fe57554fe0246bfe70a49b6cb4ae0c51))
-* prevent symlink scope escape in copy/move/rename ([cdd666f](https://github.com/filebrowser/filebrowser/commit/cdd666fc95f569ad583c32391e45646fed676dfd))
-* set X-Content-Type-Options: nosniff on raw file responses ([35db07d](https://github.com/filebrowser/filebrowser/commit/35db07d0159c520a6b3c969ac52033593914fadd))
-* use constant-time comparison for share access token ([1951436](https://github.com/filebrowser/filebrowser/commit/19514367adf2d9fe5be2b7666e397979ea679b94))
-
-## [2.63.8](https://github.com/filebrowser/filebrowser/compare/v2.63.7...v2.63.8) (2026-06-03)
-
-
-### Bug Fixes
-
-* check if share is within scope when creating ([ca019ae](https://github.com/filebrowser/filebrowser/commit/ca019ae7d966a7c28de2b2341271cd13e3458ae6))
-
-## [2.63.7](https://github.com/filebrowser/filebrowser/compare/v2.63.6...v2.63.7) (2026-06-03)
-
-
-### Bug Fixes
-
-* disallow shares for non-existent paths ([166583d](https://github.com/filebrowser/filebrowser/commit/166583db632e088e9f0adce30aec43bb9d9019f4))
-
-## [2.63.6](https://github.com/filebrowser/filebrowser/compare/v2.63.5...v2.63.6) (2026-06-03)
-
-
-### Bug Fixes
-
-* address three security disclosures (archive traversal, login DoS, symlink escape) ([847d08b](https://github.com/filebrowser/filebrowser/commit/847d08bdd135e5c3659f2e6dea2f0cd36617af9b))
-* cross-user unauthorized share-link deletion ([0231b7e](https://github.com/filebrowser/filebrowser/commit/0231b7ebdfbe77a6c54027d30c4856c3fd81ee4d))
-* incorrect access control in public directory shares via rule path rebasing ([e07c59d](https://github.com/filebrowser/filebrowser/commit/e07c59df0b850f5924d5b1683e8609661ddcf534))
-* parse csv files with uneven columns in their rows ([#5965](https://github.com/filebrowser/filebrowser/issues/5965)) ([5328e80](https://github.com/filebrowser/filebrowser/commit/5328e80d2e88d1c279a1250a7dfee4fc96f703ec))
-* remove undocumented hook auth with shell replacement ([34ae34e](https://github.com/filebrowser/filebrowser/commit/34ae34e764d72540c039f1f5ea2ec4c974168c1f))
-
-## [2.63.5](https://github.com/filebrowser/filebrowser/compare/v2.63.4...v2.63.5) (2026-05-21)
-
-
-### Bug Fixes
-
-* **router:** handle undefined catchAll param on root redirect ([#5955](https://github.com/filebrowser/filebrowser/issues/5955)) ([6ad8160](https://github.com/filebrowser/filebrowser/commit/6ad8160aa3309314c1b471c5090b67c824464396))
-
-## [2.63.4](https://github.com/filebrowser/filebrowser/compare/v2.63.3...v2.63.4) (2026-05-17)
-
-
-### Bug Fixes
-
-* show item shares from all users to admins ([#5941](https://github.com/filebrowser/filebrowser/issues/5941)) ([9cc18a8](https://github.com/filebrowser/filebrowser/commit/9cc18a81e3e1b8bf96795bfbe3d83ced294ecfd7))
-
-## [2.63.3](https://github.com/filebrowser/filebrowser/compare/v2.63.2...v2.63.3) (2026-05-05)
-
-
-### Bug Fixes
-
-* correct environment variable in compose.yaml ([#5910](https://github.com/filebrowser/filebrowser/issues/5910)) ([41b801d](https://github.com/filebrowser/filebrowser/commit/41b801d30c736c8ca863e2be6aece7d99e92129e))
-* Fix conflict modal and add a resume transfert option ([#5884](https://github.com/filebrowser/filebrowser/issues/5884)) ([f4e1485](https://github.com/filebrowser/filebrowser/commit/f4e148523e0dc9242081831b53544396f995c611))
-
-## [2.63.2](https://github.com/filebrowser/filebrowser/compare/v2.63.1...v2.63.2) (2026-04-11)
-
-
-### Bug Fixes
-
-* **preview:** let arrow keys seek video instead of switching files ([#5895](https://github.com/filebrowser/filebrowser/issues/5895)) ([0fadf28](https://github.com/filebrowser/filebrowser/commit/0fadf28b18e506ddca0027e83ebe567ac57932bf))
-
-## [2.63.1](https://github.com/filebrowser/filebrowser/compare/v2.63.0...v2.63.1) (2026-04-04)
-
-
-### Bug Fixes
-
-* check download permission in resource handler ([#5891](https://github.com/filebrowser/filebrowser/issues/5891)) ([1e03fea](https://github.com/filebrowser/filebrowser/commit/1e03feadb550e4414b5589a6a8df57f538efba15))
-* check share owner permissions on public share access ([#5888](https://github.com/filebrowser/filebrowser/issues/5888)) ([7dbf7a3](https://github.com/filebrowser/filebrowser/commit/7dbf7a3528234b2a9ee9c4115e8ecf58d258ca51))
-* enforce directory boundary in rule path matching ([#5889](https://github.com/filebrowser/filebrowser/issues/5889)) ([8adf127](https://github.com/filebrowser/filebrowser/commit/8adf127c7d33585333b8030869f6f318e6517179))
-* restrict default permissions for proxy-auth auto-provisioned users ([#5890](https://github.com/filebrowser/filebrowser/issues/5890)) ([f13c7c8](https://github.com/filebrowser/filebrowser/commit/f13c7c8cffd6d58ff29c4a6763ced1385f69961e))
-
-## [2.63.0](https://github.com/filebrowser/filebrowser/compare/v2.62.2...v2.63.0) (2026-04-04)
-
-
-### Features
-
-* enable copy operation on drag‑and‑drop with ctrl key ([#5882](https://github.com/filebrowser/filebrowser/issues/5882)) ([876cdb3](https://github.com/filebrowser/filebrowser/commit/876cdb34265b090c2a74a69509f4106f2c5e8726))
-
-
-### Bug Fixes
-
-* check download permission when sharing permission is enabled ([#5875](https://github.com/filebrowser/filebrowser/issues/5875)) ([0f39bd0](https://github.com/filebrowser/filebrowser/commit/0f39bd055efdadc15abd2f8146cf5da3793f8318))
-* **tus:** reject negative upload-length to prevent inconsistent cache entry ([#5876](https://github.com/filebrowser/filebrowser/issues/5876)) ([7a16129](https://github.com/filebrowser/filebrowser/commit/7a16129bfc07dbdc2fa52b99d2985c1bc0ea12e2))
-
-## [2.62.2](https://github.com/filebrowser/filebrowser/compare/v2.62.1...v2.62.2) (2026-03-28)
-
-
-### Bug Fixes
-
-* disable scripted content in epub ([126227b](https://github.com/filebrowser/filebrowser/commit/126227bb2754eee15cd7c722916c3bb8821084a2))
-* double slash in TUS upload path when readEntries returns multiple batches ([#5848](https://github.com/filebrowser/filebrowser/issues/5848)) ([432f3e6](https://github.com/filebrowser/filebrowser/commit/432f3e60ffdf92af6f8f56119a1bac8084f52a60))
-* include filename in Content-Disposition header for inline downloads ([#5860](https://github.com/filebrowser/filebrowser/issues/5860)) ([8f81b77](https://github.com/filebrowser/filebrowser/commit/8f81b77cf2a3da0a445f3700fbf4a0091ea46c07))
-* json escaping ([c406bda](https://github.com/filebrowser/filebrowser/commit/c406bda0c73ac8b187e23a97c05521edc77efa84))
-* self-registered users don't get execute perms ([b6a4fb1](https://github.com/filebrowser/filebrowser/commit/b6a4fb1f27f4d894b384c0f3acacda276d1338a5))
-* shares listing ([a8fc165](https://github.com/filebrowser/filebrowser/commit/a8fc1657b796c5da7190466beff13e680721b6d3))
-* touch Redis upload cache key on GetLength to prevent TTL expiry ([#5850](https://github.com/filebrowser/filebrowser/issues/5850)) ([4812536](https://github.com/filebrowser/filebrowser/commit/48125365551ce2b27790aaafd7594cf5ce52f1ba))
-* use html/template ([d9f9460](https://github.com/filebrowser/filebrowser/commit/d9f9460c1e51d10a25065e10358c12d5ced66ad9))
-
-## [2.62.1](https://github.com/filebrowser/filebrowser/compare/v2.62.0...v2.62.1) (2026-03-14)
-
-
-### Bug Fixes
-
-* base url/reverse proxy redirect ([fc80f4f](https://github.com/filebrowser/filebrowser/commit/fc80f4f44c856ddc19df3024c245990fffd55630))
-
-## [2.62.0](https://github.com/filebrowser/filebrowser/compare/v2.61.2...v2.62.0) (2026-03-14)
-
-
-### Features
-
-* Updates for project File Browser ([#5807](https://github.com/filebrowser/filebrowser/issues/5807)) ([858eb42](https://github.com/filebrowser/filebrowser/commit/858eb426515ec55172e9cca47bdf1e25a0d0d81d))
-
-
-### Bug Fixes
-
-* allow deleting the user's own account ([#5820](https://github.com/filebrowser/filebrowser/issues/5820)) ([f04af0c](https://github.com/filebrowser/filebrowser/commit/f04af0cac6c808b8e7c9a9651380c252c4de9132))
-* around languages ([c21af07](https://github.com/filebrowser/filebrowser/commit/c21af0791a5df458c2ddb81ce9ae44b772b6d82d))
-* clean path in patch handler ([4bd7d69](https://github.com/filebrowser/filebrowser/commit/4bd7d69c82163b201a987e99c0c50d7ecc6ee5f1))
-* make perm.share depend on share.download ([09a2616](https://github.com/filebrowser/filebrowser/commit/09a26166b4f79446e7174c017380f6db45444e32))
-* properly surface config parse errors ([#5822](https://github.com/filebrowser/filebrowser/issues/5822)) ([ef2e999](https://github.com/filebrowser/filebrowser/commit/ef2e9992dc3098f6c4722c2a98966cd8abf8bab5))
-* signup handler shouldn't create admins ([a63573b](https://github.com/filebrowser/filebrowser/commit/a63573b67eb302167b4c4f218361a2d0c138deab))
-* **tus:** preserve percent-encoded upload paths in Location header ([#5817](https://github.com/filebrowser/filebrowser/issues/5817)) ([0542fc0](https://github.com/filebrowser/filebrowser/commit/0542fc0ba43740c967414eebd156bac86ad80376))
-* **upload:** avoid skipping whole folder upload on conflict modal ([#5814](https://github.com/filebrowser/filebrowser/issues/5814)) ([f5f8b60](https://github.com/filebrowser/filebrowser/commit/f5f8b60b331a07729a1fed1ed065cb6fc20930ea))
-* **upload:** don't mark every folder-upload file as conflicting ([#5813](https://github.com/filebrowser/filebrowser/issues/5813)) ([6dcef07](https://github.com/filebrowser/filebrowser/commit/6dcef07f40d550acee63dd01e0a3bcf78532f690))
-
-## [2.61.2](https://github.com/filebrowser/filebrowser/compare/v2.61.1...v2.61.2) (2026-03-06)
-
-
-### Bug Fixes
-
-* added dateFormat to getUserDefaults so this is respected in the … ([#5804](https://github.com/filebrowser/filebrowser/issues/5804)) ([8598db2](https://github.com/filebrowser/filebrowser/commit/8598db2accccf5b87353e5e718b2ad1c946e5c44))
-* avoid sending the same name in the file/folder rename modal ([#5806](https://github.com/filebrowser/filebrowser/issues/5806)) ([d7b00ce](https://github.com/filebrowser/filebrowser/commit/d7b00ce5f672b7ce0b26ce31abdfc74f8b00b939))
-* **csv-viewer:** add support for missing text encodings in dropdown list ([#5795](https://github.com/filebrowser/filebrowser/issues/5795)) ([4af3f85](https://github.com/filebrowser/filebrowser/commit/4af3f85e64e795e8ae1d87d4caee8185028294ac))
-* **frontend:** do not delete original assets ([4d9e6b8](https://github.com/filebrowser/filebrowser/commit/4d9e6b821852203cef67233791a922013bd5b64d))
-* **frontend:** input password type ([8ee5576](https://github.com/filebrowser/filebrowser/commit/8ee55761a1aa9bc091d8466c44f03c2043a8ca79))
-* validate current password with a modal ([#5805](https://github.com/filebrowser/filebrowser/issues/5805)) ([177c7cf](https://github.com/filebrowser/filebrowser/commit/177c7cfcce36779e2c5ebaa4b59a055dd1e17648))
-
-## [2.61.1](https://github.com/filebrowser/filebrowser/compare/v2.61.0...v2.61.1) (2026-03-04)
-
-
-### Bug Fixes
-
-* check for correct permission in TUS Delete ([7ed1425](https://github.com/filebrowser/filebrowser/commit/7ed1425115be602c2b23236c410098ea2d74b42f))
-
-## [2.61.0](https://github.com/filebrowser/filebrowser/compare/v2.60.0...v2.61.0) (2026-02-28)
-
-
-### Features
-
-* improved conflict resolution when uploading/copying/moving files ([#5765](https://github.com/filebrowser/filebrowser/issues/5765)) ([aa80909](https://github.com/filebrowser/filebrowser/commit/aa809096eb35fdfbdeb6784b1ebfe2ca1e42f52b))
-
-
-### Bug Fixes
-
-* correctly clean path ([31194fb](https://github.com/filebrowser/filebrowser/commit/31194fb57a5b92e7155219d7ec7273028fcb2e83))
-
-## [2.60.0](https://github.com/filebrowser/filebrowser/compare/v2.59.0...v2.60.0) (2026-02-21)
-
-
-### Features
-
-* Updates for project File Browser ([#5764](https://github.com/filebrowser/filebrowser/issues/5764)) ([9940bdd](https://github.com/filebrowser/filebrowser/commit/9940bdd663ff5141110778524b8a22c957036e78))
-
-
-### Bug Fixes
-
-* always show separators and encoding list in the CSV viewer ([#5774](https://github.com/filebrowser/filebrowser/issues/5774)) ([3169a14](https://github.com/filebrowser/filebrowser/commit/3169a14a4d63a0a11a5288f4f3a674c0a0edb972))
-* modal lifecycle issues, multiple modals, new directory creation and discard changes behavior ([#5773](https://github.com/filebrowser/filebrowser/issues/5773)) ([200d501](https://github.com/filebrowser/filebrowser/commit/200d5015472c79d5caa683ea291ebf500356a39f))
-
-## [2.59.0](https://github.com/filebrowser/filebrowser/compare/v2.58.0...v2.59.0) (2026-02-15)
-
-
-### Features
-
-* add 'Open direct' button to images ([#5678](https://github.com/filebrowser/filebrowser/issues/5678)) ([804b14b](https://github.com/filebrowser/filebrowser/commit/804b14b698aa218fa5c2aaba687e72c5f7617f0f))
-* Updates for project File Browser ([#5760](https://github.com/filebrowser/filebrowser/issues/5760)) ([63a76ef](https://github.com/filebrowser/filebrowser/commit/63a76ef18c51121e08634810a894c1e22a870428))
-
-
-### Bug Fixes
-
-* render equations in markdown preview ([#5745](https://github.com/filebrowser/filebrowser/issues/5745)) ([0467326](https://github.com/filebrowser/filebrowser/commit/0467326d5c082c42c0ede88ee2d3472f5fb65600))
-
-## [2.58.0](https://github.com/filebrowser/filebrowser/compare/v2.57.1...v2.58.0) (2026-02-14)
-
-
-### Features
-
-* nederlands ([88b97de](https://github.com/filebrowser/filebrowser/commit/88b97def9ee72fe6e8094209aebb71830b7305be))
-* support for multiple encodings in CSV files ([#5756](https://github.com/filebrowser/filebrowser/issues/5756)) ([f67bccf](https://github.com/filebrowser/filebrowser/commit/f67bccf8c5470cb280fe854d92aa2666c270bcf5))
-* Updates for project File Browser ([#5749](https://github.com/filebrowser/filebrowser/issues/5749)) ([c94870f](https://github.com/filebrowser/filebrowser/commit/c94870fcfe1b4acb2db9ab897b9f7d35e3b75770))
-* Updates for project File Browser ([#5759](https://github.com/filebrowser/filebrowser/issues/5759)) ([5e8f5be](https://github.com/filebrowser/filebrowser/commit/5e8f5be245fd0126545ef5ca61c2d428ac128ad5))
-
-
-### Bug Fixes
-
-* **frontend:** pnpm lock ([b09960e](https://github.com/filebrowser/filebrowser/commit/b09960e538387ff29371c80be1584720f65181e7))
-* ignore version.go ([1f7904d](https://github.com/filebrowser/filebrowser/commit/1f7904dad21a87f04e1543ee10b60ce79e5eebe9))
-* respect Accept-Encoding for pre-compressed JS ([#5750](https://github.com/filebrowser/filebrowser/issues/5750)) ([6a76dfe](https://github.com/filebrowser/filebrowser/commit/6a76dfeba9254a938e320928c67d110f73f83715))
-* wrap response text in Error before reject ([#5753](https://github.com/filebrowser/filebrowser/issues/5753)) ([e5bc0d3](https://github.com/filebrowser/filebrowser/commit/e5bc0d3cce18fa7b069688b176b99efbb67382d2))
-
-## [2.57.1](https://github.com/filebrowser/filebrowser/compare/v2.57.0...v2.57.1) (2026-02-08)
-
-
-### Bug Fixes
-
-* normalize fields capitalization ([ff2f004](https://github.com/filebrowser/filebrowser/commit/ff2f00498cff151e2fb1f5f0b16963bf33c3d6d4))
-* remove skip clean ([489af40](https://github.com/filebrowser/filebrowser/commit/489af403a19057f6b6b4b1dc0e48cbb26a202ef9))
-
-## [2.57.0](https://github.com/filebrowser/filebrowser/compare/v2.56.0...v2.57.0) (2026-02-01)
-
-
-### Features
-
-* Add Redis upload cache for multi-replica deployments ([#5724](https://github.com/filebrowser/filebrowser/issues/5724)) ([08d7a15](https://github.com/filebrowser/filebrowser/commit/08d7a1504c42c115fdd82d3845694fe87147f1db))
-* Updates for project File Browser ([#5725](https://github.com/filebrowser/filebrowser/issues/5725)) ([8fee256](https://github.com/filebrowser/filebrowser/commit/8fee2561afbf968ed577bc4139562a42b2278243))
-
-
-### Bug Fixes
-
-* adjust yaml config decodification to yaml.v3 ([#5722](https://github.com/filebrowser/filebrowser/issues/5722)) ([b594d4d](https://github.com/filebrowser/filebrowser/commit/b594d4d4e28a1b35e69d81d2c35948fe0d629888))
-* avoid 409 conflict when renaming files differing only by case ([#5729](https://github.com/filebrowser/filebrowser/issues/5729)) ([d441b28](https://github.com/filebrowser/filebrowser/commit/d441b28f432c3448a29ac828400321f1f4ed32d9))
-
-## [2.56.0](https://github.com/filebrowser/filebrowser/compare/v2.55.0...v2.56.0) (2026-01-24)
-
-
-### Features
-
-* Updates for project File Browser ([#5698](https://github.com/filebrowser/filebrowser/issues/5698)) ([f0f2f1f](https://github.com/filebrowser/filebrowser/commit/f0f2f1ff069aae566d8bf25ec275da59f29a96bc))
-
-
-### Bug Fixes
-
-* adjust columns of the table from the "users ls" command ([#5716](https://github.com/filebrowser/filebrowser/issues/5716)) ([3032a1f](https://github.com/filebrowser/filebrowser/commit/3032a1fade43737c51c49b5ccda34f336394c2ed))
-* avoid clearing selection when clicking elements outside the empty area ([#5715](https://github.com/filebrowser/filebrowser/issues/5715)) ([004488c](https://github.com/filebrowser/filebrowser/commit/004488c15b3c30784e1ea564b3ca9feec7bcad08))
-
-## [2.55.0](https://github.com/filebrowser/filebrowser/compare/v2.54.0...v2.55.0) (2026-01-18)
-
-
-### Features
-
-* added cut, copy, paste and show command palette functions in header ([#5648](https://github.com/filebrowser/filebrowser/issues/5648)) ([785b7ab](https://github.com/filebrowser/filebrowser/commit/785b7abb7ba7a86cc0deae1052c319ff714c222c))
-* update translations ([#5677](https://github.com/filebrowser/filebrowser/issues/5677)) ([e7ea1ad](https://github.com/filebrowser/filebrowser/commit/e7ea1ad27d3d17e249489d3338be40bfea15e2a1))
-
-
-### Bug Fixes
-
-* prevent context menu clicks from clearing file selection ([#5681](https://github.com/filebrowser/filebrowser/issues/5681)) ([59ca0c3](https://github.com/filebrowser/filebrowser/commit/59ca0c340afc7774747c70ede9a5a5a3c9349d6b))
-* request current password when deleting users ([#5667](https://github.com/filebrowser/filebrowser/issues/5667)) ([cfa6c58](https://github.com/filebrowser/filebrowser/commit/cfa6c5864e5e7673aa9f3180e4964e0db92cc4da))
-* retain file selection when closing the editor ([#5693](https://github.com/filebrowser/filebrowser/issues/5693)) ([4094fb3](https://github.com/filebrowser/filebrowser/commit/4094fb359babac70e88d0ed4bfe3bd100744aad6))
-
-## [2.54.0](https://github.com/filebrowser/filebrowser/compare/v2.53.1...v2.54.0) (2026-01-10)
-
-
-### Features
-
-* add "redirect after copy/move" user setting ([#5662](https://github.com/filebrowser/filebrowser/issues/5662)) ([fda8a99](https://github.com/filebrowser/filebrowser/commit/fda8a992929b1466e75fb2813f2c4e293c12d244))
-* force file sync while uploading file ([#5668](https://github.com/filebrowser/filebrowser/issues/5668)) ([4fd18a3](https://github.com/filebrowser/filebrowser/commit/4fd18a382c31bbe7059d6733ffa371e70051865b))
-* update translations ([#5659](https://github.com/filebrowser/filebrowser/issues/5659)) ([464b581](https://github.com/filebrowser/filebrowser/commit/464b581953139c17e3276b774e381e4052827125))
-
-
-### Bug Fixes
-
-* clear selection by clicking on empty area ([#5663](https://github.com/filebrowser/filebrowser/issues/5663)) ([208535a](https://github.com/filebrowser/filebrowser/commit/208535a8cc23254de0013dfab9008486707ee6c2))
-* hide "change password form" in noauth setting ([#5652](https://github.com/filebrowser/filebrowser/issues/5652)) ([219582c](https://github.com/filebrowser/filebrowser/commit/219582c0b03fd90979b1d1398dba7919d086a23f))
-
-## [2.53.1](https://github.com/filebrowser/filebrowser/compare/v2.53.0...v2.53.1) (2026-01-03)
-
-
-### Bug Fixes
-
-* download path encoding file paths ([#5655](https://github.com/filebrowser/filebrowser/issues/5655)) ([ffa893e](https://github.com/filebrowser/filebrowser/commit/ffa893e9ac387a49dba5917a41df7c3b7ce120fc))
-* request a password to change sensitive user data ([#5629](https://github.com/filebrowser/filebrowser/issues/5629)) ([b8151a0](https://github.com/filebrowser/filebrowser/commit/b8151a038a1ea55afae8073b439b74e364cac12f))
-
-## [2.53.0](https://github.com/filebrowser/filebrowser/compare/v2.52.0...v2.53.0) (2025-12-29)
-
-
-### Features
-
-* add "disable image resolution calculation" flag ([#5638](https://github.com/filebrowser/filebrowser/issues/5638)) ([a2d80c6](https://github.com/filebrowser/filebrowser/commit/a2d80c62c1c17962e566f68fb7cac6960ed3e4cb))
-* support streaming response for search results ([#5630](https://github.com/filebrowser/filebrowser/issues/5630)) ([20bfd13](https://github.com/filebrowser/filebrowser/commit/20bfd131c6a4fca48a645b52171c2d1cc3ce92b7))
-* update translations ([a12a612](https://github.com/filebrowser/filebrowser/commit/a12a612970d6cc3dfbca1b35ef3a60a887a4effb))
-* update translations ([#5626](https://github.com/filebrowser/filebrowser/issues/5626)) ([f899756](https://github.com/filebrowser/filebrowser/commit/f89975603e29b9f1fc05aec58afb42bbd56ed696))
-* update translations ([#5631](https://github.com/filebrowser/filebrowser/issues/5631)) ([032d6c7](https://github.com/filebrowser/filebrowser/commit/032d6c7520a64686c9d9b1218562256f629b4703))
-
-
-### Bug Fixes
-
-* conversion of backslashes in file paths for archive creation ([#5637](https://github.com/filebrowser/filebrowser/issues/5637)) ([9595f39](https://github.com/filebrowser/filebrowser/commit/9595f3939c1c129ed875a47adcc4fbcfad9a0e65))
-* Don't crash on invalid config import ([#5640](https://github.com/filebrowser/filebrowser/issues/5640)) ([79d1aa9](https://github.com/filebrowser/filebrowser/commit/79d1aa9229b076ee8e3b71d6cf061fc90738f4da))
-* fix nil deref in config set command ([#5641](https://github.com/filebrowser/filebrowser/issues/5641)) ([60b1ee8](https://github.com/filebrowser/filebrowser/commit/60b1ee8bb9e18b21d7f2c04cb1cc90046cecd3e1))
-
-## [2.52.0](https://github.com/filebrowser/filebrowser/compare/v2.51.2...v2.52.0) (2025-12-13)
-
-
-### Features
-
-* sync translations with Transifex ([7fa3432](https://github.com/filebrowser/filebrowser/commit/7fa3432f25610bbb55a718bc709b9a7bf41d92f0))
-* update translations ([#5615](https://github.com/filebrowser/filebrowser/issues/5615)) ([3fdca6d](https://github.com/filebrowser/filebrowser/commit/3fdca6dfd9a18c3f4895b4ef3cbd216824dbb57a))
-
-
-### Bug Fixes
-
-* display the directory name in the shared folder view ([#5617](https://github.com/filebrowser/filebrowser/issues/5617)) ([6d4c867](https://github.com/filebrowser/filebrowser/commit/6d4c86767239dad4f09f30f48678f2f3a716eb12))
-* hide the context menu when changing the route ([#5613](https://github.com/filebrowser/filebrowser/issues/5613)) ([cf96657](https://github.com/filebrowser/filebrowser/commit/cf966578d8c6beab111b74f495bac6bdec173f41))
-
-## [2.51.2](https://github.com/filebrowser/filebrowser/compare/v2.51.1...v2.51.2) (2025-12-07)
-
-
-### Bug Fixes
-
-* **frontend:** add missing i18n strings ([c171599](https://github.com/filebrowser/filebrowser/commit/c1715992bda46517f801c1aa496df8a3b42a4e4d))
-
-## [2.51.1](https://github.com/filebrowser/filebrowser/compare/v2.51.0...v2.51.1) (2025-12-07)
-
-
-### Bug Fixes
-
-* **frontend:** csv viewer i18n strings ([4cbb4b7](https://github.com/filebrowser/filebrowser/commit/4cbb4b73af816104475f15c1d996640b56203602))
-* prevent the right-click from selecting multiple items when the "single-click" option is active ([#5608](https://github.com/filebrowser/filebrowser/issues/5608)) ([152f830](https://github.com/filebrowser/filebrowser/commit/152f8302f7cda21bde37692b175c22c124233f45))
-
-## [2.51.0](https://github.com/filebrowser/filebrowser/compare/v2.50.0...v2.51.0) (2025-12-06)
-
-
-### Features
-
-* update translations ([2d88c06](https://github.com/filebrowser/filebrowser/commit/2d88c067611e936056dbbf04247f1c1c709b2a09))
-
-
-### Bug Fixes
-
-* added column separator select (comma, semicolon and both) in CSV viewer ([#5604](https://github.com/filebrowser/filebrowser/issues/5604)) ([204a3f0](https://github.com/filebrowser/filebrowser/commit/204a3f0eeaa0c68781b60651bf27c4b27eac44e6))
-
-
-### Refactorings
-
-* cleanup package names ([#5605](https://github.com/filebrowser/filebrowser/issues/5605)) ([f029c30](https://github.com/filebrowser/filebrowser/commit/f029c3005e450cfbebb074c42dbdf65db9c8d56a))
-
-## [2.50.0](https://github.com/filebrowser/filebrowser/compare/v2.49.0...v2.50.0) (2025-11-30)
-
-
-### Features
-
-* configurable logout page URL for proxy/hook auth ([#3884](https://github.com/filebrowser/filebrowser/issues/3884)) ([b9ac45d](https://github.com/filebrowser/filebrowser/commit/b9ac45d5dac4b4eb2ba364629090fbf306cffd2b))
-* render CSVs as table ([#5569](https://github.com/filebrowser/filebrowser/issues/5569)) ([982405e](https://github.com/filebrowser/filebrowser/commit/982405ec944f94baf43594b0ed2f06329ff4e9ed))
-* update frontend/src/i18n/hr.json ([279a5cc](https://github.com/filebrowser/filebrowser/commit/279a5ccd1e8d7bde4568b63cb3c506af48b6c618))
-* update translations ([78e0395](https://github.com/filebrowser/filebrowser/commit/78e039596070a3a9e643a693cc99960c69dcfe92))
-
-
-### Bug Fixes
-
-* do not close editor if save failed ([701522a](https://github.com/filebrowser/filebrowser/commit/701522a0600cfa542469540ed764630c0ba1a732)), closes [#5591](https://github.com/filebrowser/filebrowser/issues/5591)
-
-## [2.49.0](https://github.com/filebrowser/filebrowser/compare/v2.48.2...v2.49.0) (2025-11-22)
-
-
-### Features
-
-* add "copy download link to clipboard" button to Share prompt ([#5173](https://github.com/filebrowser/filebrowser/issues/5173)) ([d48f566](https://github.com/filebrowser/filebrowser/commit/d48f5665d6975c4cbbdf9be20dc2e0106db02f01))
-* add Bulgarian language ([8db2411](https://github.com/filebrowser/filebrowser/commit/8db2411cd43a23ae3292a817e3524cfdb5ae9b86))
-* Updates for project File Browser ([#5566](https://github.com/filebrowser/filebrowser/issues/5566)) ([54306bd](https://github.com/filebrowser/filebrowser/commit/54306bdc8700fac489326ae81e28ac5db0580d13))
-
-
-### Bug Fixes
-
-* display friendly error message for password validation on signup ([#5563](https://github.com/filebrowser/filebrowser/issues/5563)) ([6d5aa35](https://github.com/filebrowser/filebrowser/commit/6d5aa355e433d613e5a3ae137f410c63baeddf0f))
-
-## [2.48.2](https://github.com/filebrowser/filebrowser/compare/v2.48.1...v2.48.2) (2025-11-18)
-
-
-### Bug Fixes
-
-* add transitionary support for FB_BASEURL ([984ea7b](https://github.com/filebrowser/filebrowser/commit/984ea7b569e3bd33b6f91ebdf63684a618d51e94))
-
-
-### Refactorings
-
-* rename python for clarification ([fd7b70c](https://github.com/filebrowser/filebrowser/commit/fd7b70cf38ac67c8c9ff79f2e7fde5e2ec45a1de))
-
-## [2.48.1](https://github.com/filebrowser/filebrowser/compare/v2.48.0...v2.48.1) (2025-11-17)
-
-
-### Bug Fixes
-
-* options should only override if set ([420adea](https://github.com/filebrowser/filebrowser/commit/420adea7e61a1c182cddd6fb2544a0752e5709f7))
-
-## [2.48.0](https://github.com/filebrowser/filebrowser/compare/v2.47.0...v2.48.0) (2025-11-17)
-
-
-### Features
-
-* consistent flags and environment variables ([#5549](https://github.com/filebrowser/filebrowser/issues/5549)) ([0a0cb80](https://github.com/filebrowser/filebrowser/commit/0a0cb8046fce52f1ff926171b34bcdb7cd39aab3))
-
-
-### Bug Fixes
-
-* add tokenExpirationTime to `config init` and troubleshoot docs ([#5546](https://github.com/filebrowser/filebrowser/issues/5546)) ([8c5dc76](https://github.com/filebrowser/filebrowser/commit/8c5dc7641e6f8aadd9e5d5d3b25a2ad9f1ec9a1e))
-* use all available flags in quick setup ([f41585f](https://github.com/filebrowser/filebrowser/commit/f41585f0392d65c08c01ab65b62d3eeb04c03b7d))
-
-
-### Refactorings
-
-* reuse logic for config init and set ([89be0b1](https://github.com/filebrowser/filebrowser/commit/89be0b1873527987dd2dddac746e93b8bc684d46))
-
-## [2.47.0](https://github.com/filebrowser/filebrowser/compare/v2.46.1...v2.47.0) (2025-11-16)
-
-
-### Features
-
-* add TUS settings to the command line ([#5556](https://github.com/filebrowser/filebrowser/issues/5556)) ([e24e1f1](https://github.com/filebrowser/filebrowser/commit/e24e1f1abae9e80add620c4ad65660ca1b575a49))
-* remove importer of v1 config ([#5550](https://github.com/filebrowser/filebrowser/issues/5550)) ([ceb5e72](https://github.com/filebrowser/filebrowser/commit/ceb5e723f3ee2c966bb561a804015246450280ca))
-
-
-### Bug Fixes
-
-* exit 0 when gracefully shutting down ([#5555](https://github.com/filebrowser/filebrowser/issues/5555)) ([5de4099](https://github.com/filebrowser/filebrowser/commit/5de4099cba2cf012d4a213c8eb29c412fc72c151))
-
-## [2.46.1](https://github.com/filebrowser/filebrowser/compare/v2.46.0...v2.46.1) (2025-11-15)
-
-
-### Bug Fixes
-
-* env key replacer and remove unused function ([#5547](https://github.com/filebrowser/filebrowser/issues/5547)) ([13814e1](https://github.com/filebrowser/filebrowser/commit/13814e11197ebd9101940883e3ca85998f86d442))
-* remove duplicated 'hide-defaults' flag (is 'hideDefaults') ([#5548](https://github.com/filebrowser/filebrowser/issues/5548)) ([ffc8504](https://github.com/filebrowser/filebrowser/commit/ffc850454e4cb8f10b970511681d6c627340afc7))
-
-## [2.46.0](https://github.com/filebrowser/filebrowser/compare/v2.45.3...v2.46.0) (2025-11-14)
-
-
-### Features
-
-* add 'hide-dotfiles' as command line parameter ([#3802](https://github.com/filebrowser/filebrowser/issues/3802)) ([0d973d3](https://github.com/filebrowser/filebrowser/commit/0d973d3aad70ceb88950f2cd9c297fc76e7955b1))
-* add context menu ([#3343](https://github.com/filebrowser/filebrowser/issues/3343)) ([1ace579](https://github.com/filebrowser/filebrowser/commit/1ace579a553486bb15af2d11f537414156606434))
-* add option to hide the login button from public-facing pages ([#3922](https://github.com/filebrowser/filebrowser/issues/3922)) ([ac7b49c](https://github.com/filebrowser/filebrowser/commit/ac7b49c1484b4e27a1149310542ccd1e90659ee2))
-* Updates for project File Browser ([#5544](https://github.com/filebrowser/filebrowser/issues/5544)) ([fb5d099](https://github.com/filebrowser/filebrowser/commit/fb5d099f8514516216f407be012d2e3f25de2441))
-
-## [2.45.3](https://github.com/filebrowser/filebrowser/compare/v2.45.2...v2.45.3) (2025-11-13)
-
-This is a test release to ensure the updated workflow works.
-
-## [2.45.2](https://github.com/filebrowser/filebrowser/compare/v2.45.1...v2.45.2) (2025-11-13)
-
-
-### Bug Fixes
-
-* **deps:** update module github.com/shirou/gopsutil/v3 to v4 ([#5536](https://github.com/filebrowser/filebrowser/issues/5536)) ([fdff7a3](https://github.com/filebrowser/filebrowser/commit/fdff7a38f4711f2b58dfdd60bebbb057bd3a478d))
-* **deps:** update module gopkg.in/yaml.v2 to v3 ([#5537](https://github.com/filebrowser/filebrowser/issues/5537)) ([f26a685](https://github.com/filebrowser/filebrowser/commit/f26a68587d8432b536453093f42dc255d19d10fa))
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
 ### [2.45.1](https://github.com/filebrowser/filebrowser/compare/v2.45.0...v2.45.1) (2025-11-11)
 

CONTRIBUTING.md

@@ -15,23 +15,11 @@ We encourage you to use git to manage your fork. To clone the main repository, j
 git clone https://github.com/filebrowser/filebrowser
 ```
 
-We use [Taskfile](https://taskfile.dev/) to manage the different processes (building, releasing, etc) automatically.
-
 ## Build
 
-You can fully build the project in order to produce a binary by running:
-
-```bash
-task build
-```
-
-## Development
-
-For development, there are a few things to have in mind.
-
 ### Frontend
 
-We use [Node.js](https://nodejs.org/en/) on the frontend to manage the build process. Prepare the frontend environment:
+We are using [Node.js](https://nodejs.org/en/) on the frontend to manage the build process. The steps to build it are:
 
 ```bash
 # From the root of the repo, go to frontend/
@@ -39,62 +27,37 @@ cd frontend
 
 # Install the dependencies
 pnpm install
-```
 
-If you just want to develop the backend, you can create a static build of the frontend:
-
-```bash
+# Build the frontend
 pnpm run build
 ```
 
-If you want to develop the frontend, start a development server which watches for changes:
+This will install the dependencies and build the frontend so you can then embed it into the Go app. Although, if you want to play with it, you'll get bored of building it after every change you do. So, you can run the command below to watch for changes:
 
 ```bash
 pnpm run dev
 ```
 
-Please note that you need to access File Browser's interface through the development server of the frontend.
-
 ### Backend
 
-First prepare the backend environment by downloading all required dependencies:
+First of all, you need to download the required dependencies. We are using the built-in `go mod` tool for dependency management. To get the modules, run:
 
 ```bash
 go mod download
 ```
 
-You can now build or run File Browser as any other Go project:
+The magic of File Browser is that the static assets are bundled into the final binary. For that, we use [Go embed.FS](https://golang.org/pkg/embed/). The files from `frontend/dist` will be embedded during the build process.
+
+To build File Browser is just like any other Go program:
 
 ```bash
-# Build
 go build
-
-# Run
-go run .
 ```
 
-## Documentation
-
-We rely on Docker to abstract all the dependencies required for building the documentation.
-
-To build the documentation to `www/public`:
+To create a development build use the "dev" tag, this way the content inside the frontend folder will not be embedded in the binary but will be reloaded at every change:
 
 ```bash
-task docs
-```
-
-To start a local server on port `8000` to view the built documentation:
-
-```bash
-task docs:serve
-```
-
-## Release
-
-To make a release, just run:
-
-```bash
-task release
+go build -tags dev
 ```
 
 ## Translations

Dockerfile

@@ -1,5 +1,5 @@
 ## Multistage build: First stage fetches dependencies
-FROM alpine:3.23 AS fetcher
+FROM alpine:3.22 AS fetcher
 
 # install and copy ca-certificates, mailcap, and tini-static; download JSON.sh
 RUN apk update && \
@@ -8,6 +8,7 @@ RUN apk update && \
 
 ## Second stage: Use lightweight BusyBox image for final runtime environment
 FROM busybox:1.37.0-musl
+ARG TARGETPLATFORM
 
 # Define non-root user UID and GID
 ENV UID=1000
@@ -18,7 +19,7 @@ RUN addgroup -g $GID user && \
     adduser -D -u $UID -G user user
 
 # Copy binary, scripts, and configurations into image with proper ownership
-COPY --chown=user:user filebrowser /bin/filebrowser
+COPY --chown=user:user $TARGETPLATFORM/filebrowser /bin/filebrowser
 COPY --chown=user:user docker/common/ /
 COPY --chown=user:user docker/alpine/ /
 COPY --chown=user:user --from=fetcher /sbin/tini-static /bin/tini

Dockerfile.s6

@@ -1,4 +1,5 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.23
+FROM ghcr.io/linuxserver/baseimage-alpine:3.22
+ARG TARGETPLATFORM
 
 RUN apk update && \
   apk --no-cache add ca-certificates mailcap jq libcap
@@ -8,7 +9,7 @@ RUN mkdir -p /config /database /srv && \
   chown -R abc:abc /config /database /srv
 
 # Copy files and set permissions
-COPY filebrowser /bin/filebrowser
+COPY $TARGETPLATFORM/filebrowser /bin/filebrowser
 COPY docker/common/ /
 COPY docker/s6/ /
 

Makefile

@@ -0,0 +1,88 @@
+include common.mk
+include tools.mk
+
+LDFLAGS += -X "$(MODULE)/version.Version=$(VERSION)" -X "$(MODULE)/version.CommitSHA=$(VERSION_HASH)"
+
+SITE_DOCKER_FLAGS = \
+	-v $(CURDIR)/www:/docs \
+	-v $(CURDIR)/LICENSE:/docs/docs/LICENSE \
+	-v $(CURDIR)/SECURITY.md:/docs/docs/security.md \
+	-v $(CURDIR)/CHANGELOG.md:/docs/docs/changelog.md \
+	-v $(CURDIR)/CODE-OF-CONDUCT.md:/docs/docs/code-of-conduct.md \
+	-v $(CURDIR)/CONTRIBUTING.md:/docs/docs/contributing.md
+
+## Build:
+
+.PHONY: build
+build: | build-frontend build-backend ## Build binary
+
+.PHONY: build-frontend
+build-frontend: ## Build frontend
+	$Q cd frontend && pnpm install --frozen-lockfile && pnpm run build
+
+.PHONY: build-backend
+build-backend: ## Build backend
+	$Q $(go) build -ldflags '$(LDFLAGS)' -o .
+
+.PHONY: test
+test: | test-frontend test-backend ## Run all tests
+
+.PHONY: test-frontend
+test-frontend: ## Run frontend tests
+	$Q cd frontend && pnpm install --frozen-lockfile && pnpm run typecheck
+
+.PHONY: test-backend
+test-backend: ## Run backend tests
+	$Q $(go) test -v ./...
+
+.PHONY: lint
+lint: lint-frontend lint-backend ## Run all linters
+
+.PHONY: lint-frontend
+lint-frontend: ## Run frontend linters
+	$Q cd frontend && pnpm install --frozen-lockfile && pnpm run lint
+
+.PHONY: lint-backend
+lint-backend: | $(golangci-lint) ## Run backend linters
+	$Q $(golangci-lint) run -v
+
+.PHONY: lint-commits
+lint-commits: $(commitlint) ## Run commit linters
+	$Q ./scripts/commitlint.sh
+
+fmt: $(goimports) ## Format source files
+	$Q $(goimports) -local $(MODULE) -w $$(find . -type f -name '*.go' -not -path "./vendor/*")
+
+clean: clean-tools ## Clean
+
+## Release:
+
+.PHONY: bump-version
+bump-version: $(standard-version) ## Bump app version
+	$Q ./scripts/bump_version.sh
+
+.PHONY: site
+site: ## Build site
+	@rm -rf www/public
+	docker build -f www/Dockerfile --progress=plain -t filebrowser.site www
+	docker run --rm $(SITE_DOCKER_FLAGS) filebrowser.site build -d "public"
+
+.PHONY: site-serve
+site-serve: ## Serve site for development
+	docker build -f www/Dockerfile --progress=plain -t filebrowser.site www
+	docker run --rm -it -p 8000:8000 $(SITE_DOCKER_FLAGS) filebrowser.site
+
+## Help:
+help: ## Show this help
+	@echo ''
+	@echo 'Usage:'
+	@echo '  ${YELLOW}make${RESET} ${GREEN}<target> [options]${RESET}'
+	@echo ''
+	@echo 'Options:'
+	@$(call global_option, "V [0|1]", "enable verbose mode (default:0)")
+	@echo ''
+	@echo 'Targets:'
+	@awk 'BEGIN {FS = ":.*?## "} { \
+		if (/^[a-zA-Z_-]+:.*?##.*$$/) {printf "    ${YELLOW}%-20s${GREEN}%s${RESET}\n", $$1, $$2} \
+		else if (/^## .*$$/) {printf "  ${CYAN}%s${RESET}\n", substr($$1,4)} \
+		}' $(MAKEFILE_LIST)

README.md

@@ -1,10 +1,12 @@
 <p align="center">
-  <img src="https://raw.githubusercontent.com/filebrowser/filebrowser/master/branding/banner.png" width="550"/>
+  <img src="https://raw.githubusercontent.com/filebrowser/logo/master/banner.png" width="550"/>
 </p>
 
-[![Build](https://github.com/filebrowser/filebrowser/actions/workflows/ci.yaml/badge.svg)](https://github.com/filebrowser/filebrowser/actions/workflows/ci.yaml)
-[![Go Report Card](https://goreportcard.com/badge/github.com/filebrowser/filebrowser/v2)](https://goreportcard.com/report/github.com/filebrowser/filebrowser/v2)
+[![Build](https://github.com/filebrowser/filebrowser/actions/workflows/main.yaml/badge.svg)](https://github.com/filebrowser/filebrowser/actions/workflows/main.yaml)
+[![Go Report Card](https://goreportcard.com/badge/github.com/filebrowser/filebrowser)](https://goreportcard.com/report/github.com/filebrowser/filebrowser)
+[![Documentation](https://img.shields.io/badge/godoc-reference-blue.svg)](http://godoc.org/github.com/filebrowser/filebrowser)
 [![Version](https://img.shields.io/github/release/filebrowser/filebrowser.svg)](https://github.com/filebrowser/filebrowser/releases/latest)
+[![Chat IRC](https://img.shields.io/badge/freenode-%23filebrowser-blue.svg)](http://webchat.freenode.net/?channels=%23filebrowser)
 
 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.
 
@@ -14,14 +16,18 @@ Documentation on how to install, configure, and contribute to this project is ho
 
 ## Project Status
 
-This project is a finished product which fulfills its goal: be a single binary web File Browser which can be run by anyone anywhere. That means that File Browser is currently on **maintenance-only** mode. Therefore, please note the following:
+> [!WARNING]
+>
+> This project is currently on **maintenance-only** mode, and is looking for new maintainers. For more information, please read the [discussion #4906](https://github.com/filebrowser/filebrowser/discussions/4906). Therefore, please note the following:
+>
+> - It can take a while until someone gets back to you. Please be patient.
+> - [Issues][issues] are only being used to track bugs. Any unrelated issues will be converted into a [discussion][discussions].
+> - No new features will be implemented until further notice. The priority is on triaging issues and merge bug fixes.
+> 
+> If you're interested in maintaining this project, please reach out via the discussion above.
 
-- It can take a while until someone gets back to you. Please be patient.
-- [Issues](https://github.com/filebrowser/filebrowser/issues) are meant to track bugs. Unrelated issues will be converted into [discussions](https://github.com/filebrowser/filebrowser/discussions).
-- The priority is triaging issues, addressing security issues and reviewing pull requests meant to solve bugs.
-- No new features are planned. Pull requests for new features are not guaranteed to be reviewed.
-
-Please read [@hacdias' personal reflection](https://hacdias.com/2026/03/11/filebrowser/) on the project status.
+[issues]: https://github.com/filebrowser/filebrowser/issues
+[discussions]: https://github.com/filebrowser/filebrowser/discussions
 
 ## Contributing
 

Taskfile.yml

@@ -1,83 +0,0 @@
-version: '3'
-
-vars:
-  SITE_DOCKER_FLAGS: >-
-    -v ./www:/docs
-    -v ./LICENSE:/docs/docs/LICENSE
-    -v ./SECURITY.md:/docs/docs/security.md
-    -v ./CHANGELOG.md:/docs/docs/changelog.md
-    -v ./CODE-OF-CONDUCT.md:/docs/docs/code-of-conduct.md
-    -v ./CONTRIBUTING.md:/docs/docs/contributing.md
-
-tasks:
-  build:frontend:
-    desc: Build frontend assets
-    dir: frontend
-    cmds:
-      - pnpm install --frozen-lockfile
-      - pnpm run build
-
-  build:backend:
-    desc: Build backend binary
-    cmds:
-      - go build -ldflags='-s -w -X "github.com/filebrowser/filebrowser/v2/version.Version={{.VERSION}}" -X "github.com/filebrowser/filebrowser/v2/version.CommitSHA={{.GIT_COMMIT}}"' -o filebrowser .
-    vars:
-      GIT_COMMIT:
-        sh: git log -n 1 --format=%h
-      VERSION:
-        sh: git describe --tags --abbrev=0 --match=v* | cut -c 2-
-
-  build:
-    desc: Build both frontend and backend
-    cmds:
-      - task: build:frontend
-      - task: build:backend
-
-  release:make:
-    internal: true
-    prompt: Do you wish to proceed?
-    cmds:
-      - pnpm dlx commit-and-tag-version -s
-
-  release:dry-run:
-    internal: true
-    cmds:
-      - pnpm dlx commit-and-tag-version --dry-run --skip
-
-  release:
-    desc: Create a new release
-    cmds:
-      - task: docs:cli:generate
-      - git add www/docs/cli
-      - |
-        if [[ `git status www/docs/cli --porcelain` ]]; then
-          git commit -m 'chore(docs): update CLI documentation'
-        fi
-      - task: release:dry-run
-      - task: release:make
-
-  docs:cli:generate:
-    cmds:
-      - rm -rf www/docs/cli
-      - mkdir -p www/docs/cli
-      - go run . docs
-    generates:
-      - www/docs/cli
-
-  docs:docker:generate:
-    internal: true
-    cmds: 
-      - docker build -f www/Dockerfile --progress=plain -t filebrowser.site www
-
-  docs:
-    desc: Generate documentation
-    cmds:
-      - rm -rf www/public
-      - task: docs:docker:generate
-      - docker run --rm {{.SITE_DOCKER_FLAGS}} filebrowser.site build -d "public"
-
-  docs:serve:
-    desc: Serve documentation
-    cmds:
-      - task: docs:docker:generate
-      - docker run --rm -it -p 8000:8000 {{.SITE_DOCKER_FLAGS}} filebrowser.site

auth/hook.go

@@ -11,7 +11,7 @@ import (
 	"slices"
 	"strings"
 
-	fberrors "github.com/filebrowser/filebrowser/v2/errors"
+	fbErrors "github.com/filebrowser/filebrowser/v2/errors"
 	"github.com/filebrowser/filebrowser/v2/files"
 	"github.com/filebrowser/filebrowser/v2/settings"
 	"github.com/filebrowser/filebrowser/v2/users"
@@ -68,7 +68,7 @@ func (a *HookAuth) Auth(r *http.Request, usr users.Store, stg *settings.Settings
 	case "block":
 		return nil, os.ErrPermission
 	case "pass":
-		u, err := a.Users.Get(a.Server.Root, a.Server.FollowExternalSymlinks, a.Cred.Username)
+		u, err := a.Users.Get(a.Server.Root, a.Cred.Username)
 		if err != nil || !users.CheckPwd(a.Cred.Password, u.Password) {
 			return nil, os.ErrPermission
 		}
@@ -86,8 +86,24 @@ func (a *HookAuth) LoginPage() bool {
 // RunCommand starts the hook command and returns the action
 func (a *HookAuth) RunCommand() (string, error) {
 	command := strings.Split(a.Command, " ")
+	envMapping := func(key string) string {
+		switch key {
+		case "USERNAME":
+			return a.Cred.Username
+		case "PASSWORD":
+			return a.Cred.Password
+		default:
+			return os.Getenv(key)
+		}
+	}
+	for i, arg := range command {
+		if i == 0 {
+			continue
+		}
+		command[i] = os.Expand(arg, envMapping)
+	}
 
-	cmd := exec.Command(command[0], command[1:]...)
+	cmd := exec.Command(command[0], command[1:]...) //nolint:gosec
 	cmd.Env = append(os.Environ(), fmt.Sprintf("USERNAME=%s", a.Cred.Username))
 	cmd.Env = append(cmd.Env, fmt.Sprintf("PASSWORD=%s", a.Cred.Password))
 	out, err := cmd.Output()
@@ -129,8 +145,8 @@ func (a *HookAuth) GetValues(s string) {
 
 // SaveUser updates the existing user or creates a new one when not found
 func (a *HookAuth) SaveUser() (*users.User, error) {
-	u, err := a.Users.Get(a.Server.Root, a.Server.FollowExternalSymlinks, a.Cred.Username)
-	if err != nil && !errors.Is(err, fberrors.ErrNotExist) {
+	u, err := a.Users.Get(a.Server.Root, a.Cred.Username)
+	if err != nil && !errors.Is(err, fbErrors.ErrNotExist) {
 		return nil, err
 	}
 
@@ -142,18 +158,16 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
 
 		// create user with the provided credentials
 		d := &users.User{
-			Username:              a.Cred.Username,
-			Password:              pass,
-			Scope:                 a.Settings.Defaults.Scope,
-			Locale:                a.Settings.Defaults.Locale,
-			ViewMode:              a.Settings.Defaults.ViewMode,
-			SingleClick:           a.Settings.Defaults.SingleClick,
-			RedirectAfterCopyMove: a.Settings.Defaults.RedirectAfterCopyMove,
-			Sorting:               a.Settings.Defaults.Sorting,
-			Perm:                  a.Settings.Defaults.Perm,
-			Commands:              a.Settings.Defaults.Commands,
-			DateFormat:            a.Settings.Defaults.DateFormat,
-			HideDotfiles:          a.Settings.Defaults.HideDotfiles,
+			Username:     a.Cred.Username,
+			Password:     pass,
+			Scope:        a.Settings.Defaults.Scope,
+			Locale:       a.Settings.Defaults.Locale,
+			ViewMode:     a.Settings.Defaults.ViewMode,
+			SingleClick:  a.Settings.Defaults.SingleClick,
+			Sorting:      a.Settings.Defaults.Sorting,
+			Perm:         a.Settings.Defaults.Perm,
+			Commands:     a.Settings.Defaults.Commands,
+			HideDotfiles: a.Settings.Defaults.HideDotfiles,
 		}
 		u = a.GetUser(d)
 
@@ -205,20 +219,18 @@ func (a *HookAuth) GetUser(d *users.User) *users.User {
 		Download: isAdmin || a.Fields.GetBoolean("user.perm.download", d.Perm.Download),
 	}
 	user := users.User{
-		ID:                    d.ID,
-		Username:              d.Username,
-		Password:              d.Password,
-		Scope:                 a.Fields.GetString("user.scope", d.Scope),
-		Locale:                a.Fields.GetString("user.locale", d.Locale),
-		ViewMode:              users.ViewMode(a.Fields.GetString("user.viewMode", string(d.ViewMode))),
-		SingleClick:           a.Fields.GetBoolean("user.singleClick", d.SingleClick),
-		RedirectAfterCopyMove: a.Fields.GetBoolean("user.redirectAfterCopyMove", d.RedirectAfterCopyMove),
+		ID:          d.ID,
+		Username:    d.Username,
+		Password:    d.Password,
+		Scope:       a.Fields.GetString("user.scope", d.Scope),
+		Locale:      a.Fields.GetString("user.locale", d.Locale),
+		ViewMode:    users.ViewMode(a.Fields.GetString("user.viewMode", string(d.ViewMode))),
+		SingleClick: a.Fields.GetBoolean("user.singleClick", d.SingleClick),
 		Sorting: files.Sorting{
 			Asc: a.Fields.GetBoolean("user.sorting.asc", d.Sorting.Asc),
 			By:  a.Fields.GetString("user.sorting.by", d.Sorting.By),
 		},
 		Commands:     a.Fields.GetArray("user.commands", d.Commands),
-		DateFormat:   a.Fields.GetBoolean("user.dateFormat", d.DateFormat),
 		HideDotfiles: a.Fields.GetBoolean("user.hideDotfiles", d.HideDotfiles),
 		Perm:         perms,
 		LockPassword: true,
@@ -239,7 +251,6 @@ var validHookFields = []string{
 	"user.locale",
 	"user.viewMode",
 	"user.singleClick",
-	"user.redirectAfterCopyMove",
 	"user.sorting.by",
 	"user.sorting.asc",
 	"user.commands",

auth/hook_test.go

@@ -1,88 +0,0 @@
-package auth
-
-import (
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-)
-
-// writeHookScript writes a POSIX shell script to a temp file and returns its
-// path, marking it executable.
-func writeHookScript(t *testing.T, body string) string {
-	t.Helper()
-	path := filepath.Join(t.TempDir(), "hook.sh")
-	if err := os.WriteFile(path, []byte("#!/bin/sh\n"+body), 0o700); err != nil {
-		t.Fatalf("failed to write hook script: %v", err)
-	}
-	return path
-}
-
-// TestRunCommandNoCredentialInjection ensures that attacker-controlled
-// credentials submitted at the unauthenticated login endpoint cannot be
-// injected into the hook command string. Credentials must only ever reach the
-// hook through the USERNAME/PASSWORD environment variables, never via string
-// substitution into the command itself (CWE-78/CWE-88).
-func TestRunCommandNoCredentialInjection(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("uses POSIX shell")
-	}
-
-	marker := filepath.Join(t.TempDir(), "pwned")
-
-	// The hook simply blocks. If the credential were ever interpolated into the
-	// command string and evaluated by a shell, the embedded `touch` would
-	// create the marker file.
-	script := writeHookScript(t, "echo hook.action=block\n")
-
-	a := &HookAuth{
-		Command: script,
-		Cred: hookCred{
-			Username: `"; touch ` + marker + `; #`,
-			Password: `$(touch ` + marker + `)`,
-		},
-	}
-
-	action, err := a.RunCommand()
-	if err != nil {
-		t.Fatalf("RunCommand returned error: %v", err)
-	}
-	if action != "block" {
-		t.Fatalf("expected action %q, got %q", "block", action)
-	}
-	if _, err := os.Stat(marker); err == nil {
-		t.Fatalf("credential injection executed: marker file %q was created", marker)
-	}
-}
-
-// TestRunCommandReceivesCredentialsViaEnv verifies the supported contract: the
-// hook receives credentials through the USERNAME and PASSWORD environment
-// variables.
-func TestRunCommandReceivesCredentialsViaEnv(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("uses POSIX shell")
-	}
-
-	script := writeHookScript(t, `if [ "$USERNAME" = alice ] && [ "$PASSWORD" = secret ]; then
-  echo hook.action=auth
-else
-  echo hook.action=block
-fi
-`)
-
-	a := &HookAuth{
-		Command: script,
-		Cred: hookCred{
-			Username: "alice",
-			Password: "secret",
-		},
-	}
-
-	action, err := a.RunCommand()
-	if err != nil {
-		t.Fatalf("RunCommand returned error: %v", err)
-	}
-	if action != "auth" {
-		t.Fatalf("expected action %q, got %q", "auth", action)
-	}
-}

auth/json.go

@@ -14,10 +14,6 @@ import (
 // MethodJSONAuth is used to identify json auth.
 const MethodJSONAuth settings.AuthMethod = "json"
 
-// dummyHash is used to prevent user enumeration timing attacks.
-// It MUST be a valid bcrypt hash.
-const dummyHash = "$2a$10$O4mEMeOL/nit6zqe.WQXauLRbRlzb3IgLHsa26Pf0N/GiU9b.wK1m"
-
 type jsonCred struct {
 	Password  string `json:"password"`
 	Username  string `json:"username"`
@@ -44,7 +40,7 @@ func (a JSONAuth) Auth(r *http.Request, usr users.Store, _ *settings.Settings, s
 
 	// If ReCaptcha is enabled, check the code.
 	if a.ReCaptcha != nil && a.ReCaptcha.Secret != "" {
-		ok, err := a.ReCaptcha.Ok(cred.ReCaptcha)
+		ok, err := a.ReCaptcha.Ok(cred.ReCaptcha) //nolint:govet
 
 		if err != nil {
 			return nil, err
@@ -55,18 +51,8 @@ func (a JSONAuth) Auth(r *http.Request, usr users.Store, _ *settings.Settings, s
 		}
 	}
 
-	u, err := usr.Get(srv.Root, srv.FollowExternalSymlinks, cred.Username)
-
-	hash := dummyHash
-	if err == nil {
-		hash = u.Password
-	}
-
-	if !users.CheckPwd(cred.Password, hash) {
-		return nil, os.ErrPermission
-	}
-
-	if err != nil {
+	u, err := usr.Get(srv.Root, cred.Username)
+	if err != nil || !users.CheckPwd(cred.Password, u.Password) {
 		return nil, os.ErrPermission
 	}
 

auth/none.go

@@ -15,7 +15,7 @@ type NoAuth struct{}
 
 // Auth uses authenticates user 1.
 func (a NoAuth) Auth(_ *http.Request, usr users.Store, _ *settings.Settings, srv *settings.Server) (*users.User, error) {
-	return usr.Get(srv.Root, srv.FollowExternalSymlinks, uint(1))
+	return usr.Get(srv.Root, uint(1))
 }
 
 // LoginPage tells that no auth doesn't require a login page.

auth/proxy.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"net/http"
 
-	fberrors "github.com/filebrowser/filebrowser/v2/errors"
+	fbErrors "github.com/filebrowser/filebrowser/v2/errors"
 	"github.com/filebrowser/filebrowser/v2/settings"
 	"github.com/filebrowser/filebrowser/v2/users"
 )
@@ -20,8 +20,8 @@ type ProxyAuth struct {
 // Auth authenticates the user via an HTTP header.
 func (a ProxyAuth) Auth(r *http.Request, usr users.Store, setting *settings.Settings, srv *settings.Server) (*users.User, error) {
 	username := r.Header.Get(a.Header)
-	user, err := usr.Get(srv.Root, srv.FollowExternalSymlinks, username)
-	if errors.Is(err, fberrors.ErrNotExist) {
+	user, err := usr.Get(srv.Root, username)
+	if errors.Is(err, fbErrors.ErrNotExist) {
 		return a.createUser(usr, setting, srv, username)
 	}
 	return user, err
@@ -46,9 +46,6 @@ func (a ProxyAuth) createUser(usr users.Store, setting *settings.Settings, srv *
 		LockPassword: true,
 	}
 	setting.Defaults.Apply(user)
-	user.Perm.Admin = false
-	user.Perm.Execute = false
-	user.Commands = []string{}
 
 	var userHome string
 	userHome, err = setting.MakeUserDir(user.Username, user.Scope, srv.Root)

auth/proxy_test.go

@@ -1,80 +0,0 @@
-package auth
-
-import (
-	"net/http"
-	"testing"
-
-	fberrors "github.com/filebrowser/filebrowser/v2/errors"
-	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/v2/users"
-)
-
-type mockUserStore struct {
-	users map[string]*users.User
-}
-
-func (m *mockUserStore) Get(_ string, _ bool, id interface{}) (*users.User, error) {
-	if v, ok := id.(string); ok {
-		if u, ok := m.users[v]; ok {
-			return u, nil
-		}
-	}
-	return nil, fberrors.ErrNotExist
-}
-
-func (m *mockUserStore) GetByScope(_ string) (*users.User, error)     { return nil, fberrors.ErrNotExist }
-func (m *mockUserStore) Gets(_ string, _ bool) ([]*users.User, error) { return nil, nil }
-func (m *mockUserStore) Update(_ *users.User, _ ...string) error      { return nil }
-func (m *mockUserStore) Save(user *users.User) error {
-	m.users[user.Username] = user
-	return nil
-}
-func (m *mockUserStore) Delete(_ interface{}) error { return nil }
-func (m *mockUserStore) LastUpdate(_ uint) int64    { return 0 }
-
-func TestProxyAuthCreateUserRestrictsDefaults(t *testing.T) {
-	t.Parallel()
-
-	store := &mockUserStore{users: make(map[string]*users.User)}
-	srv := &settings.Server{Root: t.TempDir()}
-
-	s := &settings.Settings{
-		Key:        []byte("key"),
-		AuthMethod: MethodProxyAuth,
-		Defaults: settings.UserDefaults{
-			Perm: users.Permissions{
-				Admin:    true,
-				Execute:  true,
-				Create:   true,
-				Rename:   true,
-				Modify:   true,
-				Delete:   true,
-				Share:    true,
-				Download: true,
-			},
-			Commands: []string{"git", "ls", "cat", "id"},
-		},
-	}
-
-	auth := ProxyAuth{Header: "X-Remote-User"}
-	req, _ := http.NewRequest(http.MethodGet, "/", http.NoBody)
-	req.Header.Set("X-Remote-User", "newproxyuser")
-
-	user, err := auth.Auth(req, store, s, srv)
-	if err != nil {
-		t.Fatalf("Auth() error: %v", err)
-	}
-
-	if user.Perm.Admin {
-		t.Error("auto-provisioned proxy user should not have Admin permission")
-	}
-	if user.Perm.Execute {
-		t.Error("auto-provisioned proxy user should not have Execute permission")
-	}
-	if len(user.Commands) != 0 {
-		t.Errorf("auto-provisioned proxy user should have empty Commands, got %v", user.Commands)
-	}
-	if !user.Perm.Create {
-		t.Error("auto-provisioned proxy user should retain Create permission from defaults")
-	}
-}

branding/icon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="700" height="700" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd"><defs><style>.prefix__fil1{fill:#fefefe}.prefix__fil6{fill:#006498}.prefix__fil5{fill:#bdeaff}</style></defs><g id="prefix__Layer_x0020_1"><path d="M80 0h540c44 0 80 36 80 80v540c0 44-36 80-80 80H80c-44 0-80-36-80-80V80C0 36 36 0 80 0z" fill="#455a64"/><path class="prefix__fil1" d="M350 71c154 0 279 125 279 279S504 629 350 629 71 504 71 350 196 71 350 71z"/><path d="M475 236l118 151c3 116-149 252-292 198l-76-99 114-156s138-95 136-94z" fill="#332c2b" fill-opacity=".149"/><path d="M231 211h208l38 24v246c0 5-3 8-8 8H231c-5 0-8-3-8-8V219c0-5 3-8 8-8z" fill="#2bbcff"/><path d="M231 211h208l38 24v2l-37-23H231c-4 0-7 3-7 7v263c-1-1-1-2-1-3V219c0-5 3-8 8-8z" fill="#53c6fc"/><path class="prefix__fil5" d="M305 212h113v98H305zM255 363h189c3 0 5 2 5 4v116H250V367c0-2 2-4 5-4z"/><path class="prefix__fil6" d="M250 470h199v13H250zM380 226h10c3 0 6 2 6 5v40c0 3-3 6-6 6h-10c-3 0-6-3-6-6v-40c0-3 3-5 6-5z"/><path class="prefix__fil1" d="M254 226c10 0 17 7 17 17 0 9-7 16-17 16-9 0-17-7-17-16 0-10 8-17 17-17z"/><path class="prefix__fil6" d="M267 448h165c2 0 3 1 3 3 0 1-1 3-3 3H267c-2 0-3-2-3-3 0-2 1-3 3-3zM267 415h165c2 0 3 1 3 3 0 1-1 2-3 2H267c-2 0-3-1-3-2 0-2 1-3 3-3zM267 381h165c2 0 3 2 3 3 0 2-1 3-3 3H267c-2 0-3-1-3-3 0-1 1-3 3-3z"/><path class="prefix__fil1" d="M236 472c3 0 5 2 5 5 0 2-2 4-5 4s-5-2-5-4c0-3 2-5 5-5zM463 472c3 0 5 2 5 5 0 2-2 4-5 4s-5-2-5-4c0-3 2-5 5-5z"/><path class="prefix__fil6" d="M305 212h-21v98h21z"/><path d="M477 479v2c0 5-3 8-8 8H231c-5 0-8-3-8-8v-2c0 4 3 8 8 8h238c5 0 8-4 8-8z" fill="#0ea5eb"/><path d="M350 70c155 0 280 125 280 280S505 630 350 630 70 505 70 350 195 70 350 70zm0 46c129 0 234 105 234 234S479 584 350 584 116 479 116 350s105-234 234-234z" fill="#2979ff"/></g></svg>

branding/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="560" height="560" version="1.1" id="prefix__svg44" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision"><defs id="prefix__defs4"><style type="text/css" id="style2">.prefix__fil1{fill:#fefefe}.prefix__fil6{fill:#006498}.prefix__fil5{fill:#bdeaff}</style></defs><g id="prefix__g85" transform="translate(-70 -70)"><path class="prefix__fil1" d="M350 71c154 0 279 125 279 279S504 629 350 629 71 504 71 350 196 71 350 71z" id="prefix__path9" fill="#fefefe"/><path d="M475 236l118 151c3 116-149 252-292 198l-76-99 114-156s138-95 136-94z" id="prefix__path11" fill="#332c2b" fill-opacity=".149"/><path d="M231 211h208l38 24v246c0 5-3 8-8 8H231c-5 0-8-3-8-8V219c0-5 3-8 8-8z" id="prefix__path13" fill="#2bbcff"/><path d="M231 211h208l38 24v2l-37-23H231c-4 0-7 3-7 7v263c-1-1-1-2-1-3V219c0-5 3-8 8-8z" id="prefix__path15" fill="#53c6fc"/><path class="prefix__fil5" id="prefix__polygon17" fill="#bdeaff" d="M305 212h113v98H305z"/><path class="prefix__fil5" d="M255 363h189c3 0 5 2 5 4v116H250V367c0-2 2-4 5-4z" id="prefix__path19" fill="#bdeaff"/><path class="prefix__fil6" id="prefix__polygon21" fill="#006498" d="M250 470h199v13H250z"/><path class="prefix__fil6" d="M380 226h10c3 0 6 2 6 5v40c0 3-3 6-6 6h-10c-3 0-6-3-6-6v-40c0-3 3-5 6-5z" id="prefix__path23" fill="#006498"/><path class="prefix__fil1" d="M254 226c10 0 17 7 17 17 0 9-7 16-17 16-9 0-17-7-17-16 0-10 8-17 17-17z" id="prefix__path25" fill="#fefefe"/><path class="prefix__fil6" d="M267 448h165c2 0 3 1 3 3 0 1-1 3-3 3H267c-2 0-3-2-3-3 0-2 1-3 3-3z" id="prefix__path27" fill="#006498"/><path class="prefix__fil6" d="M267 415h165c2 0 3 1 3 3 0 1-1 2-3 2H267c-2 0-3-1-3-2 0-2 1-3 3-3z" id="prefix__path29" fill="#006498"/><path class="prefix__fil6" d="M267 381h165c2 0 3 2 3 3 0 2-1 3-3 3H267c-2 0-3-1-3-3 0-1 1-3 3-3z" id="prefix__path31" fill="#006498"/><path class="prefix__fil1" d="M236 472c3 0 5 2 5 5 0 2-2 4-5 4s-5-2-5-4c0-3 2-5 5-5z" id="prefix__path33" fill="#fefefe"/><path class="prefix__fil1" d="M463 472c3 0 5 2 5 5 0 2-2 4-5 4s-5-2-5-4c0-3 2-5 5-5z" id="prefix__path35" fill="#fefefe"/><path class="prefix__fil6" id="prefix__polygon37" fill="#006498" d="M305 212h-21v98h21z"/><path d="M477 479v2c0 5-3 8-8 8H231c-5 0-8-3-8-8v-2c0 4 3 8 8 8h238c5 0 8-4 8-8z" id="prefix__path39" fill="#0ea5eb"/><path d="M350 70c155 0 280 125 280 280S505 630 350 630 70 505 70 350 195 70 350 70zm0 46c129 0 234 105 234 234S479 584 350 584 116 479 116 350s105-234 234-234z" id="prefix__path41" fill="#2979ff"/></g></svg>

cmd/cmd_test.go

@@ -1,35 +0,0 @@
-package cmd
-
-import (
-	"testing"
-
-	"github.com/samber/lo"
-	"github.com/spf13/cobra"
-)
-
-// TestEnvCollisions ensures that there are no collisions in the produced environment
-// variable names for all commands and their flags.
-func TestEnvCollisions(t *testing.T) {
-	testEnvCollisions(t, rootCmd)
-}
-
-func testEnvCollisions(t *testing.T, cmd *cobra.Command) {
-	for _, cmd := range cmd.Commands() {
-		testEnvCollisions(t, cmd)
-	}
-
-	replacements := generateEnvKeyReplacements(cmd)
-	envVariables := []string{}
-
-	for i := range replacements {
-		if i%2 != 0 {
-			envVariables = append(envVariables, replacements[i])
-		}
-	}
-
-	duplicates := lo.FindDuplicates(envVariables)
-
-	if len(duplicates) > 0 {
-		t.Errorf("Found duplicate environment variable keys for command %q: %v", cmd.Name(), duplicates)
-	}
-}

cmd/cmds_add.go

@@ -15,18 +15,18 @@ var cmdsAddCmd = &cobra.Command{
 	Short: "Add a command to run on a specific event",
 	Long:  `Add a command to run on a specific event.`,
 	Args:  cobra.MinimumNArgs(2),
-	RunE: withStore(func(_ *cobra.Command, args []string, st *store) error {
-		s, err := st.Settings.Get()
+	RunE: python(func(_ *cobra.Command, args []string, d *pythonData) error {
+		s, err := d.store.Settings.Get()
 		if err != nil {
 			return err
 		}
 		command := strings.Join(args[1:], " ")
 		s.Commands[args[0]] = append(s.Commands[args[0]], command)
-		err = st.Settings.Save(s)
+		err = d.store.Settings.Save(s)
 		if err != nil {
 			return err
 		}
 		printEvents(s.Commands)
 		return nil
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/cmds_ls.go

@@ -14,13 +14,12 @@ var cmdsLsCmd = &cobra.Command{
 	Short: "List all commands for each event",
 	Long:  `List all commands for each event.`,
 	Args:  cobra.NoArgs,
-	RunE: withStore(func(cmd *cobra.Command, _ []string, st *store) error {
-		s, err := st.Settings.Get()
+	RunE: python(func(cmd *cobra.Command, _ []string, d *pythonData) error {
+		s, err := d.store.Settings.Get()
 		if err != nil {
 			return err
 		}
-
-		evt, err := cmd.Flags().GetString("event")
+		evt, err := getString(cmd.Flags(), "event")
 		if err != nil {
 			return err
 		}
@@ -33,7 +32,6 @@ var cmdsLsCmd = &cobra.Command{
 			show["after_"+evt] = s.Commands["after_"+evt]
 			printEvents(show)
 		}
-
 		return nil
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/cmds_rm.go

@@ -35,8 +35,8 @@ including 'index_end'.`,
 
 		return nil
 	},
-	RunE: withStore(func(_ *cobra.Command, args []string, st *store) error {
-		s, err := st.Settings.Get()
+	RunE: python(func(_ *cobra.Command, args []string, d *pythonData) error {
+		s, err := d.store.Settings.Get()
 		if err != nil {
 			return err
 		}
@@ -55,11 +55,11 @@ including 'index_end'.`,
 		}
 
 		s.Commands[evt] = append(s.Commands[evt][:i], s.Commands[evt][f+1:]...)
-		err = st.Settings.Save(s)
+		err = d.store.Settings.Save(s)
 		if err != nil {
 			return err
 		}
 		printEvents(s.Commands)
 		return nil
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/config.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"encoding/json"
-	"errors"
+	nerrors "errors"
 	"fmt"
 	"os"
 	"strings"
@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/pflag"
 
 	"github.com/filebrowser/filebrowser/v2/auth"
-	fberrors "github.com/filebrowser/filebrowser/v2/errors"
+	"github.com/filebrowser/filebrowser/v2/errors"
 	"github.com/filebrowser/filebrowser/v2/settings"
 )
 
@@ -30,22 +30,14 @@ var configCmd = &cobra.Command{
 func addConfigFlags(flags *pflag.FlagSet) {
 	addServerFlags(flags)
 	addUserFlags(flags)
-
 	flags.BoolP("signup", "s", false, "allow users to signup")
-	flags.Bool("hideLoginButton", false, "hide login button from public pages")
-	flags.Bool("createUserDir", false, "generate user's home directory automatically")
-	flags.Uint("minimumPasswordLength", settings.DefaultMinimumPasswordLength, "minimum password length for new users")
+	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")
 
-	// NB: these are string so they can be presented as octal in the help text
-	// as that's the conventional representation for modes in Unix.
-	flags.String("fileMode", fmt.Sprintf("%O", settings.DefaultFileMode), "mode bits that new files are created with")
-	flags.String("dirMode", fmt.Sprintf("%O", settings.DefaultDirMode), "mode bits that new directories are created with")
-
 	flags.String("auth.method", string(auth.MethodJSONAuth), "authentication type")
 	flags.String("auth.header", "", "HTTP header for auth.method=proxy")
 	flags.String("auth.command", "", "command for auth.method=hook")
-	flags.String("auth.logoutPage", "", "url of custom logout page")
 
 	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")
@@ -57,13 +49,14 @@ func addConfigFlags(flags *pflag.FlagSet) {
 	flags.String("branding.files", "", "path to directory with images and custom styles")
 	flags.Bool("branding.disableExternal", false, "disable external links such as GitHub links")
 	flags.Bool("branding.disableUsedPercentage", false, "disable used disk percentage graph")
-
-	flags.Uint64("tus.chunkSize", settings.DefaultTusChunkSize, "the tus chunk size")
-	flags.Uint16("tus.retryCount", settings.DefaultTusRetryCount, "the tus retry count")
+	// NB: these are string so they can be presented as octal in the help text
+	// as that's the conventional representation for modes in Unix.
+	flags.String("file-mode", fmt.Sprintf("%O", settings.DefaultFileMode), "Mode bits that new files are created with")
+	flags.String("dir-mode", fmt.Sprintf("%O", settings.DefaultDirMode), "Mode bits that new directories are created with")
 }
 
 func getAuthMethod(flags *pflag.FlagSet, defaults ...interface{}) (settings.AuthMethod, map[string]interface{}, error) {
-	methodStr, err := flags.GetString("auth.method")
+	methodStr, err := getString(flags, "auth.method")
 	if err != nil {
 		return "", nil, err
 	}
@@ -94,17 +87,17 @@ func getAuthMethod(flags *pflag.FlagSet, defaults ...interface{}) (settings.Auth
 }
 
 func getProxyAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (auth.Auther, error) {
-	header, err := flags.GetString("auth.header")
+	header, err := getString(flags, "auth.header")
 	if err != nil {
 		return nil, err
 	}
 
-	if header == "" && defaultAuther != nil {
+	if header == "" {
 		header = defaultAuther["header"].(string)
 	}
 
 	if header == "" {
-		return nil, errors.New("you must set the flag 'auth.header' for method 'proxy'")
+		return nil, nerrors.New("you must set the flag 'auth.header' for method 'proxy'")
 	}
 
 	return &auth.ProxyAuth{Header: header}, nil
@@ -116,17 +109,15 @@ func getNoAuth() auth.Auther {
 
 func getJSONAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (auth.Auther, error) {
 	jsonAuth := &auth.JSONAuth{}
-	host, err := flags.GetString("recaptcha.host")
+	host, err := getString(flags, "recaptcha.host")
 	if err != nil {
 		return nil, err
 	}
-
-	key, err := flags.GetString("recaptcha.key")
+	key, err := getString(flags, "recaptcha.key")
 	if err != nil {
 		return nil, err
 	}
-
-	secret, err := flags.GetString("recaptcha.secret")
+	secret, err := getString(flags, "recaptcha.secret")
 	if err != nil {
 		return nil, err
 	}
@@ -154,16 +145,17 @@ func getJSONAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (au
 }
 
 func getHookAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (auth.Auther, error) {
-	command, err := flags.GetString("auth.command")
+	command, err := getString(flags, "auth.command")
 	if err != nil {
 		return nil, err
 	}
+
 	if command == "" {
 		command = defaultAuther["command"].(string)
 	}
 
 	if command == "" {
-		return nil, errors.New("you must set the flag 'auth.command' for method 'hook'")
+		return nil, nerrors.New("you must set the flag 'auth.command' for method 'hook'")
 	}
 
 	return &auth.HookAuth{Command: command}, nil
@@ -186,7 +178,7 @@ func getAuthentication(flags *pflag.FlagSet, defaults ...interface{}) (settings.
 	case auth.MethodHookAuth:
 		auther, err = getHookAuth(flags, defaultAuther)
 	default:
-		return "", nil, fberrors.ErrInvalidAuthMethod
+		return "", nil, errors.ErrInvalidAuthMethod
 	}
 
 	if err != nil {
@@ -200,13 +192,10 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 
 	fmt.Fprintf(w, "Sign up:\t%t\n", set.Signup)
-	fmt.Fprintf(w, "Hide Login Button:\t%t\n", set.HideLoginButton)
 	fmt.Fprintf(w, "Create User Dir:\t%t\n", set.CreateUserDir)
-	fmt.Fprintf(w, "Logout Page:\t%s\n", set.LogoutPage)
 	fmt.Fprintf(w, "Minimum Password Length:\t%d\n", set.MinimumPasswordLength)
-	fmt.Fprintf(w, "Auth Method:\t%s\n", set.AuthMethod)
+	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:")
 	fmt.Fprintf(w, "\tName:\t%s\n", set.Branding.Name)
 	fmt.Fprintf(w, "\tFiles override:\t%s\n", set.Branding.Files)
@@ -214,7 +203,6 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut
 	fmt.Fprintf(w, "\tDisable used disk percentage graph:\t%t\n", set.Branding.DisableUsedPercentage)
 	fmt.Fprintf(w, "\tColor:\t%s\n", set.Branding.Color)
 	fmt.Fprintf(w, "\tTheme:\t%s\n", set.Branding.Theme)
-
 	fmt.Fprintln(w, "\nServer:")
 	fmt.Fprintf(w, "\tLog:\t%s\n", ser.Log)
 	fmt.Fprintf(w, "\tPort:\t%s\n", ser.Port)
@@ -224,34 +212,19 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut
 	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, "\tToken Expiration Time:\t%s\n", ser.TokenExpirationTime)
 	fmt.Fprintf(w, "\tExec Enabled:\t%t\n", ser.EnableExec)
-	fmt.Fprintf(w, "\tThumbnails Enabled:\t%t\n", ser.EnableThumbnails)
-	fmt.Fprintf(w, "\tResize Preview:\t%t\n", ser.ResizePreview)
-	fmt.Fprintf(w, "\tType Detection by Header:\t%t\n", ser.TypeDetectionByHeader)
-	fmt.Fprintf(w, "\tFollow External Symlinks:\t%t\n", ser.FollowExternalSymlinks)
-
-	fmt.Fprintln(w, "\nTUS:")
-	fmt.Fprintf(w, "\tChunk size:\t%d\n", set.Tus.ChunkSize)
-	fmt.Fprintf(w, "\tRetry count:\t%d\n", set.Tus.RetryCount)
-
 	fmt.Fprintln(w, "\nDefaults:")
 	fmt.Fprintf(w, "\tScope:\t%s\n", set.Defaults.Scope)
-	fmt.Fprintf(w, "\tDateFormat:\t%t\n", set.Defaults.DateFormat)
-	fmt.Fprintf(w, "\tHideDotfiles:\t%t\n", set.Defaults.HideDotfiles)
 	fmt.Fprintf(w, "\tLocale:\t%s\n", set.Defaults.Locale)
 	fmt.Fprintf(w, "\tView mode:\t%s\n", set.Defaults.ViewMode)
 	fmt.Fprintf(w, "\tSingle Click:\t%t\n", set.Defaults.SingleClick)
-	fmt.Fprintf(w, "\tRedirect after Copy/Move:\t%t\n", set.Defaults.RedirectAfterCopyMove)
 	fmt.Fprintf(w, "\tFile Creation Mode:\t%O\n", set.FileMode)
 	fmt.Fprintf(w, "\tDirectory Creation Mode:\t%O\n", set.DirMode)
 	fmt.Fprintf(w, "\tCommands:\t%s\n", strings.Join(set.Defaults.Commands, " "))
 	fmt.Fprintf(w, "\tAce editor syntax highlighting theme:\t%s\n", set.Defaults.AceEditorTheme)
-
 	fmt.Fprintf(w, "\tSorting:\n")
 	fmt.Fprintf(w, "\t\tBy:\t%s\n", set.Defaults.Sorting.By)
 	fmt.Fprintf(w, "\t\tAsc:\t%t\n", set.Defaults.Sorting.Asc)
-
 	fmt.Fprintf(w, "\tPermissions:\n")
 	fmt.Fprintf(w, "\t\tAdmin:\t%t\n", set.Defaults.Perm.Admin)
 	fmt.Fprintf(w, "\t\tExecute:\t%t\n", set.Defaults.Perm.Execute)
@@ -261,7 +234,6 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut
 	fmt.Fprintf(w, "\t\tDelete:\t%t\n", set.Defaults.Perm.Delete)
 	fmt.Fprintf(w, "\t\tShare:\t%t\n", set.Defaults.Perm.Share)
 	fmt.Fprintf(w, "\t\tDownload:\t%t\n", set.Defaults.Perm.Download)
-
 	w.Flush()
 
 	b, err := json.MarshalIndent(auther, "", "  ")
@@ -271,123 +243,3 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut
 	fmt.Printf("\nAuther configuration (raw):\n\n%s\n\n", string(b))
 	return nil
 }
-
-func getSettings(flags *pflag.FlagSet, set *settings.Settings, ser *settings.Server, auther auth.Auther, all bool) (auth.Auther, error) {
-	errs := []error{}
-	hasAuth := false
-
-	visit := func(flag *pflag.Flag) {
-		var err error
-
-		switch flag.Name {
-		// Server flags from [addServerFlags]
-		case "address":
-			ser.Address, err = flags.GetString(flag.Name)
-		case "log":
-			ser.Log, err = flags.GetString(flag.Name)
-		case "port":
-			ser.Port, err = flags.GetString(flag.Name)
-		case "cert":
-			ser.TLSCert, err = flags.GetString(flag.Name)
-		case "key":
-			ser.TLSKey, err = flags.GetString(flag.Name)
-		case "root":
-			ser.Root, err = flags.GetString(flag.Name)
-		case "socket":
-			ser.Socket, err = flags.GetString(flag.Name)
-		case "baseURL":
-			ser.BaseURL, err = flags.GetString(flag.Name)
-		case "tokenExpirationTime":
-			ser.TokenExpirationTime, err = flags.GetString(flag.Name)
-		case "disableThumbnails":
-			ser.EnableThumbnails, err = flags.GetBool(flag.Name)
-			ser.EnableThumbnails = !ser.EnableThumbnails
-		case "disablePreviewResize":
-			ser.ResizePreview, err = flags.GetBool(flag.Name)
-			ser.ResizePreview = !ser.ResizePreview
-		case "disableExec":
-			ser.EnableExec, err = flags.GetBool(flag.Name)
-			ser.EnableExec = !ser.EnableExec
-		case "disableTypeDetectionByHeader":
-			ser.TypeDetectionByHeader, err = flags.GetBool(flag.Name)
-			ser.TypeDetectionByHeader = !ser.TypeDetectionByHeader
-		case "disableImageResolutionCalc":
-			ser.ImageResolutionCal, err = flags.GetBool(flag.Name)
-			ser.ImageResolutionCal = !ser.ImageResolutionCal
-
-		// Settings flags from [addConfigFlags]
-		case "signup":
-			set.Signup, err = flags.GetBool(flag.Name)
-		case "hideLoginButton":
-			set.HideLoginButton, err = flags.GetBool(flag.Name)
-		case "createUserDir":
-			set.CreateUserDir, err = flags.GetBool(flag.Name)
-		case "minimumPasswordLength":
-			set.MinimumPasswordLength, err = flags.GetUint(flag.Name)
-		case "shell":
-			var shell string
-			shell, err = flags.GetString(flag.Name)
-			if err == nil {
-				set.Shell = convertCmdStrToCmdArray(shell)
-			}
-		case "fileMode":
-			set.FileMode, err = getAndParseFileMode(flags, flag.Name)
-		case "dirMode":
-			set.DirMode, err = getAndParseFileMode(flags, flag.Name)
-		case "auth.method":
-			hasAuth = true
-		case "auth.logoutPage":
-			set.LogoutPage, err = flags.GetString(flag.Name)
-		case "branding.name":
-			set.Branding.Name, err = flags.GetString(flag.Name)
-		case "branding.theme":
-			set.Branding.Theme, err = flags.GetString(flag.Name)
-		case "branding.color":
-			set.Branding.Color, err = flags.GetString(flag.Name)
-		case "branding.files":
-			set.Branding.Files, err = flags.GetString(flag.Name)
-		case "branding.disableExternal":
-			set.Branding.DisableExternal, err = flags.GetBool(flag.Name)
-		case "branding.disableUsedPercentage":
-			set.Branding.DisableUsedPercentage, err = flags.GetBool(flag.Name)
-		case "tus.chunkSize":
-			set.Tus.ChunkSize, err = flags.GetUint64(flag.Name)
-		case "tus.retryCount":
-			set.Tus.RetryCount, err = flags.GetUint16(flag.Name)
-		}
-
-		if err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	if all {
-		flags.VisitAll(visit)
-	} else {
-		flags.Visit(visit)
-	}
-
-	err := errors.Join(errs...)
-	if err != nil {
-		return nil, err
-	}
-
-	err = getUserDefaults(flags, &set.Defaults, all)
-	if err != nil {
-		return nil, err
-	}
-
-	if all {
-		set.AuthMethod, auther, err = getAuthentication(flags)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		set.AuthMethod, auther, err = getAuthentication(flags, hasAuth, set, auther)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return auther, nil
-}

cmd/config_cat.go

@@ -13,19 +13,19 @@ var configCatCmd = &cobra.Command{
 	Short: "Prints the configuration",
 	Long:  `Prints the configuration.`,
 	Args:  cobra.NoArgs,
-	RunE: withStore(func(_ *cobra.Command, _ []string, st *store) error {
-		set, err := st.Settings.Get()
+	RunE: python(func(_ *cobra.Command, _ []string, d *pythonData) error {
+		set, err := d.store.Settings.Get()
 		if err != nil {
 			return err
 		}
-		ser, err := st.Settings.GetServer()
+		ser, err := d.store.Settings.GetServer()
 		if err != nil {
 			return err
 		}
-		auther, err := st.Auth.Get(set.AuthMethod)
+		auther, err := d.store.Auth.Get(set.AuthMethod)
 		if err != nil {
 			return err
 		}
 		return printSettings(ser, set, auther)
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/config_export.go

@@ -15,18 +15,18 @@ var configExportCmd = &cobra.Command{
 json or yaml file. This exported configuration can be changed,
 and imported again with 'config import' command.`,
 	Args: jsonYamlArg,
-	RunE: withStore(func(_ *cobra.Command, args []string, st *store) error {
-		settings, err := st.Settings.Get()
+	RunE: python(func(_ *cobra.Command, args []string, d *pythonData) error {
+		settings, err := d.store.Settings.Get()
 		if err != nil {
 			return err
 		}
 
-		server, err := st.Settings.GetServer()
+		server, err := d.store.Settings.GetServer()
 		if err != nil {
 			return err
 		}
 
-		auther, err := st.Auth.Get(settings.AuthMethod)
+		auther, err := d.store.Auth.Get(settings.AuthMethod)
 		if err != nil {
 			return err
 		}
@@ -42,5 +42,5 @@ and imported again with 'config import' command.`,
 			return err
 		}
 		return nil
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/config_import.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"encoding/json"
 	"errors"
+	"path/filepath"
 	"reflect"
 
 	"github.com/spf13/cobra"
@@ -33,11 +34,11 @@ database.
 
 The path must be for a json or yaml file.`,
 	Args: jsonYamlArg,
-	RunE: withStore(func(_ *cobra.Command, args []string, st *store) error {
+	RunE: python(func(_ *cobra.Command, args []string, d *pythonData) error {
 		var key []byte
 		var err error
-		if st.databaseExisted {
-			settings, settingErr := st.Settings.Get()
+		if d.hadDB {
+			settings, settingErr := d.store.Settings.Get()
 			if settingErr != nil {
 				return settingErr
 			}
@@ -52,22 +53,23 @@ The path must be for a json or yaml file.`,
 			return err
 		}
 
-		if file.Settings == nil || file.Server == nil {
-			return errors.New("invalid configuration file: 'settings' or 'server' fields are missing. Please ensure you are importing a file generated by the 'config export' command")
-		}
-
 		file.Settings.Key = key
-		err = st.Settings.Save(file.Settings)
+		err = d.store.Settings.Save(file.Settings)
 		if err != nil {
 			return err
 		}
 
-		err = st.Settings.SaveServer(file.Server)
+		err = d.store.Settings.SaveServer(file.Server)
 		if err != nil {
 			return err
 		}
 
-		var rawAuther = file.Auther
+		var rawAuther interface{}
+		if filepath.Ext(args[0]) != ".json" {
+			rawAuther = cleanUpInterfaceMap(file.Auther.(map[interface{}]interface{}))
+		} else {
+			rawAuther = file.Auther
+		}
 
 		var auther auth.Auther
 		var autherErr error
@@ -96,13 +98,13 @@ The path must be for a json or yaml file.`,
 			return autherErr
 		}
 
-		err = st.Auth.Save(auther)
+		err = d.store.Auth.Save(auther)
 		if err != nil {
 			return err
 		}
 
 		return printSettings(file.Server, file.Settings, auther)
-	}, storeOptions{allowsNoDatabase: true}),
+	}, pythonConfig{allowNoDB: true}),
 }
 
 func getAuther(sample auth.Auther, data interface{}) (interface{}, error) {

cmd/config_init.go

@@ -22,31 +22,152 @@ this options can be changed in the future with the command
 to the defaults when creating new users and you don't
 override the options.`,
 	Args: cobra.NoArgs,
-	RunE: withStore(func(cmd *cobra.Command, _ []string, st *store) error {
+	RunE: python(func(cmd *cobra.Command, _ []string, d *pythonData) error {
+		defaults := settings.UserDefaults{}
 		flags := cmd.Flags()
-
-		// Initialize config
-		s := &settings.Settings{Key: generateKey()}
-		ser := &settings.Server{}
-
-		// Fill config with options
-		auther, err := getSettings(flags, s, ser, nil, true)
+		err := getUserDefaults(flags, &defaults, true)
+		if err != nil {
+			return err
+		}
+		authMethod, auther, err := getAuthentication(flags)
 		if err != nil {
 			return err
 		}
 
-		// Save updated config
-		err = st.Settings.Save(s)
+		key := generateKey()
+
+		signup, err := getBool(flags, "signup")
 		if err != nil {
 			return err
 		}
 
-		err = st.Settings.SaveServer(ser)
+		createUserDir, err := getBool(flags, "create-user-dir")
 		if err != nil {
 			return err
 		}
 
-		err = st.Auth.Save(auther)
+		minLength, err := getUint(flags, "minimum-password-length")
+		if err != nil {
+			return err
+		}
+
+		shell, err := getString(flags, "shell")
+		if err != nil {
+			return err
+		}
+
+		brandingName, err := getString(flags, "branding.name")
+		if err != nil {
+			return err
+		}
+
+		brandingDisableExternal, err := getBool(flags, "branding.disableExternal")
+		if err != nil {
+			return err
+		}
+
+		brandingDisableUsedPercentage, err := getBool(flags, "branding.disableUsedPercentage")
+		if err != nil {
+			return err
+		}
+
+		brandingTheme, err := getString(flags, "branding.theme")
+		if err != nil {
+			return err
+		}
+
+		brandingFiles, err := getString(flags, "branding.files")
+		if err != nil {
+			return err
+		}
+
+		s := &settings.Settings{
+			Key:                   key,
+			Signup:                signup,
+			CreateUserDir:         createUserDir,
+			MinimumPasswordLength: minLength,
+			Shell:                 convertCmdStrToCmdArray(shell),
+			AuthMethod:            authMethod,
+			Defaults:              defaults,
+			Branding: settings.Branding{
+				Name:                  brandingName,
+				DisableExternal:       brandingDisableExternal,
+				DisableUsedPercentage: brandingDisableUsedPercentage,
+				Theme:                 brandingTheme,
+				Files:                 brandingFiles,
+			},
+		}
+
+		s.FileMode, err = getMode(flags, "file-mode")
+		if err != nil {
+			return err
+		}
+
+		s.DirMode, err = getMode(flags, "dir-mode")
+		if err != nil {
+			return err
+		}
+
+		address, err := getString(flags, "address")
+		if err != nil {
+			return err
+		}
+
+		socket, err := getString(flags, "socket")
+		if err != nil {
+			return err
+		}
+
+		root, err := getString(flags, "root")
+		if err != nil {
+			return err
+		}
+
+		baseURL, err := getString(flags, "baseurl")
+		if err != nil {
+			return err
+		}
+
+		tlsKey, err := getString(flags, "key")
+		if err != nil {
+			return err
+		}
+
+		cert, err := getString(flags, "cert")
+		if err != nil {
+			return err
+		}
+
+		port, err := getString(flags, "port")
+		if err != nil {
+			return err
+		}
+
+		log, err := getString(flags, "log")
+		if err != nil {
+			return err
+		}
+
+		ser := &settings.Server{
+			Address: address,
+			Socket:  socket,
+			Root:    root,
+			BaseURL: baseURL,
+			TLSKey:  tlsKey,
+			TLSCert: cert,
+			Port:    port,
+			Log:     log,
+		}
+
+		err = d.store.Settings.Save(s)
+		if err != nil {
+			return err
+		}
+		err = d.store.Settings.SaveServer(ser)
+		if err != nil {
+			return err
+		}
+		err = d.store.Auth.Save(auther)
 		if err != nil {
 			return err
 		}
@@ -57,5 +178,5 @@ Now add your first user via 'filebrowser users add' and then you just
 need to call the main command to boot up the server.
 `)
 		return printSettings(ser, s, auther)
-	}, storeOptions{expectsNoDatabase: true}),
+	}, pythonConfig{noDB: true}),
 }

cmd/config_set.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 func init() {
@@ -15,47 +16,105 @@ var configSetCmd = &cobra.Command{
 	Long: `Updates the configuration. Set the flags for the options
 you want to change. Other options will remain unchanged.`,
 	Args: cobra.NoArgs,
-	RunE: withStore(func(cmd *cobra.Command, _ []string, st *store) error {
+	RunE: python(func(cmd *cobra.Command, _ []string, d *pythonData) error {
 		flags := cmd.Flags()
-
-		// Read existing config
-		set, err := st.Settings.Get()
+		set, err := d.store.Settings.Get()
 		if err != nil {
 			return err
 		}
 
-		ser, err := st.Settings.GetServer()
+		ser, err := d.store.Settings.GetServer()
 		if err != nil {
 			return err
 		}
 
-		auther, err := st.Auth.Get(set.AuthMethod)
+		hasAuth := false
+		flags.Visit(func(flag *pflag.Flag) {
+			if err != nil {
+				return
+			}
+			switch flag.Name {
+			case "baseurl":
+				ser.BaseURL, err = getString(flags, flag.Name)
+			case "root":
+				ser.Root, err = getString(flags, flag.Name)
+			case "socket":
+				ser.Socket, err = getString(flags, flag.Name)
+			case "cert":
+				ser.TLSCert, err = getString(flags, flag.Name)
+			case "key":
+				ser.TLSKey, err = getString(flags, flag.Name)
+			case "address":
+				ser.Address, err = getString(flags, flag.Name)
+			case "port":
+				ser.Port, err = getString(flags, flag.Name)
+			case "log":
+				ser.Log, err = getString(flags, flag.Name)
+			case "signup":
+				set.Signup, err = getBool(flags, flag.Name)
+			case "auth.method":
+				hasAuth = true
+			case "shell":
+				var shell string
+				shell, err = getString(flags, flag.Name)
+				set.Shell = convertCmdStrToCmdArray(shell)
+			case "create-user-dir":
+				set.CreateUserDir, err = getBool(flags, flag.Name)
+			case "minimum-password-length":
+				set.MinimumPasswordLength, err = getUint(flags, flag.Name)
+			case "branding.name":
+				set.Branding.Name, err = getString(flags, flag.Name)
+			case "branding.color":
+				set.Branding.Color, err = getString(flags, flag.Name)
+			case "branding.theme":
+				set.Branding.Theme, err = getString(flags, flag.Name)
+			case "branding.disableExternal":
+				set.Branding.DisableExternal, err = getBool(flags, flag.Name)
+			case "branding.disableUsedPercentage":
+				set.Branding.DisableUsedPercentage, err = getBool(flags, flag.Name)
+			case "branding.files":
+				set.Branding.Files, err = getString(flags, flag.Name)
+			case "file-mode":
+				set.FileMode, err = getMode(flags, flag.Name)
+			case "dir-mode":
+				set.DirMode, err = getMode(flags, flag.Name)
+			}
+		})
+
 		if err != nil {
 			return err
 		}
 
-		// Get updated config
-		auther, err = getSettings(flags, set, ser, auther, false)
+		err = getUserDefaults(flags, &set.Defaults, false)
 		if err != nil {
 			return err
 		}
 
-		// Save updated config
-		err = st.Auth.Save(auther)
+		// read the defaults
+		auther, err := d.store.Auth.Get(set.AuthMethod)
 		if err != nil {
 			return err
 		}
 
-		err = st.Settings.Save(set)
+		// check if there are new flags for existing auth method
+		set.AuthMethod, auther, err = getAuthentication(flags, hasAuth, set, auther)
 		if err != nil {
 			return err
 		}
 
-		err = st.Settings.SaveServer(ser)
+		err = d.store.Auth.Save(auther)
+		if err != nil {
+			return err
+		}
+		err = d.store.Settings.Save(set)
+		if err != nil {
+			return err
+		}
+		err = d.store.Settings.SaveServer(ser)
 		if err != nil {
 			return err
 		}
 
 		return printSettings(ser, set, auther)
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/docs.go

@@ -3,18 +3,36 @@ package cmd
 import (
 	"bytes"
 	"fmt"
+	"io"
 	"os"
-	"path"
-	"regexp"
+	"path/filepath"
+	"sort"
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/cobra/doc"
+	"github.com/spf13/pflag"
 )
 
 func init() {
 	rootCmd.AddCommand(docsCmd)
-	docsCmd.Flags().String("out", "www/docs/cli", "directory to write the docs to")
+	docsCmd.Flags().StringP("path", "p", "./docs", "path to save the docs")
+}
+
+func printToc(names []string) {
+	for i, name := range names {
+		name = strings.TrimSuffix(name, filepath.Ext(name))
+		name = strings.Replace(name, "-", " ", -1)
+		names[i] = name
+	}
+
+	sort.Strings(names)
+
+	toc := ""
+	for _, name := range names {
+		toc += "* [" + name + "](cli/" + strings.Replace(name, " ", "-", -1) + ".md)\n"
+	}
+
+	fmt.Println(toc)
 }
 
 var docsCmd = &cobra.Command{
@@ -22,61 +40,115 @@ var docsCmd = &cobra.Command{
 	Hidden: true,
 	Args:   cobra.NoArgs,
 	RunE: func(cmd *cobra.Command, _ []string) error {
-		outputDir, err := cmd.Flags().GetString("out")
+		dir, err := getString(cmd.Flags(), "path")
 		if err != nil {
 			return err
 		}
 
-		tempDir, err := os.MkdirTemp(os.TempDir(), "filebrowser-docs-")
+		err = generateDocs(rootCmd, dir)
 		if err != nil {
 			return err
 		}
-		defer os.RemoveAll(tempDir)
+		names := []string{}
 
-		rootCmd.Root().DisableAutoGenTag = true
+		err = filepath.Walk(dir, func(_ string, info os.FileInfo, err error) error {
+			if err != nil || info.IsDir() {
+				return err
+			}
 
-		err = doc.GenMarkdownTreeCustom(cmd.Root(), tempDir, func(_ string) string {
-			return ""
-		}, func(s string) string {
-			return s
+			if !strings.HasPrefix(info.Name(), "filebrowser") {
+				return nil
+			}
+
+			names = append(names, info.Name())
+			return nil
 		})
 		if err != nil {
 			return err
 		}
 
-		entries, err := os.ReadDir(tempDir)
-		if err != nil {
-			return err
-		}
-
-		headerRegex := regexp.MustCompile(`(?m)^(##)(.*)$`)
-		linkRegex := regexp.MustCompile(`\(filebrowser(.*)\.md\)`)
-
-		fmt.Println("Generated Documents:")
-
-		for _, entry := range entries {
-			srcPath := path.Join(tempDir, entry.Name())
-			dstPath := path.Join(outputDir, strings.ReplaceAll(entry.Name(), "_", "-"))
-
-			data, err := os.ReadFile(srcPath)
-			if err != nil {
-				return err
-			}
-
-			data = headerRegex.ReplaceAll(data, []byte("#$2"))
-			data = linkRegex.ReplaceAllFunc(data, func(b []byte) []byte {
-				return bytes.ReplaceAll(b, []byte("_"), []byte("-"))
-			})
-			data = bytes.ReplaceAll(data, []byte("## SEE ALSO"), []byte("## See Also"))
-
-			err = os.WriteFile(dstPath, data, 0666)
-			if err != nil {
-				return err
-			}
-
-			fmt.Println("- " + dstPath)
-		}
-
+		printToc(names)
 		return nil
 	},
 }
+
+func generateDocs(cmd *cobra.Command, dir string) error {
+	for _, c := range cmd.Commands() {
+		if !c.IsAvailableCommand() || c.IsAdditionalHelpTopicCommand() {
+			continue
+		}
+
+		err := generateDocs(c, dir)
+		if err != nil {
+			return err
+		}
+	}
+
+	basename := strings.Replace(cmd.CommandPath(), " ", "-", -1) + ".md"
+	filename := filepath.Join(dir, basename)
+	f, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	return generateMarkdown(cmd, f)
+}
+
+func generateMarkdown(cmd *cobra.Command, w io.Writer) error {
+	cmd.InitDefaultHelpCmd()
+	cmd.InitDefaultHelpFlag()
+
+	buf := new(bytes.Buffer)
+	name := cmd.CommandPath()
+
+	short := cmd.Short
+	long := cmd.Long
+	if long == "" {
+		long = short
+	}
+
+	buf.WriteString("---\ndescription: " + short + "\n---\n\n")
+	buf.WriteString("# " + name + "\n\n")
+	buf.WriteString("## Synopsis\n\n")
+	buf.WriteString(long + "\n\n")
+
+	if cmd.Runnable() {
+		_, _ = fmt.Fprintf(buf, "```\n%s\n```\n\n", cmd.UseLine())
+	}
+
+	if cmd.Example != "" {
+		buf.WriteString("## Examples\n\n")
+		_, _ = fmt.Fprintf(buf, "```\n%s\n```\n\n", cmd.Example)
+	}
+
+	printOptions(buf, cmd)
+	_, err := buf.WriteTo(w)
+	return err
+}
+
+func generateFlagsTable(fs *pflag.FlagSet, buf io.StringWriter) {
+	_, _ = buf.WriteString("| Name | Shorthand | Usage |\n")
+	_, _ = buf.WriteString("|------|-----------|-------|\n")
+
+	fs.VisitAll(func(f *pflag.Flag) {
+		_, _ = buf.WriteString("|" + f.Name + "|" + f.Shorthand + "|" + f.Usage + "|\n")
+	})
+}
+
+func printOptions(buf *bytes.Buffer, cmd *cobra.Command) {
+	flags := cmd.NonInheritedFlags()
+	flags.SetOutput(buf)
+	if flags.HasAvailableFlags() {
+		buf.WriteString("## Options\n\n")
+		generateFlagsTable(flags, buf)
+		buf.WriteString("\n")
+	}
+
+	parentFlags := cmd.InheritedFlags()
+	parentFlags.SetOutput(buf)
+	if parentFlags.HasAvailableFlags() {
+		buf.WriteString("### Inherited\n\n")
+		generateFlagsTable(parentFlags, buf)
+		buf.WriteString("\n")
+	}
+}

cmd/root.go

@@ -17,14 +17,16 @@ import (
 	"syscall"
 	"time"
 
+	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
+	v "github.com/spf13/viper"
 	lumberjack "gopkg.in/natefinch/lumberjack.v2"
 
 	"github.com/filebrowser/filebrowser/v2/auth"
 	"github.com/filebrowser/filebrowser/v2/diskcache"
+	fbErrors "github.com/filebrowser/filebrowser/v2/errors"
 	"github.com/filebrowser/filebrowser/v2/frontend"
 	fbhttp "github.com/filebrowser/filebrowser/v2/http"
 	"github.com/filebrowser/filebrowser/v2/img"
@@ -34,69 +36,28 @@ import (
 )
 
 var (
-	flagNamesMigrations = map[string]string{
-		"file-mode":                        "fileMode",
-		"dir-mode":                         "dirMode",
-		"hide-login-button":                "hideLoginButton",
-		"create-user-dir":                  "createUserDir",
-		"minimum-password-length":          "minimumPasswordLength",
-		"socket-perm":                      "socketPerm",
-		"disable-thumbnails":               "disableThumbnails",
-		"disable-preview-resize":           "disablePreviewResize",
-		"disable-exec":                     "disableExec",
-		"disable-type-detection-by-header": "disableTypeDetectionByHeader",
-		"img-processors":                   "imageProcessors",
-		"cache-dir":                        "cacheDir",
-		"redis-cache-url":                  "redisCacheUrl",
-		"token-expiration-time":            "tokenExpirationTime",
-		"baseurl":                          "baseURL",
-	}
-
-	warnedFlags = map[string]bool{}
+	cfgFile string
 )
 
-// TODO(remove): remove after July 2026.
-func migrateFlagNames(_ *pflag.FlagSet, name string) pflag.NormalizedName {
-	if newName, ok := flagNamesMigrations[name]; ok {
-
-		if !warnedFlags[name] {
-			warnedFlags[name] = true
-			log.Printf("DEPRECATION NOTICE: Flag --%s has been deprecated, use --%s instead\n", name, newName)
-		}
-
-		name = newName
-	}
-
-	return pflag.NormalizedName(name)
-}
-
 func init() {
+	cobra.OnInitialize(initConfig)
 	rootCmd.SilenceUsage = true
-	rootCmd.SetGlobalNormalizationFunc(migrateFlagNames)
-
 	cobra.MousetrapHelpText = ""
 
 	rootCmd.SetVersionTemplate("File Browser version {{printf \"%s\" .Version}}\n")
 
-	// Flags available across the whole program
-	persistent := rootCmd.PersistentFlags()
-	persistent.StringP("config", "c", "", "config file path")
-	persistent.StringP("database", "d", "./filebrowser.db", "database path")
-
-	// Runtime flags for the root command
 	flags := rootCmd.Flags()
+	persistent := rootCmd.PersistentFlags()
+
+	persistent.StringVarP(&cfgFile, "config", "c", "", "config file path")
+	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 setup")
-	flags.String("password", "", "hashed password for the first user when using quick setup")
-	flags.Uint32("socketPerm", 0666, "unix socket file permissions")
-	flags.String("cacheDir", "", "file cache directory (disabled if empty)")
-	flags.String("redisCacheUrl", "", "redis cache URL (for multi-instance deployments), e.g. redis://user:pass@host:port")
-	flags.Int("imageProcessors", 4, "image processors count")
+	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")
+
 	addServerFlags(flags)
 }
 
-// addServerFlags adds server related flags to the given FlagSet. These flags are available
-// in both the root command, config set and config init commands.
 func addServerFlags(flags *pflag.FlagSet) {
 	flags.StringP("address", "a", "127.0.0.1", "address to listen on")
 	flags.StringP("log", "l", "stdout", "log output")
@@ -105,14 +66,15 @@ 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.StringP("baseURL", "b", "", "base url")
-	flags.String("tokenExpirationTime", "2h", "user session timeout")
-	flags.Bool("disableThumbnails", false, "disable image thumbnails")
-	flags.Bool("disablePreviewResize", false, "disable resize of image previews")
-	flags.Bool("disableExec", true, "disables Command Runner feature")
-	flags.Bool("disableTypeDetectionByHeader", false, "disables type detection by reading file headers")
-	flags.Bool("disableImageResolutionCalc", false, "disables image resolution calculation by reading image files")
-	flags.Bool("followExternalSymlinks", false, "follow symlinks whose target is outside the user scope (unsafe)")
+	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:mnd
+	flags.Bool("disable-thumbnails", false, "disable image thumbnails")
+	flags.Bool("disable-preview-resize", false, "disable resize of image previews")
+	flags.Bool("disable-exec", true, "disables Command Runner feature")
+	flags.Bool("disable-type-detection-by-header", false, "disables type detection by reading file headers")
 }
 
 var rootCmd = &cobra.Command{
@@ -127,66 +89,65 @@ it. Don't worry: you don't need to setup a separate database server.
 We're using Bolt DB which is a single file database and all managed
 by ourselves.
 
-For this command, all flags are available as environmental variables,
-except for "--config", which specifies the configuration file to use.
-The environment variables are prefixed by "FB_" followed by the flag name in
-UPPER_SNAKE_CASE. For example, the flag "--disablePreviewResize" is available
-as FB_DISABLE_PREVIEW_RESIZE.
+For this specific command, all the flags you have available (except
+"config" for the configuration file), can be given either through
+environment variables or configuration files.
 
-If "--config" is not specified, File Browser will look for a configuration
-file named .filebrowser.{json, toml, yaml, yml} in the following directories:
+If you don't set "config", it will look for a configuration file called
+.filebrowser.{json, toml, yaml, yml} in the following directories:
 
 - ./
 - $HOME/
 - /etc/filebrowser/
 
-**Note:** Only the options listed below can be set via the config file or
-environment variables. Other configuration options live exclusively in the
-database and so they must be set by the "config set" or "config
-import" commands.
-
 The precedence of the configuration values are as follows:
 
-- Flags
-- Environment variables
-- Configuration file
-- Database values
-- Defaults
+- flags
+- environment variables
+- configuration file
+- database values
+- defaults
+
+The environment variables are prefixed by "FB_" followed by the option
+name in caps. So to set "database" via an env variable, you should
+set FB_DATABASE.
 
 Also, if the database path doesn't exist, File Browser will enter into
 the quick setup mode and a new database will be bootstrapped and a new
 user created with the credentials from options "username" and "password".`,
-	RunE: withViperAndStore(func(_ *cobra.Command, _ []string, v *viper.Viper, st *store) error {
-		if !st.databaseExisted {
-			err := quickSetup(v, st.Storage)
+	RunE: python(func(cmd *cobra.Command, _ []string, d *pythonData) error {
+		log.Println(cfgFile)
+
+		if !d.hadDB {
+			err := quickSetup(cmd.Flags(), *d)
 			if err != nil {
 				return err
 			}
 		}
 
 		// build img service
-		imgWorkersCount := v.GetInt("imageProcessors")
-		if imgWorkersCount < 1 {
+		workersCount, err := cmd.Flags().GetInt("img-processors")
+		if err != nil {
+			return err
+		}
+		if workersCount < 1 {
 			return errors.New("image resize workers count could not be < 1")
 		}
-		imageService := img.New(imgWorkersCount)
+		imgSvc := img.New(workersCount)
 
 		var fileCache diskcache.Interface = diskcache.NewNoOp()
-		cacheDir := v.GetString("cacheDir")
+		cacheDir, err := cmd.Flags().GetString("cache-dir")
+		if err != nil {
+			return err
+		}
 		if cacheDir != "" {
-			if err := os.MkdirAll(cacheDir, 0700); err != nil {
+			if err := os.MkdirAll(cacheDir, 0700); err != nil { //nolint:govet
 				return fmt.Errorf("can't make directory %s: %w", cacheDir, err)
 			}
 			fileCache = diskcache.New(afero.NewOsFs(), cacheDir)
 		}
 
-		redisCacheURL := v.GetString("redisCacheUrl")
-		uploadCache, err := fbhttp.NewUploadCache(redisCacheURL)
-		if err != nil {
-			return fmt.Errorf("failed to initialize upload cache: %w", err)
-		}
-
-		server, err := getServerSettings(v, st.Storage)
+		server, err := getRunParams(cmd.Flags(), d.store)
 		if err != nil {
 			return err
 		}
@@ -208,13 +169,16 @@ user created with the credentials from options "username" and "password".`,
 			if err != nil {
 				return err
 			}
-			socketPerm := v.GetUint32("socketPerm")
+			socketPerm, err := cmd.Flags().GetUint32("socket-perm") //nolint:govet
+			if err != nil {
+				return err
+			}
 			err = os.Chmod(server.Socket, os.FileMode(socketPerm))
 			if err != nil {
 				return err
 			}
 		case server.TLSKey != "" && server.TLSCert != "":
-			cer, err := tls.LoadX509KeyPair(server.TLSCert, server.TLSKey)
+			cer, err := tls.LoadX509KeyPair(server.TLSCert, server.TLSKey) //nolint:govet
 			if err != nil {
 				return err
 			}
@@ -237,7 +201,7 @@ user created with the credentials from options "username" and "password".`,
 			panic(err)
 		}
 
-		handler, err := fbhttp.NewHandler(imageService, fileCache, uploadCache, st.Storage, server, assetsFs)
+		handler, err := fbhttp.NewHandler(imgSvc, fileCache, d.store, server, assetsFs)
 		if err != nil {
 			return err
 		}
@@ -269,7 +233,7 @@ user created with the credentials from options "username" and "password".`,
 		sig := <-sigc
 		log.Println("Got signal:", sig)
 
-		shutdownCtx, shutdownRelease := context.WithTimeout(context.Background(), 10*time.Second)
+		shutdownCtx, shutdownRelease := context.WithTimeout(context.Background(), 10*time.Second) //nolint:mnd
 		defer shutdownRelease()
 
 		if err := srv.Shutdown(shutdownCtx); err != nil {
@@ -277,86 +241,66 @@ user created with the credentials from options "username" and "password".`,
 		}
 		log.Println("Graceful shutdown complete.")
 
-		return nil
-	}, storeOptions{allowsNoDatabase: true}),
+		switch sig {
+		case syscall.SIGHUP:
+			d.err = fbErrors.ErrSighup
+		case syscall.SIGINT:
+			d.err = fbErrors.ErrSigint
+		case syscall.SIGQUIT:
+			d.err = fbErrors.ErrSigquit
+		case syscall.SIGTERM:
+			d.err = fbErrors.ErrSigTerm
+		}
+
+		return d.err
+	}, pythonConfig{allowNoDB: true}),
 }
 
-func getServerSettings(v *viper.Viper, st *storage.Storage) (*settings.Server, error) {
+//nolint:gocyclo
+func getRunParams(flags *pflag.FlagSet, st *storage.Storage) (*settings.Server, error) {
 	server, err := st.Settings.GetServer()
 	if err != nil {
 		return nil, err
 	}
 
+	if val, set := getStringParamB(flags, "root"); set {
+		server.Root = val
+	}
+
+	if val, set := getStringParamB(flags, "baseurl"); set {
+		server.BaseURL = val
+	}
+
+	if val, set := getStringParamB(flags, "log"); set {
+		server.Log = val
+	}
+
 	isSocketSet := false
 	isAddrSet := false
 
-	if v.IsSet("address") {
-		server.Address = v.GetString("address")
-		isAddrSet = true
+	if val, set := getStringParamB(flags, "address"); set {
+		server.Address = val
+		isAddrSet = isAddrSet || set
 	}
 
-	if v.IsSet("log") {
-		server.Log = v.GetString("log")
+	if val, set := getStringParamB(flags, "port"); set {
+		server.Port = val
+		isAddrSet = isAddrSet || set
 	}
 
-	if v.IsSet("port") {
-		server.Port = v.GetString("port")
-		isAddrSet = true
+	if val, set := getStringParamB(flags, "key"); set {
+		server.TLSKey = val
+		isAddrSet = isAddrSet || set
 	}
 
-	if v.IsSet("cert") {
-		server.TLSCert = v.GetString("cert")
-		isAddrSet = true
+	if val, set := getStringParamB(flags, "cert"); set {
+		server.TLSCert = val
+		isAddrSet = isAddrSet || set
 	}
 
-	if v.IsSet("key") {
-		server.TLSKey = v.GetString("key")
-		isAddrSet = true
-	}
-
-	if v.IsSet("root") {
-		server.Root = v.GetString("root")
-	}
-
-	if v.IsSet("socket") {
-		server.Socket = v.GetString("socket")
-		isSocketSet = true
-	}
-
-	if v.IsSet("baseURL") {
-		server.BaseURL = v.GetString("baseURL")
-		// TODO(remove): remove after July 2026.
-	} else if v := os.Getenv("FB_BASEURL"); v != "" {
-		log.Println("DEPRECATION NOTICE: Environment variable FB_BASEURL has been deprecated, use FB_BASE_URL instead")
-		server.BaseURL = v
-	}
-
-	if v.IsSet("tokenExpirationTime") {
-		server.TokenExpirationTime = v.GetString("tokenExpirationTime")
-	}
-
-	if v.IsSet("disableThumbnails") {
-		server.EnableThumbnails = !v.GetBool("disableThumbnails")
-	}
-
-	if v.IsSet("disablePreviewResize") {
-		server.ResizePreview = !v.GetBool("disablePreviewResize")
-	}
-
-	if v.IsSet("disableTypeDetectionByHeader") {
-		server.TypeDetectionByHeader = !v.GetBool("disableTypeDetectionByHeader")
-	}
-
-	if v.IsSet("disableImageResolutionCalc") {
-		server.ImageResolutionCal = !v.GetBool("disableImageResolutionCalc")
-	}
-
-	if v.IsSet("disableExec") {
-		server.EnableExec = !v.GetBool("disableExec")
-	}
-
-	if v.IsSet("followExternalSymlinks") {
-		server.FollowExternalSymlinks = v.GetBool("followExternalSymlinks")
+	if val, set := getStringParamB(flags, "socket"); set {
+		server.Socket = val
+		isSocketSet = isSocketSet || set
 	}
 
 	if isAddrSet && isSocketSet {
@@ -368,6 +312,18 @@ func getServerSettings(v *viper.Viper, st *storage.Storage) (*settings.Server, e
 		server.Socket = ""
 	}
 
+	disableThumbnails := getBoolParam(flags, "disable-thumbnails")
+	server.EnableThumbnails = !disableThumbnails
+
+	disablePreviewResize := getBoolParam(flags, "disable-preview-resize")
+	server.ResizePreview = !disablePreviewResize
+
+	disableTypeDetectionByHeader := getBoolParam(flags, "disable-type-detection-by-header")
+	server.TypeDetectionByHeader = !disableTypeDetectionByHeader
+
+	disableExec := getBoolParam(flags, "disable-exec")
+	server.EnableExec = !disableExec
+
 	if server.EnableExec {
 		log.Println("WARNING: Command Runner feature enabled!")
 		log.Println("WARNING: This feature has known security vulnerabilities and should not")
@@ -375,28 +331,71 @@ func getServerSettings(v *viper.Viper, st *storage.Storage) (*settings.Server, e
 		log.Println("WARNING: read https://github.com/filebrowser/filebrowser/issues/5199")
 	}
 
-	if server.FollowExternalSymlinks {
-		log.Println("WARNING: Following external symlinks enabled!")
-		log.Println("WARNING: Symlinks pointing outside a user's scope will be followed,")
-		log.Println("WARNING: which can expose files outside that scope. Only enable this if")
-		log.Println("WARNING: you fully understand and trust the contents of every user scope.")
-	}
-
-	if set, err := st.Settings.Get(); err == nil && set.Signup {
-		scope := strings.TrimSpace(set.Defaults.Scope)
-		scopeIsRoot := scope == "" || scope == "." || scope == "/"
-
-		if !set.CreateUserDir && scopeIsRoot {
-			log.Println("WARNING: Signup is enabled without createUserDir and the default scope is")
-			log.Println("WARNING: the server root, so every self-registered user can read, modify and")
-			log.Println("WARNING: delete all files File Browser serves, including other users' files.")
-			log.Println("WARNING: Enable createUserDir, or set a default scope other than the root.")
-		}
+	if val, set := getStringParamB(flags, "token-expiration-time"); set {
+		server.TokenExpirationTime = val
 	}
 
 	return server, nil
 }
 
+// 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 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.
+	if flags.Changed(key) {
+		return value, true
+	}
+
+	// If set through viper (env, config), return it.
+	if v.IsSet(key) {
+		return v.GetString(key), true
+	}
+
+	// Otherwise use default value on flags.
+	return value, false
+}
+
+func getStringParam(flags *pflag.FlagSet, key string) string {
+	val, _ := getStringParamB(flags, key)
+	return val
+}
+
 func setupLog(logMethod string) {
 	switch logMethod {
 	case "stdout":
@@ -415,22 +414,20 @@ func setupLog(logMethod string) {
 	}
 }
 
-func quickSetup(v *viper.Viper, s *storage.Storage) error {
+func quickSetup(flags *pflag.FlagSet, d pythonData) error {
 	log.Println("Performing quick setup")
 
 	set := &settings.Settings{
 		Key:                   generateKey(),
 		Signup:                false,
-		HideLoginButton:       true,
 		CreateUserDir:         false,
 		MinimumPasswordLength: settings.DefaultMinimumPasswordLength,
 		UserHomeBasePath:      settings.DefaultUsersHomeBasePath,
 		Defaults: settings.UserDefaults{
-			Scope:                 ".",
-			Locale:                "en",
-			SingleClick:           false,
-			RedirectAfterCopyMove: true,
-			AceEditorTheme:        v.GetString("defaults.aceEditorTheme"),
+			Scope:          ".",
+			Locale:         "en",
+			SingleClick:    false,
+			AceEditorTheme: getStringParam(flags, "defaults.aceEditorTheme"),
 			Perm: users.Permissions{
 				Admin:    false,
 				Execute:  true,
@@ -454,46 +451,39 @@ func quickSetup(v *viper.Viper, s *storage.Storage) error {
 	}
 
 	var err error
-	if v.GetBool("noauth") {
+	if _, noauth := getStringParamB(flags, "noauth"); noauth {
 		set.AuthMethod = auth.MethodNoAuth
-		err = s.Auth.Save(&auth.NoAuth{})
+		err = d.store.Auth.Save(&auth.NoAuth{})
 	} else {
 		set.AuthMethod = auth.MethodJSONAuth
-		err = s.Auth.Save(&auth.JSONAuth{})
+		err = d.store.Auth.Save(&auth.JSONAuth{})
 	}
 	if err != nil {
 		return err
 	}
 
-	err = s.Settings.Save(set)
+	err = d.store.Settings.Save(set)
 	if err != nil {
 		return err
 	}
 
 	ser := &settings.Server{
-		BaseURL:                v.GetString("baseURL"),
-		Port:                   v.GetString("port"),
-		Log:                    v.GetString("log"),
-		TLSKey:                 v.GetString("key"),
-		TLSCert:                v.GetString("cert"),
-		Address:                v.GetString("address"),
-		Root:                   v.GetString("root"),
-		TokenExpirationTime:    v.GetString("tokenExpirationTime"),
-		EnableThumbnails:       !v.GetBool("disableThumbnails"),
-		ResizePreview:          !v.GetBool("disablePreviewResize"),
-		EnableExec:             !v.GetBool("disableExec"),
-		TypeDetectionByHeader:  !v.GetBool("disableTypeDetectionByHeader"),
-		ImageResolutionCal:     !v.GetBool("disableImageResolutionCalc"),
-		FollowExternalSymlinks: v.GetBool("followExternalSymlinks"),
+		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 = s.Settings.SaveServer(ser)
+	err = d.store.Settings.SaveServer(ser)
 	if err != nil {
 		return err
 	}
 
-	username := v.GetString("username")
-	password := v.GetString("password")
+	username := getStringParam(flags, "username")
+	password := getStringParam(flags, "password")
 
 	if password == "" {
 		var pwd string
@@ -524,5 +514,35 @@ func quickSetup(v *viper.Viper, s *storage.Storage) error {
 	set.Defaults.Apply(user)
 	user.Perm.Admin = true
 
-	return s.Users.Save(user)
+	return d.store.Users.Save(user)
+}
+
+func initConfig() {
+	if cfgFile == "" {
+		home, err := homedir.Dir()
+		if err != nil {
+			panic(err)
+		}
+		v.AddConfigPath(".")
+		v.AddConfigPath(home)
+		v.AddConfigPath("/etc/filebrowser/")
+		v.SetConfigName(".filebrowser")
+	} else {
+		v.SetConfigFile(cfgFile)
+	}
+
+	v.SetEnvPrefix("FB")
+	v.AutomaticEnv()
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+	v.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
+
+	if err := v.ReadInConfig(); err != nil {
+		var configParseError v.ConfigParseError
+		if errors.As(err, &configParseError) {
+			panic(err)
+		}
+		cfgFile = "No config file used"
+	} else {
+		cfgFile = "Using config file: " + v.ConfigFileUsed()
+	}
 }

cmd/rule_rm.go

@@ -40,7 +40,7 @@ including 'index_end'.`,
 
 		return nil
 	},
-	RunE: withStore(func(cmd *cobra.Command, args []string, st *store) error {
+	RunE: python(func(cmd *cobra.Command, args []string, d *pythonData) error {
 		i, err := strconv.Atoi(args[0])
 		if err != nil {
 			return err
@@ -55,14 +55,14 @@ including 'index_end'.`,
 
 		user := func(u *users.User) error {
 			u.Rules = append(u.Rules[:i], u.Rules[f+1:]...)
-			return st.Users.Save(u)
+			return d.store.Users.Save(u)
 		}
 
 		global := func(s *settings.Settings) error {
 			s.Rules = append(s.Rules[:i], s.Rules[f+1:]...)
-			return st.Settings.Save(s)
+			return d.store.Settings.Save(s)
 		}
 
-		return runRules(st.Storage, cmd, user, global)
-	}, storeOptions{}),
+		return runRules(d.store, cmd, user, global)
+	}, pythonConfig{}),
 }

cmd/rules.go

@@ -36,7 +36,7 @@ func runRules(st *storage.Storage, cmd *cobra.Command, usersFn func(*users.User)
 	}
 	if id != nil {
 		var user *users.User
-		user, err = st.Users.Get("", false, id)
+		user, err = st.Users.Get("", id)
 		if err != nil {
 			return err
 		}
@@ -69,12 +69,11 @@ func runRules(st *storage.Storage, cmd *cobra.Command, usersFn func(*users.User)
 }
 
 func getUserIdentifier(flags *pflag.FlagSet) (interface{}, error) {
-	id, err := flags.GetUint("id")
+	id, err := getUint(flags, "id")
 	if err != nil {
 		return nil, err
 	}
-
-	username, err := flags.GetString("username")
+	username, err := getString(flags, "username")
 	if err != nil {
 		return nil, err
 	}

cmd/rules_add.go

@@ -21,19 +21,15 @@ var rulesAddCmd = &cobra.Command{
 	Short: "Add a global rule or user rule",
 	Long:  `Add a global rule or user rule.`,
 	Args:  cobra.ExactArgs(1),
-	RunE: withStore(func(cmd *cobra.Command, args []string, st *store) error {
-		flags := cmd.Flags()
-
-		allow, err := flags.GetBool("allow")
+	RunE: python(func(cmd *cobra.Command, args []string, d *pythonData) error {
+		allow, err := getBool(cmd.Flags(), "allow")
 		if err != nil {
 			return err
 		}
-
-		regex, err := flags.GetBool("regex")
+		regex, err := getBool(cmd.Flags(), "regex")
 		if err != nil {
 			return err
 		}
-
 		exp := args[0]
 
 		if regex {
@@ -53,14 +49,14 @@ var rulesAddCmd = &cobra.Command{
 
 		user := func(u *users.User) error {
 			u.Rules = append(u.Rules, rule)
-			return st.Users.Save(u)
+			return d.store.Users.Save(u)
 		}
 
 		global := func(s *settings.Settings) error {
 			s.Rules = append(s.Rules, rule)
-			return st.Settings.Save(s)
+			return d.store.Settings.Save(s)
 		}
 
-		return runRules(st.Storage, cmd, user, global)
-	}, storeOptions{}),
+		return runRules(d.store, cmd, user, global)
+	}, pythonConfig{}),
 }

cmd/rules_ls.go

@@ -13,7 +13,7 @@ var rulesLsCommand = &cobra.Command{
 	Short: "List global rules or user specific rules",
 	Long:  `List global rules or user specific rules.`,
 	Args:  cobra.NoArgs,
-	RunE: withStore(func(cmd *cobra.Command, _ []string, st *store) error {
-		return runRules(st.Storage, cmd, nil, nil)
-	}, storeOptions{}),
+	RunE: python(func(cmd *cobra.Command, _ []string, d *pythonData) error {
+		return runRules(d.store, cmd, nil, nil)
+	}, pythonConfig{}),
 }

cmd/upgrade.go

@@ -0,0 +1,40 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/filebrowser/filebrowser/v2/storage/bolt/importer"
+)
+
+func init() {
+	rootCmd.AddCommand(upgradeCmd)
+
+	upgradeCmd.Flags().String("old.database", "", "")
+	upgradeCmd.Flags().String("old.config", "", "")
+	_ = upgradeCmd.MarkFlagRequired("old.database")
+}
+
+var upgradeCmd = &cobra.Command{
+	Use:   "upgrade",
+	Short: "Upgrades an old configuration",
+	Long: `Upgrades an old configuration. This command DOES NOT
+import share links because they are incompatible with
+this version.`,
+	Args: cobra.NoArgs,
+	RunE: func(cmd *cobra.Command, _ []string) error {
+		flags := cmd.Flags()
+		oldDB, err := getString(flags, "old.database")
+		if err != nil {
+			return err
+		}
+		oldConf, err := getString(flags, "old.config")
+		if err != nil {
+			return err
+		}
+		db, err := getString(flags, "database")
+		if err != nil {
+			return err
+		}
+		return importer.Import(oldDB, oldConf, db)
+	},
+}

cmd/users.go

@@ -27,17 +27,16 @@ var usersCmd = &cobra.Command{
 
 func printUsers(usrs []*users.User) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	fmt.Fprintln(w, "ID\tUsername\tScope\tLocale\tV. Mode\tS.Click\tRed. After C/M\tAdmin\tExecute\tCreate\tRename\tModify\tDelete\tShare\tDownload\tPwd Lock")
+	fmt.Fprintln(w, "ID\tUsername\tScope\tLocale\tV. Mode\tS.Click\tAdmin\tExecute\tCreate\tRename\tModify\tDelete\tShare\tDownload\tPwd Lock")
 
 	for _, u := range usrs {
-		fmt.Fprintf(w, "%d\t%s\t%s\t%s\t%s\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t\n",
+		fmt.Fprintf(w, "%d\t%s\t%s\t%s\t%s\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t\n",
 			u.ID,
 			u.Username,
 			u.Scope,
 			u.Locale,
 			u.ViewMode,
 			u.SingleClick,
-			u.RedirectAfterCopyMove,
 			u.Perm.Admin,
 			u.Perm.Execute,
 			u.Perm.Create,
@@ -78,74 +77,67 @@ func addUserFlags(flags *pflag.FlagSet) {
 	flags.String("locale", "en", "locale for users")
 	flags.String("viewMode", string(users.ListViewMode), "view mode for users")
 	flags.Bool("singleClick", false, "use single clicks only")
-	flags.Bool("redirectAfterCopyMove", false, "redirect to destination after copy/move")
 	flags.Bool("dateFormat", false, "use date format (true for absolute time, false for relative)")
-	flags.Bool("hideDotfiles", false, "hide dotfiles in file listings")
+	flags.Bool("hideDotfiles", false, "hide dotfiles")
 	flags.String("aceEditorTheme", "", "ace editor's syntax highlighting theme for users")
 }
 
-func getAndParseViewMode(flags *pflag.FlagSet) (users.ViewMode, error) {
-	viewModeStr, err := flags.GetString("viewMode")
+func getViewMode(flags *pflag.FlagSet) (users.ViewMode, error) {
+	viewModeStr, err := getString(flags, "viewMode")
 	if err != nil {
 		return "", err
 	}
-
 	viewMode := users.ViewMode(viewModeStr)
 	if viewMode != users.ListViewMode && viewMode != users.MosaicViewMode {
 		return "", errors.New("view mode must be \"" + string(users.ListViewMode) + "\" or \"" + string(users.MosaicViewMode) + "\"")
 	}
-
 	return viewMode, nil
 }
 
+//nolint:gocyclo
 func getUserDefaults(flags *pflag.FlagSet, defaults *settings.UserDefaults, all bool) error {
-	errs := []error{}
-
+	var visitErr error
 	visit := func(flag *pflag.Flag) {
+		if visitErr != nil {
+			return
+		}
 		var err error
 		switch flag.Name {
 		case "scope":
-			defaults.Scope, err = flags.GetString(flag.Name)
+			defaults.Scope, err = getString(flags, flag.Name)
 		case "locale":
-			defaults.Locale, err = flags.GetString(flag.Name)
+			defaults.Locale, err = getString(flags, flag.Name)
 		case "viewMode":
-			defaults.ViewMode, err = getAndParseViewMode(flags)
+			defaults.ViewMode, err = getViewMode(flags)
 		case "singleClick":
-			defaults.SingleClick, err = flags.GetBool(flag.Name)
-		case "redirectAfterCopyMove":
-			defaults.RedirectAfterCopyMove, err = flags.GetBool(flag.Name)
+			defaults.SingleClick, err = getBool(flags, flag.Name)
 		case "aceEditorTheme":
-			defaults.AceEditorTheme, err = flags.GetString(flag.Name)
+			defaults.AceEditorTheme, err = getString(flags, flag.Name)
 		case "perm.admin":
-			defaults.Perm.Admin, err = flags.GetBool(flag.Name)
+			defaults.Perm.Admin, err = getBool(flags, flag.Name)
 		case "perm.execute":
-			defaults.Perm.Execute, err = flags.GetBool(flag.Name)
+			defaults.Perm.Execute, err = getBool(flags, flag.Name)
 		case "perm.create":
-			defaults.Perm.Create, err = flags.GetBool(flag.Name)
+			defaults.Perm.Create, err = getBool(flags, flag.Name)
 		case "perm.rename":
-			defaults.Perm.Rename, err = flags.GetBool(flag.Name)
+			defaults.Perm.Rename, err = getBool(flags, flag.Name)
 		case "perm.modify":
-			defaults.Perm.Modify, err = flags.GetBool(flag.Name)
+			defaults.Perm.Modify, err = getBool(flags, flag.Name)
 		case "perm.delete":
-			defaults.Perm.Delete, err = flags.GetBool(flag.Name)
+			defaults.Perm.Delete, err = getBool(flags, flag.Name)
 		case "perm.share":
-			defaults.Perm.Share, err = flags.GetBool(flag.Name)
+			defaults.Perm.Share, err = getBool(flags, flag.Name)
 		case "perm.download":
-			defaults.Perm.Download, err = flags.GetBool(flag.Name)
+			defaults.Perm.Download, err = getBool(flags, flag.Name)
 		case "commands":
 			defaults.Commands, err = flags.GetStringSlice(flag.Name)
 		case "sorting.by":
-			defaults.Sorting.By, err = flags.GetString(flag.Name)
+			defaults.Sorting.By, err = getString(flags, flag.Name)
 		case "sorting.asc":
-			defaults.Sorting.Asc, err = flags.GetBool(flag.Name)
-		case "dateFormat":
-			defaults.DateFormat, err = flags.GetBool(flag.Name)
-		case "hideDotfiles":
-			defaults.HideDotfiles, err = flags.GetBool(flag.Name)
+			defaults.Sorting.Asc, err = getBool(flags, flag.Name)
 		}
-
 		if err != nil {
-			errs = append(errs, err)
+			visitErr = err
 		}
 	}
 
@@ -154,6 +146,5 @@ func getUserDefaults(flags *pflag.FlagSet, defaults *settings.UserDefaults, all
 	} else {
 		flags.Visit(visit)
 	}
-
-	return errors.Join(errs...)
+	return visitErr
 }

cmd/users_add.go

@@ -16,13 +16,12 @@ var usersAddCmd = &cobra.Command{
 	Short: "Create a new user",
 	Long:  `Create a new user and add it to the database.`,
 	Args:  cobra.ExactArgs(2),
-	RunE: withStore(func(cmd *cobra.Command, args []string, st *store) error {
-		flags := cmd.Flags()
-		s, err := st.Settings.Get()
+	RunE: python(func(cmd *cobra.Command, args []string, d *pythonData) error {
+		s, err := d.store.Settings.Get()
 		if err != nil {
 			return err
 		}
-		err = getUserDefaults(flags, &s.Defaults, false)
+		err = getUserDefaults(cmd.Flags(), &s.Defaults, false)
 		if err != nil {
 			return err
 		}
@@ -32,36 +31,39 @@ var usersAddCmd = &cobra.Command{
 			return err
 		}
 
+		lockPassword, err := getBool(cmd.Flags(), "lockPassword")
+		if err != nil {
+			return err
+		}
+
+		dateFormat, err := getBool(cmd.Flags(), "dateFormat")
+		if err != nil {
+			return err
+		}
+
+		hideDotfiles, err := getBool(cmd.Flags(), "hideDotfiles")
+		if err != nil {
+			return err
+		}
+
 		user := &users.User{
-			Username: args[0],
-			Password: password,
-		}
-
-		user.LockPassword, err = flags.GetBool("lockPassword")
-		if err != nil {
-			return err
-		}
-
-		user.DateFormat, err = flags.GetBool("dateFormat")
-		if err != nil {
-			return err
-		}
-
-		user.HideDotfiles, err = flags.GetBool("hideDotfiles")
-		if err != nil {
-			return err
+			Username:     args[0],
+			Password:     password,
+			LockPassword: lockPassword,
+			DateFormat:   dateFormat,
+			HideDotfiles: hideDotfiles,
 		}
 
 		s.Defaults.Apply(user)
 
-		servSettings, err := st.Settings.GetServer()
+		servSettings, err := d.store.Settings.GetServer()
 		if err != nil {
 			return err
 		}
 		// since getUserDefaults() polluted s.Defaults.Scope
 		// which makes the Scope not the one saved in the db
 		// we need the right s.Defaults.Scope here
-		s2, err := st.Settings.Get()
+		s2, err := d.store.Settings.Get()
 		if err != nil {
 			return err
 		}
@@ -72,11 +74,11 @@ var usersAddCmd = &cobra.Command{
 		}
 		user.Scope = userHome
 
-		err = st.Users.Save(user)
+		err = d.store.Users.Save(user)
 		if err != nil {
 			return err
 		}
 		printUsers([]*users.User{user})
 		return nil
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/users_export.go

@@ -14,8 +14,8 @@ var usersExportCmd = &cobra.Command{
 	Long: `Export all users to a json or yaml file. Please indicate the
 path to the file where you want to write the users.`,
 	Args: jsonYamlArg,
-	RunE: withStore(func(_ *cobra.Command, args []string, st *store) error {
-		list, err := st.Users.Gets("", false)
+	RunE: python(func(_ *cobra.Command, args []string, d *pythonData) error {
+		list, err := d.store.Users.Gets("")
 		if err != nil {
 			return err
 		}
@@ -25,5 +25,5 @@ path to the file where you want to write the users.`,
 			return err
 		}
 		return nil
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/users_find.go

@@ -26,7 +26,7 @@ var usersLsCmd = &cobra.Command{
 	RunE:  findUsers,
 }
 
-var findUsers = withStore(func(_ *cobra.Command, args []string, st *store) error {
+var findUsers = python(func(_ *cobra.Command, args []string, d *pythonData) error {
 	var (
 		list []*users.User
 		user *users.User
@@ -36,14 +36,14 @@ var findUsers = withStore(func(_ *cobra.Command, args []string, st *store) error
 	if len(args) == 1 {
 		username, id := parseUsernameOrID(args[0])
 		if username != "" {
-			user, err = st.Users.Get("", false, username)
+			user, err = d.store.Users.Get("", username)
 		} else {
-			user, err = st.Users.Get("", false, id)
+			user, err = d.store.Users.Get("", id)
 		}
 
 		list = []*users.User{user}
 	} else {
-		list, err = st.Users.Gets("", false)
+		list, err = d.store.Users.Gets("")
 	}
 
 	if err != nil {
@@ -51,4 +51,4 @@ var findUsers = withStore(func(_ *cobra.Command, args []string, st *store) error
 	}
 	printUsers(list)
 	return nil
-}, storeOptions{})
+}, pythonConfig{})

cmd/users_import.go

@@ -25,8 +25,7 @@ file. You can use this command to import new users to your
 installation. For that, just don't place their ID on the files
 list or set it to 0.`,
 	Args: jsonYamlArg,
-	RunE: withStore(func(cmd *cobra.Command, args []string, st *store) error {
-		flags := cmd.Flags()
+	RunE: python(func(cmd *cobra.Command, args []string, d *pythonData) error {
 		fd, err := os.Open(args[0])
 		if err != nil {
 			return err
@@ -40,19 +39,19 @@ list or set it to 0.`,
 		}
 
 		for _, user := range list {
-			err = user.Clean("", false)
+			err = user.Clean("")
 			if err != nil {
 				return err
 			}
 		}
 
-		replace, err := flags.GetBool("replace")
+		replace, err := getBool(cmd.Flags(), "replace")
 		if err != nil {
 			return err
 		}
 
 		if replace {
-			oldUsers, userImportErr := st.Users.Gets("", false)
+			oldUsers, userImportErr := d.store.Users.Gets("")
 			if userImportErr != nil {
 				return userImportErr
 			}
@@ -63,20 +62,20 @@ list or set it to 0.`,
 			}
 
 			for _, user := range oldUsers {
-				err = st.Users.Delete(user.ID)
+				err = d.store.Users.Delete(user.ID)
 				if err != nil {
 					return err
 				}
 			}
 		}
 
-		overwrite, err := flags.GetBool("overwrite")
+		overwrite, err := getBool(cmd.Flags(), "overwrite")
 		if err != nil {
 			return err
 		}
 
 		for _, user := range list {
-			onDB, err := st.Users.Get("", false, user.ID)
+			onDB, err := d.store.Users.Get("", user.ID)
 
 			// User exists in DB.
 			if err == nil {
@@ -88,7 +87,7 @@ list or set it to 0.`,
 				// with the new username. If there is, print an error and cancel the
 				// operation
 				if user.Username != onDB.Username {
-					if conflictuous, err := st.Users.Get("", false, user.Username); err == nil {
+					if conflictuous, err := d.store.Users.Get("", user.Username); err == nil { //nolint:govet
 						return usernameConflictError(user.Username, conflictuous.ID, user.ID)
 					}
 				}
@@ -98,13 +97,13 @@ list or set it to 0.`,
 				user.ID = 0
 			}
 
-			err = st.Users.Save(user)
+			err = d.store.Users.Save(user)
 			if err != nil {
 				return err
 			}
 		}
 		return nil
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }
 
 func usernameConflictError(username string, originalID, newID uint) error {

cmd/users_rm.go

@@ -15,14 +15,14 @@ var usersRmCmd = &cobra.Command{
 	Short: "Delete a user by username or id",
 	Long:  `Delete a user by username or id`,
 	Args:  cobra.ExactArgs(1),
-	RunE: withStore(func(_ *cobra.Command, args []string, st *store) error {
+	RunE: python(func(_ *cobra.Command, args []string, d *pythonData) error {
 		username, id := parseUsernameOrID(args[0])
 		var err error
 
 		if username != "" {
-			err = st.Users.Delete(username)
+			err = d.store.Users.Delete(username)
 		} else {
-			err = st.Users.Delete(id)
+			err = d.store.Users.Delete(id)
 		}
 
 		if err != nil {
@@ -30,5 +30,5 @@ var usersRmCmd = &cobra.Command{
 		}
 		fmt.Println("user deleted successfully")
 		return nil
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/users_update.go

@@ -21,20 +21,19 @@ var usersUpdateCmd = &cobra.Command{
 	Long: `Updates an existing user. Set the flags for the
 options you want to change.`,
 	Args: cobra.ExactArgs(1),
-	RunE: withStore(func(cmd *cobra.Command, args []string, st *store) error {
-		flags := cmd.Flags()
+	RunE: python(func(cmd *cobra.Command, args []string, d *pythonData) error {
 		username, id := parseUsernameOrID(args[0])
-		password, err := flags.GetString("password")
+		flags := cmd.Flags()
+		password, err := getString(flags, "password")
+		if err != nil {
+			return err
+		}
+		newUsername, err := getString(flags, "username")
 		if err != nil {
 			return err
 		}
 
-		newUsername, err := flags.GetString("username")
-		if err != nil {
-			return err
-		}
-
-		s, err := st.Settings.Get()
+		s, err := d.store.Settings.Get()
 		if err != nil {
 			return err
 		}
@@ -42,50 +41,46 @@ options you want to change.`,
 		var (
 			user *users.User
 		)
+
 		if id != 0 {
-			user, err = st.Users.Get("", false, id)
+			user, err = d.store.Users.Get("", id)
 		} else {
-			user, err = st.Users.Get("", false, username)
+			user, err = d.store.Users.Get("", username)
 		}
+
 		if err != nil {
 			return err
 		}
 
 		defaults := settings.UserDefaults{
-			Scope:                 user.Scope,
-			Locale:                user.Locale,
-			ViewMode:              user.ViewMode,
-			SingleClick:           user.SingleClick,
-			RedirectAfterCopyMove: user.RedirectAfterCopyMove,
-			Perm:                  user.Perm,
-			Sorting:               user.Sorting,
-			Commands:              user.Commands,
+			Scope:       user.Scope,
+			Locale:      user.Locale,
+			ViewMode:    user.ViewMode,
+			SingleClick: user.SingleClick,
+			Perm:        user.Perm,
+			Sorting:     user.Sorting,
+			Commands:    user.Commands,
 		}
-
 		err = getUserDefaults(flags, &defaults, false)
 		if err != nil {
 			return err
 		}
-
 		user.Scope = defaults.Scope
 		user.Locale = defaults.Locale
 		user.ViewMode = defaults.ViewMode
 		user.SingleClick = defaults.SingleClick
-		user.RedirectAfterCopyMove = defaults.RedirectAfterCopyMove
 		user.Perm = defaults.Perm
 		user.Commands = defaults.Commands
 		user.Sorting = defaults.Sorting
-		user.LockPassword, err = flags.GetBool("lockPassword")
+		user.LockPassword, err = getBool(flags, "lockPassword")
 		if err != nil {
 			return err
 		}
-
-		user.DateFormat, err = flags.GetBool("dateFormat")
+		user.DateFormat, err = getBool(flags, "dateFormat")
 		if err != nil {
 			return err
 		}
-
-		user.HideDotfiles, err = flags.GetBool("hideDotfiles")
+		user.HideDotfiles, err = getBool(flags, "hideDotfiles")
 		if err != nil {
 			return err
 		}
@@ -101,11 +96,11 @@ options you want to change.`,
 			}
 		}
 
-		err = st.Users.Update(user)
+		err = d.store.Users.Update(user)
 		if err != nil {
 			return err
 		}
 		printUsers([]*users.User{user})
 		return nil
-	}, storeOptions{}),
+	}, pythonConfig{}),
 }

cmd/utils.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/fs"
 	"log"
 	"os"
@@ -11,34 +12,51 @@ import (
 	"strings"
 
 	"github.com/asdine/storm/v3"
-	homedir "github.com/mitchellh/go-homedir"
-	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
-	yaml "gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/filebrowser/filebrowser/v2/settings"
 	"github.com/filebrowser/filebrowser/v2/storage"
 	"github.com/filebrowser/filebrowser/v2/storage/bolt"
 )
 
-const databasePermissions = 0640
+const dbPerms = 0640
 
-func getAndParseFileMode(flags *pflag.FlagSet, name string) (fs.FileMode, error) {
-	mode, err := flags.GetString(name)
+func returnErr(err error) error {
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func getString(flags *pflag.FlagSet, flag string) (string, error) {
+	s, err := flags.GetString(flag)
+	return s, returnErr(err)
+}
+
+func getMode(flags *pflag.FlagSet, flag string) (fs.FileMode, error) {
+	s, err := getString(flags, flag)
 	if err != nil {
 		return 0, err
 	}
-
-	b, err := strconv.ParseUint(mode, 0, 32)
+	b, err := strconv.ParseUint(s, 0, 32)
 	if err != nil {
 		return 0, err
 	}
-
 	return fs.FileMode(b), nil
 }
 
+func getBool(flags *pflag.FlagSet, flag string) (bool, error) {
+	b, err := flags.GetBool(flag)
+	return b, returnErr(err)
+}
+
+func getUint(flags *pflag.FlagSet, flag string) (uint, error) {
+	b, err := flags.GetUint(flag)
+	return b, returnErr(err)
+}
+
 func generateKey() []byte {
 	k, err := settings.GenerateKey()
 	if err != nil {
@@ -47,6 +65,20 @@ func generateKey() []byte {
 	return k
 }
 
+type cobraFunc func(cmd *cobra.Command, args []string) error
+type pythonFunc func(cmd *cobra.Command, args []string, data *pythonData) error
+
+type pythonConfig struct {
+	noDB      bool
+	allowNoDB bool
+}
+
+type pythonData struct {
+	hadDB bool
+	store *storage.Storage
+	err   error
+}
+
 func dbExists(path string) (bool, error) {
 	stat, err := os.Stat(path)
 	if err == nil {
@@ -57,7 +89,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 {
+			if err := os.MkdirAll(d, 0700); err != nil { //nolint:govet
 				return false, err
 			}
 			return false, nil
@@ -67,138 +99,42 @@ func dbExists(path string) (bool, error) {
 	return false, err
 }
 
-// Generate the replacements for all environment variables. This allows to
-// use FB_BRANDING_DISABLE_EXTERNAL environment variables, even when the
-// option name is branding.disableExternal.
-func generateEnvKeyReplacements(cmd *cobra.Command) []string {
-	replacements := []string{}
-
-	cmd.Flags().VisitAll(func(f *pflag.Flag) {
-		oldName := strings.ToUpper(f.Name)
-		newName := strings.ToUpper(lo.SnakeCase(f.Name))
-		replacements = append(replacements, oldName, newName)
-	})
-
-	return replacements
-}
-
-func initViper(cmd *cobra.Command) (*viper.Viper, error) {
-	v := viper.New()
-
-	// Get config file from flag
-	cfgFile, err := cmd.Flags().GetString("config")
-	if err != nil {
-		return nil, err
-	}
-
-	// Configuration file
-	if cfgFile == "" {
-		home, err := homedir.Dir()
-		if err != nil {
-			return nil, err
-		}
-		v.AddConfigPath(".")
-		v.AddConfigPath(home)
-		v.AddConfigPath("/etc/filebrowser/")
-		v.SetConfigName(".filebrowser")
-	} else {
-		v.SetConfigFile(cfgFile)
-	}
-
-	// Environment variables
-	v.SetEnvPrefix("FB")
-	v.AutomaticEnv()
-	v.SetEnvKeyReplacer(strings.NewReplacer(generateEnvKeyReplacements(cmd)...))
-
-	// Bind the flags
-	err = v.BindPFlags(cmd.Flags())
-	if err != nil {
-		return nil, err
-	}
-
-	// Read in configuration
-	if err := v.ReadInConfig(); err != nil {
-
-		if errors.As(err, &viper.ConfigParseError{}) {
-			return nil, err
-		}
-
-		log.Println("No config file used")
-	} else {
-		log.Printf("Using config file: %s", v.ConfigFileUsed())
-	}
-
-	// Return Viper
-	return v, nil
-}
-
-type store struct {
-	*storage.Storage
-	databaseExisted bool
-}
-
-type storeOptions struct {
-	expectsNoDatabase bool
-	allowsNoDatabase  bool
-}
-
-type cobraFunc func(cmd *cobra.Command, args []string) error
-
-// withViperAndStore initializes Viper and the storage.Store and passes them to the callback function.
-// This function should only be used by [withStore] and the root command. No other command should call
-// this function directly.
-func withViperAndStore(fn func(cmd *cobra.Command, args []string, v *viper.Viper, store *store) error, options storeOptions) cobraFunc {
+func python(fn pythonFunc, cfg pythonConfig) cobraFunc {
 	return func(cmd *cobra.Command, args []string) error {
-		v, err := initViper(cmd)
-		if err != nil {
-			return err
-		}
+		data := &pythonData{hadDB: true}
 
-		path, err := filepath.Abs(v.GetString("database"))
+		path := getStringParam(cmd.Flags(), "database")
+		absPath, err := filepath.Abs(path)
 		if err != nil {
-			return err
+			panic(err)
 		}
-
 		exists, err := dbExists(path)
-		switch {
-		case err != nil:
-			return err
-		case exists && options.expectsNoDatabase:
-			log.Fatal(path + " already exists")
-		case !exists && !options.expectsNoDatabase && !options.allowsNoDatabase:
-			log.Fatal(path + " does not exist. Please run 'filebrowser config init' first.")
-		case !exists && !options.expectsNoDatabase:
-			log.Println("WARNING: filebrowser.db can't be found. Initialing in " + strings.TrimSuffix(path, "filebrowser.db"))
+
+		if err != nil {
+			panic(err)
+		} else if exists && cfg.noDB {
+			log.Fatal(absPath + " already exists")
+		} else if !exists && !cfg.noDB && !cfg.allowNoDB {
+			log.Fatal(absPath + " does not exist. Please run 'filebrowser config init' first.")
+		} else if !exists && !cfg.noDB {
+			log.Println("Warning: filebrowser.db can't be found. Initialing in " + strings.TrimSuffix(absPath, "filebrowser.db"))
 		}
 
-		log.Println("Using database: " + path)
-
-		db, err := storm.Open(path, storm.BoltOptions(databasePermissions, nil))
+		log.Println("Using database: " + absPath)
+		data.hadDB = exists
+		db, err := storm.Open(path, storm.BoltOptions(dbPerms, nil))
 		if err != nil {
 			return err
 		}
 		defer db.Close()
-
-		storage, err := bolt.NewStorage(db)
+		data.store, err = bolt.NewStorage(db)
 		if err != nil {
 			return err
 		}
-
-		store := &store{
-			Storage:         storage,
-			databaseExisted: exists,
-		}
-
-		return fn(cmd, args, v, store)
+		return fn(cmd, args, data)
 	}
 }
 
-func withStore(fn func(cmd *cobra.Command, args []string, store *store) error, options storeOptions) cobraFunc {
-	return withViperAndStore(func(cmd *cobra.Command, args []string, _ *viper.Viper, store *store) error {
-		return fn(cmd, args, store)
-	}, options)
-}
-
 func marshal(filename string, data interface{}) error {
 	fd, err := os.Create(filename)
 	if err != nil {
@@ -249,6 +185,33 @@ func jsonYamlArg(cmd *cobra.Command, args []string) error {
 	}
 }
 
+func cleanUpInterfaceMap(in map[interface{}]interface{}) map[string]interface{} {
+	result := make(map[string]interface{})
+	for k, v := range in {
+		result[fmt.Sprintf("%v", k)] = cleanUpMapValue(v)
+	}
+	return result
+}
+
+func cleanUpInterfaceArray(in []interface{}) []interface{} {
+	result := make([]interface{}, len(in))
+	for i, v := range in {
+		result[i] = cleanUpMapValue(v)
+	}
+	return result
+}
+
+func cleanUpMapValue(v interface{}) interface{} {
+	switch v := v.(type) {
+	case []interface{}:
+		return cleanUpInterfaceArray(v)
+	case map[interface{}]interface{}:
+		return cleanUpInterfaceMap(v)
+	default:
+		return v
+	}
+}
+
 // convertCmdStrToCmdArray checks if cmd string is blank (whitespace included)
 // then returns empty string array, else returns the split word array of cmd.
 // This is to ensure the result will never be []string{""}

commitlint.config.js

@@ -0,0 +1,34 @@
+module.exports = {
+    rules: {
+        'body-leading-blank': [1, 'always'],
+        'body-max-line-length': [2, 'always', 100],
+        'footer-leading-blank': [1, 'always'],
+        'footer-max-line-length': [2, 'always', 100],
+        'header-max-length': [2, 'always', 100],
+        'scope-case': [2, 'always', 'lower-case'],
+        'subject-case': [
+            2,
+            'never',
+            ['sentence-case', 'start-case', 'pascal-case', 'upper-case'],
+        ],
+        'subject-full-stop': [2, 'never', '.'],
+        'type-case': [2, 'always', 'lower-case'],
+        'type-empty': [2, 'never'],
+        'type-enum': [
+            2,
+            'always',
+            [
+                'feat',
+                'fix',
+                'perf',
+                'revert',
+                'refactor',
+                'build',
+                'ci',
+                'test',
+                'chore',
+                'docs',
+            ],
+        ],
+    },
+};

common.mk

@@ -0,0 +1,28 @@
+SHELL := /usr/bin/env bash
+DATE ?= $(shell date +%FT%T%z)
+BASE_PATH := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+VERSION ?= $(shell git describe --tags --always --match=v* 2> /dev/null || \
+           			cat $(CURDIR)/.version 2> /dev/null || echo v0)
+VERSION_HASH = $(shell git rev-parse HEAD)
+BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
+
+go = GOGC=off go
+MODULE = $(shell env GO111MODULE=on go list -m)
+
+# printing
+# $Q (quiet) is used in the targets as a replacer for @.
+# This macro helps to print the command for debugging by setting V to 1. Example `make test-unit V=1`
+V = 0
+Q = $(if $(filter 1,$V),,@)
+# $M is a macro to print a colored ▶ character. Example `$(info $(M) running coverage tests…)` will print "▶ running coverage tests…"
+M = $(shell printf "\033[34;1m▶\033[0m")
+
+GREEN  := $(shell tput -Txterm setaf 2)
+YELLOW := $(shell tput -Txterm setaf 3)
+WHITE  := $(shell tput -Txterm setaf 7)
+CYAN   := $(shell tput -Txterm setaf 6)
+RESET  := $(shell tput -Txterm sgr0)
+
+define global_option
+    printf "  ${YELLOW}%-20s${GREEN}%s${RESET}\n" $(1) $(2)
+endef

compose.yaml

@@ -1,32 +0,0 @@
-services:
-  filebrowser:
-    container_name: filebrowser
-    image: filebrowser/filebrowser:latest
-    networks:
-      - filebrowser
-    ports:
-      - 8000:80
-    volumes:
-      - filebrowser:/flux/vault
-    environment:
-      - FB_REDIS_CACHE_URL=redis://default:filebrowser@redis:6379 # Use rediss:// for ssl
-
-  redis:
-    container_name: redis
-    image: redis:latest
-    networks:
-      - filebrowser
-    command:
-      - sh
-      - -c
-      - |
-        cat > /tmp/users.acl <<EOF
-        user default on >filebrowser ~* +@all
-        EOF
-        redis-server --aclfile /tmp/users.acl
-
-networks:
-  filebrowser:
-
-volumes:
-  filebrowser:

diskcache/file_cache.go

@@ -2,7 +2,7 @@ package diskcache
 
 import (
 	"context"
-	"crypto/sha1"
+	"crypto/sha1" //nolint:gosec
 	"encoding/hex"
 	"errors"
 	"fmt"
@@ -103,7 +103,7 @@ func (f *FileCache) getScopedLocks(key string) (lock sync.Locker) {
 }
 
 func (f *FileCache) getFileName(key string) string {
-	hasher := sha1.New()
+	hasher := sha1.New() //nolint:gosec
 	_, _ = hasher.Write([]byte(key))
 	hash := hex.EncodeToString(hasher.Sum(nil))
 	return fmt.Sprintf("%s/%s/%s", hash[:1], hash[1:3], hash)

diskcache/file_cache_test.go

@@ -25,12 +25,12 @@ func TestFileCache(t *testing.T) {
 	// store new key
 	err := cache.Store(ctx, key, []byte(value))
 	require.NoError(t, err)
-	checkValue(ctx, t, fs, filepath.Join(cacheRoot, cachedFilePath), cache, key, value)
+	checkValue(t, ctx, fs, filepath.Join(cacheRoot, cachedFilePath), cache, key, value)
 
 	// update existing key
 	err = cache.Store(ctx, key, []byte(newValue))
 	require.NoError(t, err)
-	checkValue(ctx, t, fs, filepath.Join(cacheRoot, cachedFilePath), cache, key, newValue)
+	checkValue(t, ctx, fs, filepath.Join(cacheRoot, cachedFilePath), cache, key, newValue)
 
 	// delete key
 	err = cache.Delete(ctx, key)
@@ -40,7 +40,7 @@ func TestFileCache(t *testing.T) {
 	require.False(t, exists)
 }
 
-func checkValue(ctx context.Context, t *testing.T, fs afero.Fs, fileFullPath string, cache *FileCache, key, wantValue string) {
+func checkValue(t *testing.T, ctx context.Context, fs afero.Fs, fileFullPath string, cache *FileCache, key, wantValue string) { //nolint:revive
 	t.Helper()
 	// check actual file content
 	b, err := afero.ReadFile(fs, fileFullPath)

docker/common/defaults/settings.json

@@ -5,4 +5,4 @@
   "log": "stdout",
   "database": "/database/filebrowser.db",
   "root": "/srv"
-}
+}

errors/errors.go

@@ -1,29 +1,40 @@
-package fberrors
+package errors
 
 import (
 	"errors"
 	"fmt"
+	"os"
+	"syscall"
+)
+
+const (
+	ExitCodeSigTerm = 128 + int(syscall.SIGTERM)
+	ExitCodeSighup  = 128 + int(syscall.SIGHUP)
+	ExitCodeSigint  = 128 + int(syscall.SIGINT)
+	ExitCodeSigquit = 128 + int(syscall.SIGQUIT)
 )
 
 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")
-	ErrInvalidDataType          = errors.New("invalid data type")
-	ErrIsDirectory              = errors.New("file is directory")
-	ErrInvalidOption            = errors.New("invalid option")
-	ErrInvalidAuthMethod        = errors.New("invalid auth method")
-	ErrPermissionDenied         = errors.New("permission denied")
-	ErrInvalidRequestParams     = errors.New("invalid request params")
-	ErrSourceIsParent           = errors.New("source is parent")
-	ErrRootUserDeletion         = errors.New("the sole admin can't be deleted")
-	ErrCurrentPasswordIncorrect = errors.New("the current password is incorrect")
-	ErrShareRequiresDownload    = errors.New("permission to share requires permission to download")
+	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")
+	ErrInvalidDataType      = errors.New("invalid data type")
+	ErrIsDirectory          = errors.New("file is directory")
+	ErrInvalidOption        = errors.New("invalid option")
+	ErrInvalidAuthMethod    = errors.New("invalid auth method")
+	ErrPermissionDenied     = errors.New("permission denied")
+	ErrInvalidRequestParams = errors.New("invalid request params")
+	ErrSourceIsParent       = errors.New("source is parent")
+	ErrRootUserDeletion     = errors.New("user with id 1 can't be deleted")
+	ErrSigTerm              = errors.New("exit on signal: sigterm")
+	ErrSighup               = errors.New("exit on signal: sighup")
+	ErrSigint               = errors.New("exit on signal: sigint")
+	ErrSigquit              = errors.New("exit on signal: sigquit")
 )
 
 type ErrShortPassword struct {
@@ -33,3 +44,44 @@ type ErrShortPassword struct {
 func (e ErrShortPassword) Error() string {
 	return fmt.Sprintf("password is too short, minimum length is %d", e.MinimumLength)
 }
+
+// GetExitCode returns the exit code for a given error.
+func GetExitCode(err error) int {
+	if err == nil {
+		return 0
+	}
+
+	exitCodeMap := map[error]int{
+		ErrSigTerm: ExitCodeSigTerm,
+		ErrSighup:  ExitCodeSighup,
+		ErrSigint:  ExitCodeSigint,
+		ErrSigquit: ExitCodeSigquit,
+	}
+
+	for e, code := range exitCodeMap {
+		if errors.Is(err, e) {
+			return code
+		}
+	}
+
+	if exitErr, ok := err.(interface{ ExitCode() int }); ok {
+		return exitErr.ExitCode()
+	}
+
+	var pathErr *os.PathError
+	if errors.As(err, &pathErr) {
+		return 1
+	}
+
+	var syscallErr *os.SyscallError
+	if errors.As(err, &syscallErr) {
+		return 1
+	}
+
+	var errno syscall.Errno
+	if errors.As(err, &errno) {
+		return 1
+	}
+
+	return 1
+}

files/file.go

@@ -1,8 +1,8 @@
 package files
 
 import (
-	"crypto/md5"
-	"crypto/sha1"
+	"crypto/md5"  //nolint:gosec
+	"crypto/sha1" //nolint:gosec
 	"crypto/sha256"
 	"crypto/sha512"
 	"encoding/hex"
@@ -18,13 +18,13 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
-	"sort"
 	"strings"
 	"time"
 
-	fberrors "github.com/filebrowser/filebrowser/v2/errors"
-	"github.com/filebrowser/filebrowser/v2/rules"
 	"github.com/spf13/afero"
+
+	fbErrors "github.com/filebrowser/filebrowser/v2/errors"
+	"github.com/filebrowser/filebrowser/v2/rules"
 )
 
 var (
@@ -60,7 +60,6 @@ type FileOptions struct {
 	Modify     bool
 	Expand     bool
 	ReadHeader bool
-	CalcImgRes bool
 	Token      string
 	Checker    rules.Checker
 	Content    bool
@@ -91,13 +90,13 @@ func NewFileInfo(opts *FileOptions) (*FileInfo, error) {
 
 	if opts.Expand {
 		if file.IsDir {
-			if err := file.readListing(opts.Checker, opts.ReadHeader, opts.CalcImgRes); err != nil {
+			if err := file.readListing(opts.Checker, opts.ReadHeader); err != nil { //nolint:govet
 				return nil, err
 			}
 			return file, nil
 		}
 
-		err = file.detectType(opts.Modify, opts.Content, true, opts.CalcImgRes)
+		err = file.detectType(opts.Modify, opts.Content, true)
 		if err != nil {
 			return nil, err
 		}
@@ -169,7 +168,7 @@ func stat(opts *FileOptions) (*FileInfo, error) {
 // algorithm. The checksums data is saved on File object.
 func (i *FileInfo) Checksum(algo string) error {
 	if i.IsDir {
-		return fberrors.ErrIsDirectory
+		return fbErrors.ErrIsDirectory
 	}
 
 	if i.Checksums == nil {
@@ -184,6 +183,7 @@ func (i *FileInfo) Checksum(algo string) error {
 
 	var h hash.Hash
 
+	//nolint:gosec
 	switch algo {
 	case "md5":
 		h = md5.New()
@@ -194,7 +194,7 @@ func (i *FileInfo) Checksum(algo string) error {
 	case "sha512":
 		h = sha512.New()
 	default:
-		return fberrors.ErrInvalidOption
+		return fbErrors.ErrInvalidOption
 	}
 
 	_, err = io.Copy(h, reader)
@@ -219,7 +219,7 @@ func (i *FileInfo) RealPath() string {
 	return i.Path
 }
 
-func (i *FileInfo) detectType(modify, saveContent, readHeader bool, calcImgRes bool) error {
+func (i *FileInfo) detectType(modify, saveContent, readHeader bool) error {
 	if IsNamedPipe(i.Mode) {
 		i.Type = "blob"
 		return nil
@@ -250,13 +250,11 @@ func (i *FileInfo) detectType(modify, saveContent, readHeader bool, calcImgRes b
 		return nil
 	case strings.HasPrefix(mimetype, "image"):
 		i.Type = "image"
-		if calcImgRes {
-			resolution, err := calculateImageResolution(i.Fs, i.Path)
-			if err != nil {
-				log.Printf("Error calculating image resolution: %v", err)
-			} else {
-				i.Resolution = resolution
-			}
+		resolution, err := calculateImageResolution(i.Fs, i.Path)
+		if err != nil {
+			log.Printf("Error calculating image resolution: %v", err)
+		} else {
+			i.Resolution = resolution
 		}
 		return nil
 	case strings.HasSuffix(mimetype, "pdf"):
@@ -390,8 +388,9 @@ func (i *FileInfo) addSubtitle(fPath string) {
 	i.Subtitles = append(i.Subtitles, fPath)
 }
 
-func (i *FileInfo) readListing(checker rules.Checker, readHeader bool, calcImgRes bool) error {
-	dir, err := readDir(i.Fs, i.Path)
+func (i *FileInfo) readListing(checker rules.Checker, readHeader bool) error {
+	afs := &afero.Afero{Fs: i.Fs}
+	dir, err := afs.ReadDir(i.Path)
 	if err != nil {
 		return err
 	}
@@ -413,19 +412,12 @@ func (i *FileInfo) readListing(checker rules.Checker, readHeader bool, calcImgRe
 		isSymlink, isInvalidLink := false, false
 		if IsSymlink(f.Mode()) {
 			isSymlink = true
-			// It's a symbolic link. We try to follow it. The scoped filesystem
-			// refuses to dereference a link whose target escapes the scope
-			// (permission error); such a link is omitted from the listing
-			// entirely so it cannot leak the target's metadata. Any other
-			// failure means a broken link, which we surface as an invalid link
-			// rather than the target's information.
+			// It's a symbolic link. We try to follow it. If it doesn't work,
+			// we stay with the link information instead of the target's.
 			info, err := i.Fs.Stat(fPath)
-			switch {
-			case err == nil:
+			if err == nil {
 				f = info
-			case errors.Is(err, os.ErrPermission):
-				continue
-			default:
+			} else {
 				isInvalidLink = true
 			}
 		}
@@ -443,7 +435,7 @@ func (i *FileInfo) readListing(checker rules.Checker, readHeader bool, calcImgRe
 			currentDir: dir,
 		}
 
-		if !file.IsDir && strings.HasPrefix(mime.TypeByExtension(file.Extension), "image/") && calcImgRes {
+		if !file.IsDir && strings.HasPrefix(mime.TypeByExtension(file.Extension), "image/") {
 			resolution, err := calculateImageResolution(file.Fs, file.Path)
 			if err != nil {
 				log.Printf("Error calculating resolution for image %s: %v", file.Path, err)
@@ -460,7 +452,7 @@ func (i *FileInfo) readListing(checker rules.Checker, readHeader bool, calcImgRe
 			if isInvalidLink {
 				file.Type = "invalid_link"
 			} else {
-				err := file.detectType(true, false, readHeader, calcImgRes)
+				err := file.detectType(true, false, readHeader)
 				if err != nil {
 					return err
 				}
@@ -473,56 +465,3 @@ func (i *FileInfo) readListing(checker rules.Checker, readHeader bool, calcImgRe
 	i.Listing = listing
 	return nil
 }
-
-func readDir(afs afero.Fs, dirname string) ([]os.FileInfo, error) {
-	dir, err := afero.ReadDir(afs, dirname)
-	if err == nil {
-		return dir, nil
-	}
-
-	dir, fallbackErr := readDirNames(afs, dirname)
-	if fallbackErr != nil {
-		return nil, err
-	}
-
-	return dir, nil
-}
-
-func readDirNames(afs afero.Fs, dirname string) ([]os.FileInfo, error) {
-	file, err := afs.Open(dirname)
-	if err != nil {
-		return nil, err
-	}
-
-	names, err := file.Readdirnames(-1)
-	if closeErr := file.Close(); err == nil && closeErr != nil {
-		err = closeErr
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	sort.Strings(names)
-	dir := make([]os.FileInfo, 0, len(names))
-	for _, name := range names {
-		fPath := path.Join(dirname, name)
-		info, err := lstatIfPossible(afs, fPath)
-		if err != nil {
-			log.Printf("Skipping inaccessible file %s: %v", fPath, err)
-			continue
-		}
-
-		dir = append(dir, info)
-	}
-
-	return dir, nil
-}
-
-func lstatIfPossible(afs afero.Fs, name string) (os.FileInfo, error) {
-	if lstaterFs, ok := afs.(afero.Lstater); ok {
-		info, _, err := lstaterFs.LstatIfPossible(name)
-		return info, err
-	}
-
-	return afs.Stat(name)
-}

files/file_test.go

@@ -1,347 +0,0 @@
-package files
-
-import (
-	"os"
-	"path"
-	"path/filepath"
-	"testing"
-
-	"github.com/spf13/afero"
-)
-
-func TestScopedFs(t *testing.T) {
-	t.Run("path inside scope is allowed", func(t *testing.T) {
-		scope := t.TempDir()
-		if err := os.WriteFile(filepath.Join(scope, "file.txt"), []byte("x"), 0o644); err != nil {
-			t.Fatal(err)
-		}
-		fs := NewScopedFs(afero.NewOsFs(), scope)
-
-		if _, err := fs.Stat("/file.txt"); err != nil {
-			t.Fatalf("expected in-scope file to be accessible, got %v", err)
-		}
-	})
-
-	t.Run("new file inside scope can be created", func(t *testing.T) {
-		scope := t.TempDir()
-		fs := NewScopedFs(afero.NewOsFs(), scope)
-
-		f, err := fs.OpenFile("/does-not-exist-yet.txt", os.O_RDWR|os.O_CREATE, 0o644)
-		if err != nil {
-			t.Fatalf("expected to create a new in-scope file, got %v", err)
-		}
-		_ = f.Close()
-	})
-
-	// Regression for #5975: when the scope resolves to the filesystem root,
-	// root+separator used to be "//", which no path matched, so every write
-	// was rejected with os.ErrPermission (HTTP 403).
-	t.Run("filesystem root scope allows access", func(t *testing.T) {
-		f := filepath.Join(t.TempDir(), "file.txt")
-		if err := os.WriteFile(f, []byte("x"), 0o644); err != nil {
-			t.Fatal(err)
-		}
-		fs := NewScopedFs(afero.NewOsFs(), "/")
-
-		if _, err := fs.Stat(f); err != nil {
-			t.Fatalf("expected a path under root scope to be accessible, got %v", err)
-		}
-	})
-
-	t.Run("escaping symlink to a sibling is rejected", func(t *testing.T) {
-		base := t.TempDir()
-		scope := filepath.Join(base, "srv")
-		sibling := filepath.Join(base, "srvother")
-		for _, d := range []string{scope, sibling} {
-			if err := os.MkdirAll(d, 0o755); err != nil {
-				t.Fatal(err)
-			}
-		}
-		if err := os.WriteFile(filepath.Join(sibling, "secret.txt"), []byte("secret"), 0o644); err != nil {
-			t.Fatal(err)
-		}
-		// A symlink lexically inside the scope pointing at a sibling directory
-		// must not be followed for reads or stats.
-		if err := os.Symlink(sibling, filepath.Join(scope, "escape")); err != nil {
-			t.Skipf("cannot create symlink: %v", err)
-		}
-		fs := NewScopedFs(afero.NewOsFs(), scope)
-
-		if _, err := fs.Stat("/escape"); !os.IsPermission(err) {
-			t.Fatalf("expected stat of escaping symlink to be rejected, got %v", err)
-		}
-		if _, err := fs.Open("/escape/secret.txt"); !os.IsPermission(err) {
-			t.Fatalf("expected read through escaping symlink to be rejected, got %v", err)
-		}
-	})
-
-	t.Run("symlink whose target stays within scope is allowed", func(t *testing.T) {
-		scope := t.TempDir()
-		if err := os.MkdirAll(filepath.Join(scope, "real"), 0o755); err != nil {
-			t.Fatal(err)
-		}
-		if err := os.WriteFile(filepath.Join(scope, "real", "f.txt"), []byte("x"), 0o644); err != nil {
-			t.Fatal(err)
-		}
-		if err := os.Symlink(filepath.Join(scope, "real"), filepath.Join(scope, "link")); err != nil {
-			t.Skipf("cannot create symlink: %v", err)
-		}
-		fs := NewScopedFs(afero.NewOsFs(), scope)
-
-		if _, err := fs.Stat("/link/f.txt"); err != nil {
-			t.Fatalf("expected in-scope symlink target to be accessible, got %v", err)
-		}
-	})
-
-	// Regression for the dangling-symlink write escape (GHSA-8wc8-hf36-mjh9 /
-	// GHSA-fh54-6rfh-r8f3): a symlink whose target does not exist yet must not be
-	// followed for writes. Previously within() validated the link's in-scope
-	// parent directory, so OpenFile(O_CREATE) dereferenced the link and created
-	// the file at its out-of-scope target.
-	t.Run("write through a dangling escaping symlink is rejected", func(t *testing.T) {
-		base := t.TempDir()
-		scope := filepath.Join(base, "scope")
-		outside := filepath.Join(base, "outside")
-		for _, d := range []string{scope, outside} {
-			if err := os.MkdirAll(d, 0o755); err != nil {
-				t.Fatal(err)
-			}
-		}
-		outsideTarget := filepath.Join(outside, "created.txt") // does not exist yet
-		if err := os.Symlink(outsideTarget, filepath.Join(scope, "evil")); err != nil {
-			t.Skipf("cannot create symlink: %v", err)
-		}
-		fs := NewScopedFs(afero.NewOsFs(), scope)
-
-		f, err := fs.OpenFile("/evil", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o644)
-		if err == nil {
-			_ = f.Close()
-			t.Fatal("VULNERABLE: write through a dangling escaping symlink was allowed")
-		}
-		if !os.IsPermission(err) {
-			t.Fatalf("expected permission error, got %v", err)
-		}
-		if _, statErr := os.Stat(outsideTarget); statErr == nil {
-			t.Fatal("VULNERABLE: file was created outside the scope")
-		}
-	})
-
-	// A dangling *relative* symlink that lives under an escaping directory
-	// symlink must be resolved against the link's real directory, not its lexical
-	// parent. Otherwise the symlinked ancestor can shift the computed target back
-	// into scope while the real OS write lands outside it.
-	t.Run("write through a dangling relative symlink under a symlinked dir is rejected", func(t *testing.T) {
-		base := t.TempDir()
-		scope := filepath.Join(base, "scope")
-		outside := filepath.Join(base, "outside")
-		for _, d := range []string{scope, outside} {
-			if err := os.MkdirAll(d, 0o755); err != nil {
-				t.Fatal(err)
-			}
-		}
-		// An escaping directory symlink inside the scope: /scope/m -> /base/outside.
-		if err := os.Symlink(outside, filepath.Join(scope, "m")); err != nil {
-			t.Skipf("cannot create symlink: %v", err)
-		}
-		// A relative dangling symlink inside the escaping dir whose target,
-		// resolved against the real directory (/base/outside), is /base/escaped —
-		// outside the scope.
-		if err := os.Symlink("../escaped", filepath.Join(outside, "evil")); err != nil {
-			t.Skipf("cannot create symlink: %v", err)
-		}
-		fs := NewScopedFs(afero.NewOsFs(), scope)
-
-		f, err := fs.OpenFile("/m/evil", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o644)
-		if err == nil {
-			_ = f.Close()
-			t.Fatal("VULNERABLE: write through a dangling relative symlink under a symlinked dir was allowed")
-		}
-		if !os.IsPermission(err) {
-			t.Fatalf("expected permission error, got %v", err)
-		}
-		if _, statErr := os.Stat(filepath.Join(base, "escaped")); statErr == nil {
-			t.Fatal("VULNERABLE: file was created outside the scope")
-		}
-	})
-
-	// Regression for the symlink-following delete escape (GHSA-hq4g-mpch-f9vp /
-	// GHSA-fmm7-x4gx-8jhr): Remove/RemoveAll used to skip guard(), so RemoveAll
-	// followed a symlinked ancestor escaping the scope and deleted an
-	// out-of-scope file.
-	t.Run("RemoveAll through an escaping symlink is rejected", func(t *testing.T) {
-		base := t.TempDir()
-		scope := filepath.Join(base, "scope")
-		outside := filepath.Join(base, "outside")
-		for _, d := range []string{scope, outside} {
-			if err := os.MkdirAll(d, 0o755); err != nil {
-				t.Fatal(err)
-			}
-		}
-		victim := filepath.Join(outside, "victim.txt")
-		if err := os.WriteFile(victim, []byte("keep"), 0o644); err != nil {
-			t.Fatal(err)
-		}
-		if err := os.Symlink(outside, filepath.Join(scope, "link")); err != nil {
-			t.Skipf("cannot create symlink: %v", err)
-		}
-		fs := NewScopedFs(afero.NewOsFs(), scope)
-
-		if err := fs.RemoveAll("/link/victim.txt"); !os.IsPermission(err) {
-			t.Fatalf("expected RemoveAll through escaping symlink to be rejected, got %v", err)
-		}
-		if _, statErr := os.Stat(victim); statErr != nil {
-			t.Fatalf("VULNERABLE: out-of-scope victim file was deleted: %v", statErr)
-		}
-	})
-
-	// The guard added for the delete escape must not break legitimate deletes of
-	// in-scope files.
-	t.Run("RemoveAll of an in-scope file is allowed", func(t *testing.T) {
-		scope := t.TempDir()
-		target := filepath.Join(scope, "deleteme.txt")
-		if err := os.WriteFile(target, []byte("x"), 0o644); err != nil {
-			t.Fatal(err)
-		}
-		fs := NewScopedFs(afero.NewOsFs(), scope)
-
-		if err := fs.RemoveAll("/deleteme.txt"); err != nil {
-			t.Fatalf("expected in-scope RemoveAll to succeed, got %v", err)
-		}
-		if _, statErr := os.Stat(target); statErr == nil {
-			t.Fatal("expected in-scope file to be deleted")
-		}
-	})
-}
-
-// stat must reject a regular file reached through a symlinked ancestor that
-// escapes the scope (GHSA-hf77-9m7w-fq8q), while still serving in-scope files.
-func TestStatRejectsLinkedAncestorEscape(t *testing.T) {
-	scope := t.TempDir()
-	if err := os.MkdirAll(filepath.Join(scope, "shared"), 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.MkdirAll(filepath.Join(scope, "private"), 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(scope, "private", "secret.txt"), []byte("secret"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(scope, "shared", "ok.txt"), []byte("ok"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Symlink(filepath.Join(scope, "private"), filepath.Join(scope, "shared", "link")); err != nil {
-		t.Skipf("cannot create symlink: %v", err)
-	}
-
-	// Filesystem scoped to the shared directory, as a public share would be.
-	bfs := NewScopedFs(afero.NewOsFs(), filepath.Join(scope, "shared"))
-
-	if _, err := stat(&FileOptions{Fs: bfs, Path: "/link/secret.txt"}); !os.IsPermission(err) {
-		t.Fatalf("expected permission error for linked-ancestor escape, got %v", err)
-	}
-	if _, err := stat(&FileOptions{Fs: bfs, Path: "/ok.txt"}); err != nil {
-		t.Fatalf("expected in-scope file to be served, got %v", err)
-	}
-}
-
-type allowAllChecker struct{}
-
-func (allowAllChecker) Check(string) bool {
-	return true
-}
-
-type inaccessibleChildFs struct {
-	afero.Fs
-	child string
-}
-
-func (fs inaccessibleChildFs) Open(name string) (afero.File, error) {
-	file, err := fs.Fs.Open(name)
-	if err != nil {
-		return nil, err
-	}
-
-	if path.Clean(name) == "/" {
-		return inaccessibleChildDir{File: file}, nil
-	}
-
-	return file, nil
-}
-
-func (fs inaccessibleChildFs) Stat(name string) (os.FileInfo, error) {
-	if path.Clean(name) == fs.child {
-		return nil, os.ErrPermission
-	}
-
-	return fs.Fs.Stat(name)
-}
-
-func (fs inaccessibleChildFs) LstatIfPossible(name string) (os.FileInfo, bool, error) {
-	if path.Clean(name) == fs.child {
-		return nil, false, os.ErrPermission
-	}
-
-	if lstater, ok := fs.Fs.(afero.Lstater); ok {
-		return lstater.LstatIfPossible(name)
-	}
-
-	info, err := fs.Fs.Stat(name)
-	return info, false, err
-}
-
-type inaccessibleChildDir struct {
-	afero.File
-}
-
-func (dir inaccessibleChildDir) Readdir(int) ([]os.FileInfo, error) {
-	return nil, os.ErrPermission
-}
-
-func TestReadListingSkipsInaccessibleChildren(t *testing.T) {
-	memFs := afero.NewMemMapFs()
-	for _, dir := range []string{"/media", "/proton-mount"} {
-		if err := memFs.Mkdir(dir, 0o755); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	file, err := NewFileInfo(&FileOptions{
-		Fs:      inaccessibleChildFs{Fs: memFs, child: "/proton-mount"},
-		Path:    "/",
-		Expand:  true,
-		Checker: allowAllChecker{},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if file.Listing == nil {
-		t.Fatal("expected root listing")
-	}
-
-	if got := len(file.Items); got != 1 {
-		t.Fatalf("expected one accessible child, got %d", got)
-	}
-
-	if got := file.Items[0].Name; got != "media" {
-		t.Fatalf("expected accessible child to be listed, got %q", got)
-	}
-
-	if got := file.NumDirs; got != 1 {
-		t.Fatalf("expected one listed directory, got %d", got)
-	}
-}
-
-func TestFileInfoRealPathUsesScopedFsRealPath(t *testing.T) {
-	root := t.TempDir()
-	file := &FileInfo{
-		Fs:   NewScopedFs(afero.NewOsFs(), root),
-		Path: "/root/downloads",
-	}
-
-	got := file.RealPath()
-	want := filepath.Join(root, "root", "downloads")
-	if got != want {
-		t.Fatalf("got %q, want %q", got, want)
-	}
-}

files/fs_test.go

@@ -1,121 +0,0 @@
-package files
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/spf13/afero"
-)
-
-// TestNewFs verifies that NewFs picks the right implementation and that the
-// follow-external-symlinks toggle flips whether a symlink pointing outside the
-// scope is honored.
-func TestNewFs(t *testing.T) {
-	base := t.TempDir()
-	scope := filepath.Join(base, "srv")
-	outside := filepath.Join(base, "outside")
-	for _, d := range []string{scope, outside} {
-		if err := os.MkdirAll(d, 0o755); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if err := os.WriteFile(filepath.Join(outside, "secret.txt"), []byte("secret"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	// A symlink lexically inside the scope whose target resolves outside it.
-	if err := os.Symlink(outside, filepath.Join(scope, "escape")); err != nil {
-		t.Skipf("cannot create symlink: %v", err)
-	}
-
-	t.Run("disabled returns a ScopedFs that rejects the escaping symlink", func(t *testing.T) {
-		fs := NewFs(afero.NewOsFs(), scope, false)
-		if _, ok := fs.(*ScopedFs); !ok {
-			t.Fatalf("expected *ScopedFs, got %T", fs)
-		}
-		if _, err := fs.Stat("/escape"); !os.IsPermission(err) {
-			t.Fatalf("expected stat of escaping symlink to be rejected, got %v", err)
-		}
-	})
-
-	t.Run("enabled returns a BasePathFs that follows the escaping symlink", func(t *testing.T) {
-		fs := NewFs(afero.NewOsFs(), scope, true)
-		if _, ok := fs.(*afero.BasePathFs); !ok {
-			t.Fatalf("expected *afero.BasePathFs, got %T", fs)
-		}
-		if _, err := fs.Stat("/escape"); err != nil {
-			t.Fatalf("expected escaping symlink to be followed, got %v", err)
-		}
-		b, err := afero.ReadFile(fs, "/escape/secret.txt")
-		if err != nil {
-			t.Fatalf("expected to read through escaping symlink, got %v", err)
-		}
-		if string(b) != "secret" {
-			t.Fatalf("got %q, want %q", b, "secret")
-		}
-
-		// The link must also appear in a directory listing (the symptom in #5998).
-		entries, err := afero.ReadDir(fs, "/")
-		if err != nil {
-			t.Fatal(err)
-		}
-		var found bool
-		for _, e := range entries {
-			if e.Name() == "escape" {
-				found = true
-			}
-		}
-		if !found {
-			t.Fatal("expected escaping symlink to appear in the listing")
-		}
-	})
-}
-
-// TestBasePath verifies BasePath extracts the underlying *afero.BasePathFs from
-// either filesystem NewFs may return, so User.FullPath keeps working.
-func TestBasePath(t *testing.T) {
-	root := t.TempDir()
-	osFs := afero.NewOsFs()
-
-	for _, tc := range []struct {
-		name           string
-		followExternal bool
-	}{
-		{"ScopedFs", false},
-		{"BasePathFs", true},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			fs := NewFs(osFs, root, tc.followExternal)
-			base := BasePath(fs)
-			if base == nil {
-				t.Fatalf("expected non-nil base for %T", fs)
-			}
-			got := afero.FullBaseFsPath(base, "/x")
-			want := filepath.Join(root, "x")
-			if got != want {
-				t.Fatalf("FullBaseFsPath: got %q, want %q", got, want)
-			}
-		})
-	}
-
-	if got := BasePath(osFs); got != nil {
-		t.Fatalf("expected nil base for a plain OsFs, got %v", got)
-	}
-}
-
-// TestFileInfoRealPathUsesBasePathFsRealPath mirrors
-// TestFileInfoRealPathUsesScopedFsRealPath for the follow-external-symlinks case,
-// where the user filesystem is a bare BasePathFs.
-func TestFileInfoRealPathUsesBasePathFsRealPath(t *testing.T) {
-	root := t.TempDir()
-	file := &FileInfo{
-		Fs:   NewFs(afero.NewOsFs(), root, true),
-		Path: "/root/downloads",
-	}
-
-	got := file.RealPath()
-	want := filepath.Join(root, "root", "downloads")
-	if got != want {
-		t.Fatalf("got %q, want %q", got, want)
-	}
-}

files/mime.go

@@ -600,6 +600,7 @@ var types = map[string]string{
 	".epub":      "application/epub+zip",
 }
 
+//nolint:gochecknoinits
 func init() {
 	for ext, typ := range types {
 		// skip errors

files/scoped.go

@@ -1,253 +0,0 @@
-package files
-
-import (
-	"errors"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/spf13/afero"
-)
-
-// ScopedFs is an afero.Fs that confines every operation to a base directory and
-// refuses to follow a symbolic link whose on-disk target resolves outside that
-// base. It wraps an *afero.BasePathFs — which already provides the lexical
-// confinement — and adds a per-operation scope check on every call that would
-// dereference a symlink at the OS layer (open, stat, lstat, chmod, …).
-type ScopedFs struct {
-	base *afero.BasePathFs
-}
-
-var (
-	_ afero.Fs      = (*ScopedFs)(nil)
-	_ afero.Lstater = (*ScopedFs)(nil)
-)
-
-// maxSymlinkHops bounds how many dangling symlinks within() will follow before
-// giving up, so a pathological chain cannot loop forever. It mirrors the kernel
-// MAXSYMLINKS limit; the operation is rejected once the bound is exceeded.
-const maxSymlinkHops = 255
-
-func NewScopedFs(source afero.Fs, path string) *ScopedFs {
-	if s, ok := source.(*ScopedFs); ok {
-		source = s.base
-	}
-	return &ScopedFs{base: afero.NewBasePathFs(source, path).(*afero.BasePathFs)}
-}
-
-// NewFs builds a user filesystem rooted at path. When followExternal is true it
-// returns a bare BasePathFs, so symlinks whose target resolves outside the scope
-// are followed; otherwise it returns a ScopedFs that refuses to follow them.
-func NewFs(source afero.Fs, path string, followExternal bool) afero.Fs {
-	if followExternal {
-		return afero.NewBasePathFs(source, path)
-	}
-	return NewScopedFs(source, path)
-}
-
-// BasePath returns the underlying *afero.BasePathFs of a user filesystem built
-// by NewFs, whether it is a *ScopedFs or a bare *afero.BasePathFs, or nil if it
-// is neither.
-func BasePath(fs afero.Fs) *afero.BasePathFs {
-	switch f := fs.(type) {
-	case *ScopedFs:
-		return f.BasePathFs()
-	case *afero.BasePathFs:
-		return f
-	}
-	return nil
-}
-
-// BasePathFs returns the underlying *afero.BasePathFs.
-func (s *ScopedFs) BasePathFs() *afero.BasePathFs { return s.base }
-
-// RealPath resolves a scoped path to the real on-disk path by delegating to
-// the underlying BasePathFs. This is needed by callers that need the actual
-// filesystem path (e.g. disk.UsageWithContext).
-func (s *ScopedFs) RealPath(name string) (string, error) {
-	return s.base.RealPath(name)
-}
-
-// guard returns an error if name's on-disk target resolves outside the scope.
-func (s *ScopedFs) guard(name string) error {
-	ok, err := s.within(name)
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return os.ErrPermission
-	}
-	return nil
-}
-
-// within reports whether the on-disk target of p — after resolving any symbolic
-// links — stays within the scoped root. It exists to stop a symlink that lives
-// lexically inside the scope but points outside it from being followed for
-// reads, writes, or shares.
-//
-// Paths that do not exist yet (e.g. a brand-new file being created) are
-// validated against their nearest existing ancestor, so legitimate new files
-// are always allowed. A dangling symlink — a link whose target does not exist
-// yet — is the exception: it is followed to where it points and validated
-// there, so a write cannot dereference the link to create a file outside the
-// scope.
-func (s *ScopedFs) within(p string) (bool, error) {
-	root, err := filepath.EvalSymlinks(afero.FullBaseFsPath(s.base, "/"))
-	if err != nil {
-		return false, err
-	}
-
-	target := afero.FullBaseFsPath(s.base, p)
-	resolved, err := filepath.EvalSymlinks(target)
-	// When target does not resolve, work out where the operation would actually
-	// land. A non-existent regular path resolves to the file that would be
-	// created inside its containing directory, so walk up to the nearest
-	// existing ancestor and validate that. But when target itself is a dangling
-	// symlink, follow it one level instead: validating its lexical parent would
-	// wrongly accept a link pointing outside the scope, letting a write follow
-	// the link and create the file out of bounds.
-	for hops := 0; errors.Is(err, fs.ErrNotExist); {
-		if fi, lerr := os.Lstat(target); lerr == nil && fi.Mode()&os.ModeSymlink != 0 {
-			hops++
-			if hops > maxSymlinkHops {
-				return false, os.ErrPermission
-			}
-			dest, rerr := os.Readlink(target)
-			if rerr != nil {
-				return false, rerr
-			}
-			if !filepath.IsAbs(dest) {
-				// Resolve the link relative to the directory that really contains
-				// it, not its lexical parent: a symlinked ancestor could otherwise
-				// shift the computed target back into scope while the real write
-				// lands outside it. The parent is guaranteed to resolve here
-				// because os.Lstat above already traversed it.
-				base, berr := filepath.EvalSymlinks(filepath.Dir(target))
-				if berr != nil {
-					return false, berr
-				}
-				dest = filepath.Join(base, dest)
-			}
-			target = filepath.Clean(dest)
-		} else {
-			parent := filepath.Dir(target)
-			if parent == target {
-				break
-			}
-			target = parent
-		}
-		resolved, err = filepath.EvalSymlinks(target)
-	}
-	if err != nil {
-		return false, err
-	}
-
-	// Compare against root with a trailing separator so a sibling like
-	// "/srvother" is not treated as being inside "/srv". When root is itself the
-	// filesystem boundary (e.g. "/"), it already ends in a separator, so avoid
-	// producing "//" — which no path would match — and accept any path under it.
-	prefix := root
-	if !strings.HasSuffix(prefix, string(filepath.Separator)) {
-		prefix += string(filepath.Separator)
-	}
-
-	return resolved == root || strings.HasPrefix(resolved, prefix), nil
-}
-
-func (s *ScopedFs) Create(name string) (afero.File, error) {
-	if err := s.guard(name); err != nil {
-		return nil, err
-	}
-	return s.base.Create(name)
-}
-
-func (s *ScopedFs) Mkdir(name string, perm os.FileMode) error {
-	if err := s.guard(name); err != nil {
-		return err
-	}
-	return s.base.Mkdir(name, perm)
-}
-
-func (s *ScopedFs) MkdirAll(path string, perm os.FileMode) error {
-	if err := s.guard(path); err != nil {
-		return err
-	}
-	return s.base.MkdirAll(path, perm)
-}
-
-func (s *ScopedFs) Open(name string) (afero.File, error) {
-	if err := s.guard(name); err != nil {
-		return nil, err
-	}
-	return s.base.Open(name)
-}
-
-func (s *ScopedFs) OpenFile(name string, flag int, perm os.FileMode) (afero.File, error) {
-	if err := s.guard(name); err != nil {
-		return nil, err
-	}
-	return s.base.OpenFile(name, flag, perm)
-}
-
-func (s *ScopedFs) Remove(name string) error {
-	if err := s.guard(name); err != nil {
-		return err
-	}
-	return s.base.Remove(name)
-}
-
-func (s *ScopedFs) RemoveAll(path string) error {
-	if err := s.guard(path); err != nil {
-		return err
-	}
-	return s.base.RemoveAll(path)
-}
-
-func (s *ScopedFs) Rename(oldname, newname string) error {
-	if err := s.guard(oldname); err != nil {
-		return err
-	}
-	if err := s.guard(newname); err != nil {
-		return err
-	}
-	return s.base.Rename(oldname, newname)
-}
-
-func (s *ScopedFs) Stat(name string) (os.FileInfo, error) {
-	if err := s.guard(name); err != nil {
-		return nil, err
-	}
-	return s.base.Stat(name)
-}
-
-func (s *ScopedFs) Name() string { return "ScopedFs" }
-
-func (s *ScopedFs) Chmod(name string, mode os.FileMode) error {
-	if err := s.guard(name); err != nil {
-		return err
-	}
-	return s.base.Chmod(name, mode)
-}
-
-func (s *ScopedFs) Chown(name string, uid, gid int) error {
-	if err := s.guard(name); err != nil {
-		return err
-	}
-	return s.base.Chown(name, uid, gid)
-}
-
-func (s *ScopedFs) Chtimes(name string, atime, mtime time.Time) error {
-	if err := s.guard(name); err != nil {
-		return err
-	}
-	return s.base.Chtimes(name, atime, mtime)
-}
-
-func (s *ScopedFs) LstatIfPossible(name string) (os.FileInfo, bool, error) {
-	if err := s.guard(name); err != nil {
-		return nil, false, err
-	}
-	return s.base.LstatIfPossible(name)
-}

fileutils/copy_test.go

@@ -1,75 +0,0 @@
-package fileutils
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/filebrowser/filebrowser/v2/files"
-	"github.com/spf13/afero"
-)
-
-// Copying an in-scope directory that contains a symlink whose target escapes
-// the user's scope must not dereference that symlink into the destination.
-// Otherwise a scoped user could exfiltrate out-of-scope file content via the
-// recursive copy path (GHSA-c2gv-wf5f-hjhh, an incomplete fix of
-// GHSA-239w-m3h6-ch8v).
-func TestCopyDoesNotDereferenceEscapingSymlink(t *testing.T) {
-	base := t.TempDir()
-	scope := filepath.Join(base, "scope")
-	if err := os.MkdirAll(filepath.Join(scope, "srcdir"), 0o755); err != nil {
-		t.Fatal(err)
-	}
-
-	// A secret living outside the scope.
-	secret := filepath.Join(base, "secret.txt")
-	if err := os.WriteFile(secret, []byte("OUT-OF-SCOPE-SECRET"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	// An escaping symlink planted inside the user's scope.
-	if err := os.Symlink(secret, filepath.Join(scope, "srcdir", "link.txt")); err != nil {
-		t.Skipf("cannot create symlink: %v", err)
-	}
-
-	afs := files.NewScopedFs(afero.NewOsFs(), scope)
-
-	err := Copy(afs, "/srcdir", "/dstdir", 0o644, 0o755)
-	if err == nil {
-		t.Fatal("expected copy of a directory containing an escaping symlink to fail")
-	}
-
-	// The escaping symlink's target content must not have landed in scope.
-	if data, readErr := afero.ReadFile(afs, "/dstdir/link.txt"); readErr == nil {
-		t.Fatalf("escaping symlink was dereferenced into scope: got %q", string(data))
-	}
-}
-
-// A symlink whose target stays within scope is legitimate and must still be
-// copied (dereferenced) so the fix does not over-block normal usage.
-func TestCopyAllowsInScopeSymlink(t *testing.T) {
-	scope := t.TempDir()
-	if err := os.MkdirAll(filepath.Join(scope, "srcdir", "real"), 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(scope, "srcdir", "real", "f.txt"), []byte("in-scope"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Symlink(filepath.Join(scope, "srcdir", "real", "f.txt"), filepath.Join(scope, "srcdir", "link.txt")); err != nil {
-		t.Skipf("cannot create symlink: %v", err)
-	}
-
-	afs := files.NewScopedFs(afero.NewOsFs(), scope)
-
-	if err := Copy(afs, "/srcdir", "/dstdir", 0o644, 0o755); err != nil {
-		t.Fatalf("expected copy of an in-scope symlink to succeed, got: %v", err)
-	}
-
-	data, err := afero.ReadFile(afs, "/dstdir/link.txt")
-	if err != nil {
-		t.Fatalf("expected in-scope symlink to be copied, got: %v", err)
-	}
-	if string(data) != "in-scope" {
-		t.Fatalf("unexpected copied content: %q", string(data))
-	}
-}

frontend/assets.go

@@ -1,4 +1,5 @@
 //go:build !dev
+// +build !dev
 
 package frontend
 

frontend/assets_dev.go

@@ -0,0 +1,15 @@
+//go:build dev
+// +build dev
+
+package frontend
+
+import (
+	"io/fs"
+	"os"
+)
+
+var assets fs.FS = os.DirFS("frontend")
+
+func Assets() fs.FS {
+	return assets
+}

frontend/index.html

@@ -12,11 +12,7 @@
 
     <link rel="icon" type="image/svg+xml" href="/img/icons/favicon.svg" />
     <link rel="shortcut icon" href="/img/icons/favicon.ico" />
-    <link
-      rel="apple-touch-icon"
-      sizes="180x180"
-      href="/img/icons/apple-touch-icon.png"
-    />
+    <link rel="apple-touch-icon" sizes="180x180" href="/img/icons/apple-touch-icon.png" />
     <meta name="apple-mobile-web-app-title" content="File Browser" />
 
     <!-- Add to home screen for Android and modern mobile browsers -->
@@ -39,7 +35,6 @@
         DisableUsedPercentage: false,
         EnableExec: true,
         EnableThumbs: true,
-        LogoutPage: "",
         LoginPage: true,
         Name: "",
         NoAuth: false,

frontend/package.json

@@ -4,38 +4,37 @@
   "private": true,
   "type": "module",
   "engines": {
-    "node": ">=24.0.0",
-    "pnpm": ">=10.0.0"
+    "node": ">=22.0.0",
+    "pnpm": ">=9.0.0"
   },
   "scripts": {
     "dev": "vite dev",
     "build": "pnpm run typecheck && vite build",
     "clean": "find ./dist -maxdepth 1 -mindepth 1 ! -name '.gitkeep' -exec rm -r {} +",
-    "typecheck": "vue-tsc -p ./tsconfig.app.json --noEmit",
+    "typecheck": "vue-tsc -p ./tsconfig.tsc.json --noEmit",
     "lint": "eslint src/",
     "lint:fix": "eslint --fix src/",
     "format": "prettier --write .",
-    "test": "vitest run"
+    "test": "playwright test"
   },
   "dependencies": {
     "@chenfengyuan/vue-number-input": "^2.0.1",
-    "@vueuse/core": "^14.0.0",
-    "@vueuse/integrations": "^14.0.0",
+    "@vueuse/core": "^12.5.0",
+    "@vueuse/integrations": "^12.5.0",
     "ace-builds": "^1.43.2",
-    "csv-parse": "^6.1.0",
+    "core-js": "^3.44.0",
     "dayjs": "^1.11.13",
     "dompurify": "^3.2.6",
     "epubjs": "^0.3.93",
-    "filesize": "^11.0.13",
+    "filesize": "^10.1.1",
     "js-base64": "^3.7.7",
     "jwt-decode": "^4.0.0",
     "lodash-es": "^4.17.21",
-    "marked": "^18.0.0",
-    "marked-katex-extension": "^5.1.6",
+    "marked": "^15.0.6",
     "material-icons": "^1.13.14",
     "normalize.css": "^8.0.1",
-    "pinia": "^3.0.4",
-    "pretty-bytes": "^7.1.0",
+    "pinia": "^2.3.1",
+    "pretty-bytes": "^6.1.1",
     "qrcode.vue": "^3.6.0",
     "tus-js-client": "^4.3.1",
     "utif": "^3.1.0",
@@ -43,36 +42,38 @@
     "videojs-hotkeys": "^0.2.28",
     "videojs-mobile-ui": "^1.1.1",
     "vue": "^3.5.17",
+    "vue-final-modal": "^4.5.5",
     "vue-i18n": "^11.1.10",
     "vue-lazyload": "^3.0.0",
     "vue-reader": "^1.2.17",
-    "vue-router": "^5.0.0",
+    "vue-router": "^4.5.1",
     "vue-toastification": "^2.0.0-rc.5"
   },
   "devDependencies": {
-    "@intlify/unplugin-vue-i18n": "^11.0.1",
-    "@tsconfig/node24": "^24.0.2",
+    "@intlify/unplugin-vue-i18n": "^6.0.8",
+    "@playwright/test": "^1.54.1",
+    "@tsconfig/node22": "^22.0.2",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.10.1",
+    "@types/node": "^22.10.10",
     "@typescript-eslint/eslint-plugin": "^8.37.0",
-    "@vitejs/plugin-legacy": "^8.0.0",
-    "@vitejs/plugin-vue": "^6.0.1",
+    "@vitejs/plugin-legacy": "^6.0.0",
+    "@vitejs/plugin-vue": "^5.0.4",
     "@vue/eslint-config-prettier": "^10.2.0",
     "@vue/eslint-config-typescript": "^14.6.0",
-    "@vue/tsconfig": "^0.9.0",
+    "@vue/tsconfig": "^0.7.0",
     "autoprefixer": "^10.4.21",
-    "eslint": "^10.0.0",
+    "concurrently": "^9.2.0",
+    "eslint": "^9.31.0",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-prettier": "^5.5.1",
-    "eslint-plugin-vue": "^10.5.1",
+    "eslint-plugin-vue": "^9.24.0",
+    "jsdom": "^26.1.0",
     "postcss": "^8.5.6",
     "prettier": "^3.6.2",
     "terser": "^5.43.1",
-    "typescript": "^5.9.3",
-    "vite": "^8.0.0",
-    "vite-plugin-compression2": "^2.3.1",
-    "vitest": "^4.1.0",
-    "vue-tsc": "^3.1.3"
+    "vite": "^6.4.1",
+    "vite-plugin-compression2": "^1.0.0",
+    "vue-tsc": "^2.2.0"
   },
-  "packageManager": "pnpm@10.33.4+sha512.1c67b3b359b2d408119ba1ed289f34b8fc3c6873412bec6fd264fbdc82489e510fcbecb9ce9d22dae7f3b76269d8441046014bdca53b9979cd7a561ad631b800"
+  "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0"
 }

frontend/playwright.config.ts

@@ -0,0 +1,80 @@
+import { defineConfig, devices } from "@playwright/test";
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: "./tests",
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: "html",
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    baseURL: "http://127.0.0.1:5173",
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: "on-first-retry",
+
+    /* Set default locale to English (US) */
+    locale: "en-US",
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: "chromium",
+      use: { ...devices["Desktop Chrome"] },
+    },
+
+    {
+      name: "firefox",
+      use: { ...devices["Desktop Firefox"] },
+    },
+
+    // {
+    //   name: "webkit",
+    //   use: { ...devices["Desktop Safari"] },
+    // },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  webServer: {
+    command: "npm run dev",
+    url: "http://127.0.0.1:5173",
+    reuseExistingServer: !process.env.CI,
+  },
+});

frontend/public/img/logo.svg

@@ -1 +1,147 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="560" height="560" version="1.1" id="prefix__svg44" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision"><defs id="prefix__defs4"><style type="text/css" id="style2">.prefix__fil1{fill:#fefefe}.prefix__fil6{fill:#006498}.prefix__fil5{fill:#bdeaff}</style></defs><g id="prefix__g85" transform="translate(-70 -70)"><path class="prefix__fil1" d="M350 71c154 0 279 125 279 279S504 629 350 629 71 504 71 350 196 71 350 71z" id="prefix__path9" fill="#fefefe"/><path d="M475 236l118 151c3 116-149 252-292 198l-76-99 114-156s138-95 136-94z" id="prefix__path11" fill="#332c2b" fill-opacity=".149"/><path d="M231 211h208l38 24v246c0 5-3 8-8 8H231c-5 0-8-3-8-8V219c0-5 3-8 8-8z" id="prefix__path13" fill="#2bbcff"/><path d="M231 211h208l38 24v2l-37-23H231c-4 0-7 3-7 7v263c-1-1-1-2-1-3V219c0-5 3-8 8-8z" id="prefix__path15" fill="#53c6fc"/><path class="prefix__fil5" id="prefix__polygon17" fill="#bdeaff" d="M305 212h113v98H305z"/><path class="prefix__fil5" d="M255 363h189c3 0 5 2 5 4v116H250V367c0-2 2-4 5-4z" id="prefix__path19" fill="#bdeaff"/><path class="prefix__fil6" id="prefix__polygon21" fill="#006498" d="M250 470h199v13H250z"/><path class="prefix__fil6" d="M380 226h10c3 0 6 2 6 5v40c0 3-3 6-6 6h-10c-3 0-6-3-6-6v-40c0-3 3-5 6-5z" id="prefix__path23" fill="#006498"/><path class="prefix__fil1" d="M254 226c10 0 17 7 17 17 0 9-7 16-17 16-9 0-17-7-17-16 0-10 8-17 17-17z" id="prefix__path25" fill="#fefefe"/><path class="prefix__fil6" d="M267 448h165c2 0 3 1 3 3 0 1-1 3-3 3H267c-2 0-3-2-3-3 0-2 1-3 3-3z" id="prefix__path27" fill="#006498"/><path class="prefix__fil6" d="M267 415h165c2 0 3 1 3 3 0 1-1 2-3 2H267c-2 0-3-1-3-2 0-2 1-3 3-3z" id="prefix__path29" fill="#006498"/><path class="prefix__fil6" d="M267 381h165c2 0 3 2 3 3 0 2-1 3-3 3H267c-2 0-3-1-3-3 0-1 1-3 3-3z" id="prefix__path31" fill="#006498"/><path class="prefix__fil1" d="M236 472c3 0 5 2 5 5 0 2-2 4-5 4s-5-2-5-4c0-3 2-5 5-5z" id="prefix__path33" fill="#fefefe"/><path class="prefix__fil1" d="M463 472c3 0 5 2 5 5 0 2-2 4-5 4s-5-2-5-4c0-3 2-5 5-5z" id="prefix__path35" fill="#fefefe"/><path class="prefix__fil6" id="prefix__polygon37" fill="#006498" d="M305 212h-21v98h21z"/><path d="M477 479v2c0 5-3 8-8 8H231c-5 0-8-3-8-8v-2c0 4 3 8 8 8h238c5 0 8-4 8-8z" id="prefix__path39" fill="#0ea5eb"/><path d="M350 70c155 0 280 125 280 280S505 630 350 630 70 505 70 350 195 70 350 70zm0 46c129 0 234 105 234 234S479 584 350 584 116 479 116 350s105-234 234-234z" id="prefix__path41" fill="#2979ff"/></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xml:space="preserve"
+   width="560"
+   height="560"
+   version="1.1"
+   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
+   viewBox="0 0 560 560"
+   id="svg44"
+   sodipodi:docname="icon_raw.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="/home/umarcor/filebrowser/logo/icon_raw.svg.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"><metadata
+   id="metadata48"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1366"
+   inkscape:window-height="711"
+   id="namedview46"
+   showgrid="false"
+   inkscape:zoom="0.33714286"
+   inkscape:cx="-172.33051"
+   inkscape:cy="280"
+   inkscape:window-x="0"
+   inkscape:window-y="20"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg44" />
+  <defs
+   id="defs4">
+    <style
+   type="text/css"
+   id="style2">
+      <![CDATA[
+       .fil1 {fill:#FEFEFE}
+       .fil6 {fill:#006498}
+       .fil7 {fill:#0EA5EB}
+       .fil8 {fill:#2979FF}
+       .fil3 {fill:#2BBCFF}
+       .fil0 {fill:#455A64}
+       .fil4 {fill:#53C6FC}
+       .fil5 {fill:#BDEAFF}
+       .fil2 {fill:#332C2B;fill-opacity:0.149020}
+      ]]>
+    </style>
+  </defs>
+  <g
+   id="g85"
+   transform="translate(-70,-70)"><path
+     class="fil1"
+     d="M 350,71 C 504,71 629,196 629,350 629,504 504,629 350,629 196,629 71,504 71,350 71,196 196,71 350,71 Z"
+     id="path9"
+     inkscape:connector-curvature="0"
+     style="fill:#fefefe" /><path
+     class="fil2"
+     d="M 475,236 593,387 C 596,503 444,639 301,585 L 225,486 339,330 c 0,0 138,-95 136,-94 z"
+     id="path11"
+     inkscape:connector-curvature="0"
+     style="fill:#332c2b;fill-opacity:0.14902003" /><path
+     class="fil3"
+     d="m 231,211 h 208 l 38,24 v 246 c 0,5 -3,8 -8,8 H 231 c -5,0 -8,-3 -8,-8 V 219 c 0,-5 3,-8 8,-8 z"
+     id="path13"
+     inkscape:connector-curvature="0"
+     style="fill:#2bbcff" /><path
+     class="fil4"
+     d="m 231,211 h 208 l 38,24 v 2 L 440,214 H 231 c -4,0 -7,3 -7,7 v 263 c -1,-1 -1,-2 -1,-3 V 219 c 0,-5 3,-8 8,-8 z"
+     id="path15"
+     inkscape:connector-curvature="0"
+     style="fill:#53c6fc" /><polygon
+     class="fil5"
+     points="305,212 418,212 418,310 305,310 "
+     id="polygon17"
+     style="fill:#bdeaff" /><path
+     class="fil5"
+     d="m 255,363 h 189 c 3,0 5,2 5,4 V 483 H 250 V 367 c 0,-2 2,-4 5,-4 z"
+     id="path19"
+     inkscape:connector-curvature="0"
+     style="fill:#bdeaff" /><polygon
+     class="fil6"
+     points="250,470 449,470 449,483 250,483 "
+     id="polygon21"
+     style="fill:#006498" /><path
+     class="fil6"
+     d="m 380,226 h 10 c 3,0 6,2 6,5 v 40 c 0,3 -3,6 -6,6 h -10 c -3,0 -6,-3 -6,-6 v -40 c 0,-3 3,-5 6,-5 z"
+     id="path23"
+     inkscape:connector-curvature="0"
+     style="fill:#006498" /><path
+     class="fil1"
+     d="m 254,226 c 10,0 17,7 17,17 0,9 -7,16 -17,16 -9,0 -17,-7 -17,-16 0,-10 8,-17 17,-17 z"
+     id="path25"
+     inkscape:connector-curvature="0"
+     style="fill:#fefefe" /><path
+     class="fil6"
+     d="m 267,448 h 165 c 2,0 3,1 3,3 v 0 c 0,1 -1,3 -3,3 H 267 c -2,0 -3,-2 -3,-3 v 0 c 0,-2 1,-3 3,-3 z"
+     id="path27"
+     inkscape:connector-curvature="0"
+     style="fill:#006498" /><path
+     class="fil6"
+     d="m 267,415 h 165 c 2,0 3,1 3,3 v 0 c 0,1 -1,2 -3,2 H 267 c -2,0 -3,-1 -3,-2 v 0 c 0,-2 1,-3 3,-3 z"
+     id="path29"
+     inkscape:connector-curvature="0"
+     style="fill:#006498" /><path
+     class="fil6"
+     d="m 267,381 h 165 c 2,0 3,2 3,3 v 0 c 0,2 -1,3 -3,3 H 267 c -2,0 -3,-1 -3,-3 v 0 c 0,-1 1,-3 3,-3 z"
+     id="path31"
+     inkscape:connector-curvature="0"
+     style="fill:#006498" /><path
+     class="fil1"
+     d="m 236,472 c 3,0 5,2 5,5 0,2 -2,4 -5,4 -3,0 -5,-2 -5,-4 0,-3 2,-5 5,-5 z"
+     id="path33"
+     inkscape:connector-curvature="0"
+     style="fill:#fefefe" /><path
+     class="fil1"
+     d="m 463,472 c 3,0 5,2 5,5 0,2 -2,4 -5,4 -3,0 -5,-2 -5,-4 0,-3 2,-5 5,-5 z"
+     id="path35"
+     inkscape:connector-curvature="0"
+     style="fill:#fefefe" /><polygon
+     class="fil6"
+     points="305,212 284,212 284,310 305,310 "
+     id="polygon37"
+     style="fill:#006498" /><path
+     class="fil7"
+     d="m 477,479 v 2 c 0,5 -3,8 -8,8 H 231 c -5,0 -8,-3 -8,-8 v -2 c 0,4 3,8 8,8 h 238 c 5,0 8,-4 8,-8 z"
+     id="path39"
+     inkscape:connector-curvature="0"
+     style="fill:#0ea5eb" /><path
+     class="fil8"
+     d="M 350,70 C 505,70 630,195 630,350 630,505 505,630 350,630 195,630 70,505 70,350 70,195 195,70 350,70 Z m 0,46 C 479,116 584,221 584,350 584,479 479,584 350,584 221,584 116,479 116,350 116,221 221,116 350,116 Z"
+     id="path41"
+     inkscape:connector-curvature="0"
+     style="fill:#2979ff" /></g>
+</svg>

frontend/public/index.html

@@ -18,17 +18,9 @@
 
     <meta name="robots" content="noindex,nofollow" />
 
-    <link
-      rel="icon"
-      type="image/svg+xml"
-      href="[{[ .StaticURL ]}]/img/icons/favicon.svg"
-    />
+    <link rel="icon" type="image/svg+xml" href="[{[ .StaticURL ]}]/img/icons/favicon.svg" />
     <link rel="shortcut icon" href="[{[ .StaticURL ]}]/img/icons/favicon.ico" />
-    <link
-      rel="apple-touch-icon"
-      sizes="180x180"
-      href="[{[ .StaticURL ]}]/img/icons/apple-touch-icon.png"
-    />
+    <link rel="apple-touch-icon" sizes="180x180" href="[{[ .StaticURL ]}]/img/icons/apple-touch-icon.png" />
     <meta name="apple-mobile-web-app-title" content="File Browser" />
 
     <!-- Add to home screen for Android and modern mobile browsers -->

frontend/src/api/files.ts

@@ -3,25 +3,14 @@ import { useLayoutStore } from "@/stores/layout";
 import { baseURL } from "@/utils/constants";
 import { upload as postTus, useTus } from "./tus";
 import { createURL, fetchURL, removePrefix, StatusError } from "./utils";
-import { isEncodableResponse, makeRawResource } from "@/utils/encodings";
 
 export async function fetch(url: string, signal?: AbortSignal) {
-  const encoding = isEncodableResponse(url);
   url = removePrefix(url);
-  const res = await fetchURL(`/api/resources${url}`, {
-    signal,
-    headers: {
-      "X-Encoding": encoding ? "true" : "false",
-    },
-  });
+  const res = await fetchURL(`/api/resources${url}`, { signal });
 
   let data: Resource;
   try {
-    if (res.headers.get("Content-Type") == "application/octet-stream") {
-      data = await makeRawResource(res, url);
-    } else {
-      data = (await res.json()) as Resource;
-    }
+    data = (await res.json()) as Resource;
   } catch (e) {
     // Check if the error is an intentional cancellation
     if (e instanceof Error && e.name === "AbortError") {
@@ -49,12 +38,6 @@ export async function fetch(url: string, signal?: AbortSignal) {
   return data;
 }
 
-export async function fetchAll(url: string): Promise<RecursiveEntry[]> {
-  url = removePrefix(url);
-  const res = await fetchURL(`/api/resources/recursive${url}`, {});
-  return (await res.json()) as RecursiveEntry[];
-}
-
 async function resourceAction(url: string, method: ApiMethod, content?: any) {
   url = removePrefix(url);
 
@@ -157,9 +140,9 @@ async function postResources(
       if (request.status === 200) {
         resolve(request.responseText);
       } else if (request.status === 409) {
-        reject(new Error(request.status.toString()));
+        reject(request.status);
       } else {
-        reject(new Error(request.responseText));
+        reject(request.responseText);
       }
     };
 
@@ -183,12 +166,9 @@ function moveCopy(
   for (const item of items) {
     const from = item.from;
     const to = encodeURIComponent(removePrefix(item.to ?? ""));
-    const finalOverwrite =
-      item.overwrite == undefined ? overwrite : item.overwrite;
-    const finalRename = item.rename == undefined ? rename : item.rename;
     const url = `${from}?action=${
       copy ? "copy" : "rename"
-    }&destination=${to}&override=${finalOverwrite}&rename=${finalRename}`;
+    }&destination=${to}&override=${overwrite}&rename=${rename}`;
     promises.push(resourceAction(url, "PATCH"));
   }
   layoutStore.closeHovers();

frontend/src/api/pub.ts

@@ -41,12 +41,12 @@ export function download(
   let url = `${baseURL}/api/public/dl/${hash}`;
 
   if (files.length === 1) {
-    url += files[0] + "?";
+    url += encodeURIComponent(files[0]) + "?";
   } else {
     let arg = "";
 
     for (const file of files) {
-      arg += file + ",";
+      arg += encodeURIComponent(file) + ",";
     }
 
     arg = arg.substring(0, arg.length - 1);

frontend/src/api/search.ts

@@ -1,12 +1,7 @@
-import { fetchURL, removePrefix, StatusError } from "./utils";
+import { fetchURL, removePrefix } from "./utils";
 import url from "../utils/url";
 
-export default async function search(
-  base: string,
-  query: string,
-  signal: AbortSignal,
-  callback: (item: ResourceItem) => void
-) {
+export default async function search(base: string, query: string) {
   base = removePrefix(base);
   query = encodeURIComponent(query);
 
@@ -14,60 +9,19 @@ export default async function search(
     base += "/";
   }
 
-  const res = await fetchURL(`/api/search${base}?query=${query}`, { signal });
-  if (!res.body) {
-    throw new StatusError("000 No connection", 0);
-  }
-  try {
-    // Try streaming approach first (modern browsers)
-    if (res.body && typeof res.body.pipeThrough === "function") {
-      const reader = res.body.pipeThrough(new TextDecoderStream()).getReader();
-      let buffer = "";
-      while (true) {
-        const { done, value } = await reader.read();
-        if (value) {
-          buffer += value;
-        }
-        const lines = buffer.split(/\n/);
-        let lastLine = lines.pop();
-        // Save incomplete last line
-        if (!lastLine) {
-          lastLine = "";
-        }
-        buffer = lastLine;
+  const res = await fetchURL(`/api/search${base}?query=${query}`, {});
 
-        for (const line of lines) {
-          if (line) {
-            const item = JSON.parse(line) as ResourceItem;
-            item.url = `/files${base}` + url.encodePath(item.path);
-            if (item.isDir) {
-              item.url += "/";
-            }
-            callback(item);
-          }
-        }
-        if (done) break;
-      }
-    } else {
-      // Fallback for browsers without streaming support (e.g., Safari)
-      const text = await res.text();
-      const lines = text.split(/\n/);
-      for (const line of lines) {
-        if (line) {
-          const item = JSON.parse(line) as ResourceItem;
-          item.url = `/files${base}` + url.encodePath(item.path);
-          if (item.isDir) {
-            item.url += "/";
-          }
-          callback(item);
-        }
-      }
+  let data = await res.json();
+
+  data = data.map((item: ResourceItem & { dir: boolean }) => {
+    item.url = `/files${base}` + url.encodePath(item.path);
+
+    if (item.dir) {
+      item.url += "/";
     }
-  } catch (e) {
-    // Check if the error is an intentional cancellation
-    if (e instanceof Error && e.name === "AbortError") {
-      throw new StatusError("000 No connection", 0, true);
-    }
-    throw e;
-  }
+
+    return item;
+  });
+
+  return data;
 }

frontend/src/api/users.ts

@@ -8,13 +8,12 @@ export async function get(id: number) {
   return fetchJSON<IUser>(`/api/users/${id}`, {});
 }
 
-export async function create(user: IUser, currentPassword: string) {
+export async function create(user: IUser) {
   const res = await fetchURL(`/api/users`, {
     method: "POST",
     body: JSON.stringify({
       what: "user",
       which: [],
-      current_password: currentPassword,
       data: user,
     }),
   });
@@ -26,30 +25,19 @@ export async function create(user: IUser, currentPassword: string) {
   throw new StatusError(await res.text(), res.status);
 }
 
-export async function update(
-  user: Partial<IUser>,
-  which = ["all"],
-  currentPassword: string | null = null
-) {
+export async function update(user: Partial<IUser>, which = ["all"]) {
   await fetchURL(`/api/users/${user.id}`, {
     method: "PUT",
     body: JSON.stringify({
       what: "user",
       which: which,
-      ...(currentPassword != null ? { current_password: currentPassword } : {}),
       data: user,
     }),
   });
 }
 
-export async function remove(
-  id: number,
-  currentPassword: string | null = null
-) {
+export async function remove(id: number) {
   await fetchURL(`/api/users/${id}`, {
     method: "DELETE",
-    body: JSON.stringify({
-      ...(currentPassword != null ? { current_password: currentPassword } : {}),
-    }),
   });
 }

frontend/src/components/ContextMenu.vue

@@ -1,47 +0,0 @@
-<template>
-  <div
-    class="context-menu"
-    ref="contextMenu"
-    v-show="show"
-    :style="{
-      top: `${props.pos.y}px`,
-      left: `${left}px`,
-    }"
-  >
-    <slot />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, watch, computed, onUnmounted } from "vue";
-
-const emit = defineEmits(["hide"]);
-const props = defineProps<{ show: boolean; pos: { x: number; y: number } }>();
-const contextMenu = ref<HTMLElement | null>(null);
-
-const left = computed(() => {
-  return Math.min(
-    props.pos.x,
-    window.innerWidth - (contextMenu.value?.clientWidth ?? 0)
-  );
-});
-
-const hideContextMenu = () => {
-  emit("hide");
-};
-
-watch(
-  () => props.show,
-  (val) => {
-    if (val) {
-      document.addEventListener("click", hideContextMenu);
-    } else {
-      document.removeEventListener("click", hideContextMenu);
-    }
-  }
-);
-
-onUnmounted(() => {
-  document.removeEventListener("click", hideContextMenu);
-});
-</script>

frontend/src/components/DropdownModal.vue

@@ -1,142 +0,0 @@
-<script setup lang="ts">
-import { ref, watch, onMounted, onBeforeUnmount } from "vue";
-import { vClickOutside } from "@/utils/index";
-
-const props = withDefaults(
-  defineProps<{
-    position?: "top-left" | "bottom-left" | "bottom-right" | "top-right";
-    closeOnClick?: boolean;
-  }>(),
-  {
-    position: "bottom-right",
-    closeOnClick: true,
-  }
-);
-
-const isOpen = defineModel<boolean>();
-
-const triggerRef = ref<HTMLElement | null>(null);
-const listRef = ref<HTMLElement | null>(null);
-const dropdownStyle = ref<Record<string, string>>({});
-
-const updatePosition = () => {
-  if (!isOpen.value || !triggerRef.value) return;
-
-  const rect = triggerRef.value.getBoundingClientRect();
-
-  dropdownStyle.value = {
-    position: "fixed",
-    top: props.position.includes("bottom")
-      ? `${rect.bottom + 2}px`
-      : `${rect.top}px`,
-    left: props.position.includes("left") ? `${rect.left}px` : "auto",
-    right: props.position.includes("right")
-      ? `${window.innerWidth - rect.right}px`
-      : "auto",
-    zIndex: "11000",
-  };
-};
-
-watch(isOpen, (open) => {
-  if (open) {
-    updatePosition();
-  }
-});
-
-const onWindowChange = () => {
-  updatePosition();
-};
-
-const closeDropdown = (e: Event) => {
-  if (
-    e.target instanceof HTMLElement &&
-    listRef.value?.contains(e.target) &&
-    !props.closeOnClick
-  ) {
-    return;
-  }
-  isOpen.value = false;
-};
-
-onMounted(() => {
-  window.addEventListener("resize", onWindowChange);
-  window.addEventListener("scroll", onWindowChange, true);
-});
-
-onBeforeUnmount(() => {
-  window.removeEventListener("resize", onWindowChange);
-  window.removeEventListener("scroll", onWindowChange, true);
-});
-</script>
-
-<script lang="ts">
-export default {
-  directives: {
-    clickOutside: vClickOutside,
-  },
-};
-</script>
-
-<template>
-  <div
-    class="dropdown-modal-container"
-    v-click-outside="closeDropdown"
-    ref="triggerRef"
-  >
-    <button @click="isOpen = !isOpen" class="dropdown-modal-trigger">
-      <slot></slot>
-      <i class="material-icons">chevron_right</i>
-    </button>
-
-    <teleport to="body">
-      <div
-        ref="listRef"
-        class="dropdown-modal-list"
-        :class="{ 'dropdown-modal-open': isOpen }"
-        :style="dropdownStyle"
-      >
-        <div>
-          <slot name="list"></slot>
-        </div>
-      </div>
-    </teleport>
-  </div>
-</template>
-
-<style scoped>
-.dropdown-modal-trigger {
-  background: var(--surfacePrimary);
-  color: var(--textSecondary);
-  border: 1px solid var(--borderPrimary);
-  border-radius: 0.1em;
-  padding: 0.5em 1em;
-  transition: 0.2s ease all;
-  margin: 0;
-  display: flex;
-  justify-content: space-between;
-  gap: 1rem;
-  align-items: center;
-}
-
-.dropdown-modal-trigger > i {
-  transform: rotate(90deg);
-}
-
-.dropdown-modal-list {
-  padding: 0.25rem;
-  background-color: var(--surfacePrimary);
-  color: var(--textSecondary);
-  display: none;
-  border: 1px solid var(--borderPrimary);
-  border-radius: 0.1em;
-}
-
-.dropdown-modal-list > div {
-  max-height: 450px;
-  padding: 0.25rem;
-}
-
-.dropdown-modal-open {
-  display: block;
-}
-</style>

frontend/src/components/Search.vue

@@ -5,11 +5,10 @@
         v-if="active"
         class="action"
         @click="close"
-        :aria-label="closeButtonTitle"
-        :title="closeButtonTitle"
+        :aria-label="$t('buttons.close')"
+        :title="$t('buttons.close')"
       >
-        <i v-if="ongoing" class="material-icons">stop_circle</i>
-        <i v-else class="material-icons">arrow_back</i>
+        <i class="material-icons">arrow_back</i>
       </button>
       <i v-else class="material-icons">search</i>
       <input
@@ -22,15 +21,6 @@
         :aria-label="$t('search.search')"
         :placeholder="$t('search.search')"
       />
-      <i
-        v-show="ongoing"
-        class="material-icons spin"
-        style="display: inline-block"
-        >autorenew
-      </i>
-      <span style="margin-top: 5px" v-show="results.length > 0">
-        {{ results.length }}
-      </span>
     </div>
 
     <div id="result" ref="result">
@@ -67,6 +57,9 @@
           </li>
         </ul>
       </div>
+      <p id="renew">
+        <i class="material-icons spin">autorenew</i>
+      </p>
     </div>
   </div>
 </template>
@@ -77,11 +70,10 @@ import { useLayoutStore } from "@/stores/layout";
 
 import url from "@/utils/url";
 import { search } from "@/api";
-import { computed, inject, onMounted, ref, watch, onUnmounted } from "vue";
+import { computed, inject, onMounted, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
 import { storeToRefs } from "pinia";
-import { StatusError } from "@/api/utils";
 
 const boxes = {
   image: { label: "images", icon: "insert_photo" },
@@ -92,7 +84,6 @@ const boxes = {
 
 const layoutStore = useLayoutStore();
 const fileStore = useFileStore();
-let searchAbortController = new AbortController();
 
 const { currentPromptName } = storeToRefs(layoutStore);
 
@@ -133,7 +124,9 @@ watch(currentPromptName, (newVal, oldVal) => {
 });
 
 watch(prompt, () => {
-  reset();
+  if (results.value.length) {
+    reset();
+  }
 });
 
 // ...mapState(useFileStore, ["isListing"]),
@@ -156,10 +149,6 @@ const filteredResults = computed(() => {
   return results.value.slice(0, resultsCount.value);
 });
 
-const closeButtonTitle = computed(() => {
-  return ongoing.value ? t("buttons.stopSearch") : t("buttons.close");
-});
-
 onMounted(() => {
   if (result.value === null) {
     return;
@@ -175,23 +164,14 @@ onMounted(() => {
   });
 });
 
-onUnmounted(() => {
-  abortLastSearch();
-});
-
 const open = () => {
   !active.value && layoutStore.showHover("search");
 };
 
 const close = (event: Event) => {
-  if (ongoing.value) {
-    abortLastSearch();
-    ongoing.value = false;
-  } else {
-    event.stopPropagation();
-    event.preventDefault();
-    layoutStore.closeHovers();
-  }
+  event.stopPropagation();
+  event.preventDefault();
+  layoutStore.closeHovers();
 };
 
 const keyup = (event: KeyboardEvent) => {
@@ -208,16 +188,11 @@ const init = (string: string) => {
 };
 
 const reset = () => {
-  abortLastSearch();
   ongoing.value = false;
   resultsCount.value = 50;
   results.value = [];
 };
 
-const abortLastSearch = () => {
-  searchAbortController.abort();
-};
-
 const submit = async (event: Event) => {
   event.preventDefault();
 
@@ -233,16 +208,8 @@ const submit = async (event: Event) => {
   ongoing.value = true;
 
   try {
-    abortLastSearch();
-    searchAbortController = new AbortController();
-    results.value = [];
-    await search(path, prompt.value, searchAbortController.signal, (item) =>
-      results.value.push(item)
-    );
+    results.value = await search(path, prompt.value);
   } catch (error: any) {
-    if (error instanceof StatusError && error.is_canceled) {
-      return;
-    }
     $showError(error);
   }
 

frontend/src/components/Sidebar.vue

@@ -63,7 +63,6 @@
     </template>
     <template v-else>
       <router-link
-        v-if="!hideLoginButton"
         class="action"
         to="/login"
         :aria-label="$t('sidebar.login')"
@@ -92,7 +91,7 @@
     >
       <progress-bar :val="usage.usedPercentage" size="small"></progress-bar>
       <br />
-      {{ $t("sidebar.diskUsed", { used: usage.used, total: usage.total }) }}
+      {{ usage.used }} of {{ usage.total }} used
     </div>
 
     <p class="credits">
@@ -125,11 +124,9 @@ import * as auth from "@/utils/auth";
 import {
   version,
   signup,
-  hideLoginButton,
   disableExternal,
   disableUsedPercentage,
   noAuth,
-  logoutPage,
   loginPage,
 } from "@/utils/constants";
 import { files as api } from "@/api";
@@ -156,11 +153,10 @@ export default {
       return this.currentPromptName === "sidebar";
     },
     signup: () => signup,
-    hideLoginButton: () => hideLoginButton,
     version: () => version,
     disableExternal: () => disableExternal,
     disableUsedPercentage: () => disableUsedPercentage,
-    canLogout: () => !noAuth && (loginPage || logoutPage !== "/login"),
+    canLogout: () => !noAuth && loginPage,
   },
   methods: {
     ...mapActions(useLayoutStore, ["closeHovers", "showHover"]),

frontend/src/components/files/CsvViewer.vue

@@ -1,370 +0,0 @@
-<template>
-  <div class="csv-viewer">
-    <div class="csv-header">
-      <div class="header-select">
-        <label for="columnSeparator">{{ $t("files.columnSeparator") }}</label>
-        <select
-          id="columnSeparator"
-          class="input input--block"
-          v-model="columnSeparator"
-        >
-          <option :value="[',']">
-            {{ $t("files.csvSeparators.comma") }}
-          </option>
-          <option :value="[';']">
-            {{ $t("files.csvSeparators.semicolon") }}
-          </option>
-          <option :value="[',', ';']">
-            {{ $t("files.csvSeparators.both") }}
-          </option>
-        </select>
-      </div>
-      <div class="header-select" v-if="isEncodedContent">
-        <label for="fileEncoding">{{ $t("files.fileEncoding") }}</label>
-        <DropdownModal
-          v-model="isEncondingDropdownOpen"
-          :close-on-click="false"
-        >
-          <div>
-            <span class="selected-encoding">{{ selectedEncoding }}</span>
-          </div>
-          <template v-slot:list>
-            <input
-              v-model="encodingSearch"
-              :placeholder="$t('search.search')"
-              class="input input--block"
-              name="encoding"
-            />
-            <div class="encoding-list">
-              <div v-if="encodingList.length == 0" class="message">
-                <i class="material-icons">sentiment_dissatisfied</i>
-                <span>{{ $t("files.lonely") }}</span>
-              </div>
-              <button
-                v-for="encoding in encodingList"
-                :value="encoding"
-                :key="encoding"
-                class="encoding-button"
-                @click="selectedEncoding = encoding"
-              >
-                {{ encoding }}
-              </button>
-            </div>
-          </template>
-        </DropdownModal>
-      </div>
-    </div>
-    <div v-if="displayError" class="csv-error">
-      <i class="material-icons">error</i>
-      <p>{{ displayError }}</p>
-    </div>
-    <div v-else-if="parsed.headers.length === 0" class="csv-empty">
-      <i class="material-icons">description</i>
-      <p>{{ $t("files.lonely") }}</p>
-    </div>
-    <div v-else class="csv-table-container" @wheel.stop @touchmove.stop>
-      <table class="csv-table">
-        <thead>
-          <tr>
-            <th v-for="(header, index) in parsed.headers" :key="index">
-              {{ header || `Column ${index + 1}` }}
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr v-for="(row, rowIndex) in parsed.rows" :key="rowIndex">
-            <td v-for="(cell, cellIndex) in row" :key="cellIndex">
-              {{ cell }}
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <div class="csv-footer">
-        <div class="csv-info" v-if="parsed.rows.length > 100">
-          <i class="material-icons">info</i>
-          <span>
-            {{ $t("files.showingRows", { count: parsed.rows.length }) }}
-          </span>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, ref, watch, watchEffect } from "vue";
-import { parse } from "csv-parse/browser/esm";
-import { useI18n } from "vue-i18n";
-import { availableEncodings, decode } from "@/utils/encodings";
-import DropdownModal from "../DropdownModal.vue";
-
-const { t } = useI18n({});
-
-interface Props {
-  content: ArrayBuffer | string;
-  error?: string;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  error: "",
-});
-
-const isEncondingDropdownOpen = ref(false);
-
-const encodingSearch = ref<string>("");
-
-const encodingList = computed(() => {
-  return availableEncodings.filter((e) =>
-    e.toLowerCase().includes(encodingSearch.value.toLowerCase())
-  );
-});
-
-const columnSeparator = ref([",", ";"]);
-
-const selectedEncoding = ref("utf-8");
-
-const parsed = ref<CsvData>({ headers: [], rows: [] });
-
-const displayError = ref<string | null>(null);
-
-const isEncodedContent = computed(() => {
-  return props.content instanceof ArrayBuffer;
-});
-
-watchEffect(() => {
-  if (props.content !== "" && columnSeparator.value.length > 0) {
-    const content = isEncodedContent.value
-      ? decode(props.content as ArrayBuffer, selectedEncoding.value)
-      : props.content;
-    parse(
-      content as string,
-      {
-        delimiter: columnSeparator.value,
-        skip_empty_lines: true,
-        relax_column_count: true,
-      },
-      (error, output) => {
-        if (error) {
-          console.error("Failed to parse CSV:", error);
-          parsed.value = { headers: [], rows: [] };
-          displayError.value = t("files.csvLoadFailed", {
-            error: error.toString(),
-          });
-        } else {
-          parsed.value = {
-            headers: output[0],
-            rows: output.slice(1),
-          };
-          displayError.value = null;
-        }
-      }
-    );
-  }
-});
-
-watch(selectedEncoding, () => {
-  isEncondingDropdownOpen.value = false;
-  encodingSearch.value = "";
-});
-</script>
-
-<style scoped>
-.csv-viewer {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  background-color: var(--surfacePrimary);
-  color: var(--textSecondary);
-  padding: 1rem;
-  padding-top: 4em;
-  box-sizing: border-box;
-}
-
-.csv-error,
-.csv-empty {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  gap: 1rem;
-  color: var(--textPrimary);
-}
-
-.csv-error i,
-.csv-empty i {
-  font-size: 4rem;
-  opacity: 0.5;
-}
-
-.csv-error p,
-.csv-empty p {
-  font-size: 1.1rem;
-  margin: 0;
-}
-
-.csv-table-container {
-  flex: 1;
-  overflow: auto;
-  background-color: var(--surfacePrimary);
-  border-radius: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-}
-
-/* Scrollbar styling for better visibility */
-.csv-table-container::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
-}
-
-.csv-table-container::-webkit-scrollbar-track {
-  background: var(--background);
-  border-radius: 4px;
-}
-
-.csv-table-container::-webkit-scrollbar-thumb {
-  background: var(--borderSecondary);
-  border-radius: 4px;
-}
-
-.csv-table-container::-webkit-scrollbar-thumb:hover {
-  background: var(--textPrimary);
-}
-
-.csv-table {
-  width: 100%;
-  border-collapse: collapse;
-  font-size: 0.875rem;
-  background-color: var(--surfacePrimary);
-}
-
-.csv-table thead {
-  position: sticky;
-  top: 0;
-  z-index: 10;
-  background-color: var(--surfaceSecondary);
-}
-
-.csv-table th {
-  padding: 0.875rem 1rem;
-  text-align: left;
-  font-weight: 600;
-  border-bottom: 2px solid var(--borderSecondary);
-  background-color: var(--surfaceSecondary);
-  white-space: nowrap;
-  color: var(--textSecondary);
-  font-size: 0.875rem;
-}
-
-.csv-table td {
-  padding: 0.75rem 1rem;
-  text-align: left;
-  border-bottom: 1px solid var(--borderPrimary);
-  white-space: nowrap;
-  max-width: 400px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: var(--textSecondary);
-}
-
-.csv-table tbody tr:nth-child(even) {
-  background-color: var(--background);
-}
-
-.csv-table tbody tr:hover {
-  background-color: var(--hover);
-  transition: background-color 0.15s ease;
-}
-
-.csv-footer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  gap: 1rem;
-  padding: 0.5rem;
-}
-
-.csv-info {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  padding: 0.75rem 1rem;
-  margin-top: 0.5rem;
-  background-color: var(--surfaceSecondary);
-  border-radius: 4px;
-  border-left: 3px solid var(--blue);
-  color: var(--textSecondary);
-  font-size: 0.875rem;
-}
-
-.csv-header {
-  display: flex;
-  justify-content: space-between;
-  padding: 0.25rem;
-}
-
-.header-select {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  margin-bottom: 0.5rem;
-  flex-direction: column;
-  @media (width >= 640px) {
-    flex-direction: row;
-  }
-}
-
-.header-select > label {
-  font-size: small;
-  @media (width >= 640px) {
-    max-width: 70px;
-  }
-}
-
-.header-select > select,
-.header-select > div {
-  margin-bottom: 0;
-}
-
-.csv-info i {
-  font-size: 1.2rem;
-  color: var(--blue);
-}
-
-.encoding-list {
-  max-height: 300px;
-  min-width: 120px;
-  overflow: auto;
-  overscroll-behavior: contain;
-  -webkit-overflow-scrolling: touch;
-  touch-action: pan-y;
-}
-
-.encoding-button {
-  background-color: transparent;
-  border: none;
-  outline: none;
-  padding: 0.25rem 0.5rem;
-  color: var(--textPrimary);
-  text-align: left;
-  cursor: pointer;
-  border-radius: 0.2rem;
-  white-space: nowrap;
-  display: block;
-  width: 100%;
-}
-
-.encoding-button:hover {
-  background-color: var(--surfaceSecondary);
-}
-
-.selected-encoding {
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.message {
-  font-size: 1.25em;
-}
-</style>

frontend/src/components/files/ListingItem.vue

@@ -20,7 +20,6 @@
     :aria-label="name"
     :aria-selected="isSelected"
     :data-ext="getExtension(name).toLowerCase()"
-    @contextmenu="contextMenu"
   >
     <div>
       <img
@@ -178,11 +177,6 @@ const drop = async (event: Event) => {
         from: fileStore.req?.items[i].url,
         to: props.url + encodeURIComponent(fileStore.req?.items[i].name),
         name: fileStore.req?.items[i].name,
-        size: fileStore.req?.items[i].size,
-        isDir: fileStore.req?.items[i].isDir,
-        modified: fileStore.req?.items[i].modified,
-        overwrite: false,
-        rename: false,
       });
     }
   }
@@ -192,50 +186,39 @@ const drop = async (event: Event) => {
     return;
   }
   const path = el.__vue__.url;
+  const baseItems = (await api.fetch(path)).items;
 
-  const action = (overwrite?: boolean, rename?: boolean) => {
-    const action =
-      (event as KeyboardEvent).ctrlKey || (event as KeyboardEvent).metaKey
-        ? api.copy
-        : api.move;
-    action(items, overwrite, rename)
+  const action = (overwrite: boolean, rename: boolean) => {
+    api
+      .move(items, overwrite, rename)
       .then(() => {
         fileStore.reload = true;
       })
       .catch($showError);
   };
 
-  const conflict = await upload.checkConflict(items, path, true);
+  const conflict = upload.checkConflict(items, baseItems);
 
-  if (conflict.length > 0) {
+  let overwrite = false;
+  let rename = false;
+
+  if (conflict) {
     layoutStore.showHover({
-      prompt: "resolve-conflict",
-      props: {
-        conflict: conflict,
-      },
-      confirm: (event: Event, result: Array<ConflictingResource>) => {
+      prompt: "replace-rename",
+      confirm: (event: Event, option: any) => {
+        overwrite = option == "overwrite";
+        rename = option == "rename";
+
         event.preventDefault();
         layoutStore.closeHovers();
-        for (let i = result.length - 1; i >= 0; i--) {
-          const item = result[i];
-          if (item.checked.length == 2) {
-            items[item.index].rename = true;
-          } else if (item.checked.length == 1 && item.checked[0] == "origin") {
-            items[item.index].overwrite = true;
-          } else {
-            items.splice(item.index, 1);
-          }
-        }
-        if (items.length > 0) {
-          action();
-        }
+        action(overwrite, rename);
       },
     });
 
     return;
   }
 
-  action(false, false);
+  action(overwrite, rename);
 };
 
 const itemClick = (event: Event | KeyboardEvent) => {
@@ -256,17 +239,6 @@ const itemClick = (event: Event | KeyboardEvent) => {
   else click(event);
 };
 
-const contextMenu = (event: MouseEvent) => {
-  event.preventDefault();
-  if (
-    fileStore.selected.length === 0 ||
-    event.ctrlKey ||
-    fileStore.selected.indexOf(props.index) === -1
-  ) {
-    click(event);
-  }
-};
-
 const click = (event: Event | KeyboardEvent) => {
   if (!singleClick.value && fileStore.selectedCount !== 0)
     event.preventDefault();
@@ -281,15 +253,7 @@ const click = (event: Event | KeyboardEvent) => {
   }
 
   if (fileStore.selected.indexOf(props.index) !== -1) {
-    if (
-      (event as KeyboardEvent).ctrlKey ||
-      (event as KeyboardEvent).metaKey ||
-      fileStore.multiple
-    ) {
-      fileStore.removeSelected(props.index);
-    } else {
-      fileStore.selected = [props.index];
-    }
+    fileStore.removeSelected(props.index);
     return;
   }
 
@@ -315,6 +279,7 @@ const click = (event: Event | KeyboardEvent) => {
   }
 
   if (
+    !singleClick.value &&
     !(event as KeyboardEvent).ctrlKey &&
     !(event as KeyboardEvent).metaKey &&
     !fileStore.multiple

frontend/src/components/files/VideoPlayer.vue

@@ -147,33 +147,26 @@ interface LanguageImports {
 }
 
 const languageImports: LanguageImports = {
+  he: () => import("video.js/dist/lang/he.json"),
+  hu: () => import("video.js/dist/lang/hu.json"),
   ar: () => import("video.js/dist/lang/ar.json"),
-  bg: () => import("video.js/dist/lang/bg.json"),
-  cs: () => import("video.js/dist/lang/cs.json"),
   de: () => import("video.js/dist/lang/de.json"),
   el: () => import("video.js/dist/lang/el.json"),
   en: () => import("video.js/dist/lang/en.json"),
   es: () => import("video.js/dist/lang/es.json"),
   fr: () => import("video.js/dist/lang/fr.json"),
-  he: () => import("video.js/dist/lang/he.json"),
-  hr: () => import("video.js/dist/lang/hr.json"),
-  hu: () => import("video.js/dist/lang/hu.json"),
   it: () => import("video.js/dist/lang/it.json"),
   ja: () => import("video.js/dist/lang/ja.json"),
   ko: () => import("video.js/dist/lang/ko.json"),
-  lv: () => import("video.js/dist/lang/lv.json"),
-  nb: () => import("video.js/dist/lang/nb.json"),
-  nl: () => import("video.js/dist/lang/nl.json"),
   "nl-be": () => import("video.js/dist/lang/nl.json"),
   pl: () => import("video.js/dist/lang/pl.json"),
   "pt-br": () => import("video.js/dist/lang/pt-BR.json"),
-  "pt-pt": () => import("video.js/dist/lang/pt-PT.json"),
+  pt: () => import("video.js/dist/lang/pt-PT.json"),
   ro: () => import("video.js/dist/lang/ro.json"),
   ru: () => import("video.js/dist/lang/ru.json"),
   sk: () => import("video.js/dist/lang/sk.json"),
   tr: () => import("video.js/dist/lang/tr.json"),
   uk: () => import("video.js/dist/lang/uk.json"),
-  vi: () => import("video.js/dist/lang/vi.json"),
   "zh-cn": () => import("video.js/dist/lang/zh-CN.json"),
   "zh-tw": () => import("video.js/dist/lang/zh-TW.json"),
 };

frontend/src/components/prompts/BaseModal.vue

@@ -1,61 +1,21 @@
 <template>
-  <div id="modal-background" @click="backgroundClick">
-    <div ref="modalContainer">
-      <slot></slot>
-    </div>
-  </div>
+  <VueFinalModal
+    class="vfm-modal"
+    overlay-transition="vfm-fade"
+    content-transition="vfm-fade"
+    @closed="layoutStore.closeHovers"
+    :focus-trap="{
+      initialFocus: '#focus-prompt',
+      fallbackFocus: 'div.vfm__content',
+    }"
+  >
+    <slot />
+  </VueFinalModal>
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { VueFinalModal } from "vue-final-modal";
+import { useLayoutStore } from "@/stores/layout";
 
-const emit = defineEmits(["closed"]);
-
-const modalContainer = ref(null);
-
-onMounted(() => {
-  const element = document.querySelector("#focus-prompt") as HTMLElement | null;
-  if (element) {
-    element.focus();
-  } else if (modalContainer.value) {
-    (modalContainer.value as HTMLElement).focus();
-  }
-});
-
-const backgroundClick = (event: Event) => {
-  const target = event.target as HTMLElement;
-  if (target.id == "modal-background") {
-    emit("closed");
-  }
-};
-
-window.addEventListener("keydown", (event) => {
-  if (event.key === "Escape") {
-    event.stopImmediatePropagation();
-    emit("closed");
-  }
-});
+const layoutStore = useLayoutStore();
 </script>
-
-<style scoped>
-#modal-background {
-  position: fixed;
-  inset: 0;
-  background-color: #00000096;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  z-index: 10000;
-  animation: ease-in 150ms opacity-enter;
-}
-
-@keyframes opacity-enter {
-  from {
-    opacity: 0;
-  }
-
-  to {
-    opacity: 1;
-  }
-}
-</style>

frontend/src/components/prompts/Copy.vue

@@ -91,11 +91,6 @@ export default {
           from: this.req.items[item].url,
           to: this.dest + encodeURIComponent(this.req.items[item].name),
           name: this.req.items[item].name,
-          size: this.req.items[item].size,
-          isDir: this.req.items[item].isDir,
-          modified: this.req.items[item].modified,
-          overwrite: false,
-          rename: this.$route.path === this.dest,
         });
       }
 
@@ -114,8 +109,7 @@ export default {
               return;
             }
 
-            if (this.user.redirectAfterCopyMove)
-              this.$router.push({ path: this.dest });
+            this.$router.push({ path: this.dest });
           })
           .catch((e) => {
             buttons.done("copy");
@@ -123,40 +117,36 @@ export default {
           });
       };
 
-      const conflict = await upload.checkConflict(items, this.dest, true);
+      if (this.$route.path === this.dest) {
+        this.closeHovers();
+        action(false, true);
 
-      if (conflict.length > 0) {
+        return;
+      }
+
+      const dstItems = (await api.fetch(this.dest)).items;
+      const conflict = upload.checkConflict(items, dstItems);
+
+      let overwrite = false;
+      let rename = false;
+
+      if (conflict) {
         this.showHover({
-          prompt: "resolve-conflict",
-          props: {
-            conflict: conflict,
-          },
-          confirm: (event, result) => {
+          prompt: "replace-rename",
+          confirm: (event, option) => {
+            overwrite = option == "overwrite";
+            rename = option == "rename";
+
             event.preventDefault();
             this.closeHovers();
-            for (let i = result.length - 1; i >= 0; i--) {
-              const item = result[i];
-              if (item.checked.length == 2) {
-                items[item.index].rename = true;
-              } else if (
-                item.checked.length == 1 &&
-                item.checked[0] == "origin"
-              ) {
-                items[item.index].overwrite = true;
-              } else {
-                items.splice(item.index, 1);
-              }
-            }
-            if (items.length > 0) {
-              action();
-            }
+            action(overwrite, rename);
           },
         });
 
         return;
       }
 
-      action(false, false);
+      action(overwrite, rename);
     },
   },
 };

frontend/src/components/prompts/CreateFilePath.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, nextTick } from "vue";
+import { ref, computed, watch, nextTick, defineProps } from "vue";
 import { useRoute } from "vue-router";
 import { useFileStore } from "@/stores/file";
 import url from "@/utils/url";
@@ -35,17 +35,12 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  path: {
-    type: String,
-    default: null,
-  },
 });
 
 const container = ref<HTMLElement | null>(null);
 
 const path = computed(() => {
-  const routePath = props.path || route.path;
-  let basePath = fileStore.isFiles ? routePath : url.removeLastDir(routePath);
+  let basePath = fileStore.isFiles ? route.path : url.removeLastDir(route.path);
   if (!basePath.endsWith("/")) {
     basePath += "/";
   }

frontend/src/components/prompts/CurrentPassword.vue

@@ -1,58 +0,0 @@
-<template>
-  <div class="card floating">
-    <div class="card-title">
-      <h2>{{ $t("prompts.currentPassword") }}</h2>
-    </div>
-
-    <div class="card-content">
-      <p>
-        {{ $t("prompts.currentPasswordMessage") }}
-      </p>
-      <input
-        id="focus-prompt"
-        class="input input--block"
-        type="password"
-        @keyup.enter="submit"
-        v-model="password"
-      />
-    </div>
-
-    <div class="card-action">
-      <button
-        class="button button--flat button--grey"
-        @click="cancel"
-        :aria-label="$t('buttons.cancel')"
-        :title="$t('buttons.cancel')"
-      >
-        {{ $t("buttons.cancel") }}
-      </button>
-      <button
-        @click="submit"
-        class="button button--flat"
-        type="submit"
-        :aria-label="$t('buttons.ok')"
-        :title="$t('buttons.ok')"
-      >
-        {{ $t("buttons.ok") }}
-      </button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from "vue";
-import { useLayoutStore } from "@/stores/layout";
-const layoutStore = useLayoutStore();
-
-const { currentPrompt } = layoutStore;
-
-const password = ref("");
-
-const submit = (event: Event) => {
-  currentPrompt?.confirm(event, password.value);
-};
-
-const cancel = () => {
-  layoutStore.closeHovers();
-};
-</script>

frontend/src/components/prompts/FileList.vue

@@ -168,13 +168,7 @@ export default {
       this.showHover({
         prompt: "newDir",
         action: null,
-        confirm: (url) => {
-          const paths = url.split("/");
-          this.items.push({
-            name: paths[paths.length - 2],
-            url: url,
-          });
-        },
+        confirm: null,
         props: {
           redirect: false,
           base: this.current === this.$route.path ? null : this.current,

frontend/src/components/prompts/Move.vue

@@ -5,7 +5,6 @@
     </div>
 
     <div class="card-content">
-      <p>{{ $t("prompts.moveMessage") }}</p>
       <file-list
         ref="fileList"
         @update:selected="(val) => (dest = val)"
@@ -79,7 +78,7 @@ export default {
   computed: {
     ...mapState(useFileStore, ["req", "selected"]),
     ...mapState(useAuthStore, ["user"]),
-    ...mapWritableState(useFileStore, ["reload", "preselect"]),
+    ...mapWritableState(useFileStore, ["preselect"]),
     excludedFolders() {
       return this.selected
         .filter((idx) => this.req.items[idx].isDir)
@@ -97,11 +96,6 @@ export default {
           from: this.req.items[item].url,
           to: this.dest + encodeURIComponent(this.req.items[item].name),
           name: this.req.items[item].name,
-          size: this.req.items[item].size,
-          isDir: this.req.items[item].isDir,
-          modified: this.req.items[item].modified,
-          overwrite: false,
-          rename: false,
         });
       }
 
@@ -113,9 +107,7 @@ export default {
           .then(() => {
             buttons.success("move");
             this.preselect = removePrefix(items[0].to);
-            if (this.user.redirectAfterCopyMove)
-              this.$router.push({ path: this.dest });
-            else this.reload = true;
+            this.$router.push({ path: this.dest });
           })
           .catch((e) => {
             buttons.done("move");
@@ -123,41 +115,29 @@ export default {
           });
       };
 
-      const conflict = await upload.checkConflict(items, this.dest, true);
+      const dstItems = (await api.fetch(this.dest)).items;
+      const conflict = upload.checkConflict(items, dstItems);
 
-      if (conflict.length > 0) {
+      let overwrite = false;
+      let rename = false;
+
+      if (conflict) {
         this.showHover({
-          prompt: "resolve-conflict",
-          props: {
-            conflict: conflict,
-            files: items,
-          },
-          confirm: (event, result) => {
+          prompt: "replace-rename",
+          confirm: (event, option) => {
+            overwrite = option == "overwrite";
+            rename = option == "rename";
+
             event.preventDefault();
             this.closeHovers();
-            for (let i = result.length - 1; i >= 0; i--) {
-              const item = result[i];
-              if (item.checked.length == 2) {
-                items[item.index].rename = true;
-              } else if (
-                item.checked.length == 1 &&
-                item.checked[0] == "origin"
-              ) {
-                items[item.index].overwrite = true;
-              } else {
-                items.splice(item.index, 1);
-              }
-            }
-            if (items.length > 0) {
-              action();
-            }
+            action(overwrite, rename);
           },
         });
 
         return;
       }
 
-      action(false, false);
+      action(overwrite, rename);
     },
   },
 };

frontend/src/components/prompts/NewDir.vue

@@ -14,7 +14,7 @@
         v-model.trim="name"
         tabindex="1"
       />
-      <CreateFilePath :name="name" :is-dir="true" :path="base" />
+      <CreateFilePath :name="name" :is-dir="true" />
     </div>
 
     <div class="card-action">
@@ -41,7 +41,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, inject, ref } from "vue";
+import { inject, ref } from "vue";
 import { useFileStore } from "@/stores/file";
 import { useLayoutStore } from "@/stores/layout";
 
@@ -53,13 +53,17 @@ import CreateFilePath from "@/components/prompts/CreateFilePath.vue";
 
 const $showError = inject<IToastError>("$showError")!;
 
+const props = defineProps({
+  base: String,
+  redirect: {
+    type: Boolean,
+    default: true,
+  },
+});
+
 const fileStore = useFileStore();
 const layoutStore = useLayoutStore();
 
-const base = computed(() => {
-  return layoutStore.currentPrompt?.props?.base;
-});
-
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
@@ -72,7 +76,7 @@ const submit = async (event: Event) => {
 
   // Build the path of the new directory.
   let uri: string;
-  if (base.value) uri = base.value;
+  if (props.base) uri = props.base;
   else if (fileStore.isFiles) uri = route.path + "/";
   else uri = "/";
 
@@ -85,15 +89,12 @@ const submit = async (event: Event) => {
 
   try {
     await api.post(uri);
-    if (layoutStore.currentPrompt?.props?.redirect) {
+    if (props.redirect) {
       router.push({ path: uri });
-    } else if (!base.value) {
+    } else if (!props.base) {
       const res = await api.fetch(url.removeLastDir(uri) + "/");
       fileStore.updateRequest(res);
     }
-    if (layoutStore.currentPrompt?.confirm) {
-      layoutStore.currentPrompt?.confirm(uri);
-    }
   } catch (e) {
     if (e instanceof Error) {
       $showError(e);

frontend/src/components/prompts/Prompts.vue

@@ -1,13 +1,10 @@
 <template>
-  <base-modal v-if="modal != null" :prompt="currentPromptName" @closed="close">
-    <keep-alive>
-      <component :is="modal" />
-    </keep-alive>
-  </base-modal>
+  <ModalsContainer />
 </template>
 
 <script setup lang="ts">
-import { computed } from "vue";
+import { watch } from "vue";
+import { ModalsContainer, useModal } from "vue-final-modal";
 import { storeToRefs } from "pinia";
 import { useLayoutStore } from "@/stores/layout";
 
@@ -23,12 +20,11 @@ import Copy from "./Copy.vue";
 import NewFile from "./NewFile.vue";
 import NewDir from "./NewDir.vue";
 import Replace from "./Replace.vue";
+import ReplaceRename from "./ReplaceRename.vue";
 import Share from "./Share.vue";
 import ShareDelete from "./ShareDelete.vue";
 import Upload from "./Upload.vue";
 import DiscardEditorChanges from "./DiscardEditorChanges.vue";
-import ResolveConflict from "./ResolveConflict.vue";
-import CurrentPassword from "./CurrentPassword.vue";
 
 const layoutStore = useLayoutStore();
 
@@ -45,24 +41,35 @@ const components = new Map<string, any>([
   ["newDir", NewDir],
   ["download", Download],
   ["replace", Replace],
+  ["replace-rename", ReplaceRename],
   ["share", Share],
   ["upload", Upload],
   ["share-delete", ShareDelete],
   ["deleteUser", DeleteUser],
   ["discardEditorChanges", DiscardEditorChanges],
-  ["resolve-conflict", ResolveConflict],
-  ["current-password", CurrentPassword],
 ]);
 
-const modal = computed(() => {
-  const modal = components.get(currentPromptName.value!);
-  if (!modal) null;
+watch(currentPromptName, (newValue) => {
+  const modal = components.get(newValue!);
+  if (!modal) return;
 
-  return modal;
+  const { open, close } = useModal({
+    component: BaseModal,
+    slots: {
+      default: modal,
+    },
+  });
+
+  layoutStore.setCloseOnPrompt(close, newValue!);
+  open();
 });
 
-const close = () => {
+window.addEventListener("keydown", (event) => {
   if (!layoutStore.currentPrompt) return;
-  layoutStore.closeHovers();
-};
+
+  if (event.key === "Escape") {
+    event.stopImmediatePropagation();
+    layoutStore.closeHovers();
+  }
+});
 </script>

frontend/src/components/prompts/Rename.vue

@@ -6,7 +6,7 @@
 
     <div class="card-content">
       <p>
-        {{ $t("prompts.renameMessage") }} <code>{{ oldName }}</code
+        {{ $t("prompts.renameMessage") }} <code>{{ oldName() }}</code
         >:
       </p>
       <input
@@ -33,7 +33,6 @@
         type="submit"
         :aria-label="$t('buttons.rename')"
         :title="$t('buttons.rename')"
-        :disabled="name === '' || name === oldName"
       >
         {{ $t("buttons.rename") }}
       </button>
@@ -57,7 +56,7 @@ export default {
     };
   },
   created() {
-    this.name = this.oldName;
+    this.name = this.oldName();
   },
   inject: ["$showError"],
   computed: {
@@ -68,28 +67,25 @@ export default {
       "isListing",
     ]),
     ...mapWritableState(useFileStore, ["reload", "preselect"]),
-    oldName() {
-      if (!this.isListing) {
-        return this.req.name;
-      }
-
-      if (this.selectedCount === 0 || this.selectedCount > 1) {
-        // This shouldn't happen.
-        return "";
-      }
-
-      return this.req.items[this.selected[0]].name;
-    },
   },
   methods: {
     ...mapActions(useLayoutStore, ["closeHovers"]),
     cancel: function () {
       this.closeHovers();
     },
-    submit: async function () {
-      if (this.name === "" || this.name === this.oldName) {
+    oldName: function () {
+      if (!this.isListing) {
+        return this.req.name;
+      }
+
+      if (this.selectedCount === 0 || this.selectedCount > 1) {
+        // This shouldn't happen.
         return;
       }
+
+      return this.req.items[this.selected[0]].name;
+    },
+    submit: async function () {
       let oldLink = "";
       let newLink = "";
 

frontend/src/components/prompts/ReplaceRename.vue

@@ -0,0 +1,57 @@
+<template>
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t("prompts.replace") }}</h2>
+    </div>
+
+    <div class="card-content">
+      <p>{{ $t("prompts.replaceMessage") }}</p>
+    </div>
+
+    <div class="card-action">
+      <button
+        class="button button--flat button--grey"
+        @click="closeHovers"
+        :aria-label="$t('buttons.cancel')"
+        :title="$t('buttons.cancel')"
+        tabindex="3"
+      >
+        {{ $t("buttons.cancel") }}
+      </button>
+      <button
+        class="button button--flat button--blue"
+        @click="(event) => currentPrompt.confirm(event, 'rename')"
+        :aria-label="$t('buttons.rename')"
+        :title="$t('buttons.rename')"
+        tabindex="2"
+      >
+        {{ $t("buttons.rename") }}
+      </button>
+      <button
+        id="focus-prompt"
+        class="button button--flat button--red"
+        @click="(event) => currentPrompt.confirm(event, 'overwrite')"
+        :aria-label="$t('buttons.replace')"
+        :title="$t('buttons.replace')"
+        tabindex="1"
+      >
+        {{ $t("buttons.replace") }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapActions, mapState } from "pinia";
+import { useLayoutStore } from "@/stores/layout";
+
+export default {
+  name: "replace-rename",
+  computed: {
+    ...mapState(useLayoutStore, ["currentPrompt"]),
+  },
+  methods: {
+    ...mapActions(useLayoutStore, ["closeHovers"]),
+  },
+};
+</script>

frontend/src/components/prompts/ResolveConflict.vue

@@ -1,366 +0,0 @@
-<template>
-  <div class="card floating">
-    <div class="card-title">
-      <h2>
-        {{
-          personalized
-            ? $t("prompts.resolveConflict")
-            : $t("prompts.replaceOrSkip")
-        }}
-      </h2>
-    </div>
-
-    <div class="card-content">
-      <template v-if="personalized">
-        <p v-if="isUploadAction != true">
-          {{ $t("prompts.singleConflictResolve") }}
-        </p>
-        <div class="conflict-list-container">
-          <div>
-            <p>
-              <input
-                @change="toogleCheckAll"
-                type="checkbox"
-                :checked="originAllChecked"
-                value="origin"
-              />
-              {{
-                isUploadAction != true
-                  ? $t("prompts.filesInOrigin")
-                  : $t("prompts.uploadingFiles")
-              }}
-            </p>
-            <p>
-              <input
-                @change="toogleCheckAll"
-                type="checkbox"
-                :checked="destAllChecked"
-                value="dest"
-              />
-              {{ $t("prompts.filesInDest") }}
-            </p>
-          </div>
-          <div>
-            <template v-for="(item, index) in conflict" :key="index">
-              <div class="conflict-file-name">
-                <span>{{ item.name }}</span>
-
-                <template v-if="item.checked.length == 2">
-                  <span v-if="isUploadAction != true" class="result-rename">
-                    {{ $t("prompts.rename") }}
-                  </span>
-                  <span v-else class="result-error">
-                    {{ $t("prompts.forbiddenError") }}
-                  </span>
-                </template>
-                <span
-                  v-else-if="
-                    item.checked.length == 1 && item.checked[0] == 'origin'
-                  "
-                  class="result-override"
-                >
-                  {{ $t("prompts.override") }}
-                </span>
-                <span v-else class="result-skip">
-                  {{ $t("prompts.skip") }}
-                </span>
-              </div>
-              <div>
-                <input v-model="item.checked" type="checkbox" value="origin" />
-                <div>
-                  <p class="conflict-file-value">
-                    {{ humanTime(item.origin.lastModified) }}
-                  </p>
-                  <p class="conflict-file-value">
-                    {{ humanSize(item.origin.size) }}
-                  </p>
-                </div>
-              </div>
-              <div>
-                <input v-model="item.checked" type="checkbox" value="dest" />
-                <div>
-                  <p class="conflict-file-value">
-                    {{ humanTime(item.dest.lastModified) }}
-                  </p>
-                  <p class="conflict-file-value">
-                    {{ humanSize(item.dest.size) }}
-                  </p>
-                </div>
-              </div>
-            </template>
-          </div>
-        </div>
-      </template>
-      <template v-else>
-        <p>
-          {{ $t("prompts.fastConflictResolve", { count: conflict.length }) }}
-        </p>
-
-        <div class="result-buttons">
-          <button @click="(e) => resolve(e, ['origin'])">
-            <i class="material-icons">done_all</i>
-            {{ $t("buttons.overrideAll") }}
-          </button>
-          <button
-            v-if="isUploadAction != true"
-            @click="(e) => resolve(e, ['origin', 'dest'])"
-          >
-            <i class="material-icons">folder_copy</i>
-            {{ $t("buttons.renameAll") }}
-          </button>
-          <button @click="(e) => resolve(e, ['dest'])">
-            <i class="material-icons">undo</i>
-            {{ $t("buttons.skipAll") }}
-          </button>
-          <button @click="(e) => resume(e)">
-            <i class="material-icons">replay</i>
-            {{ $t("buttons.resumeTransfer") }}
-            <span class="info-tooltip" @click.stop="() => {}">
-              <i class="material-icons info-icon">info_outline</i>
-              <span class="info-tooltip-text">
-                {{ $t("buttons.resumeTransferTooltip") }}
-              </span>
-            </span>
-          </button>
-          <button @click="personalized = true">
-            <i class="material-icons">checklist</i>
-            {{ $t("buttons.singleDecision") }}
-          </button>
-        </div>
-      </template>
-    </div>
-
-    <div class="card-action" style="display: flex; justify-content: end">
-      <div>
-        <button
-          class="button button--flat button--grey"
-          @click="close"
-          :aria-label="$t('buttons.cancel')"
-          :title="$t('buttons.cancel')"
-          tabindex="4"
-        >
-          {{ $t("buttons.cancel") }}
-        </button>
-        <button
-          v-if="personalized"
-          id="focus-prompt"
-          class="button button--flat"
-          @click="(event) => currentPrompt?.confirm(event, conflict)"
-          :aria-label="$t('buttons.ok')"
-          :title="$t('buttons.ok')"
-          tabindex="1"
-        >
-          {{ $t("buttons.ok") }}
-        </button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, ref } from "vue";
-import { useLayoutStore } from "@/stores/layout";
-import { filesize } from "@/utils";
-import dayjs from "dayjs";
-
-const layoutStore = useLayoutStore();
-const { currentPrompt } = layoutStore;
-
-const conflict = ref<ConflictingResource[]>(currentPrompt?.props.conflict);
-
-const isUploadAction = ref<boolean | undefined>(
-  currentPrompt?.props.isUploadAction
-);
-
-const personalized = ref(false);
-
-const originAllChecked = computed(() => {
-  for (const item of conflict.value) {
-    if (!item.checked.includes("origin")) return false;
-  }
-
-  return true;
-});
-
-const destAllChecked = computed(() => {
-  for (const item of conflict.value) {
-    if (!item.checked.includes("dest")) return false;
-  }
-
-  return true;
-});
-
-const close = () => {
-  layoutStore.closeHovers();
-};
-
-const humanSize = (size: number | undefined) => {
-  return size == undefined ? "Unknown size" : filesize(size);
-};
-
-const humanTime = (modified: string | number | undefined) => {
-  if (modified == undefined) return "Unknown date";
-
-  return dayjs(modified).format("L LT");
-};
-
-const resume = (event: Event) => {
-  conflict.value.forEach((item) => {
-    if (item.isSmallerOnServer) {
-      item.checked = ["origin"];
-    } else {
-      item.checked = ["dest"];
-    }
-  });
-  currentPrompt?.confirm(event, conflict.value);
-};
-
-const resolve = (event: Event, result: Array<"origin" | "dest">) => {
-  for (const item of conflict.value) {
-    item.checked = result;
-  }
-  currentPrompt?.confirm(event, conflict.value);
-};
-
-const toogleCheckAll = (e: Event) => {
-  const target = e.currentTarget as HTMLInputElement;
-  const value = target.value as "origin" | "dest" | "both";
-  const checked = target.checked;
-
-  for (const item of conflict.value) {
-    if (value == "both") {
-      item.checked = ["origin", "dest"];
-    } else {
-      if (!item.checked.includes(value)) {
-        if (checked) {
-          item.checked.push(value);
-        }
-      } else {
-        if (!checked) {
-          item.checked = value == "dest" ? ["origin"] : ["dest"];
-        }
-      }
-    }
-  }
-};
-</script>
-<style scoped>
-.conflict-list-container {
-  max-height: 300px;
-  overflow: auto;
-}
-
-.conflict-list-container > div {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  border-bottom: solid 1px var(--textPrimary);
-  gap: 0.5rem 0.25rem;
-}
-
-.conflict-list-container > div:last-child {
-  border-bottom: none;
-}
-
-.conflict-list-container > div > div {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
-.conflict-file-name {
-  grid-column: 1 / -1;
-  color: var(--textPrimary);
-  font-size: 0.8rem;
-  display: flex;
-  justify-content: space-between;
-  padding: 0.5rem 0.25rem;
-}
-
-.conflict-file-value {
-  color: var(--textPrimary);
-  font-size: 0.9rem;
-  margin: 0;
-}
-
-.result-rename,
-.result-override,
-.result-error,
-.result-skip {
-  font-size: 0.75rem;
-  line-height: 0.75rem;
-  border-radius: 0.75rem;
-  padding: 0.15rem 0.5rem;
-}
-
-.result-override {
-  background-color: var(--input-green);
-}
-
-.result-error {
-  background-color: var(--icon-red);
-}
-.result-rename {
-  background-color: var(--icon-orange);
-}
-.result-skip {
-  background-color: var(--icon-blue);
-}
-
-.result-buttons > button {
-  padding: 0.75rem;
-  color: var(--textPrimary);
-  margin: 0.25rem 0;
-  display: flex;
-  justify-content: start;
-  align-items: center;
-  gap: 0.5rem;
-  background: transparent;
-  border: solid 1px transparent;
-  width: 100%;
-  transition: all ease-in-out 200ms;
-  cursor: pointer;
-  border-radius: 0.25rem;
-}
-
-.result-buttons > button:hover {
-  border: solid 1px var(--icon-blue);
-}
-
-.info-tooltip {
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-}
-
-.info-icon {
-  font-size: 1rem;
-  color: var(--icon-blue);
-  cursor: help;
-}
-
-.info-tooltip-text {
-  visibility: hidden;
-  opacity: 0;
-  position: absolute;
-  bottom: 100%;
-  left: 50%;
-  transform: translateX(-50%);
-  background-color: var(--surfacePrimary, #333);
-  color: var(--textPrimary, #fff);
-  font-size: 0.75rem;
-  line-height: 1.3;
-  padding: 0.5rem 0.75rem;
-  border-radius: 0.25rem;
-  width: 220px;
-  text-align: center;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-  transition: opacity 200ms ease-in-out;
-  z-index: 10;
-  pointer-events: none;
-}
-
-.info-tooltip:hover .info-tooltip-text {
-  visibility: visible;
-  opacity: 1;
-}
-</style>

frontend/src/components/prompts/Share.vue

@@ -12,7 +12,6 @@
             <th>{{ $t("settings.shareDuration") }}</th>
             <th></th>
             <th></th>
-            <th></th>
           </tr>
 
           <tr v-for="link in links" :key="link.hash">
@@ -25,7 +24,7 @@
             </td>
             <td class="small">
               <button
-                class="action"
+                class="action copy-clipboard"
                 :aria-label="$t('buttons.copyToClipboard')"
                 :title="$t('buttons.copyToClipboard')"
                 @click="copyToClipboard(buildLink(link))"
@@ -33,17 +32,6 @@
                 <i class="material-icons">content_paste</i>
               </button>
             </td>
-            <td class="small">
-              <button
-                class="action"
-                :aria-label="$t('buttons.copyDownloadLinkToClipboard')"
-                :title="$t('buttons.copyDownloadLinkToClipboard')"
-                :disabled="!!link.hasPassword"
-                @click="copyToClipboard(buildDownloadLink(link))"
-              >
-                <i class="material-icons">content_paste_go</i>
-              </button>
-            </td>
             <td class="small">
               <button
                 class="action"
@@ -144,7 +132,7 @@
 <script>
 import { mapActions, mapState } from "pinia";
 import { useFileStore } from "@/stores/file";
-import * as api from "@/api/index";
+import { share as api } from "@/api";
 import dayjs from "dayjs";
 import { useLayoutStore } from "@/stores/layout";
 import { copy } from "@/utils/clipboard";
@@ -184,7 +172,7 @@ export default {
   },
   async beforeMount() {
     try {
-      const links = await api.share.get(this.url);
+      const links = await api.get(this.url);
       this.links = links;
       this.sort();
 
@@ -223,14 +211,9 @@ export default {
         let res = null;
 
         if (!this.time) {
-          res = await api.share.create(this.url, this.password);
+          res = await api.create(this.url, this.password);
         } else {
-          res = await api.share.create(
-            this.url,
-            this.password,
-            this.time,
-            this.unit
-          );
+          res = await api.create(this.url, this.password, this.time, this.unit);
         }
 
         this.links.push(res);
@@ -248,7 +231,7 @@ export default {
     deleteLink: async function (event, link) {
       event.preventDefault();
       try {
-        await api.share.remove(link.hash);
+        await api.remove(link.hash);
         this.links = this.links.filter((item) => item.hash !== link.hash);
 
         if (this.links.length == 0) {
@@ -262,16 +245,7 @@ export default {
       return dayjs(time * 1000).fromNow();
     },
     buildLink(share) {
-      return api.share.getShareURL(share);
-    },
-    buildDownloadLink(share) {
-      return api.pub.getDownloadURL(
-        {
-          hash: share.hash,
-          path: "",
-        },
-        true
-      );
+      return api.getShareURL(share);
     },
     sort() {
       this.links = this.links.sort((a, b) => {

frontend/src/components/prompts/Upload.vue

@@ -35,6 +35,7 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
+import { useFileStore } from "@/stores/file";
 import { useLayoutStore } from "@/stores/layout";
 
 import * as upload from "@/utils/upload";
@@ -42,10 +43,11 @@ import * as upload from "@/utils/upload";
 const { t } = useI18n();
 const route = useRoute();
 
+const fileStore = useFileStore();
 const layoutStore = useLayoutStore();
 
 // TODO: this is a copy of the same function in FileListing.vue
-const uploadInput = async (event: Event) => {
+const uploadInput = (event: Event) => {
   const files = (event.currentTarget as HTMLInputElement)?.files;
   if (files === null) return;
 
@@ -65,32 +67,20 @@ const uploadInput = async (event: Event) => {
   }
 
   const path = route.path.endsWith("/") ? route.path : route.path + "/";
+  const conflict = upload.checkConflict(uploadFiles, fileStore.req!.items);
 
-  const conflict = await upload.checkConflict(uploadFiles, path);
-
-  if (conflict.length > 0) {
+  if (conflict) {
     layoutStore.showHover({
-      prompt: "resolve-conflict",
-      props: {
-        conflict: conflict,
-        isUploadAction: true,
-      },
-      confirm: (event: Event, result: Array<ConflictingResource>) => {
+      prompt: "replace",
+      action: (event: Event) => {
         event.preventDefault();
         layoutStore.closeHovers();
-        for (let i = result.length - 1; i >= 0; i--) {
-          const item = result[i];
-          if (item.checked.length == 2) {
-            continue;
-          } else if (item.checked.length == 1 && item.checked[0] == "origin") {
-            uploadFiles[item.index].overwrite = true;
-          } else {
-            uploadFiles.splice(item.index, 1);
-          }
-        }
-        if (uploadFiles.length > 0) {
-          upload.handleFiles(uploadFiles, path);
-        }
+        upload.handleFiles(uploadFiles, path, false);
+      },
+      confirm: (event: Event) => {
+        event.preventDefault();
+        layoutStore.closeHovers();
+        upload.handleFiles(uploadFiles, path, true);
       },
     });