fix default config

.github/workflows/dev.yaml

@@ -0,0 +1,79 @@
+name: dev
+
+on:
+  push:
+    branches:
+      - 'dev_v*'
+
+jobs:
+  test-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+      - working-directory: backend
+        run: go test -race -v ./...
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+            go-version: 'stable'
+      - uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.59
+          working-directory: backend
+  format-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+      - working-directory: backend
+        run: go fmt ./...
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - working-directory: frontend
+        run: npm i eslint && npm run lint
+
+  push_dev_to_registry:
+    name: Push dev image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.0.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.0.0
+        # Workaround to fix error:
+        # failed to push: failed to copy: io: read/write on closed pipe
+        # See https://github.com/docker/build-push-action/issues/761
+        with:
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: gtstef/filebrowser
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/main.yaml

@@ -1,52 +1,65 @@
-name: main release
+name: main job
 
 on:
   push:
     branches:
-      - "main"
+      - 'main'
 
 jobs:
-  test_frontend:
-    name: Test Playwright
+  test-backend:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run build
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version: 'stable'
       - working-directory: backend
-        run: go build -o filebrowser .
-      - name: Build
-        uses: docker/build-push-action@v6
+        run: go test -race -v ./...
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          context: .
-          file: ./Dockerfile.playwright
-          push: false
+            go-version: 'stable'
+      - uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.59
+          working-directory: backend
+  format-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+      - working-directory: backend
+        run: go fmt ./...
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - working-directory: frontend
+        run: npm i eslint && npm run lint
+
   push_latest_to_registry:
-    needs: [ test_frontend ]
+    needs: [lint-frontend, lint-backend, test-backend, format-backend]
     name: Push latest
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Find latest beta tag
-        run: |
-          echo "LATEST_TAG=$(git describe --tags $(git rev-list --tags="*-beta*" --max-count=1))" >> $GITHUB_ENV
-          echo "latest tag is $LATEST_TAG"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3.0.0
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.0.0
+        # Workaround to fix error:
+        # failed to push: failed to copy: io: read/write on closed pipe
+        # See https://github.com/docker/build-push-action/issues/761
+        with:
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -61,9 +74,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          build-args: |
-            VERSION=${{ env.LATEST_TAG }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           file: ./Dockerfile
           push: true

.github/workflows/pr-merge.yaml

@@ -1,37 +1,50 @@
-name: PR Request
+name: pr-merge
 
 on:
   pull_request:
     branches:
-      - "dev/v[0-9]+.[0-9]+.[0-9]+"
-      - "beta/v[0-9]+.[0-9]+.[0-9]+"
-      - "stable/v[0-9]+.[0-9]+.[0-9]+"
+      - 'main'
+      - 'dev_v*'
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
-  test_frontend:
-    name: Test Playwright
+  test-backend:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run build
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version: 'stable'
       - working-directory: backend
-        run: go build -o filebrowser .
-      - name: Build
-        uses: docker/build-push-action@v6
+        run: go test -race -v ./...
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          context: .
-          file: ./Dockerfile.playwright
-          push: false
+            go-version: 'stable'
+      - uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.59
+          working-directory: backend
+  format-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+      - working-directory: backend
+        run: go fmt ./...
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - working-directory: frontend
+        run: npm i eslint && npm run lint
+
   push_pr_to_registry:
     name: Push PR
     runs-on: ubuntu-latest
@@ -42,6 +55,12 @@ jobs:
         uses: docker/setup-qemu-action@v3.0.0
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.0.0
+        # Workaround to fix error:
+        # failed to push: failed to copy: io: read/write on closed pipe
+        # See https://github.com/docker/build-push-action/issues/761
+        with:
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -53,13 +72,10 @@ jobs:
         with:
           images: gtstef/filebrowser
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            VERSION=${{ steps.meta.outputs.version }}
-            REVISION=${{ steps.meta.outputs.revision }}

.github/workflows/regular-tests.yaml

@@ -1,51 +0,0 @@
-name: regular tests
-
-on:
-  push:
-    branches:
-      - "**"
-
-jobs:
-  test-backend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go test -race -v ./...
-  lint-backend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-            go-version: 'stable'
-      - uses: golangci/golangci-lint-action@v5
-        with:
-          version: v1.60
-          working-directory: backend
-  format-backend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go fmt ./...
-  lint-frontend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run lint
-  test-frontend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run test

.github/workflows/release.yaml

@@ -0,0 +1,115 @@
+name: release
+
+on:
+  push:
+    branches:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+permissions:
+  contents: write
+
+jobs:
+  create_release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.extract_branch.outputs.branch }}
+          release_name: ${{ steps.extract_branch.outputs.branch }}
+          body: |
+            Please see usage on [readme](https://github.com/gtsteffaniak/filebrowser).
+            Docker repo: https://hub.docker.com/r/gtstef/filebrowser/tags
+          draft: false
+          prerelease: false
+  test-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+      - working-directory: backend
+        run: go test -race -v ./...
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+            go-version: 'stable'
+      - uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.59
+          working-directory: backend
+  format-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+      - working-directory: backend
+        run: go fmt ./...
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - working-directory: frontend
+        run: npm i eslint && npm run lint
+
+  push_release_to_registry:
+    needs: [lint-frontend, lint-backend, test-backend, format-backend]
+    name: Push release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.0.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.0.0
+        # Workaround to fix error:
+        # failed to push: failed to copy: io: read/write on closed pipe
+        # See https://github.com/docker/build-push-action/issues/761
+        with:
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
+      - name: Login to Docker Hub
+        # Only push to Docker Hub when making a release
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: gtstef/filebrowser
+      - name: Strip v from version number
+        id: modify-json
+        run: |
+          JSON="${{ steps.meta.outputs.tags }}"
+          # Use jq to remove 'v' from the version field
+          JSON=$(echo "$JSON" | sed 's/filebrowser:v/filebrowser:/')
+          echo "cleaned_tag=$JSON" >> $GITHUB_OUTPUT
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.modify-json.outputs.cleaned_tag }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release_beta.yaml

@@ -1,107 +0,0 @@
-name: beta release
-
-on:
-  push:
-    branches:
-      - "beta/v[0-9]+.[0-9]+.[0-9]+"
-
-permissions:
-  contents: write
-
-jobs:
-  test_frontend:
-    name: Test Playwright
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run build
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go build -o filebrowser .
-      - name: Build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.playwright
-          push: false
-  create_release_tag:
-    needs: [ test_frontend ]
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.PAT }}
-      - name: Extract branch name
-        shell: bash
-        run: |
-          original_branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-          echo "branch_name=$transformed_branch" >> $GITHUB_OUTPUT
-          tag_name=$(echo "$original_branch" | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+')-beta
-          echo "tag_name=$tag_name" >> $GITHUB_OUTPUT
-        id: extract_branch
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          target_commitish: ${{ steps.extract_branch.outputs.branch_name }}
-          token: ${{ secrets.PAT }}
-          tag_name: ${{ steps.extract_branch.outputs.tag_name }}
-          prerelease: false # change this to false when stable gets released
-          make_latest: true # change this to false when stable gets released
-          draft: false
-          generate_release_notes: true
-          name: ${{ steps.extract_branch.outputs.tag_name }}
-
-  push_release_to_registry:
-    needs: [ test_frontend ]
-    name: Push release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: gtstef/filebrowser
-      - name: Strip v from version number
-        id: modify-json
-        run: |
-          JSON="${{ steps.meta.outputs.tags }}"
-          # Use jq to remove 'v' from the version field
-          JSON=$(echo "$JSON" | sed 's/filebrowser:beta\/v/filebrowser:beta_v/')
-          echo "cleaned_tag=$JSON" >> $GITHUB_OUTPUT
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          build-args: |
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.modify-json.outputs.cleaned_tag }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release_dev.yaml

@@ -1,50 +0,0 @@
-name: dev release
-
-on:
-  push:
-    branches:
-      - "dev/v[0-9]+.[0-9]+.[0-9]+"
-
-permissions:
-  contents: write
-
-jobs:
-  push_release_to_registry:
-    name: Push release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: gtstef/filebrowser
-      - name: Strip v from version number
-        id: modify-json
-        run: |
-          JSON="${{ steps.meta.outputs.tags }}"
-          # Use jq to remove 'v' from the version field
-          JSON=$(echo "$JSON" | sed 's/filebrowser:dev\/v/filebrowser:dev_v/')
-          echo "cleaned_tag=$JSON" >> $GITHUB_OUTPUT
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          build-args: |
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
-          platforms: linux/amd64
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.modify-json.outputs.cleaned_tag }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release_stable.yaml

@@ -1,106 +0,0 @@
-name: stable release
-
-on:
-  push:
-    branches:
-      - "stable/v[0-9]+.[0-9]+.[0-9]+"
-
-permissions:
-  contents: write
-
-jobs:
-  test_frontend:
-    name: Test Playwright
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run build
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go build -o filebrowser .
-      - name: Build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.playwright
-          push: false
-  create_release_tag:
-    needs: [ test_frontend ]
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.PAT }}
-      - name: Extract branch name
-        shell: bash
-        run: |
-          original_branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-          echo "branch_name=$transformed_branch" >> $GITHUB_OUTPUT
-          tag_name=$(echo "$original_branch" | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+')-stable
-          echo "tag_name=$tag_name" >> $GITHUB_OUTPUT
-        id: extract_branch
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          target_commitish: ${{ steps.extract_branch.outputs.branch_name }}
-          token: ${{ secrets.PAT }}
-          tag_name: ${{ steps.extract_branch.outputs.tag_name }}
-          prerelease: false
-          draft: false
-          generate_release_notes: true
-          name: ${{ steps.extract_branch.outputs.tag_name }}
-
-  push_release_to_registry:
-    needs: [ test_frontend ]
-    name: Push release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: gtstef/filebrowser
-      - name: Strip v from version number
-        id: modify-json
-        run: |
-          JSON="${{ steps.meta.outputs.tags }}"
-          # Use jq to remove 'v' from the version field
-          JSON=$(echo "$JSON" | sed 's/filebrowser:stable\/v/filebrowser:/')
-          echo "cleaned_tag=$JSON" >> $GITHUB_OUTPUT
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          build-args: |
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.modify-json.outputs.cleaned_tag }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/stale.yaml

@@ -0,0 +1,24 @@
+name: 'Close stale issues and PRs'
+permissions:
+  issues: write
+  pull-requests: write
+
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v5
+        with:
+          stale-pr-message: 'This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+          close-pr-message: 'This PR was closed because it has been stalled for 5 days with no activity.'
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+          close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity.'
+          days-before-stale: 30
+          days-before-close: 30
+          exempt-issue-labels: 'feature ☘,enhancement ⚙,bug 🐞'
+          exempt-pr-labels: 'need-help,wip'
+          operations-per-run: 100

.github/workflows/tag.yaml

@@ -1,31 +0,0 @@
-name: tag update
-
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+*"
-
-permissions:
-  contents: write
-
-jobs:
-  update_tag:
-    name: Update Release tag
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-      - name: Install dependencies and build frontend
-        run: npm i && npm run build
-        working-directory: frontend
-      - name: Install UPX
-        run: sudo apt-get install -y upx
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6
-        with:
-          args: release --clean
-          workdir: backend
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -3,19 +3,13 @@
 _old
 rice-box.go
 .idea/
-/backend
-/backend.exe
+/filebrowser
+/filebrowser.exe
 /frontend/dist
 /frontend/pkg
-/frontend/test-results
-/frontend/loginAuth.json
 /frontend/package-lock.json
 /backend/vendor
 /backend/*.cov
-/backend/test_config.yaml
-/backend/srv
-/backend/http/dist
-/backend/http/embed/*
 
 .DS_Store
 node_modules
@@ -39,9 +33,3 @@ yarn-error.log*
 *.sw*
 bin/
 build/
-
-# docs
-
-/autodocs/public
-/autodocs/themes
-/autodocs/resources

CHANGELOG.md

@@ -2,221 +2,6 @@
 
 All notable changes to this project will be documented in this file. For commit guidelines, please refer to [Standard Version](https://github.com/conventional-changelog/standard-version).
 
-## v0.4.0-beta
-
-  **New Features**
-  - Better logging
-    - highly configurable
-    - api logs include user
-  - openoffice support
-
-## v0.3.7-beta
-
-  **Notes**:
-  - Adding windows builds back to automated process... will replace manually if they throw malicious defender warnings.
-  - Adding playwright tests to all pr's against dev/beta/release branches.
-    - These playwright tests should help keep release more reliably stable.
-
-  **Bugfixes**:
-  - closing with the default bar issue.
-  - tar.gz archive creation issue
-
-## v0.3.6-beta
-
-  **New Features**
-  - Adds "externalUrl" server config https://github.com/gtsteffaniak/filebrowser/issues/272
-
-  **Notes**:
-  - All views modes to show header bar for sorting.
-  - other small style changes
-
-  **Bugfixes**:
-  - select and info bug after sorting https://github.com/gtsteffaniak/filebrowser/issues/277
-  - downloading from shares with public user
-  - Ctrl and Shift key modifiers work on listing views as expected.
-  - copy/move file/folder error and show errors https://github.com/gtsteffaniak/filebrowser/issues/278
-  - file move/copy context fix.
-
-## v0.3.5
-
-  **New Features**
-  - More indexing configuration options possible. However consider waiting on using this feature, because I will soon have a full onboarding experience in the UI to manage sources instead.
-    - added config file options "sources" in the server config.
-    - can enable/disable indexing a specified list of directories/files
-    - can enable/disable indexing hidden files
-    - prepped for multiple sources (not supported yet!)
-  - Theme and Branding support (see updates to [configuration wiki](https://github.com/gtsteffaniak/filebrowser/wiki/Configuration) on how to use)
-  - Automatically expire shares https://github.com/gtsteffaniak/filebrowser/issues/208
-
-  **Notes**:
-  - MacOS application files (ending in ".app") were previously treated as folders, now they are treated as a single file.
-  - No longer indexes "$RECYCLE.BIN" or "System Volume Information" directories.
-  - Icon styling tweaked so all icons have a background.
-  - Updated Login page styling.
-  - Settings profile menu has been simplified, password changes happen in user management.
-  - Improved windows compatibility and built on windows platform to fix false windows defender warning.
-  - If no "root" location is provided in the server config, the default is the **current directory** (rather than `/srv` like before)
-
-  **Bugfixes**:
-  - Fixed setting share expiration time would not work due to type conversion error.
-  - More safari fixes related to text-selection.
-  - Sort by name value sorting ignores the extension, only sorts by name https://github.com/gtsteffaniak/filebrowser/issues/230
-  - Fixed manual language selection issue.
-  - Fixed exact date time issue.
-
-New login page:
-
-<img width="300" alt="image" src="https://github.com/user-attachments/assets/d3ed359e-a969-4f6a-9f72-94d2b68aba49" />
-
-
-Example branding in sidebar:
-
-<img width="500" alt="image2" src="https://github.com/user-attachments/assets/d8ee14ca-4495-4106-9d26-631a5937e134" />
-
-Example user settings page:
-
-<img width="500" alt="image3" src="https://github.com/user-attachments/assets/79757a11-669e-4597-bd3d-e41efd667a1e" />
-
-## v0.3.4
-
-  **Bugfixes**:
-  - Safari right-click actions.
-  - Some small image viewer behavior
-  - Progressive webapp "install to homescreen" fix.
-
-## v0.3.3
-
-  **New Features**
-  - Navigating remembers your previous scroll position when opening items and then navigating backwards.
-  - New Icons with larger selection of file types
-  - file "type" is shown on item info page.
-  - added optional non-root "filebrowser" user for docker image. See https://github.com/gtsteffaniak/filebrowser/issues/251
-  - File preview supports more file types:
-    - images: jpg, bmp, gif, tiff, png, svg, heic, webp
-
-  **Notes**:
-  - The file "type" is now either "directory" or a specific mimetype such as "text/xml".
-  - update safari styling
-
-  **Bugfixes**:
-  - Delete/move file/folders sometimes wouldn't work.
-  - Possible fix for context menu not showing issue. See https://github.com/gtsteffaniak/filebrowser/issues/251
-  - Fixed drag/drop not refreshing immediately to reflect changes.
-
-## v0.3.2
-
-  **New Features**
-  - Mobile search has the same features as desktop.
-
-  **Notes**:
-  - Added compression. Helpful for browsing folders with a large number of items. Considering https://github.com/gtsteffaniak/filebrowser/issues/201 resolved, although future pagination support will still come.
-  - Compressed download options limited to `.zip` and `.tar.gz`
-  - right-click context menu stays in view.
-
-  **Bugfixes**:
-  - search result links when non-default baseUrl configured
-  - frontend sort bug squashed https://github.com/gtsteffaniak/filebrowser/issues/230
-  - bug which caused "noauth" method not to work after v0.3.0 routes update
-
-## v0.3.1
-
-  **New Features**
-  - Adds Smart Indexing by default.
-
-  **Notes**:
-  - Optimized api request response times via improved caching and simplified actions.
-  - User information persists more reliably.
-  - Added [indexing doc](./docs/indexing.md) to explain the expectations around indexing and how it works.
-  - The index should also use less RAM than it did in v0.3.0.
-
-  **Bugfixes**:
-  - Tweaked sorting by name, fixes case sensitive and numeric sorting. https://github.com/gtsteffaniak/filebrowser/issues/230
-  - Fixed unnecessary authentication status checks each route change
-  - Fix create file action issue.
-  - some small javascript related issues.
-  - Fixes pretty big bug viewing raw content in v0.3.0 (utf format message)
-
-## v0.3.0
-
-  This Release focuses on the API and making it more accessible for developers to access functions without the UI.
-
-  **New Features**:
-  - You can now long-live api tokens to interact with API from the user settings page.
-    - These tokens have the same permissions as your user.
-  - Helpful swagger page for API usage.
-  - Some API's were refactored for friendlier API usage, moving some attributes to parameters and first looking for a api token, then using the stored cookie if none is found. This allows for all api requests from swagger page to work without a token.
-  - Add file size to search preview! Should have been in last release... sorry!
-
-  **Notes**:
-  - Replaced backend http framework with go standard library.
-  - Right-click Context menu can target the item that was right-clicked. To fully address https://github.com/gtsteffaniak/filebrowser/issues/214
-  - adjusted settings menu for mobile, always shows all available cards rather than grayed out cards that need to be clicked.
-  - longer and more cryptographically secure share links based on UUID rather than base64.
-
-  **Bugfixes**:
-  - Fixed ui bug with shares with password.
-  - Fixes baseurl related bugs https://github.com/gtsteffaniak/filebrowser/pull/228 Thanks @SimLV
-  - Fixed empty directory load issue.
-  - Fixed image preview cutoff on mobile.
-  - Fixed issue introduced in v0.2.10 where new files and folders were not showing up on ui
-  - Fixed preview issue where preview would not load after viewing video files.
-  - Fixed sorting issue where files were not sorted by name by default.
-  - Fixed copy file prompt issue
-
-## v0.2.10
-
-  **New Features**:
-  - Allows user creation command line arguments https://github.com/gtsteffaniak/filebrowser/issues/196
-  - Folder sizes are always shown, leveraging the index. https://github.com/gtsteffaniak/filebrowser/issues/138
-  - Searching files based on filesize is no longer slower.
-
-  **Bugfixes**:
-  - fixes file selection usage when in single-click mode https://github.com/gtsteffaniak/filebrowser/issues/214
-  - Fixed displayed search context on root directory
-  - Fixed issue searching "smaller than" actually returned files "larger than"
-
-  **Notes**:
-  - Memory usage from index is reduced by ~40%
-  - Indexing time has increased 2x due to the extra processing time required to calculate directory sizes.
-  - File size calculations use 1024 base vs previous 1000 base (matching windows explorer)
-
-## v0.2.9
-
-  This release focused on UI navigation experience. Improving keyboard navigation and adds right click context menu.
-
-  **New Features**:
-  - listing view items are middle-clickable on selected listing or when in single-click mode.
-  - listing view items can be navigated via arrow keys.
-  - listing view can jump to items using letters and number keys to cycle through files that start with that character.
-  - You can use the enter key and backspace key to navigate backwards and forwards on selected items.
-  - ctr-space will open/close the search (leaving ctr-f to browser default find prompt)
-  - Added right-click context menu to replace the file selection prompt.
-
-  **Bugfixes**:
-  - Fixed drag to upload not working.
-  - Fixed shared video link issues.
-  - Fixed user edit bug related to other user.
-  - Fixed password reset bug.
-  - Fixed loading state getting stuck.
-
-## v0.2.8
-
-- **Feature**: New gallery view scaling options (closes [#141](https://github.com/gtsteffaniak/filebrowser/issues/141))
-- **Change**: Refactored backend files functions
-- **Change**: Improved UI response to filesystem changes
-- **Change**: Added frontend tests for deployment integrity
-- **Fix**: move/replace file prompt issue
-- **Fix**: opening files from search
-- **Fix**: Display count issue when hideDotFile is enabled.
-
-## v0.2.7
-
- - **Change**: New sidebar style and behavior
- - **Change**: make search view and button behavior more consistent.
- - **Fix**: [upload file bug](https://github.com/gtsteffaniak/filebrowser/issues/153)
- - **Fix**: user lock out bug introduced in 0.2.6
- - **Fix**: many minor state related issues.
-
 ## v0.2.6
 
 This change focuses on minimizing and simplifying build process.
@@ -287,7 +72,7 @@ This change focuses on minimizing and simplifying build process.
 - The shell feature has been deprecated.
   - Custom commands can be executed within the Docker container if needed.
 - The JSON config file is no longer used.
-  - All configurations are now performed via the advanced `config.yaml`.
+  - All configurations are now performed via the advanced `filebrowser.yaml`.
   - The only allowed flag is specifying the config file.
 - Removed old code for migrating database versions.
 - Eliminated all unused `cmd` code.

Dockerfile

@@ -1,31 +1,18 @@
-FROM golang:1.23-alpine AS base
-ARG VERSION
-ARG REVISION
+FROM node:slim as nbuild
 WORKDIR /app
-COPY ./backend ./
-#RUN swag init --output swagger/docs
-RUN ln -s swagger /usr/local/go/src/
-RUN go build -ldflags="-w -s \
-  -X 'github.com/gtsteffaniak/filebrowser/backend/version.Version=${VERSION}' \
-  -X 'github.com/gtsteffaniak/filebrowser/backend/version.CommitSHA=${REVISION}'" \
-  -o filebrowser .
-
-FROM node:slim AS nbuild
-WORKDIR /app
-COPY ./frontend/package.json ./
+COPY ./frontend/package*.json ./
 RUN npm i --maxsockets 1
 COPY  ./frontend/ ./
-RUN npm run build-docker
+RUN npm run build
+
+FROM golang:1.22-alpine as base
+WORKDIR /app
+COPY ./backend ./
+RUN go build -ldflags="-w -s" -o filebrowser .
 
 FROM alpine:latest
-ENV FILEBROWSER_NO_EMBEDED="true"
+ARG app="/app/filebrowser"
 RUN apk --no-cache add ca-certificates mailcap
-WORKDIR /home/filebrowser
-RUN adduser -D -s /bin/true -u 1000 filebrowser
-USER filebrowser
-COPY --from=base --chown=filebrowser:1000 /app/filebrowser* ./
-COPY --from=nbuild --chown=filebrowser:1000 /app/dist/ ./http/dist/
-USER root
-# exposing default port for auto discovery.
-EXPOSE 80
+COPY --from=base /app/filebrowser* ./
+COPY --from=nbuild /app/dist/ ./frontend/dist/
 ENTRYPOINT [ "./filebrowser" ]

Dockerfile.playwright

@@ -1,5 +0,0 @@
-FROM gtstef/playwright-base
-WORKDIR /app
-COPY [ "./backend/filebrowser*", "./"]
-COPY [ "./frontend/", "./" ]
-RUN ./filebrowser -c filebrowser-playwright.yaml & sleep 2 && npx playwright test

Dockerfile.playwright-base

@@ -1,5 +0,0 @@
-FROM node:22-slim
-WORKDIR /app
-COPY ./frontend/package.json ./
-RUN npm i @playwright/test
-RUN npx playwright install --with-deps firefox

README.md

@@ -2,157 +2,160 @@
   <a href="https://opensource.org/license/apache-2-0/"><img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg" alt="License: Apache-2.0"></a>
 </p>
 <p align="center">
-  <img src="frontend/public/img/icons/favicon-256x256.png" width="100" title="Login With Custom URL">
+<img src="frontend/public/img/icons/favicon-256x256.png" width="100" title="Login With Custom URL">
 </p>
-<h3 align="center">FileBrowser Quantum - A modern web-based file manager</h3>
+<h3 align="center">Filebrowser - A modern web-based file manager</h3>
 <p align="center">
-  <img width="800" src="https://github.com/user-attachments/assets/b16acd67-0292-437a-a06c-bc83f95758e6" title="Main Screenshot">
+  <img width="800" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/899152cf-3e69-4179-aa82-752af2df3fc6" title="Main Screenshot">
 </p>
 
 > [!WARNING]
-> There is no stable version yet. 
-> (planned for later this year after these are complete: multiple sources support, initial onboarding page, official automated docs website)
+> Starting with v0.2.0, *ALL* configuration is done via `filebrowser.yaml` configuration file.
+> Starting with v0.2.4 *ALL* share links need to be re-created (due to security fix).
 
-FileBrowser Quantum is a fork of the file browser open-source project with the following changes:
+This fork makes the following significant changes to filebrowser for origin:
 
-  1. ✅ Indexes files efficiently. (See [indexing Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/Indexing) for more info.)
-     - Real-time search results as you type
-     - Search supports file/folder sizes and many file type filters.
-     - Enhanced interactive results that show file/folder sizes.
-  2. ✅ Revamped and simplified GUI navbar and sidebar menu.
+  1. [x] Better search
+     - Lightning fast
+     - realtime results as you type
+     - Works with more type filters
+     - interactive results page.
+  2. [x] Revamped and simplified GUI navbar and sidebar menu.
      - Additional compact view mode as well as refreshed view mode styles.
-     - Many graphical and user experience improvements.
-     - right-click context menu
-  3. ✅ Revamped and simplified configuration via `config.yaml` config file.
-  4. ✅ Better listing browsing
-     - Instantly Switches view modes and sort order without reloading data.
-     - Folder sizes are displayed
-     - Navigating remembers the scroll position, navigating back keeps the last scroll position.
-  5. ✅ Developer API support
-     - Ability to create long-live API Tokens.
-     - Helpful Swagger page available at `/swagger` endpoint.
-
-Notable features that this fork *does not* have (removed):
-
- - ❌ jobs/runners are not supported yet (planned).
- - ❌ per-user rules are not supported yet (planned).
- - ❌ pagination for directory items for extremely large directories.
- - ❌ shell commands are completely removed and will not be returned.
- - see feature matrix below for more.
+  3. [x] Revamped configuration via `filebrowser.yml` config file.
+     - More configurations possible at a per-user level
+     - <img width="450" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/625bd7c4-5ee9-4011-aaae-2a388ab0813b">
 
 ## About
 
-FileBrowser Quantum provides a file-managing interface within a specified directory
-and can be used to upload, delete, preview, rename, and edit your files.
-It allows the creation of multiple users and each user can have its directory.
+Filebrowser provides a file managing interface within a specified directory
+and it can be used to upload, delete, preview, rename and edit your files.
+It allows the creation of multiple users and each user can have its own
+directory.
 
-This repository is a fork of the original [filebrowser](https://github.com/filebrowser/filebrowser)
- with a collection of changes that make this program work better in terms of
- aesthetics and performance. Improved search, simplified UI
- (without removing features) and more secure and up-to-date
- build are just a few examples.
+This repository is a fork, a collection of changes that make this program
+work better in terms of asthetics and performance. Improved search, 
+simplified ui (without removing features) and more secure and up-to-date 
+build are just a few examples.
 
-FileBrowser Quantum differs significantly from the original.
-There are hundreds of thousands of lines changed and they are generally
-no longer compatible with each other. This has been intentional -- the
+This Implementation of filebrowser differs significantly to the original. 
+There are hundereds of thousands of lines changed and they are generally 
+no longer compatible with eachother. This has been intentional -- the
 focus of this fork is on a few key principles:
   - Simplicity and improved user experience
-  - Improving performance and faster feedback when making changes.
-  - Minimize external dependencies and standard library usage.
-  - Of course -- adding much-needed features.
-
-For more, see the [Q&A Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/Q&A)
+  - Efficiency of operations and performance
+  - Minimizing external dependancies and usage of standard libraries.
+  - Of course -- adding much needed features.
 
 ## Look
 
-The UI has a simple three-component navigation system :
+One way you can observe the improved user experience is how I changed the UI. 
+The Navbar is simplified to a three component system : 
 
   1. (Left) The slide-out action panel button
   2. (Middle) The powerful search bar.
   3. (Right) The view change toggle.
-
-All other functions are moved either into the action menu or popup menus.
-If the action does not depend on context, it will exist in the slide-out
-action panel. If the action is available based on context, it will show up as
-a popup menu.
+   
+All other functions are moved either into the action menu or popup menus. 
+If the action is does not depend on context, it will exist in the slide-out action panel. 
+If the action is available based on context, it will showup as a popup menu.
 
 <p align="center">
-  <img width="800" src="https://github.com/user-attachments/assets/2be7a6c5-0f95-4d9f-bc05-484ee71246d8" title="Search GIF">
-  <img width="800" src="https://github.com/user-attachments/assets/f55a6f1f-b930-4399-98b5-94da6e90527a" title="Navigation GIF">
-  <img width="800" src="https://github.com/user-attachments/assets/93b019de-d38f-4aaa-bde3-3ba4e99ecd25" title="Main Screenshot">
+  <img width="500" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/35cdeb3b-ab79-4b04-8001-8f51f6ea06bb" title="Dark mode">
+<img width="500" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/55fa4f5c-440e-4a97-b711-96139208a163">
+<img width="500" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/c76f4100-949b-4e17-a3e6-e410fb8ec08f">
+<img width="500" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/0bde26f3-fa90-411e-bd0b-abaa47506d62">
+<img width="560" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/71d8f2b8-6fe6-4fdc-8aac-503d08c28d86">
 </p>
 
-## Install and Configuration
+## Install
 
-See the [Configuration Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/Configuration)
+Using docker:
 
-## Command Line Usage
+1. docker run (no persistent db):
 
-See the [CLI Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/CLI)
+```
+docker run -it -v /path/to/folder:/srv -p 80:80 gtstef/filebrowser
+```
 
-## API Usage
+1. docker-compose:
 
-See the [API Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/API)
+  - with local storage
+
+```
+version: '3.7'
+services:
+  filebrowser:
+    volumes:
+      - '/path/to/folder:/srv' # required (for now not configurable)
+      - './database:/database'  # optional if you want db to persist - configure a path under "database" dir in config file.
+      - './filebrowser.yaml:/filebrowser.yaml' # required
+    ports:
+      - '80:80'
+    image: gtstef/filebrowser
+    restart: always
+```
+
+  - with network share
+
+```
+version: '3.7'
+services:
+  filebrowser:
+    volumes:
+      - 'storage:/srv' # required (for now not configurable)
+      - './database:/database'  # optional if you want db to persist - configure a path under "database" dir in config file.
+      - './filebrowser.yaml:/filebrowser.yaml' # required
+    ports:
+      - '80:80'
+    image: gtstef/filebrowser
+    restart: always
+volumes:
+  storage:
+    driver_opts:
+      type: cifs
+      o: "username=admin,password=password,rw" # enter valid info here
+      device: "//192.168.1.100/share/"         # enter valid hinfo here
+
+```
+
+Not using docker (not recommended) (Must donwload asset with frontend directory next to filebrowser binary)
+
+```
+./filebrowser -f <filebrowser.yml or other /path/to/config.yaml>
+```
 
 ## Configuration
 
-Configuration is done via the `config.yaml`, see the [Configuration Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/Configuration) for available configuration options and other help.
+All configuration is now done via a single configuration file: `filebrowser.yaml`, here is an example minimal [configuration file](./backend/filebrowser.yaml).
+
+View the [Configuration Help Page](./configuration.md) for available configuration options and other help.
 
 
-## Migration from the original filebrowser
+## Migration from filebrowser/filebrowser
 
-See the [Migration Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/Migration)
+If you are currently using filebrowser from the filebrowser/filebrowser repo, but want to try using this. I recommend you start fresh without reusing the database, but there are a few things you'll need to do if you must migrate:
 
-## Comparison Chart
+1. Create a configuration file as mentioned above.
+2. Copy your database file from the original filebrowser to the path of the new one.
+3. Update the configuration file to use the database (under server in filebrowser.yml)
+4. If you are using docker, update the docker-compose file or docker run command to use the config file as described in the install section above.
+5. If you are not using docker, just make sure you run filebrowser -f filebrowser.yml and have valid filebrowser config.
+
+
+The filebrowser application should run with the same user and rules that you have from the original. But keep in mind the differences that are mentioned at the top of this readme.
+
+### background & help
+
+The original project filebrowser/filebrowser used multiple different ways to configure the server.
+This was confusing and difficult to work with from a user and from a developer's perspective.
+So I completely redesigned the program to use one single human-readable config file.
+
+I understand many coming from the original fork may notice differences which make using this improved version more difficult. If you notice issues that you believe should be fixed, please open an issue here and it will very likely be addressed with a PR within a few weeks.
+
+This version of filebrowser is going through a configuration overhaul as mentioned above. Certain features related to rules and commands may not work as they do on the original filebrowser. The purpose of this is to create a more consistent experience where configuration is done via files rather than running commands, so that it's very clear what the current state of the configuration is. When running commands its not clear what the configuration is.
+
+## Roadmap
+
+see [Roadmap Page](./roadmap.md)
 
- Application Name | <img width="48" src="frontend/public/img/icons/favicon-256x256.png" > Quantum | <img width="48" src="https://github.com/filebrowser/filebrowser/blob/master/frontend/public/img/logo.svg" > Filebrowser | <img width="48" src="https://github.com/mickael-kerjean/filestash/blob/master/public/assets/logo/app_icon.png?raw=true" > Filestash | <img width="48" src="https://avatars.githubusercontent.com/u/19211038?s=200&v=4" >  Nextcloud | <img width="48" src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/Google_Drive_logo.png/480px-Google_Drive_logo.png" > Google_Drive | <img width="48" src="https://avatars.githubusercontent.com/u/6422152?v=4" > FileRun
---- | --- | --- | --- | --- | --- | --- |
-Filesystem support            | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ |
-Linux                         | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ |
-Windows                       | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ |
-Mac                           | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ |
-Self hostable                 | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ |
-Has Stable Release?           | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
-S3 support                    | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-webdav support                | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-ftp support                   | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-Dedicated docs site?          | ❌ | ✅ | ✅ | ✅ | ❌ | ✅ |
-Multiple sources at once      | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-Docker image size             | 31 MB  | 31 MB  | 240 MB (main image) | 250 MB | ❌ | > 2 GB |
-Min. Memory Requirements      | 128 MB | 128 MB | 128 MB (main image) | 128 MB | ❌ | 4 GB   |
-has standalone binary         | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ |
-price                         | free | free | free | free tier | free tier | $99+ |
-rich media preview            | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-upload files from the web?    | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-Advanced Search?              | ✅ | ❌ | ❌ | configurable | ✅ | ✅ |
-Indexed Search?               | ✅ | ❌ | ❌ | configurable | ✅ | ✅ |
-Content-aware search?         | ❌ | ❌ | ❌ | configurable | ✅ | ✅ |
-Custom job support            | ❌ | ✅ | ❌ | ✅ | ❌ | ✅ |
-Multiple users                | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-Single sign-on support        | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-LDAP sign-on support          | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-2FA sign-on support           | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-Long-live API key support     | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ |
-API documentation page        | ✅ | ❌ | ✅ | ✅ | ❌ | ✅ |
-Mobile App                    | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ |
-open source?                  | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ |
-tags support                  | ❌ | ❌ | ❌ | ✅ | ❌ | ✅ |
-sharable web links?           | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-Event-based notifications     | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ |
-Metrics                       | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-file space quotas             | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
-text-based files editor       | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-office file support           | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ |
-Themes                        | ✅ | ✅ | ❌ | ❌ | ❌ | ✅ |
-Branding support              | ✅ | ✅ | ❌ | ❌ | ❌ | ✅ |
-activity log                  | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-Comments support              | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-collaboration on same file    | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-trash support                 | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-Starred/pinned files          | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
-Content preview icons         | ✅ | ✅ | ❌ | ❌ | ✅ | ✅ |
-Plugins support               | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-Chromecast support            | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ |
-Share collections of files    | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ |
-Can archive selected files    | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ |
-Can browse archive files      | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ 

autodocs/archetypes/default.md

@@ -1,5 +0,0 @@
-+++
-date = '{{ .Date }}'
-draft = true
-title = '{{ replace .File.ContentBaseName "-" " " | title }}'
-+++

autodocs/content/docs/Usage Guides/api.md

@@ -1,25 +0,0 @@
----
-weight: 200
-title: "API"
-description: "API Help"
-icon: "edit"
-date: "2025-01-15"
-lastmod: "2025-01-15"
-draft: false
----
-
-API tokens can be created to perform actions, access file information, and update user settings just like what can be done from the UI. You can create API tokens from the settings page via "API Management" section. This section will only show up if the user has "API" permissions, which can be granted by editing the user in user management.
-
-Regardless of whether a user has API permissions, anyone can visit the swagger page which is found at `/swagger`. This swagger page uses a short-live token (2-hour exp) that the UI uses, but allows for quick access to all the API's and their described usage and requirements:
-
-![image](https://github.com/user-attachments/assets/12abd1f6-21d3-4437-98ed-9b0da6cf2c73)
-
-When using the API outside of swagger, you will need to set the API token as a bearer token authentication type. This means the authorization header will look like `Authorization: Bearer <token>`. For example in Postman:
-
-Successful Request:
-
-<p align="center"><img width="500" alt="image" src="https://github.com/user-attachments/assets/4f18fa8a-8d87-4f40-9dc7-3d4407769b59"></p>
-
-Failed Request
-
-<p align="center"><img width="500" alt="image" src="https://github.com/user-attachments/assets/4da0deae-f93d-4d94-83b1-68806afb343a"></p>

autodocs/content/docs/quickstart.md

@@ -1,13 +0,0 @@
----
-weight: 100
-date: "2023-05-03T22:37:22+01:00"
-draft: false
-author: "Colin Wilson"
-title: "Quickstart"
-icon: "rocket_launch"
-description: "A quickstart guide to creating new content in Lotus Docs"
-publishdate: "2023-05-03T22:37:22+01:00"
-tags: ["Beginners"]
----
-
-## Requirements

autodocs/data/landing.yaml

@@ -1,89 +0,0 @@
-# Note: Template blocks require a 'weight' parameter so they're correctly ordered on the landing page
-
-# Hero
-hero:
-  enable: true
-  weight: 10
-  width: 100%
-  template: hero
-
-
-  badge:
-    text: "v0.4.0"
-    color: success # primary, secondary, success, danger, warning, info, light, dark
-    pill: true # boolean
-    soft: false # boolean
-
-  titleLogo:
-    path: "images/logos"
-    filename: "title_logo.png"
-    alt: "Lotus Docs Logo"
-    height: 80px
-
-  title: "FileBrowser Quantum"
-  subtitle: A modern self-hosted **file manager** for the web. 
-
-  ctaButton:
-    color: success
-    btnText: "Go to the Docs"
-    url: "docs"
-  info: "**Open Source** Apache 2.0 Licensed."
-
-# Image compare
-imageCompare:
-  enable: true
-  weight: 30
-  template: image compare
-
-  title: Beautifully Customizable.
-  subtitle: You can make it your own.
-
-  items:
-    - title: Dark Mode
-      config: {
-        startingPoint: 50,
-        addCircle: true,
-        addCircleBlur: false,
-        showLabels: true,
-        labelOptions: {
-          before: 'Dark',
-          after: 'Light',
-          onHover: false
-        }
-      }
-      imagePath: "images/screenshots"
-      imageBefore: "lotusdocs_dark_v0.8.webp"
-      imageAfter: "lotusdocs_light_v0.8.webp"
-
-    - title: Branding
-      config: {
-        controlColor: "#3C4257",
-        startingPoint: 25,
-        addCircle: true,
-        addCircleBlur: false,
-        showLabels: true,
-        labelOptions: {
-          before: 'Inter',
-          after: 'Life Saver',
-          onHover: false
-        }
-      }
-      imagePath: "images/screenshots"
-      imageBefore: "lotusdocs_google_font_demo_inter_screenshot.webp"
-      imageAfter: "lotusdocs_google_font_demo_lifesavers_screenshot.webp"
-
-    - title: Accent Color
-      config: {
-        startingPoint: 25,
-        addCircle: true,
-        addCircleBlur: true,
-        showLabels: true,
-        labelOptions: {
-          before: 'Blue',
-          after: 'Cardinal',
-          onHover: false
-        }
-      }
-      imagePath: "images/screenshots"
-      imageBefore: "lotusdocs_blue_theme_colour.webp"
-      imageAfter: "lotusdocs_cardinal_theme_colour.webp"

autodocs/go.mod

@@ -1,8 +0,0 @@
-module github.com/gtsteffaniak/filebrowser
-
-go 1.22.5
-
-require (
-	github.com/gohugoio/hugo-mod-bootstrap-scss/v5 v5.20300.20200 // indirect
-	github.com/gtsteffaniak/filebrowserDocsTheme v0.0.0-20250118144715-40025a28c8d5 // indirect
-)

autodocs/go.sum

@@ -1,6 +0,0 @@
-github.com/gohugoio/hugo-mod-bootstrap-scss/v5 v5.20300.20200 h1:SmpwwN3DNzJWbV+IT8gaFu07ENUFpCvKou5BHYUKuVs=
-github.com/gohugoio/hugo-mod-bootstrap-scss/v5 v5.20300.20200/go.mod h1:kx8MBj9T7SFR8ZClWvKZPmmUxBaltkoXvnWlZZcSnYA=
-github.com/gohugoio/hugo-mod-jslibs-dist/popperjs/v2 v2.21100.20000/go.mod h1:mFberT6ZtcchrsDtfvJM7aAH2bDKLdOnruUHl0hlapI=
-github.com/gtsteffaniak/filebrowserDocsTheme v0.0.0-20250118144715-40025a28c8d5 h1:dwZ1GlVhtfgigYUoPHZd+PBczUgl7FpSJrxMhPQXXJQ=
-github.com/gtsteffaniak/filebrowserDocsTheme v0.0.0-20250118144715-40025a28c8d5/go.mod h1:9Ee1u+ac9+utA3Tt3SnoIYmoewMlx7uf/WLb0CVZ2ys=
-github.com/twbs/bootstrap v5.3.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=

autodocs/hugo.toml

@@ -1,8 +0,0 @@
-baseURL = 'https://example.org/'
-languageCode = 'en-us'
-title = 'Docs'
-
-[module]
-    [[module.imports]]
-        path = "github.com/gtsteffaniak/filebrowserDocsTheme"
-        disable = false

backend/.golangci.yml

@@ -1,232 +0,0 @@
-# This code is licensed under the terms of the MIT license https://opensource.org/license/mit
-# Copyright (c) 2021 Marat Reymers
-
-## Golden config for golangci-lint v1.59.1
-#
-# This is the best config for golangci-lint based on my experience and opinion.
-# It is very strict, but not extremely strict.
-# Feel free to adapt and change it for your needs.
-
-run:
-  # Timeout for analysis, e.g. 30s, 5m.
-  # Default: 1m
-  timeout: 3m
-
-
-# This file contains only configs which differ from defaults.
-# All possible options can be found here https://github.com/golangci/golangci-lint/blob/master/.golangci.reference.yml
-linters-settings:
-  cyclop:
-    # The maximal code complexity to report.
-    # Default: 10
-    max-complexity: 30
-    # The maximal average package complexity.
-    # If it's higher than 0.0 (float) the check is enabled
-    # Default: 0.0
-    package-average: 10.0
-
-  errcheck:
-    # Report about not checking of errors in type assertions: `a := b.(MyStruct)`.
-    # Such cases aren't reported by default.
-    # Default: false
-    check-type-assertions: true
-
-  exhaustive:
-    # Program elements to check for exhaustiveness.
-    # Default: [ switch ]
-    check:
-      - switch
-      - map
-
-  exhaustruct:
-    # List of regular expressions to exclude struct packages and their names from checks.
-    # Regular expressions must match complete canonical struct package/name/structname.
-    # Default: []
-    exclude:
-      # std libs
-      - "^net/http.Client$"
-      - "^net/http.Cookie$"
-      - "^net/http.Request$"
-      - "^net/http.Response$"
-      - "^net/http.Server$"
-      - "^net/http.Transport$"
-      - "^net/url.URL$"
-      - "^os/exec.Cmd$"
-      - "^reflect.StructField$"
-      # public libs
-      - "^github.com/Shopify/sarama.Config$"
-      - "^github.com/Shopify/sarama.ProducerMessage$"
-      - "^github.com/mitchellh/mapstructure.DecoderConfig$"
-      - "^github.com/prometheus/client_golang/.+Opts$"
-      - "^github.com/spf13/cobra.Command$"
-      - "^github.com/spf13/cobra.CompletionOptions$"
-      - "^github.com/stretchr/testify/mock.Mock$"
-      - "^github.com/testcontainers/testcontainers-go.+Request$"
-      - "^github.com/testcontainers/testcontainers-go.FromDockerfile$"
-      - "^golang.org/x/tools/go/analysis.Analyzer$"
-      - "^google.golang.org/protobuf/.+Options$"
-      - "^gopkg.in/yaml.v3.Node$"
-
-  funlen:
-    # Checks the number of lines in a function.
-    # If lower than 0, disable the check.
-    # Default: 60
-    lines: 100
-    # Checks the number of statements in a function.
-    # If lower than 0, disable the check.
-    # Default: 40
-    statements: 50
-    # Ignore comments when counting lines.
-    # Default false
-    ignore-comments: true
-
-  gocognit:
-    # Minimal code complexity to report.
-    # Default: 30 (but we recommend 10-20)
-    min-complexity: 20
-
-  gocritic:
-    # Settings passed to gocritic.
-    # The settings key is the name of a supported gocritic checker.
-    # The list of supported checkers can be find in https://go-critic.github.io/overview.
-    settings:
-      captLocal:
-        # Whether to restrict checker to params only.
-        # Default: true
-        paramsOnly: false
-      underef:
-        # Whether to skip (*x).method() calls where x is a pointer receiver.
-        # Default: true
-        skipRecvDeref: false
-
-  gomodguard:
-    blocked:
-      # List of blocked modules.
-      # Default: []
-      modules:
-        - github.com/golang/protobuf:
-            recommendations:
-              - google.golang.org/protobuf
-            reason: "see https://developers.google.com/protocol-buffers/docs/reference/go/faq#modules"
-        - github.com/satori/go.uuid:
-            recommendations:
-              - github.com/google/uuid
-            reason: "satori's package is not maintained"
-        - github.com/gofrs/uuid:
-            recommendations:
-              - github.com/gofrs/uuid/v5
-            reason: "gofrs' package was not go module before v5"
-
-  govet:
-    # Enable all analyzers.
-    # Default: false
-    enable-all: true
-    # Disable analyzers by name.
-    # Run `go tool vet help` to see all analyzers.
-    # Default: []
-    disable:
-      - fieldalignment # too strict
-    # Settings per analyzer.
-    settings:
-      shadow:
-        # Whether to be strict about shadowing; can be noisy.
-        # Default: false
-        strict: false
-
-  inamedparam:
-    # Skips check for interface methods with only a single parameter.
-    # Default: false
-    skip-single-param: true
-
-  mnd:
-    # List of function patterns to exclude from analysis.
-    # Values always ignored: `time.Date`,
-    # `strconv.FormatInt`, `strconv.FormatUint`, `strconv.FormatFloat`,
-    # `strconv.ParseInt`, `strconv.ParseUint`, `strconv.ParseFloat`.
-    # Default: []
-    ignored-functions:
-      - args.Error
-      - flag.Arg
-      - flag.Duration.*
-      - flag.Float.*
-      - flag.Int.*
-      - flag.Uint.*
-      - os.Chmod
-      - os.Mkdir.*
-      - os.OpenFile
-      - os.WriteFile
-      - prometheus.ExponentialBuckets.*
-      - prometheus.LinearBuckets
-
-  nakedret:
-    # Make an issue if func has more lines of code than this setting, and it has naked returns.
-    # Default: 30
-    max-func-lines: 0
-
-  nolintlint:
-    # Exclude following linters from requiring an explanation.
-    # Default: []
-    allow-no-explanation: [ funlen, gocognit, lll ]
-    # Enable to require an explanation of nonzero length after each nolint directive.
-    # Default: false
-    require-explanation: true
-    # Enable to require nolint directives to mention the specific linter being suppressed.
-    # Default: false
-    require-specific: true
-
-  perfsprint:
-    # Optimizes into strings concatenation.
-    # Default: true
-    strconcat: false
-
-  rowserrcheck:
-    # database/sql is always checked
-    # Default: []
-    packages:
-      - github.com/jmoiron/sqlx
-
-  sloglint:
-    # Enforce not using global loggers.
-    # Values:
-    # - "": disabled
-    # - "all": report all global loggers
-    # - "default": report only the default slog logger
-    # https://github.com/go-simpler/sloglint?tab=readme-ov-file#no-global
-    # Default: ""
-    no-global: "all"
-    # Enforce using methods that accept a context.
-    # Values:
-    # - "": disabled
-    # - "all": report all contextless calls
-    # - "scope": report only if a context exists in the scope of the outermost function
-    # https://github.com/go-simpler/sloglint?tab=readme-ov-file#context-only
-    # Default: ""
-    context: "scope"
-
-  tenv:
-    # The option `all` will run against whole test files (`_test.go`) regardless of method/function signatures.
-    # Otherwise, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked.
-    # Default: false
-    all: true
-
-
-issues:
-  # Maximum count of issues with the same text.
-  # Set to 0 to disable.
-  # Default: 3
-  max-same-issues: 50
-
-  exclude-rules:
-    - source: "(noinspection|TODO)"
-      linters: [ godot ]
-    - source: "//noinspection"
-      linters: [ gocritic ]
-    - path: "_test\\.go"
-      linters:
-        - bodyclose
-        - dupl
-        - funlen
-        - goconst
-        - gosec
-        - noctx
-        - wrapcheck

backend/.goreleaser.yaml

@@ -1,45 +0,0 @@
-# .goreleaser.yaml
-project_name: filebrowser
-version: 2
-
-builds:
-  # Build configuration for darwin and linux
-  - id: default
-    ldflags: &ldflags
-      - -s -w -X github.com/gtsteffaniak/filebrowser/backend/version.Version={{ .Version }} -X github.com/gtsteffaniak/filebrowser/backend/version.CommitSHA={{ .ShortCommit }}
-    main: main.go
-    binary: filebrowser
-    goos:
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm
-      - arm64
-    goarm:
-      - "6"
-      - "7"
-    hooks:
-      post:
-        - upx --force-macos {{ .Path }}  # Compress the binary with UPX
-
-  # Build configuration for windows without arm
-  - id: windows
-    ldflags: *ldflags
-    main: main.go
-    binary: filebrowser
-    goos:
-      - windows
-    goarch:
-      - amd64
-    hooks:
-      post:
-        - upx {{ .Path }}  # Compress the binary with UPX
-
-archives:
-  - name_template: "{{.Os}}-{{.Arch}}{{if .Arm}}v{{.Arm}}{{end}}-{{ .ProjectName }}"
-    format: binary
-
-checksum:
-  disable: true
-

backend/auth/auth.go

@@ -3,13 +3,13 @@ package auth
 import (
 	"net/http"
 
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 // Auther is the authentication interface.
 type Auther interface {
 	// Auth is called to authenticate a request.
-	Auth(r *http.Request, userStore *users.Storage) (*users.User, error)
+	Auth(r *http.Request, usr users.Store) (*users.User, error)
 	// LoginPage indicates if this auther needs a login page.
 	LoginPage() bool
 }

backend/auth/hook.go

@@ -3,15 +3,15 @@ package auth
 import (
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"os/exec"
 	"strings"
 
-	"github.com/gtsteffaniak/filebrowser/backend/errors"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/errors"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 type hookCred struct {
@@ -30,7 +30,7 @@ type HookAuth struct {
 }
 
 // Auth authenticates the user via a json in content body.
-func (a *HookAuth) Auth(r *http.Request, usr *users.Storage) (*users.User, error) {
+func (a *HookAuth) Auth(r *http.Request, usr users.Store) (*users.User, error) {
 	var cred hookCred
 
 	if r.Body == nil {
@@ -51,6 +51,7 @@ func (a *HookAuth) Auth(r *http.Request, usr *users.Storage) (*users.User, error
 	if err != nil {
 		return nil, err
 	}
+
 	switch action {
 	case "auth":
 		u, err := a.SaveUser()
@@ -164,7 +165,7 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
 			return nil, fmt.Errorf("user: failed to mkdir user home dir: [%s]", userHome)
 		}
 		u.Scope = userHome
-		logger.Debug(fmt.Sprintf("user: %s, home dir: [%s].", u.Username, userHome))
+		log.Printf("user: %s, home dir: [%s].", u.Username, userHome)
 
 		err = a.Users.Save(u)
 		if err != nil {

backend/auth/json.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 type jsonCred struct {
@@ -23,7 +23,8 @@ type JSONAuth struct {
 }
 
 // Auth authenticates the user via a json in content body.
-func (a JSONAuth) Auth(r *http.Request, userStore *users.Storage) (*users.User, error) {
+func (a JSONAuth) Auth(r *http.Request, usr users.Store) (*users.User, error) {
+	config := &settings.Config
 	var cred jsonCred
 
 	if r.Body == nil {
@@ -46,7 +47,8 @@ func (a JSONAuth) Auth(r *http.Request, userStore *users.Storage) (*users.User,
 			return nil, os.ErrPermission
 		}
 	}
-	u, err := userStore.Get(files.RootPaths["default"], cred.Username)
+
+	u, err := usr.Get(config.Server.Root, cred.Username)
 	if err != nil || !users.CheckPwd(cred.Password, u.Password) {
 		return nil, os.ErrPermission
 	}

backend/auth/none.go

@@ -3,8 +3,8 @@ package auth
 import (
 	"net/http"
 
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 // MethodNoAuth is used to identify no auth.
@@ -14,8 +14,8 @@ const MethodNoAuth = "noauth"
 type NoAuth struct{}
 
 // Auth uses authenticates user 1.
-func (a NoAuth) Auth(r *http.Request, usr *users.Storage) (*users.User, error) {
-	return usr.Get(files.RootPaths["default"], uint(1))
+func (a NoAuth) Auth(r *http.Request, usr users.Store) (*users.User, error) {
+	return usr.Get(settings.Config.Server.Root, uint(1))
 }
 
 // LoginPage tells that no auth doesn't require a login page.

backend/auth/proxy.go

@@ -4,9 +4,10 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/gtsteffaniak/filebrowser/backend/errors"
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/settings"
+
+	"github.com/gtsteffaniak/filebrowser/errors"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 // MethodProxyAuth is used to identify no auth.
@@ -18,9 +19,9 @@ type ProxyAuth struct {
 }
 
 // Auth authenticates the user via an HTTP header.
-func (a ProxyAuth) Auth(r *http.Request, usr *users.Storage) (*users.User, error) {
+func (a ProxyAuth) Auth(r *http.Request, usr users.Store) (*users.User, error) {
 	username := r.Header.Get(a.Header)
-	user, err := usr.Get(files.RootPaths["default"], username)
+	user, err := usr.Get(settings.Config.Server.Root, username)
 	if err == errors.ErrNotExist {
 		return nil, os.ErrPermission
 	}

backend/auth/storage.go

@@ -1,7 +1,7 @@
 package auth
 
 import (
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 // StorageBackend is a storage backend for auth storage.

backend/benchmark_results.txt

@@ -1,66 +1,53 @@
 
  == Running benchmark == 
 /usr/local/go/bin/go
-?   	github.com/gtsteffaniak/filebrowser/backend	[no test files]
-?   	github.com/gtsteffaniak/filebrowser/backend/auth	[no test files]
-?   	github.com/gtsteffaniak/filebrowser/backend/cmd	[no test files]
+?   	github.com/gtsteffaniak/filebrowser	[no test files]
+?   	github.com/gtsteffaniak/filebrowser/auth	[no test files]
+?   	github.com/gtsteffaniak/filebrowser/cmd	[no test files]
 PASS
-ok  	github.com/gtsteffaniak/filebrowser/backend/diskcache	0.005s
-?   	github.com/gtsteffaniak/filebrowser/backend/errors	[no test files]
-/home/graham/git/filebrowser /home/graham/git/filebrowser
-/home/graham/git/filebrowser/files/file.go /home/graham/git/filebrowser
-/home/graham/git/filebrowser/mnt/doesnt/exist /home/graham/git/filebrowser
-2025/01/04 14:04:55 Initializing index and assessing file system complexity
-2025/01/04 14:04:55 Starting full scan
-2025/01/04 14:04:55 Index assessment         : complexity=simple directories=0 files=0 
-2025/01/04 14:04:55 Time Spent Indexing      : 0 seconds
-2025/01/04 14:04:55 Next scan in 1m0s
-2025/01/04 14:04:56 Initializing index and assessing file system complexity
-2025/01/04 14:04:56 Starting full scan
-2025/01/04 14:04:56 Index assessment         : complexity=simple directories=0 files=0 
-2025/01/04 14:04:56 Time Spent Indexing      : 0 seconds
-2025/01/04 14:04:56 Next scan in 1m0s
+ok  	github.com/gtsteffaniak/filebrowser/diskcache	0.003s
+?   	github.com/gtsteffaniak/filebrowser/errors	[no test files]
 goos: linux
 goarch: amd64
-pkg: github.com/gtsteffaniak/filebrowser/backend/files
+pkg: github.com/gtsteffaniak/filebrowser/files
 cpu: 11th Gen Intel(R) Core(TM) i5-11320H @ 3.20GHz
-BenchmarkFillIndex-8                     	2025/01/04 14:04:57 Initializing index and assessing file system complexity
-2025/01/04 14:04:57 Starting full scan
-2025/01/04 14:04:57 Index assessment         : complexity=simple directories=0 files=0 
-2025/01/04 14:04:57 Time Spent Indexing      : 0 seconds
-2025/01/04 14:04:57 Next scan in 1m0s
-      10	   3515090 ns/op	   34273 B/op	     451 allocs/op
-BenchmarkCheckIndexExclude-8             	      10	       156.2 ns/op	       0 B/op	       0 allocs/op
-BenchmarkCheckIndexConditionsInclude-8   	      10	        98.00 ns/op	       0 B/op	       0 allocs/op
-2025/01/04 14:04:58 Initializing index and assessing file system complexity
-2025/01/04 14:04:58 Starting full scan
-2025/01/04 14:04:58 Index assessment         : complexity=simple directories=0 files=0 
-2025/01/04 14:04:58 Time Spent Indexing      : 0 seconds
-2025/01/04 14:04:58 Next scan in 1m0s
-BenchmarkSearchAllIndexes-8              	2025/01/04 14:04:59 Initializing index and assessing file system complexity
-2025/01/04 14:04:59 Starting full scan
-2025/01/04 14:04:59 Index assessment         : complexity=simple directories=0 files=0 
-2025/01/04 14:04:59 Time Spent Indexing      : 0 seconds
-2025/01/04 14:04:59 Next scan in 1m0s
-      10	    766822 ns/op	   34230 B/op	     900 allocs/op
+BenchmarkFillIndex-8          	      10	   3587120 ns/op	  273640 B/op	    2013 allocs/op
+BenchmarkSearchAllIndexes-8   	      10	  31291180 ns/op	19500700 B/op	  298636 allocs/op
 PASS
-ok  	github.com/gtsteffaniak/filebrowser/backend/files	5.094s
+ok  	github.com/gtsteffaniak/filebrowser/files	0.408s
 PASS
-ok  	github.com/gtsteffaniak/filebrowser/backend/fileutils	0.002s
+ok  	github.com/gtsteffaniak/filebrowser/fileutils	0.003s
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 h: 401  <nil>
+2024/02/07 07:16:43 h: 401  <nil>
+2024/02/07 07:16:43 h: 401  <nil>
+2024/02/07 07:16:43 h: 401  <nil>
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 Saving new user: publicUser
+2024/02/07 07:16:43 h: 401  <nil>
+2024/02/07 07:16:43 h: 401  <nil>
 PASS
-ok  	github.com/gtsteffaniak/filebrowser/backend/http	0.184s
+ok  	github.com/gtsteffaniak/filebrowser/http	0.202s
 PASS
-ok  	github.com/gtsteffaniak/filebrowser/backend/img	0.123s
+ok  	github.com/gtsteffaniak/filebrowser/img	0.125s
 PASS
-ok  	github.com/gtsteffaniak/filebrowser/backend/runner	0.004s
+ok  	github.com/gtsteffaniak/filebrowser/rules	0.002s
 PASS
-ok  	github.com/gtsteffaniak/filebrowser/backend/settings	0.005s
-?   	github.com/gtsteffaniak/filebrowser/backend/share	[no test files]
-?   	github.com/gtsteffaniak/filebrowser/backend/storage	[no test files]
-?   	github.com/gtsteffaniak/filebrowser/backend/storage/bolt	[no test files]
-?   	github.com/gtsteffaniak/filebrowser/backend/swagger/docs	[no test files]
+ok  	github.com/gtsteffaniak/filebrowser/runner	0.003s
 PASS
-ok  	github.com/gtsteffaniak/filebrowser/backend/users	0.003s
+ok  	github.com/gtsteffaniak/filebrowser/settings	0.005s
+?   	github.com/gtsteffaniak/filebrowser/share	[no test files]
+?   	github.com/gtsteffaniak/filebrowser/storage	[no test files]
+?   	github.com/gtsteffaniak/filebrowser/storage/bolt	[no test files]
 PASS
-ok  	github.com/gtsteffaniak/filebrowser/backend/utils	0.002s
-?   	github.com/gtsteffaniak/filebrowser/backend/version	[no test files]
+ok  	github.com/gtsteffaniak/filebrowser/users	0.003s
+?   	github.com/gtsteffaniak/filebrowser/version	[no test files]

backend/cmd/root.go

@@ -1,174 +1,155 @@
 package cmd
 
 import (
+	"crypto/tls"
 	"flag"
 	"fmt"
+	"io/fs"
+	"log"
+	"net"
+	"net/http"
 	"os"
-	"strings"
+	"os/signal"
+	"strconv"
+	"syscall"
 
-	"github.com/gtsteffaniak/filebrowser/backend/diskcache"
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	fbhttp "github.com/gtsteffaniak/filebrowser/backend/http"
-	"github.com/gtsteffaniak/filebrowser/backend/img"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/gtsteffaniak/filebrowser/backend/storage"
-	"github.com/gtsteffaniak/filebrowser/backend/swagger/docs"
-	"github.com/swaggo/swag"
+	"github.com/spf13/pflag"
 
-	"github.com/gtsteffaniak/filebrowser/backend/users"
-	"github.com/gtsteffaniak/filebrowser/backend/version"
+	"github.com/spf13/afero"
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/auth"
+	"github.com/gtsteffaniak/filebrowser/diskcache"
+	"github.com/gtsteffaniak/filebrowser/files"
+	fbhttp "github.com/gtsteffaniak/filebrowser/http"
+	"github.com/gtsteffaniak/filebrowser/img"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
-func getStore(config string) (*storage.Storage, bool) {
-	// Use the config file (global flag)
-	settings.Initialize(config)
-	store, hasDB, err := storage.InitializeDb(settings.Config.Server.Database)
-	if err != nil {
-		logger.Fatal(fmt.Sprintf("could not load db info: %v", err))
-	}
-	return store, hasDB
+type dirFS struct {
+	http.Dir
 }
 
-func generalUsage() {
-	fmt.Printf(`usage: ./filebrowser <command> [options]
-commands:
-	-h    	Print help
-	-c    	Print the default config file
-	version Print version information
-	set -u	Username and password for the new user
-	set -a	Create user as admin
-	set -s	Specify a user scope
-	set -h	Print this help message
-`)
+func (d dirFS) Open(name string) (fs.File, error) {
+	return d.Dir.Open(name)
+}
+
+func init() {
+	// Define a flag for the config option (-c or --config)
+	configFlag := pflag.StringP("config", "c", "filebrowser.yaml", "Path to the config file")
+	// Bind the flags to the pflag command line parser
+	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
+	pflag.Parse()
+	log.Println("Initializing with config file:", *configFlag)
+	settings.Initialize(*configFlag)
+}
+
+var rootCmd = &cobra.Command{
+	Use: "filebrowser",
+	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
+		serverConfig := settings.Config.Server
+		if !d.hadDB {
+			quickSetup(d)
+		}
+		if serverConfig.NumImageProcessors < 1 {
+			log.Fatal("Image resize workers count could not be < 1")
+		}
+		imgSvc := img.New(serverConfig.NumImageProcessors)
+		var fileCache diskcache.Interface = diskcache.NewNoOp()
+		cacheDir := "/tmp"
+		if cacheDir != "" {
+			if err := os.MkdirAll(cacheDir, 0700); err != nil { //nolint:govet,gomnd
+				log.Fatalf("can't make directory %s: %s", cacheDir, err)
+			}
+			fileCache = diskcache.New(afero.NewOsFs(), cacheDir)
+		}
+		// initialize indexing and schedule indexing ever n minutes (default 5)
+		go files.InitializeIndex(serverConfig.IndexingInterval, serverConfig.Indexing)
+		_, err := os.Stat(serverConfig.Root)
+		checkErr(fmt.Sprint("cmd os.Stat ", serverConfig.Root), err)
+		var listener net.Listener
+		address := serverConfig.Address + ":" + strconv.Itoa(serverConfig.Port)
+		switch {
+		case serverConfig.Socket != "":
+			listener, err = net.Listen("unix", serverConfig.Socket)
+			checkErr("net.Listen", err)
+			socketPerm, err := cmd.Flags().GetUint32("socket-perm") //nolint:govet
+			checkErr("cmd.Flags().GetUint32", err)
+			err = os.Chmod(serverConfig.Socket, os.FileMode(socketPerm))
+			checkErr("os.Chmod", err)
+		case serverConfig.TLSKey != "" && serverConfig.TLSCert != "":
+			cer, err := tls.LoadX509KeyPair(serverConfig.TLSCert, serverConfig.TLSKey) //nolint:govet
+			checkErr("tls.LoadX509KeyPair", err)
+			listener, err = tls.Listen("tcp", address, &tls.Config{
+				MinVersion:   tls.VersionTLS12,
+				Certificates: []tls.Certificate{cer}},
+			)
+			checkErr("tls.Listen", err)
+		default:
+			listener, err = net.Listen("tcp", address)
+			checkErr("net.Listen", err)
+		}
+		sigc := make(chan os.Signal, 1)
+		signal.Notify(sigc, os.Interrupt, syscall.SIGTERM)
+		go cleanupHandler(listener, sigc)
+		assetsFs := dirFS{Dir: http.Dir("frontend/dist")}
+		handler, err := fbhttp.NewHandler(imgSvc, fileCache, d.store, &serverConfig, assetsFs)
+		checkErr("fbhttp.NewHandler", err)
+		defer listener.Close()
+		log.Println("Listening on", listener.Addr().String())
+		//nolint: gosec
+		if err := http.Serve(listener, handler); err != nil {
+			log.Fatalf("Could not start server on port %d: %v", serverConfig.Port, err)
+		}
+	}, pythonConfig{allowNoDB: true}),
 }
 
 func StartFilebrowser() {
-	// Global flags
-	var configPath string
-	var help bool
-	// Override the default usage output to use generalUsage()
-	flag.Usage = generalUsage
-	flag.StringVar(&configPath, "c", "config.yaml", "Path to the config file, default: config.yaml")
-	flag.BoolVar(&help, "h", false, "Get help about commands")
-
-	// Parse global flags (before subcommands)
-	flag.Parse() // print generalUsage on error
-
-	// Show help if requested
-	if help {
-		generalUsage()
-		return
-	}
-
-	// Create a new FlagSet for the 'set' subcommand
-	setCmd := flag.NewFlagSet("set", flag.ExitOnError)
-	var user, scope, dbConfig string
-	var asAdmin bool
-
-	setCmd.StringVar(&user, "u", "", "Comma-separated username and password: \"set -u <username>,<password>\"")
-	setCmd.BoolVar(&asAdmin, "a", false, "Create user as admin user, used in combination with -u")
-	setCmd.StringVar(&scope, "s", "", "Specify a user scope, otherwise default user config scope is used")
-	setCmd.StringVar(&dbConfig, "c", "config.yaml", "Path to the config file, default: config.yaml")
-
-	// Parse subcommand flags only if a subcommand is specified
-	if len(os.Args) > 1 {
-		switch os.Args[1] {
-		case "set":
-			err := setCmd.Parse(os.Args)
-			if err != nil {
-				setCmd.PrintDefaults()
-				os.Exit(1)
-			}
-			userInfo := strings.Split(user, ",")
-			if len(userInfo) < 2 {
-				fmt.Println("not enough info to create user: \"set -u username,password\"")
-				setCmd.PrintDefaults()
-				os.Exit(1)
-			}
-			username := userInfo[0]
-			password := userInfo[1]
-			getStore(dbConfig)
-			// Create the user logic
-			if asAdmin {
-				logger.Info(fmt.Sprintf("Creating user as admin: %s\n", username))
-			} else {
-				logger.Info(fmt.Sprintf("Creating non-admin user: %s\n", username))
-			}
-			newUser := users.User{
-				Username: username,
-				Password: password,
-			}
-			if scope != "" {
-				newUser.Scope = scope
-			}
-			err = storage.CreateUser(newUser, asAdmin)
-			if err != nil {
-				logger.Fatal(fmt.Sprintf("could not create user: %v", err))
-			}
-			return
-		case "version":
-			fmt.Printf(`FileBrowser Quantum - A modern web-based file manager
-Version        : %v
-Commit         : %v
-Release Info   : https://github.com/gtsteffaniak/filebrowser/releases/tag/%v
-`, version.Version, version.CommitSHA, version.Version)
-			return
-		}
-	}
-	store, dbExists := getStore(configPath)
-	database := fmt.Sprintf("Using existing database  : %v", settings.Config.Server.Database)
-	if !dbExists {
-		database = fmt.Sprintf("Creating new database    : %v", settings.Config.Server.Database)
-	}
-	sources := []string{}
-	for _, v := range settings.Config.Server.Sources {
-		sources = append(sources, v.Name+": "+v.Path)
-	}
-	logger.Info(fmt.Sprintf("Initializing FileBrowser Quantum (%v)", version.Version))
-	logger.Info(fmt.Sprintf("Using Config file        : %v", configPath))
-	logger.Debug(fmt.Sprintf("Embeded frontend         : %v", os.Getenv("FILEBROWSER_NO_EMBEDED") != "true"))
-	logger.Info(database)
-	logger.Info(fmt.Sprintf("Sources                  : %v", sources))
-
-	serverConfig := settings.Config.Server
-	swagInfo := docs.SwaggerInfo
-	swagInfo.BasePath = serverConfig.BaseURL
-	swag.Register(docs.SwaggerInfo.InstanceName(), swagInfo)
-	// initialize indexing and schedule indexing ever n minutes (default 5)
-	sourceConfigs := settings.Config.Server.Sources
-	if len(sourceConfigs) == 0 {
-		logger.Fatal("No sources configured, exiting...")
-	}
-	for _, source := range sourceConfigs {
-		go files.Initialize(source)
-	}
-	if err := rootCMD(store, &serverConfig); err != nil {
-		logger.Fatal(fmt.Sprintf("Error starting filebrowser: %v", err))
+	if err := rootCmd.Execute(); err != nil {
+		log.Fatal("Error starting filebrowser:", err)
 	}
 }
 
-func rootCMD(store *storage.Storage, serverConfig *settings.Server) error {
-	if serverConfig.NumImageProcessors < 1 {
-		logger.Fatal("Image resize workers count could not be < 1")
-	}
-	imgSvc := img.New(serverConfig.NumImageProcessors)
+func cleanupHandler(listener net.Listener, c chan os.Signal) { //nolint:interfacer
+	sig := <-c
+	log.Printf("Caught signal %s: shutting down.", sig)
+	listener.Close()
+	os.Exit(0)
+}
 
-	cacheDir := "/tmp"
-	var fileCache diskcache.Interface
-
-	// Use file cache if cacheDir is specified
-	if cacheDir != "" {
-		var err error
-		fileCache, err = diskcache.NewFileCache(cacheDir)
-		if err != nil {
-			logger.Fatal(fmt.Sprintf("failed to create file cache: %v", err))
-		}
+func quickSetup(d pythonData) {
+	settings.Config.Auth.Key = generateKey()
+	if settings.Config.Auth.Method == "noauth" {
+		err := d.store.Auth.Save(&auth.NoAuth{})
+		checkErr("d.store.Auth.Save", err)
 	} else {
-		// No-op cache if no cacheDir is specified
-		fileCache = diskcache.NewNoOp()
+		settings.Config.Auth.Method = "password"
+		err := d.store.Auth.Save(&auth.JSONAuth{})
+		checkErr("d.store.Auth.Save", err)
 	}
-	fbhttp.StartHttp(imgSvc, store, fileCache)
-
-	return nil
+	err := d.store.Settings.Save(&settings.Config)
+	checkErr("d.store.Settings.Save", err)
+	err = d.store.Settings.SaveServer(&settings.Config.Server)
+	checkErr("d.store.Settings.SaveServer", err)
+	user := &users.User{}
+	settings.Config.UserDefaults.Apply(user)
+	user.Username = settings.Config.Auth.AdminUsername
+	user.Password = settings.Config.Auth.AdminPassword
+	user.Perm.Admin = true
+	user.Scope = "./"
+	user.DarkMode = true
+	user.ViewMode = "normal"
+	user.LockPassword = false
+	user.Perm = users.Permissions{
+		Create:   true,
+		Rename:   true,
+		Modify:   true,
+		Delete:   true,
+		Share:    true,
+		Download: true,
+		Admin:    true,
+	}
+	err = d.store.Users.Save(user)
+	checkErr("d.store.Users.Save", err)
 }

backend/cmd/rule_rm.go

@@ -0,0 +1,66 @@
+package cmd
+
+import (
+	"strconv"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+func init() {
+	rulesCmd.AddCommand(rulesRmCommand)
+	rulesRmCommand.Flags().Uint("index", 0, "index of rule to remove")
+	_ = rulesRmCommand.MarkFlagRequired("index")
+}
+
+var rulesRmCommand = &cobra.Command{
+	Use:   "rm <index> [index_end]",
+	Short: "Remove a global rule or user rule",
+	Long: `Remove a global rule or user rule. The provided index
+is the same that's printed when you run 'rules ls'. Note
+that after each removal/addition, the index of the
+commands change. So be careful when removing them after each
+other.
+
+You can also specify an optional parameter (index_end) so
+you can remove all commands from 'index' to 'index_end',
+including 'index_end'.`,
+	Args: func(cmd *cobra.Command, args []string) error {
+		if err := cobra.RangeArgs(1, 2)(cmd, args); err != nil { //nolint:gomnd
+			return err
+		}
+
+		for _, arg := range args {
+			if _, err := strconv.Atoi(arg); err != nil {
+				return err
+			}
+		}
+
+		return nil
+	},
+	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
+		i, err := strconv.Atoi(args[0])
+		checkErr("strconv.Atoi", err)
+		f := i
+		if len(args) == 2 { //nolint:gomnd
+			f, err = strconv.Atoi(args[1])
+			checkErr("strconv.Atoi", err)
+		}
+
+		user := func(u *users.User) {
+			u.Rules = append(u.Rules[:i], u.Rules[f+1:]...)
+			err := d.store.Users.Save(u)
+			checkErr("d.store.Users.Save", err)
+		}
+
+		global := func(s *settings.Settings) {
+			s.Rules = append(s.Rules[:i], s.Rules[f+1:]...)
+			err := d.store.Settings.Save(s)
+			checkErr("d.store.Settings.Save", err)
+		}
+
+		runRules(d.store, cmd, user, global)
+	}, pythonConfig{}),
+}

backend/cmd/rules.go

@@ -0,0 +1,92 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
+	"github.com/gtsteffaniak/filebrowser/rules"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/storage"
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+func init() {
+	rootCmd.AddCommand(rulesCmd)
+	rulesCmd.PersistentFlags().StringP("username", "u", "", "username of user to which the rules apply")
+	rulesCmd.PersistentFlags().UintP("id", "i", 0, "id of user to which the rules apply")
+}
+
+var rulesCmd = &cobra.Command{
+	Use:   "rules",
+	Short: "Rules management utility",
+	Long: `On each subcommand you'll have available at least two flags:
+"username" and "id". You must either set only one of them
+or none. If you set one of them, the command will apply to
+an user, otherwise it will be applied to the global set or
+rules.`,
+	Args: cobra.NoArgs,
+}
+
+func runRules(st *storage.Storage, cmd *cobra.Command, usersFn func(*users.User), globalFn func(*settings.Settings)) {
+	id := getUserIdentifier(cmd.Flags())
+	if id != nil {
+		user, err := st.Users.Get("", id)
+		checkErr("st.Users.Get", err)
+
+		if usersFn != nil {
+			usersFn(user)
+		}
+
+		printRules(user.Rules, id)
+		return
+	}
+
+	s, err := st.Settings.Get()
+	checkErr("st.Settings.Get", err)
+
+	if globalFn != nil {
+		globalFn(s)
+	}
+
+	printRules(s.Rules, id)
+}
+
+func getUserIdentifier(flags *pflag.FlagSet) interface{} {
+	id := mustGetUint(flags, "id")
+	username := mustGetString(flags, "username")
+
+	if id != 0 {
+		return id
+	} else if username != "" {
+		return username
+	}
+
+	return nil
+}
+
+func printRules(rulez []rules.Rule, id interface{}) {
+	if id == nil {
+		fmt.Printf("Global Rules:\n\n")
+	} else {
+		fmt.Printf("Rules for user %v:\n\n", id)
+	}
+
+	for id, rule := range rulez {
+		fmt.Printf("(%d) ", id)
+		if rule.Regex {
+			if rule.Allow {
+				fmt.Printf("Allow Regex: \t%s\n", rule.Regexp.Raw)
+			} else {
+				fmt.Printf("Disallow Regex: \t%s\n", rule.Regexp.Raw)
+			}
+		} else {
+			if rule.Allow {
+				fmt.Printf("Allow Path: \t%s\n", rule.Path)
+			} else {
+				fmt.Printf("Disallow Path: \t%s\n", rule.Path)
+			}
+		}
+	}
+}

backend/cmd/rules_add.go

@@ -0,0 +1,58 @@
+package cmd
+
+import (
+	"regexp"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/rules"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+func init() {
+	rulesCmd.AddCommand(rulesAddCmd)
+	rulesAddCmd.Flags().BoolP("allow", "a", false, "indicates this is an allow rule")
+	rulesAddCmd.Flags().BoolP("regex", "r", false, "indicates this is a regex rule")
+}
+
+var rulesAddCmd = &cobra.Command{
+	Use:   "add <path|expression>",
+	Short: "Add a global rule or user rule",
+	Long:  `Add a global rule or user rule.`,
+	Args:  cobra.ExactArgs(1),
+	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
+		allow := mustGetBool(cmd.Flags(), "allow")
+		regex := mustGetBool(cmd.Flags(), "regex")
+		exp := args[0]
+
+		if regex {
+			regexp.MustCompile(exp)
+		}
+
+		rule := rules.Rule{
+			Allow: allow,
+			Regex: regex,
+		}
+
+		if regex {
+			rule.Regexp = &rules.Regexp{Raw: exp}
+		} else {
+			rule.Path = exp
+		}
+
+		user := func(u *users.User) {
+			u.Rules = append(u.Rules, rule)
+			err := d.store.Users.Save(u)
+			checkErr("d.store.Users.Save", err)
+		}
+
+		global := func(s *settings.Settings) {
+			s.Rules = append(s.Rules, rule)
+			err := d.store.Settings.Save(s)
+			checkErr("d.store.Settings.Save", err)
+		}
+
+		runRules(d.store, cmd, user, global)
+	}, pythonConfig{}),
+}

backend/cmd/rules_ls.go

@@ -0,0 +1,19 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rulesCmd.AddCommand(rulesLsCommand)
+}
+
+var rulesLsCommand = &cobra.Command{
+	Use:   "ls",
+	Short: "List global rules or user specific rules",
+	Long:  `List global rules or user specific rules.`,
+	Args:  cobra.NoArgs,
+	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
+		runRules(d.store, cmd, nil, nil)
+	}, pythonConfig{}),
+}

backend/cmd/users.go

@@ -0,0 +1,58 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"strconv"
+	"text/tabwriter"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+func init() {
+	rootCmd.AddCommand(usersCmd)
+}
+
+var usersCmd = &cobra.Command{
+	Use:   "users",
+	Short: "Users management utility",
+	Long:  `Users management utility.`,
+	Args:  cobra.NoArgs,
+}
+
+func printUsers(usrs []*users.User) {
+	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0) //nolint:gomnd
+	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\n",
+			u.ID,
+			u.Username,
+			u.Scope,
+			u.Locale,
+			u.ViewMode,
+			u.SingleClick,
+			u.Perm.Admin,
+			u.Perm.Execute,
+			u.Perm.Create,
+			u.Perm.Rename,
+			u.Perm.Modify,
+			u.Perm.Delete,
+			u.Perm.Share,
+			u.Perm.Download,
+			u.LockPassword,
+		)
+	}
+
+	w.Flush()
+}
+
+func parseUsernameOrID(arg string) (username string, id uint) {
+	id64, err := strconv.ParseUint(arg, 10, 64)
+	if err != nil {
+		return arg, 0
+	}
+	return "", uint(id64)
+}

backend/cmd/users_add.go

@@ -0,0 +1,40 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+func init() {
+	usersCmd.AddCommand(usersAddCmd)
+}
+
+var usersAddCmd = &cobra.Command{
+	Use:   "add <username> <password>",
+	Short: "Create a new user",
+	Long:  `Create a new user and add it to the database.`,
+	Args:  cobra.ExactArgs(2), //nolint:gomnd
+	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
+		user := &users.User{
+			Username:     args[0],
+			Password:     args[1],
+			LockPassword: mustGetBool(cmd.Flags(), "lockPassword"),
+		}
+		servSettings, err := d.store.Settings.GetServer()
+		checkErr("d.store.Settings.GetServer()", 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 := d.store.Settings.Get()
+		checkErr("d.store.Settings.Get()", err)
+
+		userHome, err := s2.MakeUserDir(user.Username, user.Scope, servSettings.Root)
+		checkErr("s2.MakeUserDir", err)
+		user.Scope = userHome
+
+		err = d.store.Users.Save(user)
+		checkErr("d.store.Users.Save", err)
+		printUsers([]*users.User{user})
+	}, pythonConfig{}),
+}

backend/cmd/users_export.go

@@ -0,0 +1,24 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	usersCmd.AddCommand(usersExportCmd)
+}
+
+var usersExportCmd = &cobra.Command{
+	Use:   "export <path>",
+	Short: "Export all users to a file.",
+	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,
+	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
+		list, err := d.store.Users.Gets("")
+		checkErr("d.store.Users.Gets", err)
+
+		err = marshal(args[0], list)
+		checkErr("marshal", err)
+	}, pythonConfig{}),
+}

backend/cmd/users_find.go

@@ -0,0 +1,51 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+func init() {
+	usersCmd.AddCommand(usersFindCmd)
+	usersCmd.AddCommand(usersLsCmd)
+}
+
+var usersFindCmd = &cobra.Command{
+	Use:   "find <id|username>",
+	Short: "Find a user by username or id",
+	Long:  `Find a user by username or id. If no flag is set, all users will be printed.`,
+	Args:  cobra.ExactArgs(1),
+	Run:   findUsers,
+}
+
+var usersLsCmd = &cobra.Command{
+	Use:   "ls",
+	Short: "List all users.",
+	Args:  cobra.NoArgs,
+	Run:   findUsers,
+}
+
+var findUsers = python(func(cmd *cobra.Command, args []string, d pythonData) {
+	var (
+		list []*users.User
+		user *users.User
+		err  error
+	)
+
+	if len(args) == 1 {
+		username, id := parseUsernameOrID(args[0])
+		if username != "" {
+			user, err = d.store.Users.Get("", username)
+		} else {
+			user, err = d.store.Users.Get("", id)
+		}
+
+		list = []*users.User{user}
+	} else {
+		list, err = d.store.Users.Gets("")
+	}
+
+	checkErr("findUsers", err)
+	printUsers(list)
+}, pythonConfig{})

backend/cmd/users_import.go

@@ -0,0 +1,91 @@
+package cmd
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"strconv"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+func init() {
+	usersCmd.AddCommand(usersImportCmd)
+	usersImportCmd.Flags().Bool("overwrite", false, "overwrite users with the same id/username combo")
+	usersImportCmd.Flags().Bool("replace", false, "replace the entire user base")
+}
+
+var usersImportCmd = &cobra.Command{
+	Use:   "import <path>",
+	Short: "Import users from a file",
+	Long: `Import users from a file. The path must be for a json or yaml
+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,
+	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
+		fd, err := os.Open(args[0])
+		checkErr("os.Open", err)
+		defer fd.Close()
+
+		list := []*users.User{}
+		err = unmarshal(args[0], &list)
+		checkErr("unmarshal", err)
+
+		for _, user := range list {
+			err = user.Clean("")
+			checkErr("Clean", err)
+		}
+
+		if mustGetBool(cmd.Flags(), "replace") {
+			oldUsers, err := d.store.Users.Gets("")
+			checkErr("d.store.Users.Gets", err)
+
+			err = marshal("users.backup.json", list)
+			checkErr("marshal users.backup.json", err)
+
+			for _, user := range oldUsers {
+				err = d.store.Users.Delete(user.ID)
+				checkErr("d.store.Users.Delete", err)
+			}
+		}
+
+		overwrite := mustGetBool(cmd.Flags(), "overwrite")
+
+		for _, user := range list {
+			onDB, err := d.store.Users.Get("", user.ID)
+
+			// User exists in DB.
+			if err == nil {
+				if !overwrite {
+					newErr := errors.New("user " + strconv.Itoa(int(user.ID)) + " is already registered")
+					checkErr("", newErr)
+				}
+
+				// If the usernames mismatch, check if there is another one in the DB
+				// with the new username. If there is, print an error and cancel the
+				// operation
+				if user.Username != onDB.Username {
+					if conflictuous, err := d.store.Users.Get("", user.Username); err == nil { //nolint:govet
+						newErr := usernameConflictError(user.Username, conflictuous.ID, user.ID)
+						checkErr("usernameConflictError", newErr)
+					}
+				}
+			} else {
+				// If it doesn't exist, set the ID to 0 to automatically get a new
+				// one that make sense in this DB.
+				user.ID = 0
+			}
+
+			err = d.store.Users.Save(user)
+			checkErr("d.store.Users.Save", err)
+		}
+	}, pythonConfig{}),
+}
+
+func usernameConflictError(username string, originalID, newID uint) error {
+	return fmt.Errorf(`can't import user with ID %d and username "%s" because the username is already registred with the user %d`,
+		newID, username, originalID)
+}

backend/cmd/users_rm.go

@@ -0,0 +1,31 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	usersCmd.AddCommand(usersRmCmd)
+}
+
+var usersRmCmd = &cobra.Command{
+	Use:   "rm <id|username>",
+	Short: "Delete a user by username or id",
+	Long:  `Delete a user by username or id`,
+	Args:  cobra.ExactArgs(1),
+	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
+		username, id := parseUsernameOrID(args[0])
+		var err error
+
+		if username != "" {
+			err = d.store.Users.Delete(username)
+		} else {
+			err = d.store.Users.Delete(id)
+		}
+
+		checkErr("usersRmCmd", err)
+		fmt.Println("user deleted successfully")
+	}, pythonConfig{}),
+}

backend/cmd/users_update.go

@@ -0,0 +1,38 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+func init() {
+	usersCmd.AddCommand(usersUpdateCmd)
+}
+
+var usersUpdateCmd = &cobra.Command{
+	Use:   "update <id|username>",
+	Short: "Updates an existing user",
+	Long: `Updates an existing user. Set the flags for the
+options you want to change.`,
+	Args: cobra.ExactArgs(1),
+	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
+		username, id := parseUsernameOrID(args[0])
+
+		var (
+			err  error
+			user *users.User
+		)
+
+		if id != 0 {
+			user, err = d.store.Users.Get("", id)
+		} else {
+			user, err = d.store.Users.Get("", username)
+		}
+		checkErr("d.store.Users.Get", err)
+
+		err = d.store.Users.Update(user)
+		checkErr("d.store.Users.Update", err)
+		printUsers([]*users.User{user})
+	}, pythonConfig{}),
+}

backend/cmd/utils.go

@@ -0,0 +1,154 @@
+package cmd
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+
+	"github.com/asdine/storm/v3"
+	"github.com/goccy/go-yaml"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/storage"
+	"github.com/gtsteffaniak/filebrowser/storage/bolt"
+)
+
+func checkErr(source string, err error) {
+	if err != nil {
+		log.Fatalf("%s: %v", source, err)
+	}
+}
+
+func mustGetString(flags *pflag.FlagSet, flag string) string {
+	s, err := flags.GetString(flag)
+	checkErr("mustGetString", err)
+	return s
+}
+
+func mustGetBool(flags *pflag.FlagSet, flag string) bool {
+	b, err := flags.GetBool(flag)
+	checkErr("mustGetBool", err)
+	return b
+}
+
+func mustGetUint(flags *pflag.FlagSet, flag string) uint {
+	b, err := flags.GetUint(flag)
+	checkErr("mustGetUint", err)
+	return b
+}
+
+func generateKey() []byte {
+	k, err := settings.GenerateKey()
+	checkErr("generateKey", err)
+	return k
+}
+
+type cobraFunc func(cmd *cobra.Command, args []string)
+type pythonFunc func(cmd *cobra.Command, args []string, data pythonData)
+
+type pythonConfig struct {
+	noDB      bool
+	allowNoDB bool
+}
+
+type pythonData struct {
+	hadDB bool
+	store *storage.Storage
+}
+
+func dbExists(path string) (bool, error) {
+	stat, err := os.Stat(path)
+	if err == nil {
+		return stat.Size() != 0, nil
+	}
+
+	if os.IsNotExist(err) {
+		d := filepath.Dir(path)
+		_, err = os.Stat(d)
+		if os.IsNotExist(err) {
+			if err := os.MkdirAll(d, 0700); err != nil { //nolint:govet,gomnd
+				return false, err
+			}
+			return false, nil
+		}
+	}
+
+	return false, err
+}
+
+func python(fn pythonFunc, cfg pythonConfig) cobraFunc {
+	return func(cmd *cobra.Command, args []string) {
+		data := pythonData{hadDB: true}
+		path := settings.Config.Server.Database
+		exists, err := dbExists(path)
+
+		if err != nil {
+			panic(err)
+		} else if exists && cfg.noDB {
+			log.Fatal(path + " already exists")
+		} else if !exists && !cfg.noDB && !cfg.allowNoDB {
+			log.Fatal(path + " does not exist. Please run 'filebrowser config init' first.")
+		}
+
+		data.hadDB = exists
+		db, err := storm.Open(path)
+		checkErr(fmt.Sprintf("storm.Open path %v", path), err)
+
+		defer db.Close()
+		data.store, err = bolt.NewStorage(db)
+		checkErr("bolt.NewStorage", err)
+		fn(cmd, args, data)
+	}
+}
+
+func marshal(filename string, data interface{}) error {
+	fd, err := os.Create(filename)
+
+	checkErr("os.Create", err)
+	defer fd.Close()
+
+	switch ext := filepath.Ext(filename); ext {
+	case ".json":
+		encoder := json.NewEncoder(fd)
+		encoder.SetIndent("", "    ")
+		return encoder.Encode(data)
+	case ".yml", ".yaml": //nolint:goconst
+		_, err := yaml.Marshal(fd)
+		return err
+	default:
+		return errors.New("invalid format: " + ext)
+	}
+}
+
+func unmarshal(filename string, data interface{}) error {
+	fd, err := os.Open(filename)
+	checkErr("os.Open", err)
+	defer fd.Close()
+
+	switch ext := filepath.Ext(filename); ext {
+	case ".json":
+		return json.NewDecoder(fd).Decode(data)
+	case ".yml", ".yaml":
+		return yaml.NewDecoder(fd).Decode(data)
+	default:
+		return errors.New("invalid format: " + ext)
+	}
+}
+
+func jsonYamlArg(cmd *cobra.Command, args []string) error {
+	if err := cobra.ExactArgs(1)(cmd, args); err != nil {
+		return err
+	}
+
+	switch ext := filepath.Ext(args[0]); ext {
+	case ".json", ".yml", ".yaml":
+		return nil
+	default:
+		return errors.New("invalid format: " + ext)
+	}
+}

backend/cmd/version.go

@@ -0,0 +1,21 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/version"
+)
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+}
+
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Print the version number",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println("File Browser v" + version.Version + "/" + version.CommitSHA)
+	},
+}

backend/diskcache/file_cache.go

@@ -10,17 +10,13 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+
+	"github.com/spf13/afero"
 )
 
-// Cache interface for caching operations
-type Cache interface {
-	Get(key string) ([]byte, error)
-	Set(key string, value []byte) error
-}
-
-// FileCache struct for file-based caching
 type FileCache struct {
-	dir string
+	fs afero.Fs
+
 	// granular locks
 	scopedLocks struct {
 		sync.Mutex
@@ -29,12 +25,10 @@ type FileCache struct {
 	}
 }
 
-// NewFileCache creates a new FileCache
-func NewFileCache(dir string) (*FileCache, error) {
-	if err := os.MkdirAll(dir, 0700); err != nil {
-		return nil, fmt.Errorf("can't make directory %s: %v", dir, err)
+func New(fs afero.Fs, root string) *FileCache {
+	return &FileCache{
+		fs: afero.NewBasePathFs(fs, root),
 	}
-	return &FileCache{dir: dir}, nil
 }
 
 func (f *FileCache) Store(ctx context.Context, key string, value []byte) error {
@@ -43,11 +37,11 @@ func (f *FileCache) Store(ctx context.Context, key string, value []byte) error {
 	defer mu.Unlock()
 
 	fileName := f.getFileName(key)
-	if err := os.MkdirAll(filepath.Dir(fileName), 0700); err != nil {
+	if err := f.fs.MkdirAll(filepath.Dir(fileName), 0700); err != nil { //nolint:gomnd
 		return err
 	}
 
-	if err := os.WriteFile(fileName, value, 0600); err != nil {
+	if err := afero.WriteFile(f.fs, fileName, value, 0700); err != nil { //nolint:gomnd
 		return err
 	}
 
@@ -74,15 +68,15 @@ func (f *FileCache) Delete(ctx context.Context, key string) error {
 	defer mu.Unlock()
 
 	fileName := f.getFileName(key)
-	if err := os.Remove(fileName); err != nil && !errors.Is(err, os.ErrNotExist) {
+	if err := f.fs.Remove(fileName); err != nil && !errors.Is(err, os.ErrNotExist) {
 		return err
 	}
 	return nil
 }
 
-func (f *FileCache) open(key string) (*os.File, bool, error) {
+func (f *FileCache) open(key string) (afero.File, bool, error) {
 	fileName := f.getFileName(key)
-	file, err := os.Open(fileName)
+	file, err := f.fs.Open(fileName)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
 			return nil, false, nil
@@ -112,5 +106,5 @@ func (f *FileCache) getFileName(key string) string {
 	hasher := sha1.New() //nolint:gosec
 	_, _ = hasher.Write([]byte(key))
 	hash := hex.EncodeToString(hasher.Sum(nil))
-	return filepath.Join(f.dir, fmt.Sprintf("%s/%s/%s", hash[:1], hash[1:3], hash))
+	return fmt.Sprintf("%s/%s/%s", hash[:1], hash[1:3], hash)
 }

backend/diskcache/file_cache_test.go

@@ -2,10 +2,10 @@ package diskcache
 
 import (
 	"context"
-	"os"
 	"path/filepath"
 	"testing"
 
+	"github.com/spf13/afero"
 	"github.com/stretchr/testify/require"
 )
 
@@ -15,39 +15,35 @@ func TestFileCache(t *testing.T) {
 		key            = "key"
 		value          = "some text"
 		newValue       = "new text"
-		cacheRoot      = "cache"
+		cacheRoot      = "/cache"
 		cachedFilePath = "a/62/a62f2225bf70bfaccbc7f1ef2a397836717377de"
 	)
 
-	// Create temporary directory for the cache
-	cacheDir, err := os.MkdirTemp("", cacheRoot)
-	require.NoError(t, err)
-	defer os.RemoveAll(cacheDir) // Clean up
-
-	cache, err := NewFileCache(cacheDir)
-	require.NoError(t, err)
+	fs := afero.NewMemMapFs()
+	cache := New(fs, "/cache")
 
 	// store new key
-	err = cache.Store(ctx, key, []byte(value))
+	err := cache.Store(ctx, key, []byte(value))
 	require.NoError(t, err)
-	checkValue(t, ctx, cache, filepath.Join(cacheDir, cachedFilePath), 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(t, ctx, cache, filepath.Join(cacheDir, cachedFilePath), key, newValue)
+	checkValue(t, ctx, fs, filepath.Join(cacheRoot, cachedFilePath), cache, key, newValue)
 
 	// delete key
 	err = cache.Delete(ctx, key)
 	require.NoError(t, err)
-	exists := fileExists(filepath.Join(cacheDir, cachedFilePath))
+	exists, err := afero.Exists(fs, filepath.Join(cacheRoot, cachedFilePath))
+	require.NoError(t, err)
 	require.False(t, exists)
 }
 
-func checkValue(t *testing.T, ctx context.Context, cache *FileCache, fileFullPath string, key, wantValue string) {
+func checkValue(t *testing.T, ctx context.Context, fs afero.Fs, fileFullPath string, cache *FileCache, key, wantValue string) { //nolint:golint
 	t.Helper()
 	// check actual file content
-	b, err := os.ReadFile(fileFullPath)
+	b, err := afero.ReadFile(fs, fileFullPath)
 	require.NoError(t, err)
 	require.Equal(t, wantValue, string(b))
 
@@ -57,11 +53,3 @@ func checkValue(t *testing.T, ctx context.Context, cache *FileCache, fileFullPat
 	require.True(t, ok)
 	require.Equal(t, wantValue, string(b))
 }
-
-func fileExists(filename string) bool {
-	info, err := os.Stat(filename)
-	if os.IsNotExist(err) {
-		return false
-	}
-	return !info.IsDir()
-}

backend/filebrowser-playwright.yaml

@@ -1,21 +0,0 @@
-server:
-  port: 80
-  baseURL:  "/"
-  root: "./tests/playwright-files"
-auth:
-  method: password
-  signup: false
-userDefaults:
-  darkMode: true
-  disableSettings: false
-  scope: "."
-  hideDotfiles: true
-  singleClick: false
-  permissions:
-    admin: false
-    create: false
-    rename: false
-    modify: false
-    delete: false
-    share: false
-    download: false

backend/files/conditions.go

@@ -14,85 +14,24 @@ var AllFiletypeOptions = []string{
 	"archive",
 	"video",
 	"doc",
+	"dir",
 	"text",
 }
-
-// Document file extensions
 var documentTypes = []string{
-	// Common Document Formats
-	".doc", ".docx", // Microsoft Word
-	".pdf", // Portable Document Format
-	".odt", // OpenDocument Text
-	".rtf", // Rich Text Format
-	".conf",
-	".bash_history",
-	".gitignore",
-	".htpasswd",
-	".profile",
-	".dockerignore",
-	".editorconfig",
-
-	// Presentation Formats
-	".ppt", ".pptx", // Microsoft PowerPoint
-	".odp", // OpenDocument Presentation
-
-	// google docs
-	".gdoc",
-
-	// google sheet
-	".gsheet",
-
-	// Spreadsheet Formats
-	".xls", ".xlsx", // Microsoft Excel
-	".ods", // OpenDocument Spreadsheet
-
-	// Other Document Formats
-	".epub", // Electronic Publication
-	".mobi", // Amazon Kindle
-	".fb2",  // FictionBook
+	".word",
+	".pdf",
+	".doc",
+	".docx",
 }
-
-// Text-based file extensions
 var textTypes = []string{
-	// Common Text Formats
-	".txt",
-	".md", // Markdown
-
-	// Scripting and Programming Languages
-	".sh",        // Bash script
-	".py",        // Python
-	".js",        // JavaScript
-	".ts",        // TypeScript
-	".php",       // PHP
-	".rb",        // Ruby
-	".go",        // Go
-	".java",      // Java
-	".c", ".cpp", // C/C++
-	".cs",    // C#
-	".swift", // Swift
-
-	// Configuration Files
-	".yaml", ".yml", // YAML
-	".json", // JSON
-	".xml",  // XML
-	".ini",  // INI
-	".toml", // TOML
-	".cfg",  // Configuration file
-
-	// Other Text-Based Formats
-	".css",          // Cascading Style Sheets
-	".html", ".htm", // HyperText Markup Language
-	".sql", // SQL
-	".csv", // Comma-Separated Values
-	".tsv", // Tab-Separated Values
-	".log", // Log file
-	".bat", // Batch file
-	".ps1", // PowerShell script
-	".tex", // LaTeX
-	".bib", // BibTeX
+	".text",
+	".sh",
+	".yaml",
+	".yml",
+	".json",
+	".env",
 }
 
-// Compressed file extensions
 var compressedFile = []string{
 	".7z",
 	".rar",
@@ -100,12 +39,6 @@ var compressedFile = []string{
 	".tar",
 	".gz",
 	".xz",
-	".bz2",
-	".tgz",  // tar.gz
-	".tbz2", // tar.bz2
-	".lzma",
-	".lz4",
-	".zstd",
 }
 
 type SearchOptions struct {
@@ -115,18 +48,8 @@ type SearchOptions struct {
 	Terms       []string
 }
 
-func extendedMimeTypeCheck(extension string) string {
-	if isDoc(extension) {
-		return "application/document"
-	}
-	if isText(extension) {
-		return "text/plain"
-	}
-	return "blob"
-}
-
-func ParseSearch(value string) SearchOptions {
-	opts := SearchOptions{
+func ParseSearch(value string) *SearchOptions {
+	opts := &SearchOptions{
 		Conditions: map[string]bool{
 			"exact": strings.Contains(value, "case:exact"),
 		},
@@ -168,7 +91,7 @@ func ParseSearch(value string) SearchOptions {
 			opts.LargerThan = updateSize(size)
 		}
 		if strings.HasPrefix(filter, "smallerThan=") {
-			opts.Conditions["smaller"] = true
+			opts.Conditions["larger"] = true
 			size := strings.TrimPrefix(filter, "smallerThan=")
 			opts.SmallerThan = updateSize(size)
 		}
@@ -222,6 +145,8 @@ func IsMatchingType(extension string, matchType string) bool {
 	switch matchType {
 	case "doc":
 		return isDoc(extension)
+	case "pdf":
+		return extension == ".pdf"
 	case "text":
 		return isText(extension)
 	case "archive":

backend/files/conditions_test.go

@@ -1,154 +0,0 @@
-package files
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// Helper function to create error messages dynamically
-func errorMsg(extension, expectedType string, expectedMatch bool) string {
-	matchStatus := "to match"
-	if !expectedMatch {
-		matchStatus = "to not match"
-	}
-	return fmt.Sprintf("Expected %s %s type '%s'", extension, matchStatus, expectedType)
-}
-
-func TestIsMatchingType(t *testing.T) {
-	// Test cases where IsMatchingType should return true
-	trueTestCases := []struct {
-		extension    string
-		expectedType string
-	}{
-		{".pdf", "doc"},
-		{".doc", "doc"},
-		{".docx", "doc"},
-		{".json", "text"},
-		{".sh", "text"},
-		{".zip", "archive"},
-		{".rar", "archive"},
-	}
-
-	for _, tc := range trueTestCases {
-		assert.True(t, IsMatchingType(tc.extension, tc.expectedType), errorMsg(tc.extension, tc.expectedType, true))
-	}
-
-	// Test cases where IsMatchingType should return false
-	falseTestCases := []struct {
-		extension    string
-		expectedType string
-	}{
-		{".mp4", "doc"},
-		{".mp4", "text"},
-		{".mp4", "archive"},
-	}
-
-	for _, tc := range falseTestCases {
-		assert.False(t, IsMatchingType(tc.extension, tc.expectedType), errorMsg(tc.extension, tc.expectedType, false))
-	}
-}
-
-func TestUpdateSize(t *testing.T) {
-	// Helper function for size error messages
-	sizeErrorMsg := func(input string, expected, actual int) string {
-		return fmt.Sprintf("Expected size for input '%s' to be %d, got %d", input, expected, actual)
-	}
-
-	// Test cases for updateSize
-	testCases := []struct {
-		input    string
-		expected int
-	}{
-		{"150", 150},
-		{"invalid", 100},
-		{"", 100},
-	}
-
-	for _, tc := range testCases {
-		actual := updateSize(tc.input)
-		assert.Equal(t, tc.expected, actual, sizeErrorMsg(tc.input, tc.expected, actual))
-	}
-}
-
-func TestIsDoc(t *testing.T) {
-	// Test cases where IsMatchingType should return true for document types
-	docTrueTestCases := []struct {
-		extension    string
-		expectedType string
-	}{
-		{".doc", "doc"},
-		{".pdf", "doc"},
-	}
-
-	for _, tc := range docTrueTestCases {
-		assert.True(t, IsMatchingType(tc.extension, tc.expectedType), errorMsg(tc.extension, tc.expectedType, true))
-	}
-
-	// Test case where IsMatchingType should return false for document types
-	docFalseTestCases := []struct {
-		extension    string
-		expectedType string
-	}{
-		{".mp4", "doc"},
-	}
-
-	for _, tc := range docFalseTestCases {
-		assert.False(t, IsMatchingType(tc.extension, tc.expectedType), errorMsg(tc.extension, tc.expectedType, false))
-	}
-}
-
-func TestIsText(t *testing.T) {
-	// Test cases where IsMatchingType should return true for text types
-	textTrueTestCases := []struct {
-		extension    string
-		expectedType string
-	}{
-		{".json", "text"},
-		{".sh", "text"},
-	}
-
-	for _, tc := range textTrueTestCases {
-		assert.True(t, IsMatchingType(tc.extension, tc.expectedType), errorMsg(tc.extension, tc.expectedType, true))
-	}
-
-	// Test case where IsMatchingType should return false for text types
-	textFalseTestCases := []struct {
-		extension    string
-		expectedType string
-	}{
-		{".mp4", "text"},
-	}
-
-	for _, tc := range textFalseTestCases {
-		assert.False(t, IsMatchingType(tc.extension, tc.expectedType), errorMsg(tc.extension, tc.expectedType, false))
-	}
-}
-
-func TestIsArchive(t *testing.T) {
-	// Test cases where IsMatchingType should return true for archive types
-	archiveTrueTestCases := []struct {
-		extension    string
-		expectedType string
-	}{
-		{".zip", "archive"},
-		{".rar", "archive"},
-	}
-
-	for _, tc := range archiveTrueTestCases {
-		assert.True(t, IsMatchingType(tc.extension, tc.expectedType), errorMsg(tc.extension, tc.expectedType, true))
-	}
-
-	// Test case where IsMatchingType should return false for archive types
-	archiveFalseTestCases := []struct {
-		extension    string
-		expectedType string
-	}{
-		{".mp4", "archive"},
-	}
-
-	for _, tc := range archiveFalseTestCases {
-		assert.False(t, IsMatchingType(tc.extension, tc.expectedType), errorMsg(tc.extension, tc.expectedType, false))
-	}
-}

backend/files/file.go

@@ -1,149 +1,245 @@
 package files
 
 import (
-	"crypto/md5"
-	"crypto/sha1"
+	"crypto/md5"  //nolint:gosec
+	"crypto/sha1" //nolint:gosec
 	"crypto/sha256"
 	"crypto/sha512"
 	"encoding/hex"
-	"fmt"
 	"hash"
 	"io"
 	"mime"
 	"net/http"
-
 	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
+	filepath "path/filepath"
 	"strings"
 	"sync"
 	"time"
 	"unicode/utf8"
 
-	"github.com/gtsteffaniak/filebrowser/backend/errors"
-	"github.com/gtsteffaniak/filebrowser/backend/fileutils"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/spf13/afero"
+
+	"github.com/gtsteffaniak/filebrowser/errors"
+	"github.com/gtsteffaniak/filebrowser/rules"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 var (
-	pathMutexes   = make(map[string]*sync.Mutex)
-	pathMutexesMu sync.Mutex // Mutex to protect the pathMutexes map
+	bytesInMegabyte int64      = 1000000
+	pathMutexes                = make(map[string]*sync.Mutex)
+	pathMutexesMu   sync.Mutex // Mutex to protect the pathMutexes map
 )
 
-type ItemInfo struct {
-	Name    string    `json:"name"`
-	Size    int64     `json:"size"`
-	ModTime time.Time `json:"modified"`
-	Type    string    `json:"type"`
-}
-
 // FileInfo describes a file.
-// reduced item is non-recursive reduced "Items", used to pass flat items array
 type FileInfo struct {
-	ItemInfo
-	Files   []ItemInfo `json:"files"`
-	Folders []ItemInfo `json:"folders"`
-	Path    string     `json:"path"`
-}
-
-// for efficiency, a response will be a pointer to the data
-// extra calculated fields can be added here
-type ExtendedFileInfo struct {
-	*FileInfo
-	Content   string            `json:"content,omitempty"`
+	*Listing
+	Fs        afero.Fs          `json:"-"`
+	Path      string            `json:"path,omitempty"`
+	Name      string            `json:"name"`
+	Size      int64             `json:"size"`
+	Extension string            `json:"-"`
+	ModTime   time.Time         `json:"modified"`
+	CacheTime time.Time         `json:"-"`
+	Mode      os.FileMode       `json:"-"`
+	IsDir     bool              `json:"isDir,omitempty"`
+	IsSymlink bool              `json:"isSymlink,omitempty"`
+	Type      string            `json:"type"`
 	Subtitles []string          `json:"subtitles,omitempty"`
+	Content   string            `json:"content,omitempty"`
 	Checksums map[string]string `json:"checksums,omitempty"`
 	Token     string            `json:"token,omitempty"`
-	RealPath  string            `json:"-"`
 }
 
 // FileOptions are the options when getting a file info.
 type FileOptions struct {
-	Path       string // realpath
-	Source     string
-	IsDir      bool
+	Fs         afero.Fs
+	Path       string
 	Modify     bool
 	Expand     bool
 	ReadHeader bool
-	Checker    users.Checker
+	Token      string
+	Checker    rules.Checker
 	Content    bool
 }
 
-func (f FileOptions) Components() (string, string) {
-	return filepath.Dir(f.Path), filepath.Base(f.Path)
+// Sorting constants
+const (
+	SortingByName     = "name"
+	SortingBySize     = "size"
+	SortingByModified = "modified"
+)
+
+// Listing is a collection of files.
+type Listing struct {
+	Items    []*FileInfo   `json:"items"`
+	Path     string        `json:"path"`
+	NumDirs  int           `json:"numDirs"`
+	NumFiles int           `json:"numFiles"`
+	Sorting  users.Sorting `json:"sorting"`
 }
 
-func FileInfoFaster(opts FileOptions) (ExtendedFileInfo, error) {
-	response := ExtendedFileInfo{}
-	if opts.Source == "" {
-		opts.Source = "default"
+// NewFileInfo creates a File object from a path and a given user. This File
+// object will be automatically filled depending on if it is a directory
+// or a file. If it's a video file, it will also detect any subtitles.
+func NewFileInfo(opts FileOptions) (*FileInfo, error) {
+	if !opts.Checker.Check(opts.Path) {
+		return nil, os.ErrPermission
 	}
-	index := GetIndex(opts.Source)
-	if index == nil {
-		return response, fmt.Errorf("could not get index: %v ", opts.Source)
+	file, err := stat(opts.Path, opts) // Pass opts.Path here
+	if err != nil {
+		return nil, err
 	}
-	opts.Path = index.makeIndexPath(opts.Path)
+	if opts.Expand {
+		if file.IsDir {
+			if err := file.readListing(opts.Path, opts.Checker, opts.ReadHeader); err != nil { //nolint:govet
+				return nil, err
+			}
+			return file, nil
+		}
+		err = file.detectType(opts.Path, opts.Modify, opts.Content, true)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return file, err
+}
+
+func FileInfoFaster(opts FileOptions) (*FileInfo, error) {
 	// Lock access for the specific path
 	pathMutex := getMutex(opts.Path)
 	pathMutex.Lock()
 	defer pathMutex.Unlock()
 	if !opts.Checker.Check(opts.Path) {
-		return response, os.ErrPermission
+		return nil, os.ErrPermission
 	}
-
-	realPath, isDir, err := index.GetRealPath(opts.Path)
-	if err != nil {
-		return response, err
+	index := GetIndex(rootPath)
+	trimmed := strings.TrimPrefix(opts.Path, "/")
+	if trimmed == "" {
+		trimmed = "/"
 	}
-	opts.IsDir = isDir
-	// TODO : whats the best way to save trips to disk here?
-	// disabled using cache because its not clear if this is helping or hurting
-	// check if the file exists in the index
-	//info, exists := index.GetReducedMetadata(opts.Path, opts.IsDir)
-	//if exists {
-	//	err := RefreshFileInfo(opts)
-	//	if err != nil {
-	//		return info, err
-	//	}
-	//	if opts.Content {
-	//		content := ""
-	//		content, err = getContent(opts.Path)
-	//		if err != nil {
-	//			return info, err
-	//		}
-	//		info.Content = content
-	//	}
-	//	return info, nil
-	//}
-
-	err = index.RefreshFileInfo(opts)
-	if err != nil {
-		return response, err
-	}
-	info, exists := index.GetReducedMetadata(opts.Path, opts.IsDir)
-	if !exists {
-		return response, err
-	}
-	if opts.Content {
-		content, err := getContent("default", opts.Path)
-		if err != nil {
-			return response, err
+	adjustedPath := makeIndexPath(trimmed, index.Root)
+	var info FileInfo
+	info, exists := index.GetMetadataInfo(adjustedPath)
+	if exists && !opts.Content {
+		// Check if the cache time is less than 1 second
+		if time.Since(info.CacheTime) > time.Second {
+			go RefreshFileInfo(opts)
 		}
-		response.Content = content
+		// refresh cache after
+		return &info, nil
+	} else {
+		// don't bother caching content
+		if opts.Content {
+			file, err := NewFileInfo(opts)
+			return file, err
+		}
+		updated := RefreshFileInfo(opts)
+		if !updated {
+			file, err := NewFileInfo(opts)
+			return file, err
+		}
+		info, exists = index.GetMetadataInfo(adjustedPath)
+		if !exists || info.Name == "" {
+			return &FileInfo{}, errors.ErrEmptyKey
+		}
+		return &info, nil
 	}
-	response.FileInfo = info
-	response.RealPath = realPath
-	return response, nil
+}
+
+func RefreshFileInfo(opts FileOptions) bool {
+	if !opts.Checker.Check(opts.Path) {
+		return false
+	}
+	index := GetIndex(rootPath)
+	trimmed := strings.TrimPrefix(opts.Path, "/")
+	if trimmed == "" {
+		trimmed = "/"
+	}
+	adjustedPath := makeIndexPath(trimmed, index.Root)
+	file, err := stat(opts.Path, opts) // Pass opts.Path here
+	if err != nil {
+		return false
+	}
+	_ = file.detectType(adjustedPath, true, opts.Content, opts.ReadHeader)
+	if file.IsDir {
+		err := file.readListing(opts.Path, opts.Checker, opts.ReadHeader)
+		if err != nil {
+			return false
+		}
+		//_, exists := index.GetFileMetadata(adjustedPath)
+
+		return index.UpdateFileMetadata(adjustedPath, *file)
+	} else {
+		//_, exists := index.GetFileMetadata(adjustedPath)
+		return index.UpdateFileMetadata(adjustedPath, *file)
+	}
+}
+
+func stat(path string, opts FileOptions) (*FileInfo, error) {
+	var file *FileInfo
+	if lstaterFs, ok := opts.Fs.(afero.Lstater); ok {
+		info, _, err := lstaterFs.LstatIfPossible(path)
+		if err == nil {
+			file = &FileInfo{
+				Fs:        opts.Fs,
+				Path:      opts.Path,
+				Name:      info.Name(),
+				ModTime:   info.ModTime(),
+				Mode:      info.Mode(),
+				Size:      info.Size(),
+				Extension: filepath.Ext(info.Name()),
+				Token:     opts.Token,
+			}
+			if info.IsDir() {
+				file.IsDir = true
+			}
+			if info.Mode()&os.ModeSymlink != 0 {
+				file.IsSymlink = true
+			}
+		}
+	}
+	if file == nil || file.IsSymlink {
+		info, err := opts.Fs.Stat(opts.Path)
+		if err != nil {
+			return nil, err
+		}
+
+		if file != nil && file.IsSymlink {
+			file.Size = info.Size()
+			file.IsDir = info.IsDir()
+			return file, nil
+		}
+
+		file = &FileInfo{
+			Fs:        opts.Fs,
+			Path:      opts.Path,
+			Name:      info.Name(),
+			ModTime:   info.ModTime(),
+			Mode:      info.Mode(),
+			IsDir:     info.IsDir(),
+			Size:      info.Size(),
+			Extension: filepath.Ext(info.Name()),
+			Token:     opts.Token,
+		}
+	}
+
+	return file, nil
 }
 
 // Checksum checksums a given File for a given User, using a specific
 // algorithm. The checksums data is saved on File object.
-func GetChecksum(fullPath, algo string) (map[string]string, error) {
-	subs := map[string]string{}
-	reader, err := os.Open(fullPath)
+func (i *FileInfo) Checksum(algo string) error {
+	if i.IsDir {
+		return errors.ErrIsDirectory
+	}
+
+	if i.Checksums == nil {
+		i.Checksums = map[string]string{}
+	}
+
+	reader, err := i.Fs.Open(i.Path)
 	if err != nil {
-		return subs, err
+		return err
 	}
 	defer reader.Close()
 
@@ -156,228 +252,232 @@ func GetChecksum(fullPath, algo string) (map[string]string, error) {
 
 	h, ok := hashFuncs[algo]
 	if !ok {
-		return subs, errors.ErrInvalidOption
+		return errors.ErrInvalidOption
 	}
 
 	_, err = io.Copy(h, reader)
 	if err != nil {
-		return subs, err
+		return err
 	}
-	subs[algo] = hex.EncodeToString(h.Sum(nil))
-	return subs, nil
-}
 
-func DeleteFiles(source, absPath string, dirPath string) error {
-	err := os.RemoveAll(absPath)
-	if err != nil {
-		return err
-	}
-	index := GetIndex(source)
-	refreshConfig := FileOptions{Path: dirPath, IsDir: true}
-	err = index.RefreshFileInfo(refreshConfig)
-	if err != nil {
-		return err
-	}
+	i.Checksums[algo] = hex.EncodeToString(h.Sum(nil))
 	return nil
 }
 
-func MoveResource(source, realsrc, realdst string, isSrcDir bool) error {
-	err := fileutils.MoveFile(realsrc, realdst)
-	if err != nil {
-		return err
-	}
-	index := GetIndex(source)
-	// refresh info for source and dest
-	err = index.RefreshFileInfo(FileOptions{
-		Path:  filepath.Dir(realsrc),
-		IsDir: isSrcDir,
-	})
-	if err != nil {
-		return errors.ErrEmptyKey
-	}
-	refreshConfig := FileOptions{Path: realdst, IsDir: true}
-	if !isSrcDir {
-		refreshConfig.Path = filepath.Dir(realdst)
-	}
-	err = index.RefreshFileInfo(refreshConfig)
-	if err != nil {
-		return errors.ErrEmptyKey
-	}
-	return nil
-}
-
-func CopyResource(source, realsrc, realdst string, isSrcDir bool) error {
-	err := fileutils.CopyFile(realsrc, realdst)
-	if err != nil {
-		return err
-	}
-	index := GetIndex(source)
-	refreshConfig := FileOptions{Path: realdst, IsDir: true}
-	if !isSrcDir {
-		refreshConfig.Path = filepath.Dir(realdst)
-	}
-	err = index.RefreshFileInfo(refreshConfig)
-	if err != nil {
-		return errors.ErrEmptyKey
-	}
-	return nil
-}
-
-func WriteDirectory(opts FileOptions) error {
-	idx := GetIndex(opts.Source)
-	realPath, _, _ := idx.GetRealPath(opts.Path)
-	// Ensure the parent directories exist
-	err := os.MkdirAll(realPath, 0775)
-	if err != nil {
-		return err
-	}
-	err = idx.RefreshFileInfo(opts)
-	if err != nil {
-		return errors.ErrEmptyKey
-	}
-	return nil
-}
-
-func WriteFile(opts FileOptions, in io.Reader) error {
-	idx := GetIndex(opts.Source)
-	dst, _, _ := idx.GetRealPath(opts.Path)
-	parentDir := filepath.Dir(dst)
-	// Create the directory and all necessary parents
-	err := os.MkdirAll(parentDir, 0775)
-	if err != nil {
-		return err
-	}
-
-	// Open the file for writing (create if it doesn't exist, truncate if it does)
-	file, err := os.OpenFile(dst, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	// Copy the contents from the reader to the file
-	_, err = io.Copy(file, in)
-	if err != nil {
-		return err
-	}
-	opts.Path = parentDir
-	opts.IsDir = true
-	return idx.RefreshFileInfo(opts)
-}
-
-// resolveSymlinks resolves symlinks in the given path
-func resolveSymlinks(path string) (string, bool, error) {
-	for {
-		// Get the file info using os.Lstat to handle symlinks
-		info, err := os.Lstat(path)
-		if err != nil {
-			return path, false, fmt.Errorf("could not stat path: %s, %v", path, err)
-		}
-
-		// Check if the path is a symlink
-		if info.Mode()&os.ModeSymlink != 0 {
-			// Read the symlink target
-			target, err := os.Readlink(path)
-			if err != nil {
-				return path, false, fmt.Errorf("could not read symlink: %s, %v", path, err)
-			}
-
-			// Resolve the symlink's target relative to its directory
-			// This ensures the resolved path is absolute and correctly calculated
-			path = filepath.Join(filepath.Dir(path), target)
-		} else {
-			// Not a symlink, so return the resolved path and whether it's a directory
-			isDir := info.IsDir()
-			return path, isDir, nil
+// RealPath gets the real path for the file, resolving symlinks if supported.
+func (i *FileInfo) RealPath() string {
+	if realPathFs, ok := i.Fs.(interface {
+		RealPath(name string) (fPath string, err error)
+	}); ok {
+		realPath, err := realPathFs.RealPath(i.Path)
+		if err == nil {
+			return realPath
 		}
 	}
+
+	return i.Path
 }
 
 // addContent reads and sets content based on the file type.
-func getContent(source, path string) (string, error) {
-	idx := GetIndex(source)
-	realPath, _, err := idx.GetRealPath(path)
-	if err != nil {
-		return "", err
+func (i *FileInfo) addContent(path string) error {
+	if !i.IsDir {
+		afs := &afero.Afero{Fs: i.Fs}
+		content, err := afs.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		stringContent := string(content)
+		if !utf8.ValidString(stringContent) {
+			return nil
+		}
+		if stringContent == "" {
+			i.Content = "empty-file-x6OlSil"
+			return nil
+		}
+		i.Content = stringContent
 	}
-
-	content, err := os.ReadFile(realPath)
-	if err != nil {
-		return "", err
-	}
-	stringContent := string(content)
-	if !utf8.ValidString(stringContent) {
-		return "", nil
-	}
-	if stringContent == "" {
-		return "empty-file-x6OlSil", nil
-	}
-	return stringContent, nil
+	return nil
 }
 
-// DetectType detects the MIME type of a file and updates the ItemInfo struct.
-func (i *ItemInfo) DetectType(realPath string, saveContent bool) {
-	name := i.Name
-	ext := filepath.Ext(name)
-
-	// Attempt MIME detection by file extension
-	i.Type = strings.Split(mime.TypeByExtension(ext), ";")[0]
-	if i.Type == "" {
-		i.Type = extendedMimeTypeCheck(ext)
+// detectType detects the file type.
+func (i *FileInfo) detectType(path string, modify, saveContent, readHeader bool) error {
+	if IsNamedPipe(i.Mode) {
+		i.Type = "blob"
+		if saveContent {
+			return i.addContent(path)
+		}
+		return nil
 	}
-	if i.Type == "blob" {
-		// Read only the first 512 bytes for efficient MIME detection
-		file, err := os.Open(realPath)
-		if err != nil {
 
-		} else {
-			defer file.Close()
-			buffer := make([]byte, 512)
-			n, _ := file.Read(buffer) // Ignore errors from Read
-			i.Type = strings.Split(http.DetectContentType(buffer[:n]), ";")[0]
+	var buffer []byte
+	if readHeader {
+		buffer = i.readFirstBytes()
+		mimetype := mime.TypeByExtension(i.Extension)
+		if mimetype == "" {
+			http.DetectContentType(buffer)
+		}
+	}
+
+	ext := filepath.Ext(i.Name)
+	for _, fileType := range AllFiletypeOptions {
+		if IsMatchingType(ext, fileType) {
+			i.Type = fileType
+		}
+
+		switch i.Type {
+		case "text":
+			if !modify {
+				i.Type = "textImmutable"
+			}
+			if saveContent {
+				return i.addContent(path)
+			}
+		case "video":
+			parentDir := strings.TrimRight(path, i.Name)
+			i.detectSubtitles(parentDir)
+		case "doc":
+			if ext == ".pdf" {
+				i.Type = "pdf"
+				return nil
+			}
+			if saveContent {
+				return i.addContent(path)
+			}
+		}
+	}
+
+	if i.Type == "" {
+		i.Type = "blob"
+		if saveContent {
+			return i.addContent(path)
+		}
+	}
+
+	return nil
+}
+
+// readFirstBytes reads the first bytes of the file.
+func (i *FileInfo) readFirstBytes() []byte {
+	reader, err := i.Fs.Open(i.Path)
+	if err != nil {
+		i.Type = "blob"
+		return nil
+	}
+	defer reader.Close()
+
+	buffer := make([]byte, 512) //nolint:gomnd
+	n, err := reader.Read(buffer)
+	if err != nil && err != io.EOF {
+		i.Type = "blob"
+		return nil
+	}
+
+	return buffer[:n]
+}
+
+// detectSubtitles detects subtitles for video files.
+func (i *FileInfo) detectSubtitles(parentDir string) {
+	if i.Type != "video" {
+		return
+	}
+	i.Subtitles = []string{}
+	ext := filepath.Ext(i.Name)
+	dir, err := os.Open(parentDir)
+	if err != nil {
+		// Directory must have been deleted, remove it from the index
+		return
+	}
+	// Read the directory contents
+	files, err := dir.Readdir(-1)
+	if err != nil {
+		return
+	}
+
+	base := strings.TrimSuffix(i.Name, ext)
+	subtitleExts := []string{".vtt", ".txt", ".srt", ".lrc"}
+
+	for _, f := range files {
+		if f.IsDir() || !strings.HasPrefix(f.Name(), base) {
+			continue
+		}
+
+		for _, subtitleExt := range subtitleExts {
+			if strings.HasSuffix(f.Name(), subtitleExt) {
+				i.Subtitles = append(i.Subtitles, filepath.Join(parentDir, f.Name()))
+				break
+			}
 		}
 	}
 }
 
-// TODO add subtitles back
-// detectSubtitles detects subtitles for video files.
-//func (i *FileInfo) detectSubtitles(path string) {
-//	if i.Type != "video" {
-//		return
-//	}
-//	parentDir := filepath.Dir(path)
-//	fileName := filepath.Base(path)
-//	i.Subtitles = []string{}
-//	ext := filepath.Ext(fileName)
-//	dir, err := os.Open(parentDir)
-//	if err != nil {
-//		// Directory must have been deleted, remove it from the index
-//		return
-//	}
-//	defer dir.Close() // Ensure directory handle is closed
-//
-//	files, err := dir.Readdir(-1)
-//	if err != nil {
-//		return
-//	}
-//
-//	base := strings.TrimSuffix(fileName, ext)
-//	subtitleExts := []string{".vtt", ".txt", ".srt", ".lrc"}
-//
-//	for _, f := range files {
-//		if f.IsDir() || !strings.HasPrefix(f.Name(), base) {
-//			continue
-//		}
-//
-//		for _, subtitleExt := range subtitleExts {
-//			if strings.HasSuffix(f.Name(), subtitleExt) {
-//				i.Subtitles = append(i.Subtitles, filepath.Join(parentDir, f.Name()))
-//				break
-//			}
-//		}
-//	}
-//}
+// readListing reads the contents of a directory and fills the listing.
+func (i *FileInfo) readListing(path string, checker rules.Checker, readHeader bool) error {
+	afs := &afero.Afero{Fs: i.Fs}
+	dir, err := afs.ReadDir(i.Path)
+	if err != nil {
+		return err
+	}
 
+	listing := &Listing{
+		Items:    []*FileInfo{},
+		Path:     i.Path,
+		NumDirs:  0,
+		NumFiles: 0,
+	}
+
+	for _, f := range dir {
+		name := f.Name()
+		fPath := filepath.Join(i.Path, name)
+
+		if !checker.Check(fPath) {
+			continue
+		}
+
+		isSymlink, isInvalidLink := false, false
+		if IsSymlink(f.Mode()) {
+			isSymlink = true
+			info, err := i.Fs.Stat(fPath)
+			if err == nil {
+				f = info
+			} else {
+				isInvalidLink = true
+			}
+		}
+
+		file := &FileInfo{
+			Name:    name,
+			Size:    f.Size(),
+			ModTime: f.ModTime(),
+			Mode:    f.Mode(),
+		}
+		if f.IsDir() {
+			file.IsDir = true
+		}
+		if isSymlink {
+			file.IsSymlink = true
+		}
+
+		if file.IsDir {
+			listing.NumDirs++
+		} else {
+			listing.NumFiles++
+
+			if isInvalidLink {
+				file.Type = "invalid_link"
+			} else {
+				err := file.detectType(path, true, false, readHeader)
+				if err != nil {
+					return err
+				}
+			}
+		}
+
+		listing.Items = append(listing.Items, file)
+	}
+
+	i.Listing = listing
+	return nil
+}
 func IsNamedPipe(mode os.FileMode) bool {
 	return mode&os.ModeNamedPipe != 0
 }
@@ -398,41 +498,3 @@ func getMutex(path string) *sync.Mutex {
 
 	return pathMutexes[path]
 }
-
-func Exists(path string) bool {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true
-	}
-	if os.IsNotExist(err) {
-		return false
-	}
-	return false
-}
-
-func (info *FileInfo) SortItems() {
-	sort.Slice(info.Folders, func(i, j int) bool {
-		nameWithoutExt := strings.Split(info.Folders[i].Name, ".")[0]
-		nameWithoutExt2 := strings.Split(info.Folders[j].Name, ".")[0]
-		// Convert strings to integers for numeric sorting if both are numeric
-		numI, errI := strconv.Atoi(nameWithoutExt)
-		numJ, errJ := strconv.Atoi(nameWithoutExt2)
-		if errI == nil && errJ == nil {
-			return numI < numJ
-		}
-		// Fallback to case-insensitive lexicographical sorting
-		return strings.ToLower(info.Folders[i].Name) < strings.ToLower(info.Folders[j].Name)
-	})
-	sort.Slice(info.Files, func(i, j int) bool {
-		nameWithoutExt := strings.Split(info.Files[i].Name, ".")[0]
-		nameWithoutExt2 := strings.Split(info.Files[j].Name, ".")[0]
-		// Convert strings to integers for numeric sorting if both are numeric
-		numI, errI := strconv.Atoi(nameWithoutExt)
-		numJ, errJ := strconv.Atoi(nameWithoutExt2)
-		if errI == nil && errJ == nil {
-			return numI < numJ
-		}
-		// Fallback to case-insensitive lexicographical sorting
-		return strings.ToLower(info.Files[i].Name) < strings.ToLower(info.Files[j].Name)
-	})
-}

backend/files/file_test.go

@@ -1,177 +0,0 @@
-package files
-
-import (
-	"os"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-)
-
-func Test_GetRealPath(t *testing.T) {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return
-	}
-	trimPrefix := filepath.Dir(filepath.Dir(cwd))
-	tests := []struct {
-		name  string
-		paths []string
-		want  struct {
-			path  string
-			isDir bool
-		}
-	}{
-		{
-			name: "current directory",
-			paths: []string{
-				"./",
-			},
-			want: struct {
-				path  string
-				isDir bool
-			}{
-				path:  "",
-				isDir: true,
-			},
-		},
-		{
-			name: "current directory",
-			paths: []string{
-				"./files/file.go",
-			},
-			want: struct {
-				path  string
-				isDir bool
-			}{
-				path:  "/files/file.go",
-				isDir: false,
-			},
-		},
-		{
-			name: "other test case",
-			paths: []string{
-				"/mnt/doesnt/exist",
-			},
-			want: struct {
-				path  string
-				isDir bool
-			}{
-				path:  "/mnt/doesnt/exist",
-				isDir: false,
-			},
-		},
-	}
-	idx := Index{
-		Source: settings.Source{
-			Path: trimPrefix,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			realPath, isDir, _ := idx.GetRealPath(tt.paths...)
-			adjustedRealPath := strings.TrimPrefix(realPath, trimPrefix)
-			if tt.want.path != adjustedRealPath || tt.want.isDir != isDir {
-				t.Errorf("expected %v:%v but got: %v:%v", tt.want.path, tt.want.isDir, adjustedRealPath, isDir)
-			}
-		})
-	}
-}
-
-func TestSortItems(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    FileInfo
-		expected FileInfo
-	}{
-		{
-			name: "Numeric and Lexicographical Sorting",
-			input: FileInfo{
-				Folders: []ItemInfo{
-					{Name: "10.txt"},
-					{Name: "2.txt"},
-					{Name: "apple"},
-					{Name: "Banana"},
-				},
-				Files: []ItemInfo{
-					{Name: "File2.txt"},
-					{Name: "File10.txt"},
-					{Name: "File1"},
-					{Name: "banana"},
-				},
-			},
-			expected: FileInfo{
-				Folders: []ItemInfo{
-					{Name: "2.txt"},
-					{Name: "10.txt"},
-					{Name: "apple"},
-					{Name: "Banana"},
-				},
-				Files: []ItemInfo{
-					{Name: "banana"},
-					{Name: "File1"},
-					{Name: "File10.txt"},
-					{Name: "File2.txt"},
-				},
-			},
-		},
-		{
-			name: "Only Lexicographical Sorting",
-			input: FileInfo{
-				Folders: []ItemInfo{
-					{Name: "dog.txt"},
-					{Name: "Cat.txt"},
-					{Name: "apple"},
-				},
-				Files: []ItemInfo{
-					{Name: "Zebra"},
-					{Name: "apple"},
-					{Name: "cat"},
-				},
-			},
-			expected: FileInfo{
-				Folders: []ItemInfo{
-					{Name: "apple"},
-					{Name: "Cat.txt"},
-					{Name: "dog.txt"},
-				},
-				Files: []ItemInfo{
-					{Name: "apple"},
-					{Name: "cat"},
-					{Name: "Zebra"},
-				},
-			},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			test.input.SortItems()
-
-			getNames := func(items []ItemInfo) []string {
-				names := []string{}
-				for _, folder := range items {
-					names = append(names, folder.Name)
-				}
-				return names
-			}
-
-			actualFolderNames := getNames(test.input.Folders)
-			expectedFolderNames := getNames(test.expected.Folders)
-
-			if !reflect.DeepEqual(actualFolderNames, expectedFolderNames) {
-				t.Errorf("Folders not sorted correctly.\nGot: %v\nExpected: %v", actualFolderNames, expectedFolderNames)
-			}
-
-			actualFileNames := getNames(test.input.Files)
-			expectedFileNames := getNames(test.expected.Files)
-
-			if !reflect.DeepEqual(actualFileNames, expectedFileNames) {
-				t.Errorf("Files not sorted correctly.\nGot: %v\nExpected: %v", actualFileNames, expectedFileNames)
-			}
-		})
-	}
-}

backend/files/indexing.go

@@ -0,0 +1,167 @@
+package files
+
+import (
+	"bytes"
+	"log"
+	"os"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/gtsteffaniak/filebrowser/settings"
+)
+
+type Directory struct {
+	Metadata map[string]FileInfo
+	Files    string
+}
+type File struct {
+	Name  string
+	IsDir bool
+}
+
+type Index struct {
+	Root        string
+	Directories map[string]Directory
+	NumDirs     int
+	NumFiles    int
+	inProgress  bool
+	quickList   []File
+	LastIndexed time.Time
+	mu          sync.RWMutex
+}
+
+var (
+	rootPath     string = "/srv"
+	indexes      []*Index
+	indexesMutex sync.RWMutex
+)
+
+func InitializeIndex(intervalMinutes uint32, schedule bool) {
+	if schedule {
+		go indexingScheduler(intervalMinutes)
+	}
+}
+
+func indexingScheduler(intervalMinutes uint32) {
+	if settings.Config.Server.Root != "" {
+		rootPath = settings.Config.Server.Root
+	}
+	si := GetIndex(rootPath)
+	log.Printf("Indexing Files...")
+	log.Printf("Configured to run every %v minutes", intervalMinutes)
+	log.Printf("Indexing from root: %s", si.Root)
+	for {
+		startTime := time.Now()
+		// Set the indexing flag to indicate that indexing is in progress
+		si.resetCount()
+		// Perform the indexing operation
+		err := si.indexFiles(si.Root)
+		si.quickList = []File{}
+		// Reset the indexing flag to indicate that indexing has finished
+		si.inProgress = false
+		// Update the LastIndexed time
+		si.LastIndexed = time.Now()
+		if err != nil {
+			log.Printf("Error during indexing: %v", err)
+		}
+		if si.NumFiles+si.NumDirs > 0 {
+			timeIndexedInSeconds := int(time.Since(startTime).Seconds())
+			log.Println("Successfully indexed files.")
+			log.Printf("Time spent indexing: %v seconds\n", timeIndexedInSeconds)
+			log.Printf("Files found: %v\n", si.NumFiles)
+			log.Printf("Directories found: %v\n", si.NumDirs)
+		}
+		// Sleep for the specified interval
+		time.Sleep(time.Duration(intervalMinutes) * time.Minute)
+	}
+}
+
+// Define a function to recursively index files and directories
+func (si *Index) indexFiles(path string) error {
+	// Check if the current directory has been modified since the last indexing
+	path = strings.TrimSuffix(path, "/")
+	adjustedPath := makeIndexPath(path, si.Root)
+	dir, err := os.Open(path)
+	if err != nil {
+		// Directory must have been deleted, remove it from the index
+		si.RemoveDirectory(adjustedPath)
+	}
+	dirInfo, err := dir.Stat()
+	if err != nil {
+		dir.Close()
+		return err
+	}
+
+	// Compare the last modified time of the directory with the last indexed time
+	lastIndexed := si.LastIndexed
+	if dirInfo.ModTime().Before(lastIndexed) {
+		dir.Close()
+		return nil
+	}
+
+	// Read the directory contents
+	files, err := dir.Readdir(-1)
+	if err != nil {
+		return err
+	}
+	dir.Close()
+	si.UpdateQuickList(files)
+	si.InsertFiles(path)
+	// done separately for memory efficiency on recursion
+	si.InsertDirs(path)
+	return nil
+}
+
+func (si *Index) InsertFiles(path string) {
+	adjustedPath := makeIndexPath(path, si.Root)
+	subDirectory := Directory{}
+	buffer := bytes.Buffer{}
+
+	for _, f := range si.GetQuickList() {
+		if !f.IsDir {
+			buffer.WriteString(f.Name + ";")
+			si.UpdateCount("files")
+		}
+	}
+	// Use GetMetadataInfo and SetFileMetadata for safer read and write operations
+	subDirectory.Files = buffer.String()
+	si.SetDirectoryInfo(adjustedPath, subDirectory)
+}
+
+func (si *Index) InsertDirs(path string) {
+	adjustedPath := makeIndexPath(path, si.Root)
+	for _, f := range si.GetQuickList() {
+		if f.IsDir {
+			if _, exists := si.Directories[adjustedPath]; exists {
+				si.UpdateCount("dirs")
+				// Add or update the directory in the map
+				if adjustedPath == "/" {
+					si.SetDirectoryInfo("/"+f.Name, Directory{})
+				} else {
+					si.SetDirectoryInfo(adjustedPath+"/"+f.Name, Directory{})
+				}
+			}
+			err := si.indexFiles(path + "/" + f.Name)
+			if err != nil {
+				if err.Error() == "invalid argument" {
+					log.Printf("Could not index \"%v\": %v \n", path, "Permission Denied")
+				} else {
+					log.Printf("Could not index \"%v\": %v \n", path, err)
+				}
+			}
+		}
+	}
+}
+
+func makeIndexPath(path string, root string) string {
+	if path == root {
+		return "/"
+	}
+	adjustedPath := strings.TrimPrefix(path, root+"/")
+	adjustedPath = strings.TrimSuffix(adjustedPath, "/")
+	if adjustedPath == "" {
+		adjustedPath = "/"
+	}
+	return adjustedPath
+}

backend/files/indexingFiles.go

@@ -1,312 +0,0 @@
-package files
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"slices"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/gtsteffaniak/filebrowser/backend/utils"
-)
-
-type Index struct {
-	settings.Source
-	Directories                map[string]*FileInfo
-	NumDirs                    uint64
-	NumFiles                   uint64
-	NumDeleted                 uint64
-	FilesChangedDuringIndexing bool
-	currentSchedule            int
-	assessment                 string
-	indexingTime               int
-	LastIndexed                time.Time
-	SmartModifier              time.Duration
-	mu                         sync.RWMutex
-	scannerMu                  sync.Mutex
-}
-
-var (
-	indexes      map[string]*Index
-	indexesMutex sync.RWMutex
-	RootPaths    map[string]string
-)
-
-func Initialize(source settings.Source) {
-	indexesMutex.RLock()
-	newIndex := Index{
-		Source:      source,
-		Directories: make(map[string]*FileInfo),
-	}
-	if RootPaths == nil {
-		RootPaths = make(map[string]string)
-	}
-	RootPaths[source.Name] = source.Path
-	indexes = make(map[string]*Index)
-	indexes[newIndex.Source.Name] = &newIndex
-	indexesMutex.RUnlock()
-
-	if !newIndex.Source.Config.Disabled {
-		time.Sleep(time.Second)
-		logger.Info("Initializing index and assessing file system complexity")
-		newIndex.RunIndexing("/", false)
-		go newIndex.setupIndexingScanners()
-	} else {
-		logger.Debug("Indexing disabled for source: " + newIndex.Source.Name)
-	}
-}
-
-// Define a function to recursively index files and directories
-func (idx *Index) indexDirectory(adjustedPath string, quick, recursive bool) error {
-	realPath := strings.TrimRight(idx.Source.Path, "/") + adjustedPath
-	// Open the directory
-	dir, err := os.Open(realPath)
-	if err != nil {
-		idx.RemoveDirectory(adjustedPath) // Remove, must have been deleted
-		return err
-	}
-	defer dir.Close()
-
-	dirInfo, err := dir.Stat()
-	if err != nil {
-		return err
-	}
-	combinedPath := adjustedPath + "/"
-	if adjustedPath == "/" {
-		combinedPath = "/"
-	}
-	// get whats currently in cache
-	idx.mu.RLock()
-	cacheDirItems := []ItemInfo{}
-	modChange := true // default to true
-	cachedDir, exists := idx.Directories[adjustedPath]
-	if exists && quick {
-		modChange = dirInfo.ModTime() != cachedDir.ModTime
-		cacheDirItems = cachedDir.Folders
-	}
-	idx.mu.RUnlock()
-
-	// If the directory has not been modified since the last index, skip expensive readdir
-	// recursively check cached dirs for mod time changes as well
-	if !modChange && recursive {
-		for _, item := range cacheDirItems {
-			err = idx.indexDirectory(combinedPath+item.Name, quick, true)
-			if err != nil {
-				logger.Error(fmt.Sprintf("error indexing directory %v : %v", combinedPath+item.Name, err))
-			}
-		}
-		return nil
-	}
-
-	if quick {
-		idx.mu.Lock()
-		idx.FilesChangedDuringIndexing = true
-		idx.mu.Unlock()
-	}
-
-	// Read directory contents
-	files, err := dir.Readdir(-1)
-	if err != nil {
-		return err
-	}
-
-	var totalSize int64
-	fileInfos := []ItemInfo{}
-	dirInfos := []ItemInfo{}
-
-	// Process each file and directory in the current directory
-	for _, file := range files {
-
-		isDir := file.IsDir()
-		fullCombined := combinedPath + file.Name()
-		if idx.shouldSkip(isDir, isHidden(file, ""), fullCombined) {
-			continue
-		}
-		itemInfo := &ItemInfo{
-			Name:    file.Name(),
-			ModTime: file.ModTime(),
-		}
-
-		// fix for .app files on macos which are technically directories, but we don't want to treat them as such
-		if isDir && strings.HasSuffix(file.Name(), ".app") {
-			isDir = false
-		}
-		if isDir {
-
-			// skip non-indexable dirs.
-			if file.Name() == "$RECYCLE.BIN" || file.Name() == "System Volume Information" {
-				continue
-			}
-
-			dirPath := combinedPath + file.Name()
-			if recursive {
-				// Recursively index the subdirectory
-				err = idx.indexDirectory(dirPath, quick, recursive)
-				if err != nil {
-					logger.Error(fmt.Sprintf("Failed to index directory %s: %v", dirPath, err))
-					continue
-				}
-			}
-			realDirInfo, exists := idx.GetMetadataInfo(dirPath, true)
-			if exists {
-				itemInfo.Size = realDirInfo.Size
-			}
-			totalSize += itemInfo.Size
-			itemInfo.Type = "directory"
-			dirInfos = append(dirInfos, *itemInfo)
-			idx.NumDirs++
-		} else {
-			itemInfo.DetectType(fullCombined, false)
-			itemInfo.Size = file.Size()
-			fileInfos = append(fileInfos, *itemInfo)
-			totalSize += itemInfo.Size
-			idx.NumFiles++
-		}
-	}
-	if totalSize == 0 && idx.Source.Config.IgnoreZeroSizeFolders {
-		return nil
-	}
-	// Create FileInfo for the current directory
-	dirFileInfo := &FileInfo{
-		Path:    adjustedPath,
-		Files:   fileInfos,
-		Folders: dirInfos,
-	}
-	dirFileInfo.ItemInfo = ItemInfo{
-		Name:    dirInfo.Name(),
-		Type:    "directory",
-		Size:    totalSize,
-		ModTime: dirInfo.ModTime(),
-	}
-
-	dirFileInfo.SortItems()
-
-	// Update the current directory metadata in the index
-	idx.UpdateMetadata(dirFileInfo)
-
-	return nil
-}
-
-func (idx *Index) makeIndexPath(subPath string) string {
-	if strings.HasPrefix(subPath, "./") {
-		subPath = strings.TrimPrefix(subPath, ".")
-	}
-	if idx.Source.Path == subPath || subPath == "." {
-		return "/"
-	}
-	// clean path
-	subPath = strings.TrimSuffix(subPath, "/")
-	// remove index prefix
-	adjustedPath := strings.TrimPrefix(subPath, idx.Source.Path)
-	adjustedPath = strings.ReplaceAll(adjustedPath, "\\", "/")
-	// remove trailing slash
-	adjustedPath = strings.TrimSuffix(adjustedPath, "/")
-	if !strings.HasPrefix(adjustedPath, "/") {
-		adjustedPath = "/" + adjustedPath
-	}
-	return adjustedPath
-}
-
-func (idx *Index) recursiveUpdateDirSizes(childInfo *FileInfo, previousSize int64) {
-	parentDir := utils.GetParentDirectoryPath(childInfo.Path)
-	parentInfo, exists := idx.GetMetadataInfo(parentDir, true)
-	if !exists || parentDir == "" {
-		return
-	}
-	newSize := parentInfo.Size - previousSize + childInfo.Size
-	parentInfo.Size += newSize
-	idx.UpdateMetadata(parentInfo)
-	idx.recursiveUpdateDirSizes(parentInfo, newSize)
-}
-
-func (idx *Index) GetRealPath(relativePath ...string) (string, bool, error) {
-	combined := append([]string{idx.Source.Path}, relativePath...)
-	joinedPath := filepath.Join(combined...)
-	isDir, _ := utils.RealPathCache.Get(joinedPath + ":isdir").(bool)
-	cached, ok := utils.RealPathCache.Get(joinedPath).(string)
-	if ok && cached != "" {
-		return cached, isDir, nil
-	}
-	// Convert relative path to absolute path
-	absolutePath, err := filepath.Abs(joinedPath)
-	if err != nil {
-		return absolutePath, false, fmt.Errorf("could not get real path: %v, %s", joinedPath, err)
-	}
-	// Resolve symlinks and get the real path
-	realPath, isDir, err := resolveSymlinks(absolutePath)
-	if err == nil {
-		utils.RealPathCache.Set(joinedPath, realPath)
-		utils.RealPathCache.Set(joinedPath+":isdir", isDir)
-	}
-	return realPath, isDir, err
-}
-
-func (idx *Index) RefreshFileInfo(opts FileOptions) error {
-	refreshOptions := FileOptions{
-		Path:  opts.Path,
-		IsDir: opts.IsDir,
-	}
-	if !refreshOptions.IsDir {
-		refreshOptions.Path = idx.makeIndexPath(filepath.Dir(refreshOptions.Path))
-		refreshOptions.IsDir = true
-	} else {
-		refreshOptions.Path = idx.makeIndexPath(refreshOptions.Path)
-	}
-	err := idx.indexDirectory(refreshOptions.Path, false, false)
-	if err != nil {
-		return fmt.Errorf("file/folder does not exist to refresh data: %s", refreshOptions.Path)
-	}
-	file, exists := idx.GetMetadataInfo(refreshOptions.Path, true)
-	if !exists {
-		return fmt.Errorf("file/folder does not exist in metadata: %s", refreshOptions.Path)
-	}
-
-	current, firstExisted := idx.GetMetadataInfo(refreshOptions.Path, true)
-	refreshParentInfo := firstExisted && current.Size != file.Size
-	//utils.PrintStructFields(*file)
-	result := idx.UpdateMetadata(file)
-	if !result {
-		return fmt.Errorf("file/folder does not exist in metadata: %s", refreshOptions.Path)
-	}
-	if !exists {
-		return nil
-	}
-	if refreshParentInfo {
-		idx.recursiveUpdateDirSizes(file, current.Size)
-	}
-	return nil
-}
-
-func isHidden(file os.FileInfo, realpath string) bool {
-	return file.Name()[0] == '.'
-}
-
-func (idx *Index) shouldSkip(isDir bool, isHidden bool, fullCombined string) bool {
-	// check inclusions first
-	if isDir && len(idx.Source.Config.Include.Folders) > 0 {
-		if !slices.Contains(idx.Source.Config.Include.Folders, fullCombined) {
-			return true
-		}
-	}
-	if !isDir && len(idx.Source.Config.Include.Files) > 0 {
-		if !slices.Contains(idx.Source.Config.Include.Files, fullCombined) {
-			return true
-		}
-	}
-
-	// check exclusions
-	if isDir && slices.Contains(idx.Source.Config.Exclude.Folders, fullCombined) {
-		return true
-	}
-	if !isDir && slices.Contains(idx.Source.Config.Exclude.Files, fullCombined) {
-		return true
-	}
-	if idx.Source.Config.IgnoreHidden && isHidden {
-		return true
-	}
-	return false
-}

backend/files/indexingSchedule.go

@@ -1,126 +0,0 @@
-package files
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
-)
-
-// schedule in minutes
-var scanSchedule = []time.Duration{
-	5 * time.Minute, // 5 minute quick scan & 25 minutes for a full scan
-	10 * time.Minute,
-	20 * time.Minute, // [3] element is 20 minutes, reset anchor for full scan
-	40 * time.Minute,
-	1 * time.Hour,
-	2 * time.Hour,
-	3 * time.Hour,
-	4 * time.Hour, // 4 hours for quick scan & 20 hours for a full scan
-}
-
-func (idx *Index) newScanner(origin string) {
-	fullScanAnchor := 3
-	fullScanCounter := 0 // every 5th scan is a full scan
-	for {
-		// Determine sleep time with modifiers
-		fullScanCounter++
-		sleepTime := scanSchedule[idx.currentSchedule] + idx.SmartModifier
-		if idx.assessment == "simple" {
-			sleepTime = scanSchedule[idx.currentSchedule] - idx.SmartModifier
-		}
-		if idx.Source.Config.IndexingInterval > 0 {
-			sleepTime = time.Duration(idx.Source.Config.IndexingInterval) * time.Minute
-		}
-
-		// Log and sleep before indexing
-		logger.Debug(fmt.Sprintf("Next scan in %v\n", sleepTime))
-		time.Sleep(sleepTime)
-
-		idx.scannerMu.Lock()
-		if fullScanCounter == 5 {
-			idx.RunIndexing(origin, false) // Full scan
-			fullScanCounter = 0
-		} else {
-			idx.RunIndexing(origin, true) // Quick scan
-		}
-		idx.scannerMu.Unlock()
-
-		// Adjust schedule based on file changes
-		if idx.FilesChangedDuringIndexing {
-			// Move to at least the full-scan anchor or reduce interval
-			if idx.currentSchedule > fullScanAnchor {
-				idx.currentSchedule = fullScanAnchor
-			} else if idx.currentSchedule > 0 {
-				idx.currentSchedule--
-			}
-		} else {
-			// Increment toward the longest interval if no changes
-			if idx.currentSchedule < len(scanSchedule)-1 {
-				idx.currentSchedule++
-			}
-		}
-		if idx.assessment == "simple" && idx.currentSchedule > 3 {
-			idx.currentSchedule = 3
-		}
-		// Ensure `currentSchedule` stays within bounds
-		if idx.currentSchedule < 0 {
-			idx.currentSchedule = 0
-		} else if idx.currentSchedule >= len(scanSchedule) {
-			idx.currentSchedule = len(scanSchedule) - 1
-		}
-	}
-}
-
-func (idx *Index) RunIndexing(origin string, quick bool) {
-	prevNumDirs := idx.NumDirs
-	prevNumFiles := idx.NumFiles
-	if quick {
-		logger.Debug("Starting quick scan")
-	} else {
-		logger.Debug("Starting full scan")
-		idx.NumDirs = 0
-		idx.NumFiles = 0
-	}
-	startTime := time.Now()
-	idx.FilesChangedDuringIndexing = false
-	// Perform the indexing operation
-	err := idx.indexDirectory("/", quick, true)
-	if err != nil {
-		logger.Error(fmt.Sprintf("Error during indexing: %v", err))
-	}
-	firstRun := idx.LastIndexed == time.Time{}
-	// Update the LastIndexed time
-	idx.LastIndexed = time.Now()
-	idx.indexingTime = int(time.Since(startTime).Seconds())
-	if !quick {
-		// update smart indexing
-		if idx.indexingTime < 3 || idx.NumDirs < 10000 {
-			idx.assessment = "simple"
-			idx.SmartModifier = 4 * time.Minute
-		} else if idx.indexingTime > 120 || idx.NumDirs > 500000 {
-			idx.assessment = "complex"
-			modifier := idx.indexingTime / 10 // seconds
-			idx.SmartModifier = time.Duration(modifier) * time.Minute
-		} else {
-			idx.assessment = "normal"
-		}
-		if firstRun {
-			logger.Info(fmt.Sprintf("Index assessment         : complexity=%v directories=%v files=%v", idx.assessment, idx.NumDirs, idx.NumFiles))
-		} else {
-			logger.Debug(fmt.Sprintf("Index assessment         : complexity=%v directories=%v files=%v", idx.assessment, idx.NumDirs, idx.NumFiles))
-		}
-		if idx.NumDirs != prevNumDirs || idx.NumFiles != prevNumFiles {
-			idx.FilesChangedDuringIndexing = true
-		}
-	}
-	if firstRun {
-		logger.Info(fmt.Sprintf("Time spent indexing      : %v seconds", idx.indexingTime))
-	} else {
-		logger.Debug(fmt.Sprintf("Time spent indexing      : %v seconds", idx.indexingTime))
-	}
-}
-
-func (idx *Index) setupIndexingScanners() {
-	go idx.newScanner("/")
-}

backend/files/indexing_test.go

@@ -7,46 +7,76 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
+	"github.com/gtsteffaniak/filebrowser/settings"
 )
 
 func BenchmarkFillIndex(b *testing.B) {
-	Initialize(settings.Source{
-		Name: "test",
-		Path: "/srv",
-	})
-	idx := GetIndex("test")
+	InitializeIndex(5, false)
+	si := GetIndex(settings.Config.Server.Root)
 	b.ResetTimer()
 	b.ReportAllocs()
 	for i := 0; i < b.N; i++ {
-		idx.createMockData(50, 3) // 1000 dirs, 3 files per dir
+		si.createMockData(50, 3) // 1000 dirs, 3 files per dir
 	}
 }
 
-func (idx *Index) createMockData(numDirs, numFilesPerDir int) {
+func (si *Index) createMockData(numDirs, numFilesPerDir int) {
 	for i := 0; i < numDirs; i++ {
-		dirPath := generateRandomPath(rand.Intn(3) + 1)
-		files := []ItemInfo{} // Slice of FileInfo
-
-		// Simulating files and directories with FileInfo
+		dirName := generateRandomPath(rand.Intn(3) + 1)
+		files := []File{}
+		// Append a new Directory to the slice
 		for j := 0; j < numFilesPerDir; j++ {
-			newFile := ItemInfo{
-				Name:    "file-" + getRandomTerm() + getRandomExtension(),
-				Size:    rand.Int63n(1000),                                          // Random size
-				ModTime: time.Now().Add(-time.Duration(rand.Intn(100)) * time.Hour), // Random mod time
-				Type:    "blob",
+			newFile := File{
+				Name:  "file-" + getRandomTerm() + getRandomExtension(),
+				IsDir: false,
 			}
 			files = append(files, newFile)
 		}
-		dirInfo := &FileInfo{
-			Path:  dirPath,
-			Files: files,
-		}
-
-		idx.UpdateMetadata(dirInfo)
+		si.UpdateQuickListForTests(files)
+		si.InsertFiles(dirName)
+		si.InsertDirs(dirName)
 	}
 }
 
+func generateRandomPath(levels int) string {
+	rand.New(rand.NewSource(time.Now().UnixNano()))
+	dirName := "srv"
+	for i := 0; i < levels; i++ {
+		dirName += "/" + getRandomTerm()
+	}
+	return dirName
+}
+
+func getRandomTerm() string {
+	wordbank := []string{
+		"hi", "test", "other", "name",
+		"cool", "things", "more", "items",
+	}
+	rand.New(rand.NewSource(time.Now().UnixNano()))
+
+	index := rand.Intn(len(wordbank))
+	return wordbank[index]
+}
+
+func getRandomExtension() string {
+	wordbank := []string{
+		".txt", ".mp3", ".mov", ".doc",
+		".mp4", ".bak", ".zip", ".jpg",
+	}
+	rand.New(rand.NewSource(time.Now().UnixNano()))
+	index := rand.Intn(len(wordbank))
+	return wordbank[index]
+}
+
+func generateRandomSearchTerms(numTerms int) []string {
+	// Generate random search terms
+	searchTerms := make([]string, numTerms)
+	for i := 0; i < numTerms; i++ {
+		searchTerms[i] = getRandomTerm()
+	}
+	return searchTerms
+}
+
 // JSONBytesEqual compares the JSON in two byte slices.
 func JSONBytesEqual(a, b []byte) (bool, error) {
 	var j, j2 interface{}
@@ -75,148 +105,36 @@ func TestGetIndex(t *testing.T) {
 	}
 }
 
-func TestMakeIndexPath(t *testing.T) {
+func TestInitializeIndex(t *testing.T) {
+	type args struct {
+		intervalMinutes uint32
+	}
 	tests := []struct {
-		name     string
-		subPath  string
-		expected string
+		name string
+		args args
 	}{
-		// Linux
-		{"Root path returns slash", "/", "/"},
-		{"Dot-prefixed returns slash", ".", "/"},
-		{"Double-dot prefix ignored", "./", "/"},
-		{"Dot prefix followed by text", "./test", "/test"},
-		{"Dot prefix followed by text", ".test", "/.test"},
-		{"Hidden file at root", "/.test", "/.test"},
-		{"Trailing slash removed", "/test/", "/test"},
-		{"Subpath without root prefix", "/other/test", "/other/test"},
-		{"Complex nested paths", "/nested/path", "/nested/path"},
+		// TODO: Add test cases.
 	}
-
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			idx := &Index{Source: settings.Source{Path: "/"}}
-			result := idx.makeIndexPath(tt.subPath)
-			if result != tt.expected {
-				t.Errorf("makeIndexPath(%q)\ngot %q\nwant %q", tt.name, result, tt.expected)
-			}
-		})
-	}
-
-	tests = []struct {
-		name     string
-		subPath  string
-		expected string
-	}{
-		// Windows
-		{"Mixed slash", "/first\\second", "/first/second"},
-		{"Windows slash", "\\first\\second", "/first/second"},
-		{"Windows full path", "C:\\Users\\testfolder\\nestedfolder", "/testfolder/nestedfolder"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			idx := &Index{Source: settings.Source{Path: "C:\\Users"}}
-			result := idx.makeIndexPath(tt.subPath)
-			if result != tt.expected {
-				t.Errorf("makeIndexPath(%q)\ngot %q\nwant %q", tt.name, result, tt.expected)
-			}
+			InitializeIndex(tt.args.intervalMinutes, false)
 		})
 	}
 }
 
-func TestMakeIndexPathRoot(t *testing.T) {
-	tests := []struct {
-		name     string
-		subPath  string
-		expected string
-	}{
-		// Linux
-		{"Root path returns slash", "/rootpath", "/"},
+func Test_indexingScheduler(t *testing.T) {
+	type args struct {
+		intervalMinutes uint32
+	}
+	tests := []struct {
+		name string
+		args args
+	}{
+		// TODO: Add test cases.
 	}
-
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			idx := &Index{Source: settings.Source{Path: "/rootpath", Name: "default"}}
-			result := idx.makeIndexPath(tt.subPath)
-			if result != tt.expected {
-				t.Errorf("makeIndexPath(%q)\ngot %q\nwant %q", tt.name, result, tt.expected)
-			}
+			indexingScheduler(tt.args.intervalMinutes)
 		})
 	}
 }
-
-func BenchmarkCheckIndexExclude(b *testing.B) {
-	tests := []struct {
-		isDir    bool
-		isHidden bool
-		fullPath string
-	}{
-		{false, false, "/test/.test"},
-		{true, false, "/test/.test"},
-		{true, true, "/test/.test"},
-		{false, false, "/test/filepath"},
-		{false, true, "/test/filepath"},
-		{true, true, "/test/filepath"},
-	}
-
-	b.ResetTimer()
-	b.ReportAllocs()
-	idx := Index{
-		Source: settings.Source{
-			Name: "files",
-			Config: settings.IndexConfig{
-				IgnoreHidden: true,
-				Exclude: settings.IndexFilter{
-					Files:        []string{"test", "filepath", ".test", ".filepath", "test", "filepath", ".test", ".filepath"},
-					Folders:      []string{"test", "filepath", ".test", ".filepath", "test", "filepath", ".test", ".filepath"},
-					FileEndsWith: []string{".zip", ".tar", ".jpeg"},
-				},
-			},
-		},
-	}
-
-	for i := 0; i < b.N; i++ {
-		for _, v := range tests {
-			idx.shouldSkip(v.isDir, v.isHidden, v.fullPath)
-		}
-	}
-
-}
-func BenchmarkCheckIndexConditionsInclude(b *testing.B) {
-	tests := []struct {
-		isDir    bool
-		isHidden bool
-		fullPath string
-	}{
-		{false, false, "/test/.test"},
-		{true, false, "/test/.test"},
-		{true, true, "/test/.test"},
-		{false, false, "/test/filepath"},
-		{false, true, "/test/filepath"},
-		{true, true, "/test/filepath"},
-	}
-
-	b.ResetTimer()
-	b.ReportAllocs()
-	idx2 := Index{
-		Source: settings.Source{
-			Name: "files",
-			Config: settings.IndexConfig{
-				IgnoreHidden: true,
-				Include: settings.IndexFilter{
-					Files:        []string{"test", "filepath", ".test", ".filepath", "test", "filepath", ".test", ".filepath"},
-					Folders:      []string{"test", "filepath", ".test", ".filepath", "test", "filepath", ".test", ".filepath"},
-					FileEndsWith: []string{".zip", ".tar", ".jpeg"},
-				},
-			},
-		},
-	}
-
-	for i := 0; i < b.N; i++ {
-		for _, v := range tests {
-			idx2.shouldSkip(v.isDir, v.isHidden, v.fullPath)
-		}
-	}
-
-}

backend/files/mockIndexing.go

@@ -1,71 +0,0 @@
-package files
-
-import (
-	"time"
-
-	"math/rand"
-)
-
-func CreateMockData(numDirs, numFilesPerDir int) FileInfo {
-	dir := FileInfo{}
-	dir.Path = "/here/is/your/mock/dir"
-	for i := 0; i < numDirs; i++ {
-		newFile := ItemInfo{
-			Name:    "file-" + getRandomTerm() + getRandomExtension(),
-			Size:    rand.Int63n(1000),                                          // Random size
-			ModTime: time.Now().Add(-time.Duration(rand.Intn(100)) * time.Hour), // Random mod time
-			Type:    "blob",
-		}
-		dir.Folders = append(dir.Folders, newFile)
-	}
-	// Simulating files and directories with FileInfo
-	for j := 0; j < numFilesPerDir; j++ {
-		newFile := ItemInfo{
-			Name:    "file-" + getRandomTerm() + getRandomExtension(),
-			Size:    rand.Int63n(1000),                                          // Random size
-			ModTime: time.Now().Add(-time.Duration(rand.Intn(100)) * time.Hour), // Random mod time
-			Type:    "blob",
-		}
-		dir.Files = append(dir.Files, newFile)
-	}
-	return dir
-}
-
-func generateRandomPath(levels int) string {
-	rand.New(rand.NewSource(time.Now().UnixNano()))
-	dirName := "srv"
-	for i := 0; i < levels; i++ {
-		dirName += "/" + getRandomTerm()
-	}
-	return dirName
-}
-
-func getRandomTerm() string {
-	wordbank := []string{
-		"hi", "test", "other", "name",
-		"cool", "things", "more", "items",
-	}
-	rand.New(rand.NewSource(time.Now().UnixNano()))
-
-	index := rand.Intn(len(wordbank))
-	return wordbank[index]
-}
-
-func getRandomExtension() string {
-	wordbank := []string{
-		".txt", ".mp3", ".mov", ".doc",
-		".mp4", ".bak", ".zip", ".jpg",
-	}
-	rand.New(rand.NewSource(time.Now().UnixNano()))
-	index := rand.Intn(len(wordbank))
-	return wordbank[index]
-}
-
-func generateRandomSearchTerms(numTerms int) []string {
-	// Generate random search terms
-	searchTerms := make([]string, numTerms)
-	for i := 0; i < numTerms; i++ {
-		searchTerms[i] = getRandomTerm()
-	}
-	return searchTerms
-}

backend/files/search.go

@@ -1,12 +1,13 @@
 package files
 
 import (
+	"math/rand"
+	"os"
 	"path/filepath"
 	"sort"
 	"strings"
 	"sync"
-
-	"github.com/gtsteffaniak/filebrowser/backend/utils"
+	"time"
 )
 
 var (
@@ -14,169 +15,160 @@ var (
 	maxSearchResults  = 100
 )
 
-type SearchResult struct {
-	Path string `json:"path"`
-	Type string `json:"type"`
-	Size int64  `json:"size"`
-}
-
-func (idx *Index) Search(search string, scope string, sourceSession string) []SearchResult {
+func (si *Index) Search(search string, scope string, sourceSession string) ([]string, map[string]map[string]bool) {
 	// Remove slashes
-	scope = idx.makeIndexPath(scope)
-	runningHash := utils.GenerateRandomHash(4)
+	scope = strings.TrimLeft(scope, "/")
+	scope = strings.TrimRight(scope, "/")
+	runningHash := generateRandomHash(4)
 	sessionInProgress.Store(sourceSession, runningHash) // Store the value in the sync.Map
 	searchOptions := ParseSearch(search)
-	results := make(map[string]SearchResult, 0)
+	fileListTypes := make(map[string]map[string]bool)
+	matching := []string{}
 	count := 0
-	var directories []string
-	cachedDirs, ok := utils.SearchResultsCache.Get(idx.Source.Path + scope).([]string)
-	if ok {
-		directories = cachedDirs
-	} else {
-		directories = idx.getDirsInScope(scope)
-		utils.SearchResultsCache.Set(idx.Source.Path+scope, directories)
-	}
 	for _, searchTerm := range searchOptions.Terms {
 		if searchTerm == "" {
 			continue
 		}
-		if count > maxSearchResults {
-			break
-		}
-		idx.mu.Lock()
-		for _, dirName := range directories {
-			scopedPath := strings.TrimPrefix(strings.TrimPrefix(dirName, scope), "/") + "/"
-			idx.mu.Unlock()
-			dir, found := idx.GetReducedMetadata(dirName, true)
-			idx.mu.Lock()
-			if !found {
-				continue
+		si.mu.Lock()
+		defer si.mu.Unlock()
+		for dirName, dir := range si.Directories {
+			isDir := true
+			files := strings.Split(dir.Files, ";")
+			value, found := sessionInProgress.Load(sourceSession)
+			if !found || value != runningHash {
+				return []string{}, map[string]map[string]bool{}
 			}
 			if count > maxSearchResults {
 				break
 			}
-			reducedDir := ItemInfo{
-				Name: filepath.Base(dirName),
-				Type: "directory",
-				Size: dir.Size,
+			pathName := scopedPathNameFilter(dirName, scope, isDir)
+			if pathName == "" {
+				continue // path not matched
 			}
-			matches := reducedDir.containsSearchTerm(searchTerm, searchOptions)
+			fileTypes := map[string]bool{}
+			matches, fileType := containsSearchTerm(dirName, searchTerm, *searchOptions, isDir, fileTypes)
 			if matches {
-				results[scopedPath] = SearchResult{Path: scopedPath, Type: "directory", Size: dir.Size}
+				fileListTypes[pathName] = fileType
+				matching = append(matching, pathName)
 				count++
 			}
-			// search files first
-			for _, item := range dir.Files {
-				fullPath := dirName + "/" + item.Name
-				scopedPath := strings.TrimPrefix(strings.TrimPrefix(fullPath, scope), "/")
-				if item.Type == "directory" {
-					scopedPath += "/"
+			isDir = false
+			for _, file := range files {
+				if file == "" {
+					continue
 				}
 				value, found := sessionInProgress.Load(sourceSession)
 				if !found || value != runningHash {
-					idx.mu.Unlock()
-					return []SearchResult{}
+					return []string{}, map[string]map[string]bool{}
 				}
+
 				if count > maxSearchResults {
 					break
 				}
-				matches := item.containsSearchTerm(searchTerm, searchOptions)
-				if matches {
-					results[scopedPath] = SearchResult{Path: scopedPath, Type: item.Type, Size: item.Size}
-					count++
+				fullName := pathName + file
+				fileTypes := map[string]bool{}
+
+				matches, fileType := containsSearchTerm(fullName, searchTerm, *searchOptions, isDir, fileTypes)
+				if !matches {
+					continue
 				}
+				fileListTypes[fullName] = fileType
+				matching = append(matching, fullName)
+				count++
 			}
 		}
-		idx.mu.Unlock()
-	}
-
-	// Sort keys based on the number of elements in the path after splitting by "/"
-	sortedKeys := make([]SearchResult, 0, len(results))
-	for _, v := range results {
-		sortedKeys = append(sortedKeys, v)
 	}
 	// Sort the strings based on the number of elements after splitting by "/"
-	sort.Slice(sortedKeys, func(i, j int) bool {
-		parts1 := strings.Split(sortedKeys[i].Path, "/")
-		parts2 := strings.Split(sortedKeys[j].Path, "/")
+	sort.Slice(matching, func(i, j int) bool {
+		parts1 := strings.Split(matching[i], "/")
+		parts2 := strings.Split(matching[j], "/")
 		return len(parts1) < len(parts2)
 	})
-	return sortedKeys
+	return matching, fileListTypes
 }
 
-// returns true if the file name contains the search term
-// returns file type if the file name contains the search term
-// returns size of file/dir if the file name contains the search term
-func (fi ItemInfo) containsSearchTerm(searchTerm string, options SearchOptions) bool {
+func scopedPathNameFilter(pathName string, scope string, isDir bool) string {
+	pathName = strings.TrimLeft(pathName, "/")
+	pathName = strings.TrimRight(pathName, "/")
+	if strings.HasPrefix(pathName, scope) || scope == "" {
+		pathName = strings.TrimPrefix(pathName, scope)
+		pathName = strings.TrimLeft(pathName, "/")
+		if isDir {
+			pathName = pathName + "/"
+		}
+	} else {
+		pathName = "" // return not matched
+	}
+	return pathName
+}
 
-	fileTypes := map[string]bool{}
-	largerThan := int64(options.LargerThan) * 1024 * 1024
-	smallerThan := int64(options.SmallerThan) * 1024 * 1024
+func containsSearchTerm(pathName string, searchTerm string, options SearchOptions, isDir bool, fileTypes map[string]bool) (bool, map[string]bool) {
 	conditions := options.Conditions
-	lowerFileName := strings.ToLower(fi.Name)
-
-	// Convert to lowercase if not exact match
+	path := getLastPathComponent(pathName)
+	// Convert to lowercase once
 	if !conditions["exact"] {
+		path = strings.ToLower(path)
 		searchTerm = strings.ToLower(searchTerm)
 	}
-
-	// Check if the file name contains the search term
-	if !strings.Contains(lowerFileName, searchTerm) {
-		return false
-	}
-
-	// Initialize file size and fileTypes map
-	var fileSize int64
-	extension := filepath.Ext(lowerFileName)
-
-	// Collect file types
-	for _, k := range AllFiletypeOptions {
-		if IsMatchingType(extension, k) {
-			fileTypes[k] = true
+	if strings.Contains(path, searchTerm) {
+		// Calculate fileSize only if needed
+		var fileSize int64
+		matchesAllConditions := true
+		extension := filepath.Ext(path)
+		for _, k := range AllFiletypeOptions {
+			if IsMatchingType(extension, k) {
+				fileTypes[k] = true
+			}
 		}
-	}
-	isDir := fi.Type == "directory"
-	fileTypes["dir"] = isDir
-	fileSize = fi.Size
-
-	// Evaluate all conditions
-	for t, v := range conditions {
-		if t == "exact" {
-			continue
-		}
-		switch t {
-		case "larger":
-			if largerThan > 0 {
-				if fileSize <= largerThan {
-					return false
+		fileTypes["dir"] = isDir
+		for t, v := range conditions {
+			if t == "exact" {
+				continue
+			}
+			var matchesCondition bool
+			switch t {
+			case "larger":
+				if fileSize == 0 {
+					fileSize = getFileSize(pathName)
 				}
-			}
-		case "smaller":
-			if smallerThan > 0 {
-				if fileSize >= smallerThan {
-					return false
+				matchesCondition = fileSize > int64(options.LargerThan)*bytesInMegabyte
+			case "smaller":
+				if fileSize == 0 {
+					fileSize = getFileSize(pathName)
 				}
+				matchesCondition = fileSize < int64(options.SmallerThan)*bytesInMegabyte
+			default:
+				matchesCondition = v == fileTypes[t]
 			}
-		default:
-			// Handle other file type conditions
-			notMatchType := v != fileTypes[t]
-			if notMatchType {
-				return false
+			if !matchesCondition {
+				matchesAllConditions = false
 			}
 		}
+		return matchesAllConditions, fileTypes
 	}
-
-	return true
+	// Clear variables and return
+	return false, map[string]bool{}
 }
 
-func (idx *Index) getDirsInScope(scope string) []string {
-	newList := []string{}
-	idx.mu.Lock()
-	defer idx.mu.Unlock()
-	for k := range idx.Directories {
-		if strings.HasPrefix(k, scope) || scope == "" {
-			newList = append(newList, k)
-		}
+func getFileSize(filepath string) int64 {
+	fileInfo, err := os.Stat(rootPath + "/" + filepath)
+	if err != nil {
+		return 0
 	}
-	return newList
+	return fileInfo.Size()
+}
+
+func getLastPathComponent(path string) string {
+	// Use filepath.Base to extract the last component of the path
+	return filepath.Base(path)
+}
+
+func generateRandomHash(length int) string {
+	const charset = "abcdefghijklmnopqrstuvwxyz0123456789"
+	rand.New(rand.NewSource(time.Now().UnixNano()))
+	result := make([]byte, length)
+	for i := range result {
+		result[i] = charset[rand.Intn(len(charset))]
+	}
+	return string(result)
 }

backend/files/search_test.go

@@ -4,15 +4,14 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/stretchr/testify/assert"
 )
 
 func BenchmarkSearchAllIndexes(b *testing.B) {
-	Initialize(settings.Source{Name: "test", Path: "/srv"})
-	idx := GetIndex("test")
+	InitializeIndex(5, false)
+	si := GetIndex(rootPath)
 
-	idx.createMockData(50, 3) // 50 dirs, 3 files per dir
+	si.createMockData(50, 3) // 1000 dirs, 3 files per dir
 
 	// Generate 100 random search terms
 	searchTerms := generateRandomSearchTerms(100)
@@ -22,204 +21,276 @@ func BenchmarkSearchAllIndexes(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		// Execute the SearchAllIndexes function
 		for _, term := range searchTerms {
-			idx.Search(term, "/", "test")
+			si.Search(term, "/", "test")
 		}
 	}
 }
 
+// loop over test files and compare output
 func TestParseSearch(t *testing.T) {
-	tests := []struct {
-		input string
-		want  SearchOptions
-	}{
-		{
-			input: "my test search",
-			want: SearchOptions{
-				Conditions: map[string]bool{"exact": false},
-				Terms:      []string{"my test search"},
-			},
-		},
-		{
-			input: "case:exact my|test|search",
-			want: SearchOptions{
-				Conditions: map[string]bool{"exact": true},
-				Terms:      []string{"my", "test", "search"},
-			},
-		},
-		{
-			input: "type:largerThan=100 type:smallerThan=1000 test",
-			want: SearchOptions{
-				Conditions:  map[string]bool{"exact": false, "larger": true, "smaller": true},
-				Terms:       []string{"test"},
-				LargerThan:  100,
-				SmallerThan: 1000,
-			},
-		},
-		{
-			input: "type:audio thisfile",
-			want: SearchOptions{
-				Conditions: map[string]bool{"exact": false, "audio": true},
-				Terms:      []string{"thisfile"},
-			},
+	value := ParseSearch("my test search")
+	want := &SearchOptions{
+		Conditions: map[string]bool{
+			"exact": false,
 		},
+		Terms: []string{"my test search"},
 	}
-
-	for _, tt := range tests {
-		t.Run(tt.input, func(t *testing.T) {
-			value := ParseSearch(tt.input)
-			if !reflect.DeepEqual(value, tt.want) {
-				t.Fatalf("\n got:  %+v\n want: %+v", value, tt.want)
-			}
-		})
+	if !reflect.DeepEqual(value, want) {
+		t.Fatalf("\n got:  %+v\n want: %+v", value, want)
+	}
+	value = ParseSearch("case:exact my|test|search")
+	want = &SearchOptions{
+		Conditions: map[string]bool{
+			"exact": true,
+		},
+		Terms: []string{"my", "test", "search"},
+	}
+	if !reflect.DeepEqual(value, want) {
+		t.Fatalf("\n got:  %+v\n want: %+v", value, want)
+	}
+	value = ParseSearch("type:largerThan=100 type:smallerThan=1000 test")
+	want = &SearchOptions{
+		Conditions: map[string]bool{
+			"exact":  false,
+			"larger": true,
+		},
+		Terms:       []string{"test"},
+		LargerThan:  100,
+		SmallerThan: 1000,
+	}
+	if !reflect.DeepEqual(value, want) {
+		t.Fatalf("\n got:  %+v\n want: %+v", value, want)
+	}
+	value = ParseSearch("type:audio thisfile")
+	want = &SearchOptions{
+		Conditions: map[string]bool{
+			"exact": false,
+			"audio": true,
+		},
+		Terms: []string{"thisfile"},
+	}
+	if !reflect.DeepEqual(value, want) {
+		t.Fatalf("\n got:  %+v\n want: %+v", value, want)
 	}
 }
 
 func TestSearchWhileIndexing(t *testing.T) {
-	Initialize(settings.Source{Name: "test", Path: "/srv"})
-	idx := GetIndex("test")
-
+	InitializeIndex(5, false)
+	si := GetIndex(rootPath)
+	// Generate 100 random search terms
+	// Generate 100 random search terms
 	searchTerms := generateRandomSearchTerms(10)
 	for i := 0; i < 5; i++ {
-		go idx.createMockData(100, 100) // Creating mock data concurrently
+		// Execute the SearchAllIndexes function
+		go si.createMockData(100, 100) // 1000 dirs, 3 files per dir
 		for _, term := range searchTerms {
-			go idx.Search(term, "/", "test") // Search concurrently
+			go si.Search(term, "/", "test")
 		}
 	}
 }
 
 func TestSearchIndexes(t *testing.T) {
 	index := Index{
-		Directories: map[string]*FileInfo{
-			"/test":      {Files: []ItemInfo{{Name: "audio1.wav", Type: "audio"}}},
-			"/test/path": {Files: []ItemInfo{{Name: "file.txt", Type: "text"}}},
-			"/new/test": {Files: []ItemInfo{
-				{Name: "audio.wav", Type: "audio"},
-				{Name: "video.mp4", Type: "video"},
-				{Name: "video.MP4", Type: "video"},
-			}},
-			"/new/test/path": {Files: []ItemInfo{{Name: "archive.zip", Type: "archive"}}},
-			"/firstDir": {
-				Files: []ItemInfo{
-					{Name: "archive.zip", Size: 100, Type: "archive"},
-				},
-				Folders: []ItemInfo{
-					{Name: "thisIsDir", Type: "directory", Size: 2 * 1024 * 1024},
-				},
+		Directories: map[string]Directory{
+			"test": {
+				Files: "audio1.wav;",
 			},
-			"/firstDir/thisIsDir": {
-				Files: []ItemInfo{
-					{Name: "hi.txt", Type: "text"},
-				},
-				ItemInfo: ItemInfo{
-					Size: 2 * 1024 * 1024,
-				},
+			"test/path": {
+				Files: "file.txt;",
+			},
+			"new": {},
+			"new/test": {
+				Files: "audio.wav;video.mp4;video.MP4;",
+			},
+			"new/test/path": {
+				Files: "archive.zip;",
 			},
 		},
 	}
-
 	tests := []struct {
 		search         string
 		scope          string
-		expectedResult []SearchResult
+		expectedResult []string
+		expectedTypes  map[string]map[string]bool
 	}{
 		{
-			search: "audio",
-			scope:  "/new/",
-			expectedResult: []SearchResult{
-				{
-					Path: "test/audio.wav",
-					Type: "audio",
-					Size: 0,
-				},
+			search:         "audio",
+			scope:          "/new/",
+			expectedResult: []string{"test/audio.wav"},
+			expectedTypes: map[string]map[string]bool{
+				"test/audio.wav": map[string]bool{"audio": true, "dir": false},
 			},
 		},
 		{
-			search: "test",
-			scope:  "/",
-			expectedResult: []SearchResult{
-				{
-					Path: "test/",
-					Type: "directory",
-					Size: 0,
-				},
-				{
-					Path: "new/test/",
-					Type: "directory",
-					Size: 0,
-				},
+			search:         "test",
+			scope:          "/",
+			expectedResult: []string{"test/", "new/test/"},
+			expectedTypes: map[string]map[string]bool{
+				"test/":     map[string]bool{"dir": true},
+				"new/test/": map[string]bool{"dir": true},
 			},
 		},
 		{
-			search: "archive",
-			scope:  "/",
-			expectedResult: []SearchResult{
-				{
-					Path: "firstDir/archive.zip",
-					Type: "archive",
-					Size: 100,
-				},
-				{
-					Path: "new/test/path/archive.zip",
-					Type: "archive",
-					Size: 0,
-				},
-			},
-		},
-		{
-			search: "arch",
-			scope:  "/firstDir",
-			expectedResult: []SearchResult{
-				{
-					Path: "archive.zip",
-					Type: "archive",
-					Size: 100,
-				},
-			},
-		},
-		{
-			search: "isdir",
-			scope:  "/",
-			expectedResult: []SearchResult{
-				{
-					Path: "firstDir/thisIsDir/",
-					Type: "directory",
-					Size: 2097152,
-				},
-			},
-		},
-		{
-			search: "IsDir type:largerThan=1",
-			scope:  "/",
-			expectedResult: []SearchResult{
-				{
-					Path: "firstDir/thisIsDir/",
-					Type: "directory",
-					Size: 2097152,
-				},
+			search:         "archive",
+			scope:          "/",
+			expectedResult: []string{"new/test/path/archive.zip"},
+			expectedTypes: map[string]map[string]bool{
+				"new/test/path/archive.zip": map[string]bool{"archive": true, "dir": false},
 			},
 		},
 		{
 			search: "video",
 			scope:  "/",
-			expectedResult: []SearchResult{
-				{
-					Path: "new/test/video.MP4",
-					Type: "video",
-					Size: 0,
-				},
-				{
-					Path: "new/test/video.mp4",
-					Type: "video",
-					Size: 0,
-				},
+			expectedResult: []string{
+				"new/test/video.mp4",
+				"new/test/video.MP4",
+			},
+			expectedTypes: map[string]map[string]bool{
+				"new/test/video.MP4": map[string]bool{"video": true, "dir": false},
+				"new/test/video.mp4": map[string]bool{"video": true, "dir": false},
 			},
 		},
 	}
-
 	for _, tt := range tests {
 		t.Run(tt.search, func(t *testing.T) {
-			result := index.Search(tt.search, tt.scope, "")
-			assert.ElementsMatch(t, tt.expectedResult, result)
+			actualResult, actualTypes := index.Search(tt.search, tt.scope, "")
+			assert.Equal(t, tt.expectedResult, actualResult)
+			if !reflect.DeepEqual(tt.expectedTypes, actualTypes) {
+				t.Fatalf("\n got:  %+v\n want: %+v", actualTypes, tt.expectedTypes)
+			}
+		})
+	}
+}
+
+func Test_scopedPathNameFilter(t *testing.T) {
+	tests := []struct {
+		name string
+		args struct {
+			pathName string
+			scope    string
+			isDir    bool // Assuming isDir should be included in args
+		}
+		want string
+	}{
+		{
+			name: "scope test",
+			args: struct {
+				pathName string
+				scope    string
+				isDir    bool
+			}{
+				pathName: "/",
+				scope:    "/",
+				isDir:    false,
+			},
+			want: "", // Update this with the expected result
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := scopedPathNameFilter(tt.args.pathName, tt.args.scope, tt.args.isDir); got != tt.want {
+				t.Errorf("scopedPathNameFilter() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_isDoc(t *testing.T) {
+	type args struct {
+		extension string
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := isDoc(tt.args.extension); got != tt.want {
+				t.Errorf("isDoc() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_getFileSize(t *testing.T) {
+	type args struct {
+		filepath string
+	}
+	tests := []struct {
+		name string
+		args args
+		want int64
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := getFileSize(tt.args.filepath); got != tt.want {
+				t.Errorf("getFileSize() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_isArchive(t *testing.T) {
+	type args struct {
+		extension string
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := isArchive(tt.args.extension); got != tt.want {
+				t.Errorf("isArchive() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_getLastPathComponent(t *testing.T) {
+	type args struct {
+		path string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := getLastPathComponent(tt.args.path); got != tt.want {
+				t.Errorf("getLastPathComponent() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_generateRandomHash(t *testing.T) {
+	type args struct {
+		length int
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := generateRandomHash(tt.args.length); got != tt.want {
+				t.Errorf("generateRandomHash() = %v, want %v", got, tt.want)
+			}
 		})
 	}
 }

backend/files/sync.go

@@ -1,75 +1,172 @@
 package files
 
 import (
-	"path/filepath"
+	"io/fs"
+	"log"
+	"time"
+
+	"github.com/gtsteffaniak/filebrowser/settings"
 )
 
+// GetFileMetadata retrieves the FileInfo from the specified directory in the index.
+func (si *Index) GetFileMetadata(adjustedPath string) (FileInfo, bool) {
+	si.mu.RLock()
+	dir, exists := si.Directories[adjustedPath]
+	si.mu.RUnlock()
+	if exists {
+		// Initialize the Metadata map if it is nil
+		if dir.Metadata == nil {
+			dir.Metadata = make(map[string]FileInfo)
+			si.SetDirectoryInfo(adjustedPath, dir)
+			return FileInfo{}, false
+		} else {
+			return dir.Metadata[adjustedPath], true
+		}
+	}
+	return FileInfo{}, false
+}
+
 // UpdateFileMetadata updates the FileInfo for the specified directory in the index.
-func (idx *Index) UpdateMetadata(info *FileInfo) bool {
-	idx.mu.Lock()
-	defer idx.mu.Unlock()
-	idx.Directories[info.Path] = info
+func (si *Index) UpdateFileMetadata(adjustedPath string, info FileInfo) bool {
+	si.mu.Lock()
+	defer si.mu.Unlock()
+	dir, exists := si.Directories[adjustedPath]
+	if !exists {
+		// Initialize the Metadata map if it is nil
+		if dir.Metadata == nil {
+			dir.Metadata = make(map[string]FileInfo)
+		}
+		si.Directories[adjustedPath] = dir
+		// Release the read lock before calling SetFileMetadata
+	}
+	return si.SetFileMetadata(adjustedPath, info)
+}
+
+// SetFileMetadata sets the FileInfo for the specified directory in the index.
+// internal use only
+func (si *Index) SetFileMetadata(adjustedPath string, info FileInfo) bool {
+
+	_, exists := si.Directories[adjustedPath]
+	if !exists {
+		return false
+	}
+	info.CacheTime = time.Now()
+	si.Directories[adjustedPath].Metadata[adjustedPath] = info
 	return true
 }
 
 // GetMetadataInfo retrieves the FileInfo from the specified directory in the index.
-func (idx *Index) GetReducedMetadata(target string, isDir bool) (*FileInfo, bool) {
-	idx.mu.Lock()
-	defer idx.mu.Unlock()
-	checkDir := idx.makeIndexPath(target)
-	if !isDir {
-		checkDir = idx.makeIndexPath(filepath.Dir(target))
-	}
-	dir, exists := idx.Directories[checkDir]
-	if !exists {
-		return nil, false
+func (si *Index) GetMetadataInfo(adjustedPath string) (FileInfo, bool) {
+	si.mu.RLock()
+	dir, exists := si.Directories[adjustedPath]
+	si.mu.RUnlock()
+	if exists {
+		// Initialize the Metadata map if it is nil
+		if dir.Metadata == nil {
+			dir.Metadata = make(map[string]FileInfo)
+			si.SetDirectoryInfo(adjustedPath, dir)
+		}
+		info, metadataExists := dir.Metadata[adjustedPath]
+		return info, metadataExists
 	}
+	return FileInfo{}, false
+}
 
-	if isDir {
+// SetDirectoryInfo sets the directory information in the index.
+func (si *Index) SetDirectoryInfo(adjustedPath string, dir Directory) {
+	si.mu.Lock()
+	si.Directories[adjustedPath] = dir
+	si.mu.Unlock()
+}
+
+// SetDirectoryInfo sets the directory information in the index.
+func (si *Index) GetDirectoryInfo(adjustedPath string) (Directory, bool) {
+	si.mu.RLock()
+	dir, exists := si.Directories[adjustedPath]
+	si.mu.RUnlock()
+	if exists {
 		return dir, true
 	}
-	// handle file
-	if checkDir == "/" {
-		checkDir = ""
+	return Directory{}, false
+}
+
+func (si *Index) RemoveDirectory(path string) {
+	si.mu.Lock()
+	defer si.mu.Unlock()
+	delete(si.Directories, path)
+}
+
+func (si *Index) UpdateCount(given string) {
+	si.mu.Lock()
+	defer si.mu.Unlock()
+	if given == "files" {
+		si.NumFiles++
+	} else if given == "dirs" {
+		si.NumDirs++
+	} else {
+		log.Println("could not update unknown type: ", given)
 	}
-	baseName := filepath.Base(target)
-	for _, item := range dir.Files {
-		if item.Name == baseName {
-			return &FileInfo{
-				Path:     checkDir + "/" + item.Name,
-				ItemInfo: item,
-			}, true
+}
+
+func (si *Index) resetCount() {
+	si.mu.Lock()
+	defer si.mu.Unlock()
+	si.NumDirs = 0
+	si.NumFiles = 0
+	si.inProgress = true
+}
+
+func GetIndex(root string) *Index {
+	for _, index := range indexes {
+		if index.Root == root {
+			return index
 		}
 	}
-	return nil, false
-
-}
-
-// GetMetadataInfo retrieves the FileInfo from the specified directory in the index.
-func (idx *Index) GetMetadataInfo(target string, isDir bool) (*FileInfo, bool) {
-	idx.mu.RLock()
-	defer idx.mu.RUnlock()
-	checkDir := idx.makeIndexPath(target)
-	if !isDir {
-		checkDir = idx.makeIndexPath(filepath.Dir(target))
+	if settings.Config.Server.Root != "" {
+		rootPath = settings.Config.Server.Root
+	}
+	newIndex := &Index{
+		Root:        rootPath,
+		Directories: make(map[string]Directory), // Initialize the map
+		NumDirs:     0,
+		NumFiles:    0,
+		inProgress:  false,
 	}
-	dir, exists := idx.Directories[checkDir]
-	return dir, exists
-}
-
-func (idx *Index) RemoveDirectory(path string) {
-	idx.mu.Lock()
-	defer idx.mu.Unlock()
-	idx.NumDeleted++
-	delete(idx.Directories, path)
-}
-
-func GetIndex(name string) *Index {
 	indexesMutex.Lock()
-	defer indexesMutex.Unlock()
-	index, ok := indexes[name]
-	if !ok {
-		return nil
-	}
-	return index
+	indexes = append(indexes, newIndex)
+	indexesMutex.Unlock()
+	return newIndex
+}
+
+func (si *Index) UpdateQuickList(files []fs.FileInfo) {
+	si.mu.Lock()
+	defer si.mu.Unlock()
+	si.quickList = []File{}
+	for _, file := range files {
+		newFile := File{
+			Name:  file.Name(),
+			IsDir: file.IsDir(),
+		}
+		si.quickList = append(si.quickList, newFile)
+	}
+}
+
+func (si *Index) UpdateQuickListForTests(files []File) {
+	si.mu.Lock()
+	defer si.mu.Unlock()
+	si.quickList = []File{}
+	for _, file := range files {
+		newFile := File{
+			Name:  file.Name,
+			IsDir: file.IsDir,
+		}
+		si.quickList = append(si.quickList, newFile)
+	}
+}
+
+func (si *Index) GetQuickList() []File {
+	si.mu.Lock()
+	defer si.mu.Unlock()
+	newQuickList := si.quickList
+	return newQuickList
 }

backend/files/sync_test.go

@@ -1,244 +0,0 @@
-package files
-
-import (
-	"testing"
-
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/stretchr/testify/assert"
-)
-
-var testIndex Index
-
-// Test for GetFileMetadata// Test for GetFileMetadata
-func TestGetFileMetadataSize(t *testing.T) {
-	t.Parallel()
-	tests := []struct {
-		name         string
-		adjustedPath string
-		expectedName string
-		expectedSize int64
-	}{
-		{
-			name:         "testpath exists",
-			adjustedPath: "/testpath",
-			expectedName: "testfile.txt",
-			expectedSize: 100,
-		},
-		{
-			name:         "testpath exists",
-			adjustedPath: "/testpath",
-			expectedName: "directory",
-			expectedSize: 100,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			fileInfo, _ := testIndex.GetReducedMetadata(tt.adjustedPath, true)
-			// Iterate over fileInfo.Items to look for expectedName
-			for _, item := range fileInfo.Files {
-				// Assert the existence and the name
-				if item.Name == tt.expectedName {
-					assert.Equal(t, tt.expectedSize, item.Size)
-					break
-				}
-			}
-		})
-	}
-}
-
-// Test for GetFileMetadata// Test for GetFileMetadata
-func TestGetFileMetadata(t *testing.T) {
-	t.Parallel()
-	tests := []struct {
-		name           string
-		adjustedPath   string
-		expectedName   string
-		expectedExists bool
-		isDir          bool
-	}{
-		{
-			name:           "testpath exists",
-			adjustedPath:   "/testpath/testfile.txt",
-			expectedName:   "testfile.txt",
-			expectedExists: true,
-		},
-		{
-			name:           "testpath not exists",
-			adjustedPath:   "/testpath/nonexistent.txt",
-			expectedName:   "nonexistent.txt",
-			expectedExists: false,
-		},
-		{
-			name:           "File exists in /anotherpath",
-			adjustedPath:   "/anotherpath/afile.txt",
-			expectedName:   "afile.txt",
-			expectedExists: true,
-		},
-		{
-			name:           "File does not exist in /anotherpath",
-			adjustedPath:   "/anotherpath/nonexistentfile.txt",
-			expectedName:   "nonexistentfile.txt",
-			expectedExists: false,
-		},
-		{
-			name:           "Directory does not exist",
-			adjustedPath:   "/nonexistentpath",
-			expectedName:   "",
-			expectedExists: false,
-			isDir:          true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			fileInfo, exists := testIndex.GetReducedMetadata(tt.adjustedPath, tt.isDir)
-			if !exists {
-				found := false
-				assert.Equal(t, tt.expectedExists, found)
-				return
-			}
-			found := false
-			if tt.isDir {
-				// Iterate over fileInfo.Items to look for expectedName
-				for _, item := range fileInfo.Files {
-					// Assert the existence and the name
-					if item.Name == tt.expectedName {
-						found = true
-						break
-					}
-				}
-			} else {
-				if fileInfo.Name == tt.expectedName {
-					found = true
-				}
-			}
-
-			assert.Equal(t, tt.expectedExists, found)
-		})
-	}
-}
-
-// Test for UpdateFileMetadata
-func TestUpdateFileMetadata(t *testing.T) {
-	info := &FileInfo{
-		Path: "/testpath",
-		Files: []ItemInfo{
-			{Name: "testfile.txt"},
-			{Name: "anotherfile.txt"},
-		},
-	}
-
-	index := &Index{
-		Directories: map[string]*FileInfo{
-			"/testpath": info,
-		},
-	}
-
-	success := index.UpdateMetadata(info)
-	if !success {
-		t.Fatalf("expected UpdateFileMetadata to succeed")
-	}
-
-	fileInfo, exists := index.GetReducedMetadata("/testpath/testfile.txt", false)
-	if !exists || fileInfo.Name != "testfile.txt" {
-		t.Fatalf("expected testfile.txt to be updated in the directory metadata:%v %v", exists, info.Name)
-	}
-}
-
-// Test for GetDirMetadata
-func TestGetDirMetadata(t *testing.T) {
-	t.Parallel()
-	_, exists := testIndex.GetReducedMetadata("/testpath", true)
-	if !exists {
-		t.Fatalf("expected GetDirMetadata to return initialized metadata map")
-	}
-
-	_, exists = testIndex.GetReducedMetadata("/nonexistent", true)
-	if exists {
-		t.Fatalf("expected GetDirMetadata to return false for nonexistent directory")
-	}
-}
-
-// Test for SetDirectoryInfo
-func TestSetDirectoryInfo(t *testing.T) {
-	index := &Index{
-		Directories: map[string]*FileInfo{
-			"/testpath": {
-				Path: "/testpath",
-				ItemInfo: ItemInfo{
-					Name: "testpath",
-					Type: "directory",
-				},
-				Files: []ItemInfo{
-					{Name: "testfile.txt"},
-					{Name: "anotherfile.txt"},
-				},
-			},
-		},
-	}
-	dir := &FileInfo{
-		Path: "/newPath",
-		ItemInfo: ItemInfo{
-			Name: "newPath",
-			Type: "directory",
-		},
-		Files: []ItemInfo{
-			{Name: "testfile.txt"},
-		},
-	}
-	index.UpdateMetadata(dir)
-	storedDir, exists := index.Directories["/newPath"]
-	if !exists || storedDir.Files[0].Name != "testfile.txt" {
-		t.Fatalf("expected SetDirectoryInfo to store directory info correctly")
-	}
-}
-
-// Test for RemoveDirectory
-func TestRemoveDirectory(t *testing.T) {
-	index := &Index{
-		Directories: map[string]*FileInfo{
-			"/testpath": {},
-		},
-	}
-	index.RemoveDirectory("/testpath")
-	_, exists := index.Directories["/testpath"]
-	if exists {
-		t.Fatalf("expected directory to be removed")
-	}
-}
-
-func init() {
-	testIndex = Index{
-		Source: settings.Source{
-			Path: "/",
-			Name: "test",
-		},
-		NumFiles: 10,
-		NumDirs:  5,
-		Directories: map[string]*FileInfo{
-			"/testpath": {
-				Path: "/testpath",
-				ItemInfo: ItemInfo{
-					Name: "testpath",
-					Type: "directory",
-				},
-				Files: []ItemInfo{
-					{Name: "testfile.txt", Size: 100},
-					{Name: "anotherfile.txt", Size: 100},
-				},
-			},
-			"/anotherpath": {
-				Path: "/anotherpath",
-				ItemInfo: ItemInfo{
-					Name: "anotherpath",
-					Type: "directory",
-				},
-				Files: []ItemInfo{
-					{Name: "afile.txt", Size: 100},
-				},
-				Folders: []ItemInfo{
-					{Name: "directory", Type: "directory", Size: 100},
-				},
-			},
-		},
-	}
-}

backend/fileutils/copy.go

@@ -2,23 +2,23 @@ package fileutils
 
 import (
 	"os"
-	"path/filepath"
+	"path"
+
+	"github.com/spf13/afero"
 )
 
 // Copy copies a file or folder from one place to another.
-func CopyHelper(src, dst string) error {
-	src = filepath.Clean(src)
-	if src == "" {
+func Copy(fs afero.Fs, src, dst string) error {
+	if src = path.Clean("/" + src); src == "" {
 		return os.ErrNotExist
 	}
 
-	dst = filepath.Clean(dst)
-	if dst == "" {
+	if dst = path.Clean("/" + dst); dst == "" {
 		return os.ErrNotExist
 	}
 
 	if src == "/" || dst == "/" {
-		// Prohibit copying from or to the root directory.
+		// Prohibit copying from or to the virtual root directory.
 		return os.ErrInvalid
 	}
 
@@ -26,14 +26,14 @@ func CopyHelper(src, dst string) error {
 		return os.ErrInvalid
 	}
 
-	info, err := os.Stat(src)
+	info, err := fs.Stat(src)
 	if err != nil {
 		return err
 	}
 
 	if info.IsDir() {
-		return CopyDir(src, dst)
+		return CopyDir(fs, src, dst)
 	}
 
-	return CopyFile(src, dst)
+	return CopyFile(fs, src, dst)
 }

backend/fileutils/dir.go

@@ -2,32 +2,27 @@ package fileutils
 
 import (
 	"errors"
-	"os"
-	"path/filepath"
+
+	"github.com/spf13/afero"
 )
 
 // CopyDir copies a directory from source to dest and all
 // of its sub-directories. It doesn't stop if it finds an error
 // during the copy. Returns an error if any.
-func CopyDir(source, dest string) error {
+func CopyDir(fs afero.Fs, source, dest string) error {
 	// Get properties of source.
-	srcinfo, err := os.Stat(source)
+	srcinfo, err := fs.Stat(source)
 	if err != nil {
 		return err
 	}
 
 	// Create the destination directory.
-	err = os.MkdirAll(dest, srcinfo.Mode())
+	err = fs.MkdirAll(dest, srcinfo.Mode())
 	if err != nil {
 		return err
 	}
 
-	dir, err := os.Open(source)
-	if err != nil {
-		return err
-	}
-	defer dir.Close()
-
+	dir, _ := fs.Open(source)
 	obs, err := dir.Readdir(-1)
 	if err != nil {
 		return err
@@ -36,18 +31,18 @@ func CopyDir(source, dest string) error {
 	var errs []error
 
 	for _, obj := range obs {
-		fsource := filepath.Join(source, obj.Name())
-		fdest := filepath.Join(dest, obj.Name())
+		fsource := source + "/" + obj.Name()
+		fdest := dest + "/" + obj.Name()
 
 		if obj.IsDir() {
 			// Create sub-directories, recursively.
-			err = CopyDir(fsource, fdest)
+			err = CopyDir(fs, fsource, fdest)
 			if err != nil {
 				errs = append(errs, err)
 			}
 		} else {
 			// Perform the file copy.
-			err = CopyFile(fsource, fdest)
+			err = CopyFile(fs, fsource, fdest)
 			if err != nil {
 				errs = append(errs, err)
 			}

backend/fileutils/file.go

@@ -5,61 +5,48 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+
+	"github.com/spf13/afero"
 )
 
-// MoveFile moves a file from src to dst.
-// By default, the rename system call is used. If src and dst point to different volumes,
-// the file copy is used as a fallback.
-func MoveFile(src, dst string) error {
-	if os.Rename(src, dst) == nil {
+// MoveFile moves file from src to dst.
+// By default the rename filesystem system call is used. If src and dst point to different volumes
+// the file copy is used as a fallback
+func MoveFile(fs afero.Fs, src, dst string) error {
+	if fs.Rename(src, dst) == nil {
 		return nil
 	}
 	// fallback
-	err := CopyFile(src, dst)
+	err := CopyFile(fs, src, dst)
 	if err != nil {
-		_ = os.Remove(dst)
+		_ = fs.Remove(dst)
 		return err
 	}
-	if err := os.Remove(src); err != nil {
+	if err := fs.Remove(src); err != nil {
 		return err
 	}
 	return nil
 }
 
-// CopyFile copies a file or directory from source to dest and returns an error if any.
-func CopyFile(source, dest string) error {
-	// Check if the source exists and whether it's a file or directory.
-	info, err := os.Stat(source)
-	if err != nil {
-		return err
-	}
-
-	if info.IsDir() {
-		// If the source is a directory, copy it recursively.
-		return copyDirectory(source, dest)
-	}
-
-	// If the source is a file, copy the file.
-	return copySingleFile(source, dest)
-}
-
-// copySingleFile handles copying a single file.
-func copySingleFile(source, dest string) error {
+// CopyFile copies a file from source to dest and returns
+// an error if any.
+func CopyFile(fs afero.Fs, source, dest string) error {
 	// Open the source file.
-	src, err := os.Open(source)
+	src, err := fs.Open(source)
 	if err != nil {
 		return err
 	}
 	defer src.Close()
 
-	// Create the destination directory if needed.
-	err = os.MkdirAll(filepath.Dir(dest), 0775) //nolint:gomnd
+	// Makes the directory needed to create the dst
+	// file.
+	err = fs.MkdirAll(filepath.Dir(dest), 0666) //nolint:gomnd
 	if err != nil {
 		return err
 	}
 
 	// Create the destination file.
-	dst, err := os.OpenFile(dest, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666) //nolint:gomnd
+	dst, err := fs.OpenFile(dest, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775) //nolint:gomnd
 	if err != nil {
 		return err
 	}
@@ -71,12 +58,12 @@ func copySingleFile(source, dest string) error {
 		return err
 	}
 
-	// Copy the mode.
-	info, err := os.Stat(source)
+	// Copy the mode
+	info, err := fs.Stat(source)
 	if err != nil {
 		return err
 	}
-	err = os.Chmod(dest, info.Mode())
+	err = fs.Chmod(dest, info.Mode())
 	if err != nil {
 		return err
 	}
@@ -84,44 +71,7 @@ func copySingleFile(source, dest string) error {
 	return nil
 }
 
-// copyDirectory handles copying directories recursively.
-func copyDirectory(source, dest string) error {
-	// Create the destination directory.
-	err := os.MkdirAll(dest, 0775) //nolint:gomnd
-	if err != nil {
-		return err
-	}
-
-	// Read the contents of the source directory.
-	entries, err := os.ReadDir(source)
-	if err != nil {
-		return err
-	}
-
-	// Iterate over each entry in the directory.
-	for _, entry := range entries {
-		srcPath := filepath.Join(source, entry.Name())
-		destPath := filepath.Join(dest, entry.Name())
-
-		if entry.IsDir() {
-			// Recursively copy subdirectories.
-			err = copyDirectory(srcPath, destPath)
-			if err != nil {
-				return err
-			}
-		} else {
-			// Copy files.
-			err = copySingleFile(srcPath, destPath)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// CommonPrefix returns the common directory path of provided files.
+// CommonPrefix returns common directory path of provided files
 func CommonPrefix(sep byte, paths ...string) string {
 	// Handle special cases.
 	switch len(paths) {
@@ -131,19 +81,30 @@ func CommonPrefix(sep byte, paths ...string) string {
 		return path.Clean(paths[0])
 	}
 
-	// Treat string as []byte, not []rune as is often done in Go.
+	// Note, we treat string as []byte, not []rune as is often
+	// done in Go. (And sep as byte, not rune). This is because
+	// most/all supported OS' treat paths as string of non-zero
+	// bytes. A filename may be displayed as a sequence of Unicode
+	// runes (typically encoded as UTF-8) but paths are
+	// not required to be valid UTF-8 or in any normalized form
+	// (e.g. "é" (U+00C9) and "é" (U+0065,U+0301) are different
+	// file names.
 	c := []byte(path.Clean(paths[0]))
 
-	// Add a trailing sep to handle the case where the common prefix directory
-	// is included in the path list.
+	// We add a trailing sep to handle the case where the
+	// common prefix directory is included in the path list
+	// (e.g. /home/user1, /home/user1/foo, /home/user1/bar).
+	// path.Clean will have cleaned off trailing / separators with
+	// the exception of the root directory, "/" (in which case we
+	// make it "//", but this will get fixed up to "/" bellow).
 	c = append(c, sep)
 
-	// Ignore the first path since it's already in c.
+	// Ignore the first path since it's already in c
 	for _, v := range paths[1:] {
-		// Clean up each path before testing it.
+		// Clean up each path before testing it
 		v = path.Clean(v) + string(sep)
 
-		// Find the first non-common byte and truncate c.
+		// Find the first non-common byte and truncate c
 		if len(v) < len(c) {
 			c = c[:len(v)]
 		}
@@ -155,7 +116,7 @@ func CommonPrefix(sep byte, paths ...string) string {
 		}
 	}
 
-	// Remove trailing non-separator characters and the final separator.
+	// Remove trailing non-separator characters and the final separator
 	for i := len(c) - 1; i >= 0; i-- {
 		if c[i] == sep {
 			c = c[:i]

backend/frontend/dist

@@ -0,0 +1 @@
+../../frontend/dist

backend/frontend/package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "frontend",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

backend/go.mod

@@ -1,51 +1,56 @@
-module github.com/gtsteffaniak/filebrowser/backend
+module github.com/gtsteffaniak/filebrowser
 
-go 1.22.5
+go 1.22.0
 
 require (
 	github.com/asdine/storm/v3 v3.2.1
 	github.com/disintegration/imaging v1.6.2
 	github.com/dsoprea/go-exif/v3 v3.0.1
 	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568
-	github.com/goccy/go-yaml v1.15.13
-	github.com/golang-jwt/jwt/v4 v4.5.1
+	github.com/goccy/go-yaml v1.11.3
+	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/google/go-cmp v0.6.0
+	github.com/gorilla/mux v1.8.1
+	github.com/marusama/semaphore/v2 v2.5.0
+	github.com/mholt/archiver/v3 v3.5.1
 	github.com/shirou/gopsutil/v3 v3.24.5
 	github.com/spf13/afero v1.11.0
-	github.com/spf13/cobra v1.8.1
+	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
-	github.com/swaggo/http-swagger v1.3.4
-	github.com/swaggo/swag v1.16.4
-	golang.org/x/crypto v0.32.0
-	golang.org/x/image v0.23.0
-	golang.org/x/text v0.21.0
+	github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce
+	golang.org/x/crypto v0.24.0
+	golang.org/x/image v0.17.0
+	golang.org/x/text v0.16.0
 )
 
 require (
-	github.com/KyleBanks/depth v1.2.1 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
 	github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
 	github.com/dsoprea/go-utility/v2 v2.0.0-20221003172846-a3e1774ef349 // indirect
+	github.com/fatih/color v1.17.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/spec v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/pgzip v1.2.6 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/nwaples/rardecode v1.1.3 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
-	github.com/swaggo/files v1.0.1 // indirect
+	github.com/ulikunitz/xz v0.5.12 // indirect
+	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	go.etcd.io/bbolt v1.3.11 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/tools v0.29.0 // indirect
+	go.etcd.io/bbolt v1.3.10 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

backend/go.sum

@@ -1,16 +1,20 @@
 github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM=
 github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
-github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
-github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863 h1:BRrxwOZBolJN4gIwvZMJY1tzqBvQgpaZiQRuIDD40jM=
 github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM=
+github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/asdine/storm/v3 v3.2.1 h1:I5AqhkPK6nBZ/qJXySdI7ot5BlXSZ7qvDY1zAn5ZJac=
 github.com/asdine/storm/v3 v3.2.1/go.mod h1:LEpXwGt4pIqrE/XcTvCnZHT5MgZCV6Ub9q7yQzOFWr0=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY=
+github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
+github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
 github.com/dsoprea/go-exif/v3 v3.0.0-20200717053412-08f1b6708903/go.mod h1:0nsO1ce0mh5czxGeLo4+OCZ/C6Eo6ZlMWsz7rH/Gxv8=
 github.com/dsoprea/go-exif/v3 v3.0.0-20210625224831-a6301f85c82b/go.mod h1:cg5SNYKHMmzxsr9X6ZeLh/nfBRHHp5PngtEPcujONtk=
@@ -28,6 +32,8 @@ github.com/dsoprea/go-utility/v2 v2.0.0-20221003142440-7a1927d49d9d/go.mod h1:LV
 github.com/dsoprea/go-utility/v2 v2.0.0-20221003160719-7bc88537c05e/go.mod h1:VZ7cB0pTjm1ADBWhJUOHESu4ZYy9JN+ZPqjfiW09EPU=
 github.com/dsoprea/go-utility/v2 v2.0.0-20221003172846-a3e1774ef349 h1:DilThiXje0z+3UQ5YjYiSRRzVdtamFpvBQXKwMglWqw=
 github.com/dsoprea/go-utility/v2 v2.0.0-20221003172846-a3e1774ef349/go.mod h1:4GC5sXji84i/p+irqghpPFZBF8tRN/Q7+700G0/DLe8=
+github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
+github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
@@ -39,18 +45,16 @@ github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3Bop
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
-github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
-github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
-github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
-github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
-github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
-github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
-github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
-github.com/goccy/go-yaml v1.15.13 h1:Xd87Yddmr2rC1SLLTm2MNDcTjeO/GYo0JGiww6gSTDg=
-github.com/goccy/go-yaml v1.15.13/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
-github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
-github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
+github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
+github.com/goccy/go-yaml v1.11.3 h1:B3W9IdWbvrUu2OYQGwvU1nZtvMQJPBKgBUuweJjLj6I=
+github.com/goccy/go-yaml v1.11.3/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU=
+github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
+github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
@@ -61,125 +65,128 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
+github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
+github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
-github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
+github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/marusama/semaphore/v2 v2.5.0 h1:o/1QJD9DBYOWRnDhPwDVAXQn6mQYD0gZaS1Tpx6DJGM=
+github.com/marusama/semaphore/v2 v2.5.0/go.mod h1:z9nMiNUekt/LTpTUQdpp+4sJeYqUGpwMHfW0Z8V8fnQ=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo=
+github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
+github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
+github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc=
+github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
+github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
 github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
 github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
-github.com/swaggo/files v1.0.1/go.mod h1:0qXmMNH6sXNf+73t65aKeB+ApmgxdnkQzVTAj2uaMUg=
-github.com/swaggo/http-swagger v1.3.4 h1:q7t/XLx0n15H1Q9/tk3Y9L4n210XzJF5WtnDX64a5ww=
-github.com/swaggo/http-swagger v1.3.4/go.mod h1:9dAh0unqMBAlbp1uE2Uc2mQTxNMU/ha4UbucIg1MFkQ=
-github.com/swaggo/swag v1.16.4 h1:clWJtd9LStiG3VeijiCfOVODP6VpHtKdQy9ELFG3s1A=
-github.com/swaggo/swag v1.16.4/go.mod h1:VBsHJRsDvfYvqoiMKnsdwhNV9LEMHgEDZcyVYX0sxPg=
+github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce h1:fb190+cK2Xz/dvi9Hv8eCYJYvIGUTN2/KLq1pT6CjEc=
+github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4=
+github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
+github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
+github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
-go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
+go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
+go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
-golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/image v0.17.0 h1:nTRVVdajgB8zCMZVsViyzhnMKPwYeroEERRC64JuLco=
+golang.org/x/image v0.17.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
-golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

backend/http/api.go

@@ -1,121 +0,0 @@
-package http
-
-import (
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/gtsteffaniak/filebrowser/backend/users"
-)
-
-func createApiKeyHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	name := r.URL.Query().Get("name")
-	durationStr := r.URL.Query().Get("days")
-	permissionsStr := r.URL.Query().Get("permissions")
-
-	if name == "" {
-		return http.StatusInternalServerError, fmt.Errorf("api name must be valid")
-	}
-	if durationStr == "" {
-		return http.StatusInternalServerError, fmt.Errorf("api duration must be valid")
-	}
-	if permissionsStr == "" {
-		return http.StatusInternalServerError, fmt.Errorf("api permissions must be valid")
-	}
-	// Parse permissions from the query parameter
-	permissions := users.Permissions{
-		Api:      strings.Contains(permissionsStr, "api") && d.user.Perm.Api,
-		Admin:    strings.Contains(permissionsStr, "admin") && d.user.Perm.Admin,
-		Execute:  strings.Contains(permissionsStr, "execute") && d.user.Perm.Execute,
-		Create:   strings.Contains(permissionsStr, "create") && d.user.Perm.Create,
-		Rename:   strings.Contains(permissionsStr, "rename") && d.user.Perm.Rename,
-		Modify:   strings.Contains(permissionsStr, "modify") && d.user.Perm.Modify,
-		Delete:   strings.Contains(permissionsStr, "delete") && d.user.Perm.Delete,
-		Share:    strings.Contains(permissionsStr, "share") && d.user.Perm.Share,
-		Download: strings.Contains(permissionsStr, "download") && d.user.Perm.Download,
-	}
-
-	// Convert the duration string to an int64
-	durationInt, err := strconv.ParseInt(durationStr, 10, 64) // Base 10 and bit size of 64
-	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid duration value: %w", err)
-	}
-
-	// Here we assume the duration is in seconds; convert to time.Duration
-	duration := time.Duration(durationInt) * time.Hour * 24
-
-	// get request body like:
-	token, err := makeSignedTokenAPI(d.user, name, duration, permissions)
-	if err != nil {
-		if strings.Contains(err.Error(), "key already exists with same name") {
-			return http.StatusConflict, err
-		}
-		return http.StatusInternalServerError, err
-	}
-	response := HttpResponse{
-		Message: "here is your token!",
-		Token:   token.Key,
-	}
-	return renderJSON(w, r, response)
-}
-
-func deleteApiKeyHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	name := r.URL.Query().Get("name")
-
-	keyInfo, ok := d.user.ApiKeys[name]
-	if !ok {
-		return http.StatusNotFound, fmt.Errorf("api key not found")
-	}
-	// Perform the user update
-	err := store.Users.DeleteApiKey(d.user.ID, name)
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-
-	revokeAPIKey(keyInfo.Key) // add to blacklist
-	response := HttpResponse{
-		Message: "successfully deleted api key from user",
-	}
-	return renderJSON(w, r, response)
-}
-
-type AuthTokenMin struct {
-	Key         string            `json:"key"`
-	Name        string            `json:"name"`
-	Created     int64             `json:"created"`
-	Expires     int64             `json:"expires"`
-	Permissions users.Permissions `json:"Permissions"`
-}
-
-func listApiKeysHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	key := r.URL.Query().Get("key")
-
-	if key != "" {
-		keyInfo, ok := d.user.ApiKeys[key]
-		if !ok {
-			return http.StatusNotFound, fmt.Errorf("api key not found")
-		}
-		modifiedKey := AuthTokenMin{
-			Key:         keyInfo.Key,
-			Name:        key,
-			Created:     keyInfo.Created,
-			Expires:     keyInfo.Expires,
-			Permissions: keyInfo.Permissions,
-		}
-		return renderJSON(w, r, modifiedKey)
-	}
-
-	modifiedList := map[string]AuthTokenMin{}
-	for key, value := range d.user.ApiKeys {
-		modifiedList[key] = AuthTokenMin{
-			Key:         value.Key,
-			Created:     value.Created,
-			Expires:     value.Expires,
-			Permissions: value.Permissions,
-		}
-	}
-
-	return renderJSON(w, r, modifiedList)
-}

backend/http/auth.go

@@ -2,96 +2,104 @@ package http
 
 import (
 	"encoding/json"
-	libError "errors"
 	"fmt"
+	"log"
 	"net/http"
-	"net/url"
 	"os"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/golang-jwt/jwt/v4/request"
-	"golang.org/x/crypto/bcrypt"
 
-	"github.com/gtsteffaniak/filebrowser/backend/errors"
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/gtsteffaniak/filebrowser/backend/share"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
-	"github.com/gtsteffaniak/filebrowser/backend/utils"
+	"github.com/gtsteffaniak/filebrowser/errors"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
-var (
-	revokedApiKeyList map[string]bool
-	revokeMu          sync.Mutex
-)
+type authToken struct {
+	User users.User `json:"user"`
+	jwt.RegisteredClaims
+}
 
-// first checks for cookie
-// then checks for header Authorization as Bearer token
-// then checks for query parameter
-func extractToken(r *http.Request) (string, error) {
-	hasToken := false
-	tokenObj, err := r.Cookie("auth")
-	if err == nil {
-		hasToken = true
-		token := tokenObj.Value
-		// Checks if the token isn't empty and if it contains two dots.
-		// The former prevents incompatibility with URLs that previously
-		// used basic auth.
-		if token != "" && strings.Count(token, ".") == 2 {
-			return token, nil
-		}
-	}
+type extractor []string
 
-	// Check for Authorization header
-	authHeader := r.Header.Get("Authorization")
-	if authHeader != "" {
-		hasToken = true
-		// Split the header to get "Bearer {token}"
-		parts := strings.Split(authHeader, " ")
-		if len(parts) == 2 && parts[0] == "Bearer" {
-			token := parts[1]
-			return token, nil
-		}
+func (e extractor) ExtractToken(r *http.Request) (string, error) {
+	token, _ := request.HeaderExtractor{"X-Auth"}.ExtractToken(r)
+
+	// Checks if the token isn't empty and if it contains two dots.
+	// The former prevents incompatibility with URLs that previously
+	// used basic auth.
+	if token != "" && strings.Count(token, ".") == 2 {
+		return token, nil
 	}
 
 	auth := r.URL.Query().Get("auth")
-	if auth != "" {
-		hasToken = true
-		if strings.Count(auth, ".") == 2 {
-			return auth, nil
-		}
+	if auth != "" && strings.Count(auth, ".") == 2 {
+		return auth, nil
 	}
 
-	if hasToken {
-		return "", fmt.Errorf("invalid token provided")
+	if r.Method == http.MethodGet {
+		cookie, _ := r.Cookie("auth")
+		if cookie != nil && strings.Count(cookie.Value, ".") == 2 {
+			return cookie.Value, nil
+		}
 	}
 
 	return "", request.ErrNoTokenInRequest
 }
 
-func loginHandler(w http.ResponseWriter, r *http.Request) {
-	// Get the authentication method from the settings
-	auther, err := store.Auth.Get(config.Auth.Method)
-	if err != nil {
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
+func withUser(fn handleFunc) handleFunc {
+	return func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		keyFunc := func(token *jwt.Token) (interface{}, error) {
+			return d.settings.Auth.Key, nil
+		}
+
+		var tk authToken
+		token, err := request.ParseFromRequest(r, &extractor{}, keyFunc, request.WithClaims(&tk))
+
+		if err != nil || !token.Valid {
+			return http.StatusUnauthorized, nil
+		}
+
+		expired := !tk.VerifyExpiresAt(time.Now().Add(time.Hour), true)
+		updated := tk.IssuedAt != nil && tk.IssuedAt.Unix() < d.store.Users.LastUpdate(tk.User.ID)
+
+		if expired || updated {
+			w.Header().Add("X-Renew-Token", "true")
+		}
+
+		d.user, err = d.store.Users.Get(d.server.Root, tk.User.ID)
+		if err != nil {
+			return http.StatusInternalServerError, err
+		}
+		return fn(w, r, d)
 	}
-	// Authenticate the user based on the request
-	user, err := auther.Auth(r, store.Users)
+}
+
+func withAdmin(fn handleFunc) handleFunc {
+	return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		if !d.user.Perm.Admin {
+			return http.StatusForbidden, nil
+		}
+
+		return fn(w, r, d)
+	})
+}
+
+var loginHandler = func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	auther, err := d.store.Auth.Get(d.settings.Auth.Method)
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
+	user, err := auther.Auth(r, d.store.Users)
 	if err == os.ErrPermission {
-		http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
-		return
+		return http.StatusForbidden, nil
 	} else if err != nil {
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	}
-	status, err := printToken(w, r, user) // Pass the data object
-	if err != nil {
-		http.Error(w, http.StatusText(status), status)
+		return http.StatusInternalServerError, err
+	} else {
+		return printToken(w, r, d, user)
 	}
 }
 
@@ -100,141 +108,76 @@ type signupBody struct {
 	Password string `json:"password"`
 }
 
-func signupHandler(w http.ResponseWriter, r *http.Request) {
+var signupHandler = func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 	if !settings.Config.Auth.Signup {
-		http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
-		return
+		return http.StatusMethodNotAllowed, nil
 	}
 
 	if r.Body == nil {
-		http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
-		return
+		return http.StatusBadRequest, nil
 	}
 
 	info := &signupBody{}
 	err := json.NewDecoder(r.Body).Decode(info)
 	if err != nil {
-		http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
-		return
+		return http.StatusBadRequest, err
 	}
 
 	if info.Password == "" || info.Username == "" {
-		http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
-		return
+		return http.StatusBadRequest, nil
 	}
 
-	user := settings.ApplyUserDefaults(users.User{})
-	user.Username = info.Username
-	user.Password = info.Password
-
-	userHome, err := config.MakeUserDir(user.Username, user.Scope, files.RootPaths["default"])
+	user := &users.User{
+		Username: info.Username,
+		Password: info.Password,
+	}
+	settings.Config.UserDefaults.Apply(user)
+	userHome, err := d.settings.MakeUserDir(user.Username, user.Scope, d.server.Root)
 	if err != nil {
-		logger.Error(fmt.Sprintf("create user: failed to mkdir user home dir: [%s]", userHome))
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	}
-	user.Scope = userHome
-	logger.Debug(fmt.Sprintf("new user: %s, home dir: [%s].", user.Username, userHome))
-	err = store.Users.Save(&user)
-	if err == errors.ErrExist {
-		http.Error(w, http.StatusText(http.StatusConflict), http.StatusConflict)
-		return
-	} else if err != nil {
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	}
-}
-
-func renewHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	// check if x-auth header is present and token is
-	return printToken(w, r, d.user)
-}
-
-func printToken(w http.ResponseWriter, _ *http.Request, user *users.User) (int, error) {
-	signed, err := makeSignedTokenAPI(user, "WEB_TOKEN_"+utils.GenerateRandomHash(4), time.Hour*2, user.Perm)
-	if err != nil {
-		if strings.Contains(err.Error(), "key already exists with same name") {
-			return http.StatusConflict, err
-		}
+		log.Printf("create user: failed to mkdir user home dir: [%s]", userHome)
 		return http.StatusInternalServerError, err
 	}
+	user.Scope = userHome
+	log.Printf("new user: %s, home dir: [%s].", user.Username, userHome)
+	settings.Config.UserDefaults.Apply(user)
+	err = d.store.Users.Save(user)
+	if err == errors.ErrExist {
+		return http.StatusConflict, err
+	} else if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
+	return http.StatusOK, nil
+}
+
+var renewHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	return printToken(w, r, d, d.user)
+})
+
+func printToken(w http.ResponseWriter, _ *http.Request, d *data, user *users.User) (int, error) {
+	duration, err := time.ParseDuration(settings.Config.Auth.TokenExpirationTime)
+	if err != nil {
+		fmt.Println("Error parsing duration:", err)
+		duration = time.Hour * 2
+	}
+	claims := &authToken{
+		User: *user,
+		RegisteredClaims: jwt.RegisteredClaims{
+			IssuedAt:  jwt.NewNumericDate(time.Now()),
+			ExpiresAt: jwt.NewNumericDate(time.Now().Add(duration)),
+			Issuer:    "File Browser",
+		},
+	}
+
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	signed, err := token.SignedString(d.settings.Auth.Key)
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
 	w.Header().Set("Content-Type", "text/plain")
-	if _, err := w.Write([]byte(signed.Key)); err != nil {
+	if _, err := w.Write([]byte(signed)); err != nil {
 		return http.StatusInternalServerError, err
 	}
 	return 0, nil
 }
-
-func isRevokedApiKey(key string) bool {
-	_, exists := revokedApiKeyList[key]
-	return exists
-}
-
-func revokeAPIKey(key string) {
-	revokeMu.Lock()
-	delete(revokedApiKeyList, key)
-	revokeMu.Unlock()
-}
-
-func makeSignedTokenAPI(user *users.User, name string, duration time.Duration, perms users.Permissions) (users.AuthToken, error) {
-	_, ok := user.ApiKeys[name]
-	if ok {
-		return users.AuthToken{}, fmt.Errorf("key already exists with same name %v ", name)
-	}
-	now := time.Now()
-	expires := now.Add(duration)
-	claim := users.AuthToken{
-		Permissions: perms,
-		Created:     now.Unix(),
-		Expires:     expires.Unix(),
-		Name:        name,
-		BelongsTo:   user.ID,
-		RegisteredClaims: jwt.RegisteredClaims{
-			IssuedAt:  jwt.NewNumericDate(now),
-			ExpiresAt: jwt.NewNumericDate(expires),
-			Issuer:    "FileBrowser Quantum",
-		},
-	}
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claim)
-	tokenString, err := token.SignedString(config.Auth.Key)
-	if err != nil {
-		return claim, err
-	}
-	claim.Key = tokenString
-	if strings.HasPrefix(name, "WEB_TOKEN") {
-		// don't add to api tokens, its a short lived web token
-		return claim, err
-	}
-	// Perform the user update
-	err = store.Users.AddApiKey(user.ID, name, claim)
-	if err != nil {
-		return claim, err
-	}
-	return claim, err
-}
-
-func authenticateShareRequest(r *http.Request, l *share.Link) (int, error) {
-	if l.PasswordHash == "" {
-		return 200, nil
-	}
-
-	if r.URL.Query().Get("token") == l.Token {
-		return 200, nil
-	}
-
-	password := r.Header.Get("X-SHARE-PASSWORD")
-	password, err := url.QueryUnescape(password)
-	if err != nil {
-		return http.StatusUnauthorized, err
-	}
-	if password == "" {
-		return http.StatusUnauthorized, nil
-	}
-	if err := bcrypt.CompareHashAndPassword([]byte(l.PasswordHash), []byte(password)); err != nil {
-		if libError.Is(err, bcrypt.ErrMismatchedHashAndPassword) {
-			return http.StatusUnauthorized, nil
-		}
-		return 401, err
-	}
-	return 200, nil
-}

backend/http/data.go

@@ -0,0 +1,75 @@
+package http
+
+import (
+	"log"
+	"net/http"
+	"strconv"
+
+	"github.com/tomasen/realip"
+
+	"github.com/gtsteffaniak/filebrowser/runner"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/storage"
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+type handleFunc func(w http.ResponseWriter, r *http.Request, d *data) (int, error)
+
+type data struct {
+	*runner.Runner
+	settings *settings.Settings
+	server   *settings.Server
+	store    *storage.Storage
+	user     *users.User
+	raw      interface{}
+}
+
+// Check implements rules.Checker.
+func (d *data) Check(path string) bool {
+
+	allow := true
+	for _, rule := range d.settings.Rules {
+		if rule.Matches(path) {
+			allow = rule.Allow
+		}
+	}
+	for _, rule := range d.user.Rules {
+		if rule.Matches(path) {
+			allow = rule.Allow
+		}
+	}
+
+	return allow
+}
+
+func handle(fn handleFunc, prefix string, store *storage.Storage, server *settings.Server) http.Handler {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+
+		settings, err := store.Settings.Get()
+		if err != nil {
+			log.Fatalf("ERROR: couldn't get settings: %v\n", err)
+			return
+		}
+
+		status, err := fn(w, r, &data{
+			Runner:   &runner.Runner{Enabled: server.EnableExec, Settings: settings},
+			store:    store,
+			settings: settings,
+			server:   server,
+		})
+
+		if status >= 400 || err != nil {
+			clientIP := realip.FromRequest(r)
+			log.Printf("%s: %v %s %v", r.URL.Path, status, clientIP, err)
+		}
+
+		if status != 0 {
+			txt := http.StatusText(status)
+			http.Error(w, strconv.Itoa(status)+" "+txt, status)
+			return
+		}
+	})
+
+	return stripPrefix(prefix, handler)
+}

backend/http/embed/.gitignore

@@ -1 +0,0 @@
-*

backend/http/http.go

@@ -0,0 +1,76 @@
+package http
+
+import (
+	"io/fs"
+	"net/http"
+
+	"github.com/gorilla/mux"
+
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/storage"
+)
+
+type modifyRequest struct {
+	What  string   `json:"what"`  // Answer to: what data type?
+	Which []string `json:"which"` // Answer to: which fields?
+}
+
+func NewHandler(
+	imgSvc ImgService,
+	fileCache FileCache,
+	store *storage.Storage,
+	server *settings.Server,
+	assetsFs fs.FS,
+) (http.Handler, error) {
+	server.Clean()
+
+	r := mux.NewRouter()
+	r.Use(func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Set("Content-Security-Policy", `default-src 'self'; style-src 'unsafe-inline';`)
+			next.ServeHTTP(w, r)
+		})
+	})
+	index, static := getStaticHandlers(store, server, assetsFs)
+	// NOTE: This fixes the issue where it would redirect if people did not put a
+	// trailing slash in the end. I hate this decision since this allows some awful
+	// URLs https://www.gorillatoolkit.org/pkg/mux#Router.SkipClean
+	r = r.SkipClean(true)
+	monkey := func(fn handleFunc, prefix string) http.Handler {
+		return handle(fn, prefix, store, server)
+	}
+	r.HandleFunc("/health", healthHandler)
+	r.PathPrefix("/static").Handler(static)
+	r.NotFoundHandler = index
+	api := r.PathPrefix("/api").Subrouter()
+	api.Handle("/login", monkey(loginHandler, ""))
+	api.Handle("/signup", monkey(signupHandler, ""))
+	api.Handle("/renew", monkey(renewHandler, ""))
+	users := api.PathPrefix("/users").Subrouter()
+	users.Handle("", monkey(usersGetHandler, "")).Methods("GET")
+	users.Handle("", monkey(userPostHandler, "")).Methods("POST")
+	users.Handle("/{id:[0-9]+}", monkey(userPutHandler, "")).Methods("PUT")
+	users.Handle("/{id:[0-9]+}", monkey(userGetHandler, "")).Methods("GET")
+	users.Handle("/{id:[0-9]+}", monkey(userDeleteHandler, "")).Methods("DELETE")
+	api.PathPrefix("/resources").Handler(monkey(resourceGetHandler, "/api/resources")).Methods("GET")
+	api.PathPrefix("/resources").Handler(monkey(resourceDeleteHandler(fileCache), "/api/resources")).Methods("DELETE")
+	api.PathPrefix("/resources").Handler(monkey(resourcePostHandler(fileCache), "/api/resources")).Methods("POST")
+	api.PathPrefix("/resources").Handler(monkey(resourcePutHandler, "/api/resources")).Methods("PUT")
+	api.PathPrefix("/resources").Handler(monkey(resourcePatchHandler(fileCache), "/api/resources")).Methods("PATCH")
+	api.PathPrefix("/usage").Handler(monkey(diskUsage, "/api/usage")).Methods("GET")
+	api.Path("/shares").Handler(monkey(shareListHandler, "/api/shares")).Methods("GET")
+	api.PathPrefix("/share").Handler(monkey(shareGetsHandler, "/api/share")).Methods("GET")
+	api.PathPrefix("/share").Handler(monkey(sharePostHandler, "/api/share")).Methods("POST")
+	api.PathPrefix("/share").Handler(monkey(shareDeleteHandler, "/api/share")).Methods("DELETE")
+	api.Handle("/settings", monkey(settingsGetHandler, "")).Methods("GET")
+	api.Handle("/settings", monkey(settingsPutHandler, "")).Methods("PUT")
+	api.PathPrefix("/raw").Handler(monkey(rawHandler, "/api/raw")).Methods("GET")
+	api.PathPrefix("/preview/{size}/{path:.*}").
+		Handler(monkey(previewHandler(imgSvc, fileCache, server.EnableThumbnails, server.ResizePreview), "/api/preview")).Methods("GET")
+	api.PathPrefix("/search").Handler(monkey(searchHandler, "/api/search")).Methods("GET")
+	public := api.PathPrefix("/public").Subrouter()
+	public.Handle("/publicUser", monkey(publicUserGetHandler, "")).Methods("GET")
+	public.PathPrefix("/dl").Handler(monkey(publicDlHandler, "/api/public/dl/")).Methods("GET")
+	public.PathPrefix("/share").Handler(monkey(publicShareHandler, "/api/public/share/")).Methods("GET")
+	return stripPrefix(server.BaseURL, r), nil
+}

backend/http/middleware.go

@@ -1,335 +0,0 @@
-package http
-
-import (
-	"compress/gzip"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/golang-jwt/jwt/v4"
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
-	"github.com/gtsteffaniak/filebrowser/backend/runner"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
-)
-
-type requestContext struct {
-	user *users.User
-	*runner.Runner
-	raw interface{}
-}
-
-type HttpResponse struct {
-	Status  int    `json:"status,omitempty"`
-	Message string `json:"message,omitempty"`
-	Token   string `json:"token,omitempty"`
-}
-
-var FileInfoFasterFunc = files.FileInfoFaster
-
-// Updated handleFunc to match the new signature
-type handleFunc func(w http.ResponseWriter, r *http.Request, data *requestContext) (int, error)
-
-// Middleware to handle file requests by hash and pass it to the handler
-func withHashFileHelper(fn handleFunc) handleFunc {
-	return func(w http.ResponseWriter, r *http.Request, data *requestContext) (int, error) {
-		path := r.URL.Query().Get("path")
-		hash := r.URL.Query().Get("hash")
-		data.user = &users.PublicUser
-
-		// Get the file link by hash
-		link, err := store.Share.GetByHash(hash)
-		if err != nil {
-			return http.StatusNotFound, fmt.Errorf("share not found")
-		}
-		// Authenticate the share request if needed
-		var status int
-		if link.Hash != "" {
-			status, err = authenticateShareRequest(r, link)
-			if err != nil || status != http.StatusOK {
-				return status, fmt.Errorf("could not authenticate share request")
-			}
-		}
-		// Retrieve the user (using the public user by default)
-		user := &users.PublicUser
-
-		// Get file information with options
-		file, err := FileInfoFasterFunc(files.FileOptions{
-			Path:       filepath.Join(user.Scope, link.Path+"/"+path),
-			Modify:     user.Perm.Modify,
-			Expand:     true,
-			ReadHeader: config.Server.TypeDetectionByHeader,
-			Checker:    user, // Call your checker function here
-		})
-		file.Token = link.Token
-		if err != nil {
-			return errToStatus(err), fmt.Errorf("error fetching share from server")
-		}
-
-		// Set the file info in the `data` object
-		data.raw = file
-
-		// Call the next handler with the data
-		return fn(w, r, data)
-	}
-}
-
-// Middleware to ensure the user is an admin
-func withAdminHelper(fn handleFunc) handleFunc {
-	return withUserHelper(func(w http.ResponseWriter, r *http.Request, data *requestContext) (int, error) {
-		// Ensure the user has admin permissions
-		if !data.user.Perm.Admin {
-			return http.StatusForbidden, nil
-		}
-
-		// Proceed to the actual handler if the user is admin
-		return fn(w, r, data)
-	})
-}
-
-// Middleware to retrieve and authenticate user
-func withUserHelper(fn handleFunc) handleFunc {
-	return func(w http.ResponseWriter, r *http.Request, data *requestContext) (int, error) {
-		if settings.Config.Auth.Method == "noauth" {
-			var err error
-			// Retrieve the user from the store and store it in the context
-			data.user, err = store.Users.Get(files.RootPaths["default"], "admin")
-			if err != nil {
-				return http.StatusInternalServerError, err
-			}
-			return fn(w, r, data)
-		}
-		keyFunc := func(token *jwt.Token) (interface{}, error) {
-			return config.Auth.Key, nil
-		}
-		tokenString, err := extractToken(r)
-		if err != nil {
-			return http.StatusUnauthorized, err
-		}
-
-		var tk users.AuthToken
-		token, err := jwt.ParseWithClaims(tokenString, &tk, keyFunc)
-		if err != nil {
-			return http.StatusUnauthorized, fmt.Errorf("error processing token, %v", err)
-		}
-		if !token.Valid {
-			return http.StatusUnauthorized, fmt.Errorf("invalid token")
-		}
-		if isRevokedApiKey(tk.Key) || tk.Expires < time.Now().Unix() {
-			return http.StatusUnauthorized, fmt.Errorf("token expired or revoked")
-		}
-		// Check if the token is about to expire and send a header to renew it
-		if tk.Expires < time.Now().Add(time.Hour).Unix() {
-			w.Header().Add("X-Renew-Token", "true")
-		}
-		// Retrieve the user from the store and store it in the context
-		data.user, err = store.Users.Get(files.RootPaths["default"], tk.BelongsTo)
-		if err != nil {
-			return http.StatusInternalServerError, err
-		}
-		setUserInResponseWriter(w, data.user)
-
-		// Call the handler function, passing in the context
-		return fn(w, r, data)
-	}
-}
-
-// Middleware to ensure the user is either the requested user or an admin
-func withSelfOrAdminHelper(fn handleFunc) handleFunc {
-	return withUserHelper(func(w http.ResponseWriter, r *http.Request, data *requestContext) (int, error) {
-		// Check if the current user is the same as the requested user or if they are an admin
-		if !data.user.Perm.Admin {
-			return http.StatusForbidden, nil
-		}
-		// Call the actual handler function with the updated context
-		return fn(w, r, data)
-	})
-}
-
-func wrapHandler(fn handleFunc) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		data := &requestContext{
-			Runner: &runner.Runner{Enabled: config.Server.EnableExec, Settings: config},
-		}
-
-		// Call the actual handler function and get status code and error
-		status, err := fn(w, r, data)
-
-		// Handle the error case if there is one
-		if err != nil {
-			// Create an error response in JSON format
-			response := &HttpResponse{
-				Status:  status, // Use the status code from the middleware
-				Message: err.Error(),
-			}
-
-			// Set the content type to JSON and status code
-			w.Header().Set("Content-Type", "application/json; charset=utf-8")
-			w.WriteHeader(status)
-
-			// Marshal the error response to JSON
-			errorBytes, marshalErr := json.Marshal(response)
-			if marshalErr != nil {
-				logger.Error(fmt.Sprintf("Error marshalling error response: %v", marshalErr))
-				http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-				return
-			}
-
-			// Write the JSON error response
-			if _, writeErr := w.Write(errorBytes); writeErr != nil {
-				logger.Error(fmt.Sprintf("Error writing error response: %v", writeErr))
-			}
-			return
-		}
-
-		// No error, proceed to write status if non-zero
-		if status != 0 {
-			w.WriteHeader(status)
-		}
-	}
-}
-
-func withPermShareHelper(fn handleFunc) handleFunc {
-	return withUserHelper(func(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-		if !d.user.Perm.Share {
-			return http.StatusForbidden, nil
-		}
-		return fn(w, r, d)
-	})
-}
-
-func withPermShare(fn handleFunc) http.HandlerFunc {
-	return wrapHandler(withPermShareHelper(fn))
-}
-
-// Example of wrapping specific middleware functions for use with http.HandleFunc
-func withHashFile(fn handleFunc) http.HandlerFunc {
-	return wrapHandler(withHashFileHelper(fn))
-}
-
-func withAdmin(fn handleFunc) http.HandlerFunc {
-	return wrapHandler(withAdminHelper(fn))
-}
-
-func withUser(fn handleFunc) http.HandlerFunc {
-	return wrapHandler(withUserHelper(fn))
-}
-
-func withSelfOrAdmin(fn handleFunc) http.HandlerFunc {
-	return wrapHandler(withSelfOrAdminHelper(fn))
-}
-
-func muxWithMiddleware(mux *http.ServeMux) *http.ServeMux {
-	wrappedMux := http.NewServeMux()
-	wrappedMux.Handle("/", LoggingMiddleware(mux))
-	return wrappedMux
-}
-
-// ResponseWriterWrapper wraps the standard http.ResponseWriter to capture the status code
-type ResponseWriterWrapper struct {
-	http.ResponseWriter
-	StatusCode  int
-	wroteHeader bool
-	PayloadSize int
-	User        string
-}
-
-// WriteHeader captures the status code and ensures it's only written once
-func (w *ResponseWriterWrapper) WriteHeader(statusCode int) {
-	if !w.wroteHeader { // Prevent WriteHeader from being called multiple times
-		if statusCode == 0 {
-			statusCode = http.StatusInternalServerError
-		}
-		w.StatusCode = statusCode
-		w.ResponseWriter.WriteHeader(statusCode)
-		w.wroteHeader = true
-	}
-}
-
-// Write is the method to write the response body and ensure WriteHeader is called
-func (w *ResponseWriterWrapper) Write(b []byte) (int, error) {
-	if !w.wroteHeader { // Default to 200 if WriteHeader wasn't called explicitly
-		w.WriteHeader(http.StatusOK)
-	}
-	return w.ResponseWriter.Write(b)
-}
-
-// Helper function to set the user in the ResponseWriterWrapper
-func setUserInResponseWriter(w http.ResponseWriter, user *users.User) {
-	// Wrap the response writer to set the user field
-	if wrappedWriter, ok := w.(*ResponseWriterWrapper); ok {
-		if user != nil {
-			wrappedWriter.User = user.Username
-		}
-	}
-}
-
-// LoggingMiddleware logs each request and its status code.
-func LoggingMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-
-		start := time.Now()
-
-		// Wrap the ResponseWriter to capture the status code.
-		wrappedWriter := &ResponseWriterWrapper{ResponseWriter: w, StatusCode: http.StatusOK}
-
-		// Call the next handler.
-		next.ServeHTTP(wrappedWriter, r)
-
-		// Capture the full URL path including the query parameters.
-		fullURL := r.URL.Path
-		if r.URL.RawQuery != "" {
-			fullURL += "?" + r.URL.RawQuery
-		}
-		truncUser := wrappedWriter.User
-		if len(truncUser) > 12 {
-			truncUser = truncUser[:10] + ".."
-		}
-		logger.Api(
-			fmt.Sprintf("%-7s | %3d | %-15s | %-12s | %-12s | \"%s\"",
-				r.Method,
-				wrappedWriter.StatusCode, // Captured status code
-				r.RemoteAddr,
-				truncUser,
-				time.Since(start).String(),
-				fullURL), wrappedWriter.StatusCode)
-	})
-}
-
-func renderJSON(w http.ResponseWriter, r *http.Request, data interface{}) (int, error) {
-	marsh, err := json.Marshal(data)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	// Calculate size in KB
-	payloadSizeKB := len(marsh) / 1024
-	// Check if the client accepts gzip encoding and hasn't explicitly disabled it
-	if acceptsGzip(r) && payloadSizeKB > 10 {
-		// Enable gzip compression
-		w.Header().Set("Content-Type", "application/json; charset=utf-8")
-		w.Header().Set("Content-Encoding", "gzip")
-		gz := gzip.NewWriter(w)
-		defer gz.Close()
-
-		if _, err := gz.Write(marsh); err != nil {
-			return http.StatusInternalServerError, err
-		}
-	} else {
-		// Normal response without compression
-		w.Header().Set("Content-Type", "application/json; charset=utf-8")
-		if _, err := w.Write(marsh); err != nil {
-			return http.StatusInternalServerError, err
-		}
-	}
-
-	return 0, nil
-}
-
-func acceptsGzip(r *http.Request) bool {
-	ae := r.Header.Get("Accept-Encoding")
-	return ae != "" && strings.Contains(ae, "gzip")
-}

backend/http/middleware_test.go

@@ -1,271 +0,0 @@
-package http
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/asdine/storm/v3"
-	"github.com/gtsteffaniak/filebrowser/backend/diskcache"
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/img"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/gtsteffaniak/filebrowser/backend/share"
-	"github.com/gtsteffaniak/filebrowser/backend/storage"
-	"github.com/gtsteffaniak/filebrowser/backend/storage/bolt"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
-	"github.com/gtsteffaniak/filebrowser/backend/utils"
-)
-
-func setupTestEnv(t *testing.T) {
-	dbPath := filepath.Join(t.TempDir(), "db")
-	db, err := storm.Open(dbPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	authStore, userStore, shareStore, settingsStore, err := bolt.NewStorage(db)
-	if err != nil {
-		t.Fatal(err)
-	}
-	store = &storage.Storage{
-		Auth:     authStore,
-		Users:    userStore,
-		Share:    shareStore,
-		Settings: settingsStore,
-	}
-	fileCache = diskcache.NewNoOp() // mocked
-	imgSvc = img.New(1)             // mocked
-	config = &settings.Config       // mocked
-	mockFileInfoFaster(t)           // Mock FileInfoFasterFunc for this test
-}
-
-func mockFileInfoFaster(t *testing.T) {
-	// Backup the original function
-	originalFileInfoFaster := FileInfoFasterFunc
-	// Defer restoration of the original function
-	t.Cleanup(func() { FileInfoFasterFunc = originalFileInfoFaster })
-
-	// Mock the function to skip execution
-	FileInfoFasterFunc = func(opts files.FileOptions) (files.ExtendedFileInfo, error) {
-		return files.ExtendedFileInfo{
-			FileInfo: &files.FileInfo{
-				Path: opts.Path,
-				ItemInfo: files.ItemInfo{
-					Name: "mocked_file",
-					Size: 12345,
-				},
-			},
-		}, nil
-	}
-}
-
-func TestWithAdminHelper(t *testing.T) {
-	setupTestEnv(t)
-	// Mock a user who has admin permissions
-	adminUser := &users.User{
-		ID:       1,
-		Username: "admin",
-		Perm:     users.Permissions{Admin: true}, // Ensure the user is an admin
-	}
-	nonAdminUser := &users.User{
-		ID:       2,
-		Username: "non-admin",
-		Perm:     users.Permissions{Admin: false}, // Non-admin user
-	}
-	// Save the users to the mock database
-	if err := store.Users.Save(adminUser); err != nil {
-		t.Fatal("failed to save admin user:", err)
-	}
-	if err := store.Users.Save(nonAdminUser); err != nil {
-		t.Fatal("failed to save non-admin user:", err)
-	}
-	// Test cases for different scenarios
-	testCases := []struct {
-		name               string
-		expectedStatusCode int
-		user               *users.User
-	}{
-		{
-			name:               "Admin access allowed",
-			expectedStatusCode: http.StatusOK, // Admin should be able to access
-			user:               adminUser,
-		},
-		{
-			name:               "Non-admin access forbidden",
-			expectedStatusCode: http.StatusForbidden, // Non-admin should be forbidden
-			user:               nonAdminUser,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			// Mock the context with the current user
-			data := &requestContext{
-				user: tc.user,
-			}
-			token, err := makeSignedTokenAPI(tc.user, "WEB_TOKEN_"+utils.GenerateRandomHash(4), time.Hour*2, tc.user.Perm)
-			if err != nil {
-				t.Fatalf("Error making token for request: %v", err)
-			}
-
-			// Wrap the usersGetHandler with the middleware
-			handler := withAdminHelper(mockHandler)
-
-			// Create a response recorder to capture the handler's output
-			recorder := httptest.NewRecorder()
-			// Create the request and apply the token as a cookie
-			req, err := http.NewRequest(http.MethodGet, "/users", http.NoBody)
-			if err != nil {
-				t.Fatalf("Error creating request: %v", err)
-			}
-			req.AddCookie(&http.Cookie{
-				Name:  "auth",
-				Value: token.Key,
-			})
-
-			// Call the handler with the test request and mock context
-			status, err := handler(recorder, req, data)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			// Verify the status code
-			if status != tc.expectedStatusCode {
-				t.Errorf("\"%v\" expected status code %d, got %d", tc.name, tc.expectedStatusCode, status)
-			}
-		})
-	}
-}
-
-func TestPublicShareHandlerAuthentication(t *testing.T) {
-	setupTestEnv(t)
-
-	const passwordBcrypt = "$2y$10$TFAmdCbyd/mEZDe5fUeZJu.MaJQXRTwdqb/IQV.eTn6dWrF58gCSe" // bcrypt hashed password
-
-	testCases := []struct {
-		name               string
-		share              *share.Link
-		token              string
-		password           string
-		extraHeaders       map[string]string
-		expectedStatusCode int
-	}{
-		{
-			name: "Public share, no auth required",
-			share: &share.Link{
-				Hash: "public_hash",
-			},
-			expectedStatusCode: 0, // zero means 200 on helpers
-		},
-		{
-			name: "Private share, no auth provided",
-			share: &share.Link{
-				Hash:         "private_hash",
-				UserID:       1,
-				PasswordHash: passwordBcrypt,
-				Token:        "123",
-			},
-			expectedStatusCode: http.StatusUnauthorized,
-		},
-		{
-			name: "Private share, valid token",
-			share: &share.Link{
-				Hash:         "token_hash",
-				UserID:       1,
-				PasswordHash: passwordBcrypt,
-				Token:        "123",
-			},
-			token:              "123",
-			expectedStatusCode: 0, // zero means 200 on helpers
-		},
-		{
-			name: "Private share, invalid password",
-			share: &share.Link{
-				Hash:         "pw_hash",
-				UserID:       1,
-				PasswordHash: passwordBcrypt,
-				Token:        "123",
-			},
-			extraHeaders: map[string]string{
-				"X-SHARE-PASSWORD": "wrong-password",
-			},
-			expectedStatusCode: http.StatusUnauthorized,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			// Save the share in the mock store
-			if err := store.Share.Save(tc.share); err != nil {
-				t.Fatal("failed to save share:", err)
-			}
-
-			// Create a response recorder to capture handler output
-			recorder := httptest.NewRecorder()
-
-			// Wrap the handler with authentication middleware
-			handler := withHashFileHelper(publicShareHandler)
-			if err := store.Settings.Save(&settings.Settings{
-				Auth: settings.Auth{
-					Key: []byte("key"),
-				},
-			}); err != nil {
-				t.Fatalf("failed to save settings: %v", err)
-			}
-
-			// Prepare the request with query parameters and optional headers
-			req := newTestRequest(t, tc.share.Hash, tc.token, tc.password, tc.extraHeaders)
-
-			// Serve the request
-			status, _ := handler(recorder, req, &requestContext{})
-
-			// Check if the response matches the expected status code
-			if status != tc.expectedStatusCode {
-				t.Errorf("expected status code %d, got %d", tc.expectedStatusCode, status)
-			}
-		})
-	}
-}
-
-// Helper function to create a new HTTP request with optional parameters
-func newTestRequest(t *testing.T, hash, token, password string, headers map[string]string) *http.Request {
-	req := newHTTPRequest(t, hash, func(r *http.Request) {
-		// Set query parameters based on provided values
-		q := r.URL.Query()
-		q.Set("path", "/")
-		q.Set("hash", hash)
-		if token != "" {
-			q.Set("token", token)
-		}
-		if password != "" {
-			q.Set("password", password)
-		}
-		r.URL.RawQuery = q.Encode()
-
-		// Set any extra headers if provided
-		for key, value := range headers {
-			r.Header.Set(key, value)
-		}
-	})
-	return req
-}
-
-func mockHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	return http.StatusOK, nil // mock response
-}
-
-// Modify newHTTPRequest to accept the hash and use it in the URL path.
-func newHTTPRequest(t *testing.T, hash string, requestModifiers ...func(*http.Request)) *http.Request {
-	t.Helper()
-	url := "/public/share/" + hash + "/" // Dynamically include the hash in the URL path
-	r, err := http.NewRequest(http.MethodGet, url, http.NoBody)
-	if err != nil {
-		t.Fatalf("failed to create request: %v", err)
-	}
-	for _, modify := range requestModifiers {
-		modify(r)
-	}
-	return r
-}

backend/http/preview.go

@@ -1,3 +1,4 @@
+//go:generate go-enum --sql --marshal --names --file $GOFILE
 package http
 
 import (
@@ -6,16 +7,21 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
 
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/img"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
+	"github.com/gorilla/mux"
+
+	"github.com/gtsteffaniak/filebrowser/files"
+	"github.com/gtsteffaniak/filebrowser/img"
 )
 
+/*
+ENUM(
+thumb
+big
+)
+*/
+type PreviewSize int
+
 type ImgService interface {
 	FormatFromExtension(ext string) (img.Format, error)
 	Resize(ctx context.Context, in io.Reader, width, height int, out io.Writer, options ...img.Option) error
@@ -27,89 +33,84 @@ type FileCache interface {
 	Delete(ctx context.Context, key string) error
 }
 
-// previewHandler handles the preview request for images.
-// @Summary Get image preview
-// @Description Returns a preview image based on the requested path and size.
-// @Tags Resources
-// @Accept json
-// @Produce json
-// @Param path query string true "File path of the image to preview"
-// @Param size query string false "Preview size ('small' or 'large'). Default is based on server config."
-// @Success 200 {file} file "Preview image content"
-// @Failure 202 {object} map[string]string "Download permissions required"
-// @Failure 400 {object} map[string]string "Invalid request path"
-// @Failure 404 {object} map[string]string "File not found"
-// @Failure 415 {object} map[string]string "Unsupported file type for preview"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/preview [get]
-func previewHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	path := r.URL.Query().Get("path")
-	source := r.URL.Query().Get("source")
-	previewSize := r.URL.Query().Get("size")
-	if previewSize != "small" {
-		previewSize = "large"
-	}
-	if path == "" {
-		return http.StatusBadRequest, fmt.Errorf("invalid request path")
-	}
-	response, err := files.FileInfoFaster(files.FileOptions{
-		Path:       filepath.Join(d.user.Scope, path),
-		Modify:     d.user.Perm.Modify,
-		Source:     source,
-		Expand:     true,
-		ReadHeader: config.Server.TypeDetectionByHeader,
-		Checker:    d.user,
-	})
-	fileInfo := response.FileInfo
-	if err != nil {
-		return errToStatus(err), err
-	}
-	if fileInfo.Type == "directory" {
-		return http.StatusBadRequest, fmt.Errorf("can't create preview for directory")
-	}
-	setContentDisposition(w, r, fileInfo.Name)
-	if !strings.HasPrefix(fileInfo.Type, "image") {
-		return http.StatusNotImplemented, fmt.Errorf("can't create preview for %s type", fileInfo.Type)
-	}
-
-	if (previewSize == "large" && !config.Server.ResizePreview) ||
-		(previewSize == "small" && !config.Server.EnableThumbnails) {
+func previewHandler(imgSvc ImgService, fileCache FileCache, enableThumbnails, resizePreview bool) handleFunc {
+	return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 		if !d.user.Perm.Download {
 			return http.StatusAccepted, nil
 		}
-		return rawFileHandler(w, r, fileInfo)
-	}
+		vars := mux.Vars(r)
 
-	format, err := imgSvc.FormatFromExtension(filepath.Ext(fileInfo.Name))
+		previewSize, err := ParsePreviewSize(vars["size"])
+		if err != nil {
+			return http.StatusBadRequest, err
+		}
+
+		file, err := files.FileInfoFaster(files.FileOptions{
+			Fs:         d.user.Fs,
+			Path:       "/" + vars["path"],
+			Modify:     d.user.Perm.Modify,
+			Expand:     true,
+			ReadHeader: d.server.TypeDetectionByHeader,
+			Checker:    d,
+		})
+
+		if err != nil {
+			return errToStatus(err), err
+		}
+		setContentDisposition(w, r, file)
+
+		switch file.Type {
+		case "image":
+			return handleImagePreview(w, r, imgSvc, fileCache, file, previewSize, enableThumbnails, resizePreview)
+		default:
+			return http.StatusNotImplemented, fmt.Errorf("can't create preview for %s type", file.Type)
+		}
+	})
+}
+
+func handleImagePreview(
+	w http.ResponseWriter,
+	r *http.Request,
+	imgSvc ImgService,
+	fileCache FileCache,
+	file *files.FileInfo,
+	previewSize PreviewSize,
+	enableThumbnails, resizePreview bool,
+) (int, error) {
+	if (previewSize == PreviewSizeBig && !resizePreview) ||
+		(previewSize == PreviewSizeThumb && !enableThumbnails) {
+		return rawFileHandler(w, r, file)
+	}
+	format, err := imgSvc.FormatFromExtension(file.Extension)
 	// Unsupported extensions directly return the raw data
 	if err == img.ErrUnsupportedFormat || format == img.FormatGif {
-		if !d.user.Perm.Download {
-			return http.StatusAccepted, nil
-		}
-		return rawFileHandler(w, r, fileInfo)
+		return rawFileHandler(w, r, file)
 	}
 	if err != nil {
 		return errToStatus(err), err
 	}
-	cacheKey := previewCacheKey(response.RealPath, previewSize, fileInfo.ModTime)
+
+	cacheKey := previewCacheKey(file, previewSize)
 	resizedImage, ok, err := fileCache.Load(r.Context(), cacheKey)
 	if err != nil {
 		return errToStatus(err), err
 	}
-
 	if !ok {
-		resizedImage, err = createPreview(imgSvc, fileCache, response, previewSize)
+		resizedImage, err = createPreview(imgSvc, fileCache, file, previewSize)
 		if err != nil {
 			return errToStatus(err), err
 		}
 	}
+
 	w.Header().Set("Cache-Control", "private")
-	http.ServeContent(w, r, response.RealPath, fileInfo.ModTime, bytes.NewReader(resizedImage))
+	http.ServeContent(w, r, file.Name, file.ModTime, bytes.NewReader(resizedImage))
+
 	return 0, nil
 }
 
-func createPreview(imgSvc ImgService, fileCache FileCache, file files.ExtendedFileInfo, previewSize string) ([]byte, error) {
-	fd, err := os.Open(file.RealPath)
+func createPreview(imgSvc ImgService, fileCache FileCache,
+	file *files.FileInfo, previewSize PreviewSize) ([]byte, error) {
+	fd, err := file.Fs.Open(file.Path)
 	if err != nil {
 		return nil, err
 	}
@@ -122,11 +123,11 @@ func createPreview(imgSvc ImgService, fileCache FileCache, file files.ExtendedFi
 	)
 
 	switch {
-	case previewSize == "large":
+	case previewSize == PreviewSizeBig:
 		width = 1080
 		height = 1080
 		options = append(options, img.WithMode(img.ResizeModeFit), img.WithQuality(img.QualityMedium))
-	case previewSize == "small":
+	case previewSize == PreviewSizeThumb:
 		width = 256
 		height = 256
 		options = append(options, img.WithMode(img.ResizeModeFill), img.WithQuality(img.QualityLow), img.WithFormat(img.FormatJpeg))
@@ -140,32 +141,15 @@ func createPreview(imgSvc ImgService, fileCache FileCache, file files.ExtendedFi
 	}
 
 	go func() {
-		cacheKey := previewCacheKey(file.RealPath, previewSize, file.FileInfo.ModTime)
+		cacheKey := previewCacheKey(file, previewSize)
 		if err := fileCache.Store(context.Background(), cacheKey, buf.Bytes()); err != nil {
-			logger.Error(fmt.Sprintf("failed to cache resized image: %v", err))
+			fmt.Printf("failed to cache resized image: %v", err)
 		}
 	}()
 
 	return buf.Bytes(), nil
 }
 
-// Generates a cache key for the preview image
-func previewCacheKey(realPath, previewSize string, modTime time.Time) string {
-	return fmt.Sprintf("%x%x%x", realPath, modTime.Unix(), previewSize)
-}
-
-func rawFileHandler(w http.ResponseWriter, r *http.Request, file *files.FileInfo) (int, error) {
-	idx := files.GetIndex("default")
-	realPath, _, _ := idx.GetRealPath(file.Path)
-	fd, err := os.Open(realPath)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	defer fd.Close()
-
-	setContentDisposition(w, r, file.Name)
-
-	w.Header().Set("Cache-Control", "private")
-	http.ServeContent(w, r, file.Name, file.ModTime, fd)
-	return 0, nil
+func previewCacheKey(f *files.FileInfo, previewSize PreviewSize) string {
+	return fmt.Sprintf("%x%x%x", f.RealPath(), f.ModTime.Unix(), previewSize)
 }

backend/http/preview_enum.go

@@ -0,0 +1,100 @@
+// Code generated by go-enum
+// DO NOT EDIT!
+
+package http
+
+import (
+	"database/sql/driver"
+	"fmt"
+	"strings"
+)
+
+const (
+	// PreviewSizeThumb is a PreviewSize of type Thumb
+	PreviewSizeThumb PreviewSize = iota
+	// PreviewSizeBig is a PreviewSize of type Big
+	PreviewSizeBig
+)
+
+const _PreviewSizeName = "thumbbig"
+
+var _PreviewSizeNames = []string{
+	_PreviewSizeName[0:5],
+	_PreviewSizeName[5:8],
+}
+
+// PreviewSizeNames returns a list of possible string values of PreviewSize.
+func PreviewSizeNames() []string {
+	tmp := make([]string, len(_PreviewSizeNames))
+	copy(tmp, _PreviewSizeNames)
+	return tmp
+}
+
+var _PreviewSizeMap = map[PreviewSize]string{
+	0: _PreviewSizeName[0:5],
+	1: _PreviewSizeName[5:8],
+}
+
+// String implements the Stringer interface.
+func (x PreviewSize) String() string {
+	if str, ok := _PreviewSizeMap[x]; ok {
+		return str
+	}
+	return fmt.Sprintf("PreviewSize(%d)", x)
+}
+
+var _PreviewSizeValue = map[string]PreviewSize{
+	_PreviewSizeName[0:5]: 0,
+	_PreviewSizeName[5:8]: 1,
+}
+
+// ParsePreviewSize attempts to convert a string to a PreviewSize
+func ParsePreviewSize(name string) (PreviewSize, error) {
+	if x, ok := _PreviewSizeValue[name]; ok {
+		return x, nil
+	}
+	return PreviewSize(0), fmt.Errorf("%s is not a valid PreviewSize, try [%s]", name, strings.Join(_PreviewSizeNames, ", "))
+}
+
+// MarshalText implements the text marshaller method
+func (x PreviewSize) MarshalText() ([]byte, error) {
+	return []byte(x.String()), nil
+}
+
+// UnmarshalText implements the text unmarshaller method
+func (x *PreviewSize) UnmarshalText(text []byte) error {
+	name := string(text)
+	tmp, err := ParsePreviewSize(name)
+	if err != nil {
+		return err
+	}
+	*x = tmp
+	return nil
+}
+
+// Scan implements the Scanner interface.
+func (x *PreviewSize) Scan(value interface{}) error {
+	var name string
+
+	switch v := value.(type) {
+	case string:
+		name = v
+	case []byte:
+		name = string(v)
+	case nil:
+		*x = PreviewSize(0)
+		return nil
+	}
+
+	tmp, err := ParsePreviewSize(name)
+	if err != nil {
+		return err
+	}
+	*x = tmp
+	return nil
+}
+
+// Value implements the driver Valuer interface.
+func (x PreviewSize) Value() (driver.Value, error) {
+	return x.String(), nil
+}

backend/http/public.go

@@ -1,49 +1,126 @@
 package http
 
 import (
-	"encoding/json"
-	"fmt"
+	"errors"
 	"net/http"
+	"net/url"
+	"path"
+	"path/filepath"
 	"strings"
 
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/spf13/afero"
+	"golang.org/x/crypto/bcrypt"
 
-	_ "github.com/gtsteffaniak/filebrowser/backend/swagger/docs"
+	"github.com/gtsteffaniak/filebrowser/files"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/share"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
-func publicShareHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	file, ok := d.raw.(files.ExtendedFileInfo)
-	if !ok {
-		return http.StatusInternalServerError, fmt.Errorf("failed to assert type files.FileInfo")
+var withHashFile = func(fn handleFunc) handleFunc {
+	return func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		id, path := ifPathWithName(r)
+		link, err := d.store.Share.GetByHash(id)
+		if err != nil {
+			return errToStatus(err), err
+		}
+		if link.Hash != "" {
+			status, err := authenticateShareRequest(r, link)
+			if status != 0 || err != nil {
+				return status, err
+			}
+		}
+		d.user = &users.PublicUser
+		if path == "/" {
+			path = link.Path
+		} else if strings.HasPrefix("/"+path, link.Path) {
+			path = "/" + path
+		} else {
+			path = link.Path + "/" + path
+		}
+		sharePath := settings.Config.Server.Root + path
+		lastComponent := filepath.Base(sharePath)
+		basePath := filepath.Dir(sharePath)
+		fsPath := afero.NewBasePathFs(afero.NewOsFs(), basePath)
+		file, err := files.FileInfoFaster(files.FileOptions{
+			Fs:         fsPath,
+			Path:       lastComponent,
+			Modify:     d.user.Perm.Modify,
+			Expand:     false,
+			ReadHeader: d.server.TypeDetectionByHeader,
+			Checker:    d,
+			Token:      link.Token,
+		})
+		if err != nil {
+			return errToStatus(err), err
+		}
+		d.raw = file
+		return fn(w, r, d)
 	}
-	file.Path = strings.TrimPrefix(file.Path, files.RootPaths["default"])
-	return renderJSON(w, r, file)
 }
 
-func publicUserGetHandler(w http.ResponseWriter, r *http.Request) {
+func ifPathWithName(r *http.Request) (id, filePath string) {
+	pathElements := strings.Split(r.URL.Path, "/")
+	id = pathElements[0]
+	allButFirst := path.Join(pathElements[1:]...)
+	if len(pathElements) == 1 {
+		allButFirst = "/"
+	}
+	return id, allButFirst
+}
+
+var publicShareHandler = withHashFile(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	file := d.raw.(*files.FileInfo)
+	file.Path = strings.TrimPrefix(file.Path, settings.Config.Server.Root)
+	if file.IsDir {
+		return renderJSON(w, r, file)
+	}
+
+	return renderJSON(w, r, file)
+})
+
+var publicUserGetHandler = func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 	// Call the actual handler logic here (e.g., renderJSON, etc.)
 	// You may need to replace `fn` with the actual handler logic.
-	status, err := renderJSON(w, r, users.PublicUser)
-	if err != nil {
-		http.Error(w, http.StatusText(status), status)
-	}
+	return renderJSON(w, r, users.PublicUser)
 }
 
-// health godoc
-// @Summary Health Check
-// @Schemes
-// @Description Returns the health status of the API.
-// @Tags Health
-// @Accept json
-// @Produce json
-// @Success 200 {object} HttpResponse "successful health check response"
-// @Router /health [get]
-func healthHandler(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-	response := HttpResponse{Message: "ok"}    // Create response with status "ok"
-	err := json.NewEncoder(w).Encode(response) // Encode the response into JSON
-	if err != nil {
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+var publicDlHandler = withHashFile(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	file := d.raw.(*files.FileInfo)
+	if !file.IsDir {
+		return rawFileHandler(w, r, file)
 	}
+
+	return rawDirHandler(w, r, d, file)
+})
+
+func authenticateShareRequest(r *http.Request, l *share.Link) (int, error) {
+	if l.PasswordHash == "" {
+		return 0, nil
+	}
+
+	if r.URL.Query().Get("token") == l.Token {
+		return 0, nil
+	}
+
+	password := r.Header.Get("X-SHARE-PASSWORD")
+	password, err := url.QueryUnescape(password)
+	if err != nil {
+		return 0, err
+	}
+	if password == "" {
+		return http.StatusUnauthorized, nil
+	}
+	if err := bcrypt.CompareHashAndPassword([]byte(l.PasswordHash), []byte(password)); err != nil {
+		if errors.Is(err, bcrypt.ErrMismatchedHashAndPassword) {
+			return http.StatusUnauthorized, nil
+		}
+		return 0, err
+	}
+	return 0, nil
+}
+
+func healthHandler(w http.ResponseWriter, _ *http.Request) {
+	w.WriteHeader(http.StatusOK)
+	_, _ = w.Write([]byte(`{"status":"OK"}`))
 }

backend/http/public_test.go

@@ -0,0 +1,136 @@
+package http
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"path/filepath"
+	"testing"
+
+	"github.com/asdine/storm/v3"
+	"github.com/spf13/afero"
+
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/share"
+	"github.com/gtsteffaniak/filebrowser/storage/bolt"
+	"github.com/gtsteffaniak/filebrowser/users"
+)
+
+func TestPublicShareHandlerAuthentication(t *testing.T) {
+	t.Parallel()
+
+	const passwordBcrypt = "$2y$10$TFAmdCbyd/mEZDe5fUeZJu.MaJQXRTwdqb/IQV.eTn6dWrF58gCSe" //nolint:gosec
+	testCases := map[string]struct {
+		share              *share.Link
+		req                *http.Request
+		expectedStatusCode int
+	}{
+		"Public share, no auth required": {
+			share:              &share.Link{Hash: "h"},
+			req:                newHTTPRequest(t),
+			expectedStatusCode: 200,
+		},
+		"Private share, no auth provided, 401": {
+			share:              &share.Link{Hash: "h", UserID: 1, PasswordHash: passwordBcrypt, Token: "123"},
+			req:                newHTTPRequest(t),
+			expectedStatusCode: 401,
+		},
+		"Private share, authentication via token": {
+			share:              &share.Link{Hash: "h", UserID: 1, PasswordHash: passwordBcrypt, Token: "123"},
+			req:                newHTTPRequest(t, func(r *http.Request) { r.URL.RawQuery = "token=123" }),
+			expectedStatusCode: 200,
+		},
+		"Private share, authentication via invalid token, 401": {
+			share:              &share.Link{Hash: "h", UserID: 1, PasswordHash: passwordBcrypt, Token: "123"},
+			req:                newHTTPRequest(t, func(r *http.Request) { r.URL.RawQuery = "token=1234" }),
+			expectedStatusCode: 401,
+		},
+		"Private share, authentication via password": {
+			share:              &share.Link{Hash: "h", UserID: 1, PasswordHash: passwordBcrypt, Token: "123"},
+			req:                newHTTPRequest(t, func(r *http.Request) { r.Header.Set("X-SHARE-PASSWORD", "password") }),
+			expectedStatusCode: 200,
+		},
+		"Private share, authentication via invalid password, 401": {
+			share:              &share.Link{Hash: "h", UserID: 1, PasswordHash: passwordBcrypt, Token: "123"},
+			req:                newHTTPRequest(t, func(r *http.Request) { r.Header.Set("X-SHARE-PASSWORD", "wrong-password") }),
+			expectedStatusCode: 401,
+		},
+	}
+
+	for name, tc := range testCases {
+		for handlerName, handler := range map[string]handleFunc{"public share handler": publicShareHandler, "public dl handler": publicDlHandler} {
+			name, tc, handlerName, handler := name, tc, handlerName, handler
+			t.Run(fmt.Sprintf("%s: %s", handlerName, name), func(t *testing.T) {
+				t.Parallel()
+
+				dbPath := filepath.Join(t.TempDir(), "db")
+				db, err := storm.Open(dbPath)
+				if err != nil {
+					t.Fatalf("failed to open db: %v", err)
+				}
+
+				t.Cleanup(func() {
+					if err := db.Close(); err != nil { //nolint:govet
+						t.Errorf("failed to close db: %v", err)
+					}
+				})
+
+				storage, err := bolt.NewStorage(db)
+				if err != nil {
+					t.Fatalf("failed to get storage: %v", err)
+				}
+				if err := storage.Share.Save(tc.share); err != nil {
+					t.Fatalf("failed to save share: %v", err)
+				}
+				if err := storage.Settings.Save(&settings.Settings{
+					Auth: settings.Auth{
+						Key: []byte("key"),
+					},
+				}); err != nil {
+					t.Fatalf("failed to save settings: %v", err)
+				}
+
+				storage.Users = &customFSUser{
+					Store: storage.Users,
+					fs:    &afero.MemMapFs{},
+				}
+
+				recorder := httptest.NewRecorder()
+				handler := handle(handler, "", storage, &settings.Server{})
+				handler.ServeHTTP(recorder, tc.req)
+				result := recorder.Result()
+				defer result.Body.Close()
+				if result.StatusCode != tc.expectedStatusCode {
+					t.Errorf("expected status code %d, got status code %d", tc.expectedStatusCode, result.StatusCode)
+				}
+			})
+		}
+	}
+}
+
+func newHTTPRequest(t *testing.T, requestModifiers ...func(*http.Request)) *http.Request {
+	t.Helper()
+	r, err := http.NewRequest(http.MethodGet, "h", http.NoBody)
+	if err != nil {
+		t.Fatalf("failed to construct request: %v", err)
+	}
+	for _, modify := range requestModifiers {
+		modify(r)
+	}
+	return r
+}
+
+type customFSUser struct {
+	users.Store
+	fs afero.Fs
+}
+
+func (cu *customFSUser) Get(baseScope string, id interface{}) (*users.User, error) {
+	user, err := cu.Store.Get(baseScope, id)
+	if err != nil {
+		return nil, err
+	}
+	user.Fs = cu.fs
+
+	return user, nil
+}

backend/http/raw.go

@@ -1,270 +1,212 @@
 package http
 
 import (
-	"archive/tar"
-	"archive/zip"
-	"compress/gzip"
 	"errors"
-	"fmt"
-	"io"
+	"log"
 	"net/http"
 	"net/url"
-	"os"
+	gopath "path"
 	"path/filepath"
 	"strings"
 
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
+	"github.com/mholt/archiver/v3"
+
+	"github.com/gtsteffaniak/filebrowser/files"
+	"github.com/gtsteffaniak/filebrowser/fileutils"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
-func setContentDisposition(w http.ResponseWriter, r *http.Request, fileName string) {
+func slashClean(name string) string {
+	if name == "" || name[0] != '/' {
+		name = "/" + name
+	}
+	return gopath.Clean(name)
+}
+
+func parseQueryFiles(r *http.Request, f *files.FileInfo, _ *users.User) ([]string, error) {
+	var fileSlice []string
+	names := strings.Split(r.URL.Query().Get("files"), ",")
+
+	if len(names) == 0 {
+		fileSlice = append(fileSlice, f.Path)
+	} else {
+		for _, name := range names {
+			name, err := url.QueryUnescape(strings.Replace(name, "+", "%2B", -1)) //nolint:govet
+			if err != nil {
+				return nil, err
+			}
+
+			name = slashClean(name)
+			fileSlice = append(fileSlice, filepath.Join(f.Path, name))
+		}
+	}
+
+	return fileSlice, nil
+}
+
+// nolint: goconst,nolintlint
+func parseQueryAlgorithm(r *http.Request) (string, archiver.Writer, error) {
+	// TODO: use enum
+	switch r.URL.Query().Get("algo") {
+	case "zip", "true", "":
+		return ".zip", archiver.NewZip(), nil
+	case "tar":
+		return ".tar", archiver.NewTar(), nil
+	case "targz":
+		return ".tar.gz", archiver.NewTarGz(), nil
+	case "tarbz2":
+		return ".tar.bz2", archiver.NewTarBz2(), nil
+	case "tarxz":
+		return ".tar.xz", archiver.NewTarXz(), nil
+	case "tarlz4":
+		return ".tar.lz4", archiver.NewTarLz4(), nil
+	case "tarsz":
+		return ".tar.sz", archiver.NewTarSz(), nil
+	default:
+		return "", nil, errors.New("format not implemented")
+	}
+}
+
+func setContentDisposition(w http.ResponseWriter, r *http.Request, file *files.FileInfo) {
 	if r.URL.Query().Get("inline") == "true" {
 		w.Header().Set("Content-Disposition", "inline")
 	} else {
 		// As per RFC6266 section 4.3
-		w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(fileName))
+		w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(file.Name))
 	}
 }
 
-// rawHandler serves the raw content of a file, multiple files, or directory in various formats.
-// @Summary Get raw content of a file, multiple files, or directory
-// @Description Returns the raw content of a file, multiple files, or a directory. Supports downloading files as archives in various formats.
-// @Tags Resources
-// @Accept json
-// @Produce json
-// @Param files query string true "Comma-separated list of specific files within the directory (required)"
-// @Param inline query bool false "If true, sets 'Content-Disposition' to 'inline'. Otherwise, defaults to 'attachment'."
-// @Param algo query string false "Compression algorithm for archiving multiple files or directories. Options: 'zip' and 'tar.gz'. Default is 'zip'."
-// @Success 200 {file} file "Raw file or directory content, or archive for multiple files"
-// @Failure 202 {object} map[string]string "Download permissions required"
-// @Failure 400 {object} map[string]string "Invalid request path"
-// @Failure 404 {object} map[string]string "File or directory not found"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/raw [get]
-func rawHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
+var rawHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 	if !d.user.Perm.Download {
 		return http.StatusAccepted, nil
 	}
 
-	filePrefix := ""
-	file, ok := d.raw.(files.ExtendedFileInfo)
-	if ok {
-		filePrefix = file.Path
-	}
-	encodedFiles := r.URL.Query().Get("files")
-	// Decode the URL-encoded path
-	files, err := url.QueryUnescape(encodedFiles)
+	file, err := files.FileInfoFaster(files.FileOptions{
+		Fs:         d.user.Fs,
+		Path:       r.URL.Path,
+		Modify:     d.user.Perm.Modify,
+		Expand:     false,
+		ReadHeader: d.server.TypeDetectionByHeader,
+		Checker:    d,
+	})
 	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
+		return errToStatus(err), err
 	}
-	fileList := strings.Split(files, ",")
-	for i, f := range fileList {
-		fileList[i] = filepath.Join(filePrefix, f)
+	if files.IsNamedPipe(file.Mode) {
+		setContentDisposition(w, r, file)
+		return 0, nil
 	}
-	return rawFilesHandler(w, r, d, fileList)
-}
-func addFile(path string, d *requestContext, tarWriter *tar.Writer, zipWriter *zip.Writer, flatten bool) error {
-	idx := files.GetIndex("default")
-	realPath, _, _ := idx.GetRealPath(d.user.Scope, path)
-	if !d.user.Check(realPath) {
+
+	if !file.IsDir {
+		return rawFileHandler(w, r, file)
+	}
+
+	return rawDirHandler(w, r, d, file)
+})
+
+func addFile(ar archiver.Writer, d *data, path, commonPath string) error {
+	if !d.Check(path) {
 		return nil
 	}
-	info, err := os.Stat(realPath)
+	info, err := d.user.Fs.Stat(path)
 	if err != nil {
 		return err
 	}
 
-	// Get the base name of the top-level folder or file
-	baseName := filepath.Base(realPath)
-
-	if info.IsDir() {
-		// Walk through directory contents
-		return filepath.Walk(realPath, func(filePath string, fileInfo os.FileInfo, err error) error {
-			if err != nil {
-				return err
-			}
-
-			// Calculate the relative path
-			relPath, err := filepath.Rel(realPath, filePath) // Use realPath directly
-			if err != nil {
-				return err
-			}
-
-			// Normalize for tar: convert \ to /
-			relPath = filepath.ToSlash(relPath)
-
-			// Skip adding `.` (current directory)
-			if relPath == "." {
-				return nil
-			}
-
-			// Prepend base folder name unless flatten is true
-			if !flatten {
-				relPath = filepath.Join(baseName, relPath)
-				relPath = filepath.ToSlash(relPath) // Ensure normalized separators
-			}
-
-			if fileInfo.IsDir() {
-				if tarWriter != nil {
-					header := &tar.Header{
-						Name:     relPath + "/",
-						Mode:     0755,
-						Typeflag: tar.TypeDir,
-						ModTime:  fileInfo.ModTime(),
-					}
-					return tarWriter.WriteHeader(header)
-				}
-				if zipWriter != nil {
-					_, err := zipWriter.Create(relPath + "/")
-					return err
-				}
-				return nil
-			}
-			return addSingleFile(filePath, relPath, zipWriter, tarWriter)
-		})
+	if !info.IsDir() && !info.Mode().IsRegular() {
+		return nil
 	}
 
-	// For a single file, use the base name as the archive path
-	return addSingleFile(realPath, baseName, zipWriter, tarWriter)
-}
-
-func addSingleFile(realPath, archivePath string, zipWriter *zip.Writer, tarWriter *tar.Writer) error {
-	file, err := os.Open(realPath)
+	file, err := d.user.Fs.Open(path)
 	if err != nil {
 		return err
 	}
 	defer file.Close()
 
-	info, err := os.Stat(realPath)
-	if err != nil {
-		return err
+	if path != commonPath {
+		filename := strings.TrimPrefix(path, commonPath)
+		filename = strings.TrimPrefix(filename, string(filepath.Separator))
+		err = ar.Write(archiver.File{
+			FileInfo: archiver.FileInfo{
+				FileInfo:   info,
+				CustomName: filename,
+			},
+			ReadCloser: file,
+		})
+		if err != nil {
+			return err
+		}
 	}
 
-	if tarWriter != nil {
-		header, err := tar.FileInfoHeader(info, "")
+	if info.IsDir() {
+		names, err := file.Readdirnames(0)
 		if err != nil {
 			return err
 		}
-		// Ensure correct relative path
-		header.Name = filepath.ToSlash(archivePath)
-		if err = tarWriter.WriteHeader(header); err != nil {
-			return err
-		}
-		_, err = io.Copy(tarWriter, file)
-		return err
-	}
 
-	if zipWriter != nil {
-		header, err := zip.FileInfoHeader(info)
-		if err != nil {
-			return err
+		for _, name := range names {
+			fPath := filepath.Join(path, name)
+			err = addFile(ar, d, fPath, commonPath)
+			if err != nil {
+				log.Printf("Failed to archive %s: %v", fPath, err)
+			}
 		}
-		header.Name = archivePath
-		writer, err := zipWriter.CreateHeader(header)
-		if err != nil {
-			return err
-		}
-		_, err = io.Copy(writer, file)
-		return err
 	}
 
 	return nil
 }
 
-func rawFilesHandler(w http.ResponseWriter, r *http.Request, d *requestContext, fileList []string) (int, error) {
-	filePath := fileList[0]
-	fileName := filepath.Base(filePath)
-	idx := files.GetIndex("default")
-	realPath, isDir, err := idx.GetRealPath(d.user.Scope, filePath)
+func rawDirHandler(w http.ResponseWriter, r *http.Request, d *data, file *files.FileInfo) (int, error) {
+	filenames, err := parseQueryFiles(r, file, d.user)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
-	if len(fileList) == 1 && !isDir {
-		fd, err2 := os.Open(realPath)
-		if err2 != nil {
-			return http.StatusInternalServerError, err
-		}
-		defer fd.Close()
-
-		// Get file information
-		fileInfo, err3 := fd.Stat()
-		if err3 != nil {
-			return http.StatusInternalServerError, err
-		}
-
-		// Set headers and serve the file
-		setContentDisposition(w, r, fileName)
-		w.Header().Set("Cache-Control", "private")
-
-		// Serve the content
-		http.ServeContent(w, r, fileName, fileInfo.ModTime(), fd)
-		return 0, nil
-	}
-
-	algo := r.URL.Query().Get("algo")
-	var extension string
-	switch algo {
-	case "zip", "true", "":
-		extension = ".zip"
-	case "tar.gz":
-		extension = ".tar.gz"
-	default:
-		return http.StatusInternalServerError, errors.New("format not implemented")
-	}
-	baseDirName := filepath.Base(filepath.Dir(realPath))
-	if baseDirName == "" || baseDirName == "/" {
-		baseDirName = "download"
-	}
-	if len(fileList) == 1 && isDir {
-		baseDirName = filepath.Base(realPath)
-	}
-	downloadFileName := url.PathEscape(baseDirName + extension)
-	w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+downloadFileName)
-	// Create the archive and stream it directly to the response
-	if extension == ".zip" {
-		err = createZip(w, d, fileList...)
-	} else {
-		err = createTarGz(w, d, fileList...)
-	}
 
+	extension, ar, err := parseQueryAlgorithm(r)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
+	err = ar.Create(w)
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+	defer ar.Close()
+
+	commonDir := fileutils.CommonPrefix(filepath.Separator, filenames...)
+
+	name := filepath.Base(commonDir)
+	if name == "." || name == "" || name == string(filepath.Separator) {
+		name = file.Name
+	}
+	// Prefix used to distinguish a filelist generated
+	// archive from the full directory archive
+	if len(filenames) > 1 {
+		name = "_" + name
+	}
+	name += extension
+	w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(name))
+
+	for _, fname := range filenames {
+		err = addFile(ar, d, fname, commonDir)
+		if err != nil {
+			log.Printf("Failed to archive %s: %v", fname, err)
+		}
+	}
+
 	return 0, nil
 }
 
-func createZip(w io.Writer, d *requestContext, filenames ...string) error {
-	zipWriter := zip.NewWriter(w)
-	defer zipWriter.Close()
-
-	// Check if we have exactly one directory
-	//flatten := len(filenames) == 1
-	for _, fname := range filenames {
-		err := addFile(fname, d, nil, zipWriter, false)
-		if err != nil {
-			logger.Error(fmt.Sprintf("Failed to add %s to ZIP: %v", fname, err))
-		}
+func rawFileHandler(w http.ResponseWriter, r *http.Request, file *files.FileInfo) (int, error) {
+	fd, err := file.Fs.Open(file.Path)
+	if err != nil {
+		return http.StatusInternalServerError, err
 	}
+	defer fd.Close()
 
-	return nil
-}
-
-func createTarGz(w io.Writer, d *requestContext, filenames ...string) error {
-	gzWriter := gzip.NewWriter(w)
-	defer gzWriter.Close()
-
-	tarWriter := tar.NewWriter(gzWriter)
-	defer tarWriter.Close()
-
-	// Check if we have exactly one directory
-	//flatten := len(filenames) == 1
-	for _, fname := range filenames {
-		err := addFile(fname, d, tarWriter, nil, false)
-		if err != nil {
-			logger.Error(fmt.Sprintf("Failed to add %s to TAR.GZ: %v", fname, err))
-		}
-	}
-
-	return nil
+	setContentDisposition(w, r, file)
+
+	w.Header().Set("Cache-Control", "private")
+	http.ServeContent(w, r, file.Name, file.ModTime, fd)
+	return 0, nil
 }

backend/http/resource.go

@@ -3,374 +3,327 @@ package http
 import (
 	"context"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
 	"path"
 	"path/filepath"
-	"strconv"
 	"strings"
 
 	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/spf13/afero"
 
-	"github.com/gtsteffaniak/filebrowser/backend/errors"
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/utils"
+	"github.com/gtsteffaniak/filebrowser/errors"
+	"github.com/gtsteffaniak/filebrowser/files"
+	"github.com/gtsteffaniak/filebrowser/fileutils"
 )
 
-// resourceGetHandler retrieves information about a resource.
-// @Summary Get resource information
-// @Description Returns metadata and optionally file contents for a specified resource path.
-// @Tags Resources
-// @Accept json
-// @Produce json
-// @Param path query string true "Path to the resource"
-// @Param source query string false "Source name for the desired source, default is used if not provided"
-// @Param source query string false "Name for the desired source, default is used if not provided"
-// @Param content query string false "Include file content if true"
-// @Param checksum query string false "Optional checksum validation"
-// @Success 200 {object} files.FileInfo "Resource metadata"
-// @Failure 404 {object} map[string]string "Resource not found"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/resources [get]
-func resourceGetHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	encodedPath := r.URL.Query().Get("path")
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
-	// Decode the URL-encoded path
-	path, err := url.QueryUnescape(encodedPath)
-	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
-	}
-	fileInfo, err := files.FileInfoFaster(files.FileOptions{
-		Path:       filepath.Join(d.user.Scope, path),
+var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	file, err := files.FileInfoFaster(files.FileOptions{
+		Fs:         d.user.Fs,
+		Path:       r.URL.Path,
 		Modify:     d.user.Perm.Modify,
-		Source:     source,
 		Expand:     true,
-		ReadHeader: config.Server.TypeDetectionByHeader,
-		Checker:    d.user,
+		ReadHeader: d.server.TypeDetectionByHeader,
+		Checker:    d,
 		Content:    r.URL.Query().Get("content") == "true",
 	})
 	if err != nil {
 		return errToStatus(err), err
 	}
-	if fileInfo.Type == "directory" {
-		return renderJSON(w, r, fileInfo)
+	if file.IsDir {
+		file.Listing.Sorting = d.user.Sorting
+		return renderJSON(w, r, file)
 	}
-	if algo := r.URL.Query().Get("checksum"); algo != "" {
-		checksums, err := files.GetChecksum(fileInfo.Path, algo)
+	if checksum := r.URL.Query().Get("checksum"); checksum != "" {
+		err := file.Checksum(checksum)
 		if err == errors.ErrInvalidOption {
 			return http.StatusBadRequest, nil
 		} else if err != nil {
 			return http.StatusInternalServerError, err
 		}
-		fileInfo.Checksums = checksums
-	}
-	return renderJSON(w, r, fileInfo)
-
-}
-
-// resourceDeleteHandler deletes a resource at a specified path.
-// @Summary Delete a resource
-// @Description Deletes a resource located at the specified path.
-// @Tags Resources
-// @Accept json
-// @Produce json
-// @Param path query string true "Path to the resource"
-// @Param source query string false "Source name for the desired source, default is used if not provided"
-// @Param source query string false "Name for the desired source, default is used if not provided"
-// @Success 200 "Resource deleted successfully"
-// @Failure 403 {object} map[string]string "Forbidden"
-// @Failure 404 {object} map[string]string "Resource not found"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/resources [delete]
-func resourceDeleteHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	// TODO source := r.URL.Query().Get("source")
-	encodedPath := r.URL.Query().Get("path")
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
-	// Decode the URL-encoded path
-	path, err := url.QueryUnescape(encodedPath)
-	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
-	}
-	if path == "/" || !d.user.Perm.Delete {
-		return http.StatusForbidden, nil
-	}
-	fileOpts := files.FileOptions{
-		Path:       filepath.Join(d.user.Scope, path),
-		Source:     source,
-		Modify:     d.user.Perm.Modify,
-		Expand:     false,
-		ReadHeader: config.Server.TypeDetectionByHeader,
-		Checker:    d.user,
-	}
-	fileInfo, err := files.FileInfoFaster(fileOpts)
-	if err != nil {
-		return errToStatus(err), err
 	}
 
-	// delete thumbnails
-	err = delThumbs(r.Context(), fileCache, fileInfo)
-	if err != nil {
-		return errToStatus(err), err
-	}
+	return renderJSON(w, r, file)
+})
 
-	err = files.DeleteFiles(source, fileInfo.RealPath, filepath.Dir(fileInfo.RealPath))
-	if err != nil {
-		return errToStatus(err), err
-	}
-	return http.StatusOK, nil
-
-}
-
-// resourcePostHandler creates or uploads a new resource.
-// @Summary Create or upload a resource
-// @Description Creates a new resource or uploads a file at the specified path. Supports file uploads and directory creation.
-// @Tags Resources
-// @Accept json
-// @Produce json
-// @Param path query string true "Path to the resource"
-// @Param source query string false "Source name for the desired source, default is used if not provided"
-// @Param source query string false "Name for the desired source, default is used if not provided"
-// @Param override query bool false "Override existing file if true"
-// @Success 200 "Resource created successfully"
-// @Failure 403 {object} map[string]string "Forbidden"
-// @Failure 404 {object} map[string]string "Resource not found"
-// @Failure 409 {object} map[string]string "Conflict - Resource already exists"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/resources [post]
-func resourcePostHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	encodedPath := r.URL.Query().Get("path")
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
-	// Decode the URL-encoded path
-	path, err := url.QueryUnescape(encodedPath)
-	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
-	}
-	if !d.user.Perm.Create || !d.user.Check(path) {
-		return http.StatusForbidden, nil
-	}
-	fileOpts := files.FileOptions{
-		Path:    filepath.Join(d.user.Scope, path),
-		Source:  source,
-		Modify:  d.user.Perm.Modify,
-		Expand:  false,
-		Checker: d.user,
-	}
-	// Directories creation on POST.
-	if strings.HasSuffix(path, "/") {
-		err = files.WriteDirectory(fileOpts)
-		if err != nil {
-			return errToStatus(err), err
-		}
-		return http.StatusOK, nil
-	}
-	fileInfo, err := files.FileInfoFaster(fileOpts)
-	if err == nil {
-		if r.URL.Query().Get("override") != "true" {
-			return http.StatusConflict, nil
-		}
-
-		// Permission for overwriting the file
-		if !d.user.Perm.Modify {
+func resourceDeleteHandler(fileCache FileCache) handleFunc {
+	return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		if r.URL.Path == "/" || !d.user.Perm.Delete {
 			return http.StatusForbidden, nil
 		}
 
-		err = delThumbs(r.Context(), fileCache, fileInfo)
+		file, err := files.FileInfoFaster(files.FileOptions{
+			Fs:         d.user.Fs,
+			Path:       r.URL.Path,
+			Modify:     d.user.Perm.Modify,
+			Expand:     false,
+			ReadHeader: d.server.TypeDetectionByHeader,
+			Checker:    d,
+		})
 		if err != nil {
 			return errToStatus(err), err
 		}
-	}
-	err = files.WriteFile(fileOpts, r.Body)
-	if err != nil {
-		return errToStatus(err), err
 
-	}
-	return http.StatusOK, nil
+		// delete thumbnails
+		err = delThumbs(r.Context(), fileCache, file)
+		if err != nil {
+			return errToStatus(err), err
+		}
+
+		err = d.RunHook(func() error {
+			return d.user.Fs.RemoveAll(r.URL.Path)
+		}, "delete", r.URL.Path, "", d.user)
+
+		if err != nil {
+			return errToStatus(err), err
+		}
+
+		return http.StatusOK, nil
+	})
 }
 
-// resourcePutHandler updates an existing file resource.
-// @Summary Update a file resource
-// @Description Updates an existing file at the specified path.
-// @Tags Resources
-// @Accept json
-// @Produce json
-// @Param path query string true "Path to the resource"
-// @Param source query string false "Source name for the desired source, default is used if not provided"
-// @Param source query string false "Name for the desired source, default is used if not provided"
-// @Success 200 "Resource updated successfully"
-// @Failure 403 {object} map[string]string "Forbidden"
-// @Failure 404 {object} map[string]string "Resource not found"
-// @Failure 405 {object} map[string]string "Method not allowed"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/resources [put]
-func resourcePutHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
+func resourcePostHandler(fileCache FileCache) handleFunc {
+	return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		if !d.user.Perm.Create || !d.Check(r.URL.Path) {
+			return http.StatusForbidden, nil
+		}
 
-	encodedPath := r.URL.Query().Get("path")
+		// Directories creation on POST.
+		if strings.HasSuffix(r.URL.Path, "/") {
+			err := d.user.Fs.MkdirAll(r.URL.Path, 0775) //nolint:gomnd
+			return errToStatus(err), err
+		}
 
-	// Decode the URL-encoded path
-	path, err := url.QueryUnescape(encodedPath)
-	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
-	}
-	if !d.user.Perm.Modify || !d.user.Check(path) {
+		file, err := files.FileInfoFaster(files.FileOptions{
+			Fs:         d.user.Fs,
+			Path:       r.URL.Path,
+			Modify:     d.user.Perm.Modify,
+			Expand:     false,
+			ReadHeader: d.server.TypeDetectionByHeader,
+			Checker:    d,
+		})
+		if err == nil {
+			if r.URL.Query().Get("override") != "true" {
+				return http.StatusConflict, nil
+			}
+
+			// Permission for overwriting the file
+			if !d.user.Perm.Modify {
+				return http.StatusForbidden, nil
+			}
+
+			err = delThumbs(r.Context(), fileCache, file)
+			if err != nil {
+				return errToStatus(err), err
+			}
+		}
+
+		err = d.RunHook(func() error {
+			info, writeErr := writeFile(d.user.Fs, r.URL.Path, r.Body)
+			if writeErr != nil {
+				return writeErr
+			}
+
+			etag := fmt.Sprintf(`"%x%x"`, info.ModTime().UnixNano(), info.Size())
+			w.Header().Set("ETag", etag)
+			return nil
+		}, "upload", r.URL.Path, "", d.user)
+
+		if err != nil {
+			_ = d.user.Fs.RemoveAll(r.URL.Path)
+		}
+
+		return errToStatus(err), err
+	})
+}
+
+var resourcePutHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	if !d.user.Perm.Modify || !d.Check(r.URL.Path) {
 		return http.StatusForbidden, nil
 	}
 
 	// Only allow PUT for files.
-	if strings.HasSuffix(path, "/") {
+	if strings.HasSuffix(r.URL.Path, "/") {
 		return http.StatusMethodNotAllowed, nil
 	}
 
-	fileOpts := files.FileOptions{
-		Path:       filepath.Join(d.user.Scope, path),
-		Source:     source,
-		Modify:     d.user.Perm.Modify,
-		Expand:     false,
-		ReadHeader: config.Server.TypeDetectionByHeader,
-		Checker:    d.user,
-	}
-	err = files.WriteFile(fileOpts, r.Body)
-	return errToStatus(err), err
-}
-
-// resourcePatchHandler performs a patch operation (e.g., move, rename) on a resource.
-// @Summary Patch resource (move/rename)
-// @Description Moves or renames a resource to a new destination.
-// @Tags Resources
-// @Accept json
-// @Produce json
-// @Param from query string true "Path from resource"
-// @Param source query string false "Source name for the desired source, default is used if not provided"
-// @Param destination query string true "Destination path for the resource"
-// @Param action query string true "Action to perform (copy, rename)"
-// @Param overwrite query bool false "Overwrite if destination exists"
-// @Param rename query bool false "Rename if destination exists"
-// @Success 200 "Resource moved/renamed successfully"
-// @Failure 403 {object} map[string]string "Forbidden"
-// @Failure 404 {object} map[string]string "Resource not found"
-// @Failure 409 {object} map[string]string "Conflict - Destination exists"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/resources [patch]
-func resourcePatchHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	// TODO source := r.URL.Query().Get("source")
-	action := r.URL.Query().Get("action")
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
-	encodedFrom := r.URL.Query().Get("from")
-	// Decode the URL-encoded path
-	src, err := url.QueryUnescape(encodedFrom)
+	exists, err := afero.Exists(d.user.Fs, r.URL.Path)
 	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
+		return http.StatusInternalServerError, err
 	}
-	dst := r.URL.Query().Get("destination")
-	dst, err = url.QueryUnescape(dst)
-	if err != nil {
-		return errToStatus(err), err
-	}
-	if !d.user.Check(src) || !d.user.Check(dst) {
-		return http.StatusForbidden, fmt.Errorf("forbidden: user rules deny access to source or destination")
-	}
-	if dst == "/" || src == "/" {
-		return http.StatusForbidden, fmt.Errorf("forbidden: source or destination is attempting to modify root")
+	if !exists {
+		return http.StatusNotFound, nil
 	}
 
-	idx := files.GetIndex(source)
-	// check target dir exists
-	parentDir, _, err := idx.GetRealPath(d.user.Scope, filepath.Dir(dst))
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-	realDest := parentDir + "/" + filepath.Base(dst)
-	realSrc, isSrcDir, err := idx.GetRealPath(d.user.Scope, src)
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-	overwrite := r.URL.Query().Get("overwrite") == "true"
-	rename := r.URL.Query().Get("rename") == "true"
-	if rename {
-		realDest = addVersionSuffix(realDest)
-	}
-	// Permission for overwriting the file
-	if overwrite && !d.user.Perm.Modify {
-		return http.StatusForbidden, fmt.Errorf("forbidden: user does not have permission to overwrite file")
-	}
 	err = d.RunHook(func() error {
-		return patchAction(r.Context(), action, realSrc, realDest, d, fileCache, isSrcDir, source)
-	}, action, realSrc, realDest, d.user)
+		info, writeErr := writeFile(d.user.Fs, r.URL.Path, r.Body)
+		if writeErr != nil {
+			return writeErr
+		}
 
+		etag := fmt.Sprintf(`"%x%x"`, info.ModTime().UnixNano(), info.Size())
+		w.Header().Set("ETag", etag)
+		return nil
+	}, "save", r.URL.Path, "", d.user)
 	return errToStatus(err), err
+})
+
+func resourcePatchHandler(fileCache FileCache) handleFunc {
+	return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		src := r.URL.Path
+		dst := r.URL.Query().Get("destination")
+		action := r.URL.Query().Get("action")
+		dst, err := url.QueryUnescape(dst)
+		if !d.Check(src) || !d.Check(dst) {
+			return http.StatusForbidden, nil
+		}
+		if err != nil {
+			return errToStatus(err), err
+		}
+		if dst == "/" || src == "/" {
+			return http.StatusForbidden, nil
+		}
+
+		err = checkParent(src, dst)
+		if err != nil {
+			return http.StatusBadRequest, err
+		}
+
+		override := r.URL.Query().Get("override") == "true"
+		rename := r.URL.Query().Get("rename") == "true"
+		if !override && !rename {
+			if _, err = d.user.Fs.Stat(dst); err == nil {
+				return http.StatusConflict, nil
+			}
+		}
+		if rename {
+			dst = addVersionSuffix(dst, d.user.Fs)
+		}
+
+		// Permission for overwriting the file
+		if override && !d.user.Perm.Modify {
+			return http.StatusForbidden, nil
+		}
+
+		err = d.RunHook(func() error {
+			return patchAction(r.Context(), action, src, dst, d, fileCache)
+		}, action, src, dst, d.user)
+
+		return errToStatus(err), err
+	})
 }
 
-func addVersionSuffix(source string) string {
+func checkParent(src, dst string) error {
+	rel, err := filepath.Rel(src, dst)
+	if err != nil {
+		return err
+	}
+
+	rel = filepath.ToSlash(rel)
+	if !strings.HasPrefix(rel, "../") && rel != ".." && rel != "." {
+		return errors.ErrSourceIsParent
+	}
+
+	return nil
+}
+
+func addVersionSuffix(source string, fs afero.Fs) string {
 	counter := 1
 	dir, name := path.Split(source)
 	ext := filepath.Ext(name)
 	base := strings.TrimSuffix(name, ext)
+
 	for {
-		if _, err := os.Stat(source); err != nil {
+		if _, err := fs.Stat(source); err != nil {
 			break
 		}
 		renamed := fmt.Sprintf("%s(%d)%s", base, counter, ext)
 		source = path.Join(dir, renamed)
 		counter++
 	}
+
 	return source
 }
 
-func delThumbs(ctx context.Context, fileCache FileCache, file files.ExtendedFileInfo) error {
-	if err := fileCache.Delete(ctx, previewCacheKey(file.RealPath, "small", file.FileInfo.ModTime)); err != nil {
-		return err
+func writeFile(fs afero.Fs, dst string, in io.Reader) (os.FileInfo, error) {
+	dir, _ := path.Split(dst)
+	err := fs.MkdirAll(dir, 0775) //nolint:gomnd
+	if err != nil {
+		return nil, err
 	}
+
+	file, err := fs.OpenFile(dst, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775) //nolint:gomnd
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	_, err = io.Copy(file, in)
+	if err != nil {
+		return nil, err
+	}
+
+	// Gets the info about the file.
+	info, err := file.Stat()
+	if err != nil {
+		return nil, err
+	}
+
+	//files.RefreshFileInfo(files.FileOptions{
+	//	Fs: info,
+	//})
+
+	return info, nil
+}
+
+func delThumbs(ctx context.Context, fileCache FileCache, file *files.FileInfo) error {
+	for _, previewSizeName := range PreviewSizeNames() {
+		size, _ := ParsePreviewSize(previewSizeName)
+		if err := fileCache.Delete(ctx, previewCacheKey(file, size)); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
-func patchAction(ctx context.Context, action, src, dst string, d *requestContext, fileCache FileCache, isSrcDir bool, index string) error {
+func patchAction(ctx context.Context, action, src, dst string, d *data, fileCache FileCache) error {
 	switch action {
+	// TODO: use enum
 	case "copy":
 		if !d.user.Perm.Create {
 			return errors.ErrPermissionDenied
 		}
-		err := files.CopyResource(index, src, dst, isSrcDir)
-		return err
-	case "rename", "move":
 
+		return fileutils.Copy(d.user.Fs, src, dst)
+	case "rename":
 		if !d.user.Perm.Rename {
 			return errors.ErrPermissionDenied
 		}
-		fileInfo, err := files.FileInfoFaster(files.FileOptions{
+		src = path.Clean("/" + src)
+		dst = path.Clean("/" + dst)
+
+		file, err := files.FileInfoFaster(files.FileOptions{
+			Fs:         d.user.Fs,
 			Path:       src,
-			Source:     index,
-			IsDir:      isSrcDir,
 			Modify:     d.user.Perm.Modify,
 			Expand:     false,
 			ReadHeader: false,
-			Checker:    d.user,
+			Checker:    d,
 		})
 		if err != nil {
 			return err
 		}
 
 		// delete thumbnails
-		err = delThumbs(ctx, fileCache, fileInfo)
+		err = delThumbs(ctx, fileCache, file)
 		if err != nil {
 			return err
 		}
-		return files.MoveResource(index, src, dst, isSrcDir)
+
+		return fileutils.MoveFile(d.user.Fs, src, dst)
 	default:
 		return fmt.Errorf("unsupported action %s: %w", action, errors.ErrInvalidRequestParams)
 	}
@@ -381,66 +334,32 @@ type DiskUsageResponse struct {
 	Used  uint64 `json:"used"`
 }
 
-// diskUsage returns the disk usage information for a given directory.
-// @Summary Get disk usage
-// @Description Returns the total and used disk space for a specified directory.
-// @Tags Resources
-// @Accept json
-// @Produce json
-// @Param source query string false "Source name for the desired source, default is used if not provided"
-// @Success 200 {object} DiskUsageResponse "Disk usage details"
-// @Failure 404 {object} map[string]string "Directory not found"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/usage [get]
-func diskUsage(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
-	value, ok := utils.DiskUsageCache.Get(source).(DiskUsageResponse)
-	if ok {
-		return renderJSON(w, r, &value)
-	}
-
-	rootPath, ok := files.RootPaths[source]
-	if !ok {
-		return 400, fmt.Errorf("bad source path provided: %v", source)
-	}
-
-	usage, err := disk.UsageWithContext(r.Context(), rootPath)
+var diskUsage = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	file, err := files.FileInfoFaster(files.FileOptions{
+		Fs:         d.user.Fs,
+		Path:       r.URL.Path,
+		Modify:     d.user.Perm.Modify,
+		Expand:     false,
+		ReadHeader: false,
+		Checker:    d,
+	})
 	if err != nil {
 		return errToStatus(err), err
 	}
-	latestUsage := DiskUsageResponse{
+	fPath := file.RealPath()
+	if !file.IsDir {
+		return renderJSON(w, r, &DiskUsageResponse{
+			Total: 0,
+			Used:  0,
+		})
+	}
+
+	usage, err := disk.UsageWithContext(r.Context(), fPath)
+	if err != nil {
+		return errToStatus(err), err
+	}
+	return renderJSON(w, r, &DiskUsageResponse{
 		Total: usage.Total,
 		Used:  usage.Used,
-	}
-	utils.DiskUsageCache.Set(source, latestUsage)
-	return renderJSON(w, r, &latestUsage)
-}
-
-func inspectIndex(w http.ResponseWriter, r *http.Request) {
-	encodedPath := r.URL.Query().Get("path")
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
-	// Decode the URL-encoded path
-	path, _ := url.QueryUnescape(encodedPath)
-	isNotDir := r.URL.Query().Get("isDir") == "false" // default to isDir true
-	index := files.GetIndex(source)
-	info, _ := index.GetReducedMetadata(path, !isNotDir)
-	renderJSON(w, r, info) // nolint:errcheck
-}
-
-func mockData(w http.ResponseWriter, r *http.Request) {
-	d := r.URL.Query().Get("numDirs")
-	f := r.URL.Query().Get("numFiles")
-	NumDirs, err := strconv.Atoi(d)
-	numFiles, err2 := strconv.Atoi(f)
-	if err != nil || err2 != nil {
-		return
-	}
-	mockDir := files.CreateMockData(NumDirs, numFiles)
-	renderJSON(w, r, mockDir) // nolint:errcheck
-}
+	})
+})

backend/http/router.go

@@ -1,187 +0,0 @@
-package http
-
-import (
-	"crypto/tls"
-	"embed"
-	"fmt"
-	"io/fs"
-	"net/http"
-	"os"
-	"text/template"
-
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/gtsteffaniak/filebrowser/backend/storage"
-	"github.com/gtsteffaniak/filebrowser/backend/version"
-
-	httpSwagger "github.com/swaggo/http-swagger" // http-swagger middleware
-)
-
-// Embed the files in the frontend/dist directory
-//
-//go:embed embed/*
-var assets embed.FS
-
-// Boolean flag to determine whether to use the embedded FS or not
-var embeddedFS = os.Getenv("FILEBROWSER_NO_EMBEDED") != "true"
-
-// Custom dirFS to handle both embedded and non-embedded file systems
-type dirFS struct {
-	http.Dir
-}
-
-// Implement the Open method for dirFS, which wraps http.Dir
-func (d dirFS) Open(name string) (fs.File, error) {
-	return d.Dir.Open(name)
-}
-
-var (
-	store     *storage.Storage
-	config    *settings.Settings
-	fileCache FileCache
-	imgSvc    ImgService
-	assetFs   fs.FS
-)
-
-func StartHttp(Service ImgService, storage *storage.Storage, cache FileCache) {
-
-	store = storage
-	fileCache = cache
-	imgSvc = Service
-	config = &settings.Config
-
-	var err error
-
-	if embeddedFS {
-		// Embedded mode: Serve files from the embedded assets
-		assetFs, err = fs.Sub(assets, "embed")
-		if err != nil {
-			logger.Fatal("Could not embed frontend. Does dist exist?")
-		}
-	} else {
-		assetFs = dirFS{Dir: http.Dir("http/dist")}
-	}
-
-	templateRenderer = &TemplateRenderer{
-		templates: template.Must(template.ParseFS(assetFs, "public/index.html")),
-	}
-
-	router := http.NewServeMux()
-	// API group routing
-	api := http.NewServeMux()
-
-	// User routes
-	api.HandleFunc("GET /users", withUser(userGetHandler))
-	api.HandleFunc("POST /users", withSelfOrAdmin(usersPostHandler))
-	api.HandleFunc("PUT /users", withUser(userPutHandler))
-	api.HandleFunc("DELETE /users", withSelfOrAdmin(userDeleteHandler))
-
-	// Auth routes
-	api.HandleFunc("POST /auth/login", loginHandler)
-	api.HandleFunc("GET /auth/signup", signupHandler)
-	api.HandleFunc("POST /auth/renew", withUser(renewHandler))
-	api.HandleFunc("PUT /auth/token", withUser(createApiKeyHandler))
-	api.HandleFunc("GET /auth/token", withUser(createApiKeyHandler))
-	api.HandleFunc("DELETE /auth/token", withUser(deleteApiKeyHandler))
-	api.HandleFunc("GET /auth/tokens", withUser(listApiKeysHandler))
-
-	// Resources routes
-	api.HandleFunc("GET /resources", withUser(resourceGetHandler))
-	api.HandleFunc("DELETE /resources", withUser(resourceDeleteHandler))
-	api.HandleFunc("POST /resources", withUser(resourcePostHandler))
-	api.HandleFunc("PUT /resources", withUser(resourcePutHandler))
-	api.HandleFunc("PATCH /resources", withUser(resourcePatchHandler))
-	api.HandleFunc("GET /usage", withUser(diskUsage))
-	api.HandleFunc("GET /raw", withUser(rawHandler))
-	api.HandleFunc("GET /preview", withUser(previewHandler))
-	if version.Version == "testing" || version.Version == "untracked" {
-		api.HandleFunc("GET /inspectIndex", inspectIndex)
-		api.HandleFunc("GET /mockData", mockData)
-	}
-
-	// Share routes
-	api.HandleFunc("GET /shares", withPermShare(shareListHandler))
-	api.HandleFunc("GET /share", withPermShare(shareGetsHandler))
-	api.HandleFunc("POST /share", withPermShare(sharePostHandler))
-	api.HandleFunc("DELETE /share", withPermShare(shareDeleteHandler))
-
-	// Public routes
-	api.HandleFunc("GET /public/publicUser", publicUserGetHandler)
-	api.HandleFunc("GET /public/dl", withHashFile(rawHandler))
-	api.HandleFunc("GET /public/share", withHashFile(publicShareHandler))
-
-	// Settings routes
-	api.HandleFunc("GET /settings", withAdmin(settingsGetHandler))
-	api.HandleFunc("PUT /settings", withAdmin(settingsPutHandler))
-
-	api.HandleFunc("GET /search", withUser(searchHandler))
-	apiPath := config.Server.BaseURL + "api"
-	router.Handle(apiPath+"/", http.StripPrefix(apiPath, api))
-
-	// Static and index file handlers
-	router.HandleFunc(fmt.Sprintf("GET %vstatic/", config.Server.BaseURL), staticFilesHandler)
-	router.HandleFunc(config.Server.BaseURL, indexHandler)
-
-	// health
-	router.HandleFunc(fmt.Sprintf("GET %vhealth", config.Server.BaseURL), healthHandler)
-
-	// Swagger
-	router.Handle(fmt.Sprintf("%vswagger/", config.Server.BaseURL),
-		httpSwagger.Handler(
-			httpSwagger.URL(config.Server.BaseURL+"swagger/doc.json"), //The url pointing to API definition
-			httpSwagger.DeepLinking(true),
-			httpSwagger.DocExpansion("none"),
-			httpSwagger.DomID("swagger-ui"),
-		),
-	)
-
-	var scheme string
-	port := ""
-
-	// Determine whether to use HTTPS (TLS) or HTTP
-	if config.Server.TLSCert != "" && config.Server.TLSKey != "" {
-		// Load the TLS certificate and key
-		cer, err := tls.LoadX509KeyPair(config.Server.TLSCert, config.Server.TLSKey)
-		if err != nil {
-			logger.Fatal(fmt.Sprintf("could not load certificate: %v", err))
-		}
-
-		// Create a custom TLS listener
-		tlsConfig := &tls.Config{
-			MinVersion:   tls.VersionTLS12,
-			Certificates: []tls.Certificate{cer},
-		}
-
-		// Set HTTPS scheme and default port for TLS
-		scheme = "https"
-
-		// Listen on TCP and wrap with TLS
-		listener, err := tls.Listen("tcp", fmt.Sprintf(":%v", config.Server.Port), tlsConfig)
-		if err != nil {
-			logger.Fatal(fmt.Sprintf("could not start TLS server: %v", err))
-		}
-		if config.Server.Port != 443 {
-			port = fmt.Sprintf(":%d", config.Server.Port)
-		}
-		// Build the full URL with host and port
-		fullURL := fmt.Sprintf("%s://localhost%s%s", scheme, port, config.Server.BaseURL)
-		logger.Info(fmt.Sprintf("Running at               : %s", fullURL))
-		err = http.Serve(listener, muxWithMiddleware(router))
-		if err != nil {
-			logger.Fatal(fmt.Sprintf("could not start server: %v", err))
-		}
-	} else {
-		// Set HTTP scheme and the default port for HTTP
-		scheme = "http"
-		if config.Server.Port != 80 {
-			port = fmt.Sprintf(":%d", config.Server.Port)
-		}
-		// Build the full URL with host and port
-		fullURL := fmt.Sprintf("%s://localhost%s%s", scheme, port, config.Server.BaseURL)
-		logger.Info(fmt.Sprintf("Running at               : %s", fullURL))
-		err := http.ListenAndServe(fmt.Sprintf(":%v", config.Server.Port), muxWithMiddleware(router))
-		if err != nil {
-			logger.Fatal(fmt.Sprintf("could not start server: %v", err))
-		}
-	}
-}

backend/http/search.go

@@ -4,70 +4,33 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/gtsteffaniak/filebrowser/backend/files"
+	"github.com/gtsteffaniak/filebrowser/files"
+	"github.com/gtsteffaniak/filebrowser/settings"
 )
 
-// searchHandler handles search requests for files based on the provided query.
-//
-// This endpoint processes a search query, retrieves relevant file paths, and
-// returns a JSON response with the search results. The search is performed
-// against the file index, which is built from the root directory specified in
-// the server's configuration. The results are filtered based on the user's scope.
-//
-// The handler expects the following headers in the request:
-// - SessionId: A unique identifier for the user's session.
-// - UserScope: The scope of the user, which influences the search context.
-//
-// The request URL should include a query parameter named `query` that specifies
-// the search terms to use. The response will include an array of searchResponse objects
-// containing the path, type, and dir status.
-//
-// Example request:
-//
-//	GET api/search?query=myfile
-//
-// Example response:
-// [
-//
-//	{
-//	    "path": "/path/to/myfile.txt",
-//	    "type": "text"
-//	},
-//	{
-//	    "path": "/path/to/mydir/",
-//	    "type": "directory"
-//	}
-//
-// ]
-//
-// @Summary Search Files
-// @Description Searches for files matching the provided query. Returns file paths and metadata based on the user's session and scope.
-// @Tags Search
-// @Accept json
-// @Produce json
-// @Param query query string true "Search query"
-// @Param scope query string false "path within user scope to search, for example '/first/second' to search within the second directory only"
-// @Param SessionId header string false "User session ID, add unique value to prevent collisions"
-// @Success 200 {array} files.SearchResult "List of search results"
-// @Failure 400 {object} map[string]string "Bad Request"
-// @Router /api/search [get]
-func searchHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
+var searchHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	response := []map[string]interface{}{}
 	query := r.URL.Query().Get("query")
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
-	searchScope := strings.TrimPrefix(r.URL.Query().Get("scope"), ".")
-	searchScope = strings.TrimPrefix(searchScope, "/")
 	// Retrieve the User-Agent and X-Auth headers from the request
 	sessionId := r.Header.Get("SessionId")
-	index := files.GetIndex(source)
-	userScope := strings.TrimPrefix(d.user.Scope, ".")
-	combinedScope := strings.TrimPrefix(userScope+"/"+searchScope, "/")
-
-	// Perform the search using the provided query and user scope
-	response := index.Search(query, combinedScope, sessionId)
-	// Set the Content-Type header to application/json
-	w.Header().Set("Content-Type", "application/json")
+	userScope := r.Header.Get("UserScope")
+	index := files.GetIndex(settings.Config.Server.Root)
+	combinedScope := strings.TrimPrefix(userScope+r.URL.Path, ".")
+	results, fileTypes := index.Search(query, combinedScope, sessionId)
+	for _, path := range results {
+		responseObj := map[string]interface{}{
+			"path": path,
+			"dir":  true,
+		}
+		if _, ok := fileTypes[path]; ok {
+			responseObj["dir"] = false
+			for filterType, value := range fileTypes[path] {
+				if value {
+					responseObj[filterType] = value
+				}
+			}
+		}
+		response = append(response, responseObj)
+	}
 	return renderJSON(w, r, response)
-}
+})

backend/http/settings.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/rules"
+	"github.com/gtsteffaniak/filebrowser/settings"
 )
 
 type settingsData struct {
@@ -13,56 +13,41 @@ type settingsData struct {
 	CreateUserDir    bool                  `json:"createUserDir"`
 	UserHomeBasePath string                `json:"userHomeBasePath"`
 	Defaults         settings.UserDefaults `json:"defaults"`
-	Rules            []users.Rule          `json:"rules"`
+	Rules            []rules.Rule          `json:"rules"`
 	Frontend         settings.Frontend     `json:"frontend"`
+	Shell            []string              `json:"shell"`
 	Commands         map[string][]string   `json:"commands"`
 }
 
-// settingsGetHandler retrieves the current system settings.
-// @Summary Get system settings
-// @Description Returns the current configuration settings for signup, user directories, rules, frontend, and commands.
-// @Tags Settings
-// @Accept json
-// @Produce json
-// @Success 200 {object} settingsData "System settings data"
-// @Router /api/settings [get]
-func settingsGetHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
+var settingsGetHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 	data := &settingsData{
-		Signup:           config.Auth.Signup,
-		CreateUserDir:    config.Server.CreateUserDir,
-		UserHomeBasePath: config.Server.UserHomeBasePath,
-		Defaults:         config.UserDefaults,
-		Rules:            config.Rules,
-		Frontend:         config.Frontend,
+		Signup:           settings.Config.Auth.Signup,
+		CreateUserDir:    settings.Config.Server.CreateUserDir,
+		UserHomeBasePath: settings.Config.Server.UserHomeBasePath,
+		Defaults:         d.settings.UserDefaults,
+		Rules:            d.settings.Rules,
+		Frontend:         d.settings.Frontend,
+		Shell:            d.settings.Shell,
+		Commands:         d.settings.Commands,
 	}
 
 	return renderJSON(w, r, data)
-}
+})
 
-// settingsPutHandler updates the system settings.
-// @Summary Update system settings
-// @Description Updates the system configuration settings for signup, user directories, rules, frontend, and commands.
-// @Tags Settings
-// @Accept json
-// @Produce json
-// @Param body body settingsData true "Settings data to update"
-// @Success 200 "Settings updated successfully"
-// @Failure 400 {object} map[string]string "Bad request - failed to decode body"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/settings [put]
-func settingsPutHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
+var settingsPutHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 	req := &settingsData{}
 	err := json.NewDecoder(r.Body).Decode(req)
 	if err != nil {
 		return http.StatusBadRequest, err
 	}
 
-	config.Server.CreateUserDir = req.CreateUserDir
-	config.Server.UserHomeBasePath = req.UserHomeBasePath
-	config.UserDefaults = req.Defaults
-	config.Rules = req.Rules
-	config.Frontend = req.Frontend
-	config.Auth.Signup = req.Signup
-	err = store.Settings.Save(config)
+	d.settings.Server.CreateUserDir = req.CreateUserDir
+	d.settings.Server.UserHomeBasePath = req.UserHomeBasePath
+	d.settings.UserDefaults = req.Defaults
+	d.settings.Rules = req.Rules
+	d.settings.Frontend = req.Frontend
+	d.settings.Shell = req.Shell
+	d.settings.Commands = req.Commands
+	err = d.store.Settings.Save(d.settings)
 	return errToStatus(err), err
-}
+})

backend/http/share.go

@@ -8,32 +8,33 @@ import (
 	"net/http"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"golang.org/x/crypto/bcrypt"
 
-	"github.com/gtsteffaniak/filebrowser/backend/errors"
-	"github.com/gtsteffaniak/filebrowser/backend/share"
+	"github.com/gtsteffaniak/filebrowser/errors"
+	"github.com/gtsteffaniak/filebrowser/share"
 )
 
-// shareListHandler returns a list of all share links.
-// @Summary List share links
-// @Description Returns a list of share links for the current user, or all links if the user is an admin.
-// @Tags Shares
-// @Accept json
-// @Produce json
-// @Success 200 {array} share.Link "List of share links"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/shares [get]
-func shareListHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
+func withPermShare(fn handleFunc) handleFunc {
+	return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		if !d.user.Perm.Share {
+			return http.StatusForbidden, nil
+		}
+		return fn(w, r, d)
+	})
+}
+
+var shareListHandler = withPermShare(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 	var (
 		s   []*share.Link
 		err error
 	)
 	if d.user.Perm.Admin {
-		s, err = store.Share.All()
+		s, err = d.store.Share.All()
 	} else {
-		s, err = store.Share.FindByUserID(d.user.ID)
+		s, err = d.store.Share.FindByUserID(d.user.ID)
 	}
 	if err == errors.ErrNotExist {
 		return renderJSON(w, r, []*share.Link{})
@@ -50,69 +51,39 @@ func shareListHandler(w http.ResponseWriter, r *http.Request, d *requestContext)
 		return s[i].Expire < s[j].Expire
 	})
 	return renderJSON(w, r, s)
-}
+})
 
-// shareGetsHandler retrieves share links for a specific resource path.
-// @Summary Get share links by path
-// @Description Retrieves all share links associated with a specific resource path for the current user.
-// @Tags Shares
-// @Accept json
-// @Produce json
-// @Param path query string true "Resource path for which to retrieve share links"
-// @Success 200 {array} share.Link "List of share links for the specified path"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/share [get]
-func shareGetsHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	path := r.URL.Query().Get("path")
-	s, err := store.Share.Gets(path, d.user.ID)
+var shareGetsHandler = withPermShare(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	s, err := d.store.Share.Gets(r.URL.Path, d.user.ID)
 	if err == errors.ErrNotExist {
 		return renderJSON(w, r, []*share.Link{})
 	}
 
 	if err != nil {
-		return http.StatusInternalServerError, fmt.Errorf("error getting share info from server")
+		return http.StatusInternalServerError, err
 	}
-	return renderJSON(w, r, s)
-}
 
-// shareDeleteHandler deletes a specific share link by its hash.
-// @Summary Delete a share link
-// @Description Deletes a share link specified by its hash.
-// @Tags Shares
-// @Accept json
-// @Produce json
-// @Param hash path string true "Hash of the share link to delete"
-// @Success 200 "Share link deleted successfully"
-// @Failure 400 {object} map[string]string "Bad request - missing or invalid hash"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/shares/{hash} [delete]
-func shareDeleteHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	hash := r.URL.Query().Get("hash")
+	return renderJSON(w, r, s)
+})
+
+var shareDeleteHandler = withPermShare(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	hash := strings.TrimSuffix(r.URL.Path, "/")
+	hash = strings.TrimPrefix(hash, "/")
 
 	if hash == "" {
 		return http.StatusBadRequest, nil
 	}
 
-	err := store.Share.Delete(hash)
+	err := d.store.Share.Delete(hash)
 	if err != nil {
 		return errToStatus(err), err
 	}
 
 	return errToStatus(err), err
-}
+})
+
+var sharePostHandler = withPermShare(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 
-// sharePostHandler creates a new share link.
-// @Summary Create a share link
-// @Description Creates a new share link with an optional expiration time and password protection.
-// @Tags Shares
-// @Accept json
-// @Produce json
-// @Param body body share.CreateBody true "Share link creation parameters"
-// @Success 200 {object} share.Link "Created share link"
-// @Failure 400 {object} map[string]string "Bad request - failed to decode body"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /api/shares [post]
-func sharePostHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
 	var s *share.Link
 	var body share.CreateBody
 	if r.Body != nil {
@@ -122,11 +93,14 @@ func sharePostHandler(w http.ResponseWriter, r *http.Request, d *requestContext)
 		defer r.Body.Close()
 	}
 
-	secure_hash, err := generateShortUUID()
+	bytes := make([]byte, 6) //nolint:gomnd
+	_, err := rand.Read(bytes)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
+	str := base64.URLEncoding.EncodeToString(bytes)
+
 	var expire int64 = 0
 
 	if body.Expires != "" {
@@ -165,47 +139,32 @@ func sharePostHandler(w http.ResponseWriter, r *http.Request, d *requestContext)
 		token = base64.URLEncoding.EncodeToString(tokenBuffer)
 		stringHash = string(hash)
 	}
-	path := r.URL.Query().Get("path")
 	s = &share.Link{
-		Path:         path,
-		Hash:         secure_hash,
+		Path:         strings.TrimSuffix(r.URL.Path, "/"),
+		Hash:         str,
 		Expire:       expire,
 		UserID:       d.user.ID,
 		PasswordHash: stringHash,
 		Token:        token,
 	}
 
-	if err := store.Share.Save(s); err != nil {
+	if err := d.store.Share.Save(s); err != nil {
 		return http.StatusInternalServerError, err
 	}
 
 	return renderJSON(w, r, s)
-}
+})
 
 func getSharePasswordHash(body share.CreateBody) (data []byte, statuscode int, err error) {
+
 	if body.Password == "" {
 		return nil, 0, nil
 	}
 
 	hash, err := bcrypt.GenerateFromPassword([]byte(body.Password), bcrypt.DefaultCost)
 	if err != nil {
-		return nil, http.StatusInternalServerError, fmt.Errorf("failed to hash password")
+		return nil, http.StatusInternalServerError, fmt.Errorf("failed to hash password: %w", err)
 	}
 
 	return hash, 0, nil
 }
-
-func generateShortUUID() (string, error) {
-	// Generate 16 random bytes (128 bits of entropy)
-	bytes := make([]byte, 16)
-	_, err := rand.Read(bytes)
-	if err != nil {
-		return "", err
-	}
-
-	// Encode the bytes to a URL-safe base64 string
-	uuid := base64.RawURLEncoding.EncodeToString(bytes)
-
-	// Trim the length to 22 characters for a shorter ID
-	return uuid[:22], nil
-}

backend/http/static.go

@@ -4,74 +4,54 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/fs"
+	"log"
 	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"text/template"
 
-	"github.com/gtsteffaniak/filebrowser/backend/auth"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-	"github.com/gtsteffaniak/filebrowser/backend/version"
+	"github.com/gtsteffaniak/filebrowser/auth"
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/storage"
+	"github.com/gtsteffaniak/filebrowser/version"
 )
 
-var templateRenderer *TemplateRenderer
-
-type TemplateRenderer struct {
-	templates *template.Template
-}
-
-// Render renders a template document with headers and data
-func (t *TemplateRenderer) Render(w http.ResponseWriter, name string, data interface{}) error {
-	// Set headers
-	w.Header().Set("Cache-Control", "no-cache, private, max-age=0")
-	w.Header().Set("Pragma", "no-cache")
-	w.Header().Set("X-Accel-Expires", "0")
-	w.Header().Set("Transfer-Encoding", "identity")
-	// Execute the template with the provided data
-	return t.templates.ExecuteTemplate(w, name, data)
-}
-
-func handleWithStaticData(w http.ResponseWriter, r *http.Request, file, contentType string) {
+func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, fSys fs.FS, file, contentType string) (int, error) {
 	w.Header().Set("Content-Type", contentType)
 
-	auther, err := store.Auth.Get(config.Auth.Method)
+	auther, err := d.store.Auth.Get(d.settings.Auth.Method)
 	if err != nil {
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
+		return http.StatusInternalServerError, err
 	}
 
 	data := map[string]interface{}{
-		"Name":                  config.Frontend.Name,
-		"DisableExternal":       config.Frontend.DisableDefaultLinks,
-		"DisableUsedPercentage": config.Frontend.DisableUsedPercentage,
+		"Name":                  d.settings.Frontend.Name,
+		"DisableExternal":       d.settings.Frontend.DisableExternal,
+		"DisableUsedPercentage": d.settings.Frontend.DisableUsedPercentage,
 		"darkMode":              settings.Config.UserDefaults.DarkMode,
-		"Color":                 config.Frontend.Color,
-		"BaseURL":               config.Server.BaseURL,
+		"Color":                 d.settings.Frontend.Color,
+		"BaseURL":               d.server.BaseURL,
 		"Version":               version.Version,
-		"CommitSHA":             version.CommitSHA,
-		"StaticURL":             config.Server.BaseURL + "static",
+		"StaticURL":             path.Join(d.server.BaseURL, "/static"),
 		"Signup":                settings.Config.Auth.Signup,
-		"NoAuth":                config.Auth.Method == "noauth",
-		"AuthMethod":            config.Auth.Method,
+		"NoAuth":                d.settings.Auth.Method == "noauth",
+		"AuthMethod":            d.settings.Auth.Method,
 		"LoginPage":             auther.LoginPage(),
 		"CSS":                   false,
 		"ReCaptcha":             false,
-		"EnableThumbs":          config.Server.EnableThumbnails,
-		"ResizePreview":         config.Server.ResizePreview,
-		"EnableExec":            config.Server.EnableExec,
-		"ReCaptchaHost":         config.Auth.Recaptcha.Host,
-		"ExternalLinks":         config.Frontend.ExternalLinks,
-		"ExternalUrl":           strings.TrimSuffix(config.Server.ExternalUrl, "/"),
+		"EnableThumbs":          d.server.EnableThumbnails,
+		"ResizePreview":         d.server.ResizePreview,
+		"EnableExec":            d.server.EnableExec,
 	}
 
-	if config.Frontend.Files != "" {
-		fPath := filepath.Join(config.Frontend.Files, "custom.css")
+	if d.settings.Frontend.Files != "" {
+		fPath := filepath.Join(d.settings.Frontend.Files, "custom.css")
 		_, err := os.Stat(fPath) //nolint:govet
 
 		if err != nil && !os.IsNotExist(err) {
-			logger.Error(fmt.Sprintf("couldn't load custom styles: %v", err))
+			log.Printf("couldn't load custom styles: %v", err)
 		}
 
 		if err == nil {
@@ -79,19 +59,12 @@ func handleWithStaticData(w http.ResponseWriter, r *http.Request, file, contentT
 		}
 	}
 
-	if config.Auth.Method == "password" {
-		raw, err := store.Auth.Get(config.Auth.Method) //nolint:govet
+	if d.settings.Auth.Method == "password" {
+		raw, err := d.store.Auth.Get(d.settings.Auth.Method) //nolint:govet
 		if err != nil {
-			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-			return
+			return http.StatusInternalServerError, err
 		}
-
-		auther, ok := raw.(*auth.JSONAuth)
-		if !ok {
-			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-			return
-		}
-
+		auther := raw.(*auth.JSONAuth)
 		if auther.ReCaptcha != nil {
 			data["ReCaptcha"] = auther.ReCaptcha.Key != "" && auther.ReCaptcha.Secret != ""
 			data["ReCaptchaHost"] = auther.ReCaptcha.Host
@@ -101,47 +74,77 @@ func handleWithStaticData(w http.ResponseWriter, r *http.Request, file, contentT
 
 	b, err := json.Marshal(data)
 	if err != nil {
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
+		return http.StatusInternalServerError, err
 	}
 
-	data["globalVars"] = strings.ReplaceAll(string(b), `'`, `\'`)
+	data["Json"] = strings.ReplaceAll(string(b), `'`, `\'`)
 
-	// Render the template with global variables
-	if err := templateRenderer.Render(w, file, data); err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-	}
-}
-
-func staticFilesHandler(w http.ResponseWriter, r *http.Request) {
-	const maxAge = 86400 // 1 day
-	w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%v", maxAge))
-	w.Header().Set("Content-Security-Policy", `default-src 'self'; style-src 'unsafe-inline';`)
-	// Remove "/static/" from the request path
-	adjustedPath := strings.TrimPrefix(r.URL.Path, fmt.Sprintf("%vstatic/", config.Server.BaseURL))
-	adjustedCompressed := adjustedPath + ".gz"
-	if strings.HasSuffix(adjustedPath, ".js") {
-		w.Header().Set("Content-Type", "application/javascript; charset=utf-8") // Set the correct MIME type for JavaScript files
-	}
-	// Check if the gzipped version of the file exists
-	fileContents, err := fs.ReadFile(assetFs, adjustedCompressed)
-	if err == nil {
-		w.Header().Set("Content-Encoding", "gzip") // Let the browser know the file is compressed
-		status, err := w.Write(fileContents)       // Write the gzipped file content to the response
-		if err != nil {
-			http.Error(w, http.StatusText(status), status)
+	fileContents, err := fs.ReadFile(fSys, file)
+	if err != nil {
+		if err == os.ErrNotExist {
+			return http.StatusNotFound, err
 		}
-	} else {
-		// Otherwise, serve the regular file
-		http.StripPrefix(fmt.Sprintf("%vstatic/", config.Server.BaseURL), http.FileServer(http.FS(assetFs))).ServeHTTP(w, r)
+		return http.StatusInternalServerError, err
 	}
+	index := template.Must(template.New("index").Delims("[{[", "]}]").Parse(string(fileContents)))
+	err = index.Execute(w, data)
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
+	return 0, nil
 }
 
-func indexHandler(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
-		return
-	}
-	handleWithStaticData(w, r, "index.html", "text/html")
+func getStaticHandlers(store *storage.Storage, server *settings.Server, assetsFs fs.FS) (index, static http.Handler) {
+	index = handle(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		if r.Method != http.MethodGet {
+			return http.StatusNotFound, nil
+		}
 
+		w.Header().Set("x-xss-protection", "1; mode=block")
+		return handleWithStaticData(w, r, d, assetsFs, "public/index.html", "text/html; charset=utf-8")
+	}, "", store, server)
+
+	static = handle(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		if r.Method != http.MethodGet {
+			return http.StatusNotFound, nil
+		}
+
+		const maxAge = 86400 // 1 day
+		w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%v", maxAge))
+
+		if d.settings.Frontend.Files != "" {
+			if strings.HasPrefix(r.URL.Path, "img/") {
+				fPath := filepath.Join(d.settings.Frontend.Files, r.URL.Path)
+				if _, err := os.Stat(fPath); err == nil {
+					http.ServeFile(w, r, fPath)
+					return 0, nil
+				}
+			} else if r.URL.Path == "custom.css" && d.settings.Frontend.Files != "" {
+				http.ServeFile(w, r, filepath.Join(d.settings.Frontend.Files, "custom.css"))
+				return 0, nil
+			}
+		}
+
+		if !strings.HasSuffix(r.URL.Path, ".js") {
+			http.FileServer(http.FS(assetsFs)).ServeHTTP(w, r)
+			return 0, nil
+		}
+
+		fileContents, err := fs.ReadFile(assetsFs, r.URL.Path+".gz")
+		if err != nil {
+			return http.StatusNotFound, err
+		}
+
+		w.Header().Set("Content-Encoding", "gzip")
+		w.Header().Set("Content-Type", "application/javascript; charset=utf-8") // Set the correct MIME type for JavaScript files
+
+		if _, err := w.Write(fileContents); err != nil {
+			return http.StatusInternalServerError, err
+		}
+
+		return 0, nil
+	}, "/static/", store, server)
+
+	return index, static
 }

backend/http/users.go

@@ -2,20 +2,17 @@ package http
 
 import (
 	"encoding/json"
-	"fmt"
-	"io"
+	"log"
 	"net/http"
-	"reflect"
 	"sort"
 	"strconv"
 
+	"github.com/gorilla/mux"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 
-	"github.com/gtsteffaniak/filebrowser/backend/errors"
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/storage"
-	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/errors"
+	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 var (
@@ -27,157 +24,102 @@ type Sorting struct {
 	By  string `json:"by"`
 	Asc bool   `json:"asc"`
 }
-type UserRequest struct {
-	What  string      `json:"what"`
-	Which []string    `json:"which"`
-	Data  *users.User `json:"data"`
+type modifyUserRequest struct {
+	modifyRequest
+	Data *users.User `json:"data"`
 }
 
-// userGetHandler retrieves a user by ID.
-// @Summary Retrieve a user by ID
-// @Description Returns a user's details based on their ID.
-// @Tags Users
-// @Accept json
-// @Produce json
-// @Param id path int true "User ID" or "self"
-// @Success 200 {object} users.User "User details"
-// @Failure 403 {object} map[string]string "Forbidden"
-// @Failure 404 {object} map[string]string "Not Found"
-// @Failure 500 {object} map[string]string "Internal Server Error"
-// @Router /api/users/{id} [get]
-func userGetHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	givenUserIdString := r.URL.Query().Get("id")
+func getUserID(r *http.Request) (uint, error) {
+	vars := mux.Vars(r)
+	i, err := strconv.ParseUint(vars["id"], 10, 0)
+	if err != nil {
+		return 0, err
+	}
+	return uint(i), err
+}
 
-	// since api self is used to validate a logged in user
-	w.Header().Add("X-Renew-Token", "false")
+func getUser(_ http.ResponseWriter, r *http.Request) (*modifyUserRequest, error) {
+	if r.Body == nil {
+		return nil, errors.ErrEmptyRequest
+	}
 
-	var givenUserId uint
-	if givenUserIdString == "self" {
-		givenUserId = d.user.ID
-	} else if givenUserIdString == "" {
+	req := &modifyUserRequest{}
+	err := json.NewDecoder(r.Body).Decode(req)
+	if err != nil {
+		return nil, err
+	}
 
-		userList, err := store.Users.Gets(files.RootPaths["default"])
+	if req.What != "user" {
+		return nil, errors.ErrInvalidDataType
+	}
+
+	return req, nil
+}
+
+func withSelfOrAdmin(fn handleFunc) handleFunc {
+	return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+		id, err := getUserID(r)
 		if err != nil {
 			return http.StatusInternalServerError, err
 		}
-
-		selfUserList := []*users.User{}
-		for _, u := range userList {
-			u.Password = ""
-			u.ApiKeys = nil
-			if u.ID == d.user.ID {
-				selfUserList = append(selfUserList, u)
-			}
+		if d.user.ID != id && !d.user.Perm.Admin {
+			return http.StatusForbidden, nil
 		}
 
-		sort.Slice(userList, func(i, j int) bool {
-			return userList[i].ID < userList[j].ID
-		})
+		d.raw = id
+		return fn(w, r, d)
+	})
+}
 
-		if !d.user.Perm.Admin {
-			userList = selfUserList
-		}
-		return renderJSON(w, r, userList)
-	} else {
-		num, _ := strconv.ParseUint(givenUserIdString, 10, 32)
-		givenUserId = uint(num)
+var usersGetHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	users, err := d.store.Users.Gets(d.server.Root)
+	if err != nil {
+		return http.StatusInternalServerError, err
 	}
 
-	if givenUserId != d.user.ID && !d.user.Perm.Admin {
-		return http.StatusForbidden, nil
+	for _, u := range users {
+		u.Password = ""
 	}
 
-	// Fetch the user details
-	u, err := store.Users.Get(files.RootPaths["default"], givenUserId)
+	sort.Slice(users, func(i, j int) bool {
+		return users[i].ID < users[j].ID
+	})
+
+	return renderJSON(w, r, users)
+})
+
+var userGetHandler = withSelfOrAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	u, err := d.store.Users.Get(d.server.Root, d.raw.(uint))
 	if err == errors.ErrNotExist {
 		return http.StatusNotFound, err
 	}
+
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
-	// Remove the password from the response if the user is not an admin
 	u.Password = ""
-	u.ApiKeys = nil
 	if !d.user.Perm.Admin {
 		u.Scope = ""
 	}
-
 	return renderJSON(w, r, u)
-}
+})
 
-// userDeleteHandler deletes a user by ID.
-// @Summary Delete a user by ID
-// @Description Deletes a user identified by their ID.
-// @Tags Users
-// @Accept json
-// @Produce json
-// @Param id path int true "User ID"
-// @Success 200 "User deleted successfully"
-// @Failure 403 {object} map[string]string "Forbidden"
-// @Failure 500 {object} map[string]string "Internal Server Error"
-// @Router /api/users/{id} [delete]
-func userDeleteHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	givenUserIdString := r.URL.Query().Get("id")
-	num, _ := strconv.ParseUint(givenUserIdString, 10, 32)
-	givenUserId := uint(num)
-
-	if givenUserId == d.user.ID {
-		return http.StatusForbidden, fmt.Errorf("cannot delete your own user")
-	}
-
-	if !d.user.Perm.Admin {
-		return http.StatusForbidden, fmt.Errorf("cannot delete users without admin permissions")
-	}
-
-	if givenUserId == 1 {
-		return http.StatusForbidden, fmt.Errorf("cannot delete the default admin user")
-	}
-
-	// Delete the user
-	err := store.Users.Delete(givenUserId)
+var userDeleteHandler = withSelfOrAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	err := d.store.Users.Delete(d.raw.(uint))
 	if err != nil {
 		return errToStatus(err), err
 	}
+
 	return http.StatusOK, nil
-}
+})
 
-// usersPostHandler creates a new user.
-// @Summary Create a new user
-// @Description Adds a new user to the system.
-// @Tags Users
-// @Accept json
-// @Produce json
-// @Param data body users.User true "User data to create a new user"
-// @Success 201 {object} users.User "Created user"
-// @Failure 400 {object} map[string]string "Bad Request"
-// @Failure 500 {object} map[string]string "Internal Server Error"
-// @Router /api/users [post]
-func usersPostHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	if !d.user.Perm.Admin {
-		return http.StatusForbidden, nil
-	}
-
-	// Validate the user's scope
-	idx := files.GetIndex("default")
-	_, _, err := idx.GetRealPath(d.user.Scope)
+var userPostHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	req, err := getUser(w, r)
 	if err != nil {
 		return http.StatusBadRequest, err
 	}
 
-	// Read the JSON body
-	body, err := io.ReadAll(r.Body)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	defer r.Body.Close()
-
-	// Parse the JSON into the UserRequest struct
-	var req UserRequest
-	if err = json.Unmarshal(body, &req); err != nil {
-		return http.StatusBadRequest, err
-	}
-
 	if len(req.Which) != 0 {
 		return http.StatusBadRequest, nil
 	}
@@ -186,84 +128,58 @@ func usersPostHandler(w http.ResponseWriter, r *http.Request, d *requestContext)
 		return http.StatusBadRequest, errors.ErrEmptyPassword
 	}
 
-	err = storage.CreateUser(*req.Data, req.Data.Perm.Admin)
+	userHome, err := d.settings.MakeUserDir(req.Data.Username, req.Data.Scope, d.server.Root)
+	if err != nil {
+		log.Printf("create user: failed to mkdir user home dir: [%s]", userHome)
+		return http.StatusInternalServerError, err
+	}
+	req.Data.Scope = userHome
+	log.Printf("user: %s, home dir: [%s].", req.Data.Username, userHome)
+
+	err = d.store.Users.Save(req.Data)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
 	w.Header().Set("Location", "/settings/users/"+strconv.FormatUint(uint64(req.Data.ID), 10))
 	return http.StatusCreated, nil
-}
+})
 
-// userPutHandler updates an existing user's details.
-// @Summary Update a user's details
-// @Description Updates the details of a user identified by ID.
-// @Tags Users
-// @Accept json
-// @Produce json
-// @Param id path int true "User ID"
-// @Param data body users.User true "User data to update"
-// @Success 200 {object} users.User "Updated user details"
-// @Failure 400 {object} map[string]string "Bad Request"
-// @Failure 403 {object} map[string]string "Forbidden"
-// @Failure 500 {object} map[string]string "Internal Server Error"
-// @Router /api/users/{id} [put]
-func userPutHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	givenUserIdString := r.URL.Query().Get("id")
-	num, _ := strconv.ParseUint(givenUserIdString, 10, 32)
-	givenUserId := uint(num)
-
-	if givenUserId != d.user.ID && !d.user.Perm.Admin {
-		return http.StatusForbidden, nil
-	}
-
-	// Validate the user's scope
-	idx := files.GetIndex("default")
-	_, _, err := idx.GetRealPath(d.user.Scope)
+var userPutHandler = withSelfOrAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	req, err := getUser(w, r)
 	if err != nil {
 		return http.StatusBadRequest, err
 	}
 
-	// Read the JSON body
-	body, err := io.ReadAll(r.Body)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	defer r.Body.Close()
-
-	// Parse the JSON into the UserRequest struct
-	var req UserRequest
-	if err = json.Unmarshal(body, &req); err != nil {
-		return http.StatusBadRequest, err
+	if req.Data.ID != d.raw.(uint) {
+		return http.StatusBadRequest, nil
 	}
 
-	// If `Which` is not specified, default to updating all fields
-	if len(req.Which) == 0 || req.Which[0] == "all" {
+	if len(req.Which) == 0 || (len(req.Which) == 1 && req.Which[0] == "all") {
+		if !d.user.Perm.Admin {
+			return http.StatusForbidden, nil
+		}
+
+		if req.Data.Password != "" {
+			req.Data.Password, err = users.HashPwd(req.Data.Password)
+		} else {
+			var suser *users.User
+			suser, err = d.store.Users.Get(d.server.Root, d.raw.(uint))
+			req.Data.Password = suser.Password
+		}
+
+		if err != nil {
+			return http.StatusInternalServerError, err
+		}
+
 		req.Which = []string{}
-		v := reflect.ValueOf(req.Data)
-		if v.Kind() == reflect.Ptr {
-			v = v.Elem()
-		}
-		t := v.Type()
-
-		// Dynamically populate fields to update
-		for i := 0; i < t.NumField(); i++ {
-			field := t.Field(i)
-			if field.Name == "Password" && req.Data.Password != "" {
-				req.Which = append(req.Which, field.Name)
-			} else if field.Name != "Password" && field.Name != "Fs" {
-				req.Which = append(req.Which, field.Name)
-			}
-		}
 	}
 
-	// Process the fields to update
-	for _, field := range req.Which {
-		// Title case field names
-		field = cases.Title(language.English, cases.NoLower).String(field)
+	for k, v := range req.Which {
+		v = cases.Title(language.English, cases.NoLower).String(v)
+		req.Which[k] = v
 
-		// Handle password update
-		if field == "Password" {
+		if v == "Password" {
 			if !d.user.Perm.Admin && d.user.LockPassword {
 				return http.StatusForbidden, nil
 			}
@@ -273,20 +189,17 @@ func userPutHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (
 			}
 		}
 
-		// Prevent non-admins from modifying certain fields
-		for _, restrictedField := range NonModifiableFieldsForNonAdmin {
-			if !d.user.Perm.Admin && field == restrictedField {
+		for _, f := range NonModifiableFieldsForNonAdmin {
+			if !d.user.Perm.Admin && v == f {
 				return http.StatusForbidden, nil
 			}
 		}
 	}
-	// Perform the user update
-	err = store.Users.Update(req.Data, req.Which...)
+
+	err = d.store.Users.Update(req.Data, req.Which...)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
-	// Return the updated user (with the password hidden) as JSON response
-	req.Data.Password = ""
-	return renderJSON(w, r, req.Data)
-}
+	return http.StatusOK, nil
+})

backend/http/utils.go

@@ -1,13 +1,30 @@
 package http
 
 import (
+	"encoding/json"
 	"errors"
 	"net/http"
+	"net/url"
 	"os"
+	"strings"
 
-	libErrors "github.com/gtsteffaniak/filebrowser/backend/errors"
+	libErrors "github.com/gtsteffaniak/filebrowser/errors"
 )
 
+func renderJSON(w http.ResponseWriter, _ *http.Request, data interface{}) (int, error) {
+	marsh, err := json.Marshal(data)
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	if _, err := w.Write(marsh); err != nil {
+		return http.StatusInternalServerError, err
+	}
+
+	return 0, nil
+}
+
 func errToStatus(err error) int {
 	switch {
 	case err == nil:
@@ -28,3 +45,23 @@ func errToStatus(err error) int {
 		return http.StatusInternalServerError
 	}
 }
+
+// This is an addaptation if http.StripPrefix in which we don't
+// return 404 if the page doesn't have the needed prefix.
+func stripPrefix(prefix string, h http.Handler) http.Handler {
+	if prefix == "" || prefix == "/" {
+		return h
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		p := strings.TrimPrefix(r.URL.Path, prefix)
+		rp := strings.TrimPrefix(r.URL.RawPath, prefix)
+		r2 := new(http.Request)
+		*r2 = *r
+		r2.URL = new(url.URL)
+		*r2.URL = *r.URL
+		r2.URL.Path = p
+		r2.URL.RawPath = rp
+		h.ServeHTTP(w, r2)
+	})
+}

backend/img/service.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/disintegration/imaging"
 	"github.com/dsoprea/go-exif/v3"
+	"github.com/marusama/semaphore/v2"
 
 	exifcommon "github.com/dsoprea/go-exif/v3/common"
 )
@@ -20,32 +21,12 @@ var ErrUnsupportedFormat = errors.New("unsupported image format")
 
 // Service
 type Service struct {
-	sem chan struct{}
+	sem semaphore.Semaphore
 }
 
-// New initializes the service with a specified number of workers (concurrency limit).
 func New(workers int) *Service {
 	return &Service{
-		sem: make(chan struct{}, workers), // Buffered channel to limit concurrency.
-	}
-}
-
-// acquire blocks until a worker is available or the context is canceled.
-func (s *Service) acquire(ctx context.Context) error {
-	select {
-	case s.sem <- struct{}{}: // Reserve a worker.
-		return nil
-	case <-ctx.Done(): // Context canceled or deadline exceeded.
-		return ctx.Err()
-	}
-}
-
-// release frees up a worker slot.
-func (s *Service) release() {
-	select {
-	case <-s.sem: // Free a worker slot.
-	default:
-		// Shouldn't happen, but guard against releasing more than acquired.
+		sem: semaphore.New(workers),
 	}
 }
 
@@ -155,10 +136,10 @@ func WithQuality(quality Quality) Option {
 }
 
 func (s *Service) Resize(ctx context.Context, in io.Reader, width, height int, out io.Writer, options ...Option) error {
-	if err := s.acquire(ctx); err != nil {
+	if err := s.sem.Acquire(ctx, 1); err != nil {
 		return err
 	}
-	defer s.release()
+	defer s.sem.Release(1)
 
 	format, wrappedReader, err := s.detectFormat(in)
 	if err != nil {
@@ -261,22 +242,3 @@ func getEmbeddedThumbnail(in io.Reader) ([]byte, io.Reader, error) {
 	thm, err := ifd.Thumbnail()
 	return thm, wrappedReader, err
 }
-
-// CreateThumbnail takes raw image data and creates a thumbnail image.
-func CreateThumbnail(rawData io.Reader, width, height int) (image.Image, error) {
-	// Decode the raw image to get an image.Image.
-	img, _, err := image.Decode(rawData)
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode image: %w", err)
-	}
-
-	// Resize the image to create a thumbnail using the specified dimensions.
-	thumb := imaging.Fit(img, width, height, imaging.Lanczos)
-
-	// Optionally, convert the thumbnail to grayscale if needed.
-	// Uncomment the line below if you want the result to be grayscale.
-	// thumb = imaging.Grayscale(thumb)
-
-	// Return the resized thumbnail image.
-	return thumb, nil
-}

backend/logger/setup.go

@@ -1,132 +0,0 @@
-package logger
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"slices"
-	"strings"
-)
-
-// Logger wraps the standard log.Logger with log level functionality
-type Logger struct {
-	logger      *log.Logger
-	levels      []LogLevel
-	apiLevels   []LogLevel
-	stdout      bool
-	disabled    bool
-	disabledAPI bool
-	colors      bool
-}
-
-var stdOutLoggerExists bool
-
-// NewLogger creates a new Logger instance with separate file and stdout loggers
-func NewLogger(filepath string, levels, apiLevels []LogLevel, noColors bool) (*Logger, error) {
-	var fileWriter io.Writer = io.Discard
-	stdout := filepath == ""
-	// Configure file logging
-	if !stdout {
-		file, err := os.OpenFile(filepath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-		if err != nil {
-			return nil, fmt.Errorf("failed to open log file: %v", err)
-		}
-		fileWriter = file
-	}
-	flags := log.Ldate | log.Ltime
-	if slices.Contains(levels, DEBUG) {
-		flags |= log.Lshortfile
-	}
-	logger := log.New(os.Stdout, "", flags)
-	if filepath != "" {
-		logger = log.New(fileWriter, "", flags)
-	}
-	if stdout {
-		stdOutLoggerExists = true
-	}
-	return &Logger{
-		logger:      logger,
-		levels:      levels,
-		apiLevels:   apiLevels,
-		disabled:    slices.Contains(levels, DISABLED),
-		disabledAPI: slices.Contains(apiLevels, DISABLED),
-		colors:      !noColors,
-		stdout:      stdout,
-	}, nil
-}
-
-// SetupLogger configures the logger with file and stdout options and their respective log levels
-func SetupLogger(output, levels, apiLevels string, noColors bool) error {
-	upperLevels := []LogLevel{}
-	for _, level := range SplitByMultiple(levels) {
-		if level == "" {
-			break
-		}
-		upperLevel := strings.ToUpper(level)
-		if upperLevel == "WARNING" || upperLevel == "WARN" {
-			upperLevel = "WARN "
-		}
-		// Convert level strings to LogLevel
-		level, ok := stringToLevel[upperLevel]
-		if !ok {
-			loggers = []*Logger{}
-			return fmt.Errorf("invalid file log level: %s", upperLevel)
-		}
-		upperLevels = append(upperLevels, level)
-	}
-	if len(upperLevels) == 0 {
-		upperLevels = []LogLevel{INFO, ERROR, WARNING}
-	}
-	upperApiLevels := []LogLevel{}
-	for _, level := range SplitByMultiple(apiLevels) {
-		if level == "" {
-			break
-		}
-		upperLevel := strings.ToUpper(level)
-		if upperLevel == "WARNING" || upperLevel == "WARN" {
-			upperLevel = "WARN "
-		}
-		// Convert level strings to LogLevel
-		level, ok := stringToLevel[strings.ToUpper(upperLevel)]
-		if !ok {
-			return fmt.Errorf("invalid api log level: %s", upperLevel)
-		}
-		upperApiLevels = append(upperApiLevels, level)
-	}
-	if len(upperApiLevels) == 0 {
-		upperApiLevels = []LogLevel{INFO, ERROR, WARNING}
-	}
-	if slices.Contains(upperLevels, DISABLED) && slices.Contains(upperApiLevels, DISABLED) {
-		// both disabled, not creating a logger
-		loggers = []*Logger{}
-		return nil
-	}
-	outputStdout := strings.ToUpper(output)
-	if outputStdout == "STDOUT" {
-		output = ""
-	}
-	if output == "" && stdOutLoggerExists {
-		// stdout logger already exists... don't create another
-		return fmt.Errorf("stdout logger already exists, could not set config levels=[%v] apiLevels=[%v] noColors=[%v]", levels, apiLevels, noColors)
-	}
-	// Create the logger
-	logger, err := NewLogger(output, upperLevels, upperApiLevels, noColors)
-	if err != nil {
-		loggers = []*Logger{}
-		return err
-	}
-	loggers = append(loggers, logger)
-	return nil
-}
-func SplitByMultiple(str string) []string {
-	delimiters := []rune{'|', ',', ' '}
-	return strings.FieldsFunc(str, func(r rune) bool {
-		for _, d := range delimiters {
-			if r == d {
-				return true
-			}
-		}
-		return false
-	})
-}

backend/logger/write.go

@@ -1,137 +0,0 @@
-package logger
-
-import (
-	"fmt"
-	"log"
-	"slices"
-)
-
-type LogLevel int
-
-const (
-	DISABLED LogLevel = 0
-	ERROR    LogLevel = 1
-	FATAL    LogLevel = 1
-	WARNING  LogLevel = 2
-	INFO     LogLevel = 3
-	DEBUG    LogLevel = 4
-	API      LogLevel = 10
-	// COLORS
-	RED    = "\033[31m"
-	GREEN  = "\033[32m"
-	YELLOW = "\033[33m"
-	GRAY   = "\033[37m"
-)
-
-var (
-	loggers []*Logger
-)
-
-type levelConsts struct {
-	INFO     string
-	FATAL    string
-	ERROR    string
-	WARNING  string
-	DEBUG    string
-	API      string
-	DISABLED string
-}
-
-var levels = levelConsts{
-	INFO:     "INFO",
-	FATAL:    "FATAL",
-	ERROR:    "ERROR",
-	WARNING:  "WARN ", // with consistent space padding
-	DEBUG:    "DEBUG",
-	DISABLED: "DISABLED",
-	API:      "API",
-}
-
-// stringToLevel maps string representation to LogLevel
-var stringToLevel = map[string]LogLevel{
-	"DEBUG":    DEBUG,
-	"INFO":     INFO,
-	"ERROR":    ERROR,
-	"DISABLED": DISABLED,
-	"WARN ":    WARNING, // with consistent space padding
-	"FATAL":    FATAL,
-	"API":      API,
-}
-
-// Log prints a log message if its level is greater than or equal to the logger's levels
-func Log(level string, msg string, prefix, api bool, color string) {
-	LEVEL := stringToLevel[level]
-	for _, logger := range loggers {
-		if api {
-			if logger.disabledAPI || !slices.Contains(logger.apiLevels, LEVEL) {
-				continue
-			}
-		} else {
-			if logger.disabled || !slices.Contains(logger.levels, LEVEL) {
-				continue
-			}
-		}
-		if logger.stdout && LEVEL == FATAL {
-			continue
-		}
-		writeOut := msg
-		if prefix {
-			writeOut = fmt.Sprintf("[%s] ", level) + writeOut
-		}
-		if logger.colors && color != "" {
-			writeOut = color + writeOut + "\033[0m"
-		}
-		err := logger.logger.Output(3, writeOut) // 3 skips this function for correct file:line
-		if err != nil {
-			log.Printf("failed to log message '%v' with error `%v`", msg, err)
-		}
-	}
-}
-
-func Api(msg string, statusCode int) {
-	if statusCode >= 300 && statusCode < 500 {
-		Log(levels.WARNING, msg, false, true, YELLOW)
-	} else if statusCode >= 500 {
-		Log(levels.ERROR, msg, false, true, RED)
-	} else {
-		Log(levels.INFO, msg, false, true, GREEN)
-	}
-}
-
-// Helper methods for specific log levels
-func Debug(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.DEBUG, msg, true, false, GRAY)
-	}
-}
-
-func Info(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.INFO, msg, false, false, "")
-	} else {
-		log.Println(msg)
-	}
-}
-
-func Warning(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.WARNING, msg, true, false, YELLOW)
-	} else {
-		log.Println("[WARN ]: " + msg)
-	}
-}
-
-func Error(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.ERROR, msg, true, false, RED)
-	} else {
-		log.Println("[ERROR] : ", msg)
-	}
-}
-
-func Fatal(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.FATAL, msg, true, false, RED)
-	}
-	log.Fatal("[FATAL] : ", msg)
-}

backend/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gtsteffaniak/filebrowser/backend/cmd"
+	"github.com/gtsteffaniak/filebrowser/cmd"
 )
 
 func main() {

backend/rules/rules.go

@@ -1,4 +1,4 @@
-package users
+package rules
 
 import (
 	"path/filepath"
@@ -11,18 +11,6 @@ type Checker interface {
 	Check(path string) bool
 }
 
-// Check implements rules.Checker.
-func (user *User) Check(path string) bool {
-	allow := true
-	for _, rule := range user.Rules {
-		if rule.Matches(path) {
-			allow = rule.Allow
-		}
-	}
-
-	return allow
-}
-
 // Rule is a allow/disallow rule.
 type Rule struct {
 	Regex  bool    `json:"regex"`

backend/rules/rules_test.go

@@ -0,0 +1,23 @@
+package rules
+
+import "testing"
+
+func TestMatchHidden(t *testing.T) {
+	cases := map[string]bool{
+		"/":                   false,
+		"/src":                false,
+		"/src/":               false,
+		"/.circleci":          true,
+		"/a/b/c/.docker.json": true,
+		".docker.json":        true,
+		"Dockerfile":          false,
+		"/Dockerfile":         false,
+	}
+
+	for path, want := range cases {
+		got := MatchHidden(path)
+		if got != want {
+			t.Errorf("MatchHidden(%s)=%v; want %v", path, got, want)
+		}
+	}
+}

backend/run_tests.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+## TEST file used by docker testing containers
+checkExit() {
+    if [ "$?" -ne 0 ];then
+        exit 1
+    fi
+}
+
+if command -v go &> /dev/null
+then
+    printf "\n == Running tests == \n"
+    go test -race -v ./...
+    checkExit
+else
+    echo "ERROR: unable to perform tests"
+    exit 1
+fi