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

[stable12] Add recovery key on public upload #5630

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

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Jul 17, 2017

Codecov Report

Merging #5630 into stable12 will decrease coverage by 14.71%.
The diff coverage is 85.71%.

@@               Coverage Diff               @@
##             stable12    #5630       +/-   ##
===============================================
- Coverage       54.08%   39.37%   -14.72%     
+ Complexity      22443    21168     -1275     
===============================================
  Files            1380     1311       -69     
  Lines           85825    70847    -14978     
  Branches         1329        0     -1329     
===============================================
- Hits            46416    27893    -18523     
- Misses          39409    42954     +3545
Impacted Files Coverage Δ Complexity Δ
apps/encryption/lib/Crypto/Encryption.php 61.3% <85.71%> (-22.13%) 57 <2> (+2)
.../Exceptions/EncryptionHeaderKeyExistsException.php 0% <0%> (-100%) 1% <0%> (ø)
lib/public/AppFramework/Middleware.php 0% <0%> (-100%) 4% <0%> (ø)
lib/private/Template/ResourceNotFoundException.php 0% <0%> (-100%) 2% <0%> (ø)
apps/dav/lib/CalDAV/Activity/Setting/Calendar.php 0% <0%> (-100%) 8% <0%> (ø)
apps/files/lib/Activity/Settings/FileRestored.php 0% <0%> (-100%) 8% <0%> (ø)
...curity/Exceptions/StrictCookieMissingException.php 0% <0%> (-100%) 1% <0%> (ø)
...te/Authentication/Token/DefaultTokenCleanupJob.php 0% <0%> (-100%) 1% <0%> (ø)
core/Command/Background/WebCron.php 0% <0%> (-100%) 1% <0%> (ø)
...Check/Iterator/ExcludeFileByNameFilterIterator.php 0% <0%> (-100%) 2% <0%> (ø)
... and 730 more

codecov bot commented Jul 17, 2017

Codecov Report

Merging #5630 into stable12 will decrease coverage by 14.71%.
The diff coverage is 85.71%.

@@               Coverage Diff               @@
##             stable12    #5630       +/-   ##
===============================================
- Coverage       54.08%   39.37%   -14.72%     
+ Complexity      22443    21168     -1275     
===============================================
  Files            1380     1311       -69     
  Lines           85825    70847    -14978     
  Branches         1329        0     -1329     
===============================================
- Hits            46416    27893    -18523     
- Misses          39409    42954     +3545
Impacted Files Coverage Δ Complexity Δ
apps/encryption/lib/Crypto/Encryption.php 61.3% <85.71%> (-22.13%) 57 <2> (+2)
.../Exceptions/EncryptionHeaderKeyExistsException.php 0% <0%> (-100%) 1% <0%> (ø)
lib/public/AppFramework/Middleware.php 0% <0%> (-100%) 4% <0%> (ø)
lib/private/Template/ResourceNotFoundException.php 0% <0%> (-100%) 2% <0%> (ø)
apps/dav/lib/CalDAV/Activity/Setting/Calendar.php 0% <0%> (-100%) 8% <0%> (ø)
apps/files/lib/Activity/Settings/FileRestored.php 0% <0%> (-100%) 8% <0%> (ø)
...curity/Exceptions/StrictCookieMissingException.php 0% <0%> (-100%) 1% <0%> (ø)
...te/Authentication/Token/DefaultTokenCleanupJob.php 0% <0%> (-100%) 1% <0%> (ø)
core/Command/Background/WebCron.php 0% <0%> (-100%) 1% <0%> (ø)
...Check/Iterator/ExcludeFileByNameFilterIterator.php 0% <0%> (-100%) 2% <0%> (ø)
... and 730 more
@blizzz

blizzz approved these changes Jul 20, 2017

Looks good

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 c9624d2 into stable12 Jul 20, 2017

1 check failed

continuous-integration/drone/pr the build failed
Details

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

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