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

Clean up room alias creation #4063

Merged
merged 2 commits into from Oct 24, 2018

Conversation

Projects
None yet
2 participants
@erikjohnston
Member

erikjohnston commented Oct 19, 2018

In particular, instead of trying to create the alias as a user and if that fails attempting to create as an appservice, we check if the requester is an appservice up front.

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Oct 19, 2018

@erikjohnston

This comment has been minimized.

Member

erikjohnston commented Oct 19, 2018

Oh, this also pulls in the change from using SynapseError to AuthError, which changes the errcode from M_UNKNOWN to M_FORBIDDEN

@richvdh

lgtm

# association creation for app services
yield self._create_association(room_alias, room_id, servers)
yield self._create_association(room_alias, room_id, servers, creator=user_id)
if send_event:

This comment has been minimized.

@richvdh

richvdh Oct 24, 2018

Member

I'm not entirely convinced that having this in here is helpful, but whatever

@erikjohnston erikjohnston merged commit cb23aa4 into develop Oct 24, 2018

6 checks passed

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
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment