updated search (#219)

.github/workflows/regular-tests.yaml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-            go-version: '1.23.3'
+            go-version: '1.22.5'
       - uses: golangci/golangci-lint-action@v5
         with:
           version: v1.60
@@ -41,11 +41,4 @@ jobs:
       - 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
+        run: npm i eslint && npm run lint

.gitignore

@@ -13,7 +13,6 @@ rice-box.go
 /backend/*.cov
 /backend/test_config.yaml
 /backend/srv
-/backend/http/dist
 
 .DS_Store
 node_modules

CHANGELOG.md

@@ -2,51 +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.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**:
@@ -60,9 +15,9 @@ All notable changes to this project will be documented in this file. For commit
   - 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)
+    - 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 calcuations use 1024 base vs previous 1000 base (matching windows explorer)
 
 ## v0.2.9
 
@@ -85,7 +40,7 @@ All notable changes to this project will be documented in this file. For commit
 
 ## v0.2.8
 
-- **Feature**: New gallery view scaling options (closes [#141](https://github.com/gtsteffaniak/filebrowser/issues/141))
+- **Feature**: New gallary 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

Dockerfile

@@ -1,10 +1,8 @@
-FROM golang:1.23-alpine AS base
+FROM golang:1.22-alpine AS base
 ARG VERSION
 ARG REVISION
 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/version.Version=${VERSION}' \
   -X 'github.com/gtsteffaniak/filebrowser/version.CommitSHA=${REVISION}'" \
@@ -21,7 +19,5 @@ FROM alpine:latest
 ENV FILEBROWSER_NO_EMBEDED="true"
 RUN apk --no-cache add ca-certificates mailcap
 COPY --from=base /app/filebrowser* ./
-# exposing default port for auto discovery.
-EXPOSE 80
-COPY --from=nbuild /app/dist/ ./http/dist/
+COPY --from=nbuild /app/dist/ ./frontend/dist/
 ENTRYPOINT [ "./filebrowser" ]

Dockerfile.playwright

@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine AS base
+FROM golang:1.22-alpine AS base
 WORKDIR /app
 COPY ./backend ./
 RUN go build -ldflags="-w -s" -o filebrowser .

README.md

@@ -6,60 +6,45 @@
 </p>
 <h3 align="center">FileBrowser Quantum - A modern web-based file manager</h3>
 <p align="center">
-  <img width="800" src="https://github.com/user-attachments/assets/e4a47229-66f8-4838-9575-dd2413596688" title="Main Screenshot">
+  <img width="800" src="https://private-user-images.githubusercontent.com/42989099/367975355-3d6f4619-4985-4ce3-952f-286510dff4f1.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjgxNTA2MjEsIm5iZiI6MTcyODE1MDMyMSwicGF0aCI6Ii80Mjk4OTA5OS8zNjc5NzUzNTUtM2Q2ZjQ2MTktNDk4NS00Y2UzLTk1MmYtMjg2NTEwZGZmNGYxLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDEwMDUlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQxMDA1VDE3NDUyMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTg1OGNlMWM3M2I1ZmY3MDcxMGU1ODc3N2ZkMjI5YWQ3YzEyODRmNDU0ZDkxMjJhNTU0ZGY1MDQ2YmIwOWRmMTgmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.mOl0Hm70XmQEk-DPzx1FbwrpxNMDAqb-WDprs1HK-mc" title="Main Screenshot">
 </p>
 
 > [!WARNING]
-> Starting with `v0.3.0` API routes have been slightly altered for friendly usage outside of the UI. The resources api returns items in separate `files` and `folder` objects now.
+> 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).
 
-> [!WARNING]
-> If on windows, please use docker. The windows binary is unstable and may not work.
+FileBrowser Quantum is a fork of the filebrowser opensource project with the 
+following changes:
 
-> [!WARNING]
-> There is no stable version yet. Always check release notes for bugfixes on functionality that may have been changed. If you notice any unexpected behavior -- please open an issue to have it fixed soon.
-
-FileBrowser Quantum is a fork of the file browser opensource project with the following changes:
-
-  1. [x] Indexes files efficiently. See [indexing readme](./docs/indexing.md)
+  1. [x] Efficiently indexed files
      - Real-time search results as you type
-     - Search supports file/folder sizes and many file type filters.
-     - Enhanced interactive results that shows file/folder sizes.
-  1. [x] Revamped and simplified GUI navbar and sidebar menu.
+     - Search Works with more type filters
+     - Enhanced 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
-  1. [x] Revamped and simplified configuration via `filebrowser.yml` config file.
-  1. [x] Better listing browsing
+  3. [x] Revamped and simplified configuration via `filebrowser.yml` config file.
+  4. [x] Faster listing browsing
      - Switching view modes is instant
-     - Folder sizes are shown as well
      - Changing Sort order is instant
      - The entire directory is loaded in 1/3 the time
-  1. Developer API support
-     - Can 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).
- - shell commands are completely removed and will not be returning.
- - themes and branding are not fully supported yet (planned).
- - see feature matrix below for more.
 
 ## About
 
-FileBrowser Quantum provides a file-managing interface within a specified directory
+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.
 
 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 
+aesthetics 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.
+FileBrowser Quantum differs significantly to 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
 focus of this fork is on a few key principles:
@@ -83,9 +68,10 @@ action panel. If the action is available based on context, it will show up 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/75226dc4-9802-46f0-9e3c-e4403d3275da" title="Main Screenshot">
+  <img width="800" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/899152cf-3e69-4179-aa82-752af2df3fc6" title="Main Screenshot">
+    <img width="800" src="https://github.com/user-attachments/assets/18c02d03-5c60-4e15-9c32-3cfe058a0c49" title="Main Screenshot">
+      <img width="800" src="https://github.com/user-attachments/assets/75226dc4-9802-46f0-9e3c-e4403d3275da" title="Main Screenshot">
+
 </p>
 
 ## Install
@@ -103,6 +89,7 @@ docker run -it -v /path/to/folder:/srv -p 80:80 gtstef/filebrowser
   - with local storage
 
 ```
+version: '3.7'
 services:
   filebrowser:
     volumes:
@@ -118,6 +105,7 @@ services:
   - with network share
 
 ```
+version: '3.7'
 services:
   filebrowser:
     volumes:
@@ -133,7 +121,7 @@ volumes:
     driver_opts:
       type: cifs
       o: "username=admin,password=password,rw" # enter valid info here
-      device: "//192.168.1.100/share/"         # enter valid info here
+      device: "//192.168.1.100/share/"         # enter valid hinfo here
 
 ```
 
@@ -147,28 +135,10 @@ Not using docker (not recommended), download your binary from releases and run w
 
 There are very few commands available. There are 3 actions done via command line:
 
-1. Running the program, as shown on the install step. The only argument used is the config file, if you choose to override default "filebrowser.yaml"
+1. Running the program, as shown on install step. Only argument used is the config file, if you choose to override default "filebrowser.yaml"
 2. Checking the version info via `./filebrowser version`
 3. Updating the DB, which currently only supports adding users via `./filebrowser set -u username,password [-a] [-s "example/scope"]`
 
-## API Usage
-
-FileBrowser Quantum comes with a swagger page that can be accessed from the API section of settings or by going to `/swagger` to see the full list:
-
-![image](https://github.com/user-attachments/assets/12abd1f6-21d3-4437-98ed-9b0da6cf2c73)
-
-You use the token as a 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>
-
-
 ## Configuration
 
 All configuration is now done via a single configuration file:
@@ -179,12 +149,11 @@ View the [Configuration Help Page](./docs/configuration.md) for available
 configuration options and other help.
 
 
-## Migration from the original filebrowser
+## Migration from filebrowser/filebrowser
 
 If you currently use the original filebrowser but want to try using this. 
-I would recommend that you start fresh without reusing the database. However, 
-If you want to migrate your existing database to FileBrowser Quantum, 
-visit the [migration 
+I recommend you start fresh without reusing the database. If you want to 
+migrate your existing database to FileBrowser Quantum, visit the [migration 
 readme](./docs/migration.md)
 
 ## Comparison Chart
@@ -216,8 +185,7 @@ Multiple users                | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 Single sign-on support        | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
 LDAP sign-on support          | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
 2FA sign-on support           | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-Long-live API key support     | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ |
-API documentation page        | ✅ | ❌ | ✅ | ✅ | ❌ | ✅ |
+Long-live API key support     | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ |
 Mobile App                    | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ |
 open source?                  | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ |
 tags support                  | ❌ | ❌ | ❌ | ✅ | ❌ | ✅ |

backend/auth/auth.go

@@ -9,7 +9,7 @@ import (
 // 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

@@ -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()
@@ -186,7 +187,7 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
 func (a *HookAuth) GetUser(d *users.User) *users.User {
 	// adds all permissions when user is admin
 	isAdmin := d.Perm.Admin
-	perms := users.Permissions{
+	perms := settings.Permissions{
 		Admin:    isAdmin,
 		Execute:  isAdmin || d.Perm.Execute,
 		Create:   isAdmin || d.Perm.Create,

backend/auth/json.go

@@ -23,7 +23,7 @@ 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
 
@@ -47,7 +47,8 @@ func (a JSONAuth) Auth(r *http.Request, userStore *users.Storage) (*users.User,
 			return nil, os.ErrPermission
 		}
 	}
-	u, err := userStore.Get(config.Server.Root, cred.Username)
+
+	u, err := usr.Get(config.Server.Root, cred.Username)
 	if err != nil || !users.CheckPwd(cred.Password, u.Password) {
 		return nil, os.ErrPermission
 	}

backend/auth/none.go

@@ -14,7 +14,7 @@ const MethodNoAuth = "noauth"
 type NoAuth struct{}
 
 // Auth uses authenticates user 1.
-func (a NoAuth) Auth(r *http.Request, usr *users.Storage) (*users.User, error) {
+func (a NoAuth) Auth(r *http.Request, usr users.Store) (*users.User, error) {
 	return usr.Get(settings.Config.Server.Root, uint(1))
 }
 

backend/auth/proxy.go

@@ -19,7 +19,7 @@ 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(settings.Config.Server.Root, username)
 	if err == errors.ErrNotExist {

backend/cmd/dist/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

backend/cmd/root.go

@@ -1,11 +1,20 @@
 package cmd
 
 import (
+	"crypto/tls"
 	"flag"
 	"fmt"
+	"io/fs"
 	"log"
+	"net"
+	"net/http"
 	"os"
+	"os/signal"
+	"strconv"
 	"strings"
+	"syscall"
+
+	"embed"
 
 	"github.com/gtsteffaniak/filebrowser/diskcache"
 	"github.com/gtsteffaniak/filebrowser/files"
@@ -13,15 +22,29 @@ import (
 	"github.com/gtsteffaniak/filebrowser/img"
 	"github.com/gtsteffaniak/filebrowser/settings"
 	"github.com/gtsteffaniak/filebrowser/storage"
-	"github.com/gtsteffaniak/filebrowser/swagger/docs"
-	"github.com/swaggo/swag"
-
 	"github.com/gtsteffaniak/filebrowser/users"
+	"github.com/gtsteffaniak/filebrowser/utils"
 	"github.com/gtsteffaniak/filebrowser/version"
 )
 
+//go:embed dist/*
+var assets embed.FS
+
+var (
+	nonEmbededFS = os.Getenv("FILEBROWSER_NO_EMBEDED") == "true"
+)
+
+type dirFS struct {
+	http.Dir
+}
+
+func (d dirFS) Open(name string) (fs.File, error) {
+	return d.Dir.Open(name)
+}
+
 func getStore(config string) (*storage.Storage, bool) {
 	// Use the config file (global flag)
+	log.Printf("Using Config file        : %v", config)
 	settings.Initialize(config)
 	store, hasDB, err := storage.InitializeDb(settings.Config.Server.Database)
 	if err != nil {
@@ -114,27 +137,35 @@ func StartFilebrowser() {
 		}
 	}
 	store, dbExists := getStore(configPath)
+	indexingInterval := fmt.Sprint(settings.Config.Server.IndexingInterval, " minutes")
+	if !settings.Config.Server.Indexing {
+		indexingInterval = "disabled"
+	}
 	database := fmt.Sprintf("Using existing database  : %v", settings.Config.Server.Database)
 	if !dbExists {
 		database = fmt.Sprintf("Creating new database    : %v", settings.Config.Server.Database)
 	}
 	log.Printf("Initializing FileBrowser Quantum (%v)\n", version.Version)
-	log.Printf("Using Config file        : %v", configPath)
-	log.Println("Embeded frontend         :", os.Getenv("FILEBROWSER_NO_EMBEDED") != "true")
+	log.Println("Embeded frontend         :", !nonEmbededFS)
 	log.Println(database)
 	log.Println("Sources                  :", settings.Config.Server.Root)
+	log.Print("Indexing interval        : ", indexingInterval)
 
 	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)
-	go files.InitializeIndex(serverConfig.Indexing)
+	go files.InitializeIndex(serverConfig.IndexingInterval, serverConfig.Indexing)
 	if err := rootCMD(store, &serverConfig); err != nil {
 		log.Fatal("Error starting filebrowser:", err)
 	}
 }
 
+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)
+}
+
 func rootCMD(store *storage.Storage, serverConfig *settings.Server) error {
 	if serverConfig.NumImageProcessors < 1 {
 		log.Fatal("Image resize workers count could not be < 1")
@@ -155,7 +186,57 @@ func rootCMD(store *storage.Storage, serverConfig *settings.Server) error {
 		// No-op cache if no cacheDir is specified
 		fileCache = diskcache.NewNoOp()
 	}
-	fbhttp.StartHttp(imgSvc, store, fileCache)
 
+	fbhttp.SetupEnv(store, serverConfig, fileCache)
+
+	_, err := os.Stat(serverConfig.Root)
+	utils.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)
+		utils.CheckErr("net.Listen", err)
+		err = os.Chmod(serverConfig.Socket, os.FileMode(0666)) // socket-perm
+		utils.CheckErr("os.Chmod", err)
+	case serverConfig.TLSKey != "" && serverConfig.TLSCert != "":
+		cer, err := tls.LoadX509KeyPair(serverConfig.TLSCert, serverConfig.TLSKey) //nolint:govet
+		utils.CheckErr("tls.LoadX509KeyPair", err)
+		listener, err = tls.Listen("tcp", address, &tls.Config{
+			MinVersion:   tls.VersionTLS12,
+			Certificates: []tls.Certificate{cer}},
+		)
+		utils.CheckErr("tls.Listen", err)
+	default:
+		listener, err = net.Listen("tcp", address)
+		utils.CheckErr("net.Listen", err)
+	}
+	sigc := make(chan os.Signal, 1)
+	signal.Notify(sigc, os.Interrupt, syscall.SIGTERM)
+	go cleanupHandler(listener, sigc)
+	if !nonEmbededFS {
+		assetsFs, err := fs.Sub(assets, "dist")
+		if err != nil {
+			log.Fatal("Could not embed frontend. Does backend/cmd/dist exist? Must be built and exist first")
+		}
+		handler, err := fbhttp.NewHandler(imgSvc, assetsFs)
+		utils.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)
+		}
+	} else {
+		assetsFs := dirFS{Dir: http.Dir("frontend/dist")}
+		handler, err := fbhttp.NewHandler(imgSvc, assetsFs)
+		utils.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)
+		}
+	}
 	return nil
 }

backend/cmd/rules.go

@@ -6,6 +6,7 @@ import (
 	"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"
@@ -65,7 +66,7 @@ func getUserIdentifier(flags *pflag.FlagSet) interface{} {
 	return nil
 }
 
-func printRules(rulez []users.Rule, id interface{}) {
+func printRules(rulez []rules.Rule, id interface{}) {
 
 	for id, rule := range rulez {
 		fmt.Printf("(%d) ", id)

backend/cmd/rules_add.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/gtsteffaniak/filebrowser/rules"
 	"github.com/gtsteffaniak/filebrowser/settings"
 	"github.com/gtsteffaniak/filebrowser/storage"
 	"github.com/gtsteffaniak/filebrowser/users"
@@ -31,13 +32,13 @@ var rulesAddCmd = &cobra.Command{
 			regexp.MustCompile(exp)
 		}
 
-		rule := users.Rule{
+		rule := rules.Rule{
 			Allow: allow,
 			Regex: regex,
 		}
 
 		if regex {
-			rule.Regexp = &users.Regexp{Raw: exp}
+			rule.Regexp = &rules.Regexp{Raw: exp}
 		} else {
 			rule.Path = exp
 		}

backend/files/conditions.go

@@ -14,72 +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
-
-	// Presentation Formats
-	".ppt", ".pptx", // Microsoft PowerPoint
-	".odp", // OpenDocument Presentation
-
-	// 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",
@@ -87,12 +39,6 @@ var compressedFile = []string{
 	".tar",
 	".gz",
 	".xz",
-	".bz2",
-	".tgz",  // tar.gz
-	".tbz2", // tar.bz2
-	".lzma",
-	".lz4",
-	".zstd",
 }
 
 type SearchOptions struct {
@@ -102,8 +48,8 @@ type SearchOptions struct {
 	Terms       []string
 }
 
-func ParseSearch(value string) SearchOptions {
-	opts := SearchOptions{
+func ParseSearch(value string) *SearchOptions {
+	opts := &SearchOptions{
 		Conditions: map[string]bool{
 			"exact": strings.Contains(value, "case:exact"),
 		},

backend/files/file.go

@@ -13,18 +13,14 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"sort"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
 	"unicode/utf8"
 
 	"github.com/gtsteffaniak/filebrowser/errors"
-	"github.com/gtsteffaniak/filebrowser/fileutils"
+	"github.com/gtsteffaniak/filebrowser/rules"
 	"github.com/gtsteffaniak/filebrowser/settings"
-	"github.com/gtsteffaniak/filebrowser/users"
-	"github.com/gtsteffaniak/filebrowser/utils"
 )
 
 var (
@@ -32,30 +28,35 @@ var (
 	pathMutexesMu sync.Mutex // Mutex to protect the pathMutexes map
 )
 
-type ItemInfo struct {
+type ReducedItem struct {
 	Name    string    `json:"name"`
 	Size    int64     `json:"size"`
 	ModTime time.Time `json:"modified"`
+	IsDir   bool      `json:"isDir,omitempty"`
 	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"`
-	Subtitles []string          `json:"subtitles,omitempty"`
-	Checksums map[string]string `json:"checksums,omitempty"`
-	Token     string            `json:"token,omitempty"`
+	Items        []*FileInfo       `json:"-"`
+	ReducedItems []ReducedItem     `json:"items,omitempty"`
+	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"`
+	NumDirs      int               `json:"numDirs"`
+	NumFiles     int               `json:"numFiles"`
 }
 
 // FileOptions are the options when getting a file info.
@@ -65,77 +66,163 @@ type FileOptions struct {
 	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)
+// Legacy file info method, only called on non-indexed directories.
+// Once indexing completes for the first time, NewFileInfo is never called.
+func NewFileInfo(opts FileOptions) (*FileInfo, error) {
+
+	index := GetIndex(rootPath)
+	if !opts.Checker.Check(opts.Path) {
+		return nil, os.ErrPermission
+	}
+	file, err := stat(opts)
+	if err != nil {
+		return nil, err
+	}
+	if opts.Expand {
+		if file.IsDir {
+			if err = file.readListing(opts.Path, opts.Checker, opts.ReadHeader); err != nil {
+				return nil, err
+			}
+			cleanedItems := []ReducedItem{}
+			for _, item := range file.Items {
+				// This is particularly useful for root of index, while indexing hasn't finished.
+				// adds the directory sizes for directories that have been indexed already.
+				if item.IsDir {
+					adjustedPath := index.makeIndexPath(opts.Path+"/"+item.Name, true)
+					info, _ := index.GetMetadataInfo(adjustedPath)
+					item.Size = info.Size
+				}
+				cleanedItems = append(cleanedItems, ReducedItem{
+					Name:    item.Name,
+					Size:    item.Size,
+					IsDir:   item.IsDir,
+					ModTime: item.ModTime,
+					Type:    item.Type,
+				})
+			}
+
+			file.Items = nil
+			file.ReducedItems = cleanedItems
+			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) (ExtendedFileInfo, error) {
-	index := GetIndex(rootPath)
-	opts.Path = index.makeIndexPath(opts.Path)
-	response := ExtendedFileInfo{}
+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
 	}
-
-	_, isDir, err := GetRealPath(opts.Path)
-	if err != nil {
-		return response, err
-	}
-	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(opts.Path)
-		if err != nil {
-			return response, err
+	index := GetIndex(rootPath)
+	adjustedPath := index.makeIndexPath(opts.Path, opts.IsDir)
+	if opts.IsDir {
+		info, exists := index.GetMetadataInfo(adjustedPath)
+		if exists && !opts.Content {
+			// Let's not refresh if less than a second has passed
+			if time.Since(info.CacheTime) > time.Second {
+				go RefreshFileInfo(opts) //nolint:errcheck
+			}
+			// refresh cache after
+			return &info, nil
 		}
-		response.Content = content
 	}
-	response.FileInfo = info
-	return response, nil
+	// don't bother caching content
+	if opts.Content {
+		file, err := NewFileInfo(opts)
+		return file, err
+	}
+	err := RefreshFileInfo(opts)
+	if err != nil {
+		file, err := NewFileInfo(opts)
+		return file, err
+	}
+	info, exists := index.GetMetadataInfo(adjustedPath + "/" + filepath.Base(opts.Path))
+	if !exists || info.Name == "" {
+		return NewFileInfo(opts)
+	}
+	return &info, nil
+}
+
+func RefreshFileInfo(opts FileOptions) error {
+	if !opts.Checker.Check(opts.Path) {
+		return fmt.Errorf("permission denied: %s", opts.Path)
+	}
+	index := GetIndex(rootPath)
+	adjustedPath := index.makeIndexPath(opts.Path, opts.IsDir)
+	file, err := stat(opts)
+	if err != nil {
+		return fmt.Errorf("File/folder does not exist to refresh data: %s", opts.Path)
+	}
+	_ = file.detectType(opts.Path, true, opts.Content, opts.ReadHeader)
+	if file.IsDir {
+		err := file.readListing(opts.Path, opts.Checker, opts.ReadHeader)
+		if err != nil {
+			return fmt.Errorf("Dir info could not be read: %s", opts.Path)
+		}
+	}
+	result := index.UpdateFileMetadata(adjustedPath, *file)
+	if !result {
+		return fmt.Errorf("File/folder does not exist in metadata: %s", adjustedPath)
+	}
+	return nil
+}
+
+func stat(opts FileOptions) (*FileInfo, error) {
+	info, err := os.Lstat(opts.Path)
+	if err != nil {
+		return nil, err
+	}
+	file := &FileInfo{
+		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
+		targetInfo, err := os.Stat(opts.Path)
+		if err == nil {
+			file.Size = targetInfo.Size()
+			file.IsDir = targetInfo.IsDir()
+		}
+	}
+
+	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 := os.Open(i.Path)
 	if err != nil {
-		return subs, err
+		return err
 	}
 	defer reader.Close()
 
@@ -148,21 +235,21 @@ 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
+
+	i.Checksums[algo] = hex.EncodeToString(h.Sum(nil))
+	return nil
 }
 
 // RealPath gets the real path for the file, resolving symlinks if supported.
 func (i *FileInfo) RealPath() string {
-	realPath, _, _ := GetRealPath(rootPath, i.Path)
-	realPath, err := filepath.EvalSymlinks(realPath)
+	realPath, err := filepath.EvalSymlinks(i.Path)
 	if err == nil {
 		return realPath
 	}
@@ -175,24 +262,16 @@ func GetRealPath(relativePath ...string) (string, bool, error) {
 		combined = append(combined, strings.TrimPrefix(path, settings.Config.Server.Root))
 	}
 	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", combined, err)
+		return "", false, err
+	}
+	if !Exists(absolutePath) {
+		return absolutePath, false, nil // return without error
 	}
 	// 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
+	return resolveSymlinks(absolutePath)
 }
 
 func DeleteFiles(absPath string, opts FileOptions) error {
@@ -200,50 +279,8 @@ func DeleteFiles(absPath string, opts FileOptions) error {
 	if err != nil {
 		return err
 	}
-	index := GetIndex(rootPath)
-	err = index.RefreshFileInfo(opts)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func MoveResource(realsrc, realdst string, isSrcDir bool) error {
-	err := fileutils.MoveFile(realsrc, realdst)
-	if err != nil {
-		return err
-	}
-	index := GetIndex(rootPath)
-	// refresh info for source and dest
-	err = index.RefreshFileInfo(FileOptions{
-		Path:  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(realsrc, realdst string, isSrcDir bool) error {
-	err := fileutils.CopyFile(realsrc, realdst)
-	if err != nil {
-		return err
-	}
-	index := GetIndex(rootPath)
-	refreshConfig := FileOptions{Path: realdst, IsDir: true}
-	if !isSrcDir {
-		refreshConfig.Path = filepath.Dir(realdst)
-	}
-	err = index.RefreshFileInfo(refreshConfig)
+	opts.Path = filepath.Dir(absPath)
+	err = RefreshFileInfo(opts)
 	if err != nil {
 		return errors.ErrEmptyKey
 	}
@@ -251,14 +288,13 @@ func CopyResource(realsrc, realdst string, isSrcDir bool) error {
 }
 
 func WriteDirectory(opts FileOptions) error {
-	realPath, _, _ := GetRealPath(rootPath, opts.Path)
 	// Ensure the parent directories exist
-	err := os.MkdirAll(realPath, 0775)
+	err := os.MkdirAll(opts.Path, 0775)
 	if err != nil {
 		return err
 	}
-	index := GetIndex(rootPath)
-	err = index.RefreshFileInfo(opts)
+	opts.Path = filepath.Dir(opts.Path)
+	err = RefreshFileInfo(opts)
 	if err != nil {
 		return errors.ErrEmptyKey
 	}
@@ -266,10 +302,13 @@ func WriteDirectory(opts FileOptions) error {
 }
 
 func WriteFile(opts FileOptions, in io.Reader) error {
-	dst, _, _ := GetRealPath(rootPath, opts.Path)
+	dst := opts.Path
 	parentDir := filepath.Dir(dst)
+	// Split the directory from the destination path
+	dir := filepath.Dir(dst)
+
 	// Create the directory and all necessary parents
-	err := os.MkdirAll(parentDir, 0775)
+	err := os.MkdirAll(dir, 0775)
 	if err != nil {
 		return err
 	}
@@ -287,105 +326,112 @@ func WriteFile(opts FileOptions, in io.Reader) error {
 		return err
 	}
 	opts.Path = parentDir
-	opts.IsDir = true
-	index := GetIndex(rootPath)
-	return index.RefreshFileInfo(opts)
+	err = RefreshFileInfo(opts)
+	if err != nil {
+		return errors.ErrEmptyKey
+	}
+	return nil
 }
 
 // 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
+		// Get the file info
 		info, err := os.Lstat(path)
 		if err != nil {
-			return path, false, fmt.Errorf("could not stat path: %s, %v", path, err)
+			return "", false, err
 		}
 
-		// Check if the path is a symlink
+		// Check if it's 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)
+				return "", false, err
 			}
 
-			// Resolve the symlink's target relative to its directory
-			// This ensures the resolved path is absolute and correctly calculated
+			// Resolve the target relative to the symlink's directory
 			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
+			// Not a symlink, so return the resolved path and check if it's a directory
+			return path, info.IsDir(), nil
 		}
 	}
 }
 
 // addContent reads and sets content based on the file type.
-func getContent(path string) (string, error) {
-	realPath, _, err := GetRealPath(rootPath, path)
-	if err != nil {
-		return "", err
+func (i *FileInfo) addContent(path string) error {
+	if !i.IsDir {
+		content, err := os.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 file type.
-func (i *ItemInfo) detectType(path string, modify, saveContent, readHeader bool) error {
-	name := i.Name
-	var contentErr error
+func (i *FileInfo) detectType(path string, modify, saveContent, readHeader bool) error {
+	if i.IsDir {
+		return nil
+	}
+	if IsNamedPipe(i.Mode) {
+		i.Type = "blob"
+		if saveContent {
+			return i.addContent(path)
+		}
+		return nil
+	}
 
-	ext := filepath.Ext(name)
 	var buffer []byte
 	if readHeader {
-		buffer = i.readFirstBytes(path)
-		mimetype := mime.TypeByExtension(ext)
+		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 contentErr
+				return i.addContent(path)
 			}
 		case "video":
-			// TODO add back somewhere else, not during metadata fetch
-			//parentDir := strings.TrimRight(path, name)
-			//i.detectSubtitles(parentDir)
+			parentDir := strings.TrimRight(path, i.Name)
+			i.detectSubtitles(parentDir)
 		case "doc":
 			if ext == ".pdf" {
 				i.Type = "pdf"
 				return nil
 			}
 			if saveContent {
-				return nil
+				return i.addContent(path)
 			}
 		}
 	}
 	if i.Type == "" {
 		i.Type = "blob"
 		if saveContent {
-			return contentErr
+			return i.addContent(path)
 		}
 	}
 
@@ -393,8 +439,8 @@ func (i *ItemInfo) detectType(path string, modify, saveContent, readHeader bool)
 }
 
 // readFirstBytes reads the first bytes of the file.
-func (i *ItemInfo) readFirstBytes(path string) []byte {
-	file, err := os.Open(path)
+func (i *FileInfo) readFirstBytes() []byte {
+	file, err := os.Open(i.Path)
 	if err != nil {
 		i.Type = "blob"
 		return nil
@@ -411,44 +457,114 @@ func (i *ItemInfo) readFirstBytes(path string) []byte {
 	return buffer[:n]
 }
 
-// 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
-//			}
-//		}
-//	}
-//}
+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
+	}
+	defer dir.Close() // Ensure directory handle is closed
+
+	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
+			}
+		}
+	}
+}
+
+// readListing reads the contents of a directory and fills the listing.
+func (i *FileInfo) readListing(path string, checker rules.Checker, readHeader bool) error {
+	dir, err := os.Open(i.Path)
+	if err != nil {
+		return err
+	}
+	defer dir.Close()
+
+	files, err := dir.Readdir(-1)
+	if err != nil {
+		return err
+	}
+
+	listing := &FileInfo{
+		Items:    []*FileInfo{},
+		NumDirs:  0,
+		NumFiles: 0,
+	}
+
+	for _, f := range files {
+		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 := os.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.Items = listing.Items
+	return nil
+}
 
 func IsNamedPipe(mode os.FileMode) bool {
 	return mode&os.ModeNamedPipe != 0
@@ -481,26 +597,3 @@ func Exists(path string) bool {
 	}
 	return false
 }
-
-func (info *FileInfo) SortItems() {
-	sort.Slice(info.Folders, func(i, j int) bool {
-		// Convert strings to integers for numeric sorting if both are numeric
-		numI, errI := strconv.Atoi(info.Folders[i].Name)
-		numJ, errJ := strconv.Atoi(info.Folders[j].Name)
-		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 {
-		// Convert strings to integers for numeric sorting if both are numeric
-		numI, errI := strconv.Atoi(info.Files[i].Name)
-		numJ, errJ := strconv.Atoi(info.Files[j].Name)
-		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

@@ -63,11 +63,14 @@ func Test_GetRealPath(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			realPath, isDir, _ := GetRealPath(tt.paths...)
+			realPath, isDir, err := 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)
 			}
+			if err != nil {
+				t.Error("got error", err)
+			}
 		})
 	}
 }

backend/files/indexing.go

@@ -0,0 +1,198 @@
+package files
+
+import (
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/gtsteffaniak/filebrowser/settings"
+)
+
+type Index struct {
+	Root        string
+	Directories map[string]FileInfo
+	NumDirs     int
+	NumFiles    int
+	inProgress  bool
+	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)
+	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)
+		// 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 {
+	// Ensure path is cleaned and normalized
+	adjustedPath := si.makeIndexPath(path, true)
+
+	// Open the directory
+	dir, err := os.Open(path)
+	if err != nil {
+		// If the directory can't be opened (e.g., deleted), remove it from the index
+		si.RemoveDirectory(adjustedPath)
+		return err
+	}
+	defer dir.Close()
+
+	dirInfo, err := dir.Stat()
+	if err != nil {
+		return err
+	}
+
+	// Check if the directory is already up-to-date
+	if dirInfo.ModTime().Before(si.LastIndexed) {
+		return nil
+	}
+
+	// Read directory contents
+	files, err := dir.Readdir(-1)
+	if err != nil {
+		return err
+	}
+
+	// Recursively process files and directories
+	fileInfos := []*FileInfo{}
+	var totalSize int64
+	var numDirs, numFiles int
+
+	for _, file := range files {
+		parentInfo := &FileInfo{
+			Name:    file.Name(),
+			Size:    file.Size(),
+			ModTime: file.ModTime(),
+			IsDir:   file.IsDir(),
+		}
+		childInfo, err := si.InsertInfo(path, parentInfo)
+		if err != nil {
+			// Log error, but continue processing other files
+			continue
+		}
+
+		// Accumulate directory size and items
+		totalSize += childInfo.Size
+		if childInfo.IsDir {
+			numDirs++
+		} else {
+			numFiles++
+		}
+		_ = childInfo.detectType(path, true, false, false)
+		fileInfos = append(fileInfos, childInfo)
+	}
+
+	// Create FileInfo for the current directory
+	dirFileInfo := &FileInfo{
+		Items:     fileInfos,
+		Name:      filepath.Base(path),
+		Size:      totalSize,
+		ModTime:   dirInfo.ModTime(),
+		CacheTime: time.Now(),
+		IsDir:     true,
+		NumDirs:   numDirs,
+		NumFiles:  numFiles,
+	}
+
+	// Add directory to index
+	si.mu.Lock()
+	si.Directories[adjustedPath] = *dirFileInfo
+	si.NumDirs += numDirs
+	si.NumFiles += numFiles
+	si.mu.Unlock()
+	return nil
+}
+
+// InsertInfo function to handle adding a file or directory into the index
+func (si *Index) InsertInfo(parentPath string, file *FileInfo) (*FileInfo, error) {
+	filePath := filepath.Join(parentPath, file.Name)
+
+	// Check if it's a directory and recursively index it
+	if file.IsDir {
+		// Recursively index directory
+		err := si.indexFiles(filePath)
+		if err != nil {
+			return nil, err
+		}
+
+		// Return directory info from the index
+		adjustedPath := si.makeIndexPath(filePath, true)
+		si.mu.RLock()
+		dirInfo := si.Directories[adjustedPath]
+		si.mu.RUnlock()
+		return &dirInfo, nil
+	}
+
+	// Create FileInfo for regular files
+	fileInfo := &FileInfo{
+		Path:    filePath,
+		Name:    file.Name,
+		Size:    file.Size,
+		ModTime: file.ModTime,
+		IsDir:   false,
+	}
+
+	return fileInfo, nil
+}
+
+func (si *Index) makeIndexPath(subPath string, isDir bool) string {
+	if si.Root == subPath {
+		return "/"
+	}
+	// clean path
+	subPath = strings.TrimSuffix(subPath, "/")
+	// remove index prefix
+	adjustedPath := strings.TrimPrefix(subPath, si.Root)
+	// remove trailing slash
+	adjustedPath = strings.TrimSuffix(adjustedPath, "/")
+	// add leading slash for root of index
+	if adjustedPath == "" {
+		adjustedPath = "/"
+	} else if !isDir {
+		adjustedPath = filepath.Dir(adjustedPath)
+	}
+	if !strings.HasPrefix(adjustedPath, "/") {
+		adjustedPath = "/" + adjustedPath
+	}
+	return adjustedPath
+}

backend/files/indexingFiles.go

@@ -1,229 +0,0 @@
-package files
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/gtsteffaniak/filebrowser/settings"
-	"github.com/gtsteffaniak/filebrowser/utils"
-)
-
-type Index struct {
-	Root                       string
-	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 (
-	rootPath     string = "/srv"
-	indexes      []*Index
-	indexesMutex sync.RWMutex
-)
-
-func InitializeIndex(enabled bool) {
-	if enabled {
-		time.Sleep(time.Second)
-		if settings.Config.Server.Root != "" {
-			rootPath = settings.Config.Server.Root
-		}
-		si := GetIndex(rootPath)
-		log.Println("Initializing index and assessing file system complexity")
-		si.RunIndexing("/", false)
-		go si.setupIndexingScanners()
-	}
-}
-
-// Define a function to recursively index files and directories
-func (si *Index) indexDirectory(adjustedPath string, quick, recursive bool) error {
-	realPath := strings.TrimRight(si.Root, "/") + adjustedPath
-
-	// Open the directory
-	dir, err := os.Open(realPath)
-	if err != nil {
-		si.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
-	si.mu.RLock()
-	cacheDirItems := []ItemInfo{}
-	modChange := true // default to true
-	cachedDir, exists := si.Directories[adjustedPath]
-	if exists && quick {
-		modChange = dirInfo.ModTime() != cachedDir.ModTime
-		cacheDirItems = cachedDir.Folders
-	}
-	si.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 = si.indexDirectory(combinedPath+item.Name, quick, true)
-			if err != nil {
-				fmt.Printf("error indexing directory %v : %v", combinedPath+item.Name, err)
-			}
-		}
-		return nil
-	}
-
-	if quick {
-		si.mu.Lock()
-		si.FilesChangedDuringIndexing = true
-		si.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 {
-		itemInfo := &ItemInfo{
-			Name:    file.Name(),
-			ModTime: file.ModTime(),
-		}
-		if file.IsDir() {
-			dirPath := combinedPath + file.Name()
-			if recursive {
-				// Recursively index the subdirectory
-				err = si.indexDirectory(dirPath, quick, recursive)
-				if err != nil {
-					log.Printf("Failed to index directory %s: %v", dirPath, err)
-					continue
-				}
-			}
-			realDirInfo, exists := si.GetMetadataInfo(dirPath, true)
-			if exists {
-				itemInfo.Size = realDirInfo.Size
-			}
-			totalSize += itemInfo.Size
-			itemInfo.Type = "directory"
-			dirInfos = append(dirInfos, *itemInfo)
-			si.NumDirs++
-		} else {
-			_ = itemInfo.detectType(combinedPath+file.Name(), true, false, false)
-			itemInfo.Size = file.Size()
-			fileInfos = append(fileInfos, *itemInfo)
-			totalSize += itemInfo.Size
-			si.NumFiles++
-		}
-	}
-	// 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
-	si.UpdateMetadata(dirFileInfo)
-
-	return nil
-}
-
-func (si *Index) makeIndexPath(subPath string) string {
-	if strings.HasPrefix(subPath, "./") {
-		subPath = strings.TrimPrefix(subPath, ".")
-	}
-	if si.Root == subPath || subPath == "." {
-		return "/"
-	}
-	// clean path
-	subPath = strings.TrimSuffix(subPath, "/")
-	// remove index prefix
-	adjustedPath := strings.TrimPrefix(subPath, si.Root)
-	// remove trailing slash
-	adjustedPath = strings.TrimSuffix(adjustedPath, "/")
-	if !strings.HasPrefix(adjustedPath, "/") {
-		adjustedPath = "/" + adjustedPath
-	}
-	return adjustedPath
-}
-
-func (si *Index) recursiveUpdateDirSizes(childInfo *FileInfo, previousSize int64) {
-	parentDir := utils.GetParentDirectoryPath(childInfo.Path)
-	parentInfo, exists := si.GetMetadataInfo(parentDir, true)
-	if !exists || parentDir == "" {
-		return
-	}
-	newSize := parentInfo.Size - previousSize + childInfo.Size
-	parentInfo.Size += newSize
-	si.UpdateMetadata(parentInfo)
-	si.recursiveUpdateDirSizes(parentInfo, newSize)
-}
-
-func (si *Index) RefreshFileInfo(opts FileOptions) error {
-	refreshOptions := FileOptions{
-		Path:  opts.Path,
-		IsDir: opts.IsDir,
-	}
-
-	if !refreshOptions.IsDir {
-		refreshOptions.Path = si.makeIndexPath(filepath.Dir(refreshOptions.Path))
-		refreshOptions.IsDir = true
-	} else {
-		refreshOptions.Path = si.makeIndexPath(refreshOptions.Path)
-	}
-	err := si.indexDirectory(refreshOptions.Path, false, false)
-	if err != nil {
-		return fmt.Errorf("file/folder does not exist to refresh data: %s", refreshOptions.Path)
-	}
-	file, exists := si.GetMetadataInfo(refreshOptions.Path, true)
-	if !exists {
-		return fmt.Errorf("file/folder does not exist in metadata: %s", refreshOptions.Path)
-	}
-
-	current, firstExisted := si.GetMetadataInfo(refreshOptions.Path, true)
-	refreshParentInfo := firstExisted && current.Size != file.Size
-	//utils.PrintStructFields(*file)
-	result := si.UpdateMetadata(file)
-	if !result {
-		return fmt.Errorf("file/folder does not exist in metadata: %s", refreshOptions.Path)
-	}
-	if !exists {
-		return nil
-	}
-	if refreshParentInfo {
-		si.recursiveUpdateDirSizes(file, current.Size)
-	}
-	return nil
-}

backend/files/indexingSchedule.go

@@ -1,120 +0,0 @@
-package files
-
-import (
-	"log"
-	"time"
-
-	"github.com/gtsteffaniak/filebrowser/settings"
-)
-
-// 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 (si *Index) newScanner(origin string) {
-	fullScanAnchor := 3
-	fullScanCounter := 0 // every 5th scan is a full scan
-	for {
-		// Determine sleep time with modifiers
-		fullScanCounter++
-		sleepTime := scanSchedule[si.currentSchedule] + si.SmartModifier
-		if si.assessment == "simple" {
-			sleepTime = scanSchedule[si.currentSchedule] - si.SmartModifier
-		}
-		if settings.Config.Server.IndexingInterval > 0 {
-			sleepTime = time.Duration(settings.Config.Server.IndexingInterval) * time.Minute
-		}
-
-		// Log and sleep before indexing
-		log.Printf("Next scan in %v\n", sleepTime)
-		time.Sleep(sleepTime)
-
-		si.scannerMu.Lock()
-		if fullScanCounter == 5 {
-			si.RunIndexing(origin, false) // Full scan
-			fullScanCounter = 0
-		} else {
-			si.RunIndexing(origin, true) // Quick scan
-		}
-		si.scannerMu.Unlock()
-
-		// Adjust schedule based on file changes
-		if si.FilesChangedDuringIndexing {
-			// Move to at least the full-scan anchor or reduce interval
-			if si.currentSchedule > fullScanAnchor {
-				si.currentSchedule = fullScanAnchor
-			} else if si.currentSchedule > 0 {
-				si.currentSchedule--
-			}
-		} else {
-			// Increment toward the longest interval if no changes
-			if si.currentSchedule < len(scanSchedule)-1 {
-				si.currentSchedule++
-			}
-		}
-		if si.assessment == "simple" && si.currentSchedule > 3 {
-			si.currentSchedule = 3
-		}
-		// Ensure `currentSchedule` stays within bounds
-		if si.currentSchedule < 0 {
-			si.currentSchedule = 0
-		} else if si.currentSchedule >= len(scanSchedule) {
-			si.currentSchedule = len(scanSchedule) - 1
-		}
-	}
-}
-
-func (si *Index) RunIndexing(origin string, quick bool) {
-	prevNumDirs := si.NumDirs
-	prevNumFiles := si.NumFiles
-	if quick {
-		log.Println("Starting quick scan")
-	} else {
-		log.Println("Starting full scan")
-		si.NumDirs = 0
-		si.NumFiles = 0
-	}
-	startTime := time.Now()
-	si.FilesChangedDuringIndexing = false
-	// Perform the indexing operation
-	err := si.indexDirectory("/", quick, true)
-	if err != nil {
-		log.Printf("Error during indexing: %v", err)
-	}
-	// Update the LastIndexed time
-	si.LastIndexed = time.Now()
-	si.indexingTime = int(time.Since(startTime).Seconds())
-	if !quick {
-		// update smart indexing
-		if si.indexingTime < 3 || si.NumDirs < 10000 {
-			si.assessment = "simple"
-			si.SmartModifier = 4 * time.Minute
-			log.Println("Index is small and efficient, adjusting scan interval accordingly.")
-		} else if si.indexingTime > 120 || si.NumDirs > 500000 {
-			si.assessment = "complex"
-			modifier := si.indexingTime / 10 // seconds
-			si.SmartModifier = time.Duration(modifier) * time.Minute
-			log.Println("Index is large and complex, adjusting scan interval accordingly.")
-		} else {
-			si.assessment = "normal"
-			log.Println("Index is normal, quick scan set to every 5 minutes.")
-		}
-		log.Printf("Index assessment         : complexity=%v directories=%v files=%v \n", si.assessment, si.NumDirs, si.NumFiles)
-		if si.NumDirs != prevNumDirs || si.NumFiles != prevNumFiles {
-			si.FilesChangedDuringIndexing = true
-		}
-	}
-	log.Printf("Time Spent Indexing      : %v seconds\n", si.indexingTime)
-}
-
-func (si *Index) setupIndexingScanners() {
-	go si.newScanner("/")
-}

backend/files/indexing_test.go

@@ -2,6 +2,7 @@ package files
 
 import (
 	"encoding/json"
+	"fmt"
 	"math/rand"
 	"reflect"
 	"testing"
@@ -11,7 +12,7 @@ import (
 )
 
 func BenchmarkFillIndex(b *testing.B) {
-	InitializeIndex(false)
+	InitializeIndex(5, false)
 	si := GetIndex(settings.Config.Server.Root)
 	b.ResetTimer()
 	b.ReportAllocs()
@@ -22,25 +23,27 @@ func BenchmarkFillIndex(b *testing.B) {
 
 func (si *Index) createMockData(numDirs, numFilesPerDir int) {
 	for i := 0; i < numDirs; i++ {
-		dirPath := generateRandomPath(rand.Intn(3) + 1)
-		files := []ItemInfo{} // Slice of FileInfo
+		dirName := generateRandomPath(rand.Intn(3) + 1)
+		files := []*FileInfo{} // Slice of FileInfo
 
 		// Simulating files and directories with FileInfo
 		for j := 0; j < numFilesPerDir; j++ {
-			newFile := ItemInfo{
+			newFile := &FileInfo{
 				Name:    "file-" + getRandomTerm() + getRandomExtension(),
+				IsDir:   false,
 				Size:    rand.Int63n(1000),                                          // Random size
 				ModTime: time.Now().Add(-time.Duration(rand.Intn(100)) * time.Hour), // Random mod time
-				Type:    "blob",
 			}
 			files = append(files, newFile)
 		}
-		dirInfo := &FileInfo{
-			Path:  dirPath,
-			Files: files,
-		}
 
-		si.UpdateMetadata(dirInfo)
+		// Simulate inserting files into index
+		for _, file := range files {
+			_, err := si.InsertInfo(dirName, file)
+			if err != nil {
+				fmt.Println("Error inserting file:", err)
+			}
+		}
 	}
 }
 
@@ -111,30 +114,36 @@ func TestGetIndex(t *testing.T) {
 	}
 }
 
-func TestMakeIndexPath(t *testing.T) {
-	tests := []struct {
-		name     string
-		subPath  string
-		expected string
-	}{
-		{"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"},
+func TestInitializeIndex(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) {
-			si := &Index{Root: "/"}
-			result := si.makeIndexPath(tt.subPath)
-			if result != tt.expected {
-				t.Errorf("makeIndexPath(%q) = %q; want %q", tt.name, result, tt.expected)
-			}
+			InitializeIndex(tt.args.intervalMinutes, false)
+		})
+	}
+}
+
+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) {
+			indexingScheduler(tt.args.intervalMinutes)
 		})
 	}
 }

backend/files/search.go

@@ -1,12 +1,12 @@
 package files
 
 import (
+	"math/rand"
 	"path/filepath"
 	"sort"
 	"strings"
 	"sync"
-
-	"github.com/gtsteffaniak/filebrowser/utils"
+	"time"
 )
 
 var (
@@ -14,120 +14,123 @@ var (
 	maxSearchResults  = 100
 )
 
-type searchResult struct {
-	Path string `json:"path"`
-	Type string `json:"type"`
-	Size int64  `json:"size"`
-}
-
-func (si *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 = si.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(si.Root + scope).([]string)
-	if ok {
-		directories = cachedDirs
-	} else {
-		directories = si.getDirsInScope(scope)
-		utils.SearchResultsCache.Set(si.Root+scope, directories)
-	}
 	for _, searchTerm := range searchOptions.Terms {
 		if searchTerm == "" {
 			continue
 		}
-		if count > maxSearchResults {
-			break
-		}
 		si.mu.Lock()
-		for _, dirName := range directories {
-			scopedPath := strings.TrimPrefix(strings.TrimPrefix(dirName, scope), "/") + "/"
-			si.mu.Unlock()
-			dir, found := si.GetReducedMetadata(dirName, true)
-			si.mu.Lock()
-			if !found {
-				continue
+		for dirName, dir := range si.Directories {
+			isDir := true
+			files := []string{}
+			for _, item := range dir.Items {
+				if !item.IsDir {
+					files = append(files, item.Name)
+				}
+			}
+			value, found := sessionInProgress.Load(sourceSession)
+			if !found || value != runningHash {
+				si.mu.Unlock()
+				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{}
+			si.mu.Unlock()
+			matches, fileType := si.containsSearchTerm(dirName, searchTerm, *searchOptions, isDir, fileTypes)
+			si.mu.Lock()
 			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 {
-					si.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 := strings.TrimLeft(pathName+file, "/")
+				fileTypes := map[string]bool{}
+				si.mu.Unlock()
+				matches, fileType := si.containsSearchTerm(fullName, searchTerm, *searchOptions, isDir, fileTypes)
+				si.mu.Lock()
+				if !matches {
+					continue
 				}
+				fileListTypes[fullName] = fileType
+				matching = append(matching, fullName)
+				count++
 			}
 		}
 		si.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{}
+func (si *Index) containsSearchTerm(pathName string, searchTerm string, options SearchOptions, isDir bool, fileTypes map[string]bool) (bool, map[string]bool) {
 	largerThan := int64(options.LargerThan) * 1024 * 1024
 	smallerThan := int64(options.SmallerThan) * 1024 * 1024
 	conditions := options.Conditions
-	lowerFileName := strings.ToLower(fi.Name)
+	fileName := filepath.Base(pathName)
+	adjustedPath := si.makeIndexPath(pathName, isDir)
 
 	// Convert to lowercase if not exact match
 	if !conditions["exact"] {
+		fileName = strings.ToLower(fileName)
 		searchTerm = strings.ToLower(searchTerm)
 	}
 
 	// Check if the file name contains the search term
-	if !strings.Contains(lowerFileName, searchTerm) {
-		return false
+	if !strings.Contains(fileName, searchTerm) {
+		return false, map[string]bool{}
 	}
 
 	// Initialize file size and fileTypes map
 	var fileSize int64
-	extension := filepath.Ext(lowerFileName)
+	extension := filepath.Ext(fileName)
 
 	// Collect file types
 	for _, k := range AllFiletypeOptions {
@@ -135,9 +138,31 @@ func (fi ItemInfo) containsSearchTerm(searchTerm string, options SearchOptions)
 			fileTypes[k] = true
 		}
 	}
-	isDir := fi.Type == "directory"
 	fileTypes["dir"] = isDir
-	fileSize = fi.Size
+	// Get file info if needed for size-related conditions
+	if largerThan > 0 || smallerThan > 0 {
+		fileInfo, exists := si.GetMetadataInfo(adjustedPath)
+		if !exists {
+			return false, fileTypes
+		} else if !isDir {
+			// Look for specific file in ReducedItems
+			for _, item := range fileInfo.ReducedItems {
+				lower := strings.ToLower(item.Name)
+				if strings.Contains(lower, searchTerm) {
+					if item.Size == 0 {
+						return false, fileTypes
+					}
+					fileSize = item.Size
+					break
+				}
+			}
+		} else {
+			fileSize = fileInfo.Size
+		}
+		if fileSize == 0 {
+			return false, fileTypes
+		}
+	}
 
 	// Evaluate all conditions
 	for t, v := range conditions {
@@ -148,35 +173,33 @@ func (fi ItemInfo) containsSearchTerm(searchTerm string, options SearchOptions)
 		case "larger":
 			if largerThan > 0 {
 				if fileSize <= largerThan {
-					return false
+					return false, fileTypes
 				}
 			}
 		case "smaller":
 			if smallerThan > 0 {
 				if fileSize >= smallerThan {
-					return false
+					return false, fileTypes
 				}
 			}
 		default:
 			// Handle other file type conditions
 			notMatchType := v != fileTypes[t]
 			if notMatchType {
-				return false
+				return false, fileTypes
 			}
 		}
 	}
 
-	return true
+	return true, fileTypes
 }
 
-func (si *Index) getDirsInScope(scope string) []string {
-	newList := []string{}
-	si.mu.Lock()
-	defer si.mu.Unlock()
-	for k := range si.Directories {
-		if strings.HasPrefix(k, scope) || scope == "" {
-			newList = append(newList, k)
-		}
+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 newList
+	return string(result)
 }

backend/files/search_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func BenchmarkSearchAllIndexes(b *testing.B) {
-	InitializeIndex(false)
+	InitializeIndex(5, false)
 	si := GetIndex(rootPath)
 
 	si.createMockData(50, 3) // 50 dirs, 3 files per dir
@@ -29,25 +29,25 @@ func BenchmarkSearchAllIndexes(b *testing.B) {
 func TestParseSearch(t *testing.T) {
 	tests := []struct {
 		input string
-		want  SearchOptions
+		want  *SearchOptions
 	}{
 		{
 			input: "my test search",
-			want: SearchOptions{
+			want: &SearchOptions{
 				Conditions: map[string]bool{"exact": false},
 				Terms:      []string{"my test search"},
 			},
 		},
 		{
 			input: "case:exact my|test|search",
-			want: SearchOptions{
+			want: &SearchOptions{
 				Conditions: map[string]bool{"exact": true},
 				Terms:      []string{"my", "test", "search"},
 			},
 		},
 		{
 			input: "type:largerThan=100 type:smallerThan=1000 test",
-			want: SearchOptions{
+			want: &SearchOptions{
 				Conditions:  map[string]bool{"exact": false, "larger": true, "smaller": true},
 				Terms:       []string{"test"},
 				LargerThan:  100,
@@ -56,7 +56,7 @@ func TestParseSearch(t *testing.T) {
 		},
 		{
 			input: "type:audio thisfile",
-			want: SearchOptions{
+			want: &SearchOptions{
 				Conditions: map[string]bool{"exact": false, "audio": true},
 				Terms:      []string{"thisfile"},
 			},
@@ -74,7 +74,7 @@ func TestParseSearch(t *testing.T) {
 }
 
 func TestSearchWhileIndexing(t *testing.T) {
-	InitializeIndex(false)
+	InitializeIndex(5, false)
 	si := GetIndex(rootPath)
 
 	searchTerms := generateRandomSearchTerms(10)
@@ -88,30 +88,24 @@ func TestSearchWhileIndexing(t *testing.T) {
 
 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"},
+		Directories: map[string]FileInfo{
+			"test":      {Items: []*FileInfo{{Name: "audio1.wav"}}},
+			"test/path": {Items: []*FileInfo{{Name: "file.txt"}}},
+			"new/test": {Items: []*FileInfo{
+				{Name: "audio.wav"},
+				{Name: "video.mp4"},
+				{Name: "video.MP4"},
+			}},
+			"new/test/path": {Items: []*FileInfo{{Name: "archive.zip"}}},
+			"/firstDir": {Items: []*FileInfo{
+				{Name: "archive.zip", Size: 100},
+				{Name: "thisIsDir", IsDir: true, Size: 2 * 1024 * 1024},
 			}},
-			"/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},
-				},
-			},
 			"/firstDir/thisIsDir": {
-				Files: []ItemInfo{
-					{Name: "hi.txt", Type: "text"},
-				},
-				ItemInfo: ItemInfo{
-					Size: 2 * 1024 * 1024,
+				Items: []*FileInfo{
+					{Name: "hi.txt"},
 				},
+				Size: 2 * 1024 * 1024,
 			},
 		},
 	}
@@ -119,106 +113,112 @@ func TestSearchIndexes(t *testing.T) {
 	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": {"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/":     {"dir": true},
+				"new/test/": {"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:         "archive",
+			scope:          "/",
+			expectedResult: []string{"firstDir/archive.zip", "new/test/path/archive.zip"},
+			expectedTypes: map[string]map[string]bool{
+				"new/test/path/archive.zip": {"archive": true, "dir": false},
+				"firstDir/archive.zip":      {"archive": true, "dir": false},
 			},
 		},
 		{
-			search: "arch",
-			scope:  "/firstDir",
-			expectedResult: []searchResult{
-				{
-					Path: "archive.zip",
-					Type: "archive",
-					Size: 100,
-				},
+			search:         "arch",
+			scope:          "/firstDir",
+			expectedResult: []string{"archive.zip"},
+			expectedTypes: map[string]map[string]bool{
+				"archive.zip": {"archive": true, "dir": false},
 			},
 		},
 		{
-			search: "isdir",
-			scope:  "/",
-			expectedResult: []searchResult{
-				{
-					Path: "firstDir/thisIsDir/",
-					Type: "directory",
-					Size: 2097152,
-				},
+			search:         "isdir",
+			scope:          "/",
+			expectedResult: []string{"firstDir/thisIsDir/"},
+			expectedTypes: map[string]map[string]bool{
+				"firstDir/thisIsDir/": {"dir": true},
 			},
 		},
 		{
-			search: "IsDir type:largerThan=1",
-			scope:  "/",
-			expectedResult: []searchResult{
-				{
-					Path: "firstDir/thisIsDir/",
-					Type: "directory",
-					Size: 2097152,
-				},
+			search:         "dir type:largerThan=1",
+			scope:          "/",
+			expectedResult: []string{"firstDir/thisIsDir/"},
+			expectedTypes: map[string]map[string]bool{
+				"firstDir/thisIsDir/": {"dir": true},
 			},
 		},
 		{
 			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": {"video": true, "dir": false},
+				"new/test/video.mp4": {"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)
+			assert.Equal(t, tt.expectedTypes, actualTypes)
+		})
+	}
+}
+
+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)
+			}
 		})
 	}
 }

backend/files/sync.go

@@ -1,71 +1,102 @@
 package files
 
 import (
-	"path/filepath"
+	"log"
+	"time"
 
 	"github.com/gtsteffaniak/filebrowser/settings"
 )
 
 // UpdateFileMetadata updates the FileInfo for the specified directory in the index.
-func (si *Index) UpdateMetadata(info *FileInfo) bool {
+func (si *Index) UpdateFileMetadata(adjustedPath string, info FileInfo) bool {
 	si.mu.Lock()
 	defer si.mu.Unlock()
-	si.Directories[info.Path] = info
+	dir, exists := si.Directories[adjustedPath]
+	if !exists {
+		si.Directories[adjustedPath] = FileInfo{}
+	}
+	return si.SetFileMetadata(adjustedPath, dir)
+}
+
+// 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] = info
 	return true
 }
 
 // GetMetadataInfo retrieves the FileInfo from the specified directory in the index.
-func (si *Index) GetReducedMetadata(target string, isDir bool) (*FileInfo, bool) {
-	si.mu.Lock()
-	defer si.mu.Unlock()
-	checkDir := si.makeIndexPath(target)
-	if !isDir {
-		checkDir = si.makeIndexPath(filepath.Dir(target))
-	}
-	dir, exists := si.Directories[checkDir]
+func (si *Index) GetMetadataInfo(adjustedPath string) (FileInfo, bool) {
+	si.mu.RLock()
+	dir, exists := si.Directories[adjustedPath]
+	si.mu.RUnlock()
 	if !exists {
-		return nil, false
+		return dir, exists
 	}
-
-	if isDir {
-		return dir, true
+	// remove recursive items, we only want this directories direct files
+	cleanedItems := []ReducedItem{}
+	for _, item := range dir.Items {
+		cleanedItems = append(cleanedItems, ReducedItem{
+			Name:    item.Name,
+			Size:    item.Size,
+			IsDir:   item.IsDir,
+			ModTime: item.ModTime,
+			Type:    item.Type,
+		})
 	}
-	// handle file
-	if checkDir == "/" {
-		checkDir = ""
-	}
-	baseName := filepath.Base(target)
-	for _, item := range dir.Files {
-		if item.Name == baseName {
-			return &FileInfo{
-				Path:     checkDir + "/" + item.Name,
-				ItemInfo: item,
-			}, true
-		}
-	}
-	return nil, false
-
+	dir.Items = nil
+	dir.ReducedItems = cleanedItems
+	realPath, _, _ := GetRealPath(adjustedPath)
+	dir.Path = realPath
+	return dir, exists
 }
 
-// GetMetadataInfo retrieves the FileInfo from the specified directory in the index.
-func (si *Index) GetMetadataInfo(target string, isDir bool) (*FileInfo, bool) {
+// SetDirectoryInfo sets the directory information in the index.
+func (si *Index) SetDirectoryInfo(adjustedPath string, dir FileInfo) {
+	si.mu.Lock()
+	si.Directories[adjustedPath] = dir
+	si.mu.Unlock()
+}
+
+// SetDirectoryInfo sets the directory information in the index.
+func (si *Index) GetDirectoryInfo(adjustedPath string) (FileInfo, bool) {
 	si.mu.RLock()
-	defer si.mu.RUnlock()
-	checkDir := si.makeIndexPath(target)
-	if !isDir {
-		checkDir = si.makeIndexPath(filepath.Dir(target))
-	}
-	dir, exists := si.Directories[checkDir]
+	dir, exists := si.Directories[adjustedPath]
+	si.mu.RUnlock()
 	return dir, exists
 }
 
 func (si *Index) RemoveDirectory(path string) {
 	si.mu.Lock()
 	defer si.mu.Unlock()
-	si.NumDeleted++
 	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)
+	}
+}
+
+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 {
@@ -77,11 +108,11 @@ func GetIndex(root string) *Index {
 	}
 	newIndex := &Index{
 		Root:        rootPath,
-		Directories: map[string]*FileInfo{},
+		Directories: map[string]FileInfo{},
 		NumDirs:     0,
 		NumFiles:    0,
+		inProgress:  false,
 	}
-	newIndex.Directories["/"] = &FileInfo{}
 	indexesMutex.Lock()
 	indexes = append(indexes, newIndex)
 	indexesMutex.Unlock()

backend/files/sync_test.go

@@ -32,9 +32,9 @@ func TestGetFileMetadataSize(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			fileInfo, _ := testIndex.GetReducedMetadata(tt.adjustedPath, true)
+			fileInfo, _ := testIndex.GetMetadataInfo(tt.adjustedPath)
 			// Iterate over fileInfo.Items to look for expectedName
-			for _, item := range fileInfo.Files {
+			for _, item := range fileInfo.ReducedItems {
 				// Assert the existence and the name
 				if item.Name == tt.expectedName {
 					assert.Equal(t, tt.expectedSize, item.Size)
@@ -53,29 +53,28 @@ func TestGetFileMetadata(t *testing.T) {
 		adjustedPath   string
 		expectedName   string
 		expectedExists bool
-		isDir          bool
 	}{
 		{
 			name:           "testpath exists",
-			adjustedPath:   "/testpath/testfile.txt",
+			adjustedPath:   "/testpath",
 			expectedName:   "testfile.txt",
 			expectedExists: true,
 		},
 		{
 			name:           "testpath not exists",
-			adjustedPath:   "/testpath/nonexistent.txt",
+			adjustedPath:   "/testpath",
 			expectedName:   "nonexistent.txt",
 			expectedExists: false,
 		},
 		{
 			name:           "File exists in /anotherpath",
-			adjustedPath:   "/anotherpath/afile.txt",
+			adjustedPath:   "/anotherpath",
 			expectedName:   "afile.txt",
 			expectedExists: true,
 		},
 		{
 			name:           "File does not exist in /anotherpath",
-			adjustedPath:   "/anotherpath/nonexistentfile.txt",
+			adjustedPath:   "/anotherpath",
 			expectedName:   "nonexistentfile.txt",
 			expectedExists: false,
 		},
@@ -84,33 +83,20 @@ func TestGetFileMetadata(t *testing.T) {
 			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
-			}
+			fileInfo, _ := testIndex.GetMetadataInfo(tt.adjustedPath)
 			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 {
+			// Iterate over fileInfo.Items to look for expectedName
+			for _, item := range fileInfo.ReducedItems {
+				// Assert the existence and the name
+				if item.Name == tt.expectedName {
 					found = true
+					break
 				}
 			}
-
 			assert.Equal(t, tt.expectedExists, found)
 		})
 	}
@@ -118,40 +104,42 @@ func TestGetFileMetadata(t *testing.T) {
 
 // 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,
+		Directories: map[string]FileInfo{
+			"/testpath": {
+				Path:  "/testpath",
+				Name:  "testpath",
+				IsDir: true,
+				ReducedItems: []ReducedItem{
+					{Name: "testfile.txt"},
+					{Name: "anotherfile.txt"},
+				},
+			},
 		},
 	}
 
-	success := index.UpdateMetadata(info)
+	info := FileInfo{Name: "testfile.txt"}
+
+	success := index.UpdateFileMetadata("/testpath", 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)
+	dir, exists := index.Directories["/testpath"]
+	if !exists || dir.ReducedItems[0].Name != "testfile.txt" {
+		t.Fatalf("expected testfile.txt to be updated in the directory metadata")
 	}
 }
 
 // Test for GetDirMetadata
 func TestGetDirMetadata(t *testing.T) {
 	t.Parallel()
-	_, exists := testIndex.GetReducedMetadata("/testpath", true)
+	_, exists := testIndex.GetMetadataInfo("/testpath")
 	if !exists {
 		t.Fatalf("expected GetDirMetadata to return initialized metadata map")
 	}
 
-	_, exists = testIndex.GetReducedMetadata("/nonexistent", true)
+	_, exists = testIndex.GetMetadataInfo("/nonexistent")
 	if exists {
 		t.Fatalf("expected GetDirMetadata to return false for nonexistent directory")
 	}
@@ -160,41 +148,51 @@ func TestGetDirMetadata(t *testing.T) {
 // Test for SetDirectoryInfo
 func TestSetDirectoryInfo(t *testing.T) {
 	index := &Index{
-		Directories: map[string]*FileInfo{
+		Directories: map[string]FileInfo{
 			"/testpath": {
-				Path: "/testpath",
-				ItemInfo: ItemInfo{
-					Name: "testpath",
-					Type: "directory",
-				},
-				Files: []ItemInfo{
+				Path:  "/testpath",
+				Name:  "testpath",
+				IsDir: true,
+				Items: []*FileInfo{
 					{Name: "testfile.txt"},
 					{Name: "anotherfile.txt"},
 				},
 			},
 		},
 	}
-	dir := &FileInfo{
-		Path: "/newPath",
-		ItemInfo: ItemInfo{
-			Name: "newPath",
-			Type: "directory",
-		},
-		Files: []ItemInfo{
+	dir := FileInfo{
+		Path:  "/newPath",
+		Name:  "newPath",
+		IsDir: true,
+		Items: []*FileInfo{
 			{Name: "testfile.txt"},
 		},
 	}
-	index.UpdateMetadata(dir)
+	index.SetDirectoryInfo("/newPath", dir)
 	storedDir, exists := index.Directories["/newPath"]
-	if !exists || storedDir.Files[0].Name != "testfile.txt" {
+	if !exists || storedDir.Items[0].Name != "testfile.txt" {
 		t.Fatalf("expected SetDirectoryInfo to store directory info correctly")
 	}
 }
 
+// Test for GetDirectoryInfo
+func TestGetDirectoryInfo(t *testing.T) {
+	t.Parallel()
+	dir, exists := testIndex.GetDirectoryInfo("/testpath")
+	if !exists || dir.Items[0].Name != "testfile.txt" {
+		t.Fatalf("expected GetDirectoryInfo to return correct directory info")
+	}
+
+	_, exists = testIndex.GetDirectoryInfo("/nonexistent")
+	if exists {
+		t.Fatalf("expected GetDirectoryInfo to return false for nonexistent directory")
+	}
+}
+
 // Test for RemoveDirectory
 func TestRemoveDirectory(t *testing.T) {
 	index := &Index{
-		Directories: map[string]*FileInfo{
+		Directories: map[string]FileInfo{
 			"/testpath": {},
 		},
 	}
@@ -205,35 +203,59 @@ func TestRemoveDirectory(t *testing.T) {
 	}
 }
 
+// Test for UpdateCount
+func TestUpdateCount(t *testing.T) {
+	index := &Index{}
+	index.UpdateCount("files")
+	if index.NumFiles != 1 {
+		t.Fatalf("expected NumFiles to be 1 after UpdateCount('files')")
+	}
+	if index.NumFiles != 1 {
+		t.Fatalf("expected NumFiles to be 1 after UpdateCount('files')")
+	}
+	index.UpdateCount("dirs")
+	if index.NumDirs != 1 {
+		t.Fatalf("expected NumDirs to be 1 after UpdateCount('dirs')")
+	}
+	index.UpdateCount("unknown")
+	// Just ensure it does not panic or update any counters
+	if index.NumFiles != 1 || index.NumDirs != 1 {
+		t.Fatalf("expected counts to remain unchanged for unknown type")
+	}
+	index.resetCount()
+	if index.NumFiles != 0 || index.NumDirs != 0 || !index.inProgress {
+		t.Fatalf("expected resetCount to reset counts and set inProgress to true")
+	}
+}
+
 func init() {
 	testIndex = Index{
-		Root:     "/",
-		NumFiles: 10,
-		NumDirs:  5,
-		Directories: map[string]*FileInfo{
+		Root:       "/",
+		NumFiles:   10,
+		NumDirs:    5,
+		inProgress: false,
+		Directories: map[string]FileInfo{
 			"/testpath": {
-				Path: "/testpath",
-				ItemInfo: ItemInfo{
-					Name: "testpath",
-					Type: "directory",
-				},
-				Files: []ItemInfo{
+				Path:     "/testpath",
+				Name:     "testpath",
+				IsDir:    true,
+				NumDirs:  1,
+				NumFiles: 2,
+				Items: []*FileInfo{
 					{Name: "testfile.txt", Size: 100},
 					{Name: "anotherfile.txt", Size: 100},
 				},
 			},
 			"/anotherpath": {
-				Path: "/anotherpath",
-				ItemInfo: ItemInfo{
-					Name: "anotherpath",
-					Type: "directory",
-				},
-				Files: []ItemInfo{
+				Path:     "/anotherpath",
+				Name:     "anotherpath",
+				IsDir:    true,
+				NumDirs:  1,
+				NumFiles: 1,
+				Items: []*FileInfo{
+					{Name: "directory", IsDir: true, Size: 100},
 					{Name: "afile.txt", Size: 100},
 				},
-				Folders: []ItemInfo{
-					{Name: "directory", Type: "directory", Size: 100},
-				},
 			},
 		},
 	}

backend/fileutils/copy.go

@@ -6,7 +6,7 @@ import (
 )
 
 // Copy copies a file or folder from one place to another.
-func CopyHelper(src, dst string) error {
+func Copy(src, dst string) error {
 	src = filepath.Clean(src)
 	if src == "" {
 		return os.ErrNotExist

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

@@ -7,9 +7,10 @@ require (
 	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.14.3
-	github.com/golang-jwt/jwt/v4 v4.5.1
+	github.com/goccy/go-yaml v1.12.0
+	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
@@ -17,45 +18,39 @@ require (
 	github.com/spf13/cobra v1.8.1
 	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.29.0
-	golang.org/x/image v0.22.0
-	golang.org/x/text v0.20.0
+	github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce
+	golang.org/x/crypto v0.26.0
+	golang.org/x/image v0.19.0
+	golang.org/x/text v0.17.0
 )
 
 require (
-	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/andybalholm/brotli v1.1.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/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
-	github.com/mailru/easyjson v0.7.7 // 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.31.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/tools v0.27.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

backend/go.sum

@@ -1,12 +1,10 @@
 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.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
-github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
+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=
@@ -34,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=
@@ -45,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.14.3 h1:8tVD+aqqPLWisSEhM+6wWoiURWXCx6BwaTKS6ZeITgM=
-github.com/goccy/go-yaml v1.14.3/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.12.0 h1:/1WHjnMsI1dlIBQutrvSMGZRQufVO3asrHfTwfACoPM=
+github.com/goccy/go-yaml v1.12.0/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=
@@ -73,31 +71,34 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 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.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+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.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+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=
@@ -110,8 +111,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 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=
@@ -124,12 +123,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 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=
@@ -138,83 +133,60 @@ github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaU
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 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/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
-github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 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=
 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.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
+golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
+golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.22.0 h1:UtK5yLUzilVrkjMAZAZ34DXGpASN8i8pj8g+O+yd10g=
-golang.org/x/image v0.22.0/go.mod h1:9hPFhljd4zZ1GNSIZJ49sqbp45GKK9t6w+iXvGqZUz4=
-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.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ=
+golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys=
 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.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
-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.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.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.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.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.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.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.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 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.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
-golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
-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-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk=
+golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/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/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,95 +2,103 @@ 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/errors"
 	"github.com/gtsteffaniak/filebrowser/settings"
-	"github.com/gtsteffaniak/filebrowser/share"
 	"github.com/gtsteffaniak/filebrowser/users"
-	"github.com/gtsteffaniak/filebrowser/utils"
 )
 
-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)
 	}
 }
 
@@ -99,141 +107,73 @@ 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 := users.ApplyDefaults(users.User{})
 	user.Username = info.Username
 	user.Password = info.Password
 
-	userHome, err := config.MakeUserDir(user.Username, user.Scope, config.Server.Root)
+	userHome, err := d.settings.MakeUserDir(user.Username, user.Scope, d.server.Root)
 	if err != nil {
 		log.Printf("create user: failed to mkdir user home dir: [%s]", userHome)
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
+		return http.StatusInternalServerError, err
 	}
 	user.Scope = userHome
 	log.Printf("new user: %s, home dir: [%s].", user.Username, userHome)
-	err = store.Users.Save(&user)
+	err = d.store.Users.Save(&user)
 	if err == errors.ErrExist {
-		http.Error(w, http.StatusText(http.StatusConflict), http.StatusConflict)
-		return
+		return http.StatusConflict, err
 	} 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
-		}
 		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 {
+		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,85 @@
+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?
+}
+
+var (
+	store     *storage.Storage
+	server    *settings.Server
+	fileCache FileCache
+)
+
+func SetupEnv(storage *storage.Storage, s *settings.Server, cache FileCache) {
+	store = storage
+	server = s
+	fileCache = cache
+}
+
+func NewHandler(
+	imgSvc ImgService,
+	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,295 +0,0 @@
-package http
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"path/filepath"
-	"time"
-
-	"github.com/golang-jwt/jwt/v4"
-	"github.com/gtsteffaniak/filebrowser/files"
-	"github.com/gtsteffaniak/filebrowser/runner"
-	"github.com/gtsteffaniak/filebrowser/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) {
-
-		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(config.Server.Root, tk.BelongsTo)
-		if err != nil {
-			return http.StatusInternalServerError, err
-		}
-		// 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 {
-				log.Printf("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 {
-				log.Printf("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
-}
-
-// 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)
-}
-
-// 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)
-
-		// Determine the color based on the status code
-		color := "\033[32m" // Default green color
-		if wrappedWriter.StatusCode >= 300 && wrappedWriter.StatusCode < 500 {
-			color = "\033[33m" // Yellow for client errors (4xx)
-		} else if wrappedWriter.StatusCode >= 500 {
-			color = "\033[31m" // Red for server errors (5xx)
-		}
-		// Capture the full URL path including the query parameters
-		fullURL := r.URL.Path
-		if r.URL.RawQuery != "" {
-			fullURL += "?" + r.URL.RawQuery
-		}
-
-		// Log the request and its status code
-		log.Printf("%s%-7s | %3d | %-15s | %-12s | \"%s\"%s",
-			color,
-			r.Method,
-			wrappedWriter.StatusCode, // Now capturing the correct status
-			r.RemoteAddr,
-			time.Since(start).String(),
-			fullURL,
-			"\033[0m", // Reset color
-		)
-	})
-}
-
-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
-}

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/diskcache"
-	"github.com/gtsteffaniak/filebrowser/files"
-	"github.com/gtsteffaniak/filebrowser/img"
-	"github.com/gtsteffaniak/filebrowser/settings"
-	"github.com/gtsteffaniak/filebrowser/share"
-	"github.com/gtsteffaniak/filebrowser/storage"
-	"github.com/gtsteffaniak/filebrowser/storage/bolt"
-	"github.com/gtsteffaniak/filebrowser/users"
-	"github.com/gtsteffaniak/filebrowser/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 (
@@ -7,12 +8,21 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path/filepath"
+
+	"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
@@ -24,89 +34,83 @@ 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")
-	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,
-		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)
-	if 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{
+			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(fileInfo, previewSize)
+
+	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, fileInfo, 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, fileInfo.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.FileInfo, 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 := os.Open(file.Path)
 	if err != nil {
 		return nil, err
 	}
@@ -119,11 +123,11 @@ func createPreview(imgSvc ImgService, fileCache FileCache, file *files.FileInfo,
 	)
 
 	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))
@@ -146,7 +150,6 @@ func createPreview(imgSvc ImgService, fileCache FileCache, file *files.FileInfo,
 	return buf.Bytes(), nil
 }
 
-// Generates a cache key for the preview image
-func previewCacheKey(f *files.FileInfo, previewSize string) string {
+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,67 +1,124 @@
 package http
 
 import (
-	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
+	"net/url"
+	"path"
 	"strings"
 
+	"golang.org/x/crypto/bcrypt"
+
 	"github.com/gtsteffaniak/filebrowser/files"
 	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/share"
 	"github.com/gtsteffaniak/filebrowser/users"
-
-	_ "github.com/gtsteffaniak/filebrowser/swagger/docs"
 )
 
-func publicShareHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	file, ok := d.raw.(files.ExtendedFileInfo)
+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 != "" {
+			var status int
+			status, err = authenticateShareRequest(r, link)
+			if err != nil || status != 0 {
+				return status, err
+			}
+		}
+		d.user = &users.PublicUser
+		realPath, isDir, err := files.GetRealPath(d.user.Scope, link.Path, path)
+		if err != nil {
+			return http.StatusNotFound, err
+		}
+		file, err := files.FileInfoFaster(files.FileOptions{
+			Path:       realPath,
+			IsDir:      isDir,
+			Modify:     d.user.Perm.Modify,
+			Expand:     true,
+			ReadHeader: d.server.TypeDetectionByHeader,
+			Checker:    d,
+			Token:      link.Token,
+		})
+		if err != nil {
+			return errToStatus(err), err
+		}
+		d.raw = file
+		return fn(w, r, d)
+	}
+}
+
+func ifPathWithName(r *http.Request) (id, filePath string) {
+	pathElements := strings.Split(r.URL.Path, "/")
+	id = pathElements[0]
+	allButFirst := path.Join(pathElements[1:]...)
+	return id, allButFirst
+}
+
+var publicShareHandler = withHashFile(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	file, ok := d.raw.(*files.FileInfo)
 	if !ok {
 		return http.StatusInternalServerError, fmt.Errorf("failed to assert type *files.FileInfo")
 	}
-	file.Path = strings.TrimPrefix(file.Path, settings.Config.Server.Root)
-	return renderJSON(w, r, file)
-}
 
-func publicUserGetHandler(w http.ResponseWriter, r *http.Request) {
+	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)
 }
 
-func publicDlHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	file, ok := d.raw.(files.ExtendedFileInfo)
+var publicDlHandler = withHashFile(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	file, ok := d.raw.(*files.FileInfo)
 	if !ok {
-		return http.StatusInternalServerError, fmt.Errorf("failed to assert type files.FileInfo")
-	}
-	if d.user == nil {
-		return http.StatusUnauthorized, fmt.Errorf("failed to get user")
+		return http.StatusInternalServerError, fmt.Errorf("failed to assert type *files.FileInfo")
 	}
 
-	if file.Type == "directory" {
-		return rawDirHandler(w, r, d, file.FileInfo)
+	if !file.IsDir {
+		return rawFileHandler(w, r, file)
 	}
 
-	return rawFileHandler(w, r, file.FileInfo)
-}
+	return rawDirHandler(w, r, d, file)
+})
 
-// 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
+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 {
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+		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,137 @@
+package http
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"path/filepath"
+	"testing"
+
+	"github.com/asdine/storm/v3"
+
+	"github.com/gtsteffaniak/filebrowser/settings"
+	"github.com/gtsteffaniak/filebrowser/share"
+	"github.com/gtsteffaniak/filebrowser/storage"
+	"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)
+					}
+				})
+				authStore, userStore, shareStore, settingsStore, err := bolt.NewStorage(db)
+				storage := &storage.Storage{
+					Auth:     authStore,
+					Users:    userStore,
+					Share:    shareStore,
+					Settings: settingsStore,
+				}
+				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,
+				}
+
+				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
+}
+
+func (cu *customFSUser) Get(baseScope string, id interface{}) (*users.User, error) {
+	user, err := cu.Store.Get(baseScope, id)
+	if err != nil {
+		return nil, err
+	}
+	return user, nil
+}

backend/http/raw.go

@@ -77,55 +77,39 @@ func setContentDisposition(w http.ResponseWriter, r *http.Request, file *files.F
 	}
 }
 
-// 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 path query string true "Path to the file or directory"
-// @Param files query string false "Comma-separated list of specific files within the directory (optional)"
-// @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', 'tar', 'targz', 'tarbz2', 'tarxz', 'tarlz4', 'tarsz'. 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 415 {object} map[string]string "Unsupported file type for preview"
-// @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
 	}
-	path := r.URL.Query().Get("path")
-	fileInfo, err := files.FileInfoFaster(files.FileOptions{
-		Path:       filepath.Join(d.user.Scope, path),
+	realPath, isDir, err := files.GetRealPath(d.user.Scope, r.URL.Path)
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+	file, err := files.FileInfoFaster(files.FileOptions{
+		Path:       realPath,
+		IsDir:      isDir,
 		Modify:     d.user.Perm.Modify,
 		Expand:     false,
-		ReadHeader: config.Server.TypeDetectionByHeader,
-		Checker:    d.user,
+		ReadHeader: d.server.TypeDetectionByHeader,
+		Checker:    d,
 	})
 	if err != nil {
 		return errToStatus(err), err
 	}
-
-	// TODO, how to handle? we removed mode, is it needed?
-	// maybe instead of mode we use bool only two conditions are checked
-	//if files.IsNamedPipe(fileInfo.Mode) {
-	//	setContentDisposition(w, r, file)
-	//	return 0, nil
-	//}
-
-	if fileInfo.Type == "directory" {
-		return rawDirHandler(w, r, d, fileInfo.FileInfo)
+	if files.IsNamedPipe(file.Mode) {
+		setContentDisposition(w, r, file)
+		return 0, nil
 	}
 
-	return rawFileHandler(w, r, fileInfo.FileInfo)
-}
+	if !file.IsDir {
+		return rawFileHandler(w, r, file)
+	}
 
-func addFile(ar archiver.Writer, d *requestContext, path, commonPath string) error {
-	if !d.user.Check(path) {
+	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(path)
@@ -176,11 +160,12 @@ func addFile(ar archiver.Writer, d *requestContext, path, commonPath string) err
 	return nil
 }
 
-func rawDirHandler(w http.ResponseWriter, r *http.Request, d *requestContext, file *files.FileInfo) (int, error) {
+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
 	}
+
 	extension, ar, err := parseQueryAlgorithm(r)
 	if err != nil {
 		return http.StatusInternalServerError, err
@@ -217,8 +202,7 @@ func rawDirHandler(w http.ResponseWriter, r *http.Request, d *requestContext, fi
 }
 
 func rawFileHandler(w http.ResponseWriter, r *http.Request, file *files.FileInfo) (int, error) {
-	realPath, _, _ := files.GetRealPath(file.Path)
-	fd, err := os.Open(realPath)
+	fd, err := os.Open(file.Path)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}

backend/http/resource.go

@@ -14,190 +14,132 @@ import (
 
 	"github.com/gtsteffaniak/filebrowser/errors"
 	"github.com/gtsteffaniak/filebrowser/files"
-	"github.com/gtsteffaniak/filebrowser/utils"
+	"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 "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) {
-
-	// TODO source := r.URL.Query().Get("source")
-	path := r.URL.Query().Get("path")
-	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) {
+	realPath, isDir, err := files.GetRealPath(d.user.Scope, r.URL.Path)
+	if err != nil {
+		return http.StatusNotFound, err
+	}
+	file, err := files.FileInfoFaster(files.FileOptions{
+		Path:       realPath,
+		IsDir:      isDir,
 		Modify:     d.user.Perm.Modify,
 		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 algo := r.URL.Query().Get("checksum"); algo != "" {
-		checksums, err := files.GetChecksum(fileInfo.Path, algo)
-		if err == errors.ErrInvalidOption {
-			return http.StatusBadRequest, nil
-		} else if err != nil {
-			return http.StatusInternalServerError, err
+	if !file.IsDir {
+		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)
+	return renderJSON(w, r, file)
+})
 
-}
+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
+		}
+		realPath, isDir, err := files.GetRealPath(d.user.Scope, r.URL.Path)
+		if err != nil {
+			return http.StatusNotFound, err
+		}
+		fileOpts := files.FileOptions{
+			Path:       realPath,
+			IsDir:      isDir,
+			Modify:     d.user.Perm.Modify,
+			Expand:     false,
+			ReadHeader: d.server.TypeDetectionByHeader,
+			Checker:    d,
+		}
+		file, err := files.FileInfoFaster(fileOpts)
+		if err != nil {
+			return errToStatus(err), err
+		}
 
-// 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 "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")
-	path := r.URL.Query().Get("path")
-	if path == "/" || !d.user.Perm.Delete {
-		return http.StatusForbidden, nil
-	}
-	realPath, isDir, err := files.GetRealPath(d.user.Scope, path)
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-	fileOpts := files.FileOptions{
-		Path:       filepath.Join(d.user.Scope, path),
-		IsDir:      isDir,
-		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, file)
+		if err != nil {
+			return errToStatus(err), err
+		}
 
-	// delete thumbnails
-	err = delThumbs(r.Context(), fileCache, fileInfo.FileInfo)
-	if err != nil {
-		return errToStatus(err), err
-	}
-
-	err = files.DeleteFiles(realPath, fileOpts)
-	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 "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) {
-	// TODO source := r.URL.Query().Get("source")
-	path := r.URL.Query().Get("path")
-	if !d.user.Perm.Create || !d.user.Check(path) {
-		return http.StatusForbidden, nil
-	}
-	fileOpts := files.FileOptions{
-		Path:    filepath.Join(d.user.Scope, path),
-		Modify:  d.user.Perm.Modify,
-		Expand:  false,
-		Checker: d.user,
-	}
-	// Directories creation on POST.
-	if strings.HasSuffix(path, "/") {
-		err := files.WriteDirectory(fileOpts)
+		err = files.DeleteFiles(realPath, 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 {
-			return http.StatusForbidden, nil
-		}
-
-		err = delThumbs(r.Context(), fileCache, fileInfo.FileInfo)
-		if err != nil {
-			return errToStatus(err), err
-		}
-	}
-	err = files.WriteFile(fileOpts, r.Body)
-	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 "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) {
-	// TODO source := r.URL.Query().Get("source")
-	path := r.URL.Query().Get("path")
-	if !d.user.Perm.Modify || !d.user.Check(path) {
+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
+		}
+		realPath, isDir, err := files.GetRealPath(d.user.Scope, r.URL.Path)
+		if err != nil {
+			return http.StatusNotFound, err
+		}
+		fileOpts := files.FileOptions{
+			Path:       realPath,
+			IsDir:      isDir,
+			Modify:     d.user.Perm.Modify,
+			Expand:     false,
+			ReadHeader: d.server.TypeDetectionByHeader,
+			Checker:    d,
+		}
+		// Directories creation on POST.
+		if strings.HasSuffix(r.URL.Path, "/") {
+			err = files.WriteDirectory(fileOpts) // Assign to the existing `err` variable
+			if err != nil {
+				return errToStatus(err), err
+			}
+			return http.StatusOK, nil
+		}
+		file, 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 {
+				return http.StatusForbidden, nil
+			}
+
+			err = delThumbs(r.Context(), fileCache, file)
+			if err != nil {
+				return errToStatus(err), err
+			}
+		}
+		err = files.WriteFile(fileOpts, r.Body)
+		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
 	}
 
-	realPath, isDir, err := files.GetRealPath(d.user.Scope, path)
+	realPath, isDir, err := files.GetRealPath(d.user.Scope, r.URL.Path)
 	if err != nil {
 		return http.StatusNotFound, err
 	}
@@ -206,70 +148,49 @@ func resourcePutHandler(w http.ResponseWriter, r *http.Request, d *requestContex
 		IsDir:      isDir,
 		Modify:     d.user.Perm.Modify,
 		Expand:     false,
-		ReadHeader: config.Server.TypeDetectionByHeader,
-		Checker:    d.user,
+		ReadHeader: d.server.TypeDetectionByHeader,
+		Checker:    d,
 	}
 	err = files.WriteFile(fileOpts, r.Body)
 	return errToStatus(err), err
-}
+})
+
+// TODO fix and verify this function still works in tests
+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
+		}
+		override := r.URL.Query().Get("override") == "true"
+		rename := r.URL.Query().Get("rename") == "true"
+		if !override && !rename {
+			if _, err = os.Stat(dst); err == nil {
+				return http.StatusConflict, nil
+			}
+		}
+		if rename {
+			dst = addVersionSuffix(dst)
+		}
+		// 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)
 
-// 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 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")
-	src := r.URL.Query().Get("from")
-	dst := r.URL.Query().Get("destination")
-	action := r.URL.Query().Get("action")
-	dst, err := url.QueryUnescape(dst)
-	if !d.user.Check(src) || !d.user.Check(dst) {
-		return http.StatusForbidden, nil
-	}
-	if err != nil {
 		return errToStatus(err), err
-	}
-	if dst == "/" || src == "/" {
-		return http.StatusForbidden, nil
-	}
-
-	// check target dir exists
-	parentDir, _, err := files.GetRealPath(d.user.Scope, filepath.Dir(dst))
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-	realDest := parentDir + "/" + filepath.Base(dst)
-	realSrc, isSrcDir, err := files.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, nil
-	}
-	err = d.RunHook(func() error {
-		return patchAction(r.Context(), action, realSrc, realDest, d, fileCache, isSrcDir)
-	}, action, realSrc, realDest, d.user)
-
-	return errToStatus(err), err
+	})
 }
 
 func addVersionSuffix(source string) string {
@@ -289,42 +210,58 @@ func addVersionSuffix(source string) string {
 }
 
 func delThumbs(ctx context.Context, fileCache FileCache, file *files.FileInfo) error {
-	if err := fileCache.Delete(ctx, previewCacheKey(file, "small")); err != nil {
-		return err
+	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) 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
 		}
-		return files.CopyResource(src, dst, isSrcDir)
-	case "rename", "move":
+
+		return fileutils.Copy(src, dst)
+	case "rename":
 		if !d.user.Perm.Rename {
 			return errors.ErrPermissionDenied
 		}
-		fileInfo, err := files.FileInfoFaster(files.FileOptions{
-			Path:       src,
-			IsDir:      isSrcDir,
+		src = path.Clean("/" + src)
+		dst = path.Clean("/" + dst)
+		realDest, _, err := files.GetRealPath(d.user.Scope, dst)
+		if err != nil {
+			return err
+		}
+		realSrc, isDir, err := files.GetRealPath(d.user.Scope, src)
+		if err != nil {
+			return err
+		}
+		file, err := files.FileInfoFaster(files.FileOptions{
+			Path:       realSrc,
+			IsDir:      isDir,
 			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.FileInfo)
+		err = delThumbs(ctx, fileCache, file)
 		if err != nil {
 			return err
 		}
-		return files.MoveResource(src, dst, isSrcDir)
+
+		return fileutils.MoveFile(realSrc, realDest)
 	default:
 		return fmt.Errorf("unsupported action %s: %w", action, errors.ErrInvalidRequestParams)
 	}
@@ -335,51 +272,35 @@ 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 "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 = "/"
+var diskUsage = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	realPath, isDir, err := files.GetRealPath(d.user.Scope, r.URL.Path)
+	if err != nil {
+		return http.StatusNotFound, err
 	}
-
-	value, ok := utils.DiskUsageCache.Get(source).(DiskUsageResponse)
-	if ok {
-		return renderJSON(w, r, &value)
-	}
-
-	fPath, isDir, err := files.GetRealPath(d.user.Scope, source)
+	file, err := files.FileInfoFaster(files.FileOptions{
+		Path:       realPath,
+		IsDir:      isDir,
+		Modify:     d.user.Perm.Modify,
+		Expand:     false,
+		ReadHeader: false,
+		Checker:    d,
+	})
 	if err != nil {
 		return errToStatus(err), err
 	}
-	if !isDir {
-		return http.StatusNotFound, fmt.Errorf("not a directory: %s", source)
+	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
 	}
-	latestUsage := DiskUsageResponse{
+	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) {
-	path := r.URL.Query().Get("path")
-	isDir := r.URL.Query().Get("isDir") == "true"
-	index := files.GetIndex(config.Server.Root)
-	info, _ := index.GetReducedMetadata(path, isDir)
-	renderJSON(w, r, info) // nolint:errcheck
-}
+	})
+})

backend/http/router.go

@@ -1,186 +0,0 @@
-package http
-
-import (
-	"crypto/tls"
-	"embed"
-	"fmt"
-	"io/fs"
-	"log"
-	"net/http"
-	"os"
-	"text/template"
-
-	"github.com/gtsteffaniak/filebrowser/settings"
-	"github.com/gtsteffaniak/filebrowser/storage"
-	"github.com/gtsteffaniak/filebrowser/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 {
-			log.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)
-	}
-
-	// 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(publicDlHandler))
-	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 {
-			log.Fatalf("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 {
-			log.Fatalf("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)
-		log.Printf("Running at               : %s", fullURL)
-		err = http.Serve(listener, muxWithMiddleware(router))
-		if err != nil {
-			log.Fatalf("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)
-		log.Printf("Running at               : %s", fullURL)
-		err := http.ListenAndServe(fmt.Sprintf(":%v", config.Server.Port), muxWithMiddleware(router))
-		if err != nil {
-			log.Fatalf("could not start server: %v", err)
-		}
-	}
-}

backend/http/search.go

@@ -8,63 +8,29 @@ import (
 	"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")
-	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")
+	userScope := r.Header.Get("UserScope")
 	index := files.GetIndex(settings.Config.Server.Root)
-	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")
+	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/rules"
 	"github.com/gtsteffaniak/filebrowser/settings"
-	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 type settingsData struct {
@@ -13,56 +13,37 @@ 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"`
 	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:           d.settings.Auth.Signup,
+		CreateUserDir:    d.settings.Server.CreateUserDir,
+		UserHomeBasePath: d.settings.Server.UserHomeBasePath,
+		Defaults:         d.settings.UserDefaults,
+		Rules:            d.settings.Rules,
+		Frontend:         d.settings.Frontend,
 	}
 
 	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.Auth.Signup = req.Signup
+	err = d.store.Settings.Save(d.settings)
 	return errToStatus(err), err
-}
+})

backend/http/share.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"golang.org/x/crypto/bcrypt"
@@ -16,24 +17,24 @@ import (
 	"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,68 +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 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")
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
+	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 {
@@ -121,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 != "" {
@@ -164,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

@@ -14,58 +14,41 @@ import (
 
 	"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.DisableExternal,
-		"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":             path.Join(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,
+		"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) {
@@ -77,17 +60,15 @@ 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
+			return http.StatusInternalServerError, fmt.Errorf("failed to assert type *auth.JSONAuth")
 		}
 
 		if auther.ReCaptcha != nil {
@@ -99,47 +80,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,13 +2,12 @@ package http
 
 import (
 	"encoding/json"
-	"fmt"
-	"io"
 	"net/http"
 	"reflect"
 	"sort"
 	"strconv"
 
+	"github.com/gorilla/mux"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 
@@ -27,153 +26,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 == "" {
-		if !d.user.Perm.Admin {
-			return http.StatusForbidden, nil
-		}
-		users, err := store.Users.Gets(config.Server.Root)
+	req := &modifyUserRequest{}
+	err := json.NewDecoder(r.Body).Decode(req)
+	if err != nil {
+		return nil, err
+	}
+
+	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
 		}
-
-		for _, u := range users {
-			u.Password = ""
-		}
-		for _, u := range users {
-			u.ApiKeys = nil
+		if d.user.ID != id && !d.user.Perm.Admin {
+			return http.StatusForbidden, nil
 		}
 
-		sort.Slice(users, func(i, j int) bool {
-			return users[i].ID < users[j].ID
-		})
+		d.raw = id
+		return fn(w, r, d)
+	})
+}
 
-		return renderJSON(w, r, users)
-	} 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(config.Server.Root, 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
-	_, _, err := files.GetRealPath(config.Server.Root, 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
 	}
@@ -189,50 +137,22 @@ func usersPostHandler(w http.ResponseWriter, r *http.Request, d *requestContext)
 
 	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
-	_, _, err := files.GetRealPath(config.Server.Root, 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 req.Data.ID != d.raw.(uint) {
+		return http.StatusBadRequest, nil
+	}
+	_, _, err = files.GetRealPath(d.server.Root, req.Data.Scope)
 	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
+		return http.StatusBadRequest, nil
 	}
 
-	// If `Which` is not specified, default to updating all fields
 	if len(req.Which) == 0 || req.Which[0] == "all" {
 		req.Which = []string{}
 		v := reflect.ValueOf(req.Data)
@@ -240,8 +160,6 @@ func userPutHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (
 			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 != "" {
@@ -252,13 +170,10 @@ func userPutHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (
 		}
 	}
 
-	// Process the fields to update
-	for _, field := range req.Which {
-		// Title case field names
-		field = cases.Title(language.English, cases.NoLower).String(field)
-
-		// Handle password update
-		if field == "Password" {
+	for k, v := range req.Which {
+		v = cases.Title(language.English, cases.NoLower).String(v)
+		req.Which[k] = v
+		if v == "Password" {
 			if !d.user.Perm.Admin && d.user.LockPassword {
 				return http.StatusForbidden, nil
 			}
@@ -268,20 +183,16 @@ 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/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/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/settings/config.go

@@ -4,10 +4,8 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/goccy/go-yaml"
-	"github.com/gtsteffaniak/filebrowser/users"
 )
 
 var Config Settings
@@ -30,12 +28,6 @@ func Initialize(configFile string) {
 		log.Fatalf("ERROR: Configured Root Path does not exist! %v", err)
 	}
 	Config.Server.Root = realRoot
-	baseurl := strings.Trim(Config.Server.BaseURL, "/")
-	if baseurl == "" {
-		Config.Server.BaseURL = "/"
-	} else {
-		Config.Server.BaseURL = "/" + baseurl + "/"
-	}
 }
 
 func loadConfigFile(configFile string) []byte {
@@ -66,6 +58,7 @@ func setDefaults() Settings {
 			EnableThumbnails:   true,
 			ResizePreview:      false,
 			EnableExec:         false,
+			IndexingInterval:   5,
 			Port:               80,
 			NumImageProcessors: 4,
 			BaseURL:            "",
@@ -93,7 +86,7 @@ func setDefaults() Settings {
 			DisableSettings: false,
 			ViewMode:        "normal",
 			Locale:          "en",
-			Permissions: users.Permissions{
+			Permissions: Permissions{
 				Create:   false,
 				Rename:   false,
 				Modify:   false,
@@ -101,7 +94,6 @@ func setDefaults() Settings {
 				Share:    false,
 				Download: false,
 				Admin:    false,
-				Api:      false,
 			},
 		},
 	}

backend/settings/dir_test.go

@@ -3,7 +3,7 @@ package settings
 import (
 	"testing"
 
-	"github.com/gtsteffaniak/filebrowser/users"
+	"github.com/gtsteffaniak/filebrowser/rules"
 )
 
 func TestSettings_MakeUserDir(t *testing.T) {
@@ -15,7 +15,7 @@ func TestSettings_MakeUserDir(t *testing.T) {
 		Shell            []string
 		AdminUsername    string
 		AdminPassword    string
-		Rules            []users.Rule
+		Rules            []rules.Rule
 		Server           Server
 		Auth             Auth
 		Frontend         Frontend

backend/settings/settings.go

@@ -2,8 +2,9 @@ package settings
 
 import (
 	"crypto/rand"
+	"strings"
 
-	"github.com/gtsteffaniak/filebrowser/users"
+	"github.com/gtsteffaniak/filebrowser/rules"
 )
 
 const DefaultUsersHomeBasePath = "/users"
@@ -11,6 +12,18 @@ const DefaultUsersHomeBasePath = "/users"
 // AuthMethod describes an authentication method.
 type AuthMethod string
 
+// Settings contain the main settings of the application.
+// GetRules implements rules.Provider.
+func (s *Settings) GetRules() []rules.Rule {
+	return s.Rules
+}
+
+// Server specific settings
+// Clean cleans any variables that might need cleaning.
+func (s *Server) Clean() {
+	s.BaseURL = strings.TrimSuffix(s.BaseURL, "/")
+}
+
 // GenerateKey generates a key of 512 bits.
 func GenerateKey() ([]byte, error) {
 	b := make([]byte, 64) //nolint:gomnd
@@ -27,8 +40,8 @@ func GetSettingsConfig(nameType string, Value string) string {
 	return nameType + Value
 }
 
-func AdminPerms() users.Permissions {
-	return users.Permissions{
+func AdminPerms() Permissions {
+	return Permissions{
 		Create:   true,
 		Rename:   true,
 		Modify:   true,
@@ -36,23 +49,5 @@ func AdminPerms() users.Permissions {
 		Share:    true,
 		Download: true,
 		Admin:    true,
-		Api:      true,
 	}
 }
-
-// Apply applies the default options to a user.
-func ApplyUserDefaults(u users.User) users.User {
-	u.StickySidebar = Config.UserDefaults.StickySidebar
-	u.DisableSettings = Config.UserDefaults.DisableSettings
-	u.DarkMode = Config.UserDefaults.DarkMode
-	u.Scope = Config.UserDefaults.Scope
-	u.Locale = Config.UserDefaults.Locale
-	u.ViewMode = Config.UserDefaults.ViewMode
-	u.SingleClick = Config.UserDefaults.SingleClick
-	u.Perm = Config.UserDefaults.Perm
-	u.Sorting = Config.UserDefaults.Sorting
-	u.Commands = Config.UserDefaults.Commands
-	u.HideDotfiles = Config.UserDefaults.HideDotfiles
-	u.DateFormat = Config.UserDefaults.DateFormat
-	return u
-}

backend/settings/storage.go

@@ -2,7 +2,7 @@ package settings
 
 import (
 	"github.com/gtsteffaniak/filebrowser/errors"
-	"github.com/gtsteffaniak/filebrowser/users"
+	"github.com/gtsteffaniak/filebrowser/rules"
 )
 
 // StorageBackend is a settings storage backend.
@@ -62,7 +62,7 @@ func (s *Storage) Save(set *Settings) error {
 	}
 
 	if set.Rules == nil {
-		set.Rules = []users.Rule{}
+		set.Rules = []rules.Rule{}
 	}
 
 	if set.Commands == nil {
@@ -94,5 +94,6 @@ func (s *Storage) GetServer() (*Server, error) {
 
 // SaveServer wraps StorageBackend.SaveServer and adds some verification.
 func (s *Storage) SaveServer(ser *Server) error {
+	ser.Clean()
 	return s.back.SaveServer(ser)
 }

backend/settings/structs.go

@@ -1,13 +1,13 @@
 package settings
 
 import (
-	"github.com/gtsteffaniak/filebrowser/users"
+	"github.com/gtsteffaniak/filebrowser/rules"
 )
 
 type Settings struct {
 	Commands     map[string][]string `json:"commands"`
 	Shell        []string            `json:"shell"`
-	Rules        []users.Rule        `json:"rules"`
+	Rules        []rules.Rule        `json:"rules"`
 	Server       Server              `json:"server"`
 	Auth         Auth                `json:"auth"`
 	Frontend     Frontend            `json:"frontend"`
@@ -76,14 +76,25 @@ type UserDefaults struct {
 	ViewMode        string       `json:"viewMode"`
 	GallerySize     int          `json:"gallerySize"`
 	SingleClick     bool         `json:"singleClick"`
-	Rules           []users.Rule `json:"rules"`
+	Rules           []rules.Rule `json:"rules"`
 	Sorting         struct {
 		By  string `json:"by"`
 		Asc bool   `json:"asc"`
 	} `json:"sorting"`
-	Perm         users.Permissions `json:"perm"`
-	Permissions  users.Permissions `json:"permissions"`
-	Commands     []string          `json:"commands,omitempty"`
-	HideDotfiles bool              `json:"hideDotfiles"`
-	DateFormat   bool              `json:"dateFormat"`
+	Perm         Permissions `json:"perm"`
+	Permissions  Permissions `json:"permissions"`
+	Commands     []string    `json:"commands,omitempty"`
+	HideDotfiles bool        `json:"hideDotfiles"`
+	DateFormat   bool        `json:"dateFormat"`
+}
+
+type Permissions struct {
+	Admin    bool `json:"admin"`
+	Execute  bool `json:"execute"`
+	Create   bool `json:"create"`
+	Rename   bool `json:"rename"`
+	Modify   bool `json:"modify"`
+	Delete   bool `json:"delete"`
+	Share    bool `json:"share"`
+	Download bool `json:"download"`
 }

backend/storage/bolt/users.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/gtsteffaniak/filebrowser/errors"
 	"github.com/gtsteffaniak/filebrowser/users"
-	"github.com/gtsteffaniak/filebrowser/utils"
 )
 
 type usersBackend struct {
@@ -56,24 +55,14 @@ func (st usersBackend) Update(user *users.User, fields ...string) error {
 	if len(fields) == 0 {
 		return st.Save(user)
 	}
-
-	val := reflect.ValueOf(user).Elem()
-
 	for _, field := range fields {
-		// Capitalize the first letter (you can adjust this based on your field naming convention)
-		correctedField := utils.CapitalizeFirst(field)
-
-		userField := val.FieldByName(correctedField)
+		userField := reflect.ValueOf(user).Elem().FieldByName(field)
 		if !userField.IsValid() {
 			return fmt.Errorf("invalid field: %s", field)
 		}
-		if !userField.CanSet() {
-			return fmt.Errorf("cannot update unexported field: %s", field)
-		}
-
 		val := userField.Interface()
-		if err := st.db.UpdateField(user, correctedField, val); err != nil {
-			return fmt.Errorf("Error updating user field: %s, error: %v", correctedField, err.Error())
+		if err := st.db.UpdateField(user, field, val); err != nil {
+			return fmt.Errorf("Error updating user field: %s, error: %v", field, err.Error())
 		}
 	}
 	return nil

backend/storage/storage.go

@@ -20,7 +20,7 @@ import (
 // Storage is a storage powered by a Backend which makes the necessary
 // verifications when fetching and saving data to ensure consistency.
 type Storage struct {
-	Users    *users.Storage
+	Users    users.Store
 	Share    *share.Storage
 	Auth     *auth.Storage
 	Settings *settings.Storage
@@ -92,7 +92,7 @@ func quickSetup(store *Storage) {
 	utils.CheckErr("store.Settings.Save", err)
 	err = store.Settings.SaveServer(&settings.Config.Server)
 	utils.CheckErr("store.Settings.SaveServer", err)
-	user := settings.ApplyUserDefaults(users.User{})
+	user := users.ApplyDefaults(users.User{})
 	user.Username = settings.Config.Auth.AdminUsername
 	user.Password = settings.Config.Auth.AdminPassword
 	user.Perm.Admin = true
@@ -111,7 +111,7 @@ func CreateUser(userInfo users.User, asAdmin bool) error {
 	if userInfo.Username == "" || userInfo.Password == "" {
 		return errors.ErrInvalidRequestParams
 	}
-	newUser := settings.ApplyUserDefaults(userInfo)
+	newUser := users.ApplyDefaults(userInfo)
 	if asAdmin {
 		newUser.Perm = settings.AdminPerms()
 	}

backend/users/storage.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/gtsteffaniak/filebrowser/errors"
+	"github.com/gtsteffaniak/filebrowser/rules"
 )
 
 // StorageBackend is the interface to implement for a users storage.
@@ -25,9 +26,7 @@ type Store interface {
 	Save(user *User) error
 	Delete(id interface{}) error
 	LastUpdate(id uint) int64
-	AddApiKey(username uint, name string, key AuthToken) error
-	DeleteApiKey(username uint, name string) error
-	AddRule(username string, rule Rule) error
+	AddRule(username string, rule rules.Rule) error
 	DeleteRule(username string, ruleID string) error
 }
 
@@ -80,7 +79,7 @@ func (s *Storage) Update(user *User, fields ...string) error {
 }
 
 // AddRule adds a rule to the user's rules list and updates the user in the database.
-func (s *Storage) AddRule(userID string, rule Rule) error {
+func (s *Storage) AddRule(userID string, rule rules.Rule) error {
 	user, err := s.Get("", userID)
 	if err != nil {
 		return err
@@ -96,42 +95,6 @@ func (s *Storage) AddRule(userID string, rule Rule) error {
 	return nil
 }
 
-func (s *Storage) AddApiKey(userID uint, name string, key AuthToken) error {
-	user, err := s.Get("", userID)
-	if err != nil {
-		return err
-	}
-	// Initialize the ApiKeys map if it is nil
-	if user.ApiKeys == nil {
-		user.ApiKeys = make(map[string]AuthToken)
-	}
-	user.ApiKeys[name] = key
-	err = s.Update(user, "ApiKeys")
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (s *Storage) DeleteApiKey(userID uint, name string) error {
-	user, err := s.Get("", userID)
-	if err != nil {
-		return err
-	}
-	// Initialize the ApiKeys map if it is nil
-	if user.ApiKeys == nil {
-		user.ApiKeys = make(map[string]AuthToken)
-	}
-	delete(user.ApiKeys, name)
-	err = s.Update(user, "ApiKeys")
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // DeleteRule deletes a rule specified by ID from the user's rules list and updates the user in the database.
 func (s *Storage) DeleteRule(userID string, ruleID string) error {
 	user, err := s.Get("", userID)
@@ -140,7 +103,7 @@ func (s *Storage) DeleteRule(userID string, ruleID string) error {
 	}
 
 	// Find and remove the rule with the specified ID
-	var updatedRules []Rule
+	var updatedRules []rules.Rule
 	for _, r := range user.Rules {
 		if r.Id != ruleID {
 			updatedRules = append(updatedRules, r)

backend/users/users.go

@@ -3,31 +3,10 @@ package users
 import (
 	"regexp"
 
-	"github.com/golang-jwt/jwt/v4"
+	"github.com/gtsteffaniak/filebrowser/rules"
+	"github.com/gtsteffaniak/filebrowser/settings"
 )
 
-type AuthToken struct {
-	Key                  string      `json:"key"`
-	Name                 string      `json:"name"`
-	Created              int64       `json:"createdAt"`
-	Expires              int64       `json:"expiresAt"`
-	BelongsTo            uint        `json:"belongsTo"`
-	Permissions          Permissions `json:"Permissions"`
-	jwt.RegisteredClaims `json:"-"`
-}
-
-type Permissions struct {
-	Api      bool `json:"api"`
-	Admin    bool `json:"admin"`
-	Execute  bool `json:"execute"`
-	Create   bool `json:"create"`
-	Rename   bool `json:"rename"`
-	Modify   bool `json:"modify"`
-	Delete   bool `json:"delete"`
-	Share    bool `json:"share"`
-	Download bool `json:"download"`
-}
-
 // SortingSettings represents the sorting settings.
 type Sorting struct {
 	By  string `json:"by"`
@@ -41,17 +20,16 @@ type User struct {
 	DisableSettings bool                 `json:"disableSettings"`
 	ID              uint                 `storm:"id,increment" json:"id"`
 	Username        string               `storm:"unique" json:"username"`
-	Password        string               `json:"password,omitempty"`
+	Password        string               `json:"password"`
 	Scope           string               `json:"scope"`
 	Locale          string               `json:"locale"`
 	LockPassword    bool                 `json:"lockPassword"`
 	ViewMode        string               `json:"viewMode"`
 	SingleClick     bool                 `json:"singleClick"`
-	Sorting         Sorting              `json:"sorting"`
-	Perm            Permissions          `json:"perm"`
+	Perm            settings.Permissions `json:"perm"`
 	Commands        []string             `json:"commands"`
-	Rules           []Rule               `json:"rules"`
-	ApiKeys         map[string]AuthToken `json:"apiKeys,omitempty"`
+	Sorting         Sorting              `json:"sorting"`
+	Rules           []rules.Rule         `json:"rules"`
 	HideDotfiles    bool                 `json:"hideDotfiles"`
 	DateFormat      bool                 `json:"dateFormat"`
 	GallerySize     int                  `json:"gallerySize"`
@@ -63,20 +41,19 @@ var PublicUser = User{
 	Scope:        "./",
 	ViewMode:     "normal",
 	LockPassword: true,
-	Perm: Permissions{
+	Perm: settings.Permissions{
 		Create:   false,
 		Rename:   false,
 		Modify:   false,
 		Delete:   false,
-		Share:    false,
+		Share:    true,
 		Download: true,
 		Admin:    false,
-		Api:      false,
 	},
 }
 
 // GetRules implements rules.Provider.
-func (u *User) GetRules() []Rule {
+func (u *User) GetRules() []rules.Rule {
 	return u.Rules
 }
 
@@ -94,3 +71,20 @@ func (u *User) CanExecute(command string) bool {
 
 	return false
 }
+
+// Apply applies the default options to a user.
+func ApplyDefaults(u User) User {
+	u.StickySidebar = settings.Config.UserDefaults.StickySidebar
+	u.DisableSettings = settings.Config.UserDefaults.DisableSettings
+	u.DarkMode = settings.Config.UserDefaults.DarkMode
+	u.Scope = settings.Config.UserDefaults.Scope
+	u.Locale = settings.Config.UserDefaults.Locale
+	u.ViewMode = settings.Config.UserDefaults.ViewMode
+	u.SingleClick = settings.Config.UserDefaults.SingleClick
+	u.Perm = settings.Config.UserDefaults.Perm
+	u.Sorting = settings.Config.UserDefaults.Sorting
+	u.Commands = settings.Config.UserDefaults.Commands
+	u.HideDotfiles = settings.Config.UserDefaults.HideDotfiles
+	u.DateFormat = settings.Config.UserDefaults.DateFormat
+	return u
+}

backend/utils/cache.go

@@ -1,80 +0,0 @@
-package utils
-
-import (
-	"sync"
-	"time"
-)
-
-var (
-	DiskUsageCache     = newCache(30*time.Second, 24*time.Hour)
-	RealPathCache      = newCache(48*time.Hour, 72*time.Hour)
-	SearchResultsCache = newCache(15*time.Second, time.Hour)
-)
-
-func newCache(expires time.Duration, cleanup time.Duration) *KeyCache {
-	newCache := KeyCache{
-		data:         make(map[string]cachedValue),
-		expiresAfter: expires, // default
-	}
-	go newCache.cleanupExpiredJob(cleanup)
-	return &newCache
-}
-
-type KeyCache struct {
-	data         map[string]cachedValue
-	mu           sync.RWMutex
-	expiresAfter time.Duration
-}
-
-type cachedValue struct {
-	value     interface{}
-	expiresAt time.Time
-}
-
-func (c *KeyCache) Set(key string, value interface{}) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	c.data[key] = cachedValue{
-		value:     value,
-		expiresAt: time.Now().Add(c.expiresAfter),
-	}
-}
-
-func (c *KeyCache) SetWithExp(key string, value interface{}, exp time.Duration) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	c.data[key] = cachedValue{
-		value:     value,
-		expiresAt: time.Now().Add(exp),
-	}
-}
-
-func (c *KeyCache) Get(key string) interface{} {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	cached, ok := c.data[key]
-	if !ok || time.Now().After(cached.expiresAt) {
-		return nil
-	}
-	return cached.value
-}
-
-func (c *KeyCache) cleanupExpired() {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	now := time.Now()
-	for key, cached := range c.data {
-		if now.After(cached.expiresAt) {
-			delete(c.data, key)
-		}
-	}
-}
-
-// should automatically run for all cache types as part of init.
-func (c *KeyCache) cleanupExpiredJob(frequency time.Duration) {
-	ticker := time.NewTicker(frequency)
-	defer ticker.Stop()
-	for range ticker.C {
-		c.cleanupExpired()
-	}
-}

backend/utils/main.go

@@ -1,13 +1,9 @@
 package utils
 
 import (
-	"crypto/rand"
-	"fmt"
 	"log"
-	math "math/rand"
-	"reflect"
-	"strings"
-	"time"
+
+	"github.com/gtsteffaniak/filebrowser/settings"
 )
 
 func CheckErr(source string, err error) {
@@ -17,70 +13,7 @@ func CheckErr(source string, err error) {
 }
 
 func GenerateKey() []byte {
-	b := make([]byte, 64)
-	_, err := rand.Read(b)
-	if err != nil {
-		return nil
-	}
-	return b
-}
-
-// CapitalizeFirst returns the input string with the first letter capitalized.
-func CapitalizeFirst(s string) string {
-	if len(s) == 0 {
-		return s // Return the empty string as is
-	}
-	return strings.ToUpper(string(s[0])) + s[1:]
-}
-
-func GenerateRandomHash(length int) string {
-	const charset = "abcdefghijklmnopqrstuvwxyz0123456789"
-	math.New(math.NewSource(time.Now().UnixNano()))
-	result := make([]byte, length)
-	for i := range result {
-		result[i] = charset[math.Intn(len(charset))]
-	}
-	return string(result)
-}
-
-func PrintStructFields(v interface{}) {
-	val := reflect.ValueOf(v)
-	typ := reflect.TypeOf(v)
-
-	// Ensure the input is a struct
-	if val.Kind() != reflect.Struct {
-		fmt.Println("Provided value is not a struct")
-		return
-	}
-
-	// Iterate over the fields of the struct
-	for i := 0; i < val.NumField(); i++ {
-		field := val.Field(i)
-		fieldType := typ.Field(i)
-
-		// Convert field value to string, if possible
-		fieldValue := fmt.Sprintf("%v", field.Interface())
-
-		// Limit to 50 characters
-		if len(fieldValue) > 100 {
-			fieldValue = fieldValue[:100] + "..."
-		}
-
-		fmt.Printf("Field: %s, %s\n", fieldType.Name, fieldValue)
-	}
-}
-
-func GetParentDirectoryPath(path string) string {
-	if path == "/" || path == "" {
-		return ""
-	}
-	path = strings.TrimSuffix(path, "/") // Remove trailing slash if any
-	lastSlash := strings.LastIndex(path, "/")
-	if lastSlash == -1 {
-		return "" // No parent directory for a relative path without slashes
-	}
-	if lastSlash == 0 {
-		return "/" // If the last slash is the first character, return root
-	}
-	return path[:lastSlash]
+	k, err := settings.GenerateKey()
+	CheckErr("generateKey", err)
+	return k
 }

backend/utils/main_test.go

@@ -1,59 +0,0 @@
-package utils
-
-import (
-	"testing"
-)
-
-func TestGetParentDirectoryPath(t *testing.T) {
-	tests := []struct {
-		input          string
-		expectedOutput string
-	}{
-		{input: "/", expectedOutput: ""},                                              // Root directory
-		{input: "/subfolder", expectedOutput: "/"},                                    // Single subfolder
-		{input: "/sub/sub/", expectedOutput: "/sub"},                                  // Nested subfolder with trailing slash
-		{input: "/subfolder/", expectedOutput: "/"},                                   // Relative path with trailing slash
-		{input: "", expectedOutput: ""},                                               // Empty string treated as root
-		{input: "/sub/subfolder", expectedOutput: "/sub"},                             // Double slash in path
-		{input: "/sub/subfolder/deep/nested/", expectedOutput: "/sub/subfolder/deep"}, // Double slash in path
-	}
-
-	for _, test := range tests {
-		t.Run(test.input, func(t *testing.T) {
-			actualOutput := GetParentDirectoryPath(test.input)
-			if actualOutput != test.expectedOutput {
-				t.Errorf("\n\tinput %q\n\texpected %q\n\tgot %q",
-					test.input, test.expectedOutput, actualOutput)
-			}
-		})
-	}
-}
-
-func TestCapitalizeFirst(t *testing.T) {
-	tests := []struct {
-		input          string
-		expectedOutput string
-	}{
-		{input: "", expectedOutput: ""},                               // Empty string
-		{input: "a", expectedOutput: "A"},                             // Single lowercase letter
-		{input: "A", expectedOutput: "A"},                             // Single uppercase letter
-		{input: "hello", expectedOutput: "Hello"},                     // All lowercase
-		{input: "Hello", expectedOutput: "Hello"},                     // Already capitalized
-		{input: "123hello", expectedOutput: "123hello"},               // Non-alphabetic first character
-		{input: "hELLO", expectedOutput: "HELLO"},                     // Mixed case
-		{input: " hello", expectedOutput: " hello"},                   // Leading space, no capitalization
-		{input: "hello world", expectedOutput: "Hello world"},         // Phrase with spaces
-		{input: " hello world", expectedOutput: " hello world"},       // Phrase with leading space
-		{input: "123 hello world", expectedOutput: "123 hello world"}, // Numbers before text
-	}
-
-	for _, test := range tests {
-		t.Run(test.input, func(t *testing.T) {
-			actualOutput := CapitalizeFirst(test.input)
-			if actualOutput != test.expectedOutput {
-				t.Errorf("\n\tinput %q\n\texpected %q\n\tgot %q",
-					test.input, test.expectedOutput, actualOutput)
-			}
-		})
-	}
-}

docs/configuration.md

@@ -10,6 +10,7 @@ Here is an expanded config file which includes all possible configurations:
 server:
   CreateUserDir: false
   UserHomeBasePath: ""
+  indexingInterval: 5
   indexing: true
   numImageProcessors: 4
   socket: ""
@@ -70,6 +71,7 @@ Here are the defaults if nothing is set:
 server:
   enableThumbnails: true
   enableExec: false
+  indexingInterval: 5
   port: 80
   numImageProcessors: 4
   baseURL: ""
@@ -107,7 +109,7 @@ userDefaults:
 
 ### Server configuration settings
 
-- `indexingInterval`: This optional paramter disables smart indexing and specifies a time in minutes the system waits before checking for filesystem changes. See [indexing readme](indexing.md) for more information.
+- `indexingInterval`: This is the time in minutes the system waits before checking for filesystem changes. Default: `5`
 
 - `indexing`: This enables or disables indexing. (Note: search will not work without indexing) Default: `true`
 
@@ -218,7 +220,6 @@ userDefaults:
 
   - `download`: This boolean value determines whether download permissions are granted.
 
-  - `api`: Ability to create and manage API keys.
 
 - `hideDotfiles`: This boolean value determines whether dotfiles are hidden. (`true` or `false`)
 

docs/contributing.md

@@ -1,13 +1,2 @@
 # Contributing Guide
 
-If you would like to contribute, please open a pull request against main or the latest `dev_` branch thats currently in progress.
-
-A PR is required to have:
-
-1. A clear description about why it was opened
-2. A short title that best describes the issue.
-3. Test evidence for anything that is not self evident or covered by unit tests.
-
-Unit tests should be updated to pass before merging. So, the best way to handle this is to create a fork and test your changes there, then merge to this repo. You can also create a draft pull request if it is not fully ready.
-
-Please don't hesitate to open an issue for any ideas you have, but cannot contribute directly for whatever reason.

docs/getting_started.md

@@ -0,0 +1,2 @@
+# Getting Started using FileBrowser Quantum
+

docs/indexing.md

@@ -1,189 +0,0 @@
-# About Indexing on FileBrowser Quantum
-
-The most significant feature is the index, this document intends to demystify how it works so you can understand how to ensure your index closely matches the current state of your filesystem.
-
-## How does the index work?
-
-The approach used by this repo includes filesystem watchers that periodically scan the directory tree for changes. By default, this uses a smart scan strategy, but you can also configure a set interval in your config file.
-
-The `scan interval` is the break time between scans and does not include the time a scan takes. A typical scan can vary dramatically, but here are some expectations for SSD-based disks:
-
-| # folders  | # files  | time to index  | memory usage (RAM) |
-|---|---|---|---|
-|  10,000 | 10,000 | ~ 0-5 seconds | 15 MB |
-| 2,000  | 250,000 | ~ 0-5 seconds | 300 MB |
-| 50,000  | 50,000 | ~ 5-30 seconds | 150 MB |
-| 250,000  | 10,000 | ~ 2-5 minutes | 300 MB |
-| 500,000  | 500,000 | ~ 5+ minutes | 500+ MB |
-
-### Smart Scanning
-
-1. There is a floating `smart scan interval` that ranges from **1 minute - 4 hours** depending on the complexity of your filesystem
-2. The smart interval changes based on how often it discovers changed files:
-  - ```
-        // 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
-        }
-    ```
-3. The `smart scan interval` performs a `quick scan` 4 times in a row, followed by a 5th `full scan` which completely rebuilds the index.
-   - A `quick scan` is limited to detecting directory changes, but is 10x faster than a full scan. Here is what a quick scan can see:
-      1. New files or folders created.
-      2. Files or folders deleted.
-      3. Renaming of files or folders.
-   - A quick scan **cannot** detect when a file has been updated, for example when you save a file and the size increases.
-   - A `full scan` is a complete re-indexing. This is always more disk and computationally intense but will capture individual file changes.
-4. The `smart scan interval` changes based on several things. A `simple` complexity enables scans every 1 minute if changes happen frequently and a maximum full scan interval of every 100 minutes. `high` complexity indicates a minimum scanning interval of 10 minutes.
-   - **under 10,000 folders** or **Under 3 seconds** to index is awlays considered `simple` complexity.
-   - **more than 500,000 folders** or **Over 2 minutes** to index is always considered `high` complexity.
-
-### Manual Scanning Interval
-
-If you don't like the behavior of smart scanning, you can configure set intervals instead by setting `indexingInterval` to a number greater than 0. This will make FileBrowser Quantum always scan at the given interval in minutes.
-
-The scan behavior is still 4 quick scans at a given interval, followed by a 5th full scan.
-
-### System requirements
-
-You can expect FileBrowser Quantum to use 100 MB of RAM for a typical installation. If you have many files and folders then the requirement could climb to multiple Gigabytes. Please monitor your system on the first run to know your specific requirements.
-
-### Why does FileBrowser Quantum index the way it does?
-
-The smart indexing method uses filesystem scanners because it allows a low-footprint design that can cater to individual filesystem complexity. There are a few options for monitoring a filesystem for changes:
-
-1. **Option 1**: Recursive Traversal with ReadDir
-  - This is quite computationally intensive but creates an accurate record of the filesystem
-  - Requires periodic scanning to remain updated
-  - Low overhead and straightforward implementation.
-2. **Option 2**: Use File System Monitoring (Real-Time or Periodic Check) such as `fsnotify`
-  - This allows for event-based reactions to filesystem changes.
-  - Requires extra overhead.
-  - Relies on OS level features and behavior differs between OS's
-  - Requires OS-level configuration to ulimits in order to properly watch a large filesystem.
-3. **Option 3**: Directory Metadata Heuristics.
-  - Using ModTime to determine when directory structures change.
-  - Has minimal insight into actual file changes.
-  - Much faster to scan for changes than Recursive transversal.
-
-Ultimately, FileBrowser Quantum uses a combination of 1 and 3 to perform index updates. Using something like fsnotify is a non-starter for large filesystems, where it would require manual host OS tuning to work at all. Besides, I can essentially offer the same behavior by creating "watchers" for top-level folders (a feature to come in the future). However, right now there is a single root-level watcher that works over the entire index.
-
-The main disadvantage of the approach is the delay caused by the scanning interval.
-
-### How to manually refresh the index?
-
-There is currently no way to manually trigger a new full indexing. This will come in a future release when the "jobs" functionality is added back.
-
-However, if you want to force-refresh a certain directory, this happens every time you **view it** in the UI or via the resources API.
-
-This also means the resources API is always up to date with the current status of the filesystem. When you "look" at a specific folder, you are causing the index to be refreshed at that location.
-
-### What information does the index have?
-
-You can see what the index looks like by using the resources API via the GET method, which returns individual directory information -- all of this information is stored in the index.
-
-Here is an example:
-
-```
-{
-    "name": "filebrowser",
-    "size": 274467914,
-    "modified": "2024-11-23T19:18:57.68013727-06:00",
-    "type": "directory",
-    "files": [
-        {
-            "name": ".dockerignore",
-            "size": 73,
-            "modified": "2024-11-20T18:14:44.91135413-06:00",
-            "type": "blob"
-        },
-        {
-            "name": ".DS_Store",
-            "size": 6148,
-            "modified": "2024-11-22T14:45:15.901211088-06:00",
-            "type": "blob"
-        },
-        {
-            "name": ".gitignore",
-            "size": 455,
-            "modified": "2024-11-23T19:18:57.616132373-06:00",
-            "type": "blob"
-        },
-        {
-            "name": "CHANGELOG.md",
-            "size": 9325,
-            "modified": "2024-11-23T19:18:57.616646332-06:00",
-            "type": "text"
-        },
-        {
-            "name": "Dockerfile",
-            "size": 769,
-            "modified": "2024-11-23T19:18:57.616941333-06:00",
-            "type": "blob"
-        },
-        {
-            "name": "Dockerfile.playwright",
-            "size": 542,
-            "modified": "2024-11-23T19:18:57.617151875-06:00",
-            "type": "blob"
-        },
-        {
-            "name": "makefile",
-            "size": 1311,
-            "modified": "2024-11-23T19:18:57.68017352-06:00",
-            "type": "blob"
-        },
-        {
-            "name": "README.md",
-            "size": 10625,
-            "modified": "2024-11-23T19:18:57.617464334-06:00",
-            "type": "text"
-        }
-    ],
-    "folders": [
-        {
-            "name": ".git",
-            "size": 60075460,
-            "modified": "2024-11-24T14:44:42.52180215-06:00",
-            "type": "directory"
-        },
-        {
-            "name": ".github",
-            "size": 11584,
-            "modified": "2024-11-20T18:14:44.911805335-06:00",
-            "type": "directory"
-        },
-        {
-            "name": "backend",
-            "size": 29247172,
-            "modified": "2024-11-23T19:18:57.667109624-06:00",
-            "type": "directory"
-        },
-        {
-            "name": "docs",
-            "size": 14272,
-            "modified": "2024-11-24T13:46:12.082024018-06:00",
-            "type": "directory"
-        },
-        {
-            "name": "frontend",
-            "size": 185090178,
-            "modified": "2024-11-24T14:44:39.880678934-06:00",
-            "type": "directory"
-        }
-    ],
-    "path": "/filebrowser"
-}
-```
-
-### Can I disable the index and still use FileBrowser Quantum?
-
-You can disable the index by setting `indexing: false` in your config file. You will still be able to browse your files, but the search will not work and you may run into issues as it's not intended to be used without indexing.
-
-I'm not sure why you would run it like this, if you have a good reason please open an issue request on how you would like it to work -- and why you would run it without the index.

docs/migration.md

@@ -19,7 +19,4 @@ Note: share links will not work and will need to be re-created after migration.
 
 The filebrowser Quantum application should run with the same user and rules that
 you have from the original. But keep in mind the differences that may not work 
-the same way, but all user configuration should be available.
-
-The windows binary is particularly untested, I would advise using docker if testing on windows.
-
+the same way, but all user configuration should be available.

docs/roadmap.md

@@ -1,21 +1,22 @@
 # Planned Roadmap
 
-upcoming 0.3.x releases, ordered by priority:
+upcoming 0.2.x releases:
 
-- More filetype icons and refreshed icons.
-- more filetype previews - eg. office, photoshop, vector, 3d files.
-- Enable mobile search with same features as desktop
-- Enable mobile search with same features as desktop
+- Replace http routes for gorilla/mux with stdlib
 - Theme configuration from settings
+- File syncronization improvements
+- more filetype previews
+
+next major 0.3.0 release :
+
+- multiple sources https://github.com/filebrowser/filebrowser/issues/2514
 - introduce jobs as replacement to runners.
-  - Add Job status to the sidebar
+- Add Job status to the sidebar
   - index status.
   - Job status from users
   - upload status
-- opentelemetry metrics
 
 Unplanned Future releases:
-  - multiple sources https://github.com/filebrowser/filebrowser/issues/2514
   - Add tools to sidebar
     - duplicate file detector.
     - bulk rename https://github.com/filebrowser/filebrowser/issues/2473

frontend/package.json

@@ -9,15 +9,14 @@
   },
   "scripts": {
     "dev": "vite dev",
-    "build": "vite build && cp -r dist/* ../backend/http/embed",
+    "build": "vite build && cp -R dist/ ../backend/cmd/",
     "build-docker": "vite build",
     "watch": "vite build --watch",
     "typecheck": "vue-tsc -p ./tsconfig.json --noEmit",
-    "lint": "eslint --ext .js,.vue,ts src",
+    "lint": "npm run typecheck && eslint src/",
     "lint:fix": "eslint --fix src/",
     "format": "prettier --write .",
-    "integration-test": "npx playwright test",
-    "test": "vitest run "
+    "test": "npx playwright test"
   },
   "dependencies": {
     "ace-builds": "^1.24.2",
@@ -33,17 +32,15 @@
     "vue-router": "^4.3.0"
   },
   "devDependencies": {
-    "@intlify/unplugin-vue-i18n": "^4.0.0",
     "@playwright/test": "^1.42.1",
+    "@intlify/unplugin-vue-i18n": "^4.0.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vue/eslint-config-typescript": "^13.0.0",
     "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-vue": "^9.24.0",
-    "jsdom": "^25.0.1",
     "vite": "^5.2.7",
     "vite-plugin-compression2": "^1.0.0",
-    "vitest": "^2.1.5",
     "vue-tsc": "^2.0.7"
   }
 }

frontend/public/index.html

@@ -4,30 +4,32 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-  {{ if .ReCaptcha }}
-    <script src="{{ .ReCaptchaHost }}/recaptcha/api.js?render=explicit" data-vite-ignore></script>
-  {{ end }}
 
-  <title>{{ if .Name }}{{ .Name }}{{ else }}FileBrowser Quantum{{ end }}</title>
+  [{[ if .ReCaptcha -]}]
+    <script src="[{[ .ReCaptchaHost ]}]/recaptcha/api.js?render=explicit" data-vite-ignore></script>
+  [{[ end ]}]
 
-  <link rel="icon" type="image/png" sizes="256x256" href="{{ .StaticURL }}/img/icons/favicon-256x256.png">
+  <title>[{[ if .Name -]}][{[ .Name ]}][{[ else ]}]FileBrowser Quantum[{[ end ]}]</title>
+
+  <link rel="icon" type="image/png" sizes="256x256" href="[{[ .StaticURL ]}]/img/icons/favicon-256x256.png">
 
   <!-- Add to home screen for Android and modern mobile browsers -->
   <link rel="manifest" id="manifestPlaceholder" crossorigin="use-credentials">
-  <meta name="theme-color" content="{{ if .Color }}{{ .Color }}{{ else }}#2979ff{{ end }}">
+  <meta name="theme-color" content="[{[ if .Color -]}][{[ .Color ]}][{[ else ]}]#2979ff[{[ end ]}]">
 
   <!-- Add to home screen for Safari on iOS/iPadOS -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
   <meta name="apple-mobile-web-app-title" content="assets">
-  <link rel="apple-touch-icon" href="{{ .StaticURL }}/img/icons/apple-touch-icon.png">
+  <link rel="apple-touch-icon" href="[{[ .StaticURL ]}]/img/icons/apple-touch-icon.png">
 
   <!-- Add to home screen for Windows -->
-  <meta name="msapplication-TileImage" content="{{ .StaticURL }}/img/icons/mstile-144x144.png">
-  <meta name="msapplication-TileColor" content="{{ if .Color }}{{ .Color }}{{ else }}#2979ff{{ end }}">
+  <meta name="msapplication-TileImage" content="[{[ .StaticURL ]}]/img/icons/mstile-144x144.png">
+  <meta name="msapplication-TileColor" content="[{[ if .Color -]}][{[ .Color ]}][{[ else ]}]#2979ff[{[ end ]}]">
 
   <!-- Inject Some Variables and generate the manifest json -->
   <script>
-    window.FileBrowser =  JSON.parse('{{ .globalVars }}');
+    window.FileBrowser = JSON.parse('[{[ .Json ]}]');
 
     var fullStaticURL = window.location.origin + window.FileBrowser.StaticURL;
     var dynamicManifest = {
@@ -35,12 +37,12 @@
       "short_name": window.FileBrowser.Name || 'FileBrowser',
       "icons": [
         {
-          "src":  fullStaticURL + "/img/icons/android-chrome-256x256.png",
+          "src": fullStaticURL + "/img/icons/android-chrome-256x256.png",
           "sizes": "512x512",
           "type": "image/png"
         }
       ],
-      "start_url": fullStaticURL,
+      "start_url": window.location.origin + window.FileBrowser.BaseURL,
       "display": "standalone",
       "background_color": "#ffffff",
       "theme_color": window.FileBrowser.Color || "#455a64"
@@ -118,7 +120,7 @@
 <body>
   <div id="app"></div>
 
-  {{ if .darkMode -}}
+  [{[ if .darkMode -]}]
   <div id="loading" class="dark-mode">
     <div class="spinner">
       <div class="bounce1"></div>
@@ -126,19 +128,18 @@
       <div class="bounce3"></div>
     </div>
   </div>
-  {{ else }}
+  [{[ else ]}]
   <div id="loading">
     <div class="spinner">
       <div class="bounce1"></div>
       <div class="bounce2"></div>
       <div class="bounce3"></div>
     </div>
-  </div>
-  {{end}}
+  </div>  [{[ end ]}]
   <script type="module" src="/src/main.ts"></script>
 
-  {{ if .CSS }}
-    <link rel="stylesheet" href="{{ .StaticURL }}/custom.css" >
-  {{ end }}
+  [{[ if .CSS -]}]
+    <link rel="stylesheet" href="[{[ .StaticURL ]}]/custom.css" />
+  [{[ end ]}]
 </body>
 </html>

frontend/public/manifest.json

@@ -13,7 +13,7 @@
       "type": "image/png"
     }
   ],
-  "start_url": "./",
+  "start_url": "/",
   "display": "standalone",
   "background_color": "#ffffff",
   "theme_color": "#455a64"

frontend/src/api/commands.js

@@ -1,10 +1,14 @@
+import { removePrefix } from "./utils";
 import { baseURL } from "@/utils/constants";
+import { state } from "@/store";
 
 const ssl = window.location.protocol === "https:";
 const protocol = ssl ? "wss:" : "ws:";
 
 export default function command(url, command, onmessage, onclose) {
-  url = `${protocol}//${window.location.host}${baseURL}api/command${url}`;
+  url = removePrefix(url);
+  url = `${protocol}//${window.location.host}${baseURL}/api/command${url}?auth=${state.jwt}`;
+
   let conn = new window.WebSocket(url);
   conn.onopen = () => conn.send(command);
   conn.onmessage = onmessage;

frontend/src/api/files.js

@@ -1,17 +1,32 @@
-import { fetchURL, adjustedData } from "./utils";
-import { removePrefix, getApiPath } from "@/utils/url.js";
+import { createURL, fetchURL, removePrefix } from "./utils";
+import { baseURL } from "@/utils/constants";
 import { state } from "@/store";
 import { notify } from "@/notify";
 
 // Notify if errors occur
-export async function fetchFiles(url, content = false) {
+export async function fetch(url, content = false) {
   try {
-    let path = removePrefix(url, "files");
-    const apiPath = getApiPath("api/resources",{path: path, content: content});
-    const res = await fetchURL(apiPath);
+    url = removePrefix(url);
+
+    const res = await fetchURL(`/api/resources${url}?content=${content}`, {});
     const data = await res.json();
-    const adjusted = adjustedData(data, url);
-    return adjusted;
+    data.url = `/files${url}`;
+
+    if (data.isDir) {
+      if (!data.url.endsWith("/")) data.url += "/";
+      data.items = data.items.map((item, index) => {
+        item.index = index;
+        item.url = `${data.url}${encodeURIComponent(item.name)}`;
+
+        if (item.isDir) {
+          item.url += "/";
+        }
+
+        return item;
+      });
+    }
+
+    return data;
   } catch (err) {
     notify.showError(err.message || "Error fetching data");
     throw err;
@@ -20,12 +35,15 @@ export async function fetchFiles(url, content = false) {
 
 async function resourceAction(url, method, content) {
   try {
+    url = removePrefix(url);
+
     let opts = { method };
+
     if (content) {
       opts.body = content;
     }
-    const apiPath = getApiPath("api/resources", { path: url });
-    const res = await fetchURL(apiPath, opts);
+
+    const res = await fetchURL(`/api/resources${url}`, opts);
     return res;
   } catch (err) {
     notify.showError(err.message || "Error performing resource action");
@@ -53,18 +71,30 @@ export async function put(url, content = "") {
 
 export function download(format, ...files) {
   try {
-    let path = "";
-    let fileargs = "";
+    let url = `${baseURL}/api/raw`;
+
     if (files.length === 1) {
-      path = removePrefix(files[0], "files")
+      url += removePrefix(files[0]) + "?";
     } else {
+      let arg = "";
+
       for (let file of files) {
-        fileargs += removePrefix(file,"files") + ",";
+        arg += removePrefix(file) + ",";
       }
-      fileargs = fileargs.substring(0, fileargs.length - 1);
+
+      arg = arg.substring(0, arg.length - 1);
+      arg = encodeURIComponent(arg);
+      url += `/?files=${arg}&`;
     }
-    const apiPath = getApiPath("api/raw", { path: path, files: fileargs, algo: format });
-    const url = window.origin+apiPath
+
+    if (format) {
+      url += `algo=${format}&`;
+    }
+
+    if (state.jwt) {
+      url += `auth=${state.jwt}&`;
+    }
+
     window.open(url);
   } catch (err) {
     notify.showError(err.message || "Error downloading files");
@@ -73,7 +103,7 @@ export function download(format, ...files) {
 
 export async function post(url, content = "", overwrite = false, onupload) {
   try {
-    url = removePrefix(url,"files");
+    url = removePrefix(url);
 
     let bufferContent;
     if (
@@ -83,12 +113,11 @@ export async function post(url, content = "", overwrite = false, onupload) {
       bufferContent = await new Response(content).arrayBuffer();
     }
 
-    const apiPath = getApiPath("api/resources", { path: url, override: overwrite });
     return new Promise((resolve, reject) => {
       let request = new XMLHttpRequest();
       request.open(
         "POST",
-        apiPath,
+        `${baseURL}/api/resources${url}?override=${overwrite}`,
         true
       );
       request.setRequestHeader("X-Auth", state.jwt);
@@ -119,27 +148,30 @@ export async function post(url, content = "", overwrite = false, onupload) {
   }
 }
 
-export async function moveCopy(items, action = "copy", overwrite = false, rename = false) {
+function moveCopy(items, copy = false, overwrite = false, rename = false) {
   let promises = [];
-  let params = {
-    overwrite: overwrite,
-    action: action,
-    rename: rename,
-  }
-  try {
-    for (let item of items) {
-      let localParams = { ...params };
-      localParams.destination = item.to;
-      localParams.from = item.from;
-      const apiPath = getApiPath("api/resources", localParams);
-      promises.push(fetch(apiPath, { method: "PATCH" }));
-    }
-    return promises;
 
-  } catch (err) {
+  for (let item of items) {
+    const from = item.from;
+    const to = encodeURIComponent(removePrefix(item.to));
+    const url = `${from}?action=${
+      copy ? "copy" : "rename"
+    }&destination=${to}&override=${overwrite}&rename=${rename}`;
+    promises.push(resourceAction(url, "PATCH"));
+  }
+
+  return Promise.all(promises).catch((err) => {
     notify.showError(err.message || "Error moving/copying resources");
     throw err;
-  }
+  });
+}
+
+export function move(items, overwrite = false, rename = false) {
+  return moveCopy(items, false, overwrite, rename);
+}
+
+export function copy(items, overwrite = false, rename = false) {
+  return moveCopy(items, true, overwrite, rename);
 }
 
 export async function checksum(url, algo) {
@@ -152,31 +184,27 @@ export async function checksum(url, algo) {
   }
 }
 
-export function getDownloadURL(path, inline) {
-  
+export function getDownloadURL(file, inline) {
   try {
     const params = {
-      path: removePrefix(path,"files"),
       ...(inline && { inline: "true" }),
     };
-    const apiPath = getApiPath("api/raw", params);
-    return window.origin+apiPath
+
+    return createURL("api/raw" + file.path, params);
   } catch (err) {
     notify.showError(err.message || "Error getting download URL");
     throw err;
   }
 }
 
-export function getPreviewURL(path, size, modified) {
+export function getPreviewURL(file, size) {
   try {
     const params = {
-      path: path,
-      size: size,
-      key: Date.parse(modified),
       inline: "true",
+      key: Date.parse(file.modified),
     };
-    const apiPath = getApiPath("api/preview", params);
-    return window.origin+apiPath
+
+    return createURL("api/preview/" + size + file.path, params);
   } catch (err) {
     notify.showError(err.message || "Error getting preview URL");
     throw err;
@@ -185,14 +213,13 @@ export function getPreviewURL(path, size, modified) {
 
 export function getSubtitlesURL(file) {
   try {
+    const params = {
+      inline: "true",
+    };
+
     const subtitles = [];
     for (const sub of file.subtitles) {
-      const params = {
-        inline: "true",
-        path: sub
-      };
-      const apiPath = getApiPath("api/raw", params);
-      return window.origin+apiPath
+      subtitles.push(createURL("api/raw" + sub, params));
     }
 
     return subtitles;
@@ -202,10 +229,11 @@ export function getSubtitlesURL(file) {
   }
 }
 
-export async function usage(source) {
+export async function usage(url) {
   try {
-    const apiPath = getApiPath("api/usage", { source: source });
-    const res = await fetchURL(apiPath);
+    url = removePrefix(url);
+
+    const res = await fetchURL(`/api/usage${url}`, {});
     return await res.json();
   } catch (err) {
     notify.showError(err.message || "Error fetching usage data");

frontend/src/api/index.js

@@ -1,9 +1,9 @@
-import * as filesApi from "./files";
-import * as shareApi from "./share";
-import * as usersApi from "./users";
-import * as settingsApi from "./settings";
-import * as publicApi from "./public";
+import * as files from "./files";
+import * as share from "./share";
+import * as users from "./users";
+import * as settings from "./settings";
+import * as pub from "./pub";
 import search from "./search";
 import commands from "./commands";
 
-export { filesApi, shareApi, usersApi, settingsApi, publicApi, commands, search };
+export { files, share, users, settings, pub, commands, search };

frontend/src/api/pub.js

@@ -0,0 +1,89 @@
+import { removePrefix, createURL } from "./utils";
+import { baseURL } from "@/utils/constants";
+
+export async function fetchPub(url, password = "") {
+  url = removePrefix(url);
+  const res = await fetch(
+      `/api/public/share${url}`,
+      {
+        headers: {
+          "X-SHARE-PASSWORD": encodeURIComponent(password),
+        },
+      }
+  );
+  if (res.status != 200) {
+    const error = new Error("000 No connection");
+    error.status = res.status;
+    throw error;
+  }
+
+  let data = await res.json();
+  data.url = `/share${url}`;
+  if (data.isDir) {
+    if (!data.url.endsWith("/")) data.url += "/";
+    data.items = data.items.map((item, index) => {
+      item.index = index;
+      item.url = `${data.url}${encodeURIComponent(item.name)}`;
+
+      if (item.isDir) {
+        item.url += "/";
+      }
+
+      return item;
+    });
+  }
+
+  return data;
+}
+
+export function download(format, hash, token, ...files) {
+  let url = `${baseURL}/api/public/dl/${hash}`;
+  if (files.length === 1) {
+    url += encodeURIComponent(files[0]) + "?";
+  } else {
+    let arg = "";
+    for (let file of files) {
+      arg += encodeURIComponent(file) + ",";
+    }
+
+    arg = arg.substring(0, arg.length - 1);
+    arg = encodeURIComponent(arg);
+    url += `/?files=${arg}&`;
+  }
+
+  if (format) {
+    url += `algo=${format}&`;
+  }
+
+  if (token) {
+    url += `token=${token}&`;
+  }
+
+  window.open(url);
+}
+
+export function getPublicUser() {
+  return fetch("/api/public/publicUser")
+    .then(response => {
+      if (!response.ok) {
+        throw new Error(`HTTP error! Status: ${response.status}`);
+      }
+      return response.json();
+    })
+    .catch(error => {
+      console.error("Error fetching public user:", error);
+      throw error;
+    });
+}
+
+export function getDownloadURL(share, inline = false) {
+  const params = {
+    ...(inline && { inline: "true" }),
+    ...(share.token && { token: share.token }),
+  };
+  if (share.path == undefined) {
+    share.path = ""
+  }
+  const path = share.path.replace("/share/"+share.hash +"/","")
+  return createURL("api/public/dl/" + share.hash + "/"+path, params, false);
+}

frontend/src/api/public.js

@@ -1,63 +0,0 @@
-import { adjustedData } from "./utils";
-import { getApiPath, removePrefix } from "@/utils/url.js";
-import { notify } from "@/notify";
-
-// Fetch public share data
-export async function fetchPub(path, hash, password = "") {
-  const params = { path, hash }
-  const apiPath = getApiPath("api/public/share", params);
-  const response = await fetch(apiPath, {
-    headers: {
-      "X-SHARE-PASSWORD": password ? encodeURIComponent(password) : "",
-    },
-  });
-
-  if (!response.ok) {
-    const error = new Error("Failed to connect to the server.");
-    error.status = response.status;
-    throw error;
-  }
-  let data = await response.json()
-  const adjusted = adjustedData(data, getApiPath(`share/${hash}${path}`));
-  return adjusted
-}
-
-// Download files with given parameters
-export function download(share, ...files) {
-  try {
-    let fileInfo = files[0]
-    if (files.length > 1) {
-      fileInfo = files.map(encodeURIComponent).join(",");
-    }
-    const params = {
-      "path": removePrefix(share.path, "share"),
-      "hash": share.hash,
-      "token": share.token,
-      "inline": share.inline,
-      "files": fileInfo,
-    };
-    const apiPath = getApiPath("api/public/dl", params);
-    window.open(window.origin+apiPath)
-  } catch (err) {
-    notify.showError(err.message || "Error downloading files");
-    throw err;
-  }
-}
-
-// Get the public user data
-export async function getPublicUser() {
-  try {
-    const apiPath = getApiPath("api/public/publicUser");
-    const response = await fetch(apiPath);
-    return response.json();
-  } catch (err) {
-    notify.showError(err.message || "Error fetching public user");
-    throw err;
-  }
-}
-
-// Generate a download URL
-export function getDownloadURL(share) {
-  const apiPath = getApiPath("api/public/dl", share);
-  return window.origin+apiPath
-}

frontend/src/api/search.js

@@ -1,21 +1,26 @@
-import { fetchURL } from "./utils";
+import { fetchURL, removePrefix } from "./utils";
+import url from "../utils/url";
 import { notify } from "@/notify";  // Import notify for error handling
-import { removePrefix, getApiPath } from "@/utils/url.js";
 
 export default async function search(base, query) {
   try {
-    base = removePrefix(base,"files");
+    base = removePrefix(base);
     query = encodeURIComponent(query);
 
     if (!base.endsWith("/")) {
       base += "/";
     }
 
-    const apiPath = getApiPath("api/search", { scope: base, query: query });
-    const res = await fetchURL(apiPath);
+    const res = await fetchURL(`/api/search${base}?query=${query}`, {});
+
     let data = await res.json();
 
-    return data
+    data = data.map((item) => {
+      item.url = `/files${base}` + url.encodePath(item.path);
+      return item;
+    });
+
+    return data;
   } catch (err) {
     notify.showError(err.message || "Error occurred during search");
     throw err;

frontend/src/api/settings.js

@@ -1,15 +1,11 @@
 import { fetchURL, fetchJSON } from "./utils";
-import { getApiPath } from "@/utils/url.js";
-
-const apiPath = getApiPath("api/settings");
 
 export function get() {
-  return fetchJSON(apiPath);
+  return fetchJSON(`/api/settings`, {});
 }
 
 export async function update(settings) {
-
-  await fetchURL(apiPath, {
+  await fetchURL(`/api/settings`, {
     method: "PUT",
     body: JSON.stringify(settings),
   });

frontend/src/api/share.js

@@ -1,45 +1,37 @@
-import { fetchURL, fetchJSON, adjustedData } from "./utils";
-import { notify } from "@/notify";
-import { getApiPath } from "@/utils/url.js";
+import { fetchURL, fetchJSON, removePrefix, createURL } from "./utils";
 
 export async function list() {
-  const apiPath = getApiPath("api/shares");
-  return fetchJSON(apiPath);
+  return fetchJSON("/api/shares");
 }
 
-export async function get(path, hash) {
-  try {
-    const params = { path, hash };
-    const apiPath = getApiPath("api/share",params);
-    let data = fetchJSON(apiPath);
-    return adjustedData(data, `api/share${path}`);
-  } catch (err) {
-    notify.showError(err.message || "Error fetching data");
-    throw err;
-  }
+export async function get(url) {
+  url = removePrefix(url);
+  return fetchJSON(`/api/share${url}`);
 }
 
 export async function remove(hash) {
-  const params = { hash };
-  const apiPath = getApiPath("api/share",params);
-  await fetchURL(apiPath, {
+  await fetchURL(`/api/share/${hash}`, {
     method: "DELETE",
   });
 }
 
-export async function create(path, password = "", expires = "", unit = "hours") {
-  const params = { path };
-  const apiPath = getApiPath("api/share",params);
+export async function create(url, password = "", expires = "", unit = "hours") {
+  url = removePrefix(url);
+  url = `/api/share${url}`;
+  expires = String(expires);
+  if (expires !== "") {
+    url += `?expires=${expires}&unit=${unit}`;
+  }
   let body = "{}";
   if (password != "" || expires !== "" || unit !== "hours") {
     body = JSON.stringify({ password: password, expires: expires, unit: unit });
   }
-  return fetchJSON(apiPath, {
+  return fetchJSON(url, {
     method: "POST",
     body: body,
   });
 }
 
 export function getShareURL(share) {
-  return window.origin+getApiPath(`share/${share.hash}`);
+  return createURL("share/" + share.hash, {}, false);
 }

frontend/src/api/users.js

@@ -1,67 +1,27 @@
 import { fetchURL, fetchJSON } from "@/api/utils";
-import { getApiPath } from "@/utils/url.js";
 import { notify } from "@/notify";  // Import notify for error handling
 
 export async function getAllUsers() {
   try {
-    const apiPath = getApiPath("api/users");
-    return await fetchJSON(apiPath);
+    return await fetchJSON(`/api/users`, {});
   } catch (err) {
     notify.showError(err.message || "Failed to fetch users");
     throw err; // Re-throw to handle further if needed
   }
 }
 
-
 export async function get(id) {
   try {
-    const apiPath = getApiPath("api/users", { id: id });
-    return await fetchJSON(apiPath);
+    return await fetchJSON(`/api/users/${id}`, {});
   } catch (err) {
     notify.showError(err.message || `Failed to fetch user with ID: ${id}`);
     throw err;
   }
 }
 
-export async function getApiKeys() {
-  try {
-    const apiPath = getApiPath("api/auth/tokens");
-    return await fetchJSON(apiPath);
-  } catch (err) {
-    notify.showError(err.message || `Failed to get api keys`);
-    throw err;
-  }
-}
-
-
-export async function createApiKey(params) {
-  try {
-    const apiPath = getApiPath("api/auth/token", params);
-    await fetchURL(apiPath, {
-      method: "PUT",
-    });
-  } catch (err) {
-    notify.showError(err.message || `Failed to create API key`);
-    throw err;
-  }
-}
-
-export function deleteApiKey(params) {
-  try {
-    const apiPath = getApiPath("api/auth/token", params);
-    fetchURL(apiPath, {
-      method: "DELETE",
-    });
-  } catch (err) {
-    notify.showError(err.message || `Failed to delete API key`);
-    throw err;
-  }
-}
-
 export async function create(user) {
   try {
-    const apiPath = getApiPath("api/users");
-    const res = await fetchURL(apiPath, {
+    const res = await fetchURL(`/api/users`, {
       method: "POST",
       body: JSON.stringify({
         what: "user",
@@ -90,8 +50,7 @@ export async function update(user, which = ["all"]) {
     if (user.username === "publicUser") {
       return;
     }
-    const apiPath = getApiPath("api/users", { id: user.id });
-    await fetchURL(apiPath, {
+    await fetchURL(`/api/users/${user.id}`, {
       method: "PUT",
       body: JSON.stringify({
         what: "user",
@@ -107,8 +66,7 @@ export async function update(user, which = ["all"]) {
 
 export async function remove(id) {
   try {
-    const apiPath = getApiPath("api/users", { id: id });
-    await fetchURL(apiPath, {
+    await fetchURL(`/api/users/${id}`, {
       method: "DELETE",
     });
   } catch (err) {

frontend/src/api/utils.js

@@ -1,5 +1,7 @@
 import { state } from "@/store";
 import { renew, logout } from "@/utils/auth";
+import { baseURL } from "@/utils/constants";
+import { encodePath } from "@/utils/url";
 import { notify } from "@/notify";
 
 export async function fetchURL(url, opts, auth = true) {
@@ -10,24 +12,19 @@ export async function fetchURL(url, opts, auth = true) {
 
   let res;
   try {
-    let userScope = "";
-    if (state.user) {
-      userScope = state.user.scope;
-    }
-    res = await fetch(url, {
+    res = await fetch(`${baseURL}${url}`, {
       headers: {
+        "X-Auth": state.jwt,
         "sessionId": state.sessionId,
-        "userScope": userScope,
+        "userScope": state.user.scope,
         ...headers,
       },
       ...rest,
     });
   } catch (e) {
-    let message = e;
-    if (e == "TypeError: Failed to fetch") {
-      message = "Failed to connect to the server, is it still running?";
-    }
-    const error = new Error(message);
+    console.error(e)
+    const error = new Error("000 No connection");
+    error.status = res.status;
     throw error;
   }
 
@@ -36,7 +33,7 @@ export async function fetchURL(url, opts, auth = true) {
   }
 
   if (res.status < 200 || res.status > 299) {
-    let error = new Error(await res.text());
+    const error = new Error(await res.text());
     error.status = res.status;
 
     if (auth && res.status == 401) {
@@ -51,37 +48,36 @@ export async function fetchURL(url, opts, auth = true) {
 
 export async function fetchJSON(url, opts) {
   const res = await fetchURL(url, opts);
-  if (res.status < 300) {
+  if (res.status === 200) {
     return res.json();
   } else {
-    notify.showError("received status: "+res.status+" on url " + url);
+    notify.showError("unable to fetch : " + url + "status" + res.status);
     throw new Error(res.status);
   }
 }
 
-export function adjustedData(data, url) {
-  data.url = url;
-
-  if (data.type === "directory") {
-    if (!data.url.endsWith("/")) data.url += "/";
-
-    // Combine folders and files into items
-    data.items = [...(data.folders || []), ...(data.files || [])];
-
-    data.items = data.items.map((item, index) => {
-      item.index = index;
-      item.url = `${data.url}${item.name}`;
-      if (item.type === "directory") {
-        item.url += "/";
-      }
-      return item;
-    });
-  }
-  if (data.files) {
-    data.files = []
-  }
-  if (data.folders) {
-    data.folders = []
-  }
-  return data;
+export function removePrefix(url) {
+  url = url.split("/").splice(2).join("/");
+  if (url === "") url = "/";
+  if (url[0] !== "/") url = "/" + url;
+  return url;
+}
+
+export function createURL(endpoint, params = {}, auth = true) {
+  let prefix = baseURL;
+  if (!prefix.endsWith("/")) {
+    prefix = prefix + "/";
+  }
+  const url = new URL(prefix + encodePath(endpoint), origin);
+
+  const searchParams = {
+    ...(auth && { auth: state.jwt }),
+    ...params,
+  };
+
+  for (const key in searchParams) {
+    url.searchParams.set(key, searchParams[key]);
+  }
+
+  return url.toString();
 }

frontend/src/api/utils.test.js

@@ -1,95 +0,0 @@
-import { describe, it, expect, vi } from 'vitest';
-import { adjustedData } from './utils.js';
-
-describe('adjustedData', () => {
-  it('should append the URL and process directory data correctly', () => {
-    const input = {
-      type: "directory",
-      folders: [
-        { name: "folder1", type: "directory" },
-        { name: "folder2", type: "directory" },
-      ],
-      files: [
-        { name: "file1.txt", type: "file" },
-        { name: "file2.txt", type: "file" },
-      ],
-    };
-
-    const url = "http://example.com/unit-testing/files/path/to/directory";
-
-    const expected = {
-      type: "directory",
-      url: "http://example.com/unit-testing/files/path/to/directory/",
-      folders: [],
-      files: [],
-      items: [
-        { name: "folder1", type: "directory", index: 0, url: "http://example.com/unit-testing/files/path/to/directory/folder1/" },
-        { name: "folder2", type: "directory", index: 1, url: "http://example.com/unit-testing/files/path/to/directory/folder2/" },
-        { name: "file1.txt", type: "file", index: 2, url: "http://example.com/unit-testing/files/path/to/directory/file1.txt" },
-        { name: "file2.txt", type: "file", index: 3, url: "http://example.com/unit-testing/files/path/to/directory/file2.txt" },
-      ],
-    };
-
-    expect(adjustedData(input, url)).toEqual(expected);
-  });
-
-  it('should add a trailing slash to the URL if missing for a directory', () => {
-    const input = { type: "directory", folders: [], files: [] };
-    const url = "http://example.com/base";
-
-    const expected = {
-      type: "directory",
-      url: "http://example.com/base/",
-      folders: [],
-      files: [],
-      items: [],
-    };
-
-    expect(adjustedData(input, url)).toEqual(expected);
-  });
-
-  it('should handle non-directory types without modification to items', () => {
-    const input = { type: "file", name: "file1.txt" };
-    const url = "http://example.com/base";
-
-    const expected = {
-      type: "file",
-      name: "file1.txt",
-      url: "http://example.com/base",
-    };
-
-    expect(adjustedData(input, url)).toEqual(expected);
-  });
-
-  it('should handle missing folders and files gracefully', () => {
-    const input = { type: "directory" };
-    const url = "http://example.com/base";
-
-    const expected = {
-      type: "directory",
-      url: "http://example.com/base/",
-      items: [],
-    };
-
-    expect(adjustedData(input, url)).toEqual(expected);
-  });
-
-  it('should handle empty input object correctly', () => {
-    const input = {};
-    const url = "http://example.com/base";
-
-    const expected = {
-      url: "http://example.com/base",
-    };
-
-    expect(adjustedData(input, url)).toEqual(expected);
-  });
-
-});
-
-vi.mock('@/utils/constants', () => {
-  return {
-    baseURL: "unit-testing",
-  };
-});
-

frontend/src/components/Breadcrumbs.vue

@@ -21,6 +21,7 @@
         type="range"
         id="gallery-size"
         name="gallery-size"
+        :value="gallerySize"
         min="0"
         max="10"
         @input="updateGallerySize"
@@ -32,7 +33,6 @@
 
 <script>
 import { state, mutations, getters } from "@/store";
-import { removePrefix } from "@/utils/url.js";
 import Action from "@/components/Action.vue";
 
 export default {
@@ -51,19 +51,12 @@ export default {
       return getters.isCardView();
     },
     items() {
-      let relativePath = removePrefix(state.route.path, "files");
-      if (getters.currentView() == "share") {
-        // Split the path, filter out any empty elements, then join again with slashes
-        relativePath = removePrefix(state.route.path, "share");
-      }
+      const relativePath = state.route.path.replace(this.base, "");
       let parts = relativePath.split("/");
 
       if (parts[0] === "") {
         parts.shift();
       }
-      if (getters.currentView() == "share") {
-        parts.shift();
-      }
 
       if (parts[parts.length - 1] === "") {
         parts.pop();
@@ -103,9 +96,7 @@ export default {
       return "router-link";
     },
     showShare() {
-      return (
-        state.user?.perm && state.user?.perm.share && state.user.username != "publicUser"
-      );
+      return state.user?.perm && state.user?.perm.share;
     },
   },
   methods: {

frontend/src/components/Search.vue

@@ -35,28 +35,17 @@
         <div class="button" style="width: 100%">Search Context: {{ getContext }}</div>
         <!-- List of search results -->
         <ul v-show="results.length > 0">
-          <li v-for="(s, k) in results" :key="k" class="search-entry">
-            <router-link :to="createPath(s.path)">
-              <i v-if="s.type == 'directory'" class="material-icons folder-icons">
-                folder
-              </i>
-              <i v-else-if="s.type == 'audio'" class="material-icons audio-icons">
-                volume_up
-              </i>
-              <i v-else-if="s.type == 'image'" class="material-icons image-icons">
-                photo
-              </i>
-              <i v-else-if="s.type == 'video'" class="material-icons video-icons">
-                movie
-              </i>
-              <i v-else-if="s.type == 'archive'" class="material-icons archive-icons">
-                archive
-              </i>
+          <li v-for="(s, k) in results" :key="k" style="cursor: pointer">
+            <router-link :to="s.url">
+              <i v-if="s.dir" class="material-icons folder-icons"> folder </i>
+              <i v-else-if="s.audio" class="material-icons audio-icons"> volume_up </i>
+              <i v-else-if="s.image" class="material-icons image-icons"> photo </i>
+              <i v-else-if="s.video" class="material-icons video-icons"> movie </i>
+              <i v-else-if="s.archive" class="material-icons archive-icons"> archive </i>
               <i v-else class="material-icons file-icons"> insert_drive_file </i>
               <span class="text-container">
-                {{ basePath(s.path, s.type == "directory") }}<b>{{ baseName(s.path) }}</b>
+                {{ basePath(s.path, s.dir) }}<b>{{ baseName(s.path) }}</b>
               </span>
-              <div class="filesize">{{ humanSize(s.size) }}</div>
             </router-link>
           </li>
         </ul>
@@ -108,7 +97,7 @@
       <div class="searchContext">Search Context: {{ getContext }}</div>
       <div id="result-list">
         <div>
-          <div v-if="!isMobile && active">
+          <div>
             <!-- Button groups for filtering search results -->
             <ButtonGroup
               :buttons="folderSelect"
@@ -124,7 +113,7 @@
               :isDisabled="isTypeSelectDisabled"
             />
             <!-- Inputs for filtering by file size -->
-            <div class="sizeConstraints">
+            <div v-if="!foldersOnly" class="sizeConstraints">
               <div class="sizeInputWrapper">
                 <p>Smaller Than:</p>
                 <input
@@ -180,28 +169,17 @@
         </div>
         <!-- List of search results -->
         <ul v-show="results.length > 0">
-          <li v-for="(s, k) in results" :key="k" class="search-entry">
-            <router-link :to="createPath(s.path)">
-              <i v-if="s.type == 'directory'" class="material-icons folder-icons">
-                folder
-              </i>
-              <i v-else-if="s.type == 'audio'" class="material-icons audio-icons">
-                volume_up
-              </i>
-              <i v-else-if="s.type == 'image'" class="material-icons image-icons">
-                photo
-              </i>
-              <i v-else-if="s.type == 'video'" class="material-icons video-icons">
-                movie
-              </i>
-              <i v-else-if="s.type == 'archive'" class="material-icons archive-icons">
-                archive
-              </i>
+          <li v-for="(s, k) in results" :key="k" style="cursor: pointer">
+            <router-link :to="s.url">
+              <i v-if="s.dir" class="material-icons folder-icons"> folder </i>
+              <i v-else-if="s.audio" class="material-icons audio-icons"> volume_up </i>
+              <i v-else-if="s.image" class="material-icons image-icons"> photo </i>
+              <i v-else-if="s.video" class="material-icons video-icons"> movie </i>
+              <i v-else-if="s.archive" class="material-icons archive-icons"> archive </i>
               <i v-else class="material-icons file-icons"> insert_drive_file </i>
               <span class="text-container">
-                {{ basePath(s.path, s.type == "directory") }}<b>{{ baseName(s.path) }}</b>
+                {{ basePath(s.path, s.dir) }}<b>{{ baseName(s.path) }}</b>
               </span>
-              <div class="filesize">{{ humanSize(s.size) }}</div>
             </router-link>
           </li>
         </ul>
@@ -209,13 +187,10 @@
     </div>
   </div>
 </template>
-
 <script>
 import ButtonGroup from "./ButtonGroup.vue";
 import { search } from "@/api";
 import { getters, mutations, state } from "@/store";
-import { getHumanReadableFilesize } from "@/utils/filesizes";
-import { getApiPath } from "@/utils/url";
 
 var boxes = {
   folder: { label: "folders", icon: "folder" },
@@ -339,12 +314,6 @@ export default {
     },
   },
   methods: {
-    createPath(path) {
-      return getApiPath(`files/${path}`)
-    },
-    humanSize(size) {
-      return getHumanReadableFilesize(size);
-    },
     basePath(str, isDir) {
       let parts = str.replace(/(\/$|^\/)/, "").split("/");
       if (parts.length <= 1) {
@@ -367,13 +336,11 @@ export default {
     },
     open() {
       if (!this.active) {
-        this.resetSearchFilters();
         mutations.showHover("search");
       }
     },
     close(event) {
       this.value = "";
-
       event.stopPropagation();
       mutations.closeHovers();
     },
@@ -423,10 +390,10 @@ export default {
         return;
       }
       let searchTypesFull = this.searchTypes;
-      if (this.largerThan != "") {
+      if (this.largerThan != "" && !this.isTypeSelectDisabled) {
         searchTypesFull = searchTypesFull + "type:largerThan=" + this.largerThan + " ";
       }
-      if (this.smallerThan != "") {
+      if (this.smallerThan != "" && !this.isTypeSelectDisabled) {
         searchTypesFull = searchTypesFull + "type:smallerThan=" + this.smallerThan + " ";
       }
       let path = state.route.path;
@@ -569,15 +536,6 @@ export default {
   /* IE and Edge */
 }
 
