Fix PUTing documents with If-None-Match when non-existent

[raucao]

I found a pretty glaring bug when I tried to restore documents via rs-backup for development on my local machine:

The code currently does not discern between If-Match and If-None-Match in both the GET and PUT functions. It will just grab whichever header is set as the "version" and treat both headers the same way. When restoring a backup, and thus sending an ETAG in If-None-Match for a non-existent document (i.e. "create or update this document if there isn't one that matches this ETAG"), Armadietto will thus respond with a 412 conflict status.

This changeset fixes the bug, but I have not looked at the tests for it. I would appreciate if a more regular contributor could add the respective tests, since I currently don't have more time to spend on this. Thank you.

[DougReeder]

Yeah, I thought that was odd when I saw that code, but I didn't explore further. It appear to assume only one of those will be used with a given verb.

[DougReeder]

It seems we have tests that storage.js passes arguments to the store, but not tests that the store properly handles If-Match and If-None-Match. So I've added some, in branch https://github.com/remotestorage/armadietto/tree/test-if-none-match

If you pull that branch and go back to commit 17a7cf7 , you can see our existing code handles If-Match with an ETag and If-None-Match with *. It doesn't handle If-None-Match with an ETag, as the signature for the put method doesn't allow put to distinguish If-Match with an ETag vs. If-None-Match with an ETag, as @raucao noted.

Unfortunately, the tests show commit b578ded fixes If-None-Match with an ETag, at the expense of If-Match with an ETag and If-None-Match with *. and a number of other tests as well.

There will need to be some changes before we can merge this.

[DougReeder]

It seems we have tests that storage.js passes arguments to the store, but not tests that the store properly handles If-Match and If-None-Match. So I've added some, in branch https://github.com/remotestorage/armadietto/tree/test-if-none-match

If you pull that branch and go back to commit 17a7cf7 , you can see our existing code handles If-Match with an ETag and If-None-Match with *. It doesn't handle If-None-Match with an ETag, as the signature for the put method doesn't allow the method to distinguish If-Match with an ETag vs. If-None-Match with an ETag.

Unfortunately, the tests show commit b578ded fixes If-None-Match with an ETag, at the expense of If-Match with an ETag and If-None-Match with *. and a number of other tests as well.

There will need to be some changes before we can merge this.

[raucao]

Just a friendly FYI that this bug still exists (AFAIK), and prevents rs-backup from restoring backups.

However, I have no intention of adding more commits to this PR, since I'm the maintainer of a different server implementation myself (Liquor Cabinet + Akkounts), and I have no free capacity to get more familiar with the codebase here.

[DougReeder]

This is fixed in the modular server; can we close this PR in favor of that?