mirror of
https://github.com/element-hq/synapse.git
synced 2024-12-22 12:44:30 +03:00
6495dbb326
This closes #2602 v1auth was created to account for the differences in status code between the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid tokens). However since those protocols were merged, this makes the r0 version/endpoint internally inconsistent, and violates the specification for the r0 endpoint. This might break clients that rely on this inconsistency with the specification. This is said to affect the legacy angular reference client. However, I feel that restoring parity with the spec is more important. Either way, it is critical to inform developers about this change, in case they rely on the illegal behaviour. Signed-off-by: Adrian Tschira <nota@notafile.com>
157 lines
5.1 KiB
Python
157 lines
5.1 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright 2014-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.
|
|
|
|
"""Tests REST events for /rooms paths."""
|
|
|
|
# twisted imports
|
|
from twisted.internet import defer
|
|
|
|
import synapse.rest.client.v1.room
|
|
from synapse.types import UserID
|
|
|
|
from ....utils import MockHttpResource, MockClock, setup_test_homeserver
|
|
from .utils import RestTestCase
|
|
|
|
from mock import Mock, NonCallableMock
|
|
|
|
|
|
PATH_PREFIX = "/_matrix/client/api/v1"
|
|
|
|
|
|
class RoomTypingTestCase(RestTestCase):
|
|
""" Tests /rooms/$room_id/typing/$user_id REST API. """
|
|
user_id = "@sid:red"
|
|
|
|
user = UserID.from_string(user_id)
|
|
|
|
@defer.inlineCallbacks
|
|
def setUp(self):
|
|
self.clock = MockClock()
|
|
|
|
self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
|
|
self.auth_user_id = self.user_id
|
|
|
|
hs = yield setup_test_homeserver(
|
|
"red",
|
|
clock=self.clock,
|
|
http_client=None,
|
|
federation_client=Mock(),
|
|
ratelimiter=NonCallableMock(spec_set=[
|
|
"send_message",
|
|
]),
|
|
)
|
|
self.hs = hs
|
|
|
|
self.event_source = hs.get_event_sources().sources["typing"]
|
|
|
|
self.ratelimiter = hs.get_ratelimiter()
|
|
self.ratelimiter.send_message.return_value = (True, 0)
|
|
|
|
hs.get_handlers().federation_handler = Mock()
|
|
|
|
def get_user_by_access_token(token=None, allow_guest=False):
|
|
return {
|
|
"user": UserID.from_string(self.auth_user_id),
|
|
"token_id": 1,
|
|
"is_guest": False,
|
|
}
|
|
|
|
hs.get_auth().get_user_by_access_token = get_user_by_access_token
|
|
|
|
def _insert_client_ip(*args, **kwargs):
|
|
return defer.succeed(None)
|
|
hs.get_datastore().insert_client_ip = _insert_client_ip
|
|
|
|
def get_room_members(room_id):
|
|
if room_id == self.room_id:
|
|
return defer.succeed([self.user])
|
|
else:
|
|
return defer.succeed([])
|
|
|
|
@defer.inlineCallbacks
|
|
def fetch_room_distributions_into(
|
|
room_id, localusers=None, remotedomains=None, ignore_user=None
|
|
):
|
|
members = yield get_room_members(room_id)
|
|
for member in members:
|
|
if ignore_user is not None and member == ignore_user:
|
|
continue
|
|
|
|
if hs.is_mine(member):
|
|
if localusers is not None:
|
|
localusers.add(member)
|
|
else:
|
|
if remotedomains is not None:
|
|
remotedomains.add(member.domain)
|
|
hs.get_room_member_handler().fetch_room_distributions_into = (
|
|
fetch_room_distributions_into
|
|
)
|
|
|
|
synapse.rest.client.v1.room.register_servlets(hs, self.mock_resource)
|
|
|
|
self.room_id = yield self.create_room_as(self.user_id)
|
|
# Need another user to make notifications actually work
|
|
yield self.join(self.room_id, user="@jim:red")
|
|
|
|
@defer.inlineCallbacks
|
|
def test_set_typing(self):
|
|
(code, _) = yield self.mock_resource.trigger(
|
|
"PUT", "/rooms/%s/typing/%s" % (self.room_id, self.user_id),
|
|
'{"typing": true, "timeout": 30000}'
|
|
)
|
|
self.assertEquals(200, code)
|
|
|
|
self.assertEquals(self.event_source.get_current_key(), 1)
|
|
events = yield self.event_source.get_new_events(
|
|
from_key=0,
|
|
room_ids=[self.room_id],
|
|
)
|
|
self.assertEquals(events[0], [{
|
|
"type": "m.typing",
|
|
"room_id": self.room_id,
|
|
"content": {
|
|
"user_ids": [self.user_id],
|
|
}
|
|
}])
|
|
|
|
@defer.inlineCallbacks
|
|
def test_set_not_typing(self):
|
|
(code, _) = yield self.mock_resource.trigger(
|
|
"PUT", "/rooms/%s/typing/%s" % (self.room_id, self.user_id),
|
|
'{"typing": false}'
|
|
)
|
|
self.assertEquals(200, code)
|
|
|
|
@defer.inlineCallbacks
|
|
def test_typing_timeout(self):
|
|
(code, _) = yield self.mock_resource.trigger(
|
|
"PUT", "/rooms/%s/typing/%s" % (self.room_id, self.user_id),
|
|
'{"typing": true, "timeout": 30000}'
|
|
)
|
|
self.assertEquals(200, code)
|
|
|
|
self.assertEquals(self.event_source.get_current_key(), 1)
|
|
|
|
self.clock.advance_time(36)
|
|
|
|
self.assertEquals(self.event_source.get_current_key(), 2)
|
|
|
|
(code, _) = yield self.mock_resource.trigger(
|
|
"PUT", "/rooms/%s/typing/%s" % (self.room_id, self.user_id),
|
|
'{"typing": true, "timeout": 30000}'
|
|
)
|
|
self.assertEquals(200, code)
|
|
|
|
self.assertEquals(self.event_source.get_current_key(), 3)
|