summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Use SimpleResolverComplexifier in tests (#4497)Richard van der Hoff2019-01-293-32/+17
| | | | | two reasons for this. One, it saves a bunch of boilerplate. Two, it squashes unicode to IDNA-in-a-`str` (even on python 3) in a way that it turns out we rely on to give consistent behaviour between python 2 and 3.
* Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-2811-28/+71
|\ | | | | Pass through room version to event auth
| * Correctly use default room version if none is setErik Johnston2019-01-281-2/+2
| |
| * NewsfileErik Johnston2019-01-251-0/+1
| |
| * Pass through room version to event authErik Johnston2019-01-2510-27/+69
| |
* | Fix worker TLS (#4492)Amber Brown2019-01-288-48/+49
| | | | | | | | | | | | | | | | * load cert * changelog * fix
* | Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-288-18/+30
| |
* | Merge pull request #4412 from matrix-org/anoa/dm_room_upgradeAndrew Morgan2019-01-285-18/+83
|\ \ | | | | | | Migrate direct message and tag state on room upgrade
| * | Change return syntax in doc stringAndrew Morgan2019-01-281-1/+1
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-2832-123/+556
| |\ \ | |/ / |/| | | | | anoa/dm_room_upgrade
* | | Remove --process-dependency-links from UPGRADE.rst (#4485)Aaron Raimist2019-01-282-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove --process-dependency-links from UPGRADE.rst Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | Merge pull request #4488 from matrix-org/rav/fed_routing/refactorRichard van der Hoff2019-01-283-35/+120
|\ \ \ | | | | | | | | Refactoring in MatrixFederationAgent
| * | | docstrings for _RoutingResultRichard van der Hoff2019-01-281-0/+36
| | | |
| * | | changelogRichard van der Hoff2019-01-281-0/+1
| | | |
| * | | Handle IP literals explicitlyRichard van der Hoff2019-01-282-17/+21
| | | | | | | | | | | | | | | | We don't want to be doing .well-known lookups on these guys.
| * | | MatrixFederationAgent: factor out routing logicRichard van der Hoff2019-01-281-18/+62
|/ / / | | | | | | | | | This is going to get too big and unmanageable.
* | / Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)Richard van der Hoff2019-01-283-12/+193
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that the library does a better job of parsing URIs than our reinvented wheel. Who knew. There are two things going on here. The first is that, unlike parse_server_name, URI.fromBytes will strip off square brackets from IPv6 literals, which means that it is valid input to ClientTLSOptionsFactory and HostnameEndpoint. The second is that we stay in `bytes` throughout (except for the argument to ClientTLSOptionsFactory), which avoids the weirdness of (sometimes) ending up with idna-encoded values being held in `unicode` variables. TBH it probably would have been ok but it made the tests fragile.
* | Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-2517-86/+220
|\ \ | | | | | | Require event format version to parse or create events
| * | NewsfileErik Johnston2019-01-251-0/+1
| | |
| * | Replace missed usages of FrozenEventErik Johnston2019-01-253-10/+14
| | |
| * | Fix testsErik Johnston2019-01-255-4/+14
| | |
| * | Require event format version to parse or create eventsErik Johnston2019-01-258-72/+191
| | |
* | | Merge pull request #4471 from matrix-org/erikj/sqlite_native_upsertErik Johnston2019-01-253-4/+9
|\ \ \ | | | | | | | | Disable native upsert on sqlite
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-2513-7/+120
| |\ \ \ | |/ / / |/| | | | | | | erikj/sqlite_native_upsert
* | | | Fix quoting for allowed_local_3pids example config (#4476)Richard van der Hoff2019-01-252-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use double-quotes here, you have to escape your backslashes. It's much easier with single-quotes. (Note that the existing double-backslashes are already interpreted by python's """ parsing.)
* | | | Fix Host header sent by MatrixFederationAgent (#4468)Richard van der Hoff2019-01-255-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | Move the Host header logic down here so that (a) it is used if we reuse the agent elsewhere, and (b) we can mess about with it with .well-known.
* | | | Don't require sqlite3 when using postgres (#4466)Andrew Morgan2019-01-252-2/+2
| | | |
| * | | NewsfileErik Johnston2019-01-252-1/+2
| | | |
| * | | Disable native upserts for sqlite, as they don't workErik Johnston2019-01-251-3/+7
| |/ /
| | * Reuse predecessor methodAndrew Morgan2019-01-281-12/+8
| | |
| | * FixesAndrew Morgan2019-01-251-39/+39
| | |
| | * Clean up direct_rooms accessAndrew Morgan2019-01-251-3/+3
| | |
| | * Use python magicAndrew Morgan2019-01-251-2/+1
| | |
| | * Destructure account data tuple before useAndrew Morgan2019-01-251-3/+3
| | |
| | * Remove unnecessary null checkAndrew Morgan2019-01-251-7/+6
| | |
| | * Move room_tag declaration to be closer to its useAndrew Morgan2019-01-251-4/+5
| | |
| | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-2575-1069/+1683
| | |\ | |_|/ |/| | | | | anoa/dm_room_upgrade
* | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-254-0/+86
|\ \ \ | |/ / |/| | Ability to search entire room history after upgrading room
| * | Merge branch 'anoa/full_search_upgraded_rooms' of ↵Andrew Morgan2019-01-243-3/+3
| |\ \ | | | | | | | | | | | | github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms
| | * | Apply suggestions from code reviewRichard van der Hoff2019-01-242-2/+2
| | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
| | * | Update synapse/api/filtering.pyRichard van der Hoff2019-01-241-1/+1
| | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
| * | | Remove redundant create event None checkAndrew Morgan2019-01-241-3/+0
| |/ /
| * | Do not return in a deferred functionAndrew Morgan2019-01-221-3/+3
| | |
| * | Ensure new filter is actually createdAndrew Morgan2019-01-222-2/+1
| | |
| * | Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-223-35/+51
| | | | | | | | | | | | | | | * Create a new method for getting predecessor rooms * Remove formatting change
| * | Add changelogAndrew Morgan2019-01-181-0/+1
| | |
| * | Search for messages across predecessor roomsAndrew Morgan2019-01-183-0/+73
| | | | | | | | | | | | Signed-off-by: Andrew Morgan <andrew@amorgan.xyz>
* | | Merge pull request #4447 from matrix-org/erikj/msc_1813Erik Johnston2019-01-255-7/+37
|\ \ \ | | | | | | | | Implement MSC 1813 - Add room version to make APIs
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-2563-1025/+1459
| |\ \ \
| * | | | Review commentsErik Johnston2019-01-242-2/+4
| | | | |
* | | | | Merge pull request #4469 from ↵Erik Johnston2019-01-2518-253/+91
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/revert-4451-erikj/require_format_version Revert "Require event format version to parse or create events"
| * | | | | Revert "Require event format version to parse or create events"Erik Johnston2019-01-2518-253/+91
|/ / / / /
* | | | | Merge pull request #4451 from matrix-org/erikj/require_format_versionErik Johnston2019-01-2518-91/+253
|\ \ \ \ \ | |_|/ / / |/| | | | Require event format version to parse or create events
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-2438-698/+509
| |\ \ \ \ | |/ / / / |/| | | | | | | | | erikj/require_format_version
* | | | | Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-245-13/+67
|\ \ \ \ \ | | | | | | | | | | | | Add room_version param to get_pdu
| * | | | | Review commentsErik Johnston2019-01-242-1/+7
| | | | | |
* | | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-245-39/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | Store rejected remote invite events as outliers
| * | | | | | Update make_membership_event docsErik Johnston2019-01-241-2/+5
| | | | | | |
| * | | | | | Remove unecessary setting of outlier bitErik Johnston2019-01-241-2/+0
| | | | | | |
| * | | | | | Use term 'out of band membership' insteadErik Johnston2019-01-243-9/+10
| | | | | | |
* | | | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-246-4/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add support for persisting event format versions
* \ \ \ \ \ \ \ Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fixAndrew Morgan2019-01-242-2/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add a 60s timeout to filtered room directory queries
| * | | | | | | | Change default timeout value from 0 to NoneAndrew Morgan2019-01-241-1/+1
| | | | | | | | |
| * | | | | | | | Use self.clock instead of datetimeAndrew Morgan2019-01-241-4/+3
| | | | | | | | |
| * | | | | | | | isortAndrew Morgan2019-01-241-1/+1
| | | | | | | | |
| * | | | | | | | Add changelogAndrew Morgan2019-01-241-0/+1
| | | | | | | | |
| * | | | | | | | lintAndrew Morgan2019-01-241-1/+2
| | | | | | | | |
| * | | | | | | | Time out filtered room dir queries after 60sAndrew Morgan2019-01-241-2/+12
| | | | | | | | |
* | | | | | | | | Merge pull request #4464 from matrix-org/rav/fix_srv_lookupRichard van der Hoff2019-01-243-12/+89
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MatrixFederationAgent: Look up the right SRV record
| * | | | | | | | | Look up the right SRV recordRichard van der Hoff2019-01-243-4/+12
| | | | | | | | | |
| * | | | | | | | | lots more tests for MatrixFederationAgentRichard van der Hoff2019-01-241-10/+79
| | | | | | | | | |
* | | | | | | | | | Generate the debian config during build (#4444)Richard van der Hoff2019-01-244-617/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than hardcoding a config which we always forget to update, generate it from the default config.
* | | | | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460)Richard van der Hoff2019-01-242-2/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | This could cause exceptions if the id server returned 4xx responses.
* | | | | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-245-9/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Neilj/fix threepid auth check
| * | | | | | | | | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-223-7/+6
| | | | | | | | | |
| * | | | | | | | | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-225-8/+16
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_docNeil Johnson2019-01-242-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Clarify docs for public_baseurl
| * | | | | | | | | | ChangelogDavid Baker2019-01-241-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Clarify docs for public_baseurlDavid Baker2019-01-241-1/+5
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is leading to problems with people upgrading to clients that support MSC1730 because people have this misconfigured, so try to make the docs completely unambiguous.
* / | | | | | | | | Fix UPSERT check (#4459)Amber Brown2019-01-242-5/+29
|/ / / / / / / / /
* | | | | | | | | Use native UPSERTs where possible (#4306)Amber Brown2019-01-2414-43/+238
| | | | | | | | |
* | | | | | | | | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-243-6/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is that we have cut-and-pasted an impl from Twisted, and then failed to maintain it. It was fixed in Twisted in https://github.com/twisted/twisted/pull/1047/files; let's do the same here.
| | | | | * | | | Replace missed usages of FrozenEventErik Johnston2019-01-243-10/+14
| | | | | | | | |
| | | | | * | | | Fix testsErik Johnston2019-01-245-4/+14
| | | | | | | | |
| | | | | * | | | NewsfileErik Johnston2019-01-231-0/+1
| | | | | | | | |
| | | | | * | | | Require event format version to parse or create eventsErik Johnston2019-01-238-74/+193
| | | | | | | | |
| | | | | * | | | Merge branch 'erikj/fixup_rejecting_invites' of ↵Erik Johnston2019-01-235-37/+32
| | | | | |\ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/require_format_version
| | | * | | | | | Clarify the invite flowsErik Johnston2019-01-233-7/+24
| | | | | | | | |
| | | * | | | | | Remove unnecessary '_sign_event'Erik Johnston2019-01-232-15/+8
| | | | | | | | |
| | | * | | | | | NewsfileErik Johnston2019-01-231-0/+1
| | | | | | | | |
| | | * | | | | | Store rejected remote invite events as outliersErik Johnston2019-01-233-38/+21
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently they're stored as non-outliers even though the server isn't in the room, which can be problematic in places where the code assumes it has the state for all non outlier events. In particular, there is an edge case where persisting the leave event triggers a state resolution, which requires looking up the room version from state. Since the server doesn't have the state, this causes an exception to be thrown.
| | | | * | | | Merge branch 'erikj/get_pdu_versions' into erikj/require_format_versionErik Johnston2019-01-2329-309/+937
| | | | |\ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | NewsfileErik Johnston2019-01-231-0/+1
| | | | | | | |
| | | * | | | | Add room_version param to get_pduErik Johnston2019-01-234-13/+60
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | When we add new event format we'll need to know the event format or room version when parsing events.
* | | | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backportAndrew Morgan2019-01-232-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add metric for user dir current event stream position
| * | | | | | | Add changelogAndrew Morgan2019-01-231-0/+1
| | | | | | | |
| * | | | | | | Add metric for user dir current event stream positionAndrew Morgan2019-01-231-0/+6
| | | | | | | |
* | | | | | | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agentRichard van der Hoff2019-01-239-258/+555
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Move SRV magic into an Agent-like thing
| * | | | | | | fix python2 test failureRichard van der Hoff2019-01-231-1/+1
| | | | | | | |
| * | | | | | | Add a test for MatrixFederationAgentRichard van der Hoff2019-01-222-1/+195
| | | | | | | |
| * | | | | | | put resolve_service in an objectRichard van der Hoff2019-01-223-83/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes it easier to stub things out for tests.
| * | | | | | | Require that service_name be a byte stringRichard van der Hoff2019-01-222-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is only ever a bytes now, so let's enforce that.
| * | | | | | | changelogRichard van der Hoff2019-01-221-0/+1
| | | | | | | |
| * | | | | | | Kill off matrix_federation_endpointRichard van der Hoff2019-01-222-145/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this thing is now redundant.
| * | | | | | | Make MatrixFederationClient use MatrixFederationAgentRichard van der Hoff2019-01-222-27/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... instead of the matrix_federation_endpoint
| * | | | | | | MatrixFederationAgentRichard van der Hoff2019-01-222-0/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull the magic that is currently in matrix_federation_endpoint and friends into an agent-like thing
* | | | | | | | debian package: symlink to python-3.X (#4433)Richard van der Hoff2019-01-233-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the debian package, make the virtualenv symlink python to /usr/bin/python3.X rather than /usr/bin/python3. Also make sure we depend on the right python3.x package. This might help a bit with subtle failures when people install a package from the wrong distro (https://github.com/matrix-org/synapse/issues/4431).
* | | | | | | | Fixup removal of duplicate `user_ips` rows (#4432)Erik Johnston2019-01-232-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unnecessary ORDER BY clause * Add logging * Newsfile
* | | | | | | | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-238-36/+298
| | | | | | | |
| | | | * | | | Merge branch 'erikj/msc_1813' into erikj/require_format_versionErik Johnston2019-01-235-8/+41
| | | |/| | | | | | | | |/ / /
| | | | * | | NewsfileErik Johnston2019-01-231-0/+1
| | | | | | |
| | | | * | | Implement MSC 1813 - Add room version to make APIsErik Johnston2019-01-234-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also implement `make_membership_event` converting the returned room version to an event format version.
| | | * | | | Update newsfileErik Johnston2019-01-231-1/+1
| | | |/ / /
| | | * | | isortErik Johnston2019-01-232-4/+2
| | | | | |
| | | * | | NewsfileErik Johnston2019-01-231-0/+1
| | | | | |
| | | * | | Add support for persisting event format versionsErik Johnston2019-01-235-4/+50
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we only have the one event format version defined, but this adds the necessary infrastructure to persist and fetch the format versions alongside the events. We specify the format version rather than the room version as: 1. We don't necessarily know the room version, existing events may be either v1 or v2. 2. We'd need to be careful to prevent/handle correctly if different events in the same room reported to be of different versions, which sounds annoying.
* | | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedupErik Johnston2019-01-222-26/+36
|\ \ \ \ \ | |_|/ / / |/| | | | Fix bug when removing duplicate rows from user_ips
| * | | | Refactor to rewrite the SQL insteadErik Johnston2019-01-221-13/+16
| | | | |
| * | | | Don't shadow paramsErik Johnston2019-01-221-4/+3
| | | | |
| * | | | NewsfileErik Johnston2019-01-221-0/+1
| | | | |
| * | | | Fix bug when removing duplicate rows from user_ipsErik Johnston2019-01-221-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by accidentally overwritting a `last_seen` variable in a for loop, causing the wrong value to be written to the progress table. The result of which was that we didn't scan sections of the table when searching for duplicates, and so some duplicates did not get deleted.
* | | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registrationNeil Johnson2019-01-223-11/+15
|\ \ \ \ \ | |_|/ / / |/| | | | Config option to disable requesting MSISDN on registration
| * | | | fix line lengthNeil Johnson2019-01-211-1/+3
| | | | |
| * | | | Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-213-11/+13
| | | | |
| | | | * Move tag and direct state copying into separate functionAndrew Morgan2019-01-251-43/+63
| | | | |
| | | | * lintAndrew Morgan2019-01-221-1/+3
| | | | |
| | | | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-223-172/+8
| | | | |\ | |_|_|_|/ |/| | | | | | | | | anoa/dm_room_upgrade
* | | | | Make key fetches use regular federation client (#4426)Richard van der Hoff2019-01-223-172/+8
| | | | | | | | | | | | | | | | | | | | | | | | | All this magic is redundant.
| | | | * Prevent duplicate room IDs in m.directAndrew Morgan2019-01-221-10/+9
| | | | |
| | | | * Fix commentsAndrew Morgan2019-01-221-2/+2
| | | | |
| | | | * Join logic covers both room creator and arbitrary usersAndrew Morgan2019-01-221-33/+0
| | | | |
| | | | * tags, m.direct copying over correctlyAndrew Morgan2019-01-222-11/+62
| | | | |
| | | | * Fix typosAndrew Morgan2019-01-224-14/+14
| | | | |
| | | | * Migrating dm and room tags work for migratorAndrew Morgan2019-01-221-2/+13
| | | | |
| | | | * Prevent crash on user who doesn't have any direct roomsAndrew Morgan2019-01-221-1/+1
| | | | |
| | | | * Add changelogAndrew Morgan2019-01-221-0/+1
| | | | |
| | | | * Preserve DM status of a room on upgradeAndrew Morgan2019-01-221-0/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Morgan <andrew@amorgan.xyz>
| | | | * Fix typoAndrew Morgan2019-01-221-2/+2
| |_|_|/ |/| | |
* | | | Refactor and bugfix for resove_service (#4427)Richard van der Hoff2019-01-226-86/+250
| | | |
* | | | Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-228-57/+6
| |/ / |/| | | | | * remove dh_params and set better cipher string
* | | Merge pull request #4402 from matrix-org/erikj/fed_v2_invite_serverErik Johnston2019-01-214-6/+42
|\ \ \ | |/ / |/| | Implement server side of MSC1794 - Federation v2 Invite API
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-2124-118/+261
| |\ \ | |/ / |/| | | | | erikj/fed_v2_invite_server
* | | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apisErik Johnston2019-01-214-68/+74
|\ \ \ | | | | | | | | Add groundwork for new versions of federation APIs
* | | | Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-213-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Migrate encryption state on room upgrade Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> * Add changelog file
* | | | Fix race when persisting create event (#4404)Erik Johnston2019-01-182-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix race when persisting create event When persisting a chunk of DAG it is sometimes requried to do a state resolution, which requires knowledge of the room version. If this happens while we're persisting the create event then we need to use that event rather than attempting to look it up in the database.
* | | | Tweak code coverage settings (#4400)Erik Johnston2019-01-183-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Tweak code coverage settings * Fix manifest * Newsfile * Fix commit status?
* | | | Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-184-93/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant WrappedConnection The matrix federation client uses an HTTP connection pool, which times out its idle HTTP connections, so there is no need for any of this business.
* | | | Fix incorrect logcontexts after a Deferred was cancelled (#4407)Richard van der Hoff2019-01-174-3/+117
| |_|/ |/| |
* | | sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-173-15/+18
| | | | | | | | | | | | | | | Just got very confused about the fact that the headers are only an output, not an input.
* | | Changing macaroon_secret_key no longer logs you out (#4387)Richard van der Hoff2019-01-162-3/+1
| | |
* | | don't store more remote device lists if they have more than 1K devices (#4397)Richard van der Hoff2019-01-162-0/+20
| | |
* | | Merge pull request #4399 from andrewshadura/update-python-depsErik Johnston2019-01-162-2/+3
|\ \ \ | | | | | | | | Update Dependencies
| * | | Add a changelog entryAndrej Shadura2019-01-161-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
| * | | Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynaclAndrej Shadura2019-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 0.13.0, pymacaroons works correctly with pynacl, so there isn’t any more reason to depend on an outdated pynacl fork. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
| * | | Use msgpack instead of msgpack-pythonAndrej Shadura2019-01-161-1/+1
|/ / / | | | | | | | | | | | | | | | The package msgpack-python has been deprecated. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
* | | Merge pull request #4392 from matrix-org/neilj/fix_user_type_typoErik Johnston2019-01-152-1/+2
|\ \ \ | | | | | | | | ALL_USER_TYPES should be a tuple
| * | | ALL_USER_TYPES should be a tupleNeil Johnson2019-01-152-1/+2
|/ / /
| | * NewsfileErik Johnston2019-01-161-0/+1
| | |
| | * Add /v2/invite federation APIErik Johnston2019-01-153-6/+41
| |/
| * NewsfileErik Johnston2019-01-151-0/+1
| |
| * Add groundwork for new versions of federation APIsErik Johnston2019-01-153-68/+73
|/
* Merge branch 'release-v0.34.1.1' into developRichard van der Hoff2019-01-124-49/+163
|\
| * moar plusses!Richard van der Hoff2019-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turns out that 0.34.1.1+1 comes before 0.34.1.1+bionic (etc). The version may only contain "~ 0-9 A-Z a-z + - ." (sorting in that order). Option 1: replace "+" with something that sorts after +. Options are "-" (but dpkg-source complains about that) or "." (but that would mean we couldn't distinguish packaging-only changes from real changes). Option 2: stick with + and just find something that sorts after 'xenial'. The only options there are "-", "." (same problems as before), "z", and "+". Hence, ++1. Sorry.
| * Rewrite build_debian_packages release-v0.34.1.1Richard van der Hoff2019-01-122-46/+154
| | | | | | | | Rewrite this in python so that it can be run in parallel.
| * s/Breaks/Conflicts/ in debian/controlRichard van der Hoff2019-01-112-3/+9
| | | | | | | | Otherwise people can't upgrade from matrix-synapse without removing it first
* | Silence travis-ci build warnings by removing non-functional python3.6 (#4377)Richard van der Hoff2019-01-122-0/+8
| | | | | | | | | | | | * Remove non-functional python3.6 in travis env * changelog
* | Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-124-4/+164
| |
* | Merge remote-tracking branch 'origin/master' into developAmber Brown2019-01-116-195/+51
|\ \
| * | Merge Synapse v0.34.1.1Amber Brown2019-01-116-195/+51
| |\|
| | * changelog, for debianAmber Brown2019-01-111-0/+6
| | |
| | * changelog v0.34.1.1Amber Brown2019-01-112-1/+14
| | |
| | * versionAmber Brown2019-01-111-1/+1
| | |
| | * Merge pull request #4374 from matrix-org/rav/macaroon_key_fix_0.34.1Amber Brown2019-01-114-194/+31
| |/| | | | | | | Fix spontaneous logout
| | * changelogRichard van der Hoff2019-01-102-1/+1
| | |
| | * Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-104-194/+31
| |/| | | | | | | | | | Fixes #4371
| | * Revert "Fix macaroon_secret_key fallback logic"Richard van der Hoff2019-01-101-3/+3
| | | | | | | | | | | | | | | | | | This is already fixed in 0.34.1, by 59f93bb This reverts commit efc522c55e996e420271de2d9094835dda52ade4.
| | * changelogRichard van der Hoff2019-01-101-0/+1
| | |
| | * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-103-197/+33
| | |\
| | | * Fix macaroon_secret_key fallback logicRichard van der Hoff2019-01-101-3/+3
| | | |
| | | * Skip macaroon check for access tokens in the dbRichard van der Hoff2019-01-102-186/+28
| | | |
| | | * Fix fallback to signing key for macaroon-secret-keyRichard van der Hoff2019-01-101-2/+2
| | | |
* | | | Merge pull request #4342 from aaronraimist/new-virtualenvRichard van der Hoff2019-01-102-3/+3
|\ \ \ \ | | | | | | | | | | Update README to use new virtualenv (#4328)
| * | | | README.rst: fix hash_password pathRichard van der Hoff2019-01-021-2/+1
| | | | |
| * | | | Add changelogAaron Raimist2019-01-011-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | | Update README to use new virtualenv (#4328)Aaron Raimist2019-01-011-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-091-3/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fix docker build to install optional deps release-v0.34.1Richard van der Hoff2019-01-091-3/+1
| | | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-092-1/+8
|\| | | |
| * | | | debian: Remove Breaks: matrix-synapse-ldap3 v0.34.1+1Richard van der Hoff2019-01-092-1/+8
| | | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-0945-46/+73
|\| | | |
| * | | | 0.34.1 v0.34.1Richard van der Hoff2019-01-095-5/+13
| | | | |
| * | | | Merge branch 'develop' into release-v0.34.1Erik Johnston2019-01-094-6/+13
| |\ \ \ \
| * | | | | clean up changelog v0.34.1rc1Richard van der Hoff2019-01-081-3/+2
| | | | | |
| * | | | | 0.34.1rc1Richard van der Hoff2019-01-081-1/+1
| | | | | |
| * | | | | changelogRichard van der Hoff2019-01-0841-41/+61
| | | | | |
* | | | | | Merge pull request #4368 from matrix-org/erikj/better_errorsErik Johnston2019-01-092-68/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixup docstrings for matrixfederationclient
| * | | | | | NewsfileErik Johnston2019-01-091-0/+1
| | | | | | |
| * | | | | | Fixup docstrings for matrixfederationclientErik Johnston2019-01-091-68/+73
| | | | | | |
* | | | | | | Fix adding new rows instead of updating them if one of the key values is a ↵Amber Brown2019-01-093-1/+81
| |_|/ / / / |/| | | | | | | | | | | | | | | | | NULL in upserts. (#4369)
* | | | | | Merge pull request #4362 from matrix-org/erikj/better_errorsErik Johnston2019-01-092-5/+6
|\| | | | | | | | | | | | | | | | | Use RequestSendFailed when fail to parse content type headers
| * | | | | NewsfileErik Johnston2019-01-081-0/+1
| | | | | |
| * | | | | Use RequestSendFailed when fail to parse content type headersErik Johnston2019-01-081-5/+5
| | | | | |
* | | | | | Merge pull request #4361 from matrix-org/erikj/better_errorsErik Johnston2019-01-082-1/+7
|\| | | | | | |/ / / / |/| | | | Don't log stack traces for HTTP error responses
| * | | | NewsfileErik Johnston2019-01-081-0/+1
| | | | |
| * | | | Don't log stack traces for HTTP error responsesErik Johnston2019-01-081-1/+6
|/ / / /
* | | | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-086-44/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Correctly retry and back off if we get a HTTPerror response * Refactor request sending to have better excpetions MatrixFederationHttpClient blindly reraised exceptions to the caller without differentiating "expected" failures (e.g. connection timeouts etc) versus more severe problems (e.g. programming errors). This commit adds a RequestSendFailed exception that is raised when "expected" failures happen, allowing the TransactionQueue to log them as warnings while allowing us to log other exceptions as actual exceptions.
* | | | Fix synapse.config.__main__ on python 3 (#4356)Amber Brown2019-01-082-1/+2
| | | |
* | | | Fix command hint to generate a config file (#4353)Jason Robinson2019-01-073-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix command hint to generate a config file When trying to start Synapse without a config file, it will complain and give a hint towards what command to run. This hinted command is missing the "report_stats" parameter, which is required with either yes or no value. Add this to the command. Not an ideal situation but makes the given command work without the user getting another error, even though it might be unclear what "report_stats" represents. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | | Add GET account data routes (#4303)Travis Ralston2019-01-072-1/+34
| | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/issues/1339
* | | | Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-074-28/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Raise a ConfigError if an invalid resource is specified * Require Jinja 2.9 for the consent resource * changelog
* | | | fix the check for whether `is_url` to match all the other ones in codebase ↵Michael Telatynski2019-01-062-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | (#3405) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* | | | Update debian Conflicts specifications (#4349)Richard van der Hoff2019-01-043-2/+14
| | | | | | | | | | | | ... to allow installation alongside our matrix-synapse transitional package.
* | | | fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-022-10/+12
| | | |
* | | | Update README to not lie about required restart (#4343)Aaron Raimist2019-01-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update README to not lie about required restart Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | Merge pull request #4344 from matrix-org/neilj/fix_synchrotron_fix_4312Neil Johnson2019-01-022-25/+26
|\ \ \ \ | | | | | | | | | | Ensure synchrotrons can access is_support_user in the storage layer
| * | | | Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-022-25/+26
|/ / / /
* | | | Update docker-compose.yml (#4282)jribal2019-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Hi, the original docker-compose file did not work by default. You get federation port working but no client port. My proposal is to let federation port work as it is by default (8448) and let traefik handle client http/https traffic.
* | | | Update PR template to use absolute links (#4341)Aaron Raimist2019-01-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update PR template to use absolute links Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | Avoid packaging _trial_temp directory (#4326)Richard van der Hoff2019-01-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Make sure we don't put the _trial_temp directory in the package target directory. Fixes https://github.com/matrix-org/synapse/issues/4322
* | | | Install the optional dependencies into the debian package (#4325)Richard van der Hoff2019-01-025-20/+37
|/ / / | | | | | | | | | | | | | | | | | | | | | since #4298, the optional dependencies are no longer installed with a simple `pip install .`, which meant that they were not being included in the debian package. The easy fix to that is dh_virtualenv --extras, but that needs dh_virtualenv 1.1...
* | | Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-297-590/+45
| | |
* | | Remove mention of lt-cred-mech in the sample coturn config. (#4333)Krithin Sitaram2018-12-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove mention of lt-cred-mech in the sample coturn config. See https://github.com/coturn/coturn/pull/262 for more context. Also clean up some minor formatting issues while I'm here. * Add changelog. Signed-off-by: Krithin Sitaram <krithin@gmail.com>
* | | Log roomid along with Unknown room (#4297)Will Hunt2018-12-242-1/+2
| | |
* | | Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-243-1/+6
|\ \ \ | | | | | | | | Add v2 room version
| * | | NewsfileErik Johnston2018-12-181-0/+1
| | | |
| * | | Add v2 room versionErik Johnston2018-12-182-1/+5
| | | |
* | | | Return well_known in /login response (#4319)Richard van der Hoff2018-12-243-7/+15
| | | | | | | | | | | | | | | | ... as per MSC1730.
* | | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5Richard van der Hoff2018-12-232-1/+24
|\ \ \ \ | | | | | | | | | | Fix test_metrics.py compatibility prometheus_client 0.5
| * | | | Fix test_metrics.py compatibility prometheus_client 0.5Maarten de Vries2018-12-212-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prometheus_client 0.5 has a named-tuple Sample type with more member than the old plain tuple had. This commit makes sure the unit test detects this and changes the way it reads the sample. Signed-off-by: Maarten de Vries <maarten@de-vri.es>
* | | | | Merge pull request #4316 from matrix-org/rav/fix_docker_uploadRichard van der Hoff2018-12-212-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix circleci config for synapse:latest docker upload
| * | | | | Fix circleci config for synapse:latest docker uploadRichard van der Hoff2018-12-212-2/+3
| |/ / / / | | | | | | | | | | | | | | | Give the image the right tag, so that we can push it.
* | | | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-2211-46/+157
| | | | |
* | | | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-222-35/+36
| | | | | | | | | | | | | | | These settings are not supposed to be under 'listeners'.
* | | | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-228-272/+590
| | | | |
* | | | | Make the dependencies more like a standard Python project and hook up the ↵Amber Brown2018-12-227-158/+111
|/ / / / | | | | | | | | | | | | optional dependencies to setuptools (#4298)
* | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-2/+7
|\ \ \ \
| * | | | Mention updating extensions release-v0.34.0Richard van der Hoff2018-12-201-2/+7
| | | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-3/+4
|\| | | |
| * | | | clarify that installing -py3 removes the old pkgRichard van der Hoff2018-12-201-3/+4
| | | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-1/+8
|\| | | |
| * | | | buster is a thingRichard van der Hoff2018-12-201-1/+8
| | |/ / | |/| |
* | | | Merge branch 'master' into developRichard van der Hoff2018-12-2042-29/+2514
|\| | |
| * | | Clarify that py2 packages will continue to exist v0.34.0Richard van der Hoff2018-12-201-0/+4
| | | |
| * | | document supported python 3 versionsRichard van der Hoff2018-12-202-5/+9
| | | |
| * | | more changelog fixRichard van der Hoff2018-12-201-1/+1
| | | |
| * | | minor changelog tweaksRichard van der Hoff2018-12-201-4/+4
| | | |
| * | | fix UPGRADE formattingRichard van der Hoff2018-12-201-6/+6
| | | |
| * | | Prepare 0.34 releaseRichard van der Hoff2018-12-207-24/+18
| | | |
| * | | Update log config for debian packagesRichard van der Hoff2018-12-201-0/+1
| | | | | | | | | | | | | | | | Better follow our own release notes.
| * | | Debian packaging via dh_virtualenvRichard van der Hoff2018-12-2041-2/+2481
| |\ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-21 17:04:28 +0000