Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
2a81393a
Commit
2a81393a
authored
5 years ago
by
Richard van der Hoff
Browse files
Options
Downloads
Patches
Plain Diff
Pass room_version into add_hashes_and_signatures
parent
54f3f369
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
synapse/crypto/event_signing.py
+13
-7
13 additions, 7 deletions
synapse/crypto/event_signing.py
synapse/events/builder.py
+1
-1
1 addition, 1 deletion
synapse/events/builder.py
tests/crypto/test_event_signing.py
+7
-2
7 additions, 2 deletions
tests/crypto/test_event_signing.py
with
21 additions
and
10 deletions
synapse/crypto/event_signing.py
+
13
−
7
View file @
2a81393a
...
...
@@ -20,10 +20,13 @@ import logging
from
canonicaljson
import
encode_canonical_json
from
signedjson.sign
import
sign_json
from
signedjson.types
import
SigningKey
from
unpaddedbase64
import
decode_base64
,
encode_base64
from
synapse.api.errors
import
Codes
,
SynapseError
from
synapse.api.room_versions
import
RoomVersion
from
synapse.events.utils
import
prune_event
,
prune_event_dict
from
synapse.types
import
JsonDict
logger
=
logging
.
getLogger
(
__name__
)
...
...
@@ -137,20 +140,23 @@ def compute_event_signature(event_dict, signature_name, signing_key):
def
add_hashes_and_signatures
(
event_dict
,
signature_name
,
signing_key
,
hash_algorithm
=
hashlib
.
sha256
room_version
:
RoomVersion
,
event_dict
:
JsonDict
,
signature_name
:
str
,
signing_key
:
SigningKey
,
):
"""
Add content hash and sign the event
Args:
event_dict (dict): The event to add hashes to and sign
signature_name (str): The name of the entity signing the event
room_version: the version of the room this event is in
event_dict: The event to add hashes to and sign
signature_name: The name of the entity signing the event
(typically the server
'
s hostname).
signing_key (syutil.crypto.SigningKey): The key to sign with
hash_algorithm: A hasher from `hashlib`, e.g. hashlib.sha256, to use
to hash the event
signing_key: The key to sign with
"""
name
,
digest
=
compute_content_hash
(
event_dict
,
hash_algorithm
=
hash
_algorithm
)
name
,
digest
=
compute_content_hash
(
event_dict
,
hash_algorithm
=
hash
lib
.
sha256
)
event_dict
.
setdefault
(
"
hashes
"
,
{})[
name
]
=
encode_base64
(
digest
)
...
...
This diff is collapsed.
Click to expand it.
synapse/events/builder.py
+
1
−
1
View file @
2a81393a
...
...
@@ -255,7 +255,7 @@ def create_local_event_from_event_dict(
event_dict
.
setdefault
(
"
signatures
"
,
{})
add_hashes_and_signatures
(
event_dict
,
hostname
,
signing_key
)
add_hashes_and_signatures
(
room_version
,
event_dict
,
hostname
,
signing_key
)
return
event_type_from_format_version
(
format_version
)(
event_dict
,
internal_metadata_dict
=
internal_metadata_dict
)
...
...
This diff is collapsed.
Click to expand it.
tests/crypto/test_event_signing.py
+
7
−
2
View file @
2a81393a
...
...
@@ -17,6 +17,7 @@
import
nacl.signing
from
unpaddedbase64
import
decode_base64
from
synapse.api.room_versions
import
RoomVersions
from
synapse.crypto.event_signing
import
add_hashes_and_signatures
from
synapse.events
import
FrozenEvent
...
...
@@ -49,7 +50,9 @@ class EventSigningTestCase(unittest.TestCase):
"
unsigned
"
:
{
"
age_ts
"
:
1000000
},
}
add_hashes_and_signatures
(
event_dict
,
HOSTNAME
,
self
.
signing_key
)
add_hashes_and_signatures
(
RoomVersions
.
V1
,
event_dict
,
HOSTNAME
,
self
.
signing_key
)
event
=
FrozenEvent
(
event_dict
)
...
...
@@ -81,7 +84,9 @@ class EventSigningTestCase(unittest.TestCase):
"
unsigned
"
:
{
"
age_ts
"
:
1000000
},
}
add_hashes_and_signatures
(
event_dict
,
HOSTNAME
,
self
.
signing_key
)
add_hashes_and_signatures
(
RoomVersions
.
V1
,
event_dict
,
HOSTNAME
,
self
.
signing_key
)
event
=
FrozenEvent
(
event_dict
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment