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

by default include m.room.encryption on invites #3902

Merged
merged 4 commits into from Jan 30, 2019

Conversation

Projects
None yet
4 participants
@ara4n
Copy link
Member

ara4n commented Sep 18, 2018

so that receiving clients can chuck a padlock on the incoming room.

obviously this means that the sending server can lie about the encryptedness, but this is hopefully mitigated elsewhere in the UI.

@ara4n ara4n requested a review from matrix-org/synapse-core Sep 18, 2018

ara4n added some commits Sep 18, 2018

@erikjohnston
Copy link
Member

erikjohnston left a comment

LGTM I guess? Though why are the tests failing?

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jan 30, 2019

Codecov Report

Merging #3902 into develop will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #3902      +/-   ##
===========================================
+ Coverage    74.74%   74.74%   +<.01%     
===========================================
  Files          338      338              
  Lines        34481    34482       +1     
  Branches      5616     5616              
===========================================
+ Hits         25772    25773       +1     
+ Misses        7122     7119       -3     
- Partials      1587     1590       +3
Impacted Files Coverage Δ
synapse/config/api.py 100% <ø> (ø) ⬆️
synapse/api/constants.py 100% <100%> (ø) ⬆️
synapse/handlers/user_directory.py 71.25% <0%> (-0.3%) ⬇️
synapse/events/__init__.py 68.83% <0%> (ø) ⬆️
synapse/handlers/search.py 74.01% <0%> (ø) ⬆️
synapse/handlers/federation.py 62.05% <0%> (ø) ⬆️
synapse/util/file_consumer.py 82.45% <0%> (+1.75%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6587b0b...00c8f46. Read the comment docs.

@hawkowl hawkowl merged commit ad7ac88 into develop Jan 30, 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

@hawkowl hawkowl deleted the matthew/room-encryption-on-invites branch Jan 30, 2019

anoadragon453 added a commit that referenced this pull request Feb 1, 2019

by default include m.room.encryption on invites (#3902)
* by default include m.room.encryption on invites

* fix constant

* changelog

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.