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

[15] Add interface to allow storages from opting out of encryption #12692

Merged
merged 3 commits into from
Nov 29, 2018
Merged

[15] Add interface to allow storages from opting out of encryption #12692

merged 3 commits into from
Nov 29, 2018

Conversation

icewind1991
Copy link
Member

Backport of #12691

@icewind1991
Add interface to allow storages from opting out of encryption
f3798a7 
As opposed to hard-coding a list of excluded storages

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Nov 27, 2018
@icewind1991 icewind1991 added this to the Nextcloud 15 milestone Nov 27, 2018
ChristophWurst
ChristophWurst approved these changes Nov 29, 2018
View reviewed changes
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.

Nice 👍

@ChristophWurst
Update autoloader classmap
d5e0292 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst
Copy link
Member

https://drone.nextcloud.com/nextcloud/server/13084/116

1) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #2 (false, array('OCA\Files_Sharing\SharedStorage'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

2) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #3 (false, array('OCA\Files_Sharing\External\Storage'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

3) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #4 (false, array('OC\Files\Storage\OwnCloud'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

4) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #5 (false, array('OCA\Files_Sharing\SharedStorage', 'OCA\Files_Sharing\External\Storage'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

5) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #6 (false, array('OCA\Files_Sharing\SharedStorage', 'OC\Files\Storage\OwnCloud'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

6) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #7 (false, array('OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

7) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #8 (false, array('OCA\Files_Sharing\SharedStorage', 'OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

@icewind1991
update encryption wrapper tests
7cdc04a 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Copy link
Member Author

tests are happy again

MorrisJobke
MorrisJobke approved these changes Nov 29, 2018
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

👍

@MorrisJobke MorrisJobke merged commit 96450a9 into stable15 Nov 29, 2018
@MorrisJobke MorrisJobke deleted the storage-no-encryption-interface-15 branch November 29, 2018 21:01
@MorrisJobke MorrisJobke mentioned this pull request Nov 30, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@schiessle schiessle Awaiting requested review from schiessle

Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
Nextcloud 15
Development

Successfully merging this pull request may close these issues.
3 participants
@icewind1991 @ChristophWurst @MorrisJobke