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

Copy over non-federatable trait on room upgrade #4530

Merged
merged 6 commits into from Jan 31, 2019

Conversation

Projects
None yet
4 participants
@anoadragon453
Copy link
Member

commented Jan 30, 2019

This PR fixes the bug where if you upgraded a room that was set to be unable to federate, the upgraded room could still federate.

Sytest PR: matrix-org/sytest#557

Fixes #4517

@anoadragon453 anoadragon453 requested a review from matrix-org/synapse-core Jan 30, 2019

@turt2live

This comment has been minimized.

Copy link
Member

commented Jan 30, 2019

Fixes #4517

@codecov-io

This comment has been minimized.

Copy link

commented Jan 31, 2019

Codecov Report

Merging #4530 into develop will increase coverage by 6.93%.
The diff coverage is 100%.

@@             Coverage Diff             @@
##           develop    #4530      +/-   ##
===========================================
+ Coverage    67.79%   74.72%   +6.93%     
===========================================
  Files          338      338              
  Lines        34491    34492       +1     
  Branches      5619     5618       -1     
===========================================
+ Hits         23384    25775    +2391     
+ Misses        9494     7126    -2368     
+ Partials      1613     1591      -22
@richvdh
Copy link
Member

left a comment

lgtm otherwise.

Returns:
Deferred[EventBase|None]: The room creation event. None if can not be found
"""
state_ids = yield self.get_current_state_ids(room_id)
create_id = state_ids.get((EventTypes.Create, ""))

# If we can't find the create event, assume we've hit a dead end
if not create_id:
defer.returnValue(None)

This comment has been minimized.

Copy link
@richvdh

richvdh Jan 31, 2019

Member

It shouldn't be possible to get here. Suggest you throw the NotFoundEvent (and update the docstring accordingly)

@anoadragon453

This comment has been minimized.

Copy link
Member Author

commented Jan 31, 2019

Cool, addressed. Will wait for CI.

@richvdh richvdh changed the base branch from develop to release-v0.99.0 Jan 31, 2019

@richvdh richvdh changed the base branch from release-v0.99.0 to develop Jan 31, 2019

@anoadragon453 anoadragon453 merged commit c45fd0d into develop Jan 31, 2019

5 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

@anoadragon453 anoadragon453 deleted the anoa/room_upgrade_federatable branch Jan 31, 2019

richvdh added a commit that referenced this pull request Feb 14, 2019

Merge tag 'v0.99.1'
Synapse 0.99.1 (2019-02-14)
===========================

Features
--------

- Include m.room.encryption on invites by default ([\#3902](#3902))
- Federation OpenID listener resource can now be activated even if federation is disabled ([\#4420](#4420))
- Synapse's ACME support will now correctly reprovision a certificate that approaches its expiry while Synapse is running. ([\#4522](#4522))
- Add ability to update backup versions ([\#4580](#4580))
- Allow the "unavailable" presence status for /sync.
  This change makes Synapse compliant with r0.4.0 of the Client-Server specification. ([\#4592](#4592))
- There is no longer any need to specify `no_tls`: it is inferred from the absence of TLS listeners ([\#4613](#4613), [\#4615](#4615), [\#4617](#4617), [\#4636](#4636))
- The default configuration no longer requires TLS certificates. ([\#4614](#4614))

Bugfixes
--------

- Copy over room federation ability on room upgrade. ([\#4530](#4530))
- Fix noisy "twisted.internet.task.TaskStopped" errors in logs ([\#4546](#4546))
- Synapse is now tolerant of the `tls_fingerprints` option being None or not specified. ([\#4589](#4589))
- Fix 'no unique or exclusion constraint' error ([\#4591](#4591))
- Transfer Server ACLs on room upgrade. ([\#4608](#4608))
- Fix failure to start when not TLS certificate was given even if TLS was disabled. ([\#4618](#4618))
- Fix self-signed cert notice from generate-config. ([\#4625](#4625))
- Fix performance of `user_ips` table deduplication background update ([\#4626](#4626), [\#4627](#4627))

Internal Changes
----------------

- Change the user directory state query to use a filtered call to the db instead of a generic one. ([\#4462](#4462))
- Reject federation transactions if they include more than 50 PDUs or 100 EDUs. ([\#4513](#4513))
- Reduce duplication of ``synapse.app`` code. ([\#4567](#4567))
- Fix docker upload job to push -py2 images. ([\#4576](#4576))
- Add port configuration information to ACME instructions. ([\#4578](#4578))
- Update MSC1711 FAQ to calrify .well-known usage ([\#4584](#4584))
- Clean up default listener configuration ([\#4586](#4586))
- Clarifications for reverse proxy docs ([\#4607](#4607))
- Move ClientTLSOptionsFactory init out of `refresh_certificates` ([\#4611](#4611))
- Fail cleanly if listener config lacks a 'port' ([\#4616](#4616))
- Remove redundant entries from docker config ([\#4619](#4619))
- README updates ([\#4621](#4621))
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.