Compare commits

...
59 Commits
Author SHA1 Message Date
Henrique Dias 29c73eaca6 chore(release): 2.63.1 2026-04-04 22:15:49 +02:00
f13c7c8cff fix: restrict default permissions for proxy-auth auto-provisioned users (#5890)
Co-authored-by: Henrique Dias <mail@hacdias.com>
2026-04-04 22:02:34 +02:00
kodareef5andGitHub 1e03feadb5 fix: check download permission in resource handler (#5891) 2026-04-04 21:58:17 +02:00
kodareef5andGitHub 8adf127c7d fix: enforce directory boundary in rule path matching (#5889) 2026-04-04 21:57:40 +02:00
kodareef5andGitHub 7dbf7a3528 fix: check share owner permissions on public share access (#5888) 2026-04-04 21:56:55 +02:00
Henrique Dias 65a837de49 chore(release): 2.63.0 2026-04-04 10:02:07 +02:00
Ariel LeyvaandGitHub 876cdb3426 feat: enable copy operation on drag‑and‑drop with ctrl key (#5882) 2026-04-04 09:54:19 +02:00
Henrique Dias 2f805de527 docs: update docker compose 2026-04-04 09:19:09 +02:00
Ariel LeyvaandGitHub 7a16129bfc fix(tus): reject negative upload-length to prevent inconsistent cache entry (#5876) 2026-04-04 09:11:50 +02:00
Ariel LeyvaandGitHub 0f39bd055e fix: check download permission when sharing permission is enabled (#5875) 2026-04-04 09:11:21 +02:00
Henrique Dias 860c19ddf5 chore(release): 2.62.2 2026-03-28 20:02:32 +01:00
Henrique Dias a8fc1657b7 fix: shares listing 2026-03-28 20:02:12 +01:00
Henrique Dias c406bda0c7 fix: json escaping 2026-03-28 19:54:21 +01:00
Henrique Dias d9f9460c1e fix: use html/template 2026-03-28 19:16:12 +01:00
Henrique Dias 126227bb27 fix: disable scripted content in epub 2026-03-28 19:14:02 +01:00
Henrique Dias b6a4fb1f27 fix: self-registered users don't get execute perms 2026-03-28 19:08:19 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2368e468b9 chore(deps): update pnpm/action-setup action to v5 (#5869)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-28 19:07:00 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
8d8cd26d7f chore(deps): update all non-major dependencies (#5838)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-28 19:04:25 +01:00
lifandGitHub 8f81b77cf2 fix: include filename in Content-Disposition header for inline downloads (#5860) 2026-03-28 19:03:07 +01:00
transifex-integration[bot]GitHubtransifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
0616f6811f chore: Updates for project File Browser (#5847)
Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2026-03-28 18:59:51 +01:00
fabbandGitHub 432f3e60ff fix: double slash in TUS upload path when readEntries returns multiple batches (#5848) 2026-03-28 18:59:28 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
ae72f93667 chore(deps): update actions/deploy-pages action to v5 (#5866)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-28 18:53:12 +01:00
ArranandGitHub 4812536555 fix: touch Redis upload cache key on GetLength to prevent TTL expiry (#5850) 2026-03-26 16:27:28 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
6d44b3ae1d chore(deps): update pnpm/action-setup action to v5 (#5857)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-21 07:14:02 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
811cf2dfe5 chore(deps): update go-task/setup-task action to v2 (#5856)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-21 07:13:58 +01:00
Henrique Dias b5f970731b chore(release): 2.62.1 2026-03-14 09:31:34 +01:00
Henrique Dias fc80f4f44c fix: base url/reverse proxy redirect 2026-03-14 09:30:35 +01:00
Henrique Dias 6aea227617 chore(release): 2.62.0 2026-03-14 08:32:56 +01:00
Henrique Dias 09a26166b4 fix: make perm.share depend on share.download 2026-03-14 08:31:55 +01:00
Henrique Dias a63573b67e fix: signup handler shouldn't create admins 2026-03-14 08:23:10 +01:00
Henrique Dias 4bd7d69c82 fix: clean path in patch handler 2026-03-14 08:13:51 +01:00
Henrique Dias c21af0791a fix: around languages 2026-03-14 08:12:03 +01:00
transifex-integration[bot]GitHubtransifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
858eb42651 feat: Updates for project File Browser (#5807)
Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2026-03-14 07:57:56 +01:00
Henrique Dias 21709428b1 ci: update transifex settings 2026-03-14 07:57:18 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
846fb3333a chore(deps): update dependency vite to v8 (#5831)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-14 07:55:55 +01:00
Henrique Dias 6f772f2b10 ci: update transifex settings 2026-03-14 07:55:25 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
3c5d36673f chore(deps): update all non-major dependencies (#5818)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-14 07:53:53 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
27afbb8813 chore(deps): update dependency @vitejs/plugin-legacy to v8 (#5830)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-14 07:52:28 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
79875bac7f chore(deps): update marocchino/sticky-pull-request-comment action to v3 (#5833)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-14 07:51:04 +01:00
Henrique DiasandGitHub be8ba18937 docs: add notice on proxy 2026-03-12 07:59:20 +01:00
Andrew KatsikasandGitHub ef2e9992dc fix: properly surface config parse errors (#5822) 2026-03-12 07:34:11 +01:00
SergioandGitHub 0542fc0ba4 fix(tus): preserve percent-encoded upload paths in Location header (#5817) 2026-03-11 19:37:07 +01:00
Ariel LeyvaandGitHub f04af0cac6 fix: allow deleting the user's own account (#5820) 2026-03-11 19:36:05 +01:00
SergioandGitHub f5f8b60b33 fix(upload): avoid skipping whole folder upload on conflict modal (#5814) 2026-03-11 19:34:57 +01:00
SergioandGitHub 6dcef07f40 fix(upload): don't mark every folder-upload file as conflicting (#5813) 2026-03-11 19:34:49 +01:00
Henrique DiasandGitHub 6700a981a5 docs: update readme 2026-03-11 19:32:42 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
490e5bbf99 chore(deps): update docker/setup-qemu-action action to v4 (#5812)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-07 07:40:47 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
df63cb595c chore(deps): update docker/setup-buildx-action action to v4 (#5811)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-07 07:40:39 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
3cb21c727d chore(deps): update docker/login-action action to v4 (#5810)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-07 07:40:31 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
c01b6a840c chore(deps): update dependency eslint to v10.0.3 (#5809)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-07 07:40:23 +01:00
Henrique Dias cbcf708d94 chore(release): 2.61.2 2026-03-06 16:17:33 +01:00
Henrique Dias 4d9e6b8218 fix(frontend): do not delete original assets 2026-03-06 16:07:08 +01:00
Henrique Dias 8ee55761a1 fix(frontend): input password type 2026-03-06 16:06:54 +01:00
Marcel SzalbachandGitHub 8598db2acc fix: added dateFormat to getUserDefaults so this is respected in the … (#5804) 2026-03-06 15:32:04 +01:00
transifex-integration[bot]GitHubtransifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
a7dc7bf88a chore: update translations (#5796)
Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2026-03-06 15:28:29 +01:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
9f56826fb2 chore(deps): update all non-major dependencies (#5794)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-06 15:27:14 +01:00
Ariel LeyvaandGitHub d7b00ce5f6 fix: avoid sending the same name in the file/folder rename modal (#5806) 2026-03-06 15:26:54 +01:00
Ariel LeyvaandGitHub 177c7cfcce fix: validate current password with a modal (#5805) 2026-03-06 15:26:41 +01:00
Ariel LeyvaandGitHub 4af3f85e64 fix(csv-viewer): add support for missing text encodings in dropdown list (#5795) 2026-03-06 15:26:13 +01:00
91 changed files with 2738 additions and 1045 deletions
+26 -8
View File
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v4
- uses: pnpm/action-setup@v5
with:
package_json_file: "frontend/package.json"
- uses: actions/setup-node@v6
@@ -27,6 +27,24 @@ jobs:
pnpm install --frozen-lockfile
pnpm run lint
test-frontend:
name: Test Frontend
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v5
with:
package_json_file: "frontend/package.json"
- uses: actions/setup-node@v6
with:
node-version: "24.x"
cache: "pnpm"
cache-dependency-path: "frontend/pnpm-lock.yaml"
- working-directory: frontend
run: |
pnpm install --frozen-lockfile
pnpm run test
lint-backend:
name: Lint Backend
runs-on: ubuntu-latest
@@ -59,7 +77,7 @@ jobs:
- uses: actions/setup-go@v6
with:
go-version: '1.26'
- uses: pnpm/action-setup@v4
- uses: pnpm/action-setup@v5
with:
package_json_file: "frontend/package.json"
- uses: actions/setup-node@v6
@@ -68,7 +86,7 @@ jobs:
cache: "pnpm"
cache-dependency-path: "frontend/pnpm-lock.yaml"
- name: Install Task
uses: go-task/setup-task@v1
uses: go-task/setup-task@v2
- run: task build
release:
@@ -83,7 +101,7 @@ jobs:
- uses: actions/setup-go@v6
with:
go-version: '1.26'
- uses: pnpm/action-setup@v4
- uses: pnpm/action-setup@v5
with:
package_json_file: "frontend/package.json"
- uses: actions/setup-node@v6
@@ -92,14 +110,14 @@ jobs:
cache: "pnpm"
cache-dependency-path: "frontend/pnpm-lock.yaml"
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
- name: Install Task
uses: go-task/setup-task@v1
uses: go-task/setup-task@v2
- run: task build:frontend
- name: Login to Docker Hub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
+5 -5
View File
@@ -18,9 +18,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v6
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
- name: Install Task
uses: go-task/setup-task@v1
uses: go-task/setup-task@v2
- name: Build site
run: task docs
@@ -39,9 +39,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v6
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
- name: Install Task
uses: go-task/setup-task@v1
uses: go-task/setup-task@v2
- name: Build site
run: task docs
- name: Upload static files as artifact
@@ -49,4 +49,4 @@ jobs:
with:
path: www/public
- name: Deploy to GitHub Pages
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v5
+2 -2
View File
@@ -21,7 +21,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: marocchino/sticky-pull-request-comment@v2
- uses: marocchino/sticky-pull-request-comment@v3
# When the previous steps fails, the workflow would stop. By adding this
# condition you can continue the execution with the populated error message.
if: always() && (steps.lint_pr_title.outputs.error_message != null)
@@ -40,7 +40,7 @@ jobs:
# Delete a previous comment when the issue has been resolved
- if: ${{ steps.lint_pr_title.outputs.error_message == null }}
uses: marocchino/sticky-pull-request-comment@v2
uses: marocchino/sticky-pull-request-comment@v3
with:
header: pr-title-lint-error
delete: true
+76
View File
@@ -2,6 +2,82 @@
All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
## [2.63.1](https://github.com/filebrowser/filebrowser/compare/v2.63.0...v2.63.1) (2026-04-04)
### Bug Fixes
* check download permission in resource handler ([#5891](https://github.com/filebrowser/filebrowser/issues/5891)) ([1e03fea](https://github.com/filebrowser/filebrowser/commit/1e03feadb550e4414b5589a6a8df57f538efba15))
* check share owner permissions on public share access ([#5888](https://github.com/filebrowser/filebrowser/issues/5888)) ([7dbf7a3](https://github.com/filebrowser/filebrowser/commit/7dbf7a3528234b2a9ee9c4115e8ecf58d258ca51))
* enforce directory boundary in rule path matching ([#5889](https://github.com/filebrowser/filebrowser/issues/5889)) ([8adf127](https://github.com/filebrowser/filebrowser/commit/8adf127c7d33585333b8030869f6f318e6517179))
* restrict default permissions for proxy-auth auto-provisioned users ([#5890](https://github.com/filebrowser/filebrowser/issues/5890)) ([f13c7c8](https://github.com/filebrowser/filebrowser/commit/f13c7c8cffd6d58ff29c4a6763ced1385f69961e))
## [2.63.0](https://github.com/filebrowser/filebrowser/compare/v2.62.2...v2.63.0) (2026-04-04)
### Features
* enable copy operation on drag‑and‑drop with ctrl key ([#5882](https://github.com/filebrowser/filebrowser/issues/5882)) ([876cdb3](https://github.com/filebrowser/filebrowser/commit/876cdb34265b090c2a74a69509f4106f2c5e8726))
### Bug Fixes
* check download permission when sharing permission is enabled ([#5875](https://github.com/filebrowser/filebrowser/issues/5875)) ([0f39bd0](https://github.com/filebrowser/filebrowser/commit/0f39bd055efdadc15abd2f8146cf5da3793f8318))
* **tus:** reject negative upload-length to prevent inconsistent cache entry ([#5876](https://github.com/filebrowser/filebrowser/issues/5876)) ([7a16129](https://github.com/filebrowser/filebrowser/commit/7a16129bfc07dbdc2fa52b99d2985c1bc0ea12e2))
## [2.62.2](https://github.com/filebrowser/filebrowser/compare/v2.62.1...v2.62.2) (2026-03-28)
### Bug Fixes
* disable scripted content in epub ([126227b](https://github.com/filebrowser/filebrowser/commit/126227bb2754eee15cd7c722916c3bb8821084a2))
* double slash in TUS upload path when readEntries returns multiple batches ([#5848](https://github.com/filebrowser/filebrowser/issues/5848)) ([432f3e6](https://github.com/filebrowser/filebrowser/commit/432f3e60ffdf92af6f8f56119a1bac8084f52a60))
* include filename in Content-Disposition header for inline downloads ([#5860](https://github.com/filebrowser/filebrowser/issues/5860)) ([8f81b77](https://github.com/filebrowser/filebrowser/commit/8f81b77cf2a3da0a445f3700fbf4a0091ea46c07))
* json escaping ([c406bda](https://github.com/filebrowser/filebrowser/commit/c406bda0c73ac8b187e23a97c05521edc77efa84))
* self-registered users don't get execute perms ([b6a4fb1](https://github.com/filebrowser/filebrowser/commit/b6a4fb1f27f4d894b384c0f3acacda276d1338a5))
* shares listing ([a8fc165](https://github.com/filebrowser/filebrowser/commit/a8fc1657b796c5da7190466beff13e680721b6d3))
* touch Redis upload cache key on GetLength to prevent TTL expiry ([#5850](https://github.com/filebrowser/filebrowser/issues/5850)) ([4812536](https://github.com/filebrowser/filebrowser/commit/48125365551ce2b27790aaafd7594cf5ce52f1ba))
* use html/template ([d9f9460](https://github.com/filebrowser/filebrowser/commit/d9f9460c1e51d10a25065e10358c12d5ced66ad9))
## [2.62.1](https://github.com/filebrowser/filebrowser/compare/v2.62.0...v2.62.1) (2026-03-14)
### Bug Fixes
* base url/reverse proxy redirect ([fc80f4f](https://github.com/filebrowser/filebrowser/commit/fc80f4f44c856ddc19df3024c245990fffd55630))
## [2.62.0](https://github.com/filebrowser/filebrowser/compare/v2.61.2...v2.62.0) (2026-03-14)
### Features
* Updates for project File Browser ([#5807](https://github.com/filebrowser/filebrowser/issues/5807)) ([858eb42](https://github.com/filebrowser/filebrowser/commit/858eb426515ec55172e9cca47bdf1e25a0d0d81d))
### Bug Fixes
* allow deleting the user's own account ([#5820](https://github.com/filebrowser/filebrowser/issues/5820)) ([f04af0c](https://github.com/filebrowser/filebrowser/commit/f04af0cac6c808b8e7c9a9651380c252c4de9132))
* around languages ([c21af07](https://github.com/filebrowser/filebrowser/commit/c21af0791a5df458c2ddb81ce9ae44b772b6d82d))
* clean path in patch handler ([4bd7d69](https://github.com/filebrowser/filebrowser/commit/4bd7d69c82163b201a987e99c0c50d7ecc6ee5f1))
* make perm.share depend on share.download ([09a2616](https://github.com/filebrowser/filebrowser/commit/09a26166b4f79446e7174c017380f6db45444e32))
* properly surface config parse errors ([#5822](https://github.com/filebrowser/filebrowser/issues/5822)) ([ef2e999](https://github.com/filebrowser/filebrowser/commit/ef2e9992dc3098f6c4722c2a98966cd8abf8bab5))
* signup handler shouldn't create admins ([a63573b](https://github.com/filebrowser/filebrowser/commit/a63573b67eb302167b4c4f218361a2d0c138deab))
* **tus:** preserve percent-encoded upload paths in Location header ([#5817](https://github.com/filebrowser/filebrowser/issues/5817)) ([0542fc0](https://github.com/filebrowser/filebrowser/commit/0542fc0ba43740c967414eebd156bac86ad80376))
* **upload:** avoid skipping whole folder upload on conflict modal ([#5814](https://github.com/filebrowser/filebrowser/issues/5814)) ([f5f8b60](https://github.com/filebrowser/filebrowser/commit/f5f8b60b331a07729a1fed1ed065cb6fc20930ea))
* **upload:** don't mark every folder-upload file as conflicting ([#5813](https://github.com/filebrowser/filebrowser/issues/5813)) ([6dcef07](https://github.com/filebrowser/filebrowser/commit/6dcef07f40d550acee63dd01e0a3bcf78532f690))
## [2.61.2](https://github.com/filebrowser/filebrowser/compare/v2.61.1...v2.61.2) (2026-03-06)
### Bug Fixes
* added dateFormat to getUserDefaults so this is respected in the … ([#5804](https://github.com/filebrowser/filebrowser/issues/5804)) ([8598db2](https://github.com/filebrowser/filebrowser/commit/8598db2accccf5b87353e5e718b2ad1c946e5c44))
* avoid sending the same name in the file/folder rename modal ([#5806](https://github.com/filebrowser/filebrowser/issues/5806)) ([d7b00ce](https://github.com/filebrowser/filebrowser/commit/d7b00ce5f672b7ce0b26ce31abdfc74f8b00b939))
* **csv-viewer:** add support for missing text encodings in dropdown list ([#5795](https://github.com/filebrowser/filebrowser/issues/5795)) ([4af3f85](https://github.com/filebrowser/filebrowser/commit/4af3f85e64e795e8ae1d87d4caee8185028294ac))
* **frontend:** do not delete original assets ([4d9e6b8](https://github.com/filebrowser/filebrowser/commit/4d9e6b821852203cef67233791a922013bd5b64d))
* **frontend:** input password type ([8ee5576](https://github.com/filebrowser/filebrowser/commit/8ee55761a1aa9bc091d8466c44f03c2043a8ca79))
* validate current password with a modal ([#5805](https://github.com/filebrowser/filebrowser/issues/5805)) ([177c7cf](https://github.com/filebrowser/filebrowser/commit/177c7cfcce36779e2c5ebaa4b59a055dd1e17648))
## [2.61.1](https://github.com/filebrowser/filebrowser/compare/v2.61.0...v2.61.1) (2026-03-04)
+3 -1
View File
@@ -18,8 +18,10 @@ This project is a finished product which fulfills its goal: be a single binary w
- It can take a while until someone gets back to you. Please be patient.
- [Issues](https://github.com/filebrowser/filebrowser/issues) are meant to track bugs. Unrelated issues will be converted into [discussions](https://github.com/filebrowser/filebrowser/discussions).
- No new features will be implemented by maintainers. Pull requests for new features will be reviewed on a case by case basis.
- The priority is triaging issues, addressing security issues and reviewing pull requests meant to solve bugs.
- No new features are planned. Pull requests for new features are not guaranteed to be reviewed.
Please read [@hacdias' personal reflection](https://hacdias.com/2026/03/11/filebrowser/) on the project status.
## Contributing
+2
View File
@@ -168,6 +168,7 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
Sorting: a.Settings.Defaults.Sorting,
Perm: a.Settings.Defaults.Perm,
Commands: a.Settings.Defaults.Commands,
DateFormat: a.Settings.Defaults.DateFormat,
HideDotfiles: a.Settings.Defaults.HideDotfiles,
}
u = a.GetUser(d)
@@ -233,6 +234,7 @@ func (a *HookAuth) GetUser(d *users.User) *users.User {
By: a.Fields.GetString("user.sorting.by", d.Sorting.By),
},
Commands: a.Fields.GetArray("user.commands", d.Commands),
DateFormat: a.Fields.GetBoolean("user.dateFormat", d.DateFormat),
HideDotfiles: a.Fields.GetBoolean("user.hideDotfiles", d.HideDotfiles),
Perm: perms,
LockPassword: true,
+3
View File
@@ -46,6 +46,9 @@ func (a ProxyAuth) createUser(usr users.Store, setting *settings.Settings, srv *
LockPassword: true,
}
setting.Defaults.Apply(user)
user.Perm.Admin = false
user.Perm.Execute = false
user.Commands = []string{}
var userHome string
userHome, err = setting.MakeUserDir(user.Username, user.Scope, srv.Root)
+79
View File
@@ -0,0 +1,79 @@
package auth
import (
"net/http"
"testing"
fberrors "github.com/filebrowser/filebrowser/v2/errors"
"github.com/filebrowser/filebrowser/v2/settings"
"github.com/filebrowser/filebrowser/v2/users"
)
type mockUserStore struct {
users map[string]*users.User
}
func (m *mockUserStore) Get(_ string, id interface{}) (*users.User, error) {
if v, ok := id.(string); ok {
if u, ok := m.users[v]; ok {
return u, nil
}
}
return nil, fberrors.ErrNotExist
}
func (m *mockUserStore) Gets(_ string) ([]*users.User, error) { return nil, nil }
func (m *mockUserStore) Update(_ *users.User, _ ...string) error { return nil }
func (m *mockUserStore) Save(user *users.User) error {
m.users[user.Username] = user
return nil
}
func (m *mockUserStore) Delete(_ interface{}) error { return nil }
func (m *mockUserStore) LastUpdate(_ uint) int64 { return 0 }
func TestProxyAuthCreateUserRestrictsDefaults(t *testing.T) {
t.Parallel()
store := &mockUserStore{users: make(map[string]*users.User)}
srv := &settings.Server{Root: t.TempDir()}
s := &settings.Settings{
Key: []byte("key"),
AuthMethod: MethodProxyAuth,
Defaults: settings.UserDefaults{
Perm: users.Permissions{
Admin: true,
Execute: true,
Create: true,
Rename: true,
Modify: true,
Delete: true,
Share: true,
Download: true,
},
Commands: []string{"git", "ls", "cat", "id"},
},
}
auth := ProxyAuth{Header: "X-Remote-User"}
req, _ := http.NewRequest(http.MethodGet, "/", http.NoBody)
req.Header.Set("X-Remote-User", "newproxyuser")
user, err := auth.Auth(req, store, s, srv)
if err != nil {
t.Fatalf("Auth() error: %v", err)
}
if user.Perm.Admin {
t.Error("auto-provisioned proxy user should not have Admin permission")
}
if user.Perm.Execute {
t.Error("auto-provisioned proxy user should not have Execute permission")
}
if len(user.Commands) != 0 {
t.Errorf("auto-provisioned proxy user should have empty Commands, got %v", user.Commands)
}
if !user.Perm.Create {
t.Error("auto-provisioned proxy user should retain Create permission from defaults")
}
}
+2 -1
View File
@@ -99,7 +99,7 @@ func getProxyAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (a
return nil, err
}
if header == "" && defaultAuther != nil {
if header == "" && defaultAuther != nil {
header = defaultAuther["header"].(string)
}
@@ -236,6 +236,7 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut
fmt.Fprintln(w, "\nDefaults:")
fmt.Fprintf(w, "\tScope:\t%s\n", set.Defaults.Scope)
fmt.Fprintf(w, "\tDateFormat:\t%t\n", set.Defaults.DateFormat)
fmt.Fprintf(w, "\tHideDotfiles:\t%t\n", set.Defaults.HideDotfiles)
fmt.Fprintf(w, "\tLocale:\t%s\n", set.Defaults.Locale)
fmt.Fprintf(w, "\tView mode:\t%s\n", set.Defaults.ViewMode)
+2
View File
@@ -138,6 +138,8 @@ func getUserDefaults(flags *pflag.FlagSet, defaults *settings.UserDefaults, all
defaults.Sorting.By, err = flags.GetString(flag.Name)
case "sorting.asc":
defaults.Sorting.Asc, err = flags.GetBool(flag.Name)
case "dateFormat":
defaults.DateFormat, err = flags.GetBool(flag.Name)
case "hideDotfiles":
defaults.HideDotfiles, err = flags.GetBool(flag.Name)
}
+2 -1
View File
@@ -118,7 +118,8 @@ func initViper(cmd *cobra.Command) (*viper.Viper, error) {
// Read in configuration
if err := v.ReadInConfig(); err != nil {
if errors.Is(err, viper.ConfigParseError{}) {
if errors.As(err, &viper.ConfigParseError{}) {
return nil, err
}
-17
View File
@@ -1,17 +0,0 @@
# Run using:
# docker compose -f compose.yaml -f compose.redis.yaml up --build
services:
redis:
container_name: redis
image: redis:latest
networks:
- filebrowser
command:
- sh
- -c
- |
cat > /tmp/users.acl <<EOF
user default on >filebrowser ~* +@all
EOF
redis-server --aclfile /tmp/users.acl
+1 -6
View File
@@ -1,12 +1,7 @@
# Run using:
# docker compose up --build
services:
filebrowser:
container_name: filebrowser
build:
dockerfile: Dockerfile
context: .
image: filebrowser/filebrowser:latest
networks:
- filebrowser
ports:
+2 -1
View File
@@ -21,8 +21,9 @@ var (
ErrPermissionDenied = errors.New("permission denied")
ErrInvalidRequestParams = errors.New("invalid request params")
ErrSourceIsParent = errors.New("source is parent")
ErrRootUserDeletion = errors.New("user with id 1 can't be deleted")
ErrRootUserDeletion = errors.New("the sole admin can't be deleted")
ErrCurrentPasswordIncorrect = errors.New("the current password is incorrect")
ErrShareRequiresDownload = errors.New("permission to share requires permission to download")
)
type ErrShortPassword struct {
+7 -5
View File
@@ -14,7 +14,8 @@
"typecheck": "vue-tsc -p ./tsconfig.app.json --noEmit",
"lint": "eslint src/",
"lint:fix": "eslint --fix src/",
"format": "prettier --write ."
"format": "prettier --write .",
"test": "vitest run"
},
"dependencies": {
"@chenfengyuan/vue-number-input": "^2.0.1",
@@ -54,11 +55,11 @@
"@types/lodash-es": "^4.17.12",
"@types/node": "^24.10.1",
"@typescript-eslint/eslint-plugin": "^8.37.0",
"@vitejs/plugin-legacy": "^7.2.1",
"@vitejs/plugin-legacy": "^8.0.0",
"@vitejs/plugin-vue": "^6.0.1",
"@vue/eslint-config-prettier": "^10.2.0",
"@vue/eslint-config-typescript": "^14.6.0",
"@vue/tsconfig": "^0.8.1",
"@vue/tsconfig": "^0.9.0",
"autoprefixer": "^10.4.21",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.5",
@@ -68,9 +69,10 @@
"prettier": "^3.6.2",
"terser": "^5.43.1",
"typescript": "^5.9.3",
"vite": "^7.2.2",
"vite": "^8.0.0",
"vite-plugin-compression2": "^2.3.1",
"vitest": "^4.1.0",
"vue-tsc": "^3.1.3"
},
"packageManager": "pnpm@10.30.3+sha512.c961d1e0a2d8e354ecaa5166b822516668b7f44cb5bd95122d590dd81922f606f5473b6d23ec4a5be05e7fcd18e8488d47d978bbe981872f1145d06e9a740017"
"packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
}
+1094 -505
View File
File diff suppressed because it is too large Load Diff
+142
View File
@@ -0,0 +1,142 @@
<script setup lang="ts">
import { ref, watch, onMounted, onBeforeUnmount } from "vue";
import { vClickOutside } from "@/utils/index";
const props = withDefaults(
defineProps<{
position?: "top-left" | "bottom-left" | "bottom-right" | "top-right";
closeOnClick?: boolean;
}>(),
{
position: "bottom-right",
closeOnClick: true,
}
);
const isOpen = defineModel<boolean>();
const triggerRef = ref<HTMLElement | null>(null);
const listRef = ref<HTMLElement | null>(null);
const dropdownStyle = ref<Record<string, string>>({});
const updatePosition = () => {
if (!isOpen.value || !triggerRef.value) return;
const rect = triggerRef.value.getBoundingClientRect();
dropdownStyle.value = {
position: "fixed",
top: props.position.includes("bottom")
? `${rect.bottom + 2}px`
: `${rect.top}px`,
left: props.position.includes("left") ? `${rect.left}px` : "auto",
right: props.position.includes("right")
? `${window.innerWidth - rect.right}px`
: "auto",
zIndex: "11000",
};
};
watch(isOpen, (open) => {
if (open) {
updatePosition();
}
});
const onWindowChange = () => {
updatePosition();
};
const closeDropdown = (e: Event) => {
if (
e.target instanceof HTMLElement &&
listRef.value?.contains(e.target) &&
!props.closeOnClick
) {
return;
}
isOpen.value = false;
};
onMounted(() => {
window.addEventListener("resize", onWindowChange);
window.addEventListener("scroll", onWindowChange, true);
});
onBeforeUnmount(() => {
window.removeEventListener("resize", onWindowChange);
window.removeEventListener("scroll", onWindowChange, true);
});
</script>
<script lang="ts">
export default {
directives: {
clickOutside: vClickOutside,
},
};
</script>
<template>
<div
class="dropdown-modal-container"
v-click-outside="closeDropdown"
ref="triggerRef"
>
<button @click="isOpen = !isOpen" class="dropdown-modal-trigger">
<slot></slot>
<i class="material-icons">chevron_right</i>
</button>
<teleport to="body">
<div
ref="listRef"
class="dropdown-modal-list"
:class="{ 'dropdown-modal-open': isOpen }"
:style="dropdownStyle"
>
<div>
<slot name="list"></slot>
</div>
</div>
</teleport>
</div>
</template>
<style scoped>
.dropdown-modal-trigger {
background: var(--surfacePrimary);
color: var(--textSecondary);
border: 1px solid var(--borderPrimary);
border-radius: 0.1em;
padding: 0.5em 1em;
transition: 0.2s ease all;
margin: 0;
display: flex;
justify-content: space-between;
gap: 1rem;
align-items: center;
}
.dropdown-modal-trigger > i {
transform: rotate(90deg);
}
.dropdown-modal-list {
padding: 0.25rem;
background-color: var(--surfacePrimary);
color: var(--textSecondary);
display: none;
border: 1px solid var(--borderPrimary);
border-radius: 0.1em;
}
.dropdown-modal-list > div {
max-height: 450px;
padding: 0.25rem;
}
.dropdown-modal-open {
display: block;
}
</style>
+92 -15
View File
@@ -21,19 +21,37 @@
</div>
<div class="header-select" v-if="isEncodedContent">
<label for="fileEncoding">{{ $t("files.fileEncoding") }}</label>
<select
id="fileEncoding"
class="input input--block"
v-model="selectedEncoding"
<DropdownModal
v-model="isEncondingDropdownOpen"
:close-on-click="false"
>
<option
v-for="encoding in availableEncodings"
:value="encoding"
:key="encoding"
>
{{ encoding }}
</option>
</select>
<div>
<span class="selected-encoding">{{ selectedEncoding }}</span>
</div>
<template v-slot:list>
<input
v-model="encodingSearch"
:placeholder="$t('search.search')"
class="input input--block"
name="encoding"
/>
<div class="encoding-list">
<div v-if="encodingList.length == 0" class="message">
<i class="material-icons">sentiment_dissatisfied</i>
<span>{{ $t("files.lonely") }}</span>
</div>
<button
v-for="encoding in encodingList"
:value="encoding"
:key="encoding"
class="encoding-button"
@click="selectedEncoding = encoding"
>
{{ encoding }}
</button>
</div>
</template>
</DropdownModal>
</div>
</div>
<div v-if="displayError" class="csv-error">
@@ -74,10 +92,11 @@
</template>
<script setup lang="ts">
import { computed, ref, watchEffect } from "vue";
import { computed, ref, watch, watchEffect } from "vue";
import { parse } from "csv-parse/browser/esm";
import { useI18n } from "vue-i18n";
import { availableEncodings, decode } from "@/utils/encodings";
import DropdownModal from "../DropdownModal.vue";
const { t } = useI18n({});
@@ -90,6 +109,16 @@ const props = withDefaults(defineProps<Props>(), {
error: "",
});
const isEncondingDropdownOpen = ref(false);
const encodingSearch = ref<string>("");
const encodingList = computed(() => {
return availableEncodings.filter((e) =>
e.toLowerCase().includes(encodingSearch.value.toLowerCase())
);
});
const columnSeparator = ref([",", ";"]);
const selectedEncoding = ref("utf-8");
@@ -128,6 +157,11 @@ watchEffect(() => {
);
}
});
watch(selectedEncoding, () => {
isEncondingDropdownOpen.value = false;
encodingSearch.value = "";
});
</script>
<style scoped>
@@ -271,14 +305,21 @@ watchEffect(() => {
align-items: center;
gap: 0.5rem;
margin-bottom: 0.5rem;
flex-direction: column;
@media (width >= 640px) {
flex-direction: row;
}
}
.header-select > label {
font-size: small;
max-width: 80px;
@media (width >= 640px) {
max-width: 70px;
}
}
.header-select > select {
.header-select > select,
.header-select > div {
margin-bottom: 0;
}
@@ -286,4 +327,40 @@ watchEffect(() => {
font-size: 1.2rem;
color: var(--blue);
}
.encoding-list {
max-height: 300px;
min-width: 120px;
overflow: auto;
overscroll-behavior: contain;
-webkit-overflow-scrolling: touch;
touch-action: pan-y;
}
.encoding-button {
background-color: transparent;
border: none;
outline: none;
padding: 0.25rem 0.5rem;
color: var(--textPrimary);
text-align: left;
cursor: pointer;
border-radius: 0.2rem;
white-space: nowrap;
display: block;
width: 100%;
}
.encoding-button:hover {
background-color: var(--surfaceSecondary);
}
.selected-encoding {
white-space: nowrap;
text-overflow: ellipsis;
}
.message {
font-size: 1.25em;
}
</style>
@@ -194,8 +194,11 @@ const drop = async (event: Event) => {
const baseItems = (await api.fetch(path)).items;
const action = (overwrite?: boolean, rename?: boolean) => {
api
.move(items, overwrite, rename)
const action =
(event as KeyboardEvent).ctrlKey || (event as KeyboardEvent).metaKey
? api.copy
: api.move;
action(items, overwrite, rename)
.then(() => {
fileStore.reload = true;
})
+10 -3
View File
@@ -147,26 +147,33 @@ interface LanguageImports {
}
const languageImports: LanguageImports = {
he: () => import("video.js/dist/lang/he.json"),
hu: () => import("video.js/dist/lang/hu.json"),
ar: () => import("video.js/dist/lang/ar.json"),
bg: () => import("video.js/dist/lang/bg.json"),
cs: () => import("video.js/dist/lang/cs.json"),
de: () => import("video.js/dist/lang/de.json"),
el: () => import("video.js/dist/lang/el.json"),
en: () => import("video.js/dist/lang/en.json"),
es: () => import("video.js/dist/lang/es.json"),
fr: () => import("video.js/dist/lang/fr.json"),
he: () => import("video.js/dist/lang/he.json"),
hr: () => import("video.js/dist/lang/hr.json"),
hu: () => import("video.js/dist/lang/hu.json"),
it: () => import("video.js/dist/lang/it.json"),
ja: () => import("video.js/dist/lang/ja.json"),
ko: () => import("video.js/dist/lang/ko.json"),
lv: () => import("video.js/dist/lang/lv.json"),
nb: () => import("video.js/dist/lang/nb.json"),
nl: () => import("video.js/dist/lang/nl.json"),
"nl-be": () => import("video.js/dist/lang/nl.json"),
pl: () => import("video.js/dist/lang/pl.json"),
"pt-br": () => import("video.js/dist/lang/pt-BR.json"),
pt: () => import("video.js/dist/lang/pt-PT.json"),
"pt-pt": () => import("video.js/dist/lang/pt-PT.json"),
ro: () => import("video.js/dist/lang/ro.json"),
ru: () => import("video.js/dist/lang/ru.json"),
sk: () => import("video.js/dist/lang/sk.json"),
tr: () => import("video.js/dist/lang/tr.json"),
uk: () => import("video.js/dist/lang/uk.json"),
vi: () => import("video.js/dist/lang/vi.json"),
"zh-cn": () => import("video.js/dist/lang/zh-CN.json"),
"zh-tw": () => import("video.js/dist/lang/zh-TW.json"),
};
@@ -0,0 +1,58 @@
<template>
<div class="card floating">
<div class="card-title">
<h2>{{ $t("prompts.currentPassword") }}</h2>
</div>
<div class="card-content">
<p>
{{ $t("prompts.currentPasswordMessage") }}
</p>
<input
id="focus-prompt"
class="input input--block"
type="password"
@keyup.enter="submit"
v-model="password"
/>
</div>
<div class="card-action">
<button
class="button button--flat button--grey"
@click="cancel"
:aria-label="$t('buttons.cancel')"
:title="$t('buttons.cancel')"
>
{{ $t("buttons.cancel") }}
</button>
<button
@click="submit"
class="button button--flat"
type="submit"
:aria-label="$t('buttons.ok')"
:title="$t('buttons.ok')"
>
{{ $t("buttons.ok") }}
</button>
</div>
</div>
</template>
<script setup lang="ts">
import { ref } from "vue";
import { useLayoutStore } from "@/stores/layout";
const layoutStore = useLayoutStore();
const { currentPrompt } = layoutStore;
const password = ref("");
const submit = (event: Event) => {
currentPrompt?.confirm(event, password.value);
};
const cancel = () => {
layoutStore.closeHovers();
};
</script>
@@ -28,6 +28,7 @@ import ShareDelete from "./ShareDelete.vue";
import Upload from "./Upload.vue";
import DiscardEditorChanges from "./DiscardEditorChanges.vue";
import ResolveConflict from "./ResolveConflict.vue";
import CurrentPassword from "./CurrentPassword.vue";
const layoutStore = useLayoutStore();
@@ -50,6 +51,7 @@ const components = new Map<string, any>([
["deleteUser", DeleteUser],
["discardEditorChanges", DiscardEditorChanges],
["resolve-conflict", ResolveConflict],
["current-password", CurrentPassword],
]);
const modal = computed(() => {
+14 -10
View File
@@ -6,7 +6,7 @@
<div class="card-content">
<p>
{{ $t("prompts.renameMessage") }} <code>{{ oldName() }}</code
{{ $t("prompts.renameMessage") }} <code>{{ oldName }}</code
>:
</p>
<input
@@ -33,6 +33,7 @@
type="submit"
:aria-label="$t('buttons.rename')"
:title="$t('buttons.rename')"
:disabled="name === '' || name === oldName"
>
{{ $t("buttons.rename") }}
</button>
@@ -56,7 +57,7 @@ export default {
};
},
created() {
this.name = this.oldName();
this.name = this.oldName;
},
inject: ["$showError"],
computed: {
@@ -67,25 +68,28 @@ export default {
"isListing",
]),
...mapWritableState(useFileStore, ["reload", "preselect"]),
},
methods: {
...mapActions(useLayoutStore, ["closeHovers"]),
cancel: function () {
this.closeHovers();
},
oldName: function () {
oldName() {
if (!this.isListing) {
return this.req.name;
}
if (this.selectedCount === 0 || this.selectedCount > 1) {
// This shouldn't happen.
return;
return "";
}
return this.req.items[this.selected[0]].name;
},
},
methods: {
...mapActions(useLayoutStore, ["closeHovers"]),
cancel: function () {
this.closeHovers();
},
submit: async function () {
if (this.name === "" || this.name === this.oldName) {
return;
}
let oldLink = "";
let newLink = "";
@@ -34,9 +34,10 @@ export default {
no: "Norsk",
nl: "Nederlands (Nederland)",
"nl-be": "Nederlands (België)",
lv: "Latviešu",
pl: "Polski",
"pt-br": "Português (Brasil)",
pt: "Português (Portugal)",
"pt-pt": "Português (Portugal)",
ro: "Romanian",
ru: "Русский",
sk: "Slovenčina",
@@ -17,7 +17,11 @@
{{ $t("settings.perm.delete") }}
</p>
<p>
<input type="checkbox" :disabled="admin" v-model="perm.download" />
<input
type="checkbox"
:disabled="admin || perm.share"
v-model="perm.download"
/>
{{ $t("settings.perm.download") }}
</p>
<p>
@@ -61,5 +65,15 @@ export default {
},
isExecEnabled: () => enableExec,
},
watch: {
perm: {
deep: true,
handler() {
if (this.perm.share === true) {
this.perm.download = true;
}
},
},
},
};
</script>
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "الصور",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Изображения",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Imatges",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Obrázky",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Dateien im Zielordner",
"override": "Überschreiben",
"skip": "Überspringen",
"forbiddenError": "Zugriff verweigert"
"forbiddenError": "Zugriff verweigert",
"currentPassword": "Dein Passwort",
"currentPasswordMessage": "Gib dein Passwort ein, um diese Aktion zu bestätigen."
},
"search": {
"images": "Bilder",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Εικόνες",
+4 -2
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Images",
@@ -243,7 +245,7 @@
"execute": "Execute commands",
"modify": "Edit files",
"rename": "Rename or move files and directories",
"share": "Share files"
"share": "Share files (require download permission)"
},
"permissions": "Permissions",
"permissionsHelp": "You can set the user to be an administrator or choose the permissions individually. If you select \"Administrator\", all of the other options will be automatically checked. The management of users remains a privilege of an administrator.\n",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Imágenes",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "تصاویر",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Images",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "תמונות",
+21 -19
View File
@@ -42,17 +42,17 @@
"update": "Ažuriraj",
"upload": "Prenesi",
"openFile": "Otvori datoteku",
"openDirect": "View raw",
"openDirect": "Pregled neobrađenog",
"discardChanges": "Odbaci",
"stopSearch": "Stop searching",
"stopSearch": "Prestanak pretraživanja",
"saveChanges": "Spremi promjene",
"editAsText": "Uredi kao tekst",
"increaseFontSize": "Povećaj veličinu fonta",
"decreaseFontSize": "Smanji veličinu fonta",
"overrideAll": "Replace all files in destination folder",
"skipAll": "Skip all conflicting files",
"renameAll": "Rename all files (create a copy)",
"singleDecision": "Decide for each conflicting file"
"overrideAll": "Zamijeni sve datoteke u destinacijskoj mapi",
"skipAll": "Preskoči sve konfliktirajuće datoteke",
"renameAll": "Preimenuj sve datoteke (stvori kopiju)",
"singleDecision": "Odluči za svaku konfliktirajuću datoteku"
},
"download": {
"downloadFile": "Preuzmi Datoteku",
@@ -94,7 +94,7 @@
"semicolon": "Točka zarez (;)",
"both": "I (,) i (;)"
},
"fileEncoding": "File Encoding"
"fileEncoding": "Kodiranje datoteka"
},
"help": {
"click": "odaberi datoteku ili mapu",
@@ -166,16 +166,18 @@
"optionalPassword": "Opcionalna lozinka",
"resolution": "Rezolucija",
"discardEditorChanges": "Jeste li sigurni da želite odbaciti promjene koje ste napravili?",
"replaceOrSkip": "Replace or skip files",
"resolveConflict": "Which files do you want to keep?",
"singleConflictResolve": "If you select both versions, a number will be added to the name of the copied file.",
"fastConflictResolve": "The destination folder there are {count} files with same name.",
"uploadingFiles": "Uploading files",
"filesInOrigin": "Files in origin",
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"replaceOrSkip": "Zamijeni ili preskoči datoteke",
"resolveConflict": "Koje datoteke želite sačuvati?",
"singleConflictResolve": "Ako odaberete obje verzije, u ime kopirane datoteke bit će dodan broj.",
"fastConflictResolve": "Destinacijska mapa sadrži {count} istoimenih datoteka.",
"uploadingFiles": "Prenošenje datoteka",
"filesInOrigin": "Datoteke u izvornoj mapi",
"filesInDest": "Datoteke u destinacijskoj mapi",
"override": "Prebrisivanje",
"skip": "Preskoči",
"forbiddenError": "Greška zabrane pristupa",
"currentPassword": "Vaša lozinka",
"currentPasswordMessage": "Unesite Vašu lozinku da biste validirali ovu akciju."
},
"search": {
"images": "Slike",
@@ -248,7 +250,7 @@
"permissions": "Dopuštenja",
"permissionsHelp": "Korisnika možete postaviti administratorom ili odabrati dopuštenja individualno. Odabirom na \"Administrator\", sve druge opcije bit će automatski odabrane. Upravljanje korisnicima ostaje privilegija administratora.\n",
"profileSettings": "Postavke profila",
"redirectAfterCopyMove": "Redirect to destination after copy/move",
"redirectAfterCopyMove": "Preusmjeri na destinaciju nakon kopiranja/premještanja",
"ruleExample1": "onemogućava pristup svakoj datoteci koja započinje točkom (poput .git, .gitignore) u svakoj mapi.\n",
"ruleExample2": "blokira pristup datoteci naziva Caddyfile na korijenu opsega.",
"rules": "Pravila",
@@ -276,7 +278,7 @@
"userUpdated": "Korisnik ažuriran!",
"username": "Korisničko ime",
"users": "Korisnici",
"currentPassword": "Your Current Password"
"currentPassword": "Vaša trenutna lozinka"
},
"sidebar": {
"help": "Pomoć",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Képek",
+17 -7
View File
@@ -3,6 +3,7 @@ import { createI18n } from "vue-i18n";
import("dayjs/locale/ar");
import("dayjs/locale/bg");
import("dayjs/locale/ca");
import("dayjs/locale/cs");
import("dayjs/locale/de");
import("dayjs/locale/el");
@@ -16,6 +17,7 @@ import("dayjs/locale/is");
import("dayjs/locale/it");
import("dayjs/locale/ja");
import("dayjs/locale/ko");
import("dayjs/locale/lv");
import("dayjs/locale/nb");
import("dayjs/locale/nl");
import("dayjs/locale/nl-be");
@@ -41,6 +43,18 @@ export function detectLocale() {
// https://developer.mozilla.org/en-US/docs/Web/API/Navigator/language
let locale = navigator.language.toLowerCase();
switch (true) {
case /^ar\b/.test(locale):
locale = "ar";
break;
case /^bg\b/.test(locale):
locale = "bg";
break;
case /^cs\b/.test(locale):
locale = "cs";
break;
case /^lv\b/.test(locale):
locale = "lv";
break;
case /^he\b/.test(locale):
locale = "he";
break;
@@ -50,9 +64,6 @@ export function detectLocale() {
case /^hu\b/.test(locale):
locale = "hu";
break;
case /^ar\b/.test(locale):
locale = "ar";
break;
case /^el.*/i.test(locale):
locale = "el";
break;
@@ -74,8 +85,9 @@ export function detectLocale() {
case /^pt-br\b/.test(locale):
locale = "pt-br";
break;
case /^pt-pt\b/.test(locale):
case /^pt\b/.test(locale):
locale = "pt";
locale = "pt-pt";
break;
case /^ja\b/.test(locale):
locale = "ja";
@@ -128,9 +140,7 @@ export function detectLocale() {
case /^no\b/.test(locale):
locale = "no";
break;
case /^bg\b/.test(locale):
locale = "bg";
break;
default:
locale = "en";
}
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Myndir",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Immagini",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "画像",
+16 -14
View File
@@ -49,10 +49,10 @@
"editAsText": "텍스트로 편집",
"increaseFontSize": "글꼴 크기 증가",
"decreaseFontSize": "글꼴 크기 감소",
"overrideAll": "Replace all files in destination folder",
"skipAll": "Skip all conflicting files",
"renameAll": "Rename all files (create a copy)",
"singleDecision": "Decide for each conflicting file"
"overrideAll": "대상 폴더의 모든 파일을 대체",
"skipAll": "충돌하는 모든 파일을 건너뛰기",
"renameAll": "모든 파일의 이름 변경 (복사본 생성)",
"singleDecision": "충돌하는 각 파일을 확인"
},
"download": {
"downloadFile": "파일 다운로드",
@@ -166,16 +166,18 @@
"optionalPassword": "비밀번호 (선택)",
"resolution": "해상도",
"discardEditorChanges": "변경 사항을 취소하시겠습니까?",
"replaceOrSkip": "Replace or skip files",
"resolveConflict": "Which files do you want to keep?",
"singleConflictResolve": "If you select both versions, a number will be added to the name of the copied file.",
"fastConflictResolve": "The destination folder there are {count} files with same name.",
"uploadingFiles": "Uploading files",
"filesInOrigin": "Files in origin",
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"replaceOrSkip": "파일 대체 또는 건너뛰기",
"resolveConflict": "어떤 파일을 유지하시겠습니까?",
"singleConflictResolve": "모든 버전을 선택하면 복사한 파일의 이름에 번호를 추가합니다.",
"fastConflictResolve": "대상 폴더에 같은 이름을 가진 파일이 {count}개 있습니다.",
"uploadingFiles": "파일 업로드 중",
"filesInOrigin": "원본 파일",
"filesInDest": "대상 경로의 파일",
"override": "덮어쓰기",
"skip": "건너뛰기",
"forbiddenError": "권한 오류",
"currentPassword": "기존 비밀번호",
"currentPasswordMessage": "기존 비밀번호를 입력해 이 동작을 확인하십시오."
},
"search": {
"images": "이미지",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Attēli",
-304
View File
@@ -1,304 +0,0 @@
{
"buttons": {
"cancel": "Atcelt",
"clear": "Tīrs",
"close": "Aizvērt",
"continue": "Turpināt",
"copy": "Kopēt",
"copyFile": "Kopēt failu",
"copyToClipboard": "Kopēt starpliktuvē",
"copyDownloadLinkToClipboard": "Kopēt lejupielādes saiti starpliktuvē",
"create": "Izveidot",
"delete": "Dzēst",
"download": "Lejupielādēt",
"file": "Fails",
"folder": "Mape",
"fullScreen": "Pārslēgt pilnekrāna režīmu",
"hideDotfiles": "Slēpt punktfailus",
"info": "Informācija",
"more": "Vairāk",
"move": "Pārvietot",
"moveFile": "Pārvietot failu",
"new": "Jauns",
"next": "Nākamais",
"ok": "Labi",
"permalink": "Iegūt pastāvīgo saiti",
"previous": "Iepriekšējais",
"preview": "Priekšskatījums",
"publish": "Publicēt",
"rename": "Pārdēvēt",
"replace": "Aizstāt",
"reportIssue": "Ziņot par problēmu",
"save": "Saglabāt",
"schedule": "Grafiks",
"search": "Meklēt",
"select": "Izvēlieties",
"selectMultiple": "Izvēlieties vairākus",
"share": "Dalīties",
"shell": "Pārslēgt apvalku",
"submit": "Iesniegt",
"switchView": "Pārslēgt skatu",
"toggleSidebar": "Pārslēgt sānjoslu",
"update": "Atjaunināt",
"upload": "Augšupielādēt",
"openFile": "Atvērt failu",
"openDirect": "View raw",
"discardChanges": "Izmest",
"stopSearch": "Beigt meklēšanu",
"saveChanges": "Saglabāt izmaiņas",
"editAsText": "Rediģēt kā tekstu",
"increaseFontSize": "Palieliniet fonta lielumu",
"decreaseFontSize": "Samaziniet fonta lielumu",
"overrideAll": "Replace all files in destination folder",
"skipAll": "Skip all conflicting files",
"renameAll": "Rename all files (create a copy)",
"singleDecision": "Decide for each conflicting file"
},
"download": {
"downloadFile": "Lejupielādēt failu",
"downloadFolder": "Lejupielādēt mapi",
"downloadSelected": "Lejupielādēt atlasīto"
},
"upload": {
"abortUpload": "Vai tiešām vēlaties pārtraukt?"
},
"errors": {
"forbidden": "Jums nav atļaujas piekļūt šim.",
"internal": "Kaut kas tiešām nogāja greizi.",
"notFound": "Šo atrašanās vietu nevar sasniegt.",
"connection": "Ar serveri nevar sazināties."
},
"files": {
"body": "Ķermenis",
"closePreview": "Aizvērt priekšskatījumu",
"files": "Faili",
"folders": "Mapes",
"home": "Sākums",
"lastModified": "Pēdējoreiz modificēts",
"loading": "Notiek ielāde...",
"lonely": "Šeit ir tukša vieta...",
"metadata": "Metadati",
"multipleSelectionEnabled": "Vairākas atlases ir iespējotas",
"name": "Vārds",
"size": "Izmērs",
"sortByLastModified": "Kārtot pēc pēdējās modifikācijas",
"sortByName": "Kārtot pēc nosaukuma",
"sortBySize": "Kārtot pēc izmēra",
"noPreview": "Šim failam nav pieejams priekšskatījums.",
"csvTooLarge": "CSV fails ir pārāk liels priekšskatīšanai (>5 MB). Lūdzu, lejupielādējiet to, lai skatītu",
"csvLoadFailed": "Neizdevās ielādēt CSV failu.",
"showingRows": "Rāda {count} rindu(as)",
"columnSeparator": "Kolonnu atdalītājs",
"csvSeparators": {
"comma": "Komats (,)",
"semicolon": "Semikols (;)",
"both": "Gan (,) gan (;)"
},
"fileEncoding": "File Encoding"
},
"help": {
"click": "atlasiet failu vai direktoriju",
"ctrl": {
"click": "atlasīt vairākus failus vai direktorijus",
"f": "atver meklēšanu",
"s": "saglabājiet failu vai lejupielādējiet direktoriju, kurā atrodaties"
},
"del": "dzēst atlasītos vienumus",
"doubleClick": "atvērt failu vai direktoriju",
"esc": "notīrīt atlasi un/vai aizvērt uzvedni",
"f1": "šo informāciju",
"f2": "pārdēvēt failu",
"help": "Palīdzība"
},
"login": {
"createAnAccount": "Izveidot kontu",
"loginInstead": "Jau ir konts",
"password": "Parole",
"passwordConfirm": "Paroles apstiprināšana",
"passwordsDontMatch": "Paroles nesakrīt",
"signup": "Reģistrēšanās",
"submit": "Pieteikties",
"username": "Lietotājvārds",
"usernameTaken": "Lietotājvārds jau aizņemts",
"wrongCredentials": "Nepareizi akreditācijas dati",
"passwordTooShort": "Parolei jābūt vismaz {min} rakstzīmju garai",
"logout_reasons": {
"inactivity": "Jūs esat atteicies no sistēmas neaktivitātes dēļ."
}
},
"permanent": "Pastāvīgs",
"prompts": {
"copy": "Kopēt",
"copyMessage": "Izvēlieties atrašanās vietu, uz kuru kopēt failus:",
"currentlyNavigating": "Pašlaik navigācija:",
"deleteMessageMultiple": "Vai tiešām vēlaties dzēst {count} failu(s)?",
"deleteMessageSingle": "Vai tiešām vēlaties dzēst šo failu/mapi?",
"deleteMessageShare": "Vai tiešām vēlaties dzēst šo koplietojumu({path})?",
"deleteUser": "Vai tiešām vēlaties dzēst šo lietotāju?",
"deleteTitle": "Dzēst failus",
"displayName": "Displeja nosaukums:",
"download": "Lejupielādēt failus",
"downloadMessage": "Izvēlieties formātu, kuru vēlaties lejupielādēt.",
"error": "Kaut kas nogāja greizi",
"fileInfo": "Informācija par failu",
"filesSelected": "{count} atlasīti faili",
"lastModified": "Pēdējās izmaiņas",
"move": "Pārvietot",
"moveMessage": "Izvēlieties jaunu mājvietu failam(iem)/mapei(ēm):",
"newArchetype": "Izveidojiet jaunu ierakstu, pamatojoties uz arhtipu. Jūsu fails tiks izveidots satura mapē.",
"newDir": "Jauna direktorija",
"newDirMessage": "Nosaukums savai jaunajai direktorijai.",
"newFile": "Jauns fails",
"newFileMessage": "Nosauciet savu jauno failu.",
"numberDirs": "Katalogu skaits",
"numberFiles": "Failu skaits",
"rename": "Pārdēvēt",
"renameMessage": "Ievietojiet jaunu nosaukumu",
"replace": "Aizstāt",
"replaceMessage": "Vienam no failiem, kurus mēģināt augšupielādēt, ir konfliktējošs nosaukums. Vai vēlaties izlaist šo failu un turpināt augšupielādi vai aizstāt esošo?\n",
"schedule": "Grafiks",
"scheduleMessage": "Izvēlieties datumu un laiku, lai ieplānotu šī ieraksta publicēšanu.",
"show": "Rādīt",
"size": "Izmērs",
"upload": "Augšupielādēt",
"uploadFiles": "Notiek {files} failu augšupielāde...",
"uploadMessage": "Atlasiet augšupielādes opciju.",
"optionalPassword": "Izvēles parole",
"resolution": "Izšķirtspēja",
"discardEditorChanges": "Vai tiešām vēlaties atmest veiktās izmaiņas?",
"replaceOrSkip": "Replace or skip files",
"resolveConflict": "Which files do you want to keep?",
"singleConflictResolve": "If you select both versions, a number will be added to the name of the copied file.",
"fastConflictResolve": "The destination folder there are {count} files with same name.",
"uploadingFiles": "Uploading files",
"filesInOrigin": "Files in origin",
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
},
"search": {
"images": "Attēli",
"music": "Mūzika",
"pdf": "PDF",
"pressToSearch": "Nospiediet taustiņu Enter, lai meklētu...",
"search": "Meklē...",
"typeToSearch": "Ierakstiet, lai meklētu...",
"types": "Veidi",
"video": "Video"
},
"settings": {
"aceEditorTheme": "Ace redaktora tēma",
"admin": "Admin",
"administrator": "Administrator",
"allowCommands": "Izpildīt komandas",
"allowEdit": "Rediģēt, pārdēvēt un dzēst failus vai direktorijus",
"allowNew": "Izveidojiet jaunus failus un direktorijus",
"allowPublish": "Publicēt jaunus ierakstus un lapas",
"allowSignup": "Atļaut lietotājiem reģistrēties",
"hideLoginButton": "Paslēpt pieteikšanās pogu publiskajās lapās",
"avoidChanges": "(atstājiet tukšu, lai izvairītos no izmaiņām)",
"branding": "Zīmols",
"brandingDirectoryPath": "Zīmola direktorijas ceļš",
"brandingHelp": "Jūs varat pielāgot sava failu pārlūka instances izskatu un darbību, mainot tās nosaukumu, aizstājot logotipu, pievienojot pielāgotus stilus un pat atspējojot ārējās saites uz GitHub.\nLai iegūtu plašāku informāciju par pielāgotu zīmola veidošanu, lūdzu, skatiet {0}.",
"changePassword": "Mainīt paroli",
"commandRunner": "Komandu skrējējs",
"commandRunnerHelp": "Šeit varat iestatīt komandas, kas tiek izpildītas nosauktajos notikumos. Katrā rindā jāraksta pa vienai. Būs pieejami vides mainīgie {0} un {1}, kas ir {0} relatīvi pret {1}. Lai iegūtu plašāku informāciju par šo funkciju un pieejamajiem vides mainīgajiem, lūdzu, izlasiet {2}.",
"commandsUpdated": "Komandas atjauninātas!",
"createUserDir": "Automātiski izveidot lietotāja mājas direktoriju, pievienojot jaunu lietotāju",
"minimumPasswordLength": "Minimālais paroles garums",
"tusUploads": "Sadalītas augšupielādes",
"tusUploadsHelp": "Failu pārlūks atbalsta failu augšupielādi fragmentos, ļaujot izveidot efektīvu, uzticamu, atsākamu un fragmentos sadalītu failu augšupielādi pat neuzticamos tīklos.",
"tusUploadsChunkSize": "Norāda pieprasījuma maksimālo izmēru (mazākiem augšupielādes apjomiem tiks izmantota tieša augšupielāde). Varat ievadīt vienkāršu veselu skaitli, kas apzīmē baitu izmēru, vai virkni, piemēram, 10 MB, 1 GB utt.",
"tusUploadsRetryCount": "Atkārtotu mēģinājumu skaits, kas jāveic, ja fragmenta augšupielāde neizdodas.",
"userHomeBasePath": "Lietotāja mājas direktoriju bāzes ceļš",
"userScopeGenerationPlaceholder": "Darbības joma tiks ģenerēta automātiski",
"createUserHomeDirectory": "Izveidojiet lietotāja mājas direktoriju",
"customStylesheet": "Pielāgota stila lapa",
"defaultUserDescription": "Šie ir noklusējuma iestatījumi jaunajiem lietotājiem.",
"disableExternalLinks": "Atspējot ārējās saites (izņemot dokumentāciju)",
"disableUsedDiskPercentage": "Atspējot izmantotā diska procentuālās daļas grafiku",
"documentation": "dokumentācija",
"examples": "Piemēri",
"executeOnShell": "Izpildīt uz čaulas",
"executeOnShellDescription": "Pēc noklusējuma failu pārlūks izpilda komandas, tieši izsaucot to bināros failus. Ja vēlaties tās palaist čaulā (piemēram, Bash vai PowerShell), varat to definēt šeit ar nepieciešamajiem argumentiem un karodziņiem. Ja tas ir iestatīts, izpildītā komanda tiks pievienota kā arguments. Tas attiecas gan uz lietotāja komandām, gan notikumu piesaistes rīkiem.",
"globalRules": "Šis ir globāls atļaušanas un aizliegšanas noteikumu kopums. Tie attiecas uz katru lietotāju. Katra lietotāja iestatījumos varat definēt konkrētus noteikumus, lai tos ignorētu.",
"globalSettings": "Globālie iestatījumi",
"hideDotfiles": "Slēpt punktfailus",
"insertPath": "Ievietojiet ceļu",
"insertRegex": "Ievietojiet regex izteiksmi",
"instanceName": "Gadījuma nosaukums",
"language": "Valoda",
"lockPassword": "Neļaut lietotājam mainīt paroli",
"newPassword": "Jūsu jaunā parole",
"newPasswordConfirm": "Apstipriniet savu jauno paroli",
"newUser": "Jauns lietotājs",
"password": "Parole",
"passwordUpdated": "Parole atjaunināta!",
"path": "Ceļš",
"perm": {
"create": "Izveidojiet failus un direktorijus",
"delete": "Dzēst failus un direktorijus",
"download": "Lejupielādēt",
"execute": "Izpildīt komandas",
"modify": "Rediģēt failus",
"rename": "Pārdēvēt vai pārvietot failus un direktorijus",
"share": "Kopīgojiet failus"
},
"permissions": "Atļaujas",
"permissionsHelp": "Varat iestatīt lietotāju kā administratoru vai izvēlēties atļaujas individuāli. Ja atlasīsiet “Administrators”, visas pārējās opcijas tiks automātiski atzīmētas. Lietotāju pārvaldība joprojām ir administratora privilēģija.\n",
"profileSettings": "Profila iestatījumi",
"redirectAfterCopyMove": "Pārvirzīt uz galapunktu pēc kopēšanas/pārvietošanas",
"ruleExample1": "neļauj piekļūt jebkuram dotfile failam (piemēram, .git, .gitignore) katrā mapē.\n",
"ruleExample2": "bloķē piekļuvi failam ar nosaukumu Caddyfile darbības jomas saknē.",
"rules": "Noteikumi",
"rulesHelp": "Šeit varat definēt atļaušanas un aizliegšanas noteikumu kopu šim konkrētajam lietotājam. Bloķētie faili netiks rādīti sarakstos, un lietotājs tiem nevarēs piekļūt. Mēs atbalstām regulārās izteiksmes un ceļus attiecībā pret lietotāja darbības jomu.\n",
"scope": "Darbības joma",
"setDateFormat": "Iestatiet precīzu datuma formātu",
"settingsUpdated": "Iestatījumi atjaunināti!",
"shareDuration": "Kopīgošanas ilgums",
"shareManagement": "Kopīgošanas pārvaldība",
"shareDeleted": "Kopīgojums izdzēsts!",
"singleClick": "Failu un direktoriju atvēršanai izmantojiet vienus klikšķi",
"themes": {
"default": "Sistēmas noklusējums",
"dark": "Tumša",
"light": "Gaiša",
"title": "Tēma"
},
"user": "Lietotājs",
"userCommands": "Komandas",
"userCommandsHelp": "Ar atstarpi atdalīts saraksts ar šim lietotājam pieejamajām komandām. Piemērs:\n",
"userCreated": "Lietotājs izveidots!",
"userDefaults": "Lietotāja noklusējuma iestatījumi",
"userDeleted": "Lietotājs izdzēsts!",
"userManagement": "Lietotāju pārvaldība",
"userUpdated": "Lietotājs atjaunināts!",
"username": "Lietotājvārds",
"users": "Lietotāji",
"currentPassword": "Esošā Parole"
},
"sidebar": {
"help": "Palīdzība",
"hugoNew": "Hugo Jauns",
"login": "Pieteikties",
"logout": "Atteikties",
"myFiles": "Mani faili",
"newFile": "Jauns fails",
"newFolder": "Jauna mape",
"preview": "Priekšskatījums",
"settings": "Iestatījumi",
"signup": "Reģistrēties",
"siteSettings": "Vietnes iestatījumi"
},
"success": {
"linkCopied": "Saite nokopēta!"
},
"time": {
"days": "Dienas",
"hours": "Stundas",
"minutes": "Minūtes",
"seconds": "Sekundes",
"unit": "Laika vienība"
}
}
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Afbeeldingen",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Bestanden in bestemming",
"override": "Overschrijven",
"skip": "Overslaan",
"forbiddenError": "Verboden Fout"
"forbiddenError": "Verboden Fout",
"currentPassword": "Uw wachtwoord",
"currentPasswordMessage": "Voer uw wachtwoord in om deze actie te valideren."
},
"search": {
"images": "Afbeeldingen",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Bilde",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Pliki w miejscu docelowym",
"override": "Zastąp",
"skip": "Pomiń",
"forbiddenError": "Błąd zabronionego dostępu"
"forbiddenError": "Błąd zabronionego dostępu",
"currentPassword": "Twoje hasło",
"currentPasswordMessage": "Wpisz swoje hasło, aby zatwierdzić tę czynność."
},
"search": {
"images": "Obrazy",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Imagens",
+306
View File
@@ -0,0 +1,306 @@
{
"buttons": {
"cancel": "Cancelar",
"clear": "Limpar",
"close": "Fechar",
"continue": "Continuar",
"copy": "Copiar",
"copyFile": "Copiar ficheiro",
"copyToClipboard": "Copiar para a área de transferência",
"copyDownloadLinkToClipboard": "Copiar link do download para a área de transferência",
"create": "Criar",
"delete": "Eliminar",
"download": "Descarregar",
"file": "Ficheiro",
"folder": "Pasta",
"fullScreen": "Alternar ecrã inteiro",
"hideDotfiles": "Ocultar ficheiros começados por ponto",
"info": "Info",
"more": "Mais",
"move": "Mover",
"moveFile": "Mover ficheiro",
"new": "Novo",
"next": "Seguinte",
"ok": "OK",
"permalink": "Obter link permanente",
"previous": "Anterior",
"preview": "Pré-visualizar",
"publish": "Publicar",
"rename": "Mudar o nome",
"replace": "Substituir",
"reportIssue": "Reportar problema",
"save": "Guardar",
"schedule": "Agendar",
"search": "Pesquisar",
"select": "Seleccionar",
"selectMultiple": "Seleccionar vários",
"share": "Partilhar",
"shell": "Alternar shell",
"submit": "Enviar",
"switchView": "Alterar vista",
"toggleSidebar": "Alternar barra lateral",
"update": "Actualizar",
"upload": "Enviar",
"openFile": "Abrir ficheiro",
"openDirect": "Ver raw",
"discardChanges": "Descartar",
"stopSearch": "Parar a procura",
"saveChanges": "Guardar alterações",
"editAsText": "Editar como Texto",
"increaseFontSize": "Aumentar o tamanho da letra",
"decreaseFontSize": "Diminuir o tamanho da letra",
"overrideAll": "Substituir todos os ficheiros na pasta de destino",
"skipAll": "Ignorar todos os ficheiros em conflito",
"renameAll": "Mudar o nome a todos os ficheiros (criar uma cópia)",
"singleDecision": "Decidir para cada ficheiro em conflito"
},
"download": {
"downloadFile": "Descarregar Ficheiro",
"downloadFolder": "Descarregar Pasta",
"downloadSelected": "Descarregar Seleccionados"
},
"upload": {
"abortUpload": "Tem a certeza que quer abortar?"
},
"errors": {
"forbidden": "Não tem permissão para aceder a isto.",
"internal": "Algo correu mal.",
"notFound": "Esta localização não pôde ser alcançada.",
"connection": "Este servidor não pôde ser alcançado."
},
"files": {
"body": "Corpo",
"closePreview": "Fechar pré-visualização",
"files": "Ficheiros",
"folders": "Pastas",
"home": "Início",
"lastModified": "Última modificação",
"loading": "A carregar...",
"lonely": "Sinto-me sózinho...",
"metadata": "Metadados",
"multipleSelectionEnabled": "Selecção múltipla activada",
"name": "Nome",
"size": "Tamanho",
"sortByLastModified": "Ordenar pela última modificação",
"sortByName": "Ordenar pelo nome",
"sortBySize": "Ordenar pelo tamanho",
"noPreview": "Pré-visualização não disponível para este ficheiro.",
"csvTooLarge": "O ficheiro CSV é demasiado grande para pré-visualizar (>5MB). Por favor, descarregue-o para visualizá-lo.",
"csvLoadFailed": "Falha ao carregar o ficheiro CSV.",
"showingRows": "A mostrar {count} linha(s)",
"columnSeparator": "Separador de Coluna",
"csvSeparators": {
"comma": "Vírgula (,)",
"semicolon": "Ponto e vírgula (;)",
"both": "Ambos (,) e (;)"
},
"fileEncoding": "Codificação do Ficheiro"
},
"help": {
"click": "seleccionar ficheiro ou pasta",
"ctrl": {
"click": "seleccionar vários ficheiros e pastas",
"f": "abre a pesquisa",
"s": "guarda um ficheiro ou descarrega a pasta onde estiver"
},
"del": "elimina os itens seleccionados",
"doubleClick": "abre um ficheiro ou pasta",
"esc": "limpa a selecção e/ou fecha o pedido",
"f1": "esta informação",
"f2": "muda o nome ao ficheiro",
"help": "Ajuda"
},
"login": {
"createAnAccount": "Criar uma conta",
"loginInstead": "Já tenho uma conta",
"password": "Palavra-passe",
"passwordConfirm": "Confirmação da Palavra-passe",
"passwordsDontMatch": "As palavras-passe não coincidem",
"signup": "Registar",
"submit": "Entrar",
"username": "Nome de utilizador",
"usernameTaken": "O nome de utilizador já existe",
"wrongCredentials": "Credenciais erradas",
"passwordTooShort": "A palavra-passe tem de ter pelo menos {min} caracteres",
"logout_reasons": {
"inactivity": "Foi terminada a sessão por inactividade."
}
},
"permanent": "Permanente",
"prompts": {
"copy": "Copiar",
"copyMessage": "Escolha a localização para copiar os ficheiros:",
"currentlyNavigating": "Actualmente a navegar em:",
"deleteMessageMultiple": "Tem a certeza que quer eliminar {count} ficheiro(s)?",
"deleteMessageSingle": "Tem a certeza que quer eliminar este ficheiro/pasta?",
"deleteMessageShare": "Tem a certeza que quer eliminar esta partilha ({path})?",
"deleteUser": "Tem a certeza que quer eliminar este utilizador?",
"deleteTitle": "Eliminar ficheiros",
"displayName": "Nome a mostrar:",
"download": "Descarregar ficheiros",
"downloadMessage": "Escolha o formato que pretende descarregar.",
"error": "Algo correu mal.",
"fileInfo": "Informação do Ficheiro",
"filesSelected": "{count} ficheiro(s) seleccionado(s)",
"lastModified": "última modificação",
"move": "Mover",
"moveMessage": "Escolha uma nova casa para o(s) seu(s) ficheiro(s)/pasta(s):",
"newArchetype": "Criar uma nova publicação baseado no archetype. O seu ficheiro irá ser criado no conteúdo da pasta.",
"newDir": "Nova pasta",
"newDirMessage": "Nomeie a sua nova pasta.",
"newFile": "Novo ficheiro",
"newFileMessage": "Nomeie o seu novo ficheiro.",
"numberDirs": "Número de pastas",
"numberFiles": "Número de ficheiros",
"rename": "Mudar o nome",
"renameMessage": "Introduza um novo nome para",
"replace": "Substituir",
"replaceMessage": "Um dos ficheiros que está a tentar enviar tem um nome em conflito. Quer ignorar este ficheiro e continuar a enviar ou substituir o existente?\none?\n",
"schedule": "Agendar",
"scheduleMessage": "Escolha a data e hora para agendar a publicação desta publicação.",
"show": "Mostrar",
"size": "Tamanho",
"upload": "Enviar",
"uploadFiles": "A enviar {files} ficheiros...",
"uploadMessage": "Seleccione uma opção para enviar.",
"optionalPassword": "Palavra-passe opcional",
"resolution": "Resolução",
"discardEditorChanges": "Tem a certeza que quer descartar as alterações que fez?",
"replaceOrSkip": "Substituir ou ignorar ficheiros",
"resolveConflict": "Que ficheiros quer manter?",
"singleConflictResolve": "Se seleccionar ambas as versões, um número será adicionar ao nome do ficheiro copiado.",
"fastConflictResolve": "Na pasta de destino há {count} ficheiros com o mesmo nome.",
"uploadingFiles": "A enviar ficheiros",
"filesInOrigin": "Ficheiros na origem",
"filesInDest": "Ficheiros no destino",
"override": "Substituir",
"skip": "Ignorar",
"forbiddenError": "Erro de Proibido",
"currentPassword": "A sua palavra-passe",
"currentPasswordMessage": "Insira a sua palavra-passe para validar esta acção."
},
"search": {
"images": "Imagens",
"music": "Música",
"pdf": "PDF",
"pressToSearch": "Prima Enter para procurar...",
"search": "Procurar...",
"typeToSearch": "Digite para procurar...",
"types": "Tipos",
"video": "Vídeo"
},
"settings": {
"aceEditorTheme": "Editor de temas audaz",
"admin": "Admin",
"administrator": "Administrador",
"allowCommands": "Executar comandos",
"allowEdit": "Editar, mudar o nome e eliminar ficheiros ou pastas",
"allowNew": "Criar novos ficheiros e pastas",
"allowPublish": "Publicar novas publicações e páginas",
"allowSignup": "Permitir que utilizadores se registem",
"hideLoginButton": "Ocultar o botão de início de sessão nas páginas públicas",
"avoidChanges": "(deixe em branco para evitar alterações)",
"branding": "Branding",
"brandingDirectoryPath": "Caminho da pasta da marca",
"brandingHelp": "Pode personalizar a aparência da instânciado seu File Browser\nao alterar o seu nome, alterar o logótipo, adicionar estilos personalizados e até mesmo desactivar links externos para o Github.\nPara mais informação acerca de personalização de marca, por favor, veja {0}.",
"changePassword": "Alterar Palavra-passe",
"commandRunner": "Executador de comandos",
"commandRunnerHelp": "Aqui pode definir comandos que são executados nos eventos nomeados. Tem de escrever um por linha. A variável de ambiente {0} e {1} irá estar disponível, sendo {0} relativo a {1}.\nPara mais informação acerca desta funcionalidade e variáveis de ambiente disponíveis, por favor, leia o {2}.",
"commandsUpdated": "Comandos actualizados!",
"createUserDir": "Criar automaticamente a pasta da casa do utilizador quando adicionar um novo utilizador",
"minimumPasswordLength": "Comprimento mínimo da palavra-passe",
"tusUploads": "Envios aos Bocados",
"tusUploadsHelp": "O File Browser suporta envio de ficheiros aos bocados, permitindo a criação de envios eficiente, de confiança e retomáveis de ficheiros aos bocados mesmo em redes instáveis.",
"tusUploadsChunkSize": "Indica o tamanho máximo do pedido (envios directos serão utilizadas para envios pequenos). Pode introduzir um valor inteiro para tamanhos de byte ou uma cadeia como 10MB, 1GB, etc.",
"tusUploadsRetryCount": "Número de tentativas a realizar se um bocado falha ao ser enviado.",
"userHomeBasePath": "O caminho base para a pasta da casa do utilizador",
"userScopeGenerationPlaceholder": "O escopo será gerado automaticamente",
"createUserHomeDirectory": "Criar pasta da casa do utilizador",
"customStylesheet": "Folha de estilo Personalizada",
"defaultUserDescription": "Estes são as definições por defeito para novos utilizadores",
"disableExternalLinks": "Eliminar links externos (excepto documentação)",
"disableUsedDiskPercentage": "Desactivar gráfico de percentagem de uso de disco",
"documentation": "documentação\ndocumentation",
"examples": "Exemplos",
"executeOnShell": "Executar na shell",
"executeOnShellDescription": "Por defeito, o File Browser executa os comandos ao chamar os seus binários\ndirectamenta. Se quiser executá-los mesmo na shell (como o Bash ou PoweShell), pode defini-lo aqui com os argumentos pedidos e flags. Se definido, o comando que executar será acrescentado como um argumento. Isto aplica-se a ambos comandos de utilizador e hooks de eventos.",
"globalRules": "Esta é um conjunto global de regras de permissão e negação. Elas aplicam-se a cada utilizador. Pode definir regras especificas em cada definições de utilizador para contornar estas.",
"globalSettings": "Definições Globais",
"hideDotfiles": "Ocultar ficheiros começados por ponto",
"insertPath": "Introduza o caminho",
"insertRegex": "Introduza expressão regex",
"instanceName": "Nome da instância",
"language": "Idioma",
"lockPassword": "Impedir o utilizador de alterar a palavra-passe",
"newPassword": "A sua nova palavra-passe",
"newPasswordConfirm": "Confirmar a sua palavra-passe",
"newUser": "Novo Utilizador",
"password": "Palavra-passe",
"passwordUpdated": "Palavras-passe não coincidem!",
"path": "Caminho",
"perm": {
"create": "Criar ficheiros e pastas",
"delete": "Eliminar ficheiros e pastas",
"download": "Descarregar",
"execute": "Executar comandos",
"modify": "Editar ficheiros",
"rename": "Mudar o nome ou mover ficheiros e pastas",
"share": "Ficheiros partilhados"
},
"permissions": "Permissões",
"permissionsHelp": "Pode definir um utilizador um administrador ou escolher as permissões individualmente. Se escolher \"Administrador\", todas as outras opções serão automaticamente marcadas. A gestão de utilizadores continua a ser um privilégio de um administrador.\n",
"profileSettings": "Definições de Perfil",
"redirectAfterCopyMove": "Redireccionar para o destino depois de copiar/mover",
"ruleExample1": "impede o acesso a qualquer ficheiro começado por ponto (como .git ou .gitignore) em cada pasta.\n",
"ruleExample2": "bloqueia o acesso ao ficheiro chamado Caddyfile na raíz de um escopo.",
"rules": "Regras",
"rulesHelp": "Aqui pode definir um conjunto de regras de permissão e negação para este utilizador especifico. Os ficheiros bloqueados não serão mostrados nas listas e não são acessíveis ao utilizador. Suportamos regex e caminhos relativos ao escopo do utilizador.\n",
"scope": "Escopo",
"setDateFormat": "Definir formato exacto da data",
"settingsUpdated": "Definições actualizadas!",
"shareDuration": "Duração da Partilha",
"shareManagement": "Gestão de Partilhas",
"shareDeleted": "Partilha eliminada!",
"singleClick": "Utilizar cliques únicos para abrir ficheiros e pastas",
"themes": {
"default": "Predefinição do sistema",
"dark": "Escuro",
"light": "Claro",
"title": "Tema"
},
"user": "Utilizador",
"userCommands": "Comandos",
"userCommandsHelp": "Uma lista separada por espaços com os comandos disponíveis para este utilizador. Exemplo:\n",
"userCreated": "Utilizador criado!",
"userDefaults": "Definições de utilizador por defeito",
"userDeleted": "Utilizador eliminado!",
"userManagement": "Gestão de Utilizadores",
"userUpdated": "Utilizador actualizado!",
"username": "Nome de utilizador",
"users": "Utilizadores",
"currentPassword": "A Sua Palavra-passe Actual"
},
"sidebar": {
"help": "Ajuda",
"hugoNew": "Hugo New",
"login": "Iniciar sessão",
"logout": "Sair",
"myFiles": "Os meus ficheiros",
"newFile": "Novo ficheiro",
"newFolder": "Nova pasta",
"preview": "Pré-visualizar",
"settings": "Definições",
"signup": "Registar",
"siteSettings": "Definições do Site"
},
"success": {
"linkCopied": "Link copiado!"
},
"time": {
"days": "Dias",
"hours": "Horas",
"minutes": "Minutos",
"seconds": "Segundos",
"unit": "Unidade de Tempo"
}
}
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Imagens",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Imagini",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Изображения",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Obrázky",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Bilder",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Görseller",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Зображення",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "Hình ảnh",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "图像",
+3 -1
View File
@@ -175,7 +175,9 @@
"filesInDest": "Files in destination",
"override": "Overwrite",
"skip": "Skip",
"forbiddenError": "Forbidden Error"
"forbiddenError": "Forbidden Error",
"currentPassword": "Your password",
"currentPasswordMessage": "Enter your password to validate this action."
},
"search": {
"images": "影像",
+4
View File
@@ -10,4 +10,8 @@ declare global {
// TODO: no idea what the exact type is
__vue__: any;
}
interface HTMLElement {
clickOutsideEvent?: (event: Event) => void;
}
}
@@ -0,0 +1,80 @@
import { describe, it, expect } from "vitest";
/**
* Reproduces the path-building logic from scanFiles() in upload.ts (lines 118-138).
*
* readReaderContent() is called when traversing a dropped folder. The browser's
* FileSystemDirectoryReader.readEntries() returns entries in batches — you must
* call it repeatedly until it returns an empty array. Each recursive call in the
* current code appends "/" to the directory, so the second batch and beyond get
* double (or triple, etc.) slashes in the constructed fullPath.
*/
type Entry = { name: string; isFile: boolean; isDirectory: boolean };
function simulateScanFiles(
dirName: string,
entryBatches: Entry[][]
): string[] {
const paths: string[] = [];
let batchIndex = 0;
// Mirrors readEntry() for files — records fullPath as `${directory}${file.name}`
function readEntry(entry: Entry, directory = ""): void {
if (entry.isFile) {
paths.push(`${directory}${entry.name}`);
}
}
// Mirrors readReaderContent() from upload.ts lines 118-138
function readReaderContent(directory: string): void {
const entries = batchIndex < entryBatches.length ? entryBatches[batchIndex] : [];
batchIndex++;
if (entries.length > 0) {
const dirWithSlash = directory.endsWith("/")
? directory
: `${directory}/`;
for (const entry of entries) {
readEntry(entry, dirWithSlash);
}
readReaderContent(dirWithSlash);
}
}
// Initial call mirrors readEntry() for a directory — upload.ts line 111-114
readReaderContent(dirName);
return paths;
}
describe("scanFiles path construction", () => {
it("should not produce double slashes when readEntries returns multiple batches", () => {
// Two batches: simulates a large directory where the browser splits
// readEntries() results across multiple calls
const paths = simulateScanFiles("TestFolder", [
[
{ name: "file1.xlsx", isFile: true, isDirectory: false },
{ name: "file2.xlsx", isFile: true, isDirectory: false },
],
[
{ name: "file3.xlsx", isFile: true, isDirectory: false },
],
]);
expect(paths).toHaveLength(3);
for (const p of paths) {
expect(p, `path "${p}" contains double slash`).not.toContain("//");
}
});
it("single batch should work fine (no regression)", () => {
const paths = simulateScanFiles("TestFolder", [
[
{ name: "file1.xlsx", isFile: true, isDirectory: false },
],
]);
expect(paths).toEqual(["TestFolder/file1.xlsx"]);
});
});
+173
View File
@@ -1,4 +1,5 @@
export const availableEncodings = [
// encodings
"utf-8",
"ibm866",
"iso-8859-2",
@@ -37,6 +38,178 @@ export const availableEncodings = [
"euc-kr",
"utf-16be",
"utf-16le",
// label encodings
"unicode-1-1-utf-8",
"utf8",
"866",
"cp866",
"csibm866",
"csisolatin2",
"iso-ir-101",
"iso8859-2",
"iso88592",
"iso_8859-2",
"iso_8859-2:1987",
"l2",
"latin2",
"csisolatin3",
"iso-ir-109",
"iso8859-3",
"iso88593",
"iso_8859-3",
"iso_8859-3:1988",
"l3",
"latin3",
"csisolatin4",
"iso-ir-110",
"iso8859-4",
"iso88594",
"iso_8859-4",
"iso_8859-4:1988",
"l4",
"latin4",
"csisolatincyrillic",
"cyrillic",
"iso-ir-144",
"iso88595",
"iso_8859-5",
"iso_8859-5:1988",
"arabic",
"asmo-708",
"csiso88596e",
"csiso88596i",
"csisolatinarabic",
"ecma-114",
"iso-8859-6-e",
"iso-8859-6-i",
"iso-ir-127",
"iso8859-6",
"iso88596",
"iso_8859-6",
"iso_8859-6:1987",
"csisolatingreek",
"ecma-118",
"elot_928",
"greek",
"greek8",
"iso-ir-126",
"iso8859-7",
"iso88597",
"iso_8859-7",
"iso_8859-7:1987",
"sun_eu_greek",
"csiso88598e",
"csisolatinhebrew",
"hebrew",
"iso-8859-8-e",
"iso-ir-138",
"iso8859-8",
"iso88598",
"iso_8859-8",
"iso_8859-8:1988",
"visual",
"csiso88598i",
"logical",
"csisolatin6",
"iso-ir-157",
"iso8859-10",
"iso885910",
"l6",
"latin6",
"iso8859-13",
"iso885913",
"iso8859-14",
"iso885914",
"csisolatin9",
"iso8859-15",
"iso885915",
"l9",
"latin9",
"cskoi8r",
"koi",
"koi8",
"koi8_r",
"csmacintosh",
"mac",
"x-mac-roman",
"dos-874",
"iso-8859-11",
"iso8859-11",
"iso885911",
"tis-620",
"cp1250",
"x-cp1250",
"cp1251",
"x-cp1251",
"ansi_x3.4-1968",
"ascii",
"cp1252",
"cp819",
"csisolatin1",
"ibm819",
"iso-8859-1",
"iso-ir-100",
"iso8859-1",
"iso88591",
"iso_8859-1",
"iso_8859-1:1987",
"l1",
"latin1",
"us-ascii",
"x-cp1252",
"cp1253",
"x-cp1253",
"cp1254",
"csisolatin5",
"iso-8859-9",
"iso-ir-148",
"iso8859-9",
"iso88599",
"iso_8859-9",
"iso_8859-9:1989",
"l5",
"latin5",
"x-cp1254",
"cp1255",
"x-cp1255",
"cp1256",
"x-cp1256",
"cp1257",
"x-cp1257",
"cp1258",
"x-cp1258",
"x-mac-ukrainian",
"chinese",
"csgb2312",
"csiso58gb231280",
"gb2312",
"gb_2312",
"gb_2312-80",
"iso-ir-58",
"x-gbk",
"big5-hkscs",
"cn-big5",
"csbig5",
"x-x-big5",
"cseucpkdfmtjapanese",
"x-euc-jp",
"csiso2022jp",
"csshiftjis",
"ms_kanji",
"shift-jis",
"sjis",
"windows-31j",
"x-sjis",
"cseuckr",
"csksc56011987",
"iso-ir-149",
"korean",
"ks_c_5601-1987",
"ks_c_5601-1989",
"ksc5601",
"ksc_5601",
"windows-949",
"utf-16",
];
export function decode(content: ArrayBuffer, encoding: string): string {
+22
View File
@@ -4,3 +4,25 @@ import { partial } from "filesize";
* Formats filesize as KiB/MiB/...
*/
export const filesize = partial({ base: 2 });
export const vClickOutside = {
created(el: HTMLElement, binding: any) {
el.clickOutsideEvent = (event: Event) => {
const target = event.target;
if (target instanceof Node) {
if (!el.contains(target)) {
binding.value(event);
}
}
};
document.addEventListener("click", el.clickOutsideEvent);
},
unmounted(el: HTMLElement) {
if (el.clickOutsideEvent) {
document.removeEventListener("click", el.clickOutsideEvent);
}
},
};
+12 -5
View File
@@ -23,12 +23,16 @@ export function checkConflict(
for (let i = 0; i < files.length; i++) {
const file = files[i];
let name = file.name;
const name = file.name;
if (folder_upload) {
if (folder_upload && file.isDir) {
const dirs = file.fullPath?.split("/");
// For folder uploads, destination listing is flat and only contains
// top-level entries. Treating every nested file as a conflict when the
// parent folder exists blocks the whole upload (see #5798), so skip
// preflight conflict detection for nested files.
if (dirs && dirs.length > 1) {
name = dirs[0];
continue;
}
}
@@ -120,11 +124,14 @@ export function scanFiles(dt: DataTransfer): Promise<UploadList | FileList> {
reader.readEntries((entries) => {
reading--;
if (entries.length > 0) {
const dirWithSlash = directory.endsWith("/")
? directory
: `${directory}/`;
for (const entry of entries) {
readEntry(entry, `${directory}/`);
readEntry(entry, dirWithSlash);
}
readReaderContent(reader, `${directory}/`);
readReaderContent(reader, dirWithSlash);
}
if (reading === 0) {
+4 -1
View File
@@ -480,7 +480,10 @@ const headerButtons = computed(() => {
shell: authStore.user?.perm.execute && enableExec,
delete: fileStore.selectedCount > 0 && authStore.user?.perm.delete,
rename: fileStore.selectedCount === 1 && authStore.user?.perm.rename,
share: fileStore.selectedCount === 1 && authStore.user?.perm.share,
share:
fileStore.selectedCount === 1 &&
authStore.user?.perm.share &&
authStore.user?.perm.download,
move: fileStore.selectedCount > 0 && authStore.user?.perm.rename,
copy: fileStore.selectedCount > 0 && authStore.user?.perm.create,
};
+5 -2
View File
@@ -84,7 +84,6 @@
}"
:epubOptions="{
allowPopups: true,
allowScriptedContent: true,
}"
@update:location="locationChange"
/>
@@ -311,7 +310,11 @@ const isPdf = computed(() => fileStore.req?.extension.toLowerCase() == ".pdf");
const isEpub = computed(
() => fileStore.req?.extension.toLowerCase() == ".epub"
);
const isCsv = computed(() => fileStore.req?.extension.toLowerCase() == ".csv");
const isCsv = computed(
() =>
fileStore.req?.extension.toLowerCase() == ".csv" &&
fileStore.req.size <= CSV_MAX_SIZE
);
const isResizeEnabled = computed(() => resizePreview);
+45 -25
View File
@@ -15,19 +15,6 @@
:isDefault="false"
:isNew="isNew"
/>
<p v-if="isCurrentPasswordRequired">
<label for="currentPassword">{{
t("settings.currentPassword")
}}</label>
<input
class="input input--block"
type="password"
v-model="currentPassword"
id="currentPassword"
autocomplete="current-password"
/>
</p>
</div>
<div class="card-action">
@@ -72,12 +59,12 @@ import { useRoute, useRouter } from "vue-router";
import { useI18n } from "vue-i18n";
import { StatusError } from "@/api/utils";
import { authMethod } from "@/utils/constants";
import { logout } from "@/utils/auth";
const error = ref<StatusError>();
const originalUser = ref<IUser>();
const user = ref<IUser>();
const createUserDir = ref<boolean>(false);
const currentPassword = ref<string>("");
const isCurrentPasswordRequired = ref<boolean>(false);
const $showError = inject<IToastError>("$showError")!;
@@ -134,17 +121,35 @@ const fetchData = async () => {
}
};
const deletePrompt = () =>
layoutStore.showHover({ prompt: "deleteUser", confirm: deleteUser });
const deletePrompt = () => {
if (isCurrentPasswordRequired.value) {
layoutStore.showHover({
prompt: "current-password",
confirm: (event: Event, currentPassword: string) => {
event.preventDefault();
layoutStore.closeHovers();
deleteUser(currentPassword);
},
});
} else {
layoutStore.showHover({
prompt: "deleteUser",
confirm: () => deleteUser(""),
});
}
};
const deleteUser = async (e: Event) => {
e.preventDefault();
const deleteUser = async (currentPassword: string) => {
if (!user.value) {
return false;
}
try {
await api.remove(user.value.id, currentPassword.value);
router.push({ path: "/settings/users" });
await api.remove(user.value.id, currentPassword);
if (user.value.id == authStore.user?.id) {
logout();
} else {
router.push({ path: "/settings/users" });
}
$showSuccess(t("settings.userDeleted"));
} catch (err) {
if (err instanceof StatusError) {
@@ -157,8 +162,25 @@ const deleteUser = async (e: Event) => {
return true;
};
const save = async (event: Event) => {
const save = (event: Event) => {
event.preventDefault();
if (isCurrentPasswordRequired.value) {
layoutStore.showHover({
prompt: "current-password",
confirm: (event: Event, currentPassword: string) => {
event.preventDefault();
layoutStore.closeHovers();
send(currentPassword);
},
});
} else {
send("");
}
return true;
};
const send = async (currentPassword: string) => {
if (!user.value) {
return false;
}
@@ -170,11 +192,11 @@ const save = async (event: Event) => {
...user.value,
};
const loc = await api.create(newUser, currentPassword.value);
const loc = await api.create(newUser, currentPassword);
router.push({ path: loc || "/settings/users" });
$showSuccess(t("settings.userCreated"));
} else {
await api.update(user.value, ["all"], currentPassword.value);
await api.update(user.value, ["all"], currentPassword);
if (user.value.id === authStore.user?.id) {
authStore.updateUser(user.value);
@@ -185,7 +207,5 @@ const save = async (event: Event) => {
} catch (e: any) {
$showError(e);
}
return true;
};
</script>
+1 -1
View File
@@ -14,7 +14,7 @@ const plugins = [
// defaults already drop IE support
targets: ["defaults"],
}),
compression({ include: /\.js$/i, deleteOriginalAssets: true }),
compression({ include: /\.js$/, deleteOriginalAssets: false }),
];
const resolve = {
+11 -11
View File
@@ -1,6 +1,6 @@
module github.com/filebrowser/filebrowser/v2
go 1.25
go 1.25.0
require (
github.com/asdine/storm/v3 v3.2.1
@@ -17,17 +17,18 @@ require (
github.com/mholt/archives v0.1.5
github.com/mitchellh/go-homedir v1.1.0
github.com/redis/go-redis/v9 v9.18.0
github.com/samber/lo v1.52.0
github.com/shirou/gopsutil/v4 v4.26.1
github.com/samber/lo v1.53.0
github.com/shirou/gopsutil/v4 v4.26.2
github.com/spf13/afero v1.15.0
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
github.com/spf13/viper v1.21.0
github.com/stretchr/testify v1.11.1
github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce
golang.org/x/crypto v0.48.0
golang.org/x/image v0.36.0
golang.org/x/text v0.34.0
go.etcd.io/bbolt v1.4.3
golang.org/x/crypto v0.49.0
golang.org/x/image v0.38.0
golang.org/x/text v0.35.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v3 v3.0.1
)
@@ -47,7 +48,7 @@ require (
github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // 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/ebitengine/purego v0.9.1 // indirect
github.com/ebitengine/purego v0.10.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
@@ -73,13 +74,12 @@ require (
github.com/subosito/gotenv v1.6.0 // indirect
github.com/ulikunitz/xz v0.5.15 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.etcd.io/bbolt v1.4.3 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/net v0.51.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.42.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
+18 -18
View File
@@ -83,8 +83,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/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/ISU=
github.com/ebitengine/purego v0.10.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
@@ -215,10 +215,10 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik=
github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
github.com/shirou/gopsutil/v4 v4.26.1 h1:TOkEyriIXk2HX9d4isZJtbjXbEjf5qyKPAzbzY0JWSo=
github.com/shirou/gopsutil/v4 v4.26.1/go.mod h1:medLI9/UNAb0dOI9Q3/7yWSqKkj00u+1tgY8nvv41pc=
github.com/samber/lo v1.53.0 h1:t975lj2py4kJPQ6haz1QMgtId2gtmfktACxIXArw3HM=
github.com/samber/lo v1.53.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
github.com/shirou/gopsutil/v4 v4.26.2 h1:X8i6sicvUFih4BmYIGT1m2wwgw2VG9YgrDTi7cIRGUI=
github.com/shirou/gopsutil/v4 v4.26.2/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ=
github.com/sorairolake/lzip-go v0.3.8 h1:j5Q2313INdTA80ureWYRhX+1K78mUXfMoPZCw/ivWik=
github.com/sorairolake/lzip-go v0.3.8/go.mod h1:JcBqGMV0frlxwrsE9sMWXDjqn3EeVf0/54YPsw66qkU=
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
@@ -283,8 +283,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -296,8 +296,8 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc=
golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4=
golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE=
golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -336,8 +336,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
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.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -350,8 +350,8 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -377,8 +377,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
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.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
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=
@@ -389,8 +389,8 @@ 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.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+10
View File
@@ -167,6 +167,16 @@ var signupHandler = func(_ http.ResponseWriter, r *http.Request, d *data) (int,
d.settings.Defaults.Apply(user)
// Users signed up via the signup handler should never become admins, even
// if that is the default permission.
user.Perm.Admin = false
// Self-registered users should not inherit execution capabilities from
// default settings, regardless of what the administrator has configured
// as the default. Execution rights must be explicitly granted by an admin.
user.Perm.Execute = false
user.Commands = []string{}
pwd, err := users.ValidateAndHashPwd(info.Password, d.settings.MinimumPasswordLength)
if err != nil {
return http.StatusBadRequest, err
+1 -1
View File
@@ -70,7 +70,7 @@ func NewHandler(
api.PathPrefix("/usage").Handler(monkey(diskUsage, "/api/usage")).Methods("GET")
api.Path("/shares").Handler(monkey(shareListHandler, "/api/shares")).Methods("GET")
api.Handle("/shares", monkey(shareListHandler, "")).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")
+4
View File
@@ -33,6 +33,10 @@ var withHashFile = func(fn handleFunc) handleFunc {
return errToStatus(err), err
}
if !user.Perm.Share || !user.Perm.Download {
return http.StatusForbidden, nil
}
d.user = user
file, err := files.NewFileInfo(&files.FileOptions{
+36 -1
View File
@@ -23,38 +23,66 @@ func TestPublicShareHandlerAuthentication(t *testing.T) {
testCases := map[string]struct {
share *share.Link
req *http.Request
sharePerm bool
downloadPerm bool
expectedStatusCode int
}{
"Public share, no auth required": {
share: &share.Link{Hash: "h", UserID: 1},
req: newHTTPRequest(t),
sharePerm: true,
downloadPerm: true,
expectedStatusCode: 200,
},
"Private share, no auth provided, 401": {
share: &share.Link{Hash: "h", UserID: 1, PasswordHash: passwordBcrypt, Token: "123"},
req: newHTTPRequest(t),
sharePerm: true,
downloadPerm: true,
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" }),
sharePerm: true,
downloadPerm: true,
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" }),
sharePerm: true,
downloadPerm: true,
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") }),
sharePerm: true,
downloadPerm: true,
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") }),
sharePerm: true,
downloadPerm: true,
expectedStatusCode: 401,
},
"Share owner lost share permission, 403": {
share: &share.Link{Hash: "h", UserID: 1},
req: newHTTPRequest(t),
sharePerm: false,
downloadPerm: true,
expectedStatusCode: 403,
},
"Share owner lost download permission, 403": {
share: &share.Link{Hash: "h", UserID: 1},
req: newHTTPRequest(t),
sharePerm: true,
downloadPerm: false,
expectedStatusCode: 403,
},
}
for name, tc := range testCases {
@@ -82,7 +110,14 @@ func TestPublicShareHandlerAuthentication(t *testing.T) {
if err := storage.Share.Save(tc.share); err != nil {
t.Fatalf("failed to save share: %v", err)
}
if err := storage.Users.Save(&users.User{Username: "username", Password: "pw"}); err != nil {
if err := storage.Users.Save(&users.User{
Username: "username",
Password: "pw",
Perm: users.Permissions{
Share: tc.sharePerm,
Download: tc.downloadPerm,
},
}); err != nil {
t.Fatalf("failed to save user: %v", err)
}
if err := storage.Settings.Save(&settings.Settings{Key: []byte("key")}); err != nil {
+2 -1
View File
@@ -72,7 +72,8 @@ func parseQueryAlgorithm(r *http.Request) (string, archives.Archival, error) {
func setContentDisposition(w http.ResponseWriter, r *http.Request, file *files.FileInfo) {
if r.URL.Query().Get("inline") == "true" {
w.Header().Set("Content-Disposition", "inline")
// As per RFC6266 section 4.3
w.Header().Set("Content-Disposition", "inline; filename*=utf-8''"+url.PathEscape(file.Name))
} else {
// As per RFC6266 section 4.3
w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(file.Name))
+75
View File
@@ -0,0 +1,75 @@
package fbhttp
import (
"net/http"
"net/http/httptest"
"net/url"
"testing"
"github.com/filebrowser/filebrowser/v2/files"
)
func TestSetContentDisposition(t *testing.T) {
t.Parallel()
testCases := map[string]struct {
filename string
inline bool
expected string
}{
"inline simple filename": {
filename: "document.pdf",
inline: true,
expected: "inline; filename*=utf-8''" + url.PathEscape("document.pdf"),
},
"attachment simple filename": {
filename: "document.pdf",
inline: false,
expected: "attachment; filename*=utf-8''" + url.PathEscape("document.pdf"),
},
"inline non-ASCII filename": {
filename: "日本語.txt",
inline: true,
expected: "inline; filename*=utf-8''" + url.PathEscape("日本語.txt"),
},
"attachment non-ASCII filename": {
filename: "日本語.txt",
inline: false,
expected: "attachment; filename*=utf-8''" + url.PathEscape("日本語.txt"),
},
"inline filename with spaces": {
filename: "my file.txt",
inline: true,
expected: "inline; filename*=utf-8''" + url.PathEscape("my file.txt"),
},
"attachment filename with spaces": {
filename: "my file.txt",
inline: false,
expected: "attachment; filename*=utf-8''" + url.PathEscape("my file.txt"),
},
}
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
t.Parallel()
recorder := httptest.NewRecorder()
req, err := http.NewRequest(http.MethodGet, "/test", http.NoBody)
if err != nil {
t.Fatalf("failed to create request: %v", err)
}
if tc.inline {
req.URL.RawQuery = "inline=true"
}
file := &files.FileInfo{Name: tc.filename}
setContentDisposition(recorder, req, file)
got := recorder.Header().Get("Content-Disposition")
if got != tc.expected {
t.Errorf("Content-Disposition = %q, want %q", got, tc.expected)
}
})
}
}
+7 -2
View File
@@ -30,7 +30,7 @@ var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d
Expand: true,
ReadHeader: d.server.TypeDetectionByHeader,
Checker: d,
Content: true,
Content: d.user.Perm.Download,
})
if err != nil {
return errToStatus(err), err
@@ -42,8 +42,11 @@ var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d
file.ApplySort()
return renderJSON(w, r, file)
} else if encoding == "true" {
if !d.user.Perm.Download {
return http.StatusAccepted, nil
}
if file.Type != "text" {
return http.StatusUnsupportedMediaType, fmt.Errorf("file is not a text file")
return renderJSON(w, r, file)
}
f, err := d.user.Fs.Open(r.URL.Path)
@@ -212,6 +215,8 @@ func resourcePatchHandler(fileCache FileCache) handleFunc {
dst := r.URL.Query().Get("destination")
action := r.URL.Query().Get("action")
dst, err := url.QueryUnescape(dst)
dst = path.Clean("/" + dst)
src = path.Clean("/" + src)
if !d.Check(src) || !d.Check(dst) {
return http.StatusForbidden, nil
}
+1 -1
View File
@@ -20,7 +20,7 @@ import (
func withPermShare(fn handleFunc) handleFunc {
return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
if !d.user.Perm.Share {
if !d.user.Perm.Share || !d.user.Perm.Download {
return http.StatusForbidden, nil
}
+6 -6
View File
@@ -1,19 +1,19 @@
package fbhttp
import (
"compress/gzip"
"encoding/json"
"errors"
"fmt"
"io/fs"
"html/template"
"io"
"compress/gzip"
"io/fs"
"log"
"net/http"
"os"
"path"
"path/filepath"
"strings"
"text/template"
"github.com/filebrowser/filebrowser/v2/auth"
"github.com/filebrowser/filebrowser/v2/settings"
@@ -85,7 +85,7 @@ func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, fSys
return http.StatusInternalServerError, err
}
data["Json"] = strings.ReplaceAll(string(b), `'`, `\'`)
data["Json"] = template.JS(strings.ReplaceAll(string(b), `'`, `\'`))
fileContents, err := fs.ReadFile(fSys, file)
if err != nil {
@@ -153,7 +153,7 @@ func getStaticHandlers(store *storage.Storage, server *settings.Server, assetsFs
defer f.Close()
acceptEncoding := r.Header.Get("Accept-Encoding")
if strings.Contains(acceptEncoding, "gzip") {
if strings.Contains(acceptEncoding, "gzip") {
w.Header().Set("Content-Encoding", "gzip")
w.Header().Set("Content-Type", "application/javascript; charset=utf-8")
@@ -168,7 +168,7 @@ func getStaticHandlers(store *storage.Storage, server *settings.Server, assetsFs
defer gzReader.Close()
w.Header().Set("Content-Type", "application/javascript; charset=utf-8")
if _, err := io.Copy(w, gzReader); err != nil {
return http.StatusInternalServerError, err
}
+6 -6
View File
@@ -5,10 +5,10 @@ import (
"fmt"
"io"
"net/http"
"net/url"
"os"
"path/filepath"
"strconv"
"strings"
"time"
"github.com/spf13/afero"
@@ -105,19 +105,19 @@ func tusPostHandler(cache UploadCache) handleFunc {
}
uploadLength, err := getUploadLength(r)
if err != nil {
if err != nil || uploadLength < 0 {
return http.StatusBadRequest, fmt.Errorf("invalid upload length: %w", err)
}
// Enables the user to utilize the PATCH endpoint for uploading file data
cache.Register(file.RealPath(), uploadLength)
path, err := url.JoinPath("/", d.server.BaseURL, "/api/tus", r.URL.Path)
if err != nil {
return http.StatusBadRequest, fmt.Errorf("invalid path: %w", err)
basePath := "/" + strings.Trim(strings.TrimSpace(d.server.BaseURL), "/")
if basePath == "/" {
basePath = ""
}
w.Header().Set("Location", path)
w.Header().Set("Location", basePath+"/api/tus"+r.URL.EscapedPath())
return http.StatusCreated, nil
})
}
+2
View File
@@ -67,6 +67,8 @@ func (c *redisUploadCache) GetLength(filePath string) (int64, error) {
return 0, fmt.Errorf("invalid upload length in cache: %w", err)
}
c.Touch(filePath)
return size, nil
}
+12
View File
@@ -156,6 +156,10 @@ var userPostHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *
return http.StatusBadRequest, err
}
if req.Data.Perm.Share && !req.Data.Perm.Download {
return http.StatusBadRequest, fberrors.ErrShareRequiresDownload
}
userHome, err := d.settings.MakeUserDir(req.Data.Username, req.Data.Scope, d.server.Root)
if err != nil {
log.Printf("create user: failed to mkdir user home dir: [%s]", userHome)
@@ -204,6 +208,14 @@ var userPutHandler = withSelfOrAdmin(func(w http.ResponseWriter, r *http.Request
return http.StatusBadRequest, nil
}
for _, field := range req.Which {
if strings.ToLower(field) == "perm" || strings.ToLower(field) == "all" {
if req.Data.Perm.Share && !req.Data.Perm.Download {
return http.StatusBadRequest, fberrors.ErrShareRequiresDownload
}
}
}
if len(req.Which) == 0 || (len(req.Which) == 1 && req.Which[0] == "all") {
if !d.user.Perm.Admin {
return http.StatusForbidden, nil
+9
View File
@@ -60,6 +60,15 @@ func stripPrefix(prefix string, h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
p := strings.TrimPrefix(r.URL.Path, prefix)
rp := strings.TrimPrefix(r.URL.RawPath, prefix)
// If the path is exactly the prefix (no trailing slash), redirect to
// the prefix with a trailing slash so the router receives "/" instead
// of "", which would otherwise cause a redirect to the site root.
if p == "" {
http.Redirect(w, r, prefix+"/", http.StatusMovedPermanently)
return
}
r2 := new(http.Request)
*r2 = *r
r2.URL = new(url.URL)
+10 -1
View File
@@ -31,7 +31,16 @@ func (r *Rule) Matches(path string) bool {
return r.Regexp.MatchString(path)
}
return strings.HasPrefix(path, r.Path)
if path == r.Path {
return true
}
prefix := r.Path
if prefix != "/" && !strings.HasSuffix(prefix, "/") {
prefix += "/"
}
return strings.HasPrefix(path, prefix)
}
// Regexp is a wrapper to the native regexp type where we
+31
View File
@@ -2,6 +2,37 @@ package rules
import "testing"
func TestRuleMatches(t *testing.T) {
t.Parallel()
cases := []struct {
name string
rulePath string
testPath string
want bool
}{
{"exact match", "/uploads", "/uploads", true},
{"child path", "/uploads", "/uploads/file.txt", true},
{"sibling prefix", "/uploads", "/uploads_backup/secret.txt", false},
{"root rule", "/", "/anything", true},
{"trailing slash rule", "/uploads/", "/uploads/file.txt", true},
{"trailing slash no sibling", "/uploads/", "/uploads_backup/file.txt", false},
{"nested child", "/data/shared", "/data/shared/docs/file.txt", true},
{"nested sibling", "/data/shared", "/data/shared_private/file.txt", false},
}
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
r := &Rule{Path: tc.rulePath}
got := r.Matches(tc.testPath)
if got != tc.want {
t.Errorf("Rule{Path: %q}.Matches(%q) = %v; want %v", tc.rulePath, tc.testPath, got, tc.want)
}
})
}
}
func TestMatchHidden(t *testing.T) {
cases := map[string]bool{
"/": false,
+27
View File
@@ -6,6 +6,7 @@ import (
"reflect"
"github.com/asdine/storm/v3"
bolt "go.etcd.io/bbolt"
fberrors "github.com/filebrowser/filebrowser/v2/errors"
"github.com/filebrowser/filebrowser/v2/users"
@@ -93,3 +94,29 @@ func (st usersBackend) DeleteByUsername(username string) error {
return st.db.DeleteStruct(user)
}
func (st usersBackend) CountAdmins() (int, error) {
count := 0
err := st.db.Bolt.View(func(tx *bolt.Tx) error {
bucket := tx.Bucket([]byte(reflect.TypeOf(users.User{}).Name()))
if bucket == nil {
return nil
}
c := bucket.Cursor()
for _, v := c.First(); v != nil; _, v = c.Next() {
var u users.User
if err := st.db.Codec().Unmarshal(v, &u); err != nil {
return err
}
if u.Perm.Admin {
count++
}
}
return nil
})
return count, err
}
+2
View File
@@ -9,7 +9,9 @@ settings:
language_mapping:
sv_SE: sv-se
pt_BR: pt-br
pt_PT: pt-pt
zh_CN: zh-cn
zh_HK: zh-hk
zh_TW: zh-tw
nl_BE: nl-be
lv_LV: lv-lv
+21 -2
View File
@@ -15,6 +15,7 @@ type StorageBackend interface {
Update(u *User, fields ...string) error
DeleteByID(uint) error
DeleteByUsername(string) error
CountAdmins() (int, error)
}
type Store interface {
@@ -108,14 +109,20 @@ func (s *Storage) Delete(id interface{}) error {
if err != nil {
return err
}
if user.ID == 1 {
if s.IsUniqueAdmin(user) {
return fberrors.ErrRootUserDeletion
}
return s.back.DeleteByUsername(id)
case uint:
if id == 1 {
user, err := s.back.GetBy(id)
if err != nil {
return err
}
if s.IsUniqueAdmin(user) {
return fberrors.ErrRootUserDeletion
}
return s.back.DeleteByID(id)
default:
return fberrors.ErrInvalidDataType
@@ -131,3 +138,15 @@ func (s *Storage) LastUpdate(id uint) int64 {
}
return 0
}
func (s *Storage) IsUniqueAdmin(user *User) bool {
if !user.Perm.Admin {
return false
}
count, err := s.back.CountAdmins()
if err != nil {
return true
}
return count <= 1
}
+1 -1
View File
@@ -38,7 +38,7 @@ Where `X-My-Header` is the HTTP header provided by your proxy with the username.
> [!WARNING]
>
> File Browser will blindly trust the provided header. If the proxy can be bypassed, an attacker could simply attach the header and get admin access.
> File Browser will blindly trust the provided header. If the proxy can be bypassed, an attacker could simply attach the header and get admin access. Please ensure that File Browser is not accessible from untrusted networks, and that the proxy is correctly configured to strip/overwrite the header from client requests.
## Hook Authentication