diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
new file mode 100644
index 0000000000..12e7afca4c
--- /dev/null
+++ b/synapse/handlers/federation.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+# Copyright 2014 matrix.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Contains handlers for federation events."""
+
+from ._base import BaseHandler
+
+from synapse.api.events.room import InviteJoinEvent, RoomMemberEvent
+from synapse.api.constants import Membership
+from synapse.util.logutils import log_function
+
+from twisted.internet import defer
+
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+class FederationHandler(BaseHandler):
+
+ """Handles events that originated from federation."""
+
+ @log_function
+ @defer.inlineCallbacks
+ def on_receive(self, event, is_new_state):
+ if hasattr(event, "state_key") and not is_new_state:
+ logger.debug("Ignoring old state.")
+ return
+
+ target_is_mine = False
+ if hasattr(event, "target_host"):
+ target_is_mine = event.target_host == self.hs.hostname
+
+ if event.type == InviteJoinEvent.TYPE:
+ if not target_is_mine:
+ logger.debug("Ignoring invite/join event %s", event)
+ return
+
+ # If we receive an invite/join event then we need to join the
+ # sender to the given room.
+ # TODO: We should probably auth this or some such
+ content = event.content
+ content.update({"membership": Membership.JOIN})
+ new_event = self.event_factory.create_event(
+ etype=RoomMemberEvent.TYPE,
+ target_user_id=event.user_id,
+ room_id=event.room_id,
+ user_id=event.user_id,
+ membership=Membership.JOIN,
+ content=content
+ )
+
+ yield self.hs.get_handlers().room_member_handler.change_membership(
+ new_event,
+ True
+ )
+
+ else:
+ with (yield self.room_lock.lock(event.room_id)):
+ store_id = yield self.store.persist_event(event)
+
+ yield self.notifier.on_new_room_event(event, store_id)
|