Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
112cf5a7
Commit
112cf5a7
authored
5 years ago
by
Brendan Abolivier
Browse files
Options
Downloads
Patches
Plain Diff
Add third party rules hook for 3PID invites
parent
187d2837
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
synapse/events/third_party_rules.py
+31
-1
31 additions, 1 deletion
synapse/events/third_party_rules.py
synapse/handlers/room_member.py
+10
-0
10 additions, 0 deletions
synapse/handlers/room_member.py
with
41 additions
and
1 deletion
synapse/events/third_party_rules.py
+
31
−
1
View file @
112cf5a7
...
...
@@ -35,7 +35,10 @@ class ThirdPartyEventRules(object):
module
,
config
=
hs
.
config
.
third_party_event_rules
if
module
is
not
None
:
self
.
third_party_rules
=
module
(
config
=
config
)
self
.
third_party_rules
=
module
(
config
=
config
,
http_client
=
hs
.
get_simple_http_client
(),
)
@defer.inlineCallbacks
def
check_event_allowed
(
self
,
event
,
context
):
...
...
@@ -81,3 +84,30 @@ class ThirdPartyEventRules(object):
yield
self
.
third_party_rules
.
on_create_room
(
requester
,
config
,
is_requester_admin
)
def
check_threepid_can_be_invited
(
self
,
medium
,
address
,
room_id
):
"""
Check if a provided 3PID can be invited in the given room.
Args:
medium (str): The 3PID
'
s medium.
address (str): The 3PID
'
s address.
room_id (str): The room we want to invite the threepid to.
Returns:
defer.Deferred[bool], True if the 3PID can be invited, False if not.
"""
if
self
.
third_party_rules
is
None
:
defer
.
returnValue
(
True
)
state_ids
=
yield
self
.
store
.
get_filtered_current_state_ids
(
room_id
)
room_state_events
=
yield
self
.
store
.
get_events
(
state_ids
.
values
())
state_events
=
{}
for
key
,
event_id
in
state_ids
.
items
():
state_events
[
key
]
=
room_state_events
[
event_id
]
ret
=
yield
self
.
third_party_rules
.
check_threepid_can_be_invited
(
medium
,
address
,
state_events
,
)
defer
.
returnValue
(
ret
)
This diff is collapsed.
Click to expand it.
synapse/handlers/room_member.py
+
10
−
0
View file @
112cf5a7
...
...
@@ -72,6 +72,7 @@ class RoomMemberHandler(object):
self
.
clock
=
hs
.
get_clock
()
self
.
spam_checker
=
hs
.
get_spam_checker
()
self
.
third_party_event_rules
=
hs
.
get_third_party_event_rules
()
self
.
_server_notices_mxid
=
self
.
config
.
server_notices_mxid
self
.
_enable_lookup
=
hs
.
config
.
enable_3pid_lookup
self
.
allow_per_room_profiles
=
self
.
config
.
allow_per_room_profiles
...
...
@@ -723,6 +724,15 @@ class RoomMemberHandler(object):
# can't just rely on the standard ratelimiting of events.
yield
self
.
base_handler
.
ratelimit
(
requester
)
can_invite
=
yield
self
.
third_party_event_rules
.
check_threepid_can_be_invited
(
medium
,
address
,
room_id
,
)
if
not
can_invite
:
raise
SynapseError
(
403
,
"
This third-party identifier can not be invited in this room
"
,
Codes
.
FORBIDDEN
,
)
invitee
=
yield
self
.
_lookup_3pid
(
id_server
,
medium
,
address
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment