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

Ratelimit invites by room and target user #9258

Merged
merged 9 commits into from
Jan 29, 2021
Merged

Ratelimit invites by room and target user #9258

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df3f040
Ratelimit invites by room and target user
erikjohnston Jan 28, 2021
3f9db08
Add tests
erikjohnston Jan 28, 2021
00d3258
Newsfile
erikjohnston Jan 28, 2021
7f0c021
typo
erikjohnston Jan 29, 2021
94367e6
Update changelog.d/9258.feature
erikjohnston Jan 29, 2021
86c8c0a
Review comments
erikjohnston Jan 29, 2021
2752772
sample config
erikjohnston Jan 29, 2021
677ed7c
Fix up inconsistency between config and defaults
erikjohnston Jan 29, 2021
4c76ab0
Pass through ratelimiting errors
erikjohnston Jan 29, 2021
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
Prev Previous commit
Pass through ratelimiting errors
  • Loading branch information
@erikjohnston
erikjohnston committed Jan 29, 2021
commit 4c76ab0fa28140f39991816108ddf36c37a53068
2 changes: 1 addition & 1 deletion synapse/federation/federation_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ async def _do_send_invite(
"User's homeserver does not support this room version",
Codes.UNSUPPORTED_ROOM_VERSION,
)
elif e.code == 403:
elif e.code in (403, 429):
raise e.to_synapse_error()
Copy link
Member

Choose a reason for hiding this comment

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

Cool, thanks for added. This won't pass through retry_after_ms but I presume the client will have some default amount of time they'll wait for.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, hmm, why on earth don't we proxy through all the fields??

I don't think clients actually care about retry_after_ms...

else:
raise
Expand Down