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])
diff --git a/synapse/rest/directory.py b/synapse/rest/directory.py
index 31849246a1..6c260e7102 100644
--- a/synapse/rest/directory.py
+++ b/synapse/rest/directory.py
@@ -16,7 +16,7 @@
from twisted.internet import defer
-from synapse.api.errors import SynapseError, Codes
+from synapse.api.errors import AuthError, SynapseError, Codes
from base import RestServlet, client_path_pattern
import json
@@ -81,6 +81,24 @@ class ClientDirectoryServer(RestServlet):
defer.returnValue((200, {}))
+ @defer.inlineCallbacks
+ def on_DELETE(self, request, room_alias):
+ user = yield self.auth.get_user_by_req(request)
+
+ is_admin = yield self.auth.is_server_admin(user)
+ if not is_admin:
+ raise AuthError(403, "You need to be a server admin")
+
+ dir_handler = self.handlers.directory_handler
+
+ room_alias = self.hs.parse_roomalias(urllib.unquote(room_alias))
+
+ yield dir_handler.delete_association(
+ user.to_string(), room_alias
+ )
+
+ defer.returnValue((200, {}))
+
def _parse_json(request):
try:
diff --git a/synapse/storage/directory.py b/synapse/storage/directory.py
index 540eb4c2c4..52373a28a6 100644
--- a/synapse/storage/directory.py
+++ b/synapse/storage/directory.py
@@ -93,6 +93,36 @@ class DirectoryStore(SQLBaseStore):
}
)
+ def delete_room_alias(self, room_alias):
+ return self.runInteraction(
+ self._delete_room_alias_txn,
+ room_alias,
+ )
+
+ def _delete_room_alias_txn(self, txn, room_alias):
+ cursor = txn.execute(
+ "SELECT room_id FROM room_aliases WHERE room_alias = ?",
+ (room_alias.to_string(),)
+ )
+
+ res = cursor.fetchone()
+ if res:
+ room_id = res[0]
+ else:
+ return None
+
+ txn.execute(
+ "DELETE FROM room_aliases WHERE room_alias = ?",
+ (room_alias.to_string(),)
+ )
+
+ txn.execute(
+ "DELETE FROM room_alias_servers WHERE room_alias = ?",
+ (room_alias.to_string(),)
+ )
+
+ return room_id
+
def get_aliases_for_room(self, room_id):
return self._simple_select_onecol(
"room_aliases",
diff --git a/tests/storage/test_directory.py b/tests/storage/test_directory.py
index 7e8e7e1e83..e9c242cc07 100644
--- a/tests/storage/test_directory.py
+++ b/tests/storage/test_directory.py
@@ -30,7 +30,8 @@ class DirectoryStoreTestCase(unittest.TestCase):
db_pool = SQLiteMemoryDbPool()
yield db_pool.prepare()
- hs = HomeServer("test",
+ hs = HomeServer(
+ "test",
db_pool=db_pool,
)
@@ -60,9 +61,25 @@ class DirectoryStoreTestCase(unittest.TestCase):
servers=["test"],
)
-
self.assertObjectHasAttributes(
- {"room_id": self.room.to_string(),
- "servers": ["test"]},
+ {
+ "room_id": self.room.to_string(),
+ "servers": ["test"],
+ },
+ (yield self.store.get_association_from_room_alias(self.alias))
+ )
+
+ @defer.inlineCallbacks
+ def test_delete_alias(self):
+ yield self.store.create_room_alias_association(
+ room_alias=self.alias,
+ room_id=self.room.to_string(),
+ servers=["test"],
+ )
+
+ room_id = yield self.store.delete_room_alias(self.alias)
+ self.assertEqual(self.room.to_string(), room_id)
+
+ self.assertIsNone(
(yield self.store.get_association_from_room_alias(self.alias))
)
|
