-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
[stable10] Backport of Add encryption version fix command #35000
Conversation
75000ef
to
c5b264e
Compare
Codecov Report
@@ Coverage Diff @@
## stable10 #35000 +/- ##
===============================================
- Coverage 64.29% 44.97% -19.33%
===============================================
Files 1285 116 -1169
Lines 76824 11565 -65259
Branches 1307 1307
===============================================
- Hits 49394 5201 -44193
+ Misses 27049 5983 -21066
Partials 381 381
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## stable10 #35000 +/- ##
==============================================
+ Coverage 64.29% 64.46% +0.17%
- Complexity 20040 20061 +21
==============================================
Files 1285 1286 +1
Lines 76824 76925 +101
Branches 1307 1307
==============================================
+ Hits 49393 49593 +200
+ Misses 27050 26951 -99
Partials 381 381
Continue to review full report at Codecov.
|
Tried to run unit test, inorder to reproduce the error. Unfortunately I am hit with error shown below:
Looking at the CI errors its clear that the files are not encrypted. Here is the snapshot of the failure:
Reference: https://drone.owncloud.com/owncloud/core/16812/127 |
Please tick the Doc-ticket item and add one in docs ! |
Debugging the cause for why the files are not getting encrypted when the test is run. I was able to find that even the skeleton when copied doesn't get encrypted. This is how the directory structure looks after the user logs in:
|
$fileCache = $cache->get($fileId); | ||
|
||
if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) { | ||
$output->writeln("<info>The file: $path is a share. Hence kindly fix this by running the script under the owner of share</info>"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where you wrote "by running the script under the owner of share", did you mean "by running the script as the owner of share"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What I meant is : executing the script for the user who owns the share.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about: Hence kindly fix this by running the script for the owner of share
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me know if this looks ok?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left a few comments, all intended to help out. Sorry if they come across as pedantic or nitpicky.
Note: this is a backport of code already reviewed in the |
34c3ffa
to
4af812b
Compare
There is a final failure noticed with files_primary_s3 for :
The issues related to this PR's test are now passing in the CI. |
I added |
c3f2f3b
to
35361c6
Compare
35361c6
to
c7b1fd4
Compare
I will create a separate commit in this PR to address the changes requested. |
Add a new command to fix the encryption version. This would help the admin to fix the issues related to encryption version mismatch for the files. Signed-off-by: Sujith H <[email protected]>
c7b1fd4
to
f617238
Compare
Added commit f617238 to this PR. |
Fix minor wording corrections in the command and in the test. Signed-off-by: Sujith H <[email protected]>
f617238
to
c530242
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
|
This did not seem to make it into the |
I was just going to write something similar. I'm using daily-master to review changes and that command isn't available in 10.3.0 prealpha. |
This code is in the "new" core |
Thanks for the clarification, @phil-davis. Just as soon as it's in one of the Docker releases, I'll get it documented. |
Backport of
encryption
app PR owncloud/encryption#115Add a new command to fix the encryption
version. This would help the admin to
fix the issues related to encryption version
mismatch for the files.
Signed-off-by: Sujith H [email protected]
Description
The
encryption:fixencryptedversion
command becomes handy when the encrypted version in the filecache becomes inconsistent. It helps to fix the encrypted version, so that user doesn't hit withBad Signature
errors while trying to view or download the file from oC UI.Related Issue
Motivation and Context
The
encryption:fixencryptedversion
command becomes handy when the encrypted version in the filecache becomes inconsistent. It helps to fix the encrypted version, so that user doesn't hit withBad Signature
errors while trying to view or download the file from oC UI.How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist:
Open tasks: