Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Server capabilities support #4472

Merged
merged 17 commits into from
Jan 30, 2019
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4472.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support exposing server capabilities in CS API (MSC1753, MSC1804)
1 change: 1 addition & 0 deletions synapse/api/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ class ThirdPartyEntityKind(object):
class RoomVersions(object):
V1 = "1"
V2 = "2"
V3 = "3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it matters, but I'm a bit surprised this is still in here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is now updated due to #4515

VDH_TEST = "vdh-test-version"
STATE_V2_TEST = "state-v2-test"

Expand Down
2 changes: 2 additions & 0 deletions synapse/rest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
account,
account_data,
auth,
capabilities,
devices,
filter,
groups,
Expand Down Expand Up @@ -107,3 +108,4 @@ def register_servlets(client_resource, hs):
user_directory.register_servlets(hs, client_resource)
groups.register_servlets(hs, client_resource)
room_upgrade_rest_servlet.register_servlets(hs, client_resource)
capabilities.register_servlets(hs, client_resource)
65 changes: 65 additions & 0 deletions synapse/rest/client/v2_alpha/capabilities.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# -*- coding: utf-8 -*-
# Copyright 2019 New Vector
#
# 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 logging

from twisted.internet import defer

from synapse.http.servlet import RestServlet

from ._base import client_v2_patterns

logger = logging.getLogger(__name__)


class CapabilitiesRestServlet(RestServlet):
"""End point to expose the capabilities of the server."""

PATTERNS = client_v2_patterns("/capabilities$")

def __init__(self, hs):
"""
Args:
hs (synapse.server.HomeServer): server
"""
super(CapabilitiesRestServlet, self).__init__()
self.hs = hs
self.auth = hs.get_auth()
self.store = hs.get_datastore()

@defer.inlineCallbacks
def on_GET(self, request):
requester = yield self.auth.get_user_by_req(request, allow_guest=True)
user = yield self.store.get_user_by_id(requester.user.to_string())
change_password = bool(user['password_hash'])

defer.returnValue(
(200, {
"capabilities": {
"m.room_versions": {
"default": "1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should pull this in from synapse.api.constants

"available": {
"1": "stable",
"2": "stable",
"state-v2-test": "unstable",
}
},
"m.change_password": change_password,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

err, spec wants this to be {} at a minimum, not a boolean directly. I think we should modify the MSC to have this be the capability:

"m.change_password": {
  "enabled": true
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

}
})
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be nicer if you could move this out of the defer.returnValue, i.e. something like:

response = {
    ...
}

defer.returnValue((200, response))

it just makes it a lot easier to see what's going on



def register_servlets(hs, http_server):
CapabilitiesRestServlet(hs).register(http_server)
78 changes: 78 additions & 0 deletions tests/rest/client/v2_alpha/test_capabilities.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# -*- coding: utf-8 -*-
# Copyright 2019 New Vector 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 synapse.api.constants import DEFAULT_ROOM_VERSION, KNOWN_ROOM_VERSIONS
from synapse.rest.client.v1 import admin, login
from synapse.rest.client.v2_alpha import capabilities

from tests import unittest


class CapabilitiesTestCase(unittest.HomeserverTestCase):

servlets = [
admin.register_servlets,
capabilities.register_servlets,
login.register_servlets,
]

def make_homeserver(self, reactor, clock):
self.url = b"/_matrix/client/r0/capabilities"
hs = self.setup_test_homeserver()
self.store = hs.get_datastore()
return hs

def test_check_auth_required(self):
request, channel = self.make_request("GET", self.url)
self.render(request)

self.assertEqual(channel.code, 401)

def test_get_room_version_capabilities(self):
self.register_user("user", "pass")
access_token = self.login("user", "pass")

request, channel = self.make_request("GET", self.url, access_token=access_token)
self.render(request)
capabilities = channel.json_body['capabilities']

self.assertEqual(channel.code, 200)
for room_version in capabilities['m.room_versions']['available'].keys():
self.assertTrue(room_version in KNOWN_ROOM_VERSIONS, "" + room_version)
self.assertEqual(
DEFAULT_ROOM_VERSION, capabilities['m.room_versions']['default']
)

def test_get_change_password_capabilities(self):
localpart = "user"
password = "pass"
user = self.register_user(localpart, password)
access_token = self.login(user, password)

request, channel = self.make_request("GET", self.url, access_token=access_token)
self.render(request)
capabilities = channel.json_body['capabilities']

self.assertEqual(channel.code, 200)

# Test case where password is handled outside of Synapse
self.assertTrue(capabilities['m.change_password'])
self.get_success(self.store.user_set_password_hash(user, None))
request, channel = self.make_request("GET", self.url, access_token=access_token)
self.render(request)
capabilities = channel.json_body['capabilities']

self.assertEqual(channel.code, 200)
self.assertFalse(capabilities['m.change_password'])