-.search-entry {
-  cursor: pointer;
-  border-radius: 0.25em;
-}
-
-.search-entry:hover {
-  background-color: var(--surfacePrimary);
-}
-
 .text-container {
   white-space: nowrap;
   overflow: hidden;
@@ -653,6 +611,10 @@ body.rtl #search #result ul > * {
   border-bottom-left-radius: 0;
 }
 
+input.sizeInput:disabled {
+  cursor: not-allowed;
+}
+
 /* Search Input Placeholder */
 #search::-webkit-input-placeholder {
   color: rgba(255, 255, 255, 0.5);
@@ -736,6 +698,31 @@ body.rtl #search .boxes h3 {
   justify-content: center;
 }
 
+.sizeInput {
+  height: 100%;
+  text-align: center;
+  width: 5em;
+  border-radius: 1em;
+  padding: 1em;
+  backdrop-filter: invert(0.1);
+  border: none !important;
+}
+
+.sizeInputWrapper {
+  border-radius: 1em;
+  margin-left: 0.5em;
+  margin-right: 0.5em;
+  display: -ms-flexbox;
+  display: flex;
+  background-color: rgb(245, 245, 245);
+  padding: 0.25em;
+  height: 3em;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  border: 1px solid #ccc;
+}
+
 .helpButton {
   position: absolute;
   right: 10px;
@@ -753,13 +740,4 @@ body.rtl #search .boxes h3 {
   justify-content: center;
   align-items: center;
 }
-
-.filesize {
-  background-color: var(--surfaceSecondary);
-  border-radius: 1em;
-  padding: 0.25em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-  min-width: fit-content;
-}
 </style>

frontend/src/components/files/ListingItem.vue

@@ -1,7 +1,7 @@
 <template>
   <component
     :is="quickNav ? 'a' : 'div'"
-    :href="quickNav ? getUrl() : undefined"
+    :href="quickNav ? url : undefined"
     :class="{
       item: true,
       activebutton: isMaximized && isSelected,
@@ -16,7 +16,6 @@
     :data-type="type"
     :aria-label="name"
     :aria-selected="isSelected"
-    @contextmenu="onRightClick"
     @click="quickNav ? toggleClick() : itemClick($event)"
   >
     <div @click="toggleClick" :class="{ activetitle: isMaximized && isSelected }">
@@ -47,21 +46,17 @@
 .activebutton {
   height: 10em;
 }
-
 .activecontent {
   height: 5em !important;
   display: grid !important;
 }
-
 .activeimg {
   width: 8em !important;
   height: 8em !important;
 }
-
 .iconActive {
   font-size: 6em !important;
 }
-
 .activetitle {
   width: 9em !important;
   margin-right: 1em !important;
@@ -72,11 +67,9 @@
 import { enableThumbs } from "@/utils/constants";
 import { getHumanReadableFilesize } from "@/utils/filesizes";
 import { fromNow } from "@/utils/moment";
-import { filesApi } from "@/api";
+import { files as api } from "@/api";
 import * as upload from "@/utils/upload";
 import { state, getters, mutations } from "@/store"; // Import your custom store
-import { baseURL } from "@/utils/constants";
-import { router } from "@/router";
 
 export default {
   name: "item",
@@ -136,7 +129,12 @@ export default {
       if (state.req.path == "/") {
         path = "";
       }
-      return filesApi.getPreviewURL(path + "/" + this.name, "small", state.req.modified);
+      const file = {
+        path: path + "/" + this.name,
+        modified: this.modified,
+      };
+
+      return api.getPreviewURL(file, "thumb");
     },
     isThumbsEnabled() {
       return enableThumbs;
@@ -159,24 +157,6 @@ export default {
     }
   },
   methods: {
-    getUrl() {
-      return baseURL.slice(0, -1) + this.url;
-    },
-    onRightClick(event) {
-      event.preventDefault(); // Prevent default context menu
-
-      // If no items are selected, select the right-clicked item
-      if (getters.selectedCount() === 0) {
-        mutations.addSelected(this.index);
-      }
-      mutations.showHover({
-        name: "ContextMenu",
-        props: {
-          posX: event.clientX,
-          posY: event.clientY,
-        },
-      });
-    },
     handleIntersect(entries, observer) {
       entries.forEach((entry) => {
         if (entry.isIntersecting) {
@@ -247,16 +227,21 @@ export default {
           name: state.req.items[i].name,
         });
       }
-      let response = await filesApi.fetchFiles(el.__vue__.url);
 
-      let action = async (overwrite, rename) => {
-        await filesApi.moveCopy(items, "move", overwrite, rename);
-        setTimeout(() => {
-          mutations.setReload(true);
-        }, 50);
+      // Get url from ListingItem instance
+      let path = el.__vue__.url;
+      let baseItems = (await api.fetch(path)).items;
+
+      let action = (overwrite, rename) => {
+        api
+          .move(items, overwrite, rename)
+          .then(() => {
+            mutations.setReload(true);
+          })
+          .catch(showError);
       };
 
-      let conflict = upload.checkConflict(items, response.items);
+      let conflict = upload.checkConflict(items, baseItems);
 
       let overwrite = false;
       let rename = false;
@@ -273,12 +258,14 @@ export default {
             action(overwrite, rename);
           },
         });
+
         return;
       }
 
       action(overwrite, rename);
     },
     itemClick(event) {
+      console.log("should say something");
       if (this.singleClick && !state.multiple) this.open();
       else this.click(event);
     },
@@ -324,7 +311,7 @@ export default {
       mutations.addSelected(this.index);
     },
     open() {
-      router.push({ path: this.url });
+      this.$router.push({ path: this.url });
     },
   },
 };

