Skip to content

we also encrypt/decrypt files in the versions folder#11392

Merged
MorrisJobke merged 1 commit intomasterfrom
fix_version_previews
Oct 6, 2014
Merged

we also encrypt/decrypt files in the versions folder#11392
MorrisJobke merged 1 commit intomasterfrom
fix_version_previews

Conversation

@schiessle
Copy link
Copy Markdown
Contributor

we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled.

This fixes the preview creation for versions if encryption is enabled.

@MorrisJobke
Copy link
Copy Markdown
Contributor

What about the trashbin?

@schiessle
Copy link
Copy Markdown
Contributor Author

@MorrisJobke For the trash bin we don't provide previews at the moment. For versions it is relatively easy because only the encrypted file is stored at a different location (/data/user/files_versions) but the keys are all at the same place as for the current file because all of them use the same keys.
For the trashbin not only the file is in /data/user/files_trashbin but also the keys. To make it work for the trash bin we would need to handle a lot of special cases. Maybe this will come in the future.

@LukasReschke
Copy link
Copy Markdown
Member

Well, why not 👍

@LukasReschke
Copy link
Copy Markdown
Member

(requires a documentation update after merging)

@schiessle
Copy link
Copy Markdown
Contributor Author

There should be no documentation update needed, This is just a bug fix, we already encrypted versions before.

@schiessle
Copy link
Copy Markdown
Contributor Author

The jenkins fail is unrelated... Can we have a second reviewer for this small fix? @MorrisJobke @PVince81 Thanks!

@PVince81
Copy link
Copy Markdown
Contributor

PVince81 commented Oct 6, 2014

Can you add a unit test for this ?
Maybe unit-testing the function isEncryptedPath() would be nice if there isn't one already.

@schiessle schiessle force-pushed the fix_version_previews branch from 4b05f50 to 9147219 Compare October 6, 2014 10:03
@schiessle
Copy link
Copy Markdown
Contributor Author

@PVince81 unit tests added

@DeepDiver1975
Copy link
Copy Markdown
Member

@owncloud-bot retest this please

@scrutinizer-notifier
Copy link
Copy Markdown

The inspection completed: 6 new issues, 7 updated code elements

@PVince81
Copy link
Copy Markdown
Contributor

PVince81 commented Oct 6, 2014

Before the fix: text preview appears encrypted in versions dropdown
After the fix: text preview appears correctly in versions dropdown

👍

@ghost
Copy link
Copy Markdown

ghost commented Oct 6, 2014

🚀 Test PASSed. 🚀
Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng/110/

MorrisJobke added a commit that referenced this pull request Oct 6, 2014
we also encrypt/decrypt files in the versions folder
@MorrisJobke MorrisJobke merged commit e5b4e54 into master Oct 6, 2014
@MorrisJobke MorrisJobke deleted the fix_version_previews branch October 6, 2014 11:03
@MorrisJobke
Copy link
Copy Markdown
Contributor

@schiesbn Backport?

@schiessle
Copy link
Copy Markdown
Contributor Author

yes, I will backport it

@schiessle
Copy link
Copy Markdown
Contributor Author

stable7: 3039837

@karlitschek
Copy link
Copy Markdown
Contributor

Thanks.
Would be great to wait for an approval from me before backporting. :-)

@lock lock bot locked as resolved and limited conversation to collaborators Aug 16, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants