summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4512 from matrix-org/anoa/consent_dirAndrew Morgan2019-01-292-11/+14
|\ | | | | Check consent dir path on startup
| * Check consent dir path on startupAndrew Morgan2019-01-292-11/+14
| |
* | Relax requirement for a content-type on .well-known (#4511)Richard van der Hoff2019-01-291-20/+13
| |
* | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurlTravis Ralston2019-01-291-1/+1
|\ \ | |/ |/| Don't recommend :8448 to people on public_baseurl
| * Don't recommend :8448 to people on public_baseurlTravis Ralston2019-01-281-1/+1
| |
* | Do not generate self-signed TLS certificates by default. (#4509)Amber Brown2019-01-291-43/+18
| |
* | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-297-133/+260
|\ \ | | | | | | Refactor event building into EventBuilder
| * | Correctly set context.app_serviceErik Johnston2019-01-291-0/+2
| | |
| * | Don't set event_id twiceErik Johnston2019-01-291-2/+0
| | |
| * | Remove dead functionErik Johnston2019-01-291-11/+0
| | |
| * | Replace usage of builder.user_id with builder.senderErik Johnston2019-01-291-1/+1
| | | | | | | | | | | | | | | `.user_id` is proxed to `.sender` in FrozenEvent, so this has no functional change
| * | Refactor event building into EventBuilderErik Johnston2019-01-295-112/+254
| | | | | | | | | | | | | | | This is so that everything is done in one place, making it easier to change the event format based on room version
| * | Make add_hashes_and_signatures operate on dictsErik Johnston2019-01-291-10/+6
| | |
* | | Implement MSC1708 (.well-known lookups for server routing) (#4489)Richard van der Hoff2019-01-291-4/+110
| | |
* | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signatureErik Johnston2019-01-292-2/+2
|\ \ \ | | | | | | | | Fixup calls to `comput_event_signature`
| * | | Fixup calls to `comput_event_signature`Erik Johnston2019-01-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently pass FrozenEvent instead of `dict` to `compute_event_signature`, which works by accident due to `dict(event)` producing the correct result. This fixes PR #4493 commit 855a151
* | | | Merge pull request #4496 from matrix-org/erikj/invite_fallbackErik Johnston2019-01-292-14/+89
|\ \ \ \ | |/ / / |/| | | Implement fallback for V2 invite API
| * | | Implement fallback for V2 invite APIErik Johnston2019-01-282-14/+89
| | | | | | | | | | | | | | | | | | | | If the room version is either 1 or 2 then a server should retry failed `/v2/invite` requests with the v1 API
* | | | Make linearizer more quiet (#4507)Amber Brown2019-01-291-5/+5
| |/ / |/| |
* | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validatorErik Johnston2019-01-293-26/+45
|\ \ \ | | | | | | | | Split up event validation between event and builder
| * | | Remove duplicate checksErik Johnston2019-01-291-14/+0
| | | |
| * | | Fix up error messagesErik Johnston2019-01-291-2/+2
| | | |
| * | | Fold validate into validate_newErik Johnston2019-01-291-16/+11
| | | |
| * | | Split up event validation between event and builderErik Johnston2019-01-283-23/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The validator was being run on the EventBuilder objects, and so the validator only checked a subset of fields. With the upcoming EventBuilder refactor even fewer fields will be there to validate. To get around this we split the validation into those that can be run against an EventBuilder and those run against a fully fledged event.
* | | | Fix receiving events from federation via a workerErik Johnston2019-01-291-1/+1
| | | | | | | | | | | | | | | | This bug was introduced in PR #4470, commit 678a92cb56d547dcadffa723e29b4855a27d0901
* | | | Fix typo in upserts code (#4505)Amber Brown2019-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * fix obvious problem :| * changelog
* | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signingErik Johnston2019-01-292-42/+104
|\ \ \ \ | | | | | | | | | | Refactor event signing to work on dicts
| * | | | Refactor event signing to work on dictsErik Johnston2019-01-282-42/+104
| |/ / / | | | | | | | | | | | | | | | | | | | | This is in preparation for making EventBuilder format agnostic, which means event signing should be done against the event dict rather than the EventBuilder object.
* | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-288-25/+56
|\ \ \ \ | |_|_|/ |/| | | Pass through room version to event auth
| * | | Correctly use default room version if none is setErik Johnston2019-01-281-2/+2
| | | |
| * | | Pass through room version to event authErik Johnston2019-01-258-24/+55
| | | |
* | | | Fix worker TLS (#4492)Amber Brown2019-01-287-48/+48
| |/ / |/| | | | | | | | | | | | | | | | | | | | * load cert * changelog * fix
* | | Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-283-12/+20
| | |
* | | Change return syntax in doc stringAndrew Morgan2019-01-281-1/+1
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-2815-107/+342
|\ \ \ | | |/ | |/| | | | anoa/dm_room_upgrade
| * | docstrings for _RoutingResultRichard van der Hoff2019-01-281-0/+36
| | |
| * | Handle IP literals explicitlyRichard van der Hoff2019-01-281-0/+19
| | | | | | | | | | | | 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-281-11/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2511-82/+205
| |\ | | | | | | Require event format version to parse or create events
| | * Replace missed usages of FrozenEventErik Johnston2019-01-253-10/+14
| | |
| | * Require event format version to parse or create eventsErik Johnston2019-01-258-72/+191
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-257-6/+99
| |\ \ | | | | | | | | | | | | erikj/sqlite_native_upsert
| | * | Fix quoting for allowed_local_3pids example config (#4476)Richard van der Hoff2019-01-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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-251-2/+1
| | | |
| * | | 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-2538-409/+1140
|\ \ \ | | |/ | |/| | | | anoa/dm_room_upgrade
| * | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-253-0/+85
| |\ \ | | |/ | |/| 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
| | * Search for messages across predecessor roomsAndrew Morgan2019-01-183-0/+73
| | | | | | | | | | | | Signed-off-by: Andrew Morgan <andrew@amorgan.xyz>
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-2530-364/+920
| |\ \
| | * \ Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-244-13/+66
| | |\ \ | | | | | | | | | | Add room_version param to get_pdu
| | | * | Review commentsErik Johnston2019-01-242-1/+7
| | | | |
| | | * | 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 #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-244-39/+34
| | |\ \ \ | | | | | | | | | | | | 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
| | | | | |
| | | * | | Clarify the invite flowsErik Johnston2019-01-233-7/+24
| | | | | |
| | | * | | Remove unnecessary '_sign_event'Erik Johnston2019-01-232-15/+8
| | | | | |
| | | * | | 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 pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-245-4/+48
| | |\ \ \ | | | | | | | | | | | | Add support for persisting event format versions
| | * \ \ \ Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fixAndrew Morgan2019-01-241-2/+12
| | |\ \ \ \ | | | | | | | | | | | | | | 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
| | | | | | |
| | | * | | | 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-241-1/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | MatrixFederationAgent: Look up the right SRV record
| | | * | | | | Look up the right SRV recordRichard van der Hoff2019-01-241-1/+2
| | | | | | | |
| | * | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460)Richard van der Hoff2019-01-241-2/+3
| | |/ / / / / | | | | | | | | | | | | | | 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-243-8/+12
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Neilj/fix threepid auth check
| | | * | | | | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-222-6/+5
| | | | | | | |
| | | * | | | | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-223-7/+12
| | | | | | | |
| | * | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_docNeil Johnson2019-01-241-1/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clarify docs for public_baseurl
| | | * | | | | | 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-241-5/+28
| | |/ / / / /
| | * | | | | Use native UPSERTs where possible (#4306)Amber Brown2019-01-247-30/+212
| | | | | | |
| | * | | | | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-241-3/+12
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backportAndrew Morgan2019-01-231-0/+6
| | |\ \ \ \ | | | | | | | | | | | | | | Add metric for user dir current event stream position
| | | * | | | 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-234-232/+240
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Move SRV magic into an Agent-like thing
| | | * | | | put resolve_service in an objectRichard van der Hoff2019-01-222-63/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes it easier to stub things out for tests.
| | | * | | | Require that service_name be a byte stringRichard van der Hoff2019-01-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it is only ever a bytes now, so let's enforce that.
| | | * | | | 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-221-27/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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
| | * | | | | Fixup removal of duplicate `user_ips` rows (#4432)Erik Johnston2019-01-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unnecessary ORDER BY clause * Add logging * Newsfile
| | * | | | | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-236-35/+296
| | | | | | |
| * | | | | | Review commentsErik Johnston2019-01-242-2/+4
| | | | | | |
| * | | | | | 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.
| * | | | | isortErik Johnston2019-01-232-4/+2
| | | | | |
| * | | | | 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-221-26/+35
| |\ \ \ \ | | |_|/ / | |/| | | 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
| | | | |
| | * | | 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-222-11/+14
| |\ \ \ \ | | |_|/ / | |/| | | 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-212-11/+12
| | | | |
* | | | | 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-222-172/+7
|\| | | | | | | | | | | | | | | | | | | anoa/dm_room_upgrade
| * | | | Make key fetches use regular federation client (#4426)Richard van der Hoff2019-01-222-172/+7
| | | | | | | | | | | | | | | | | | | | | | | | | 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-223-13/+13
| | | | |
* | | | | 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
| | | | |
* | | | | 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-223-72/+141
| | | |
* | | | Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-222-42/+4
| |/ / |/| | | | | * remove dh_params and set better cipher string
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-2110-111/+84
|\| | | | | | | | | | | erikj/fed_v2_invite_server
| * | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apisErik Johnston2019-01-213-68/+73
| |\ \ | | | | | | | | Add groundwork for new versions of federation APIs
| * | | Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-212-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-181-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-182-86/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-172-3/+12
| | |/ | |/|
| * | sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-172-15/+17
| | | | | | | | | | | | | | | 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-161-3/+0
| | |
| * | don't store more remote device lists if they have more than 1K devices (#4397)Richard van der Hoff2019-01-161-0/+19
| | |
| * | 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>
| * | ALL_USER_TYPES should be a tupleNeil Johnson2019-01-151-1/+1
| | |
* | | Add /v2/invite federation APIErik Johnston2019-01-153-6/+41
| |/ |/|
* | Add groundwork for new versions of federation APIsErik Johnston2019-01-153-68/+73
|/
* Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-122-4/+160
|
* Merge remote-tracking branch 'origin/master' into developAmber Brown2019-01-113-41/+30
|\
| * versionAmber Brown2019-01-111-1/+1
| |
| * Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-102-40/+29
| |\ | | | | | | | | | 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.
| | * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-102-43/+32
| | |\
| | | * 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-101-38/+27
| | | |
| | | * Fix fallback to signing key for macaroon-secret-keyRichard van der Hoff2019-01-101-2/+2
| | | |
* | | | Merge branch 'master' into developRichard van der Hoff2019-01-091-1/+1
|\| | |
| * | | 0.34.1 v0.34.1Richard van der Hoff2019-01-091-1/+1
| | | |
| * | | Merge branch 'develop' into release-v0.34.1Erik Johnston2019-01-092-6/+11
| |\ \ \
| * | | | 0.34.1rc1Richard van der Hoff2019-01-081-1/+1
| | | | |
* | | | | Merge pull request #4368 from matrix-org/erikj/better_errorsErik Johnston2019-01-091-68/+73
|\ \ \ \ \ | | | | | | | | | | | | Fixup docstrings for matrixfederationclient
| * | | | | 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-091-1/+9
|/ / / / | | | | | | | | | | | | NULL in upserts. (#4369)
* | | | Use RequestSendFailed when fail to parse content type headersErik Johnston2019-01-081-5/+5
| | | |
* | | | 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-084-41/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-1/+1
| | |
* | | Add GET account data routes (#4303)Travis Ralston2019-01-071-1/+33
| | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/issues/1339
* | | Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-073-28/+74
| | | | | | | | | | | | | | | | | | | | | | | | * 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-061-3/+8
| | | | | | | | | | | | | | | | | | (#3405) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* | | fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-021-10/+11
| | |
* | | Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-021-25/+25
| | |
* | | Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-294-445/+0
| | |
* | | Log roomid along with Unknown room (#4297)Will Hunt2018-12-241-1/+1
| | |
* | | Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-242-1/+5
|\ \ \ | | | | | | | | Add v2 room version
| * | | Add v2 room versionErik Johnston2018-12-182-1/+5
| | | |
* | | | Return well_known in /login response (#4319)Richard van der Hoff2018-12-241-7/+11
| | | | | | | | | | | | | | | | ... as per MSC1730.
* | | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-229-46/+89
| | | |
* | | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-221-35/+35
| | | | | | | | | | | | These settings are not supposed to be under 'listeners'.
* | | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-223-171/+255
| | | |
* | | | Make the dependencies more like a standard Python project and hook up the ↵Amber Brown2018-12-223-147/+90
| | | | | | | | | | | | | | | | optional dependencies to setuptools (#4298)
* | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare 0.34 releaseRichard van der Hoff2018-12-201-1/+1
| | | |
| * | | Debian packaging via dh_virtualenvRichard van der Hoff2018-12-201-1/+1
| |\ \ \
| | * | | Debian packaging via dh_virtualenv (#4285)Richard van der Hoff2018-12-202-2/+2
| | | | |
| * | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 'sandbox' to the CSP for media repo * Changelog
| * | | | Improved welcome page (#4294)Nad Chishtie2018-12-141-25/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.
| * | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-1/+1
| |/ / /
* | | | Fixed line lengthNathan Pennie2018-12-191-1/+5
| | | |
* | | | Fix the variable names used for account_dataNathan Pennie2018-12-191-3/+3
| | | |
* | | | ensure can report mau stats when hs.config.mau_stats_only is set (#4305)Neil Johnson2018-12-181-1/+1
| | | | | | | | | | | | * ensure can report mau stats when hs.config.mau_stats_only is set
* | | | create support user (#4141)Neil Johnson2018-12-1410-33/+159
| | | | | | | | | | | | | | | | | | | | | | | | Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits.
* | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-1/+1
| | | |
* | | | Improved welcome page (#4294)Nad Chishtie2018-12-141-25/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.
* | | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-115-51/+68
|\| | |
| * | | 0.34.0rc2 v0.34.0rc2Richard van der Hoff2018-12-111-1/+1
| | | |
| * | | Merge pull request #4290 from matrix-org/rav/remove_webclientRichard van der Hoff2018-12-113-50/+38
| |\ \ \ | | | | | | | | | | Stop installing Matrix Console by default
| | * | | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-113-50/+38
| | | | | | | | | | | | | | | | | | | | This is based on the work done by @krombel in #2601.
| * | | | Merge pull request #4289 from matrix-org/rav/welcome_pageRichard van der Hoff2018-12-112-0/+29
| |\ \ \ \ | | | | | | | | | | | | Add a welcome page to the static resources
| | * | | | Add a welcome page to the static resourcesRichard van der Hoff2018-12-112-0/+29
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is largely a precursor for the removal of the bundled webclient. The idea is to present a page at / which reassures people that something is working, and to give them some links for next steps. The welcome page lives at `/_matrix/static/`, so is enabled alongside the other `static` resources (which, in practice, means the client API is enabled). We'll redirect to it from `/` if we have nothing better to display there. It would be nice to have a way to disable it (in the same way that you might disable the nginx welcome page), but I can't really think of a good way to do that without a load of ickiness. It's based on the work done by @krombel for #2601.
| * / / / Prepare 0.34.0rc1Richard van der Hoff2018-12-041-1/+1
| |/ / /
* | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | * Add 'sandbox' to the CSP for media repo * Changelog
* | | | Move imports to one lineWill Hunt2018-12-101-4/+1
| | | |
* | | | Use `send_cors`Will Hunt2018-12-101-4/+1
| | | |
* | | | changelog & isortWill Hunt2018-12-091-1/+5
| | | |
* | | | Make /config more CORS-yWill Hunt2018-12-091-1/+3
| | | |
* | | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-074-14/+37
| | | | | | | | | | | | | | | | | | | | When we register a new user from SAML2 data, initialise their displayname correctly.
* | | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-077-2/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements both a SAML2 metadata endpoint (at `/_matrix/saml2/metadata.xml`), and a SAML2 response receiver (at `/_matrix/saml2/authn_response`). If the SAML2 response matches what's been configured, we complete the SSO login flow by redirecting to the client url (aka `RelayState` in SAML2 jargon) with a login token. What we don't yet have is anything to build a SAML2 request and redirect the user to the identity provider. That is left as an exercise for the reader.
* | | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-073-31/+153
| | | | | | | | | | | | | | | | This is mostly factoring out the post-CAS-login code to somewhere we can reuse it for other SSO flows, but it also fixes the userid mapping while we're at it.
* | | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-065-154/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rip out half-implemented m.login.saml2 support This was implemented in an odd way that left most of the work to the client, in a way that I really didn't understand. It's going to be a pain to maintain, so let's start by ripping it out. * drop undocumented dependency on dateutil It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat.
* | | | drop undocumented dependency on dateutil (#4266)Richard van der Hoff2018-12-061-7/+6
| | | | | | | | | | | | | | | | It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat.
* | | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-053-0/+81
|/ / / | | | | | | | | | Sometimes it's useful for synapse to generate its own .well-known file.
* | | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-042-9/+25
| | |
* | | Fix non-ASCII pushrules (#4248)Amber Brown2018-12-041-12/+23
| | |
* | | Add an option to disable search for homeservers which may not be interested ↵Travis Ralston2018-12-043-1/+20
| | | | | | | | | | | | | | | | | | in it (#4230) This is useful for homeservers not intended for users, such as bot-only homeservers or ones that only process IoT data.
* | | add more detail to logging regarding "More than one row matched" error (#4234)Ben Parsons2018-12-041-6/+6
| | |
* | | Fix UnicodeDecodeError when postgres is not configured in english (#4253)Richard van der Hoff2018-12-042-8/+46
| | | | | | | | | | | | This is a bit of a half-assed effort at fixing https://github.com/matrix-org/synapse/issues/4252. Fundamentally the right answer is to drop support for Python 2.
* | | Merge pull request #4244 from aaronraimist/drop-sent-txtRichard van der Hoff2018-12-046-74/+3
|\ \ \ | | | | | | | | Drop sent_transactions
| * | | Drop sent_transactionsAaron Raimist2018-12-016-74/+3
| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3Richard van der Hoff2018-12-041-1/+1
|\ \ \ \ | | | | | | | | | | Fix removing pushers on python 3
| * | | | fix type errorAmber Brown2018-12-031-1/+1
| | | | |
* | | | | Run the AS senders as background processes (#4189)Richard van der Hoff2018-12-041-12/+24
|/ / / / | | | | | | | | | | | | This should fix some "Starting db connection from sentinel context" warnings, and will mean we get metrics for these processes.
* / / / Workaround for non-ascii event ids (#4241)Richard van der Hoff2018-12-031-1/+3
|/ / / | | | | | | | | | | | | | | | It turns out that we accept events with non-ascii IDs, which would later cause an explosion during state res. Fixes #4226
* | | Neilj/fix autojoin (#4223)Neil Johnson2018-11-283-2/+24
| | | | | | | | | | | | | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent
* | | Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | * fix transaction wrapping bug that caused get_user_id_by_threepid_txn to fail * towncrier * white space
* | | Support m.login.sso (#4220)Richard van der Hoff2018-11-274-52/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean up the CSS for the fallback login form I was finding this hard to work with, so simplify a bunch of things. Each flow is now a form inside a div of class login_flow. The login_flow class now has a fixed width, as that looks much better than each flow having a differnt width. * Support m.login.sso MSC1721 renames m.login.cas to m.login.sso. This implements the change (retaining support for m.login.cas for older clients). * changelog
* | | Ignore __pycache__ directories in schema delta dirRichard van der Hoff2018-11-201-1/+1
| | | | | | | | | | | | Now that we use py3, compiled python ends up in __pycache__ rather than *.pyc.
* | | Remove riot.im from the list of trusted Identity Servers in the default ↵Neil Johnson2018-11-201-1/+3
| | | | | | | | | | | | configuration (#4207)
* | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixesRichard van der Hoff2018-11-201-2/+3
|\ \ \ | | | | | | | | Fix some logcontext leaks
| * | | Fix logcontext leak in EmailPusherRichard van der Hoff2018-11-191-2/+3
| | | |
* | | | Merge remote-tracking branch 'origin/master' into developAmber Brown2018-11-191-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | versionAmber Brown2018-11-191-1/+1
| | | |
| * | | release 0.33.9rc1 v0.33.9rc1 github/release-v0.33.9 release-v0.33.9Neil Johnson2018-11-141-1/+1
| | | |
* | | | Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-22/+16
| |/ / |/| |
* | | Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-152-3/+3
| | |
* | | Fix Content-Disposition in media repository (#4176)Amber Brown2018-11-153-90/+110
| | |
* | | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-153-35/+47
| | |
* | | Use <meta> tags to discover the per-page encoding of html previews (#4183)Amber Brown2018-11-151-9/+22
|/ /
* | Add a test for the public T&Cs formRichard van der Hoff2018-11-141-1/+1
| |
* | Fix an internal server error when viewing the public privacy policyRichard van der Hoff2018-11-141-4/+7
| |
* | Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbersDavid Baker2018-11-142-2/+70
|\ \ | | | | | | Make e2e backup versions numeric in the DB
| * \ Merge remote-tracking branch 'origin/develop' into ↵David Baker2018-11-0947-416/+763
| |\ \ | | | | | | | | | | | | dbkr/e2e_backup_versions_are_numbers
| * | | pep8David Baker2018-11-091-1/+2
| | | |
| * | | add docsDavid Baker2018-11-091-1/+4
| | | |
| * | | Remove unnecessary str()David Baker2018-11-091-1/+1
| | | |
| * | | Cast to int here tooDavid Baker2018-10-301-0/+5
| | | |
| * | | Cast bacjup version to int when queryingDavid Baker2018-10-301-1/+6
| | | |
| * | | Convert version back to a stringDavid Baker2018-10-301-0/+1
| | | |
| * | | Try & make it work on postgresDavid Baker2018-10-301-2/+2
| | | |
| * | | Make e2e backup versions numeric in the DBDavid Baker2018-10-293-2/+55
| | | | | | | | | | | | | | | | | | | | We were doing max(version) which does not do what we wanted on a column of type TEXT.
* | | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_eventsErik Johnston2018-11-092-89/+74
|\ \ \ \ | |_|/ / |/| | | Drop incoming events from federation for unknown rooms
| * | | Remove hack to support rejoining roomsErik Johnston2018-11-091-74/+42
| | | |
| * | | Simplify to always drop events if server isn't in the roomErik Johnston2018-11-091-14/+9
| | | |
| * | | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-10 22:22:22 +0000