mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-09-28 21:09:29 -04:00
Remove v1 only REST APIs now we don't ship matrix console (#4334)
This commit is contained in:
Amber Brown
GitHub
parent
98df67a8de
commit
d7843f47b6
7 changed files with 45 additions and 590 deletions
|
|
@ -16,64 +16,49 @@
|
|||
""" Tests REST events for /events paths."""
|
||||
|
||||
from mock import Mock, NonCallableMock
|
||||
from six import PY3
|
||||
|
||||
from twisted.internet import defer
|
||||
from synapse.rest.client.v1 import admin, events, login, room
|
||||
|
||||
from ....utils import MockHttpResource, setup_test_homeserver
|
||||
from .utils import RestTestCase
|
||||
|
||||
PATH_PREFIX = "/_matrix/client/api/v1"
|
||||
from tests import unittest
|
||||
|
||||
|
||||
class EventStreamPermissionsTestCase(RestTestCase):
|
||||
class EventStreamPermissionsTestCase(unittest.HomeserverTestCase):
|
||||
""" Tests event streaming (GET /events). """
|
||||
|
||||
if PY3:
|
||||
skip = "Skip on Py3 until ported to use not V1 only register."
|
||||
servlets = [
|
||||
events.register_servlets,
|
||||
room.register_servlets,
|
||||
admin.register_servlets,
|
||||
login.register_servlets,
|
||||
]
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def setUp(self):
|
||||
import synapse.rest.client.v1.events
|
||||
import synapse.rest.client.v1_only.register
|
||||
import synapse.rest.client.v1.room
|
||||
def make_homeserver(self, reactor, clock):
|
||||
|
||||
self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
|
||||
config = self.default_config()
|
||||
config.enable_registration_captcha = False
|
||||
config.enable_registration = True
|
||||
config.auto_join_rooms = []
|
||||
|
||||
hs = yield setup_test_homeserver(
|
||||
self.addCleanup,
|
||||
http_client=None,
|
||||
federation_client=Mock(),
|
||||
ratelimiter=NonCallableMock(spec_set=["send_message"]),
|
||||
hs = self.setup_test_homeserver(
|
||||
config=config, ratelimiter=NonCallableMock(spec_set=["send_message"])
|
||||
)
|
||||
self.ratelimiter = hs.get_ratelimiter()
|
||||
self.ratelimiter.send_message.return_value = (True, 0)
|
||||
hs.config.enable_registration_captcha = False
|
||||
hs.config.enable_registration = True
|
||||
hs.config.auto_join_rooms = []
|
||||
|
||||
hs.get_handlers().federation_handler = Mock()
|
||||
|
||||
synapse.rest.client.v1_only.register.register_servlets(hs, self.mock_resource)
|
||||
synapse.rest.client.v1.events.register_servlets(hs, self.mock_resource)
|
||||
synapse.rest.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||
return hs
|
||||
|
||||
def prepare(self, hs, reactor, clock):
|
||||
|
||||
# register an account
|
||||
self.user_id = "sid1"
|
||||
response = yield self.register(self.user_id)
|
||||
self.token = response["access_token"]
|
||||
self.user_id = response["user_id"]
|
||||
self.user_id = self.register_user("sid1", "pass")
|
||||
self.token = self.login(self.user_id, "pass")
|
||||
|
||||
# register a 2nd account
|
||||
self.other_user = "other1"
|
||||
response = yield self.register(self.other_user)
|
||||
self.other_token = response["access_token"]
|
||||
self.other_user = response["user_id"]
|
||||
self.other_user = self.register_user("other2", "pass")
|
||||
self.other_token = self.login(self.other_user, "pass")
|
||||
|
||||
def tearDown(self):
|
||||
pass
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_stream_basic_permissions(self):
|
||||
# invalid token, expect 401
|
||||
# note: this is in violation of the original v1 spec, which expected
|
||||
|
|
@ -81,34 +66,37 @@ class EventStreamPermissionsTestCase(RestTestCase):
|
|||
# implementation is now part of the r0 implementation, the newer
|
||||
# behaviour is used instead to be consistent with the r0 spec.
|
||||
# see issue #2602
|
||||
(code, response) = yield self.mock_resource.trigger_get(
|
||||
"/events?access_token=%s" % ("invalid" + self.token,)
|
||||
request, channel = self.make_request(
|
||||
"GET", "/events?access_token=%s" % ("invalid" + self.token,)
|
||||
)
|
||||
self.assertEquals(401, code, msg=str(response))
|
||||
self.render(request)
|
||||
self.assertEquals(channel.code, 401, msg=channel.result)
|
||||
|
||||
# valid token, expect content
|
||||
(code, response) = yield self.mock_resource.trigger_get(
|
||||
"/events?access_token=%s&timeout=0" % (self.token,)
|
||||
request, channel = self.make_request(
|
||||
"GET", "/events?access_token=%s&timeout=0" % (self.token,)
|
||||
)
|
||||
self.assertEquals(200, code, msg=str(response))
|
||||
self.assertTrue("chunk" in response)
|
||||
self.assertTrue("start" in response)
|
||||
self.assertTrue("end" in response)
|
||||
self.render(request)
|
||||
self.assertEquals(channel.code, 200, msg=channel.result)
|
||||
self.assertTrue("chunk" in channel.json_body)
|
||||
self.assertTrue("start" in channel.json_body)
|
||||
self.assertTrue("end" in channel.json_body)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_stream_room_permissions(self):
|
||||
room_id = yield self.create_room_as(self.other_user, tok=self.other_token)
|
||||
yield self.send(room_id, tok=self.other_token)
|
||||
room_id = self.helper.create_room_as(self.other_user, tok=self.other_token)
|
||||
self.helper.send(room_id, tok=self.other_token)
|
||||
|
||||
# invited to room (expect no content for room)
|
||||
yield self.invite(
|
||||
self.helper.invite(
|
||||
room_id, src=self.other_user, targ=self.user_id, tok=self.other_token
|
||||
)
|
||||
|
||||
(code, response) = yield self.mock_resource.trigger_get(
|
||||
"/events?access_token=%s&timeout=0" % (self.token,)
|
||||
# valid token, expect content
|
||||
request, channel = self.make_request(
|
||||
"GET", "/events?access_token=%s&timeout=0" % (self.token,)
|
||||
)
|
||||
self.assertEquals(200, code, msg=str(response))
|
||||
self.render(request)
|
||||
self.assertEquals(channel.code, 200, msg=channel.result)
|
||||
|
||||
# We may get a presence event for ourselves down
|
||||
self.assertEquals(
|
||||
|
|
@ -116,7 +104,7 @@ class EventStreamPermissionsTestCase(RestTestCase):
|
|||
len(
|
||||
[
|
||||
c
|
||||
for c in response["chunk"]
|
||||
for c in channel.json_body["chunk"]
|
||||
if not (
|
||||
c.get("type") == "m.presence"
|
||||
and c["content"].get("user_id") == self.user_id
|
||||
|
|
@ -126,7 +114,7 @@ class EventStreamPermissionsTestCase(RestTestCase):
|
|||
)
|
||||
|
||||
# joined room (expect all content for room)
|
||||
yield self.join(room=room_id, user=self.user_id, tok=self.token)
|
||||
self.helper.join(room=room_id, user=self.user_id, tok=self.token)
|
||||
|
||||
# left to room (expect no content for room)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,89 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2015, 2016 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.
|
||||
|
||||
import json
|
||||
|
||||
from mock import Mock
|
||||
from six import PY3
|
||||
|
||||
from twisted.test.proto_helpers import MemoryReactorClock
|
||||
|
||||
from synapse.http.server import JsonResource
|
||||
from synapse.rest.client.v1_only.register import register_servlets
|
||||
from synapse.util import Clock
|
||||
|
||||
from tests import unittest
|
||||
from tests.server import make_request, render, setup_test_homeserver
|
||||
|
||||
|
||||
class CreateUserServletTestCase(unittest.TestCase):
|
||||
"""
|
||||
Tests for CreateUserRestServlet.
|
||||
"""
|
||||
|
||||
if PY3:
|
||||
skip = "Not ported to Python 3."
|
||||
|
||||
def setUp(self):
|
||||
self.registration_handler = Mock()
|
||||
|
||||
self.appservice = Mock(sender="@as:test")
|
||||
self.datastore = Mock(
|
||||
get_app_service_by_token=Mock(return_value=self.appservice)
|
||||
)
|
||||
|
||||
handlers = Mock(registration_handler=self.registration_handler)
|
||||
self.reactor = MemoryReactorClock()
|
||||
self.hs_clock = Clock(self.reactor)
|
||||
|
||||
self.hs = self.hs = setup_test_homeserver(
|
||||
self.addCleanup, http_client=None, clock=self.hs_clock, reactor=self.reactor
|
||||
)
|
||||
self.hs.get_datastore = Mock(return_value=self.datastore)
|
||||
self.hs.get_handlers = Mock(return_value=handlers)
|
||||
|
||||
def test_POST_createuser_with_valid_user(self):
|
||||
|
||||
res = JsonResource(self.hs)
|
||||
register_servlets(self.hs, res)
|
||||
|
||||
request_data = json.dumps(
|
||||
{
|
||||
"localpart": "someone",
|
||||
"displayname": "someone interesting",
|
||||
"duration_seconds": 200,
|
||||
}
|
||||
)
|
||||
|
||||
url = b'/_matrix/client/api/v1/createUser?access_token=i_am_an_app_service'
|
||||
|
||||
user_id = "@someone:interesting"
|
||||
token = "my token"
|
||||
|
||||
self.registration_handler.get_or_create_user = Mock(
|
||||
return_value=(user_id, token)
|
||||
)
|
||||
|
||||
request, channel = make_request(self.reactor, b"POST", url, request_data)
|
||||
render(request, res, self.reactor)
|
||||
|
||||
self.assertEquals(channel.result["code"], b"200")
|
||||
|
||||
det_data = {
|
||||
"user_id": user_id,
|
||||
"access_token": token,
|
||||
"home_server": self.hs.hostname,
|
||||
}
|
||||
self.assertDictContainsSubset(det_data, json.loads(channel.result["body"]))
|
||||
Loading…
Add table
Add a link
Reference in a new issue