[stable9] Make sure that the encrypted version is set #23709

Merged
merged 1 commit into from Apr 1, 2016

Projects

None yet

5 participants

@LukasReschke
Member

Backport of #23707

cc @PVince81 @schiesbn @owncloud/encryption

@LukasReschke LukasReschke Make sure that the encrypted version is set
The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following:

1. User uploaded a file
2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`.
3. The call when updating the file cache will use the old version.
d16553d
@mention-bot

By analyzing the blame information on this pull request, we identified @schiesbn, @DeepDiver1975 and @nickvergessen to be potential reviewers

@schiessle
Member

tested 👍

@PVince81
Collaborator
PVince81 commented Apr 1, 2016

Tested together with #23710, versions work fine 👍

@DeepDiver1975 DeepDiver1975 merged commit 193a33a into stable9 Apr 1, 2016

21 of 22 checks passed

server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #8813 failed in 2 min 20 sec
Details
cla-bot-core Build #2755 succeeded in 22 sec
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #60173 succeeded in 16 min
Details
core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #54172 succeeded in 23 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #28733 succeeded in 29 min
Details
core-ci-linux/database=oci,label=SLAVE Build #28733 succeeded in 56 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #28733 succeeded in 30 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #28733 succeeded in 14 min
Details
ocs-api-integration-tests-ci Build #9059 succeeded in 13 min
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #8813 succeeded in 3 min 37 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #8813 succeeded in 5 min 28 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #9788 succeeded in 5 min 31 sec
Details
server-master-linux-php5.4-ci/database=sqlite,label=SLAVE Build #1552 succeeded in 12 min
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #36999 succeeded in 10 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #13168 succeeded in 9 min 23 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #13168 succeeded in 46 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #13168 succeeded in 11 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #13169 succeeded in 21 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #13168 succeeded in 44 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #13169 succeeded in 27 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #13169 succeeded in 24 min
Details
@DeepDiver1975 DeepDiver1975 deleted the stable9-make-sure-that-encrypted-version-is-set branch Apr 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment