From 2f0f911c52f6de48e47fbb5624a3e3beee0dd6a4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 30 Oct 2018 10:35:18 +0000
Subject: Convert version back to a string

---
 synapse/storage/e2e_room_keys.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'synapse/storage/e2e_room_keys.py')

diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index f25ded2295..9f826b292c 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -236,6 +236,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
                 ),
             )
             result["auth_data"] = json.loads(result["auth_data"])
+            result["version"] = str(result["version"])
             return result
 
         return self.runInteraction(
-- 
cgit 1.5.1


From 12941f5f8b1f38f273e301104203149b10e9e214 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 30 Oct 2018 11:01:07 +0000
Subject: Cast bacjup version to int when querying

---
 synapse/storage/e2e_room_keys.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'synapse/storage/e2e_room_keys.py')

diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index 9f826b292c..2a012e9487 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -219,7 +219,12 @@ class EndToEndRoomKeyStore(SQLBaseStore):
             if version is None:
                 this_version = self._get_current_version(txn, user_id)
             else:
-                this_version = version
+                try:
+                    this_version = int(version)
+                except ValueError:
+                    # Our versions are all ints so if we can't convert it to an integer,
+                    # it isn't there.
+                    raise StoreError(404, "No row found")
 
             result = self._simple_select_one_txn(
                 txn,
-- 
cgit 1.5.1


From e0934acdbbd497ee1330efe42feccb11382639ec Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 30 Oct 2018 11:12:23 +0000
Subject: Cast to int here too

---
 synapse/storage/e2e_room_keys.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'synapse/storage/e2e_room_keys.py')

diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index 2a012e9487..a1d203fd61 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -118,6 +118,11 @@ class EndToEndRoomKeyStore(SQLBaseStore):
             these room keys.
         """
 
+        try:
+            version = int(version)
+        except ValueError:
+            defer.returnValue({'rooms': {}})
+
         keyvalues = {
             "user_id": user_id,
             "version": version,
-- 
cgit 1.5.1


From 4f93abd62d6800c00c9e943f75e19e09c98c8f30 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Nov 2018 13:25:38 +0000
Subject: add docs

---
 synapse/storage/e2e_room_keys.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'synapse/storage/e2e_room_keys.py')

diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index a1d203fd61..5d83707fa0 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -217,7 +217,10 @@ class EndToEndRoomKeyStore(SQLBaseStore):
         Raises:
             StoreError: with code 404 if there are no e2e_room_keys_versions present
         Returns:
-            A deferred dict giving the info metadata for this backup version
+            A deferred dict giving the info metadata for this backup version, with fields including:
+                version(str)
+                algorithm(str)
+                auth_data(object): opaque dict supplied by the client
         """
 
         def _get_e2e_room_keys_version_info_txn(txn):
-- 
cgit 1.5.1


From d44dea0223c16f86a57647e670b8a7651b93aa2a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Nov 2018 14:38:31 +0000
Subject: pep8

---
 synapse/storage/e2e_room_keys.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'synapse/storage/e2e_room_keys.py')

diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index 5d83707fa0..16b7f005aa 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -217,7 +217,8 @@ class EndToEndRoomKeyStore(SQLBaseStore):
         Raises:
             StoreError: with code 404 if there are no e2e_room_keys_versions present
         Returns:
-            A deferred dict giving the info metadata for this backup version, with fields including:
+            A deferred dict giving the info metadata for this backup version, with
+            fields including:
                 version(str)
                 algorithm(str)
                 auth_data(object): opaque dict supplied by the client
-- 
cgit 1.5.1