Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Raise a more helpful exception

This commit is contained in:
Erik Johnston 2017-03-23 13:48:30 +00:00
parent e64655c25d
commit 6ebe2d23b1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/storage/end_to_end_keys.py
View File

@ -14,6 +14,8 @@
# limitations under the License. # limitations under the License.
from twisted.internet import defer from twisted.internet import defer
from synapse.api.errors import SynapseError
from canonicaljson import encode_canonical_json from canonicaljson import encode_canonical_json
import ujson as json import ujson as json
@ -150,8 +152,8 @@ class EndToEndKeyStore(SQLBaseStore):
if key_id in existing_key_map: if key_id in existing_key_map:
ex_algo, ex_bytes = existing_key_map[key_id] ex_algo, ex_bytes = existing_key_map[key_id]
if algorithm != ex_algo or json_bytes != ex_bytes: if algorithm != ex_algo or json_bytes != ex_bytes:
raise Exception( raise SynapseError(
"One time key with key_id %r already exists" % (key_id,) 400, "One time key with key_id %r already exists" % (key_id,)
) )
else: else:
new_keys.append((algorithm, key_id, json_bytes)) new_keys.append((algorithm, key_id, json_bytes))