diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py
index 5308e2c8e1..d5df3c630b 100644
--- a/synapse/handlers/__init__.py
+++ b/synapse/handlers/__init__.py
@@ -25,6 +25,7 @@ from .profile import ProfileHandler
from .presence import PresenceHandler
from .directory import DirectoryHandler
from .typing import TypingNotificationHandler
+from .admin import AdminHandler
class Handlers(object):
@@ -49,3 +50,4 @@ class Handlers(object):
self.login_handler = LoginHandler(hs)
self.directory_handler = DirectoryHandler(hs)
self.typing_notification_handler = TypingNotificationHandler(hs)
+ self.admin_handler = AdminHandler(hs)
diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py
new file mode 100644
index 0000000000..687b343a1d
--- /dev/null
+++ b/synapse/handlers/admin.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# Copyright 2014 OpenMarket Ltd
+#
+# 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.
+
+from twisted.internet import defer
+
+from ._base import BaseHandler
+
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+class AdminHandler(BaseHandler):
+
+ def __init__(self, hs):
+ super(AdminHandler, self).__init__(hs)
+
+ @defer.inlineCallbacks
+ def get_whois(self, user):
+ res = yield self.store.get_user_ip_and_agents(user)
+
+ d = {}
+ for r in res:
+ device = d.setdefault(r["device_id"], {})
+ session = device.setdefault(r["access_token"], [])
+ session.append({
+ "ip": r["ip"],
+ "user_agent": r["user_agent"],
+ "last_seen": r["last_seen"],
+ })
+
+ ret = {
+ "user_id": user.to_string(),
+ "devices": [
+ {
+ "device_id": k,
+ "sessions": [
+ {
+ # "access_token": x, TODO (erikj)
+ "connections": y,
+ }
+ for x, y in v.items()
+ ]
+ }
+ for k, v in d.items()
+ ],
+ }
+
+ defer.returnValue(ret)
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index 4ab00a761a..84c3a1d56f 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -57,7 +57,6 @@ class DirectoryHandler(BaseHandler):
if not servers:
raise SynapseError(400, "Failed to get server list")
-
try:
yield self.store.create_room_alias_association(
room_alias,
@@ -68,25 +67,19 @@ class DirectoryHandler(BaseHandler):
defer.returnValue("Already exists")
# TODO: Send the room event.
+ yield self._update_room_alias_events(user_id, room_id)
- aliases = yield self.store.get_aliases_for_room(room_id)
-
- event = self.event_factory.create_event(
- etype=RoomAliasesEvent.TYPE,
- state_key=self.hs.hostname,
- room_id=room_id,
- user_id=user_id,
- content={"aliases": aliases},
- )
+ @defer.inlineCallbacks
+ def delete_association(self, user_id, room_alias):
+ # TODO Check if server admin
- snapshot = yield self.store.snapshot_room(
- room_id=room_id,
- user_id=user_id,
- )
+ if not room_alias.is_mine:
+ raise SynapseError(400, "Room alias must be local")
- yield self.state_handler.handle_new_event(event, snapshot)
- yield self._on_new_room_event(event, snapshot, extra_users=[user_id])
+ room_id = yield self.store.delete_room_alias(room_alias)
+ if room_id:
+ yield self._update_room_alias_events(user_id, room_id)
@defer.inlineCallbacks
def get_association(self, room_alias):
@@ -142,3 +135,23 @@ class DirectoryHandler(BaseHandler):
"room_id": result.room_id,
"servers": result.servers,
})
+
+ @defer.inlineCallbacks
+ def _update_room_alias_events(self, user_id, room_id):
+ aliases = yield self.store.get_aliases_for_room(room_id)
+
+ event = self.event_factory.create_event(
+ etype=RoomAliasesEvent.TYPE,
+ state_key=self.hs.hostname,
+ room_id=room_id,
+ user_id=user_id,
+ content={"aliases": aliases},
+ )
+
+ snapshot = yield self.store.snapshot_room(
+ room_id=room_id,
+ user_id=user_id,
+ )
+
+ yield self.state_handler.handle_new_event(event, snapshot)
+ yield self._on_new_room_event(event, snapshot, extra_users=[user_id])
|
