Skip to content

Fix the missing argument to DecryptAll#18

Merged
PVince81 merged 1 commit into
masterfrom
fix-decryptall-missingarg
Oct 27, 2017
Merged

Fix the missing argument to DecryptAll#18
PVince81 merged 1 commit into
masterfrom
fix-decryptall-missingarg

Conversation

@sharidas

Copy link
Copy Markdown
Contributor

logger is the last argument to DecryptAll which
was missing when DecryptAll is called. This change
fixes the same.

Signed-off-by: Sujith H sharidasan@owncloud.com

logger is the last argument to DecryptAll which
was missing when DecryptAll is called. This change
fixes the same.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
@sharidas sharidas requested a review from PVince81 October 27, 2017 03:50
@sharidas sharidas self-assigned this Oct 27, 2017
@sharidas sharidas added this to the QA milestone Oct 27, 2017
@sharidas

Copy link
Copy Markdown
Contributor Author

@PVince81 Not sure how this mess has happened, while creating the doc ticket, I realised that an argument is missing in the DecryptAll call. This is the PR to fix it. We need to merge this. Sorry for the inconvenience caued :(

@sharidas

Copy link
Copy Markdown
Contributor Author

The console output after this change:

sujith@sujith-Inspiron-5567 ~/test/owncloud $ rm -fr data config/config.php; ./occ  maintenance:install --admin-user "admin" --admin-pass "admin"; ./occ app:enable encryption; ./occ encryption:enable; ./occ encryption:select-encryption-type masterkey -y; ./occ encryption:recreate-master-key 
Cannot load Xdebug - it was already loaded
creating sqlite db
ownCloud was successfully installed
Cannot load Xdebug - it was already loaded
encryption enabled
Cannot load Xdebug - it was already loaded
Encryption enabled

Default module: OC_DEFAULT_MODULE
Cannot load Xdebug - it was already loaded
Master key successfully enabled.
Cannot load Xdebug - it was already loaded
Warning: In order to re-create master key, the entire ownCloud filesystem will be decrypted and then encrypted using new master key. Do you want to continue? (y/n)y
Decryption started

    1 [->--------------------------]prepare encryption modules...
 done.


 Fetch list of users... finished 
 [============================]


 starting to decrypt files... finished 
 [============================]


all files could be decrypted successfully!
    1 [============================]
Decryption completed

Encryption started

Waiting for creating new masterkey

New masterkey created successfully



Encrypt all files with the Default encryption module
====================================================


Use master key to encrypt all files.


Start to encrypt users files
----------------------------



 all files encrypted 
 [>---------------------------]


Encryption completed successfully

sujith@sujith-Inspiron-5567 ~/test/owncloud $

Output of the command when ran with -y option

sujith@sujith-Inspiron-5567 ~/test/owncloud $ rm -fr data config/config.php; ./occ  maintenance:install --admin-user "admin" --admin-pass "admin"; ./occ app:enable encryption; ./occ encryption:enable; ./occ encryption:select-encryption-type masterkey -y; ./occ encryption:recreate-master-key -y
Cannot load Xdebug - it was already loaded
creating sqlite db
ownCloud was successfully installed
Cannot load Xdebug - it was already loaded
encryption enabled
Cannot load Xdebug - it was already loaded
Encryption enabled

Default module: OC_DEFAULT_MODULE
Cannot load Xdebug - it was already loaded
Master key successfully enabled.
Cannot load Xdebug - it was already loaded
Decryption started

    1 [->--------------------------]prepare encryption modules...
 done.


 Fetch list of users... finished 
 [============================]


 starting to decrypt files... finished 
 [============================]


all files could be decrypted successfully!
    1 [============================]
Decryption completed

Encryption started

Waiting for creating new masterkey

New masterkey created successfully



Encrypt all files with the Default encryption module
====================================================


Use master key to encrypt all files.


Start to encrypt users files
----------------------------



 all files encrypted 
 [>---------------------------]


Encryption completed successfully

sujith@sujith-Inspiron-5567 ~/test/owncloud $

@PVince81 PVince81 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

@sharidas let's merge this quick fix. Can you separately look into writing an integration test for this command ?

@PVince81 PVince81 merged commit c46ac60 into master Oct 27, 2017
@PVince81 PVince81 deleted the fix-decryptall-missingarg branch October 27, 2017 07:28
@PVince81

Copy link
Copy Markdown
Contributor

@sharidas please backport

@sharidas

Copy link
Copy Markdown
Contributor Author

Backport PR: owncloud/core#29371

@patrickjahns patrickjahns removed this from the QA milestone Aug 13, 2019
Sign up for free to 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