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

add updating of backup versions #4580

Merged
merged 6 commits into from Feb 11, 2019

Conversation

Projects
None yet
3 participants
@uhoreg
Copy link
Member

commented Feb 6, 2019

first cut of a proposed change to backups to allow for updating backup versions (e.g. to allow new signatures to be added): uhoreg/matrix-doc#1 The API isn't finalized, but I don't think that it will change significantly, so I think that it can have an initial review.

(Also includes a change to fix some error codes that was apparently sitting on my harddrive uncommitted)

CI seems to be failing due to reasons unrelated to my changes.

@codecov-io

This comment has been minimized.

Copy link

commented Feb 7, 2019

Codecov Report

Merging #4580 into develop will increase coverage by 0.01%.
The diff coverage is 74.35%.

@@            Coverage Diff             @@
##           develop   #4580      +/-   ##
==========================================
+ Coverage    74.89%   74.9%   +0.01%     
==========================================
  Files          338     338              
  Lines        34511   34547      +36     
  Branches      5620    5627       +7     
==========================================
+ Hits         25846   25879      +33     
+ Misses        7083    7079       -4     
- Partials      1582    1589       +7

@uhoreg uhoreg requested a review from matrix-org/synapse-core Feb 7, 2019

@erikjohnston
Copy link
Member

left a comment

This looks broadly sane to me, though we I'd quite like some tests and the docs to land before merging

Show resolved Hide resolved synapse/rest/client/v2_alpha/room_keys.py Outdated
Show resolved Hide resolved synapse/handlers/e2e_room_keys.py Outdated
@erikjohnston

This comment has been minimized.

Copy link
Member

commented Feb 7, 2019

@uhoreg I merged develop into your sytest branch, as that was what was breaking the CI

@uhoreg uhoreg requested a review from erikjohnston Feb 8, 2019

@uhoreg

This comment has been minimized.

Copy link
Member Author

commented Feb 8, 2019

added some tests, and made things match the latest proposal (which has been merged into the MSC)

@erikjohnston erikjohnston merged commit 719e073 into develop Feb 11, 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

@manuroe manuroe referenced this pull request Feb 12, 2019

Closed

key backup: Trust on Decrypt #257

3 of 3 tasks complete

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))

@richvdh richvdh deleted the uhoreg/e2e_backup_add_updating branch Mar 11, 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.