summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-14 01:06:44 +1000
committerGitHub <noreply@github.com>2018-09-14 01:06:44 +1000
commitcb64fe2cb7d1867e0ad6008516a1f0205581eb83 (patch)
tree696e0e9213c06c65188083b52889e2b06e41b07a /synapse
parentfix circleci merged builds (#3858) (diff)
parentNewsfile (diff)
downloadsynapse-cb64fe2cb7d1867e0ad6008516a1f0205581eb83.tar.xz
Merge pull request #3859 from matrix-org/erikj/add_iterkeys
Fix handling of redacted events from federation
Diffstat (limited to 'synapse')
-rw-r--r--synapse/events/__init__.py5
-rw-r--r--synapse/federation/federation_base.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py
index 51f9084b90..b782af6308 100644
--- a/synapse/events/__init__.py
+++ b/synapse/events/__init__.py
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import six
+
 from synapse.util.caches import intern_dict
 from synapse.util.frozenutils import freeze
 
@@ -147,6 +149,9 @@ class EventBase(object):
     def items(self):
         return list(self._event_dict.items())
 
+    def keys(self):
+        return six.iterkeys(self._event_dict)
+
 
 class FrozenEvent(EventBase):
     def __init__(self, event_dict, internal_metadata_dict={}, rejected_reason=None):
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py
index 61782ae1c0..b7ad729c63 100644
--- a/synapse/federation/federation_base.py
+++ b/synapse/federation/federation_base.py
@@ -153,7 +153,7 @@ class FederationBase(object):
                     # *actual* redacted copy to be on the safe side.)
                     redacted_event = prune_event(pdu)
                     if (
-                        set(six.iterkeys(redacted_event)) == set(six.iterkeys(pdu)) and
+                        set(redacted_event.keys()) == set(pdu.keys()) and
                         set(six.iterkeys(redacted_event.content))
                             == set(six.iterkeys(pdu.content))
                     ):