From 909ceecc28fc3815971f1dbcebb160f0ad13ab13 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 30 Apr 2019 17:27:58 +0100 Subject: Tests --- tests/rest/client/test_identity.py | 41 +++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) (limited to 'tests/rest/client/test_identity.py') diff --git a/tests/rest/client/test_identity.py b/tests/rest/client/test_identity.py index 7e8b95887f..14756a31b7 100644 --- a/tests/rest/client/test_identity.py +++ b/tests/rest/client/test_identity.py @@ -16,6 +16,7 @@ import json from synapse.rest.client.v1 import admin, login, room +from synapse.rest.client.v2_alpha import account from tests import unittest @@ -23,6 +24,7 @@ from tests import unittest class IdentityTestCase(unittest.HomeserverTestCase): servlets = [ + account.register_servlets, admin.register_servlets, room.register_servlets, login.register_servlets, @@ -36,12 +38,13 @@ class IdentityTestCase(unittest.HomeserverTestCase): return self.hs - def test_3pid_lookup_disabled(self): - self.register_user("kermit", "monkey") - tok = self.login("kermit", "monkey") + def prepare(self, reactor, clock, hs): + self.user_id = self.register_user("kermit", "monkey") + self.tok = self.login("kermit", "monkey") + def test_3pid_invite_disabled(self): request, channel = self.make_request( - b"POST", "/createRoom", b"{}", access_token=tok, + b"POST", "/createRoom", b"{}", access_token=self.tok, ) self.render(request) self.assertEquals(channel.result["code"], b"200", channel.result) @@ -57,7 +60,35 @@ class IdentityTestCase(unittest.HomeserverTestCase): "/rooms/%s/invite" % (room_id) ).encode('ascii') request, channel = self.make_request( - b"POST", request_url, request_data, access_token=tok, + b"POST", request_url, request_data, access_token=self.tok, ) self.render(request) self.assertEquals(channel.result["code"], b"403", channel.result) + + def test_3pid_lookup_disabled(self): + url = "/_matrix/client/unstable/account/3pid/lookup?id_server=testis&medium=email&address=foo@bar.baz" + request, channel = self.make_request("GET", url, access_token=self.tok) + self.render(request) + self.assertEqual(channel.result["code"], b"403", channel.result) + + def test_3pid_bulk_lookup_disabled(self): + url = "/_matrix/client/unstable/account/3pid/bulk_lookup" + data = { + "id_server": "testis", + "threepids": [ + [ + "email", + "foo@bar.baz" + ], + [ + "email", + "john.doe@matrix.org" + ] + ] + } + request_data = json.dumps(data) + request, channel = self.make_request( + "POST", url, request_data, access_token=self.tok, + ) + self.render(request) + self.assertEqual(channel.result["code"], b"403", channel.result) -- cgit 1.5.1 From 96bd70f6d03cff8c88e05ccb228671fce9cbfe15 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 30 Apr 2019 18:22:52 +0100 Subject: Bunch of tests --- tests/rest/client/test_identity.py | 126 ++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) (limited to 'tests/rest/client/test_identity.py') diff --git a/tests/rest/client/test_identity.py b/tests/rest/client/test_identity.py index 14756a31b7..c1b1b11202 100644 --- a/tests/rest/client/test_identity.py +++ b/tests/rest/client/test_identity.py @@ -15,13 +15,17 @@ import json +from mock import Mock + +from twisted.internet import defer + from synapse.rest.client.v1 import admin, login, room from synapse.rest.client.v2_alpha import account from tests import unittest -class IdentityTestCase(unittest.HomeserverTestCase): +class IdentityDisabledTestCase(unittest.HomeserverTestCase): servlets = [ account.register_servlets, @@ -66,7 +70,8 @@ class IdentityTestCase(unittest.HomeserverTestCase): self.assertEquals(channel.result["code"], b"403", channel.result) def test_3pid_lookup_disabled(self): - url = "/_matrix/client/unstable/account/3pid/lookup?id_server=testis&medium=email&address=foo@bar.baz" + url = ("/_matrix/client/unstable/account/3pid/lookup" + "?id_server=testis&medium=email&address=foo@bar.baz") request, channel = self.make_request("GET", url, access_token=self.tok) self.render(request) self.assertEqual(channel.result["code"], b"403", channel.result) @@ -92,3 +97,120 @@ class IdentityTestCase(unittest.HomeserverTestCase): ) self.render(request) self.assertEqual(channel.result["code"], b"403", channel.result) + + +class IdentityEnabledTestCase(unittest.HomeserverTestCase): + + servlets = [ + account.register_servlets, + admin.register_servlets, + room.register_servlets, + login.register_servlets, + ] + + def make_homeserver(self, reactor, clock): + + config = self.default_config() + config.enable_3pid_lookup = True + + mock_http_client = Mock(spec=[ + "get_json", + "post_json", + ]) + mock_http_client.get_json.return_value = defer.succeed((200, "{}")) + mock_http_client.post_json.return_value = defer.succeed((200, "{}")) + + self.hs = self.setup_test_homeserver( + config=config, + simple_http_client=mock_http_client, + ) + + return self.hs + + def prepare(self, reactor, clock, hs): + self.user_id = self.register_user("kermit", "monkey") + self.tok = self.login("kermit", "monkey") + + def test_3pid_invite_enabled(self): + request, channel = self.make_request( + b"POST", "/createRoom", b"{}", access_token=self.tok, + ) + self.render(request) + self.assertEquals(channel.result["code"], b"200", channel.result) + room_id = channel.json_body["room_id"] + + params = { + "id_server": "testis", + "medium": "email", + "address": "test@example.com", + } + request_data = json.dumps(params) + request_url = ( + "/rooms/%s/invite" % (room_id) + ).encode('ascii') + request, channel = self.make_request( + b"POST", request_url, request_data, access_token=self.tok, + ) + self.render(request) + + get_json = self.hs.get_simple_http_client().get_json + get_json.assert_called_once_with( + "https://testis/_matrix/identity/api/v1/lookup", + { + "address": "test@example.com", + "medium": "email", + }, + ) + + def test_3pid_lookup_enabled(self): + url = ("/_matrix/client/unstable/account/3pid/lookup" + "?id_server=testis&medium=email&address=foo@bar.baz") + request, channel = self.make_request("GET", url, access_token=self.tok) + self.render(request) + + get_json = self.hs.get_simple_http_client().get_json + get_json.assert_called_once_with( + "https://testis/_matrix/identity/api/v1/lookup", + { + "address": "foo@bar.baz", + "medium": "email", + }, + ) + + def test_3pid_bulk_lookup_enabled(self): + url = "/_matrix/client/unstable/account/3pid/bulk_lookup" + data = { + "id_server": "testis", + "threepids": [ + [ + "email", + "foo@bar.baz" + ], + [ + "email", + "john.doe@matrix.org" + ] + ] + } + request_data = json.dumps(data) + request, channel = self.make_request( + "POST", url, request_data, access_token=self.tok, + ) + self.render(request) + + post_json = self.hs.get_simple_http_client().post_json + post_json.assert_called_once_with( + "https://testis/_matrix/identity/api/v1/bulk_lookup", + { + "threepids": [ + [ + "email", + "foo@bar.baz" + ], + [ + "email", + "john.doe@matrix.org" + ] + ], + }, + ) -- cgit 1.5.1 From b4f3d70b212b60576c12e99f62b53df169467067 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 7 May 2019 11:47:37 +0100 Subject: Incorporate review --- synapse/handlers/identity.py | 2 +- synapse/rest/client/v2_alpha/account.py | 2 ++ tests/rest/client/test_identity.py | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/rest/client/test_identity.py') diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index 5b610990b6..dc77b6786f 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -403,7 +403,7 @@ class IdentityHandler(BaseHandler): target = self.rewrite_identity_server_urls.get(id_server, id_server) try: - data = yield self.http_client.post_json( + data = yield self.http_client.post_json_get_json( "https://%s/_matrix/identity/api/v1/bulk_lookup" % (target,), { "threepids": threepids, diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 154700d7d1..f1037ce115 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -531,6 +531,8 @@ class ThreepidBulkLookupRestServlet(RestServlet): body = parse_json_object_from_request(request) + assert_params_in_dict(body, ["threepids", "id_server"]) + # Proxy the request to the identity server. lookup_3pid handles checking # if the lookup is allowed so we don't need to do it here. ret = yield self.identity_handler.bulk_lookup_3pid( diff --git a/tests/rest/client/test_identity.py b/tests/rest/client/test_identity.py index c1b1b11202..ed149f3600 100644 --- a/tests/rest/client/test_identity.py +++ b/tests/rest/client/test_identity.py @@ -115,10 +115,10 @@ class IdentityEnabledTestCase(unittest.HomeserverTestCase): mock_http_client = Mock(spec=[ "get_json", - "post_json", + "post_json_get_json", ]) mock_http_client.get_json.return_value = defer.succeed((200, "{}")) - mock_http_client.post_json.return_value = defer.succeed((200, "{}")) + mock_http_client.post_json_get_json.return_value = defer.succeed((200, "{}")) self.hs = self.setup_test_homeserver( config=config, @@ -198,7 +198,7 @@ class IdentityEnabledTestCase(unittest.HomeserverTestCase): ) self.render(request) - post_json = self.hs.get_simple_http_client().post_json + post_json = self.hs.get_simple_http_client().post_json_get_json post_json.assert_called_once_with( "https://testis/_matrix/identity/api/v1/bulk_lookup", { -- cgit 1.5.1 From 532ba44add046f0d25b3f36438ae45ea2ebae869 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Thu, 9 May 2019 13:01:40 +0100 Subject: Fix test --- tests/rest/client/test_identity.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests/rest/client/test_identity.py') diff --git a/tests/rest/client/test_identity.py b/tests/rest/client/test_identity.py index ed149f3600..7edcfa8f67 100644 --- a/tests/rest/client/test_identity.py +++ b/tests/rest/client/test_identity.py @@ -38,6 +38,10 @@ class IdentityDisabledTestCase(unittest.HomeserverTestCase): config = self.default_config() config.enable_3pid_lookup = False + config.trusted_third_party_id_servers = [ + "testis" + ] + self.hs = self.setup_test_homeserver(config=config) return self.hs @@ -112,6 +116,9 @@ class IdentityEnabledTestCase(unittest.HomeserverTestCase): config = self.default_config() config.enable_3pid_lookup = True + config.trusted_third_party_id_servers = [ + "testis" + ] mock_http_client = Mock(spec=[ "get_json", -- cgit 1.5.1 From f304f1a574a7114ad4ccc335563d1ecb3eb49501 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Thu, 9 May 2019 13:07:43 +0100 Subject: Incorporate review --- synapse/handlers/identity.py | 2 +- synapse/rest/client/v2_alpha/account.py | 7 +++---- tests/rest/client/test_identity.py | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tests/rest/client/test_identity.py') diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index b4c6e94777..f39803629e 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -388,7 +388,7 @@ class IdentityHandler(BaseHandler): @defer.inlineCallbacks def bulk_lookup_3pid(self, id_server, threepids): - """Looks up a 3pid in the passed identity server. + """Looks up given 3pids in the passed identity server. Args: id_server (str): The server name (including port, if required) diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index f1037ce115..08079a9bc6 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -15,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import logging +import re from six.moves import http_client @@ -482,11 +483,10 @@ class ThreepidDeleteRestServlet(RestServlet): class ThreepidLookupRestServlet(RestServlet): - PATTERNS = client_v2_patterns("/account/3pid/lookup$") + PATTERNS = [re.compile("^/_matrix/client/unstable/account/3pid/lookup$")] def __init__(self, hs): super(ThreepidLookupRestServlet, self).__init__() - self.config = hs.config self.auth = hs.get_auth() self.identity_handler = hs.get_handlers().identity_handler @@ -514,11 +514,10 @@ class ThreepidLookupRestServlet(RestServlet): class ThreepidBulkLookupRestServlet(RestServlet): - PATTERNS = client_v2_patterns("/account/3pid/bulk_lookup$") + PATTERNS = [re.compile("^/_matrix/client/unstable/account/3pid/bulk_lookup$")] def __init__(self, hs): super(ThreepidBulkLookupRestServlet, self).__init__() - self.config = hs.config self.auth = hs.get_auth() self.identity_handler = hs.get_handlers().identity_handler diff --git a/tests/rest/client/test_identity.py b/tests/rest/client/test_identity.py index 7edcfa8f67..b942f1ffe6 100644 --- a/tests/rest/client/test_identity.py +++ b/tests/rest/client/test_identity.py @@ -26,6 +26,7 @@ from tests import unittest class IdentityDisabledTestCase(unittest.HomeserverTestCase): + """Tests that 3PID lookup attempts fail when the HS's config disallows them.""" servlets = [ account.register_servlets, @@ -104,6 +105,7 @@ class IdentityDisabledTestCase(unittest.HomeserverTestCase): class IdentityEnabledTestCase(unittest.HomeserverTestCase): + """Tests that 3PID lookup attempts succeed when the HS's config allows them.""" servlets = [ account.register_servlets, -- cgit 1.5.1 From aa5c42f5bc5502f06ef41e03e0ea6863d2622bab Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Thu, 9 May 2019 13:59:57 +0100 Subject: Fix failing test --- tests/rest/client/test_identity.py | 4 ++-- tests/rulecheck/test_domainrulecheck.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'tests/rest/client/test_identity.py') diff --git a/tests/rest/client/test_identity.py b/tests/rest/client/test_identity.py index b942f1ffe6..ec260a2873 100644 --- a/tests/rest/client/test_identity.py +++ b/tests/rest/client/test_identity.py @@ -40,7 +40,7 @@ class IdentityDisabledTestCase(unittest.HomeserverTestCase): config = self.default_config() config.enable_3pid_lookup = False config.trusted_third_party_id_servers = [ - "testis" + "testis", ] self.hs = self.setup_test_homeserver(config=config) @@ -119,7 +119,7 @@ class IdentityEnabledTestCase(unittest.HomeserverTestCase): config = self.default_config() config.enable_3pid_lookup = True config.trusted_third_party_id_servers = [ - "testis" + "testis", ] mock_http_client = Mock(spec=[ diff --git a/tests/rulecheck/test_domainrulecheck.py b/tests/rulecheck/test_domainrulecheck.py index e3167aa06b..66b9cca4b3 100644 --- a/tests/rulecheck/test_domainrulecheck.py +++ b/tests/rulecheck/test_domainrulecheck.py @@ -164,6 +164,9 @@ class DomainRuleCheckerRoomTestCase(unittest.HomeserverTestCase): def make_homeserver(self, reactor, clock): config = self.default_config() + config.trusted_third_party_id_servers = [ + "localhost", + ] config.spam_checker = ( DomainRuleChecker, -- cgit 1.5.1