From 3ccb17ce592d7e75e0bd0237c347d64f63d5eb10 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 29 Sep 2014 14:59:52 +0100
Subject: SYN-48: Implement WHOIS rest servlet
---
synapse/rest/admin.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 synapse/rest/admin.py
(limited to 'synapse/rest/admin.py')
diff --git a/synapse/rest/admin.py b/synapse/rest/admin.py
new file mode 100644
index 0000000000..97eb1954e0
--- /dev/null
+++ b/synapse/rest/admin.py
@@ -0,0 +1,47 @@
+# -*- 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 synapse.api.errors import AuthError, SynapseError
+from base import RestServlet, client_path_pattern
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class WhoisRestServlet(RestServlet):
+ PATTERN = client_path_pattern("/admin/whois/(?P<user_id>[^/]*)")
+
+ @defer.inlineCallbacks
+ def on_GET(self, request, user_id):
+ target_user = self.hs.parse_userid(user_id)
+ auth_user = yield self.auth.get_user_by_req(request)
+ is_admin = yield self.auth.is_server_admin(auth_user)
+
+ if not is_admin and target_user != auth_user:
+ raise AuthError(403, "You are not a server admin")
+
+ if not target_user.is_mine:
+ raise SynapseError(400, "Can only whois a local user")
+
+ ret = yield self.handlers.admin_handler.get_whois(auth_user)
+
+ defer.returnValue((200, ret))
+
+
+def register_servlets(hs, http_server):
+ WhoisRestServlet(hs).register(http_server)
--
cgit 1.5.1
From 1132663cc7d2b168b32b0b48f65bbdf161d090f4 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 29 Sep 2014 15:04:04 +0100
Subject: SYN-48: Fix typo. Get the whois for requested user rather tahan the
requester
---
synapse/rest/admin.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'synapse/rest/admin.py')
diff --git a/synapse/rest/admin.py b/synapse/rest/admin.py
index 97eb1954e0..ed9b484623 100644
--- a/synapse/rest/admin.py
+++ b/synapse/rest/admin.py
@@ -38,7 +38,7 @@ class WhoisRestServlet(RestServlet):
if not target_user.is_mine:
raise SynapseError(400, "Can only whois a local user")
- ret = yield self.handlers.admin_handler.get_whois(auth_user)
+ ret = yield self.handlers.admin_handler.get_whois(target_user)
defer.returnValue((200, ret))
--
cgit 1.5.1