| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Clarify and fix behaviour when there are multiple aliases | Erik Johnston | 2019-02-14 | 1 | -0/+6 |
| | | |||||
| * | Add configurable room list publishing rules | Erik Johnston | 2019-02-14 | 2 | -0/+74 |
| | | | | | | This allows specifying who and what is allowed to be published onto the public room list | ||||
| * | Fix error when loading cert if tls is disabled (#4618) | Richard van der Hoff | 2019-02-12 | 1 | -1/+1 |
| | | | | | | | If TLS is disabled, it should not be an error if no cert is given. Fixes #4554. | ||||
| * | fix tests | Richard van der Hoff | 2019-02-11 | 1 | -2/+6 |
| | | |||||
| * | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611) | Richard van der Hoff | 2019-02-11 | 1 | -3/+1 |
| | | | | | | It's nothing to do with refreshing the certificates. No idea why it was here. | ||||
| * | Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updating | Erik Johnston | 2019-02-11 | 1 | -0/+72 |
| |\ | | | | | add updating of backup versions | ||||
| | * | make sure version is in body and wrap in linearizer queue | Hubert Chathi | 2019-02-08 | 1 | -0/+72 |
| | | | | | | | | | also add tests | ||||
| * | | Merge pull request #4420 from matrix-org/jaywink/openid-listener | Erik Johnston | 2019-02-11 | 2 | -1/+120 |
| |\ \ | |/ |/| | New listener resource for the federation API "openid/userinfo" endpoint | ||||
| | * | Fix flake8 issues | Jason Robinson | 2019-01-23 | 1 | -2/+8 |
| | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| | * | Fix openid tests after rebase | Jason Robinson | 2019-01-23 | 1 | -2/+2 |
| | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| | * | Fix sorting of imports in tests. Remove an unnecessary mock | Jason Robinson | 2019-01-23 | 1 | -2/+2 |
| | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| | * | Add tests for the openid lister for SynapseHomeServer | Jason Robinson | 2019-01-23 | 1 | -1/+48 |
| | | | | | | | | | | | | | | | Check all possible variants of openid and federation listener on/off possibilities. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| | * | Add tests for the openid lister for FederationReaderServer | Jason Robinson | 2019-01-23 | 1 | -0/+66 |
| | | | | | | | | | | | | | | | Check all possible variants of openid and federation listener on/off possibilities. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| | * | Fix a test docstring in frontend proxy tests | Jason Robinson | 2019-01-23 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Treat an invalid .well-known the same as an absent one | Richard van der Hoff | 2019-02-01 | 1 | -11/+70 |
| | | | | | | | | | ... basically, carry on and fall back to SRV etc. | ||||
| * | | Update federation routing logic to check .well-known before SRV | Richard van der Hoff | 2019-01-31 | 1 | -30/+21 |
| | | | |||||
| * | | Merge pull request #4472 from matrix-org/neilj/room_capabilities | Erik Johnston | 2019-01-30 | 1 | -0/+78 |
| |\ \ | | | | | | | Server capabilities support | ||||
| | * \ | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 20 | -120/+766 |
| | |\ \ | |||||
| | * | | | rework format of change password capability | Neil Johnson | 2019-01-29 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | support change_password in capabilities end-point | Neil Johnson | 2019-01-29 | 1 | -0/+23 |
| | | | | | |||||
| | * | | | isort | Neil Johnson | 2019-01-29 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | enforce auth for capabilities endpoint | Neil Johnson | 2019-01-29 | 1 | -4/+19 |
| | | | | | |||||
| | * | | | Support room version capabilities in CS API (MSC1804) | Neil Johnson | 2019-01-25 | 1 | -0/+39 |
| | | | | | |||||
| * | | | | Follow redirects on .well-known (#4520) | Richard van der Hoff | 2019-01-30 | 1 | -0/+97 |
| | | | | | |||||
| * | | | | Add a caching layer to .well-known responses (#4516) | Richard van der Hoff | 2019-01-30 | 3 | -8/+243 |
| | | | | | |||||
| * | | | | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 4 | -10/+1 |
| | |/ / |/| | | |||||
| * | | | Relax requirement for a content-type on .well-known (#4511) | Richard van der Hoff | 2019-01-29 | 1 | -1/+0 |
| | | | | |||||
| * | | | Do not generate self-signed TLS certificates by default. (#4509) | Amber Brown | 2019-01-29 | 2 | -2/+75 |
| | | | | |||||
| * | | | Merge pull request #4481 from matrix-org/erikj/event_builder | Erik Johnston | 2019-01-29 | 2 | -31/+27 |
| |\ \ \ | | | | | | | | | Refactor event building into EventBuilder | ||||
| | * | | | Fix test to use valid event format | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Make add_hashes_and_signatures operate on dicts | Erik Johnston | 2019-01-29 | 1 | -30/+26 |
| | | | | | |||||
| * | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489) | Richard van der Hoff | 2019-01-29 | 4 | -9/+350 |
| | | | | | |||||
| * | | | | Enable configuring test log level via env var (#4506) | Richard van der Hoff | 2019-01-29 | 3 | -30/+79 |
| |/ / / | | | | | | | | | | I got fed up with always adding '@unittest.DEBUG' every time I needed to debug a test. | ||||
| * | | | Use SimpleResolverComplexifier in tests (#4497) | Richard van der Hoff | 2019-01-29 | 2 | -32/+16 |
| | | | | | | | | | | | | | | | | 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_version | Erik Johnston | 2019-01-28 | 2 | -3/+14 |
| |\ \ \ | | | | | | | | | Pass through room version to event auth | ||||
| | * | | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 2 | -3/+14 |
| | | | | | |||||
| * | | | | Fix UPSERTs on SQLite 3.24+ (#4477) | Amber Brown | 2019-01-28 | 2 | -4/+7 |
| | | | | | |||||
| * | | | | Handle IP literals explicitly | Richard van der Hoff | 2019-01-28 | 1 | -17/+2 |
| | | | | | | | | | | | | | | | | | We don't want to be doing .well-known lookups on these guys. | ||||
| * | | | | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487) | Richard van der Hoff | 2019-01-28 | 1 | -1/+180 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_version | Erik Johnston | 2019-01-25 | 5 | -4/+14 |
| |\ \ \ | | | | | | | | | Require event format version to parse or create events | ||||
| | * | | | Fix tests | Erik Johnston | 2019-01-25 | 5 | -4/+14 |
| | | | | | |||||
| * | | | | Fix Host header sent by MatrixFederationAgent (#4468) | Richard van der Hoff | 2019-01-25 | 2 | -1/+17 |
| |/ / / | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Revert "Require event format version to parse or create events" | Erik Johnston | 2019-01-25 | 5 | -14/+4 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-24 | 5 | -14/+163 |
| |\| | | | | | | | | | | | erikj/require_format_version | ||||
| | * | | Look up the right SRV record | Richard van der Hoff | 2019-01-24 | 1 | -3/+9 |
| | | | | |||||
| | * | | lots more tests for MatrixFederationAgent | Richard van der Hoff | 2019-01-24 | 1 | -10/+79 |
| | | | | |||||
| | * | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 1 | -1/+3 |
| | |\ \ | | | | | | | | | Neilj/fix threepid auth check | ||||
| | | * | | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 1 | -1/+3 |
| | | |/ | |||||
| | * | | Use native UPSERTs where possible (#4306) | Amber Brown | 2019-01-24 | 3 | -5/+20 |
| | | | | |||||
| | * | | Don't send IP addresses as SNI (#4452) | Richard van der Hoff | 2019-01-24 | 1 | -3/+60 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Fix tests | Erik Johnston | 2019-01-24 | 5 | -4/+14 |
| |/ / | |||||
| * | | fix python2 test failure | Richard van der Hoff | 2019-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | Add a test for MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -1/+195 |
| | | | |||||
| * | | put resolve_service in an object | Richard van der Hoff | 2019-01-22 | 1 | -20/+18 |
| | | | | | | | | | this makes it easier to stub things out for tests. | ||||
| * | | Require that service_name be a byte string | Richard van der Hoff | 2019-01-22 | 1 | -4/+4 |
| | | | | | | | | | it is only ever a bytes now, so let's enforce that. | ||||
| * | | Make MatrixFederationClient use MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 1 | -0/+96 |
| |/ | | | | ... instead of the matrix_federation_endpoint | ||||
| * | Refactor and bugfix for resove_service (#4427) | Richard van der Hoff | 2019-01-22 | 2 | -14/+108 |
| | | |||||
| * | Require ECDH key exchange & remove dh_params (#4429) | Amber Brown | 2019-01-22 | 1 | -1/+0 |
| | | | | * remove dh_params and set better cipher string | ||||
| * | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 1 | -7/+47 |
| | | | | | | | | | * 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 Hoff | 2019-01-17 | 1 | -0/+104 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into develop | Amber Brown | 2019-01-11 | 1 | -154/+1 |
| |\ | |||||
| | * | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 | Richard van der Hoff | 2019-01-10 | 1 | -154/+1 |
| | |\ | | | | | | | | | | Fixes #4371 | ||||
| | | * | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 | Richard van der Hoff | 2019-01-10 | 1 | -154/+1 |
| | | |\ | |||||
| | | | * | Skip macaroon check for access tokens in the db | Richard van der Hoff | 2019-01-10 | 1 | -148/+1 |
| | | | | | |||||
| * | | | | Fix adding new rows instead of updating them if one of the key values is a ↵ | Amber Brown | 2019-01-09 | 1 | -0/+71 |
| |/ / / | | | | | | | | | | NULL in upserts. (#4369) | ||||
| * | | | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | ||||
| * | | | Remove v1 only REST APIs now we don't ship matrix console (#4334) | Amber Brown | 2018-12-29 | 2 | -145/+44 |
| | | | | |||||
| * | | | Return well_known in /login response (#4319) | Richard van der Hoff | 2018-12-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | ... as per MSC1730. | ||||
| * | | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5 | Richard van der Hoff | 2018-12-23 | 1 | -1/+23 |
| |\ \ \ | | | | | | | | | Fix test_metrics.py compatibility prometheus_client 0.5 | ||||
| | * | | | Fix test_metrics.py compatibility prometheus_client 0.5 | Maarten de Vries | 2018-12-21 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | | | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 2 | -98/+334 |
| |/ / / | |||||
| * | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 8 | -10/+204 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | When we register a new user from SAML2 data, initialise their displayname correctly. | ||||
| * | | | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Hoff | 2018-12-07 | 1 | -1/+30 |
| | | | | | | | | | | | | | 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 Hoff | 2018-12-06 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | ||||
| * | | | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 1 | -0/+58 |
| |/ / | | | | | | | Sometimes it's useful for synapse to generate its own .well-known file. | ||||
| * | | Patch defer.inlineCallbacks to check logcontexts in tests (#4205) | Richard van der Hoff | 2018-12-04 | 3 | -3/+98 |
| | | | |||||
| * | | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 1 | -1/+11 |
| | | | | | | | | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent | ||||
| * | | Check logcontexts before and after each test (#4190) | Richard van der Hoff | 2018-11-27 | 2 | -8/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add better diagnostics to flakey keyring test * fix interpolation fail * Check logcontexts before and after each test * update changelog * update changelog | ||||
| * | | Fix more logcontext leaks in tests (#4209) | Richard van der Hoff | 2018-11-27 | 1 | -1/+2 |
| | | | |||||
| * | | Do a GC after each test to fix logcontext leaks (#4227) | Richard van der Hoff | 2018-11-27 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | * Some words about garbage collections and logcontexts * Do a GC after each test to fix logcontext leaks This feels like an awful hack, but... * changelog | ||||
| * | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes | Richard van der Hoff | 2018-11-20 | 4 | -5/+8 |
| |\ \ | | | | | | | Fix some logcontext leaks | ||||
| | * | | Fix logcontext leak in test_url_preview | Richard van der Hoff | 2018-11-19 | 1 | -1/+2 |
| | | | | |||||
| | * | | Fix logcontext leak in http pusher test | Richard van der Hoff | 2018-11-19 | 1 | -1/+2 |
| | | | | |||||
| | * | | Fix some tests which leaked logcontexts | Richard van der Hoff | 2018-11-19 | 2 | -3/+4 |
| | | | | |||||
| * | | | Fix fallback auth on Python 3 (#4197) | Amber Brown | 2018-11-19 | 1 | -0/+104 |
| |/ / | |||||
| * | | Fix the terms UI auth tests | Travis Ralston | 2018-11-15 | 1 | -1/+1 |
| | | | | | | | By setting the config value directly, we skip the block that adds the slash automatically for us. | ||||
| * | | Fix Content-Disposition in media repository (#4176) | Amber Brown | 2018-11-15 | 2 | -0/+160 |
| | | | |||||
| * | | Add option to track MAU stats (but not limit people) (#3830) | Travis Ralston | 2018-11-15 | 3 | -0/+44 |
| | | | |||||
| * | | Use <meta> tags to discover the per-page encoding of html previews (#4183) | Amber Brown | 2018-11-15 | 1 | -0/+77 |
| | | | |||||
| * | | Add a test for the public T&Cs form | Richard van der Hoff | 2018-11-14 | 1 | -0/+7 |
| | | | |||||
| * | | Add test to assert set_e2e_device_keys correctly returns False on no-op | Erik Johnston | 2018-11-08 | 1 | -0/+15 |
| | | | |||||
| * | | Fix URL preview bugs (type error when loading cache from db, content-type ↵ | Amber Brown | 2018-11-08 | 2 | -0/+166 |
| | | | | | | | | | including quotes) (#4157) | ||||
| * | | Remove some boilerplate in tests (#4156) | Amber Brown | 2018-11-07 | 10 | -216/+161 |
| | | | |||||
| * | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 2 | -2/+5 |
| | | | | | | | | | So people can still collect consent the old way if they want to. | ||||
| * | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 1 | -42/+37 |
| | | | | | | | fixes #4056 | ||||
| * | | Tests for user consent resource (#4140) | Amber Brown | 2018-11-06 | 3 | -5/+138 |
| | | | |||||
| * | | Add some tests for the HTTP pusher (#4149) | Amber Brown | 2018-11-06 | 1 | -0/+159 |
| | | | |||||
| * | | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | * Add helpers for getting prev and auth events This is in preparation for allowing the event format to change between room versions. | ||||
| * | | Merge pull request #4137 from matrix-org/erikj/clean_up_events | Erik Johnston | 2018-11-02 | 2 | -3/+3 |
| |\ \ | | | | | | | Clean up event accesses and tests | ||||
| | * | | Clean up event accesses and tests | Erik Johnston | 2018-11-02 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | This is in preparation to refactor FrozenEvent to support different event formats for different room versions | ||||
| * | | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 2 | -1/+130 |
| | | | | |||||
| * | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_none | Erik Johnston | 2018-11-02 | 1 | -2/+98 |
| |\ \ \ | | | | | | | | | Fix None exception in state res v2 | ||||
| | * | | | Fix None exception in state res v2 | Erik Johnston | 2018-11-02 | 1 | -2/+98 |
| | |/ / | |||||
| * | | | The tests also need a version parameter | Travis Ralston | 2018-10-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 15 | -99/+716 |
| |\| | | |||||
| | * | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -1/+105 |
| | | | | |||||
| | * | | Write some tests for the email pusher (#4095) | Amber Brown | 2018-10-30 | 5 | -3/+160 |
| | | | | |||||
| | * | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 1 | -9/+1 |
| | |\ \ | | | | | | | | | Room version upgrade support | ||||
| | | * | | fix broken test | Richard van der Hoff | 2018-10-25 | 1 | -9/+1 |
| | | | | | | | | | | | | | | | | | This test stubbed out some stuff in a very weird way. I have no idea why. It broke. | ||||
| | * | | | Port register_new_matrix_user to Python 3 and add tests (#4085) | Amber Brown | 2018-10-26 | 2 | -0/+160 |
| | |/ / | |||||
| | * | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 1 | -65/+110 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit. | ||||
| | * | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 2 | -0/+115 |
| | |\ \ | | | | | | | | | Add config option to control alias creation | ||||
| | | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-25 | 7 | -23/+734 |
| | | |\ \ | | | | | | | | | | | | | | | | erikj/alias_disallow_list | ||||
| | | * | | | Use allow/deny | Erik Johnston | 2018-10-25 | 2 | -5/+5 |
| | | | | | | |||||
| | | * | | | Add tests for alias creation rules | Erik Johnston | 2018-10-19 | 1 | -0/+48 |
| | | | | | | |||||
| | | * | | | Add tests for config generation | Erik Johnston | 2018-10-19 | 1 | -0/+67 |
| | | | | | | |||||
| | * | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_init | Neil Johnson | 2018-10-25 | 1 | -2/+8 |
| | |\ \ \ \ | | |_|/ / | |/| | | | fix race condiftion in calling initialise_reserved_users | ||||
| | | * | | | fix style inconsistencies | Neil Johnson | 2018-10-24 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 5 | -4/+677 |
| | | |\ \ \ | |||||
| | | * | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 1 | -2/+8 |
| | | | |/ / | | |/| | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-10-25 | 7 | -4/+1113 |
| | |\ \ \ \ | | | |/ / | | |/| | | | | | | | matthew/autocreate_autojoin | ||||
| | * | | | | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 1 | -4/+17 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 7 | -205/+292 |
| | |\ \ \ \ | |||||
| | * | | | | | move logic into register, fix room alias localpart bug, tests | Neil Johnson | 2018-10-04 | 2 | -19/+44 |
| | | | | | | | |||||
| * | | | | | | pep8 | Travis Ralston | 2018-10-24 | 2 | -6/+3 |
| | | | | | | | |||||
| * | | | | | | It helps to import things | Travis Ralston | 2018-10-24 | 1 | -0/+16 |
| | | | | | | | |||||
| * | | | | | | Move test to where the other integration tests are | Travis Ralston | 2018-10-24 | 2 | -97/+109 |
| | | | | | | | |||||
| * | | | | | | Fix test | Travis Ralston | 2018-10-24 | 1 | -25/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debug tests Try printing the channel fix Import and use six Remove debugging Disable captcha Add some mocks Define the URL Fix the clock? Less rendering? use the other render Complete the dummy auth stage Fix last stage of the test Remove mocks we don't need | ||||
| * | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 5 | -4/+677 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | Richard van der Hoff | 2018-10-24 | 4 | -3/+666 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | rav/fix_event_filter_validation | ||||
| | | * \ \ \ \ | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 2 | -3/+3 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Fix a number of flake8 errors | ||||
| | | | * | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 2 | -3/+3 |
| | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broadly three things here: * disable W504 which seems a bit whacko * remove a bunch of `as e` expressions from exception handlers that don't use them * use `r""` for strings which include backslashes Also, we don't use pep8 any more, so we can get rid of the duplicate config there. | ||||
| | | * | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 2 | -0/+663 |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | Add v2 state resolution algorithm | ||||
| | | | * | | | | isort | Erik Johnston | 2018-10-24 | 1 | -4/+1 |
| | | | | | | | | |||||
| | | | * | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | | * | | | | Add some state res v2 tests | Erik Johnston | 2018-10-16 | 2 | -0/+666 |
| | | | | | | | | |||||
| | * | | | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -1/+11 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783 which meant that single backslashes were not allowed in event field filters. The intention here is to allow single-backslashes, but disallow double-backslashes. | ||||
| * | | | | | | Fix terms UI auth test | Travis Ralston | 2018-10-18 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Test for terms UI auth | Travis Ralston | 2018-10-18 | 1 | -0/+70 |
| |/ / / / / | |||||
| * / / / / | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 1 | -0/+39 |
| |/ / / / | | | | | | | | | Thanks @Half-Shot !!! | ||||
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 38 | -985/+1879 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Add tests | Erik Johnston | 2018-10-02 | 1 | -0/+45 |
| | | | | | |||||
| | * | | | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 2 | -2/+7 |
| | | | | | |||||
| | * | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -106/+0 |
| | |\ \ \ | | | | | | | | | | | Fix exceptions when handling incoming transactions | ||||
| | | * | | | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 1 | -1/+1 |
| | | |\| | | |||||
| | | * | | | Remove redundant, failing, test | Richard van der Hoff | 2018-09-27 | 1 | -106/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test didn't do what it claimed to do, and what it claimed to do was the same as test_cant_hide_direct_ancestors anyway. This stuff is tested by sytest anyway. | ||||
| | * | | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 4 | -95/+238 |
| | | |/ / | |/| | | |||||
| | * | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |/| | | Replaced all occurences of e.message with str(e) | ||||
| | | * | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Schnuffle <schnuffle@github.com> | ||||
| | * | | | Include eventid in log lines when processing incoming federation ↵ | Richard van der Hoff | 2018-09-27 | 2 | -12/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions (#3959) when processing incoming transactions, it can be hard to see what's going on, because we process a bunch of stuff in parallel, and because we may end up recursively working our way through a chain of three or four events. This commit creates a way to use logcontexts to add the relevant event ids to the log lines. | ||||
| | * | | | docstrings and unittests for storage.state (#3958) | Richard van der Hoff | 2018-09-27 | 1 | -0/+39 |
| | |/ / | | | | | | | | | | I spent ages trying to figure out how I was going mad... | ||||
| | * | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 1 | -1/+0 |
| | |\ \ | | | | | | | | | Fix some instances of ExpiringCache not expiring cache items | ||||
| | | * | | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead. | ||||
| | * | | | Merge branch 'master' into develop | Amber Brown | 2018-09-25 | 1 | -2/+2 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Fix compatibility issue with older Twisted in tests. | Oleg Girko | 2018-09-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older Twisted (18.4.0) returns TimeoutError instead of ConnectingCancelledError when connection times out. This change allows tests to be compatible with this behaviour. Signed-off-by: Oleg Girko <ol@infoserver.lv> | ||||
| | * | | | Fix client IPs being broken on Python 3 (#3908) | Amber Brown | 2018-09-20 | 4 | -42/+202 |
| | | | | | |||||
| | * | | | Add a regression test for logging on failed connections (#3912) | Amber Brown | 2018-09-20 | 2 | -3/+74 |
| | | | | | |||||
| | * | | | Refactor matrixfederationclient to fix logging (#3906) | Richard van der Hoff | 2018-09-18 | 3 | -37/+122 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | We want to wait until we have read the response body before we log the request as complete, otherwise a confusing thing happens where the request appears to have completed, but we later fail it. To do this, we factor the salient details of a request out to a separate object, which can then keep track of the txn_id, so that it can be logged. | ||||
| | * | | Tests | Erik Johnston | 2018-09-14 | 1 | -0/+81 |
| | | | | |||||
| | * | | Attempt to figure out what's going on with timeouts (#3857) | Amber Brown | 2018-09-14 | 2 | -1/+198 |
| | | | | |||||
| | * | | improve naming | Neil Johnson | 2018-09-12 | 1 | -3/+3 |
| | | | | |||||
| | * | | expose number of real reserved users | Neil Johnson | 2018-09-12 | 1 | -0/+31 |
| | | | | |||||
| | * | | Port tests/ to Python 3 (#3808) | Amber Brown | 2018-09-07 | 11 | -430/+348 |
| | | | | |||||
| | * | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6 | Neil Johnson | 2018-09-06 | 3 | -5/+48 |
| | |\ \ | | | | | | | | | guest users should not be part of mau total | ||||
| | | * | | ensure guests never enter mau list | Neil Johnson | 2018-09-06 | 3 | -4/+7 |
| | | | | | |||||
| | | * | | guest users should not be part of mau total | Neil Johnson | 2018-09-05 | 1 | -2/+42 |
| | | | | | |||||
| | * | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-09-06 | 2 | -14/+17 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Fix origin handling for pushed transactions | Richard van der Hoff | 2018-09-05 | 2 | -14/+17 |
| | | | | | | | | | | | | | | | | | | | | | Use the actual origin for push transactions, rather than whatever the remote server claimed. | ||||
| | * | | | Fix tests on postgresql (#3740) | Amber Brown | 2018-09-04 | 16 | -337/+355 |
| | | | | | |||||
| | * | | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -0/+17 |
| | | | | | |||||
| | * | | | Port storage/ to Python 3 (#3725) | Amber Brown | 2018-08-31 | 4 | -4/+129 |
| | | | | | |||||
| | * | | | Fix up tests | Richard van der Hoff | 2018-08-28 | 3 | -6/+10 |
| | | | | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | Fix checking if service notice room is already tagged | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | This manifested in synapse repeatedly setting the tag for the room | ||||
| | * | | | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 3 | -5/+5 |
| | |/ / / | |||||
| * | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -4/+5 |
| | | | | | |||||
| * | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 89 | -2601/+3251 |
| |\| | | | |||||
| | * | | | Unit tests | Erik Johnston | 2018-08-23 | 2 | -3/+227 |
| | | | | | |||||
| | * | | | Implement trail users | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Fix bug where we resent "limit exceeded" server notices | Erik Johnston | 2018-08-23 | 1 | -0/+66 |
| | | | | | | | | | | | | | | | | | This was due to a bug where we mutated a cached event's contents | ||||
| | * | | | Actually run the tests | Erik Johnston | 2018-08-23 | 1 | -0/+0 |
| | | | | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-22 | 19 | -127/+395 |
| | |\ \ \ | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * \ \ | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 1 | -2/+2 |
| | | |\ \ \ | | | | | | | | | | | | | Allow profile updates to happen on workers | ||||
| | | | * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-17 | 82 | -2374/+2146 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/split_profiles | ||||
| | | | * | | | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 6 | -6/+48 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Refactor state module to support multiple room versions | ||||
| | | | * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-20 | 85 | -2483/+2389 |
| | | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | erikj/refactor_state_handler | ||||
| | | | * | | | | | Fix tests | Erik Johnston | 2018-08-09 | 6 | -5/+46 |
| | | | | | | | | | |||||
| | | * | | | | | | Split the state_group_cache in two (#3726) | Matthew Hodgson | 2018-08-22 | 1 | -11/+94 |
| | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits the state_group_cache in two. One half contains normal state events; the other contains member events. The idea is that the lazyloading common case of: "I want a subset of member events plus all of the other state" can be accomplished efficiently by splitting the cache into two, and asking for "all events" from the non-members cache, and "just these keys" from the members cache. This means we can avoid having to make DictionaryCache aware of these sort of complicated queries, whilst letting LL requests benefit from the caching. Previously we were unable to sensibly use the caching and had to pull all state from the DB irrespective of the filtering, which made things slow. Hopefully fixes https://github.com/matrix-org/synapse/issues/3720. | ||||
| | | * | | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 6 | -50/+204 |
| | | | | | | | | |||||
| | | * | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 7 | -60/+49 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Use a producer to stream back responses | ||||
| | | | * | | | | | Fix the tests | Amber Brown | 2018-08-15 | 7 | -60/+49 |
| | | | | | | | | | |||||
| | * | | | | | | | Update notice format | Erik Johnston | 2018-08-22 | 1 | -3/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | rename error code | Neil Johnson | 2018-08-18 | 2 | -4/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | clean up, no functional changes | Neil Johnson | 2018-08-17 | 1 | -15/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 5 | -18/+19 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * | | | | | | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 1 | -0/+13 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 5 | -18/+19 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * | | | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 1 | -0/+13 |
| | | |/ / / / / | |||||
| | * | | | | | | refactor for readability, and reuse caching for setting tags | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | check for room state before deciding on action | Neil Johnson | 2018-08-16 | 1 | -20/+32 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 3 | -3/+57 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 2 | -2/+56 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Fix Mau off by one errors | ||||
| | | | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 3 | -7/+7 |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 2 | -2/+2 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | | * | | | | | | fix off by 1 errors | Neil Johnson | 2018-08-14 | 2 | -3/+14 |
| | | | | | | | | | | |||||
| | | | * | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-14 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | | | * | | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 2 | -5/+48 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 3 | -5/+10 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | | * \ \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 3 | -12/+84 |
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | * | | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -1/+1 |
| | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 82 | -2362/+1984 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * | | | | | | | | update error codes | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 2 | -3/+3 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 5 | -50/+258 |
| | | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | / / / / | | | | |_|/ / / / | | | |/| | | | | | |||||
| | | | * | | | | | | fix setup_test_homeserver to be postgres compatible | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | * | | | | | | in case max_mau is less than I think | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 3 | -12/+84 |
| | | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| / / / / | | | | |/ / / / | Block ability to read via sync if mau limit exceeded | ||||
| | | | * | | | | | Implement a new test baseclass to cut down on boilerplate (#3684) | Amber Brown | 2018-08-14 | 2 | -37/+173 |
| | | | | | | | | | |||||
| | | * | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 3 | -5/+10 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | | * | | | | | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 3 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | ||||
| | | * | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | | * | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 44 | -58/+187 |
| | | | | | | | | |||||
| | | * | | | | | fix up a forced long line | Amber Brown | 2018-08-11 | 1 | -1/+2 |
| | | | | | | | | |||||
| | | * | | | | | Run black. | black | 2018-08-10 | 75 | -2280/+1629 |
| | | | | | | | | |||||
| | | * | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 3 | -3/+3 |
| | | | | | | | | |||||
| | | * | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 1 | -0/+2 |
| | | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | send SNI for federation requests | ||||
| | | | * | | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 23 | -1161/+2080 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into ↵ | Jeroen | 2018-07-14 | 76 | -218/+279 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py | ||||
| | | | * \ \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 10 | -6/+731 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py | ||||
| | | | * | | | | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | implementation of server notices to alert on hitting resource limits | Neil Johnson | 2018-08-10 | 1 | -0/+125 |
| | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 2 | -12/+13 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix imports | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -9/+31 |
| | | | | | | | | | | |||||
| | * | | | | | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 1 | -6/+13 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 2 | -1/+12 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | ||||
| | | * | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 2 | -1/+12 |
| | | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | Flag to disable HS without disabling federation | ||||
| | | | * | | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 2 | -1/+60 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 2 | -1/+12 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 13 | -52/+74 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | ||||
| | | * | | | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 13 | -52/+70 |
| | | | |_|/ / / / / / | | |/| | | | | | | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |