Skip to content

[stable30] fx(dav): file request guest nickname encoding #49239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 1 commit into from
Nov 13, 2024
Merged

[stable30] fx(dav): file request guest nickname encoding #49239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dav/lib/Files/Sharing/FilesDropPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function beforeMethod(RequestInterface $request, ResponseInterface $respo
// Extract the attributes for the file request
$isFileRequest = false;
$attributes = $this->share->getAttributes();
$nickName = $request->getHeader('X-NC-Nickname');
$nickName = $request->hasHeader('X-NC-Nickname') ? urldecode($request->getHeader('X-NC-Nickname')) : null;

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of urldecode cannot be null, possibly null value provided
if ($attributes !== null) {
$isFileRequest = $attributes->getAttribute('fileRequest', 'enabled') === true;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/js/files_drop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
}

if (localStorage.getItem('nick') !== null) {
data.headers['X-NC-Nickname'] = localStorage.getItem('nick')
data.headers['X-NC-Nickname'] = encodeURIComponent(localStorage.getItem('nick'))
}

$('#drop-upload-done-indicator').addClass('hidden');
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/FilesDropContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function droppingFileWith($path, $content, $nickName = null) {
];

if ($nickName) {
$options['headers']['X-NC-NICKNAME'] = $nickName;
$options['headers']['X-NC-NICKNAME'] = urlencode($nickName);
}

$options['body'] = \GuzzleHttp\Psr7\Utils::streamFor($content);
Expand Down