summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/leap/soledad/server/_incoming.py2
-rw-r--r--testing/tests/server/test_incoming_resource.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/leap/soledad/server/_incoming.py b/src/leap/soledad/server/_incoming.py
index b39f17d0..eded5932 100644
--- a/src/leap/soledad/server/_incoming.py
+++ b/src/leap/soledad/server/_incoming.py
@@ -100,7 +100,7 @@ class IncomingFormatter(object):
def format(self, raw_content, enc_scheme):
return {self.INCOMING_KEY: True,
self.ERROR_DECRYPTING_KEY: False,
- ENC_SCHEME_KEY: EncryptionSchemes.NONE,
+ ENC_SCHEME_KEY: enc_scheme,
ENC_JSON_KEY: raw_content}
def preamble(self, raw_content, doc_id):
diff --git a/testing/tests/server/test_incoming_resource.py b/testing/tests/server/test_incoming_resource.py
index 16e1e720..0d4918b9 100644
--- a/testing/tests/server/test_incoming_resource.py
+++ b/testing/tests/server/test_incoming_resource.py
@@ -50,3 +50,8 @@ class IncomingResourceTestCase(unittest.TestCase):
doc = self.couchdb.put_doc.call_args[0][0]
self.assertEquals(doc_id, doc.doc_id)
self.assertEquals(formatter.format(content, scheme), doc.content)
+
+ def test_formatter(self):
+ formatter = IncomingFormatter()
+ formatted = formatter.format('content', EncryptionSchemes.PUBKEY)
+ self.assertEquals(formatted['_enc_scheme'], EncryptionSchemes.PUBKEY)