Skip to content
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

fix moving an encrypted file to an unencrypted storage #38567

Merged
merged 1 commit into from
May 10, 2021

Conversation

C0rby
Copy link
Contributor

@C0rby C0rby commented Mar 22, 2021

Mark a file as unencrypted when moving it from an encrypted storage to an unencrypted storage.

Description

Related Issue

Motivation and Context

How Has This Been Tested?

  • test environment:
  • test case 1:
  • test case 2:
  • ...

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

@update-docs
Copy link

update-docs bot commented Mar 22, 2021

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@IljaN IljaN self-assigned this Mar 23, 2021
@IljaN
Copy link
Member

IljaN commented Mar 23, 2021

Known Limitation: While moving between encrypted and unencrypted storage works. Version restore breaks and corrupts the versioning history.

Mark a file as unencrypted when moving it from an encrypted storage to an unencrypted storage.

Co-authored-by: Ilja Neumann <ineumann@owncloud.com>
@IljaN IljaN force-pushed the fix-move-external-storage branch from cf0743e to 50706b7 Compare March 23, 2021 11:50
@sonarcloud
Copy link

sonarcloud bot commented Mar 23, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@micbar
Copy link
Contributor

micbar commented Apr 12, 2021

@karakayasemi Some ideas / feedback?

@karakayasemi karakayasemi self-requested a review April 18, 2021 17:28
@karakayasemi
Copy link
Contributor

Known Limitation: While moving between encrypted and unencrypted storage works. Version restore breaks and corrupts the versioning history.

Versioning is working fine in my local. Could you share the exact reproduction step? Thank you.

Copy link
Contributor

@karakayasemi karakayasemi left a comment

Choose a reason for hiding this comment

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

Tested, fix is working. Code looks good to me. After ensure it will not cause regression on versioning, I can approve the pr.

@micbar
Copy link
Contributor

micbar commented May 3, 2021

@IljaN @C0rby we have 6 weeks to code freeze.

@IljaN IljaN marked this pull request as ready for review May 10, 2021 07:45
@IljaN IljaN requested a review from karakayasemi May 10, 2021 07:46
Copy link
Contributor

@karakayasemi karakayasemi left a comment

Choose a reason for hiding this comment

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

I tested it, everything seemed fine to me after this change. The code looks good.

@IljaN IljaN merged commit 469c197 into master May 10, 2021
@delete-merged-branch delete-merged-branch bot deleted the fix-move-external-storage branch May 10, 2021 07:53
@IljaN IljaN added this to the development milestone May 10, 2021
@micbar
Copy link
Contributor

micbar commented May 10, 2021

@karakayasemi Can you file a changelog in a separate PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants