Skip to content

Fix activities for e2e encryption - #8298

Merged
nickvergessen merged 7 commits into
masterfrom
bugfix/e2e-45/fix-activities-for-end2end-encryption
Mar 1, 2018
Merged

Fix activities for e2e encryption#8298
nickvergessen merged 7 commits into
masterfrom
bugfix/e2e-45/fix-activities-for-end2end-encryption

Conversation

@nickvergessen

@nickvergessennickvergessen commented Feb 10, 2018

Copy link
Copy Markdown
Member

Fixnextcloud/end_to_end_encryption#45

  • Fix path of container (/<user>/files/)
  • Delete activities are broken (should try to rebuild from path instead of id)

bildschirmfoto von 2018-02-12 16-24-22

@codecov

codecovBot commented Feb 12, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8298 into master will decrease coverage by 16.78%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #8298 +/- ##
=============================================
- Coverage 51.87% 35.09% -16.79% - Complexity 25406 25418 +12 
=============================================
Files 1609 1609 Lines 95296 95329 +33 Branches 1378 1378 =============================================
- Hits 49437 33451 -15986 - Misses 45859 61878 +16019
Impacted FilesCoverage ΔComplexity Δ
apps/files/lib/Activity/Provider.php0% <0%> (-13.7%)83 <19> (+12)
apps/user_ldap/lib/GroupPluginManager.php0% <0%> (-100%)17% <0%> (ø)
lib/private/Security/IdentityProof/Key.php0% <0%> (-100%)3% <0%> (ø)
apps/dav/lib/CalDAV/Activity/Setting/Event.php0% <0%> (-100%)8% <0%> (ø)
apps/systemtags/lib/Settings/Admin.php0% <0%> (-100%)3% <0%> (ø)
apps/dav/lib/CalDAV/PublicCalendarObject.php0% <0%> (-100%)1% <0%> (ø)
core/Controller/NavigationController.php0% <0%> (-100%)9% <0%> (ø)
.../Exceptions/EncryptionHeaderKeyExistsException.php0% <0%> (-100%)1% <0%> (ø)
...Check/Iterator/ExcludeFileByNameFilterIterator.php0% <0%> (-100%)2% <0%> (ø)
...ib/private/Contacts/ContactsMenu/ActionFactory.php0% <0%> (-100%)2% <0%> (ø)
... and 525 more

@nickvergessennickvergessen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 12, 2018
@schiessle

schiessle commented Feb 28, 2018

Copy link
Copy Markdown
Member

I did some tests, this are the results:

  • creating a top-level folder, mark is as e2e, upload a file -> activity "you created a encrypted file" -> ✅
  • create a sub folder in the e2e folder, upload a file to the subfolder-> activity view is broken (loads forever) 💥
    oc_activity entry looks like this:
    9|1519823263|30|file_created|admin|admin|files|created_self|[{"131":"\/E2e2\/Foo\/fa39a4b131a840d6a384ecf13eba1498"}]||[]|/E2e2/Foo/fa39a4b131a840d6a384ecf13eba1498|http://192.168.178.42/index.php/apps/files/?dir=/E2e2/Foo|files|131
  • create a normal (unencrypted) folder, create a e2e sub-folder, upload a file -> activity "you created a encrypted file" -> ✅

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
nickvergessenforce-pushed the bugfix/e2e-45/fix-activities-for-end2end-encryption branch from d4474b9 to 825c276CompareFebruary 28, 2018 14:17
@nickvergessen

Copy link
Copy Markdown
MemberAuthor

Ah, failed on the recursion.

Rebased it, but only changed the last commit.

Signed-off-by: Joas Schilling <coding@schilljs.com>

@schiessleschiessle left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

tested again. Everything seems to work now

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
nickvergessen merged commit 0f3ba94 into masterMar 1, 2018
@nickvergessen
nickvergessen deleted the bugfix/e2e-45/fix-activities-for-end2end-encryption branch March 1, 2018 09:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@nickvergessen@schiessle@MorrisJobke