calculate and update the version of the encryption signature correctly

[schiessle]

fix #22260

steps to test:

1. Enable encryption
2. Upload a file "test.txt"
3. Update the file "test.txt" in the web UI with the text editor, save
4. Check "encrypted" column in database
5. Update the file "test.txt" with Webdav PUT
6. Check "encrypted" column in database

cc @PVince81 @LukasReschke

[mention-bot]

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

[schiessle]

will write/update unit test... but please test this already if it fixes all the issues. @PVince81 maybe you can run smashbox against it? Thanks!

[nickvergessen]

Smashing: ⏳

[nickvergessen]

{
  "reqId": "byzACVvfhAscHVi4RgP8",
  "remoteAddr": "10.0.2.2",
  "app": "PHP",
  "message": "Call to a member function update() on null at \/home\/nickv\/ownCloud\/master\/core\/lib\/private\/files\/storage\/wrapper\/encryption.php#263",
  "level": 3,
  "time": "2016-02-10T10:34:24+00:00"
}

Exception when trying to delete:

Unexpected response: Status code: 500 - 
Operation "rmdir" must be allowed when share permissions are 31  ["/home/nickv/ownCloud/Smashbox/smashbox/lib/oc-tests/test_sharePermissions.py" at line 251]

[nickvergessen]

Unit tests fail as well, so that should help finding the issue

PHP Fatal error:  Call to a member function update() on null in /ssd/jenkins/workspace/core-ci-linux@3/database/sqlite/label/SLAVE/lib/private/files/storage/wrapper/encryption.php on line 263

[schiessle]

OK, this version should hopefully work for all tests. I'm not completely happy with the solution but I have no better idea at the moment and it also clean up some stuff (e.g. no more $realPath variable needed).

[LukasReschke]

Did some kinda extensive smoke testing locally. Worked fine 👍

[nickvergessen]

Smashbox: ✅

[PVince81]

That looks good, even with versions:

| files/test.txt                                                              |         4 |
| files_versions/test                                                         |         0 |
| files_versions/test.txt.v1455113368                                         |         1 |
| files_versions/test.txt.v1455113435                                         |         2 |
| files_versions/test.txt.v1455113498                                         |         3 |
| files_versions/test/test2.txt.v1455113375                                   |         1 |
| files_versions/test/test2.txt.v1455113441                                   |         2 |
| files_versions/test/test2.txt.v1455113487                                   |         3 |

Tested after upgrading with existing encrypted versions.

[PVince81]

I also checked that the version files can still be downloaded.

👍

[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.