frontend/src/components/prompts/ActionApi.vue

@@ -1,111 +0,0 @@
-<template>
-  <div class="card floating">
-    <div class="card-title">
-      <h2>API Key Details</h2>
-    </div>
-
-    <div class="card-content">
-      <button
-        class="action copy-clipboard"
-        :data-clipboard-text="info.key"
-        :aria-label="$t('buttons.copyToClipboard')"
-        :title="$t('buttons.copyToClipboard')"
-      >
-        API Key Name : {{ name }}
-        <i class="material-icons">content_paste</i>
-      </button>
-
-      <h3>Created At :</h3>
-      {{ formatTime(info.created) }}
-      <h3>Expires At :</h3>
-      {{ formatTime(info.expires) }}
-      <h3>Permissions:</h3>
-      <table>
-        <tbody>
-          <tr v-for="(isEnabled, perm) in info.Permissions" :key="perm">
-            <td>{{ perm }}</td>
-            <td>{{ isEnabled ? "✓" : "✗" }}</td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    <div class="card-action">
-      <button
-        class="button button--flat button--grey"
-        @click="closeHovers"
-        :aria-label="$t('buttons.close')"
-        :title="$t('buttons.close')"
-      >
-        {{ $t("buttons.close") }}
-      </button>
-      <button
-        class="button button--flat button--red"
-        @click="deleteApi"
-        :title="$t('buttons.delete')"
-      >
-        {{ $t("buttons.delete") }}
-      </button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mutations } from "@/store";
-import { notify } from "@/notify";
-import { usersApi } from "@/api";
-
-export default {
-  name: "ActionApi",
-  props: {
-    name: {
-      type: String,
-      required: true,
-    },
-    info: {
-      type: Object,
-      required: true,
-    },
-  },
-  methods: {
-    formatTime(timestamp) {
-      return new Date(timestamp * 1000).toLocaleDateString("en-US", {
-        year: "numeric",
-        month: "long",
-        day: "numeric",
-      });
-    },
-    closeHovers() {
-      mutations.closeHovers();
-    },
-    deleteApi() {
-      // Dummy delete function, to be filled in later
-      try {
-        usersApi.deleteApiKey({ name: this.name });
-        notify.showSuccess("API key deleted!");
-        window.location.reload();
-      } catch (error) {
-        notify.showError(error);
-      }
-    },
-  },
-};
-</script>
-
-<style>
-/* Basic styling for the prompt */
-.card.floating {
-  padding: 20px;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-}
-.card-content {
-  margin-bottom: 16px;
-}
-.card-action {
-  display: flex;
-  justify-content: flex-end;
-}
-.card-action .button {
-  margin-left: 8px;
-}
-</style>

frontend/src/components/prompts/Copy.vue

@@ -49,10 +49,10 @@
 <script>
 import { mutations, state } from "@/store";
 import FileList from "./FileList.vue";
-import { filesApi } from "@/api";
+import { files as api } from "@/api";
 import buttons from "@/utils/buttons";
 import * as upload from "@/utils/upload";
-//import { notify } from "@/notify";
+import { notify } from "@/notify";
 
 export default {
   name: "copy",
@@ -77,19 +77,33 @@ export default {
       let items = [];
 
       // Create a new promise for each file.
-      for (let item of state.selected) {
+      for (let item of this.selected) {
         items.push({
-          from: state.req.items[item].url,
-          to: this.dest + encodeURIComponent(state.req.items[item].name),
-          name: state.req.items[item].name,
+          from: store.req.items[item].url,
+          to: this.dest + encodeURIComponent(store.req.items[item].name),
+          name: store.req.items[item].name,
         });
       }
 
       let action = async (overwrite, rename) => {
         buttons.loading("copy");
-        await filesApi.moveCopy(items, "copy", overwrite, rename);
-        this.$router.push({ path: this.dest });
-        mutations.setReload(true);
+
+        await api
+          .copy(items, overwrite, rename)
+          .then(() => {
+            buttons.success("copy");
+
+            if (state.route.path === this.dest) {
+              mutations.setReload(true);
+              return;
+            }
+
+            this.$router.push({ path: this.dest });
+          })
+          .catch((e) => {
+            buttons.done("copy");
+            notify.showError(e);
+          });
       };
 
       if (state.route.path === this.dest) {
@@ -99,7 +113,7 @@ export default {
         return;
       }
 
-      let dstItems = (await filesApi.fetchFiles(this.dest)).items;
+      let dstItems = (await api.fetch(this.dest)).items;
       let conflict = upload.checkConflict(items, dstItems);
 
       let overwrite = false;

frontend/src/components/prompts/CreateApi.vue

@@ -1,122 +0,0 @@
-<template>
-  <div class="card floating create-api__prompt__card" id="create-api">
-    <div class="card-title">
-      <h2>Create API Key</h2>
-    </div>
-
-    <div class="card-content">
-      <!-- API Key Name Input -->
-      <p>API Key Name</p>
-      <input
-        class="input input--block"
-        type="text"
-        v-model.trim="apiName"
-        placeholder="enter a uinque api key name"
-      />
-
-      <!-- Duration Input -->
-      <p>Token Duration</p>
-      <div class="inputWrapper">
-        <input
-          class="sizeInput roundedInputLeft input"
-          v-model.number="duration"
-          type="number"
-          min="1"
-          placeholder="number"
-        />
-        <select v-model="unit" class="roundedInputRight input">
-          <option value="days">days</option>
-          <option value="months">months</option>
-        </select>
-      </div>
-
-      <!-- Permissions Input -->
-      <p>
-        Choose at least one permission for the key. Your User must also have the
-        permission.
-      </p>
-      <div>
-        <p v-for="(isEnabled, perm) in availablePermissions" :key="perm">
-          <input type="checkbox" v-model="permissions[perm]" />
-          {{ perm }}
-        </p>
-      </div>
-    </div>
-
-    <div class="card-action">
-      <button
-        @click="closeHovers"
-        class="button button--flat button--grey"
-        :aria-label="$t('buttons.cancel')"
-        :title="$t('buttons.cancel')"
-      >
-        {{ $t("buttons.cancel") }}
-      </button>
-      <button
-        class="button button--flat button--blue"
-        @click="createAPIKey"
-        :title="$t('buttons.create')"
-      >
-        {{ $t("buttons.create") }}
-      </button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mutations, state } from "@/store";
-import { notify } from "@/notify";
-import { usersApi } from "@/api";
-
-export default {
-  name: "CreateAPI",
-  data() {
-    return {
-      apiName: "",
-      duration: 1,
-      unit: "days",
-      permissions: {},
-    };
-  },
-  computed: {
-    availablePermissions() {
-      return state.user.perm;
-    },
-    durationInDays() {
-      // Calculate duration based on unit
-      return this.unit === "days" ? this.duration : this.duration * 30; // assuming 30 days per month
-    },
-  },
-  created() {
-    // Initialize permissions with the same structure as availablePermissions
-    this.permissions = Object.fromEntries(
-      Object.keys(this.availablePermissions).map((perm) => [perm, false])
-    );
-  },
-  methods: {
-    closeHovers() {
-      mutations.closeHovers();
-    },
-    async createAPIKey() {
-      try {
-        // Filter to get keys of permissions set to true and join them as a comma-separated string
-        const permissionsString = Object.keys(this.permissions)
-          .filter((key) => this.permissions[key])
-          .join(",");
-
-        const params = {
-          name: this.apiName,
-          days: this.durationInDays,
-          permissions: permissionsString,
-        };
-
-        usersApi.createApiKey(params);
-        notify.showSuccess("successfully created!");
-        window.location.reload();
-      } catch (error) {
-        notify.showError(this.$t("errors.createKeyFailed"));
-      }
-    },
-  },
-};
-</script>

frontend/src/components/prompts/Delete.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { filesApi } from "@/api";
+import { files as api } from "@/api";
 import buttons from "@/utils/buttons";
 import { state, getters, mutations } from "@/store";
 import { notify } from "@/notify";
@@ -57,9 +57,9 @@ export default {
 
       try {
         if (!this.isListing) {
-          await filesApi.remove(state.route.path);
+          await api.remove(state.route.path);
           buttons.success("delete");
-          notify.showSuccess("Deleted item successfully");
+          showSuccess("Deleted item successfully");
 
           this.currentPrompt?.confirm();
           this.closeHovers();
@@ -74,12 +74,12 @@ export default {
 
         let promises = [];
         for (let index of state.selected) {
-          promises.push(filesApi.remove(state.req.items[index].url));
+          promises.push(api.remove(state.req.items[index].url));
         }
 
         await Promise.all(promises);
         buttons.success("delete");
-        notify.showSuccess("Deleted item successfully");
+        showSuccess("Deleted item successfully");
         mutations.setReload(true); // Handle reload as needed
       } catch (e) {
         buttons.done("delete");

frontend/src/components/prompts/DeleteUser.vue

@@ -20,7 +20,7 @@
   </div>
 </template>
 <script>
-import { usersApi } from "@/api";
+import { users as api } from "@/api";
 import { notify } from "@/notify";
 import buttons from "@/utils/buttons";
 import { state, mutations, getters } from "@/store";
@@ -39,7 +39,7 @@ export default {
     async deleteUser(event) {
       event.preventDefault();
       try {
-        await usersApi.remove(this.user.id);
+        await api.remove(this.user.id);
         this.$router.push({ path: "/settings",hash:"#users-main" });
         notify.showSuccess(this.$t("settings.userDeleted"));
       } catch (e) {
@@ -56,7 +56,7 @@ export default {
 
       try {
         if (!this.isListing) {
-          await usersApi.remove(this.$route.path);
+          await api.remove(this.$route.path);
           buttons.success("delete");
 
           this.currentPrompt?.confirm();
@@ -72,7 +72,7 @@ export default {
 
         let promises = [];
         for (let index of this.selected) {
-          promises.push(usersApi.remove(state.req.items[index].url));
+          promises.push(api.remove(state.req.items[index].url));
         }
 
         await Promise.all(promises);