Skip to content
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

Jump to bottom

[stable22] Use the unjailed-path in OC_Helper::getStorageInfo() for files located in SharedStorage. #31136

Merged
merged 1 commit into from
Feb 21, 2022
Merged

[stable22] Use the unjailed-path in OC_Helper::getStorageInfo() for files located in SharedStorage. #31136

merged 1 commit into from
Feb 21, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #30985

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 22.2.4 milestone Feb 11, 2022
@szaimen
Copy link
Contributor

szaimen commented Feb 11, 2022

Okay, seems like it is not important enough for the hotifx release: #30999 (comment)

@blizzz blizzz added 4. to release Ready to be released and/or waiting for tests to finish bug labels Feb 11, 2022
@PVince81
Copy link
Member

/rebase

@rotdrop @PVince81
Use the unjailed-path in OC_Helper::getStorageInfo() for files locate…
c31adf1 
…d in SharedStorage.

The current implementation already switches the storage-backend to
$storage->getSourceStorage(). However, it then calls
$rootInfo->getInternalPath() which returns the internal path relative to
the storage where the share is mounted. This is wrong, we need also to
unjail the path. Compare, e.g., with
OCA\Files_Sharing\SharedStorage::file_get/put_contents() for the
"logic".

Signed-off-by: Claus-Justus Heine <himself@claus-justus-heine.de>
@szaimen
Copy link
Contributor

szaimen commented Feb 21, 2022

⚙️ failure unrelated, afaics

@szaimen szaimen merged commit 55ce97c into stable22 Feb 21, 2022
@szaimen szaimen deleted the backport/30985/stable22 branch February 21, 2022 11:35
@blizzz blizzz mentioned this pull request Mar 9, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@solracsf solracsf solracsf approved these changes

@CarlSchwan CarlSchwan CarlSchwan approved these changes

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@PVince81 PVince81 Awaiting requested review from PVince81

@rotdrop rotdrop Awaiting requested review from rotdrop

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Milestone
Nextcloud 22.2.6
Development

Successfully merging this pull request may close these issues.
6 participants
@szaimen @PVince81 @solracsf @CarlSchwan @blizzz @rotdrop