From 32322267dd9e89cb6f0ed07ac7869a57f0eaeb47 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Thu, 22 Jun 2017 02:37:37 -0300 Subject: [bug] incoming doesnt accept encryption schemes According to /incoming specification, this parameter doesn't exists. It was added on MX side and brought here on transition. This commit explicitly removes it, leaving a track on history that it got removed during transition. Further work on MX will also remove the "NONE" encryption scheme, which is part of dead code. --- server/src/leap/soledad/server/_incoming.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'server/src') diff --git a/server/src/leap/soledad/server/_incoming.py b/server/src/leap/soledad/server/_incoming.py index 1f74a6e4..6fd91a08 100644 --- a/server/src/leap/soledad/server/_incoming.py +++ b/server/src/leap/soledad/server/_incoming.py @@ -27,7 +27,6 @@ from leap.soledad.common.crypto import EncryptionSchemes __all__ = ['IncomingResource'] -ACCEPTED_SCHEMES = [EncryptionSchemes.NONE, EncryptionSchemes.PUBKEY] def _default_backend(): @@ -43,8 +42,8 @@ class IncomingResource(Resource): self.formatter = IncomingFormatter() def render_PUT(self, request): - uuid, doc_id, scheme = request.postpath - assert scheme in ACCEPTED_SCHEMES + uuid, doc_id = request.postpath + scheme = EncryptionSchemes.PUBKEY db = self.factory.open_database(uuid) doc = ServerDocument(doc_id) doc.content = self.formatter.format(request.content.read(), scheme) -- cgit v1.2.3