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

[stable11] Add recovery key on public upload #5631

Merged
merged 2 commits into from Jul 20, 2017

Conversation

Projects
None yet
3 participants
@schiessle
Member

schiessle commented Jul 6, 2017

In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

backport of #5629

@schiessle schiessle added this to the Nextcloud 11.0.4 milestone Jul 6, 2017

@schiessle schiessle changed the title from Add recovery key on public upload to [stable11] Add recovery key on public upload Jul 6, 2017

@nickvergessen

Works

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Jul 17, 2017

Codecov Report

Merging #5631 into stable11 will decrease coverage by 14.24%.
The diff coverage is 85.71%.

@@               Coverage Diff               @@
##             stable11    #5631       +/-   ##
===============================================
- Coverage       57.41%   43.16%   -14.25%     
+ Complexity      19458    18454     -1004     
===============================================
  Files            1215     1205       -10     
  Lines           72673    68295     -4378     
  Branches         1239     1334       +95     
===============================================
- Hits            41725    29480    -12245     
- Misses          30948    38815     +7867
Impacted Files Coverage Δ Complexity Δ
apps/encryption/lib/Crypto/Encryption.php 58.33% <85.71%> (-25.11%) 57 <2> (+2)
...pps/files/lib/Activity/Settings/FavoriteAction.php 0% <0%> (-100%) 8% <0%> (ø)
...ivate/IntegrityCheck/Helpers/EnvironmentHelper.php 0% <0%> (-100%) 2% <0%> (ø)
apps/sharebymail/tests/SettingsTest.php 0% <0%> (-100%) 2% <0%> (ø)
lib/private/Files/SimpleFS/SimpleFolder.php 0% <0%> (-100%) 11% <0%> (ø)
lib/private/App/CodeChecker/EmptyCheck.php 0% <0%> (-100%) 6% <0%> (ø)
lib/private/IntegrityCheck/Helpers/AppLocator.php 0% <0%> (-100%) 3% <0%> (ø)
lib/public/AppFramework/Http/DownloadResponse.php 0% <0%> (-100%) 1% <0%> (ø)
...curity/Exceptions/StrictCookieMissingException.php 0% <0%> (-100%) 1% <0%> (ø)
...vate/Security/CSP/ContentSecurityPolicyManager.php 0% <0%> (-100%) 8% <0%> (ø)
... and 555 more

codecov bot commented Jul 17, 2017

Codecov Report

Merging #5631 into stable11 will decrease coverage by 14.24%.
The diff coverage is 85.71%.

@@               Coverage Diff               @@
##             stable11    #5631       +/-   ##
===============================================
- Coverage       57.41%   43.16%   -14.25%     
+ Complexity      19458    18454     -1004     
===============================================
  Files            1215     1205       -10     
  Lines           72673    68295     -4378     
  Branches         1239     1334       +95     
===============================================
- Hits            41725    29480    -12245     
- Misses          30948    38815     +7867
Impacted Files Coverage Δ Complexity Δ
apps/encryption/lib/Crypto/Encryption.php 58.33% <85.71%> (-25.11%) 57 <2> (+2)
...pps/files/lib/Activity/Settings/FavoriteAction.php 0% <0%> (-100%) 8% <0%> (ø)
...ivate/IntegrityCheck/Helpers/EnvironmentHelper.php 0% <0%> (-100%) 2% <0%> (ø)
apps/sharebymail/tests/SettingsTest.php 0% <0%> (-100%) 2% <0%> (ø)
lib/private/Files/SimpleFS/SimpleFolder.php 0% <0%> (-100%) 11% <0%> (ø)
lib/private/App/CodeChecker/EmptyCheck.php 0% <0%> (-100%) 6% <0%> (ø)
lib/private/IntegrityCheck/Helpers/AppLocator.php 0% <0%> (-100%) 3% <0%> (ø)
lib/public/AppFramework/Http/DownloadResponse.php 0% <0%> (-100%) 1% <0%> (ø)
...curity/Exceptions/StrictCookieMissingException.php 0% <0%> (-100%) 1% <0%> (ø)
...vate/Security/CSP/ContentSecurityPolicyManager.php 0% <0%> (-100%) 8% <0%> (ø)
... and 555 more
@blizzz

blizzz approved these changes Jul 20, 2017

schiessle added some commits Jul 6, 2017

Add recovery key on public upload
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

@schiessle schiessle merged commit ed9a4c2 into stable11 Jul 20, 2017

1 check failed

continuous-integration/drone/pr the build failed
Details

@schiessle schiessle deleted the add-recovery-key-on-public-upload-stable11 branch Jul 20, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment