Skip to content

Commit 034106d

Browse files
authored
Merge pull request #49226 from nextcloud/fix/encode-guest-file-request
fx(dav): file request guest nickname encoding
2 parents de1c175 + 94d22a7 commit 034106d

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

apps/dav/lib/Files/Sharing/FilesDropPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function beforeMethod(RequestInterface $request, ResponseInterface $respo
6464
// Extract the attributes for the file request
6565
$isFileRequest = false;
6666
$attributes = $this->share->getAttributes();
67-
$nickName = $request->getHeader('X-NC-Nickname');
67+
$nickName = $request->hasHeader('X-NC-Nickname') ? urldecode($request->getHeader('X-NC-Nickname')) : null;
6868
if ($attributes !== null) {
6969
$isFileRequest = $attributes->getAttribute('fileRequest', 'enabled') === true;
7070
}

apps/files_sharing/src/public-file-request.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6+
import { defineAsyncComponent } from 'vue'
7+
import { getBuilder } from '@nextcloud/browser-storage'
68
import { getGuestNickname, setGuestNickname } from '@nextcloud/auth'
7-
import { spawnDialog } from '@nextcloud/dialogs'
89
import { getUploader } from '@nextcloud/upload'
9-
import { defineAsyncComponent } from 'vue'
10+
import { spawnDialog } from '@nextcloud/dialogs'
11+
1012
import logger from './services/logger'
11-
import { getBuilder } from '@nextcloud/browser-storage'
1213

1314
const storage = getBuilder('files_sharing').build()
1415

@@ -18,7 +19,7 @@ const storage = getBuilder('files_sharing').build()
1819
*/
1920
function registerFileRequestHeader(nickname: string) {
2021
const uploader = getUploader()
21-
uploader.setCustomHeader('X-NC-Nickname', nickname)
22+
uploader.setCustomHeader('X-NC-Nickname', encodeURIComponent(nickname))
2223
logger.debug('Nickname header registered for uploader', { headers: uploader.customHeaders })
2324
}
2425

dist/files_sharing-public-file-request.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-public-file-request.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)