Changes to encryption wrapper

[sharidas]

Changes made to encryption wrapper so that we can
get the commands like transfer-ownership or recreate
masterkey work. This change doesn't alter the core
functionality of copy or fopen function. The arguments
passed to the function remains same as other wrappers.

Signed-off-by: Sujith H [email protected]

Description

Changes made to the ecnryption warpper and view to get the transfer-ownership command recreate master key work. Basically there was a problem which caused to change the arguments passed to the routines like fopen or copy. With this change we don't have to alter them. But we use flags to control the code flow for the commands.

Related Issue

Motivation and Context

This change would prevent the modification to common routines which were made to arguments of functions like fopen or copy etc.

How Has This Been Tested?

• Scratch installation of oC and create 2 users
• Verified transfer ownership command works with and without encryption between two users.
• Verified Recreate command for master key works on the same setup.

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

[PVince81]

great progress, see comments

let's use the static approach

[PVince81]

please remove

[PVince81]

so if I understand correctly, this flag only affects write operations ?

If yes, call it $disableWriteEncryption instead and the methods setDisableWriteEncryption()

[PVince81]

Just pass the flag as argument, no need to write two methods...

[PVince81]

I'd prefer that the View doesn't know anything about encryption. Encryption is just like a plugin that inserts itself so it's not good that the core code like View relies on encryption specific things.

Let's make flag static in the Encryption class above instead and set it from outside. That should do for now.

[PVince81]

you need to call isset earlier, else line 478 is going to throw a warning when not set

[PVince81]

@sharidas did you miss this comment ?

[sharidas]

No, I thought in a different way. wrap() expects either null or string from$this->sourcePath[$path]. So if $this->sourcePath[$path] not set then I set as null at https://github.com/owncloud/core/pull/28774/files#diff-938b56891f3079e628cfda1c331911b7R476 .
Else if its set then unset at line 484. Terrible idea?

[PVince81]

use unset for maximum deletion

[sharidas]

• Removed changes from View which points to encryption.
• Removed the comment ( code comment )
• Renamed the variable $decryptedFile to $disableWriteEncryption and also renamed the function associated with the operation to setDisableWriteEncryption(). Argument is passed to setDisableWriteEncryption() for operation set or unset.
• [x]

[PVince81]

This is going to break horribly with external storage because you are doing a fopen directly on the filesystem.

Use $this->getWrapperStorage()->fopen() instead

[sharidas]

@PVince81 Updated in my latest PR. Thanks for pointing it out.

[sharidas]

Hope this looks better.

[PVince81]

function must be static

[sharidas]

Done.

[sharidas]

• Made the function setDisableWriteEncryption static.
• Used a local variable to pass the $this->sourcePath[$path] if its set else null to -> wrap()
• Removed the view code

[PVince81]

PHPDoc comments please

[PVince81]

👍 add missing PHP doc then this is good to go

[PVince81]

@sharidas please backport to stable10

[sharidas]

Backport of this PR: #28845

[lock]

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.