changed permissions and backend requirements (#185)

.github/workflows/pr.yaml

@@ -1,4 +1,4 @@
-name: pr-merge
+name: pr-request
 
 on:
   pull_request:

.github/workflows/release.yaml

@@ -3,7 +3,7 @@ name: release
 on:
   push:
     branches:
-      - "^v[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+"
 
 permissions:
   contents: write

Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.22-alpine as base
+FROM golang:1.22-alpine AS base
 WORKDIR /app
 COPY ./backend ./
 RUN go build -ldflags="-w -s" -o filebrowser .
 
-FROM node:slim as nbuild
+FROM node:slim AS nbuild
 WORKDIR /app
 COPY ./frontend/package.json ./
 RUN npm i --maxsockets 1

Dockerfile.playwright

@@ -1,15 +1,13 @@
-
-
-FROM golang:1.22-alpine as base
+FROM golang:1.22-alpine AS base
 WORKDIR /app
 COPY ./backend ./
 RUN go build -ldflags="-w -s" -o filebrowser .
 
-FROM node:slim as nbuild
+FROM node:slim
 WORKDIR /app
 COPY ./frontend/package.json ./
 RUN npm i --maxsockets 1
-RUN npx playwright install --with-deps chromium
+RUN npx playwright install --with-deps firefox
 COPY [ "backend/filebrowser.yaml", "./" ]
 COPY  ./frontend/ ./frontend
 WORKDIR /app/frontend

backend/cmd/users_import.go

@@ -34,11 +34,6 @@ list or set it to 0.`,
 		err = unmarshal(args[0], &list)
 		checkErr("unmarshal", err)
 
-		for _, user := range list {
-			err = user.Clean("")
-			checkErr("Clean", err)
-		}
-
 		if mustGetBool(cmd.Flags(), "replace") {
 			oldUsers, err := d.store.Users.Gets("")
 			checkErr("d.store.Users.Gets", err)

backend/diskcache/file_cache_test.go

@@ -2,7 +2,6 @@ package diskcache
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -21,7 +20,7 @@ func TestFileCache(t *testing.T) {
 	)
 
 	// Create temporary directory for the cache
-	cacheDir, err := ioutil.TempDir("", cacheRoot)
+	cacheDir, err := os.MkdirTemp("", cacheRoot)
 	require.NoError(t, err)
 	defer os.RemoveAll(cacheDir) // Clean up
 
@@ -48,7 +47,7 @@ func TestFileCache(t *testing.T) {
 func checkValue(t *testing.T, ctx context.Context, cache *FileCache, fileFullPath string, key, wantValue string) {
 	t.Helper()
 	// check actual file content
-	b, err := ioutil.ReadFile(fileFullPath)
+	b, err := os.ReadFile(fileFullPath)
 	require.NoError(t, err)
 	require.Equal(t, wantValue, string(b))
 

backend/files/file.go

@@ -362,7 +362,6 @@ func (i *FileInfo) addContent(path string) error {
 			return err
 		}
 		stringContent := string(content)
-		fmt.Println("Content: ", stringContent)
 		if !utf8.ValidString(stringContent) {
 			return nil
 		}

backend/http/raw.go

@@ -111,7 +111,7 @@ func addFile(ar archiver.Writer, d *data, path, commonPath string) error {
 	if !d.Check(path) {
 		return nil
 	}
-	info, err := d.user.Fs.Stat(path)
+	info, err := os.Stat(path)
 	if err != nil {
 		return err
 	}
@@ -120,7 +120,7 @@ func addFile(ar archiver.Writer, d *data, path, commonPath string) error {
 		return nil
 	}
 
-	file, err := d.user.Fs.Open(path)
+	file, err := os.Open(path)
 	if err != nil {
 		return err
 	}

backend/http/resource.go

@@ -139,6 +139,9 @@ var resourcePutHandler = withUser(func(w http.ResponseWriter, r *http.Request, d
 	}
 
 	realPath, err := files.GetRealPath(d.user.Scope, r.URL.Path)
+	if err != nil {
+		return http.StatusNotFound, err
+	}
 	fileOpts := files.FileOptions{
 		Path:       realPath,
 		Modify:     d.user.Perm.Modify,

backend/runner/runner.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"strings"
 
+	"github.com/gtsteffaniak/filebrowser/files"
 	"github.com/gtsteffaniak/filebrowser/settings"
 	"github.com/gtsteffaniak/filebrowser/users"
 )
@@ -19,8 +20,8 @@ type Runner struct {
 
 // RunHook runs the hooks for the before and after event.
 func (r *Runner) RunHook(fn func() error, evt, path, dst string, user *users.User) error {
-	path = user.FullPath(path)
-	dst = user.FullPath(dst)
+	path, _ = files.GetRealPath(user.Scope, path)
+	dst, _ = files.GetRealPath(user.Scope, dst)
 
 	if r.Enabled {
 		if val, ok := r.Commands["before_"+evt]; ok {

backend/users/storage.go

@@ -54,9 +54,6 @@ func (s *Storage) Get(baseScope string, id interface{}) (user *User, err error)
 	if err != nil {
 		return
 	}
-	if err := user.Clean(baseScope); err != nil {
-		return nil, err
-	}
 	return user, err
 }
 
@@ -66,23 +63,12 @@ func (s *Storage) Gets(baseScope string) ([]*User, error) {
 	if err != nil {
 		return nil, err
 	}
-	for _, user := range users {
-		if err := user.Clean(baseScope); err != nil { //nolint:govet
-			return nil, err
-		}
-	}
-
 	return users, err
 }
 
 // Update updates a user in the database.
 func (s *Storage) Update(user *User, fields ...string) error {
-	err := user.Clean("")
-	if err != nil {
-		return err
-	}
-
-	err = s.back.Update(user, fields...)
+	err := s.back.Update(user, fields...)
 	if err != nil {
 		return err
 	}
@@ -138,10 +124,6 @@ func (s *Storage) DeleteRule(userID string, ruleID string) error {
 // Save saves the user in a storage.
 func (s *Storage) Save(user *User) error {
 	log.Println("Saving new user:", user.Username)
-	if err := user.Clean(""); err != nil {
-		return err
-	}
-
 	return s.back.Save(user)
 }
 

backend/users/users.go

@@ -1,11 +1,8 @@
 package users
 
 import (
-	"path/filepath"
 	"regexp"
 
-	"github.com/spf13/afero"
-
 	"github.com/gtsteffaniak/filebrowser/rules"
 )
 
@@ -42,7 +39,6 @@ type User struct {
 	Perm            Permissions  `json:"perm"`
 	Commands        []string     `json:"commands"`
 	Sorting         Sorting      `json:"sorting"`
-	Fs              afero.Fs     `json:"-" yaml:"-"`
 	Rules           []rules.Rule `json:"rules"`
 	HideDotfiles    bool         `json:"hideDotfiles"`
 	DateFormat      bool         `json:"dateFormat"`
@@ -54,7 +50,6 @@ var PublicUser = User{
 	Scope:        "./",
 	ViewMode:     "normal",
 	LockPassword: true,
-	Fs:           afero.NewMemMapFs(),
 	Perm: Permissions{
 		Create:   false,
 		Rename:   false,
@@ -71,26 +66,6 @@ func (u *User) GetRules() []rules.Rule {
 	return u.Rules
 }
 
-// Clean cleans up a user and verifies if all its fields
-// are alright to be saved.
-//
-//nolint:gocyclo
-func (u *User) Clean(baseScope string) error {
-
-	if u.Fs == nil {
-		scope := u.Scope
-		scope = filepath.Join(baseScope, filepath.Join("/", scope)) //nolint:gocritic
-		u.Fs = afero.NewBasePathFs(afero.NewOsFs(), scope)
-	}
-
-	return nil
-}
-
-// FullPath gets the full path for a user's relative path.
-func (u *User) FullPath(path string) string {
-	return afero.FullBaseFsPath(u.Fs.(*afero.BasePathFs), path)
-}
-
 // CanExecute checks if an user can execute a specific command.
 func (u *User) CanExecute(command string) bool {
 	if !u.Perm.Execute {

backend/version/version.go

@@ -2,7 +2,7 @@ package version
 
 var (
 	// Version is the current File Browser version.
-	Version = "(0.3.0)"
+	Version = "(0.2.8)"
 	// CommitSHA is the commmit sha.
 	CommitSHA = "(unknown)"
 )

frontend/playwright.config.ts

@@ -36,8 +36,8 @@ export default defineConfig({
   /* Configure projects for major browsers */
   projects: [
     {
-      name: "chromium",
-      use: { ...devices["Desktop Chrome"] },
+      name: "firefox",
+      use: { ...devices["Desktop Firefox"] },
     },
   ],
 });

frontend/src/components/prompts/Delete.vue

@@ -33,7 +33,7 @@
 import { files as api } from "@/api";
 import buttons from "@/utils/buttons";
 import { state, getters, mutations } from "@/store";
-import { showError } from "@/notify";
+import { showError,showSuccess } from "@/notify";
 
 export default {
   name: "delete",
@@ -59,6 +59,7 @@ export default {
         if (!this.isListing) {
           await api.remove(state.route.path);
           buttons.success("delete");
+          showSuccess("Deleted item successfully")
 
           this.currentPrompt?.confirm();
           this.closeHovers();
@@ -78,6 +79,7 @@ export default {
 
         await Promise.all(promises);
         buttons.success("delete");
+        showSuccess("Deleted item successfully")
         mutations.setReload(true); // Handle reload as needed
       } catch (e) {
         buttons.done("delete");

frontend/src/components/prompts/Move.vue

@@ -52,7 +52,7 @@ import FileList from "./FileList.vue";
 import { files as api } from "@/api";
 import buttons from "@/utils/buttons";
 import * as upload from "@/utils/upload";
-import { showError } from "@/notify";
+import { showError,showSuccess } from "@/notify";
 
 export default {
   name: "move",
@@ -111,18 +111,17 @@ export default {
           confirm: (event, option) => {
             overwrite = option == "overwrite";
             rename = option == "rename";
-
             event.preventDefault();
             mutations.closeHovers();
             action(overwrite, rename);
             mutations.setReload(true);
           },
         });
-
         return;
       }
 
       action(overwrite, rename);
+
     },
   },
 };

frontend/src/components/prompts/ReplaceRename.vue

@@ -7,29 +7,32 @@
     <div class="card-content">
       <p>{{ $t("prompts.replaceMessage") }}</p>
     </div>
-
     <div class="card-action">
       <button
         class="button button--flat button--grey"
-        @click="(event) => currentPrompt.confirm(event, 'rename')"
+        @click="closeHovers"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')"
+        tabindex="3"
       >
         {{ $t("buttons.cancel") }}
       </button>
       <button
         class="button button--flat button--blue"
-        @click="(event) => currentPrompt.confirm(event, 'overwrite')"
+        @click="(event) => currentPrompt.confirm(event, 'rename')"
         :aria-label="$t('buttons.rename')"
         :title="$t('buttons.rename')"
+        tabindex="2"
       >
         {{ $t("buttons.rename") }}
       </button>
       <button
+        id="focus-prompt"
         class="button button--flat button--red"
-        @click="(event) => showConfirm(event, 'overwrite')"
+        @click="(event) => currentPrompt.confirm(event, 'overwrite')"
         :aria-label="$t('buttons.replace')"
         :title="$t('buttons.replace')"
+        tabindex="1"
       >
         {{ $t("buttons.replace") }}
       </button>

frontend/test-results/.last-run.json

@@ -1,4 +1,4 @@
 {
-  "status": "passed",
+  "status": "interrupted",
   "failedTests": []
 }