[stable22] Fix encrypted version to 0 when finding unencrypted file #28603
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot-nextcloud[bot]](https://github.com/avatars/in/21012?s=60&v=4){kind=small}
backportbot-nextcloud
bot
requested review from
artonge,
CarlSchwan,
juliusknorr,
LukasReschke and
PVince81
Whenever the command is run and a "legacy cipher" seems to be detected when the legacy option is disabled, it's highly likely that the file is actually unencrypted but the database contains a encrypted version higher than 0 for some reason. The command now detects this case and automatically sets the encrypted version to 0 so that the file can be read again. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
This prevents side effects in tests by properly cleaning up even with expected exceptions. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
PVince81
force-pushed
the
backport/28373/stable22
branch
from
56db3ef
to
eada9ea
Compare
|
conflicts solved, it was in the use statements |
juliusknorr
approved these changes
Aug 26, 2021
|
Failed test unrelated: 1) Test\Files\ObjectStore\AzureTest::testCopy
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'foobar'
+'Path or Http-Method does not match any emulated command.\n
+Possible causes include\n
+ - missing account name path parameter\n
+ - Unsupported Http-Method on resource\n
+ - Unsupported / Not implemented "comp" query parameter on resource'
/drone/src/tests/lib/Files/ObjectStore/ObjectStoreTest.php:125 |
MichaIng
approved these changes
Aug 26, 2021
|
thanks a lot for the reviews and merges @MichaIng |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport of #28373