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

Be sure to get the jailed path if the storage is a jail #16932

Merged
merged 1 commit into from
Sep 4, 2019
Merged

Be sure to get the jailed path if the storage is a jail #16932

merged 1 commit into from
Sep 4, 2019

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Aug 30, 2019 •
edited by nickvergessen
Loading

Fixes nextcloud/groupfolders#583

Signed-off-by: Roeland Jago Douma roeland@famdouma.nl

@rullzer rullzer added bug 3. to review Waiting for reviews labels Aug 30, 2019
@rullzer rullzer added this to the Nextcloud 17 milestone Aug 30, 2019
nickvergessen
nickvergessen approved these changes Aug 30, 2019
View reviewed changes
Copy link
Member

@nickvergessen nickvergessen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for shares and group folders

juliushaertl
juliushaertl approved these changes Aug 30, 2019
View reviewed changes
Copy link
Member

@juliushaertl juliushaertl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works.

@juliushaertl
Copy link
Member

I've amended to also use the same approach in the mime type check.

@nickvergessen
Copy link
Member

Should this then just happen outside this method and we only ever inject the jailed path?

@rullzer
Copy link
Member Author

rullzer commented Aug 30, 2019

Should this then just happen outside this method and we only ever inject the jailed path?

would make sense yes.

@rullzer @nickvergessen
Be sure to get the jailed path if the storage is a jail
f57fa23 
Fixes: nextcloud/groupfolders#583

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@nickvergessen
Copy link
Member

Done, please re-review @rullzer @juliushaertl

@rullzer
Copy link
Member Author

rullzer commented Sep 3, 2019

Perfect :)

@nickvergessen
Copy link
Member

/backport to stable16

@nickvergessen
Copy link
Member

/backport to stable15

@nickvergessen nickvergessen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 3, 2019
@rullzer rullzer merged commit 361ff31 into master Sep 4, 2019
@rullzer rullzer deleted the fix/workflow/jails branch September 4, 2019 06:55
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Sep 4, 2019
Merged
@backportbot-nextcloud
Copy link

backport to stable16 in #16991

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Sep 4, 2019
Merged
@backportbot-nextcloud
Copy link

backport to stable15 in #16992

@rullzer rullzer mentioned this pull request Sep 4, 2019
Merged
16 tasks
@juliushaertl juliushaertl mentioned this pull request Sep 4, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes

@juliushaertl juliushaertl juliushaertl approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

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 17
Development

Successfully merging this pull request may close these issues.

Cache can not get the parent
3 participants
@rullzer @juliushaertl @nickvergessen