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.

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
merged 1 commit into from
Sep 1, 2020

Conversation

juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Aug 25, 2020

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

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

👍 🐘

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

Yes smart move

This was referenced Aug 26, 2020
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl 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 juliushaertl force-pushed the bugfix/noid/direct-editing-encryption branch from 7f3a8e2 to e0ae377 Compare September 1, 2020 09:40
@faily-bot
Copy link

faily-bot bot commented Sep 1, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 32530: failure

mariadb10.1-php7.2

Show full log
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) Test\Files\Cache\Wrapper\CacheJailTest::testWithoutNormalizer
Failed asserting that 0 is greater than 0.

/drone/src/tests/lib/Files/Cache/CacheTest.php:554

mysql8.0-php7.2

  • cancelled - typically means that the tests took longer than the drone CI allows them to run

@rullzer rullzer merged commit 6bda2c2 into master Sep 1, 2020
@rullzer rullzer deleted the bugfix/noid/direct-editing-encryption branch September 1, 2020 18:32
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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can not edit text files
3 participants