summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-044-5/+100
|\ | | | | Don't 500 when trying to exchange a revoked 3PID invite
| * Fixup testsBrendan Abolivier2019-10-042-4/+12
| |
| * TypoBrendan Abolivier2019-10-041-1/+1
| |
| * LintBrendan Abolivier2019-10-041-3/+1
| |
| * Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| |
| * Lint (again)Brendan Abolivier2019-10-041-3/+1
| |
| * LintBrendan Abolivier2019-10-041-5/+5
| |
| * Add test caseBrendan Abolivier2019-10-042-1/+84
| |
| * ChangelogBrendan Abolivier2019-10-041-0/+1
| |
| * LintBrendan Abolivier2019-10-041-1/+3
| |
| * Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-041-2/+13
|/ | | | | | | | While this is not documented in the spec (but should be), Riot (and other clients) revoke 3PID invites by sending a m.room.third_party_invite event with an empty ({}) content to the room's state. When the invited 3PID gets associated with a MXID, the identity server (which doesn't know about revocations) sends down to the MXID's homeserver all of the undelivered invites it has for this 3PID. The homeserver then tries to talk to the inviting homeserver in order to exchange these invite for m.room.member events. When one of the invite is revoked, the inviting homeserver responds with a 500 error because it tries to extract a 'display_name' property from the content, which is empty. This might cause the invited server to consider that the server is down and not try to exchange other, valid invites (or at least delay it). This fix handles the case of revoked invites by avoiding trying to fetch a 'display_name' from the original invite's content, and letting the m.room.member event fail the auth rules (because, since the original invite's content is empty, it doesn't have public keys), which results in sending a 403 with the correct error message to the invited server.
* Merge pull request #7 from matrix-org/babolivier/deactivation-inviteBrendan Abolivier2019-09-273-2/+94
|\ | | | | Reject pending invites on deactivation
| * Fix git messing upBrendan Abolivier2019-09-271-2/+3
| |
| * s/return/defer.returnValue/Brendan Abolivier2019-09-271-1/+1
| |
| * Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| |
| * Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-0/+4
| | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * Update changelog.d/6125.featureBrendan Abolivier2019-09-271-0/+1
| | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * okBrendan Abolivier2019-09-271-1/+3
| |
| * LintBrendan Abolivier2019-09-272-1/+85
| |
* | Merge pull request #6 from matrix-org/babolivier/access-rules-membershipBrendan Abolivier2019-09-262-1/+10
|\ \ | |/ |/| Allow membership events which membership isn't join or invite in restricted rooms
| * ChangelogBrendan Abolivier2019-09-261-0/+1
| |
| * Allow membership events which membership isn't join or invite in restricted ↵Brendan Abolivier2019-09-261-1/+9
|/ | | | rooms
* Merge pull request #5 from matrix-org/babolivier/get-retention-workerMichael Kaye2019-09-252-55/+64
|\ | | | | Fix room retention policy management in worker mode
| * TypoBrendan Abolivier2019-09-241-1/+1
| |
| * Consider every room as having no retention policy if the feature is disabledBrendan Abolivier2019-09-241-0/+8
| |
| * ChangelogBrendan Abolivier2019-09-241-0/+1
| |
| * Move get_retention_policy_for_room to RoomWorkerStoreBrendan Abolivier2019-09-241-55/+55
|/
* Merge pull request #4 from matrix-org/babolivier/strip_invalid_mxid_charactersBrendan Abolivier2019-09-203-2/+26
|\ | | | | Fix handling of filtered strings in Python 3 when processing MXIDs
| * Remove unnecessary cast to listBrendan Abolivier2019-09-201-1/+1
| |
| * ChangelogBrendan Abolivier2019-09-191-0/+1
| |
| * LintBrendan Abolivier2019-09-191-1/+2
| |
| * Use six.moves.filter when filtering out from MXIDBrendan Abolivier2019-09-191-1/+3
| | | | | | | | Python 2's filter() function and Python 3's don't return the same type when processing a string (respectively str and filter), therefore use six's compatibility mapping (which resolves to itertools.ifilter() if using Python2), then generate a string from the filtered list, in order to ensure consistent behaviour between Python 2 and Python 3.
| * Add unit tests for strip_invalid_mxid_charactersBrendan Abolivier2019-09-191-1/+21
|/
* Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-103-9/+79
|\ | | | | Don't treat 3PID revocation as a new 3PID invite
| * Update changelog.d/2.bugfixBrendan Abolivier2019-09-101-1/+1
| | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * Process revocations in _on_membership_or_invite_directBrendan Abolivier2019-09-091-18/+11
| |
| * TypoBrendan Abolivier2019-09-061-1/+1
| |
| * LintBrendan Abolivier2019-09-061-1/+0
| |
| * ChangelogBrendan Abolivier2019-09-061-0/+1
| |
| * Only filter on 3PID invite tokensBrendan Abolivier2019-09-061-6/+6
| |
| * Fix bogus conflict resolutionBrendan Abolivier2019-09-061-0/+1
| |
| * Merge branch 'dinsic' into babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-066-13/+166
| |\
| * | Don't process revoked/redacted events as part of the room's membership infoBrendan Abolivier2019-09-062-2/+12
| | |
| * | Don't treat 3PID revokation as a new 3PID inviteBrendan Abolivier2019-09-062-7/+74
| | |
* | | Merge pull request #3 from matrix-org/babolivier/password-reset-template-unicodeBrendan Abolivier2019-09-095-8/+7
|\ \ \ | |_|/ |/| | Ensure the password reset template is correctly converted to binary
| * | Rename io.open import to limite side-effectsBrendan Abolivier2019-09-091-2/+2
| | |
| * | LintBrendan Abolivier2019-09-091-1/+1
| | |
| * | Revert "Merge pull request #5932 from ↵Brendan Abolivier2019-09-093-7/+4
| | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb.
| * | Read all files as UTF-8Brendan Abolivier2019-09-091-1/+2
| | |
| * | Revert "Ensure the password reset template is correctly converted to binary"Brendan Abolivier2019-09-091-2/+1
| | | | | | | | | | | | This reverts commit 665dd9f7f8db2f8d38f454d4d5b96efcf163a5db.
| * | ChangelogBrendan Abolivier2019-09-091-0/+1
| | |
| * | Ensure the password reset template is correctly converted to binaryBrendan Abolivier2019-09-091-1/+2
|/ / | | | | | | Regardless of the Python version
* | Merge pull request #1 from matrix-org/babolivier/direct-avatar-nameBrendan Abolivier2019-09-066-5/+159
|\ \ | |/ |/| Forbid changing the name, avatar or topic of a direct room
| * Fix CIBrendan Abolivier2019-09-053-5/+5
| |
| * LintBrendan Abolivier2019-09-051-2/+0
| |
| * ChangelogBrendan Abolivier2019-09-051-0/+1
| |
| * Add testsBrendan Abolivier2019-09-051-0/+105
| |
| * Forbid changing the name, avatar or topic of a direct roomBrendan Abolivier2019-09-051-0/+50
|/
* Merge pull request #5932 from ↵ dinsic_2019-08-30 github/dinsic dinsicBrendan Abolivier2019-08-293-4/+7
|\ | | | | | | | | matrix-org/babolivier/account_validity_template_encode Fix encoding for account validity HTML files on Python 2
| * Bump requirement for six to 1.12Brendan Abolivier2019-08-291-1/+1
| |
| * Fix encoding for account validity HTML files on Python 2Brendan Abolivier2019-08-292-3/+6
|/
* Merge pull request #5815 from matrix-org/babolivier/dinsic-message-retention dinsic_2019-08-29Brendan Abolivier2019-08-2813-7/+1072
|\ | | | | Message retention policies at the room and server levels
| * Merge branch 'dinsic' into babolivier/dinsic-message-retentionBrendan Abolivier2019-08-2814-44/+344
| |\ | |/ |/|
* | Merge pull request #5812 from matrix-org/babolivier/account-validity-messages dinsic_2019-08-12Michael Kaye2019-08-128-9/+117
|\ \ | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| * | LintBrendan Abolivier2019-08-013-14/+9
| | |
| * | Sample configBrendan Abolivier2019-08-011-0/+10
| | |
| * | ChangelogBrendan Abolivier2019-08-011-0/+1
| | |
| * | Add testsBrendan Abolivier2019-08-011-0/+37
| | |
| * | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-015-9/+74
| | |
* | | Merge pull request #5781 from matrix-org/baboliver/loopingcall-args dinsic_2019-08-08Michael Kaye2019-08-082-2/+5
|\ \ \ | | | | | | | | Add ability to pass arguments to looping calls
| * | | ChangelogBrendan Abolivier2019-07-291-0/+1
| | | |
| * | | Add kwargs and docBrendan Abolivier2019-07-291-2/+4
| | | |
| * | | Add ability to pass arguments to looping callsBrendan Abolivier2019-07-291-2/+2
| | | |
* | | | Merge pull request #5760 from ↵Michael Kaye2019-08-083-16/+190
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | matrix-org/babolivier/access-rules-public-restricted Force the access rule to be "restricted" if the join rule is "public"
| * | | Explain rationaleBrendan Abolivier2019-08-011-0/+4
| | | |
| * | | Incorporate reviewBrendan Abolivier2019-07-301-15/+13
| | | |
| * | | Fix changelogBrendan Abolivier2019-07-251-1/+1
| | | |
| * | | ChangelogBrendan Abolivier2019-07-251-0/+1
| | | |
| * | | Merge ifsBrendan Abolivier2019-07-251-5/+4
| | | |
| * | | DocBrendan Abolivier2019-07-251-2/+14
| | | |
| * | | Fix status code for forbidden eventsBrendan Abolivier2019-07-251-6/+6
| | | |
| * | | Only check the join rule on room creation if an access rule is also providedBrendan Abolivier2019-07-251-12/+12
| | | |
| * | | Turns out the default preset is public_chatBrendan Abolivier2019-07-241-5/+3
| | | |
| * | | Implement restrictions on new eventsBrendan Abolivier2019-07-241-1/+40
| | | |
| * | | Implement restriction on public room creationBrendan Abolivier2019-07-241-11/+30
| | | |
| * | | Add test caseBrendan Abolivier2019-07-241-2/+106
| |/ /
* | | Check room ID and type of redacted event (#5784) dinsic_2019-07-31Brendan Abolivier2019-07-311-17/+32
|\ \ \ | |/ / |/| | Check room ID and type of redacted event
| * | Ignore redactions of redactions in get_events_as_listBrendan Abolivier2019-07-311-4/+1
| | |
| * | Ignore invalid redactions in _get_event_from_rowBrendan Abolivier2019-07-311-0/+5
| | |
| * | Should now work, unless we can't find the redaction event which happens for ↵Brendan Abolivier2019-07-301-18/+18
| | | | | | | | | | | | some reason (need to investigate)
| * | Don't make the checks depend on recheck_redactionBrendan Abolivier2019-07-301-20/+23
| | |
| * | Do checks soonerBrendan Abolivier2019-07-291-21/+19
| | |
| * | Check room ID and type of redacted eventBrendan Abolivier2019-07-291-10/+22
|/ /
| * Implement per-room message retention policiesBrendan Abolivier2019-08-2813-7/+1072
|/
* Merge pull request #5702 from matrix-org/babolivier/3pid-invite dinsic_2019-07-18Brendan Abolivier2019-07-182-1/+5
|\ | | | | Fix check of the association between a 3PID invite and the subsequent m.room.member event in the 3rd party rules
| * Fix changelogBrendan Abolivier2019-07-171-1/+1
| |
| * Merge branch 'dinsic' into babolivier/3pid-inviteBrendan Abolivier2019-07-175-152/+59
| |\ | |/ |/|
* | Merge pull request #5646 from matrix-org/babolivier/profile-allow-self dinsic_2019-07-09Brendan Abolivier2019-07-095-152/+59
|\ \ | | | | | | Port #5644 to dinsic
| * | make the base branch dinsic for dinsic dinsic_2019-06-27_1Amber H. Brown2019-07-091-4/+5
| | |
| * | cut down circleci config to just what dinsic needsAmber H. Brown2019-07-091-148/+2
| | |
| * | LintBrendan Abolivier2019-07-091-2/+2
| | |
| * | Add test caseBrendan Abolivier2019-07-091-0/+47
| | |
| * | ChangelogBrendan Abolivier2019-07-091-0/+1
| | |
| * | Allow newly-registered users to lookup their own profilesBrendan Abolivier2019-07-091-0/+4
| | | | | | | | | | | | When a user creates an account and the 'require_auth_for_profile_requests' config flag is set, and a client that performed the registration wants to lookup the newly-created profile, the request will be denied because the user doesn't share a room with themselves yet.
| | * ChangelogBrendan Abolivier2019-07-171-0/+1
| | |
| | * There's no third_party_signed property in an invite's contentBrendan Abolivier2019-07-171-6/+3
| | |
| | * Fix check of the association between a 3PID invite and the subsequent ↵Brendan Abolivier2019-07-171-1/+7
| |/ |/| | | | | m.room.member event in the 3rd party rules
* | Merge pull request #5610 from matrix-org/babolivier/power-levels dinsic_2019-07-04Brendan Abolivier2019-07-043-38/+173
|\ \ | | | | | | Implement new restrictions on power levels
| * \ Merge branch 'babolivier/power-levels' of github.com:matrix-org/synapse into ↵Brendan Abolivier2019-07-031-0/+1
| |\ \ | | | | | | | | | | | | babolivier/power-levels
| | * | Update synapse/third_party_rules/access_rules.pyBrendan Abolivier2019-07-031-0/+1
| | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | Incorporate reviewBrendan Abolivier2019-07-031-6/+10
| |/ /
| * | Incorporate reviewBrendan Abolivier2019-07-031-8/+12
| | |
| * | ChangelogBrendan Abolivier2019-07-031-0/+1
| | |
| * | Change the rule for applying PL restrictionsBrendan Abolivier2019-07-031-3/+7
| | |
| * | Add testsBrendan Abolivier2019-07-031-4/+52
| | |
| * | Default return value for events we're not interested inBrendan Abolivier2019-07-031-0/+2
| | |
| * | Refactor part of the access rules moduleBrendan Abolivier2019-07-031-33/+47
| | | | | | | | | | | | Since we're not processing only membership events and 3PID invites anymore, it's nice to know which function is supposed to process what.
| * | Implement restrictions for power levelsBrendan Abolivier2019-07-031-0/+57
| | |
* | | Merge pull request #5577 from matrix-org/babolivier/3pid-invite-ratelimit dinsic_2019-06-28Brendan Abolivier2019-06-282-0/+2
|\ \ \ | |/ / |/| | Port #5576 to dinsic
| * | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| | | | | | | | | | | | If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited.
| * | ChangelogBrendan Abolivier2019-06-281-0/+1
| | |
| * | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
|/ / | | | | | | This would cause emails being sent, but Synapse responding with a 429 when creating the event. The client would then retry, and with bad timing the same scenario would happen again. Some testing I did ended up sending me 10 emails for one single invite because of this.
* / Add test case for #5574Brendan Abolivier2019-06-281-0/+108
|/ | | | There's no test that makes sure #5574 didn't break things or works correctly (my bad), so this PR adds a test case that makes sure of it.
* Merge pull request #5574 from matrix-org/babolivier/fix-3pid-bind dinsic_2019-06-27Brendan Abolivier2019-06-271-3/+8
|\ | | | | Fix new 3PID bindings being associated with rewritten IS's server names instead of the original one
| * Fix new 3PID bindings being associated with rewritten IS's server names ↵Brendan Abolivier2019-06-271-3/+8
| | | | | | | | | | | | instead of the original one This would make unbind requests fail because Synapse is using the server name it has in DB as destination_is to generate signature, and Sydent uses its own server name there when verifying it, so if a mismatch happens, which is the case if the name gets rewritten for routing purposes, the unbind requests fail on the signature verification.
* | Merge pull request #5542 from matrix-org/babolivier/federation-publicrooms dinsic_2019-06-24Brendan Abolivier2019-06-246-20/+49
|\ \ | | | | | | Port "Split public rooms directory auth config in two" to dinsic
| * | Split public rooms directory auth config in twoBrendan Abolivier2019-06-246-20/+49
|/ /
* | Merge pull request #5495 from matrix-org/babolivier/deactivate_bg_job_typo dinsic_2019-06-19Brendan Abolivier2019-06-192-1/+2
|\ \ | | | | | | Port "Fix typo in deactivation background job" to dinsic
| * | Fix typo in deactivation background jobBrendan Abolivier2019-06-192-1/+2
| | |
* | | Merge pull request #5484 from matrix-org/babolivier/dinsic_access_rulesBrendan Abolivier2019-06-193-0/+812
|\ \ \ | |/ / |/| | Implement custom access rules
| * | Add tests for constraints on changing the rule for a roomBrendan Abolivier2019-06-181-0/+60
| | |
| * | Add tests for 3PID invitesBrendan Abolivier2019-06-181-12/+146
| | |
| * | Don't process 3PIDs in _apply_restrictedBrendan Abolivier2019-06-181-1/+3
| | |
| * | Remove unused importBrendan Abolivier2019-06-181-1/+0
| | |
| * | Add tests for inviting with access rulesBrendan Abolivier2019-06-181-2/+102
| | |
| * | LintBrendan Abolivier2019-06-181-1/+0
| | |
| * | Remove unused importsBrendan Abolivier2019-06-181-3/+0
| | |
| * | LintBrendan Abolivier2019-06-181-1/+1
| | |
| * | Add tests for room creation hookBrendan Abolivier2019-06-181-0/+136
| | |
| * | Incorporate reviewBrendan Abolivier2019-06-181-78/+69
| | |
| * | FixesBrendan Abolivier2019-06-181-0/+5
| | |
| * | DocstringsBrendan Abolivier2019-06-171-27/+154
| | |
| * | Rename into RoomAccessRulesBrendan Abolivier2019-06-172-1/+1
| | |
| * | Fix function callBrendan Abolivier2019-06-171-1/+1
| | |
| * | Implement rules changeBrendan Abolivier2019-06-171-1/+40
| | |
| * | Improve docBrendan Abolivier2019-06-171-3/+8
| | |
| * | Implement 3PID invite hookBrendan Abolivier2019-06-171-7/+49
| | |
| * | Implement restricted rules and room creation hookBrendan Abolivier2019-06-171-11/+43
| | |
| * | Implement rules for directBrendan Abolivier2019-06-171-12/+100
| | |
| * | BackboneBrendan Abolivier2019-06-171-0/+11
| | |
| * | BaseBrendan Abolivier2019-06-172-0/+45
|/ /
* | Merge pull request #5481 from matrix-org/babolivier/third_party_rules_3pidBrendan Abolivier2019-06-173-1/+43
|\ \ | | | | | | Port "Add third party rules hook for 3PID invites" to dinsic
| * | Make check_threepid_can_be_invited asyncBrendan Abolivier2019-06-171-0/+1
| | |
| * | ChangelogBrendan Abolivier2019-06-171-0/+1
| | |
| * | Add third party rules hook for 3PID invitesBrendan Abolivier2019-06-172-1/+41
| | |
* | | Merge pull request #5474 from matrix-org/erikj/add_create_room_hookErik Johnston2019-06-173-6/+38
|\ \ \ | | | | | | | | Add third party rules hook into create room
| * | | NewsfileErik Johnston2019-06-171-0/+1
| |/ /
| * / Add third party rules hook into create roomErik Johnston2019-06-172-6/+37
|/ /
* | Merge pull request #5471 from matrix-org/erikj/3pid_remote_invite_stateBrendan Abolivier2019-06-173-7/+2
|\ \ | | | | | | Port "Fix 3PID invite room state over federation" to dinsic
| * | NewsfileErik Johnston2019-06-141-0/+1
| | |
| * | Fix 3PID invite room state over federation.Erik Johnston2019-06-141-6/+0
| | | | | | | | | | | | | | | | | | | | | Fixes that when a user exchanges a 3PID invite for a proper invite over federation it does not include the `invite_room_state` key. This was due to synapse incorrectly sending out two invite requests.
| * | Change to absolute path for contrib/dockerNeil Johnson2019-06-131-1/+1
| | | | | | | | | because this file is reproduced on dockerhub and relative paths don't work
* | | Merge branch 'babolivier/third_party_event_rules' into dinsicBrendan Abolivier2019-06-149-4/+282
|\ \ \
| * | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-149-4/+284
| | | |
* | | | Merge pull request #5466 from matrix-org/babolivier/fix_deactivation_bg_jobBrendan Abolivier2019-06-142-2/+6
|\ \ \ \ | | | | | | | | | | Port "Fix background job for deactivated flag" to dinsic
| * | | | Fix changelogBrendan Abolivier2019-06-142-1/+2
| | | | |
| * | | | ChangelogBrendan Abolivier2019-06-141-0/+1
| | | | |
| * | | | Fix background job for deactivated flagBrendan Abolivier2019-06-141-2/+4
| | | | |
* | | | | Merge pull request #5463 from ↵Brendan Abolivier2019-06-146-27/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_deactivated_accounts_2 Port "Don't send renewal emails to deactivated users" to dinsic
| * | | | Fix testBrendan Abolivier2019-06-141-1/+2
| | | | |
| * | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-146-27/+68
|/ / / /
* | | | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-145-0/+183
| | | |
* | | | Merge pull request #5420 from matrix-org/babolivier/userdir_hide_usersBrendan Abolivier2019-06-145-0/+78
|\ \ \ \ | | | | | | | | | | Add configuration option to hide new users from the user directory
| * \ \ \ Merge branch 'dinsic' into babolivier/userdir_hide_usersBrendan Abolivier2019-06-141-0/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Make index uniqueBrendan Abolivier2019-06-141-0/+1
| | | | |
* | | | | Merge pull request #5416 from matrix-org/babolivier/fix_profile_replicationBrendan Abolivier2019-06-135-3/+32
|\ \ \ \ \ | | | | | | | | | | | | Add unique index to the profile_replication_status table.
| | * \ \ \ Merge branch 'babolivier/fix_profile_replication' into ↵Brendan Abolivier2019-06-132-2/+15
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | babolivier/userdir_hide_users
| * | | | | LintBrendan Abolivier2019-06-131-1/+1
| | | | | |
| * | | | | Fix snafuBrendan Abolivier2019-06-131-2/+3
| | | | | |
| * | | | | Create the index in a background updateBrendan Abolivier2019-06-132-3/+15
| | | | | |
| * | | | | Fix bogus changelogBrendan Abolivier2019-06-121-1/+1
| | | | | |
| * | | | | LintBrendan Abolivier2019-06-121-1/+0
| | | | | |
| * | | | | Merge branch 'dinsic' into babolivier/fix_profile_replicationBrendan Abolivier2019-06-12187-1929/+11277
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| | * | | | Fix bogus changelogBrendan Abolivier2019-06-121-1/+1
| | | | | |
| | * | | | LintBrendan Abolivier2019-06-121-1/+0
| | | | | |
| | * | | | Merge branch 'dinsic' into babolivier/userdir_hide_usersBrendan Abolivier2019-06-12188-1929/+11277
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Regenerate full schemasBrendan Abolivier2019-06-122-2/+17
| | | | | |
* | | | | | Fix path for password policy endpointsBrendan Abolivier2019-06-121-2/+2
| | | | | |
* | | | | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-12151-1604/+8497
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 1.0.0 v1.0.0Erik Johnston2019-06-116-4/+28
| | | | | |
| * | | | | Merge pull request #5424 from matrix-org/erikj/change_password_reset_linksErik Johnston2019-06-1112-32/+262
| |\ \ \ \ \ | | | | | | | | | | | | | | Change password reset links to /_matrix.
| | * | | | | Bump bleach version so that tests can run on old deps.Erik Johnston2019-06-115-25/+1
| | | | | | |
| | * | | | | NewsfileErik Johnston2019-06-111-0/+1
| | | | | | |
| | * | | | | Change password reset links to /_matrix.Erik Johnston2019-06-116-7/+260
| | | |_|/ / | | |/| | |
| * / | | | Neilj/improve federation docs (#5419)Neil Johnson2019-06-114-16/+106
| |/ / / / | | | | | | | | | | | | | | | Add FAQ questions to federate.md. Add a health warning making it clear that the 1711 upgrade FAQ is now out of date.
| * | | | 1.0.0rc3 v1.0.0rc3Erik Johnston2019-06-112-1/+7
| | | | |
| * | | | Fix defaults on checking threepidsErik Johnston2019-06-102-1/+2
| | | | |
| * | | | Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zeroErik Johnston2019-06-102-0/+5
| |\ \ \ \ | | | | | | | | | | | | Fix bug sending federation transactions with lots of EDUs
| | * | | | Update changelog.d/5418.bugfixErik Johnston2019-06-101-1/+1
| | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| | * | | | NewsfileErik Johnston2019-06-101-0/+1
| | | | | |
| | * | | | Fix bug sending federation transactions with lots of EDUsErik Johnston2019-06-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we try and send a transaction with lots of EDUs and we run out of space, we call get_new_device_msgs_for_remote with a limit of 0, which then failed.
| * | | | | 1.0.0rc2 v1.0.0rc2Erik Johnston2019-06-105-4/+12
| | | | | |
| * | | | | Merge pull request #5417 from matrix-org/rav/shared_ssl_contextErik Johnston2019-06-1010-182/+455
| |\ \ \ \ \ | | |/ / / / | |/| | | | Share an SSL context object between SSL connections
| | * | | | fix ci on py2, againRichard van der Hoff2019-06-101-1/+1
| | | | | |
| | * | | | rename gutwrenched attrRichard van der Hoff2019-06-101-5/+9
| | | | | |
| | * | | | fix CI on python 2.7Richard van der Hoff2019-06-101-6/+4
| | | | | |
| | * | | | fix build failsRichard van der Hoff2019-06-102-1/+4
| | | | | |
| | * | | | Tests for SSL certs for federation connectionsRichard van der Hoff2019-06-106-106/+343
| | | | | | | | | | | | | | | | | | | | | | | | Add some tests for bad certificates for federation and .well-known connections
| | * | | | Fix federation connections to literal IP addressesRichard van der Hoff2019-06-102-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turns out we need a shiny version of service_identity to enforce this correctly.
| | * | | | clean up impl, and import idna directlyRichard van der Hoff2019-06-102-15/+12
| | | | | |
| | * | | | Share an SSL context object between SSL connectionsRichard van der Hoff2019-06-091-60/+89
| | | | | | | | | | | | | | | | | | | | | | | | This involves changing how the info callbacks work.
| * | | | | Merge branch 'erikj/fix_null_valid_until_ms' of ↵Erik Johnston2019-06-103-1/+58
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into release-v1.0.0
| | * | | | | NewsfileErik Johnston2019-06-101-0/+1
| | | | | | |
| | * | | | | Fix key verification when key stored with null valid_until_msErik Johnston2019-06-102-1/+57
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some keys are stored in the synapse database with a null valid_until_ms which caused an exception to be thrown when using that key. We fix this by treating nulls as zeroes, i.e. they keys will match verification requests with a minimum_valid_until_ms of zero (i.e. don't validate ts) but will not match requests with a non-zero minimum_valid_until_ms. Fixes #5391.
| * / / / / Improve startup checks for insecure notary configs (#5392)Richard van der Hoff2019-06-103-11/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not really a problem to trust notary responses signed by the old key so long as we are also doing TLS validation. This commit adds a check to the config parsing code at startup to check that we do not have the insecure matrix.org key without tls validation, and refuses to start without it. This allows us to remove the rather alarming-looking warning which happens at runtime.
| * | | | 1.0.0rc1 v1.0.0rc1Neil Johnson2019-06-0781-83/+84
| | | | |
| * | | | Automatically retry builds when a buildkite agent is lost (#5380)Andrew Morgan2019-06-072-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the build agents get lost or die (error codes -1 and 2). Retry automatically a maximum of 2 times if this happens. Error code reference: * -1: Agent was lost * 0: Build successful * 1: There was an error in your code * 2: The build stopped abruptly * 255: The build was cancelled
| * | | | Prevent multiple device list updates from breaking a batch send (#5156)Andrew Morgan2019-06-064-31/+196
| | | | | | | | | | | | | | | fixes #5153
| * | | | Set default room version to v4. (#5379)Neil Johnson2019-06-065-3/+11
| | | | | | | | | | | | | | | | | | | | Set default room version to v4.
| * | | | Merge pull request #5320 from matrix-org/hawkowl/full-schema-v1Erik Johnston2019-06-067-2/+2356
| |\ \ \ \ | | | | | | | | | | | | Make a full SQL schema
| | * | | | fix maybeAmber H. Brown2019-06-071-20/+2
| | | | | |
| | * | | | just user dir?Amber H. Brown2019-06-071-1/+19
| | | | | |
| | * | | | remove background updates that arent neededAmber H. Brown2019-06-071-33/+1
| | | | | |
| | * | | | add more commentsAmber Brown2019-06-061-0/+5
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1Amber Brown2019-06-0445-329/+299
| | |\ \ \ \
| | * | | | | add stuff in bg updatesAmber Brown2019-06-041-10/+62
| | | | | | |
| | * | | | | WHY IS THIS CALLED A SLIGHTLY DIFFERENT THINGAmber Brown2019-06-031-0/+1
| | | | | | |
| | * | | | | more fixAmber Brown2019-06-032-0/+4
| | | | | | |
| | * | | | | more fixAmber Brown2019-06-032-2/+38
| | | | | | |
| | * | | | | fix schemasAmber Brown2019-06-035-61/+22
| | | | | | |
| | * | | | | full schemaAmber Brown2019-06-033-0/+2315
| | | | | | |
| | * | | | | prepareAmber Brown2019-06-031-2/+14
| | | | | | |
| * | | | | | remove bloatNeil Johnson2019-06-061-10/+1
| | | | | | |
| * | | | | | Add ability to perform password reset via email without trusting the ↵Andrew Morgan2019-06-0620-71/+922
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identity server (#5377) Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368
| * | | | | | Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-066-95/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few changes going on here: * We make checking the signature on a key server response optional: if no verify_keys are specified, we trust to TLS to validate the connection. * We change the default config so that it does not require responses to be signed by the old key. * We replace the old 'perspectives' config with 'trusted_key_servers', which is also formatted slightly differently. * We emit a warning to the logs every time we trust a key server response signed by the old key.
| * | | | | | Neilj/1.0 upgrade notes (#5371)Neil Johnson2019-06-064-8/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.0 upgrade/install notes
| * | | | | | Regen sample config before kicking off agents (#5370)Andrew Morgan2019-06-062-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Regen sample config before kicking off agents * Add changelog
| * | | | | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369)Richard van der Hoff2019-06-062-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes some warnings, and a scary-looking stacktrace when sytest kills the process.
| * | | | | | Merge pull request #5221 from matrix-org/erikj/fix_worker_sytestErik Johnston2019-06-062-1/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix get_max_topological_token to never return None
| | * | | | | | Better wordsErik Johnston2019-06-061-1/+1
| | | | | | | |
| | * | | | | | NewsfileErik Johnston2019-05-211-0/+1
| | | | | | | |
| | * | | | | | Fix get_max_topological_token to never return NoneErik Johnston2019-05-211-1/+11
| | | | | | | |
| * | | | | | | Merge pull request #5089 from dnaf/m-heroes-empty-room-nameBrendan Abolivier2019-06-062-5/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make /sync return heroes if room name or canonical alias are empty
| | * | | | | | | Add credit in the changelogBrendan Abolivier2019-06-062-1/+1
| | | | | | | | |
| | * | | | | | | Simplify conditionBrendan Abolivier2019-06-061-2/+2
| | | | | | | | |
| | * | | | | | | Simplify conditionBrendan Abolivier2019-06-051-3/+2
| | | | | | | | |
| | * | | | | | | Merge branch 'develop' into m-heroes-empty-room-nameBrendan Abolivier2019-06-05350-3583/+9622
| | |\ \ \ \ \ \ \
| | * | | | | | | | LintKatie Wolfe2019-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I probably should've just run autopep8 in the first place... Signed-off-by: Katie Wolfe <katie@dnaf.moe>
| | * | | | | | | | Clean up codeKatie Wolfe2019-04-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Katie Wolfe <katie@dnaf.moe>