-
-
Notifications
You must be signed in to change notification settings - Fork 4k
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.
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
Do not expose direct editing if no master key is available #22423
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juliushaertl
requested review from
rullzer,
ChristophWurst,
blizzz and
tobiasKaminsky
August 25, 2020 15:17
ChristophWurst
approved these changes
Aug 25, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 🐘
rullzer
approved these changes
Aug 25, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes smart move
Signed-off-by: Julius Härtl <[email protected]>
juliushaertl
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 1, 2020
juliushaertl
force-pushed
the
bugfix/noid/direct-editing-encryption
branch
from
September 1, 2020 09:40
7f3a8e2
to
e0ae377
Compare
🤖 beep boop beep 🤖 Here are the logs for the failed build: Status of 32530: failuremariadb10.1-php7.2Show full log
mysql8.0-php7.2
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
4. to release
Ready to be released and/or waiting for tests to finish
bug
feature: encryption (server-side)
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will make sure that direct editing is only exposed to mobile clients then a master key is available in case server side encryption is used.
I would propose to backport this even though the public interface is extended, but it is only used by the files app.
cc @camilasan @tobiasKaminsky @marinofaggiana for the clients:
I would expect there should be no changes required from the client side since it would just return an empty list of direct editors then.
Fixes nextcloud/ios#1340