Implement the SHHS complexity API (#5216)
This commit is contained in:
parent
532b825ed9
commit
46c8f7a517
|
@ -0,0 +1 @@
|
||||||
|
Synapse will now serve the experimental "room complexity" API endpoint.
|
|
@ -26,6 +26,7 @@ CLIENT_API_PREFIX = "/_matrix/client"
|
||||||
FEDERATION_PREFIX = "/_matrix/federation"
|
FEDERATION_PREFIX = "/_matrix/federation"
|
||||||
FEDERATION_V1_PREFIX = FEDERATION_PREFIX + "/v1"
|
FEDERATION_V1_PREFIX = FEDERATION_PREFIX + "/v1"
|
||||||
FEDERATION_V2_PREFIX = FEDERATION_PREFIX + "/v2"
|
FEDERATION_V2_PREFIX = FEDERATION_PREFIX + "/v2"
|
||||||
|
FEDERATION_UNSTABLE_PREFIX = FEDERATION_PREFIX + "/unstable"
|
||||||
STATIC_PREFIX = "/_matrix/static"
|
STATIC_PREFIX = "/_matrix/static"
|
||||||
WEB_CLIENT_PREFIX = "/_matrix/client"
|
WEB_CLIENT_PREFIX = "/_matrix/client"
|
||||||
CONTENT_REPO_PREFIX = "/_matrix/content"
|
CONTENT_REPO_PREFIX = "/_matrix/content"
|
||||||
|
|
|
@ -23,7 +23,11 @@ from twisted.internet import defer
|
||||||
import synapse
|
import synapse
|
||||||
from synapse.api.errors import Codes, FederationDeniedError, SynapseError
|
from synapse.api.errors import Codes, FederationDeniedError, SynapseError
|
||||||
from synapse.api.room_versions import RoomVersions
|
from synapse.api.room_versions import RoomVersions
|
||||||
from synapse.api.urls import FEDERATION_V1_PREFIX, FEDERATION_V2_PREFIX
|
from synapse.api.urls import (
|
||||||
|
FEDERATION_UNSTABLE_PREFIX,
|
||||||
|
FEDERATION_V1_PREFIX,
|
||||||
|
FEDERATION_V2_PREFIX,
|
||||||
|
)
|
||||||
from synapse.http.endpoint import parse_and_validate_server_name
|
from synapse.http.endpoint import parse_and_validate_server_name
|
||||||
from synapse.http.server import JsonResource
|
from synapse.http.server import JsonResource
|
||||||
from synapse.http.servlet import (
|
from synapse.http.servlet import (
|
||||||
|
@ -1304,6 +1308,30 @@ class FederationGroupsSettingJoinPolicyServlet(BaseFederationServlet):
|
||||||
defer.returnValue((200, new_content))
|
defer.returnValue((200, new_content))
|
||||||
|
|
||||||
|
|
||||||
|
class RoomComplexityServlet(BaseFederationServlet):
|
||||||
|
"""
|
||||||
|
Indicates to other servers how complex (and therefore likely
|
||||||
|
resource-intensive) a public room this server knows about is.
|
||||||
|
"""
|
||||||
|
PATH = "/rooms/(?P<room_id>[^/]*)/complexity"
|
||||||
|
PREFIX = FEDERATION_UNSTABLE_PREFIX
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def on_GET(self, origin, content, query, room_id):
|
||||||
|
|
||||||
|
store = self.handler.hs.get_datastore()
|
||||||
|
|
||||||
|
is_public = yield store.is_room_world_readable_or_publicly_joinable(
|
||||||
|
room_id
|
||||||
|
)
|
||||||
|
|
||||||
|
if not is_public:
|
||||||
|
raise SynapseError(404, "Room not found", errcode=Codes.INVALID_PARAM)
|
||||||
|
|
||||||
|
complexity = yield store.get_room_complexity(room_id)
|
||||||
|
defer.returnValue((200, complexity))
|
||||||
|
|
||||||
|
|
||||||
FEDERATION_SERVLET_CLASSES = (
|
FEDERATION_SERVLET_CLASSES = (
|
||||||
FederationSendServlet,
|
FederationSendServlet,
|
||||||
FederationEventServlet,
|
FederationEventServlet,
|
||||||
|
@ -1327,6 +1355,7 @@ FEDERATION_SERVLET_CLASSES = (
|
||||||
FederationThirdPartyInviteExchangeServlet,
|
FederationThirdPartyInviteExchangeServlet,
|
||||||
On3pidBindServlet,
|
On3pidBindServlet,
|
||||||
FederationVersionServlet,
|
FederationVersionServlet,
|
||||||
|
RoomComplexityServlet,
|
||||||
)
|
)
|
||||||
|
|
||||||
OPENID_SERVLET_CLASSES = (
|
OPENID_SERVLET_CLASSES = (
|
||||||
|
|
|
@ -822,10 +822,16 @@ class AdminRestResource(JsonResource):
|
||||||
|
|
||||||
def __init__(self, hs):
|
def __init__(self, hs):
|
||||||
JsonResource.__init__(self, hs, canonical_json=False)
|
JsonResource.__init__(self, hs, canonical_json=False)
|
||||||
|
register_servlets(hs, self)
|
||||||
|
|
||||||
register_servlets_for_client_rest_resource(hs, self)
|
|
||||||
SendServerNoticeServlet(hs).register(self)
|
def register_servlets(hs, http_server):
|
||||||
VersionServlet(hs).register(self)
|
"""
|
||||||
|
Register all the admin servlets.
|
||||||
|
"""
|
||||||
|
register_servlets_for_client_rest_resource(hs, http_server)
|
||||||
|
SendServerNoticeServlet(hs).register(http_server)
|
||||||
|
VersionServlet(hs).register(http_server)
|
||||||
|
|
||||||
|
|
||||||
def register_servlets_for_client_rest_resource(hs, http_server):
|
def register_servlets_for_client_rest_resource(hs, http_server):
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
from __future__ import division
|
||||||
|
|
||||||
import itertools
|
import itertools
|
||||||
import logging
|
import logging
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
@ -614,7 +616,7 @@ class EventsWorkerStore(SQLBaseStore):
|
||||||
|
|
||||||
def _get_total_state_event_counts_txn(self, txn, room_id):
|
def _get_total_state_event_counts_txn(self, txn, room_id):
|
||||||
"""
|
"""
|
||||||
See get_state_event_counts.
|
See get_total_state_event_counts.
|
||||||
"""
|
"""
|
||||||
sql = "SELECT COUNT(*) FROM state_events WHERE room_id=?"
|
sql = "SELECT COUNT(*) FROM state_events WHERE room_id=?"
|
||||||
txn.execute(sql, (room_id,))
|
txn.execute(sql, (room_id,))
|
||||||
|
@ -635,3 +637,49 @@ class EventsWorkerStore(SQLBaseStore):
|
||||||
"get_total_state_event_counts",
|
"get_total_state_event_counts",
|
||||||
self._get_total_state_event_counts_txn, room_id
|
self._get_total_state_event_counts_txn, room_id
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def _get_current_state_event_counts_txn(self, txn, room_id):
|
||||||
|
"""
|
||||||
|
See get_current_state_event_counts.
|
||||||
|
"""
|
||||||
|
sql = "SELECT COUNT(*) FROM current_state_events WHERE room_id=?"
|
||||||
|
txn.execute(sql, (room_id,))
|
||||||
|
row = txn.fetchone()
|
||||||
|
return row[0] if row else 0
|
||||||
|
|
||||||
|
def get_current_state_event_counts(self, room_id):
|
||||||
|
"""
|
||||||
|
Gets the current number of state events in a room.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
room_id (str)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Deferred[int]
|
||||||
|
"""
|
||||||
|
return self.runInteraction(
|
||||||
|
"get_current_state_event_counts",
|
||||||
|
self._get_current_state_event_counts_txn, room_id
|
||||||
|
)
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def get_room_complexity(self, room_id):
|
||||||
|
"""
|
||||||
|
Get a rough approximation of the complexity of the room. This is used by
|
||||||
|
remote servers to decide whether they wish to join the room or not.
|
||||||
|
Higher complexity value indicates that being in the room will consume
|
||||||
|
more resources.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
room_id (str)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Deferred[dict[str:int]] of complexity version to complexity.
|
||||||
|
"""
|
||||||
|
state_events = yield self.get_current_state_event_counts(room_id)
|
||||||
|
|
||||||
|
# Call this one "v1", so we can introduce new ones as we want to develop
|
||||||
|
# it.
|
||||||
|
complexity_v1 = round(state_events / 500, 2)
|
||||||
|
|
||||||
|
defer.returnValue({"v1": complexity_v1})
|
||||||
|
|
|
@ -0,0 +1,90 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Copyright 2019 Matrix.org Foundation
|
||||||
|
#
|
||||||
|
# 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.config.ratelimiting import FederationRateLimitConfig
|
||||||
|
from synapse.federation.transport import server
|
||||||
|
from synapse.rest import admin
|
||||||
|
from synapse.rest.client.v1 import login, room
|
||||||
|
from synapse.util.ratelimitutils import FederationRateLimiter
|
||||||
|
|
||||||
|
from tests import unittest
|
||||||
|
|
||||||
|
|
||||||
|
class RoomComplexityTests(unittest.HomeserverTestCase):
|
||||||
|
|
||||||
|
servlets = [
|
||||||
|
admin.register_servlets,
|
||||||
|
room.register_servlets,
|
||||||
|
login.register_servlets,
|
||||||
|
]
|
||||||
|
|
||||||
|
def default_config(self, name='test'):
|
||||||
|
config = super(RoomComplexityTests, self).default_config(name=name)
|
||||||
|
config["limit_large_remote_room_joins"] = True
|
||||||
|
config["limit_large_remote_room_complexity"] = 0.05
|
||||||
|
return config
|
||||||
|
|
||||||
|
def prepare(self, reactor, clock, homeserver):
|
||||||
|
class Authenticator(object):
|
||||||
|
def authenticate_request(self, request, content):
|
||||||
|
return defer.succeed("otherserver.nottld")
|
||||||
|
|
||||||
|
ratelimiter = FederationRateLimiter(
|
||||||
|
clock,
|
||||||
|
FederationRateLimitConfig(
|
||||||
|
window_size=1,
|
||||||
|
sleep_limit=1,
|
||||||
|
sleep_msec=1,
|
||||||
|
reject_limit=1000,
|
||||||
|
concurrent_requests=1000,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
server.register_servlets(
|
||||||
|
homeserver, self.resource, Authenticator(), ratelimiter
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_complexity_simple(self):
|
||||||
|
|
||||||
|
u1 = self.register_user("u1", "pass")
|
||||||
|
u1_token = self.login("u1", "pass")
|
||||||
|
|
||||||
|
room_1 = self.helper.create_room_as(u1, tok=u1_token)
|
||||||
|
self.helper.send_state(
|
||||||
|
room_1, event_type="m.room.topic", body={"topic": "foo"}, tok=u1_token
|
||||||
|
)
|
||||||
|
|
||||||
|
# Get the room complexity
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"GET", "/_matrix/federation/unstable/rooms/%s/complexity" % (room_1,)
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
self.assertEquals(200, channel.code)
|
||||||
|
complexity = channel.json_body["v1"]
|
||||||
|
self.assertTrue(complexity > 0, complexity)
|
||||||
|
|
||||||
|
# Artificially raise the complexity
|
||||||
|
store = self.hs.get_datastore()
|
||||||
|
store.get_current_state_event_counts = lambda x: defer.succeed(500 * 1.23)
|
||||||
|
|
||||||
|
# Get the room complexity again -- make sure it's our artificial value
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"GET", "/_matrix/federation/unstable/rooms/%s/complexity" % (room_1,)
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
self.assertEquals(200, channel.code)
|
||||||
|
complexity = channel.json_body["v1"]
|
||||||
|
self.assertEqual(complexity, 1.23)
|
Loading…
Reference in New Issue