mirror of
https://github.com/element-hq/synapse
synced 2024-09-06 00:40:15 +00:00
implement knock via non-federation
This commit is contained in:
parent
a17f64361c
commit
16801e2b5c
9 changed files with 122 additions and 4 deletions
|
@ -225,9 +225,12 @@ def _is_membership_change_allowed(event, auth_events):
|
||||||
|
|
||||||
key = (EventTypes.JoinRules, "")
|
key = (EventTypes.JoinRules, "")
|
||||||
join_rule_event = auth_events.get(key)
|
join_rule_event = auth_events.get(key)
|
||||||
|
print(auth_events)
|
||||||
|
print(join_rule_event)
|
||||||
if join_rule_event:
|
if join_rule_event:
|
||||||
join_rule = join_rule_event.content.get("join_rule", JoinRules.INVITE)
|
join_rule = join_rule_event.content.get("join_rule", JoinRules.INVITE)
|
||||||
else:
|
else:
|
||||||
|
print("No such event")
|
||||||
join_rule = JoinRules.INVITE
|
join_rule = JoinRules.INVITE
|
||||||
|
|
||||||
user_level = get_user_power_level(event.user_id, auth_events)
|
user_level = get_user_power_level(event.user_id, auth_events)
|
||||||
|
@ -235,6 +238,7 @@ def _is_membership_change_allowed(event, auth_events):
|
||||||
|
|
||||||
# FIXME (erikj): What should we do here as the default?
|
# FIXME (erikj): What should we do here as the default?
|
||||||
ban_level = _get_named_level(auth_events, "ban", 50)
|
ban_level = _get_named_level(auth_events, "ban", 50)
|
||||||
|
knock_level = _get_named_level(auth_events, "knock", 0)
|
||||||
|
|
||||||
logger.debug(
|
logger.debug(
|
||||||
"_is_membership_change_allowed: %s",
|
"_is_membership_change_allowed: %s",
|
||||||
|
@ -257,7 +261,7 @@ def _is_membership_change_allowed(event, auth_events):
|
||||||
raise AuthError(403, "%s is banned from the room" % (target_user_id,))
|
raise AuthError(403, "%s is banned from the room" % (target_user_id,))
|
||||||
return
|
return
|
||||||
|
|
||||||
if Membership.JOIN != membership:
|
if Membership.JOIN != membership and Membership.KNOCK != membership:
|
||||||
if (
|
if (
|
||||||
caller_invited
|
caller_invited
|
||||||
and Membership.LEAVE == membership
|
and Membership.LEAVE == membership
|
||||||
|
@ -311,6 +315,17 @@ def _is_membership_change_allowed(event, auth_events):
|
||||||
elif Membership.BAN == membership:
|
elif Membership.BAN == membership:
|
||||||
if user_level < ban_level or user_level <= target_level:
|
if user_level < ban_level or user_level <= target_level:
|
||||||
raise AuthError(403, "You don't have permission to ban")
|
raise AuthError(403, "You don't have permission to ban")
|
||||||
|
elif Membership.KNOCK == membership:
|
||||||
|
# check that we have the leave event
|
||||||
|
print("====================")
|
||||||
|
print(join_rule)
|
||||||
|
print(user_level, knock_level)
|
||||||
|
if target and target.membership != Membership.LEAVE:
|
||||||
|
raise AuthError(403, "You don't have permission to knock")
|
||||||
|
elif join_rule != JoinRules.INVITE:
|
||||||
|
raise AuthError(403, "You don't have permission to knock")
|
||||||
|
elif user_level < knock_level:
|
||||||
|
raise AuthError(403, "You don't have permission to knock")
|
||||||
else:
|
else:
|
||||||
raise AuthError(500, "Unknown membership %s" % membership)
|
raise AuthError(500, "Unknown membership %s" % membership)
|
||||||
|
|
||||||
|
@ -653,7 +668,7 @@ def auth_types_for_event(event) -> Set[Tuple[str]]:
|
||||||
|
|
||||||
if event.type == EventTypes.Member:
|
if event.type == EventTypes.Member:
|
||||||
membership = event.content["membership"]
|
membership = event.content["membership"]
|
||||||
if membership in [Membership.JOIN, Membership.INVITE]:
|
if membership in [Membership.JOIN, Membership.INVITE, Membership.KNOCK]:
|
||||||
auth_types.add((EventTypes.JoinRules, ""))
|
auth_types.add((EventTypes.JoinRules, ""))
|
||||||
|
|
||||||
auth_types.add((EventTypes.Member, event.state_key))
|
auth_types.add((EventTypes.Member, event.state_key))
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
# Copyright 2014-2016 OpenMarket Ltd
|
# Copyright 2014-2016 OpenMarket Ltd
|
||||||
# Copyright 2017-2018 New Vector Ltd
|
# Copyright 2017-2018 New Vector Ltd
|
||||||
# Copyright 2019 The Matrix.org Foundation C.I.C.
|
# Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
# Copyrignt 2020 Sorunome
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
|
@ -471,7 +472,7 @@ class EventCreationHandler(object):
|
||||||
membership = builder.content.get("membership", None)
|
membership = builder.content.get("membership", None)
|
||||||
target = UserID.from_string(builder.state_key)
|
target = UserID.from_string(builder.state_key)
|
||||||
|
|
||||||
if membership in {Membership.JOIN, Membership.INVITE}:
|
if membership in {Membership.JOIN, Membership.INVITE, Membership.KNOCK}:
|
||||||
# If event doesn't include a display name, add one.
|
# If event doesn't include a display name, add one.
|
||||||
profile = self.profile_handler
|
profile = self.profile_handler
|
||||||
content = builder.content
|
content = builder.content
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
# Copyright 2016 OpenMarket Ltd
|
# Copyright 2016 OpenMarket Ltd
|
||||||
# Copyright 2018 New Vector Ltd
|
# Copyright 2018 New Vector Ltd
|
||||||
# Copyright 2019 The Matrix.org Foundation C.I.C.
|
# Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
# Copyright 2020 Sorunome
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
|
@ -476,6 +477,21 @@ class RoomMemberHandler(object):
|
||||||
requester, remote_room_hosts, room_id, target, content,
|
requester, remote_room_hosts, room_id, target, content,
|
||||||
)
|
)
|
||||||
return res
|
return res
|
||||||
|
elif effective_membership_state == Membership.KNOCK:
|
||||||
|
print("===========================")
|
||||||
|
print("blah")
|
||||||
|
if not is_host_in_room:
|
||||||
|
# The knock needs to be send over federation
|
||||||
|
remote_room_hosts.append(room_id.split(":", 1)[1])
|
||||||
|
|
||||||
|
content["membership"] = Membership.KNOCK
|
||||||
|
|
||||||
|
profile = self.profile_handler
|
||||||
|
if not content_specified:
|
||||||
|
content["displayname"] = yield profile.get_displayname(target)
|
||||||
|
content["avatar_url"] = yield profile.get_avatar_url(target)
|
||||||
|
|
||||||
|
raise SynapseError(500, "Not yet implemented")
|
||||||
|
|
||||||
res = yield self._local_membership_update(
|
res = yield self._local_membership_update(
|
||||||
requester=requester,
|
requester=requester,
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# Copyright 2018 New Vector Ltd
|
# Copyright 2018 New Vector Ltd
|
||||||
|
# Copyright 2020 Sorunome
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
|
@ -232,6 +233,8 @@ class StatsHandler(StateDeltasHandler):
|
||||||
room_stats_delta["left_members"] -= 1
|
room_stats_delta["left_members"] -= 1
|
||||||
elif prev_membership == Membership.BAN:
|
elif prev_membership == Membership.BAN:
|
||||||
room_stats_delta["banned_members"] -= 1
|
room_stats_delta["banned_members"] -= 1
|
||||||
|
elif prev_membership == Membership.KNOCK:
|
||||||
|
room_stats_delta["knock_members"] -= 1
|
||||||
else:
|
else:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
"%r is not a valid prev_membership" % (prev_membership,)
|
"%r is not a valid prev_membership" % (prev_membership,)
|
||||||
|
@ -253,6 +256,8 @@ class StatsHandler(StateDeltasHandler):
|
||||||
room_stats_delta["left_members"] += 1
|
room_stats_delta["left_members"] += 1
|
||||||
elif membership == Membership.BAN:
|
elif membership == Membership.BAN:
|
||||||
room_stats_delta["banned_members"] += 1
|
room_stats_delta["banned_members"] += 1
|
||||||
|
elif membership == Membership.KNOCK:
|
||||||
|
room_stats_delta["knock_members"] += 1
|
||||||
else:
|
else:
|
||||||
raise ValueError("%r is not a valid membership" % (membership,))
|
raise ValueError("%r is not a valid membership" % (membership,))
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,7 @@ from synapse.rest.client.v2_alpha import (
|
||||||
filter,
|
filter,
|
||||||
groups,
|
groups,
|
||||||
keys,
|
keys,
|
||||||
|
knock,
|
||||||
notifications,
|
notifications,
|
||||||
openid,
|
openid,
|
||||||
read_marker,
|
read_marker,
|
||||||
|
@ -118,6 +119,7 @@ class ClientRestResource(JsonResource):
|
||||||
capabilities.register_servlets(hs, client_resource)
|
capabilities.register_servlets(hs, client_resource)
|
||||||
account_validity.register_servlets(hs, client_resource)
|
account_validity.register_servlets(hs, client_resource)
|
||||||
relations.register_servlets(hs, client_resource)
|
relations.register_servlets(hs, client_resource)
|
||||||
|
knock.register_servlets(hs, client_resource)
|
||||||
|
|
||||||
# moving to /_synapse/admin
|
# moving to /_synapse/admin
|
||||||
synapse.rest.admin.register_servlets_for_client_rest_resource(
|
synapse.rest.admin.register_servlets_for_client_rest_resource(
|
||||||
|
|
61
synapse/rest/client/v2_alpha/knock.py
Normal file
61
synapse/rest/client/v2_alpha/knock.py
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Copyright 2020 Sorunome
|
||||||
|
#
|
||||||
|
# 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 synapse.api.errors import AuthError, SynapseError
|
||||||
|
from synapse.http.servlet import RestServlet, parse_json_object_from_request
|
||||||
|
|
||||||
|
from ._base import client_patterns
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class KnockServlet(RestServlet):
|
||||||
|
"""
|
||||||
|
POST /rooms/{roomId}/knock
|
||||||
|
"""
|
||||||
|
|
||||||
|
PATTERNS = client_patterns(
|
||||||
|
"/rooms/(?P<room_id>[^/]*)/knock"
|
||||||
|
)
|
||||||
|
|
||||||
|
def __init__(self, hs):
|
||||||
|
super(KnockServlet, self).__init__()
|
||||||
|
self.room_member_handler = hs.get_room_member_handler()
|
||||||
|
self.auth = hs.get_auth()
|
||||||
|
|
||||||
|
async def on_POST(self, request, room_id, txn_id=None):
|
||||||
|
requester = await self.auth.get_user_by_req(request)
|
||||||
|
|
||||||
|
content = parse_json_object_from_request(request)
|
||||||
|
event_content = None
|
||||||
|
if "reason" in content:
|
||||||
|
event_content = {"reason": content["reason"]}
|
||||||
|
|
||||||
|
await self.room_member_handler.update_membership(
|
||||||
|
requester=requester,
|
||||||
|
target=requester.user,
|
||||||
|
room_id=room_id,
|
||||||
|
action="knock",
|
||||||
|
txn_id=txn_id,
|
||||||
|
third_party_signed=None,
|
||||||
|
content=event_content,
|
||||||
|
)
|
||||||
|
|
||||||
|
return 200, {}
|
||||||
|
|
||||||
|
def register_servlets(hs, http_server):
|
||||||
|
KnockServlet(hs).register(http_server)
|
|
@ -0,0 +1,17 @@
|
||||||
|
/* Copyright 2020 Sorunome
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
ALTER TABLE room_stats_current ADD knock_members INT NOT NULL DEFAULT '0';
|
||||||
|
ALTER TABLE room_stats_historical ADD knock_members BIGINT NOT NULL DEFAULT '0';
|
|
@ -40,6 +40,7 @@ ABSOLUTE_STATS_FIELDS = {
|
||||||
"left_members",
|
"left_members",
|
||||||
"banned_members",
|
"banned_members",
|
||||||
"local_users_in_room",
|
"local_users_in_room",
|
||||||
|
"knock_members",
|
||||||
),
|
),
|
||||||
"user": ("joined_rooms",),
|
"user": ("joined_rooms",),
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
# Remember to update this number every time a change is made to database
|
# Remember to update this number every time a change is made to database
|
||||||
# schema files, so the users will be informed on server restarts.
|
# schema files, so the users will be informed on server restarts.
|
||||||
SCHEMA_VERSION = 57
|
SCHEMA_VERSION = 58
|
||||||
|
|
||||||
dir_path = os.path.abspath(os.path.dirname(__file__))
|
dir_path = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue