[stable12] Add recovery key on public upload #5630
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
schiessle
added
3. to review
nickvergessen
approved these changes
Jul 12, 2017
blizzz
reviewed
Jul 14, 2017
| @@ -407,7 +413,7 @@ public function update($path, $uid, array $accessList) { | |||
| } | |||
| } | |||
|
|
|||
| $publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $uid); | |||
| $publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $this->owner); | |||
There was a problem hiding this comment.
I assumed it is ensured somehow that begin() is run first, and this $this->owner is never null?
There was a problem hiding this comment.
good catch, I will double check
There was a problem hiding this comment.
@blizzz I added a explicit check, can you review it (also the stable11 and master version) Thanks!
schiessle
force-pushed
the
add-recovery-key-on-public-upload-stable12
branch
from
b08c7df to
9cc81d4
Compare
Codecov Report
@@ 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
|
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 <[email protected]>
Signed-off-by: Bjoern Schiessle <[email protected]>
schiessle
force-pushed
the
add-recovery-key-on-public-upload-stable12
branch
from
9cc81d4 to
fff804c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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