Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent kicking users who aren't in the room #4999

Merged
merged 3 commits into from Apr 4, 2019

Conversation

Projects
None yet
2 participants
@anoadragon453
Copy link
Member

commented Apr 3, 2019

Prevent kick events from succeeding if the user is not currently in the room.

Closes #4973

Sytest PR: matrix-org/sytest#602

@anoadragon453 anoadragon453 requested a review from matrix-org/synapse-core Apr 3, 2019

@erikjohnston

This comment has been minimized.

Copy link
Member

commented Apr 3, 2019

I wonder whether it'd be worth rewriting this so that we specifically said what transitions were allowed, rather than adding ad hoc rules.

@anoadragon453

This comment has been minimized.

Copy link
Member Author

commented Apr 3, 2019

Could do, yeah.

@anoadragon453

This comment has been minimized.

Copy link
Member Author

commented Apr 4, 2019

Although we're going to want custom error messages for what isn't allowed, which may end up looking quite close to the current code anyways.

@codecov

This comment has been minimized.

Copy link

commented Apr 4, 2019

Codecov Report

Merging #4999 into develop will decrease coverage by <.01%.
The diff coverage is 0%.

@@             Coverage Diff             @@
##           develop    #4999      +/-   ##
===========================================
- Coverage     60.7%   60.69%   -0.01%     
===========================================
  Files          332      332              
  Lines        34172    34176       +4     
  Branches      5633     5635       +2     
===========================================
  Hits         20743    20743              
- Misses       11958    11960       +2     
- Partials      1471     1473       +2
@anoadragon453

This comment has been minimized.

Copy link
Member Author

commented Apr 4, 2019

Left a TODO.

anoadragon453 added a commit to matrix-org/sytest that referenced this pull request Apr 4, 2019

@anoadragon453 anoadragon453 merged commit db265f0 into develop Apr 4, 2019

24 checks passed

buildkite/synapse Build #834 passed (14 minutes, 24 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 12 seconds)
Details
buildkite/synapse/isort Passed (15 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (16 seconds)
Details
buildkite/synapse/packaging Passed (16 seconds)
Details
buildkite/synapse/pep-8 Passed (53 seconds)
Details
buildkite/synapse/pipeline Passed (2 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Passed (11 minutes, 59 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Passed (11 minutes, 18 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Passed (6 minutes, 25 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Passed (7 minutes, 44 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Passed (12 minutes, 6 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (12 minutes, 9 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (7 minutes, 33 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (7 minutes, 12 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (11 minutes, 57 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (12 minutes, 10 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (7 minutes, 3 seconds)
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
codecov/patch 0% of diff hit (target 0%)
Details
codecov/project 60.69% (target 0%)
Details

@anoadragon453 anoadragon453 deleted the anoa/no_kick_not_in_room branch Apr 4, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.