Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 3 | -60/+125 |
|\ | |||||
| * | Servers-known-about statistic (#5981) | Amber Brown | 2019-09-07 | 3 | -60/+125 |
| | | |||||
* | | use something that's the right type for user_id | Hubert Chathi | 2019-09-06 | 1 | -1/+1 |
| | | |||||
* | | fix test | Hubert Chathi | 2019-09-05 | 1 | -1/+3 |
| | | |||||
* | | add test | Hubert Chathi | 2019-09-04 | 1 | -0/+88 |
| | | |||||
* | | make isort happy | Hubert Chathi | 2019-09-04 | 1 | -0/+1 |
| | | |||||
* | | make black happy | Hubert Chathi | 2019-09-04 | 1 | -85/+62 |
| | | |||||
* | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 1 | -1/+226 |
| | | |||||
* | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 8 | -119/+544 |
|\| | |||||
| * | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 2 | -113/+538 |
| | | | | | | Previously the stats were not being correctly populated. | ||||
| * | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 6 | -6/+6 |
| | | | | | | | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :) | ||||
* | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 17 | -56/+944 |
|\| | |||||
| * | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 1 | -0/+1 |
| |\ | | | | | | | Exempt support users from consent | ||||
| | * | Fix registration test | Half-Shot | 2019-08-23 | 1 | -0/+1 |
| | | | |||||
| * | | Config templating (#5900) | Jorik Schellekens | 2019-08-28 | 3 | -1/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template config files * Imagine a system composed entirely of x, y, z etc and the basic operations.. Wait George, why XOR? Why not just neq? George: Eh, I didn't think of that.. Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
| * | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 4 | -2/+456 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-08-22 | 2 | -39/+50 |
| |\| | | | | | | | | | | erikj/reliable_lookups | ||||
| | * | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail | Erik Johnston | 2019-08-22 | 1 | -35/+48 |
| | |\ | | | | | | | | | Retry well known on fail | ||||
| | | * | Change jitter to be a factor rather than absolute value | Erik Johnston | 2019-08-20 | 1 | -2/+2 |
| | | | | |||||
| | | * | Retry well known on fail. | Erik Johnston | 2019-08-15 | 1 | -33/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | If we have recently seen a valid well-known for a domain we want to retry on (non-final) errors a few times, to handle temporary blips in networking/etc. | ||||
| | * | | Refactor the Appservice scheduler code | Richard van der Hoff | 2019-08-20 | 1 | -4/+2 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too. | ||||
| * | | Remove test debugs | Erik Johnston | 2019-08-20 | 3 | -3/+0 |
| | | | |||||
| * | | Refactor MatrixFederationAgent to retry SRV. | Erik Johnston | 2019-08-15 | 2 | -5/+66 |
| |/ | | | | | | | | | | | | | | | This refactors MatrixFederationAgent to move the SRV lookup into the endpoint code, this has two benefits: 1. Its easier to retry different host/ports in the same way as HostnameEndpoint. 2. We avoid SRV lookups if we have a free connection in the pool | ||||
| * | Retry well-known lookup before expiry. | Erik Johnston | 2019-08-13 | 2 | -2/+71 |
| | | | | | | | | | | | | | | | | | | This gives a bit of a grace period where we can attempt to refetch a remote `well-known`, while still using the cached result if that fails. Hopefully this will make the well-known resolution a bit more torelant of failures, rather than it immediately treating failures as "no result" and caching that for an hour. | ||||
| * | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known | Erik Johnston | 2019-08-13 | 1 | -22/+21 |
| |\ | | | | | | | Add a lower bound to well-known TTL. | ||||
| | * | Move well known lookup into a separate clas | Erik Johnston | 2019-08-07 | 1 | -20/+19 |
| | | | |||||
| | * | Add a lower bound for TTL on well known results. | Erik Johnston | 2019-08-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | It costs both us and the remote server for us to fetch the well known for every single request we send, so we add a minimum cache period. This is set to 5m so that we still honour the basic premise of "refetch frequently". | ||||
| * | | Merge pull request #5788 from matrix-org/rav/metaredactions | Richard van der Hoff | 2019-08-12 | 1 | -0/+70 |
| |\ \ | | |/ | |/| | Fix handling of redactions of redactions | ||||
| | * | Handle loops in redaction events | Richard van der Hoff | 2019-07-30 | 1 | -0/+70 |
| | | | |||||
| * | | Account validity: allow defining HTML templates to serve the us… (#5807) | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
| |\ \ | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt | ||||
| | * | | Add tests | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
| | | | | |||||
| * | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known | Erik Johnston | 2019-07-31 | 1 | -6/+6 |
| |\ \ \ | | | | | | | | | | | Share SSL options for well-known requests | ||||
| | * | | | Share SSL options for well-known requests | Erik Johnston | 2019-07-31 | 1 | -6/+6 |
| | |/ / | |||||
| * / / | Remove DelayedCall debugging from test runs (#5787) | Amber Brown | 2019-07-31 | 1 | -6/+0 |
| |/ / | |||||
* | | | fix formatting | Hubert Chathi | 2019-08-01 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 16 | -106/+279 |
|\| | | |||||
| * | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state | Erik Johnston | 2019-07-30 | 1 | -1/+36 |
| |\ \ | | | | | | | | | Add unit test for current state membership bg update | ||||
| | * | | Add unit test for current state membership bg update | Erik Johnston | 2019-07-23 | 1 | -1/+36 |
| | | | | |||||
| * | | | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 3 | -3/+2 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656) | ||||
| * | | Room Complexity Client Implementation (#5783) | Amber Brown | 2019-07-30 | 1 | -3/+74 |
| | | | |||||
| * | | Convert RedactionTestCase to modern test style (#5768) | Richard van der Hoff | 2019-07-26 | 1 | -36/+38 |
| | | | |||||
| * | | Fix some error cases in the caching layer. (#5749) | Richard van der Hoff | 2019-07-25 | 1 | -3/+87 |
| | | | | | | | | | | | | | | | | | | | | | There was some inconsistent behaviour in the caching layer around how exceptions were handled - particularly synchronously-thrown ones. This seems to be most easily handled by pushing the creation of ObservableDeferreds down from CacheDescriptor to the Cache. | ||||
| * | | Merge tag 'v1.2.0rc2' into develop | Andrew Morgan | 2019-07-24 | 2 | -6/+17 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734)) | ||||
| | * | | Fix servlet metric names (#5734) | Jorik Schellekens | 2019-07-24 | 2 | -6/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix servlet metric names Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Remove redundant check * Cover all return paths | ||||
| * | | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 13 | -25/+25 |
| | |/ | |/| | |||||
| * | | Refactor Keyring._start_key_lookups | Richard van der Hoff | 2019-07-19 | 1 | -29/+0 |
| |/ | | | | | | | | | There's an awful lot of deferreds and dictionaries flying around here. The whole thing can be made much simpler and achieve the same effect. | ||||
* / | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 1 | -0/+63 |
|/ | |||||
* | Support Prometheus_client 0.4.0+ (#5636) | Amber Brown | 2019-07-18 | 1 | -3/+1 |
| | |||||
* | Remove the ability to query relations when the original event was redacted. ↵ | Andrew Morgan | 2019-07-18 | 1 | -3/+113 |
| | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted. | ||||
* | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -0/+20 |
| | |||||
* | More refactoring in `get_events_as_list` (#5707) | Richard van der Hoff | 2019-07-17 | 2 | -0/+160 |
| | | | | | | | | We can now use `_get_events_from_cache_or_db` rather than going right back to the database, which means that (a) we can benefit from caching, and (b) it opens the way forward to more extensive checks on the original event. We now always require the original event to exist before we will serve up a redaction. | ||||
* | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Erik Johnston | 2019-07-15 | 2 | -1/+211 |
|\ | | | | | Add basic function to get all data for a user out of synapse | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-07-05 | 22 | -82/+234 |
| |\ | | | | | | | | | | erikj/admin_exfiltrate_data | ||||
| * | | Fixup from review comments. | Erik Johnston | 2019-07-04 | 1 | -5/+5 |
| | | | |||||
| * | | Add basic function to get all data for a user out of synapse | Erik Johnston | 2019-07-02 | 2 | -1/+211 |
| | | | |||||
* | | | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 5 | -11/+136 |
| | | | | | | | | | | | | Record how long an access token is valid for, and raise a soft-logout once it expires. | ||||
* | | | Add a mechanism for per-test configs (#5657) | Richard van der Hoff | 2019-07-12 | 1 | -1/+54 |
| | | | | | | | | | | | | | | | | | | It's useful to be able to tweak the homeserver config to be used for each test. This PR adds a mechanism to do so. | ||||
* | | | Clean up exception handling for access_tokens (#5656) | Richard van der Hoff | 2019-07-11 | 1 | -7/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, let's get rid of `TOKEN_NOT_FOUND_HTTP_STATUS`. It was a hack we did at one point when it was possible to return either a 403 or a 401 if the creds were missing. We always return a 401 in these cases now (thankfully), so it's not needed. Let's also stop abusing `AuthError` for these cases. Honestly they have nothing that relates them to the other places that `AuthError` is used, other than the fact that they are loosely under the 'Auth' banner. It makes no sense for them to share exception classes. Instead, let's add a couple of new exception classes: `InvalidClientTokenError` and `MissingClientTokenError`, for the `M_UNKNOWN_TOKEN` and `M_MISSING_TOKEN` cases respectively - and an `InvalidClientCredentialsError` base class for the two of them. | ||||
* | | | Inline issue_access_token (#5659) | Richard van der Hoff | 2019-07-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | this is only used in one place, so it's clearer if we inline it and reduce the API surface. Also, fixes a buglet where we would create an access token even if we were about to block the user (we would never return the AT, so the user could never use it, but it was still created and added to the db.) | ||||
* | | | Remove access-token support from RegistrationStore.register (#5642) | Richard van der Hoff | 2019-07-10 | 6 | -58/+24 |
| | | | | | | | | | | | | | | | The 'token' param is no longer used anywhere except the tests, so let's kill that off too. | ||||
* | | | Include the original event in /relations (#5626) | Andrew Morgan | 2019-07-09 | 1 | -0/+5 |
| | | | | | | | | | When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances. | ||||
* | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self | Brendan Abolivier | 2019-07-09 | 1 | -0/+47 |
|\ \ \ | | | | | | | | | Allow newly-registered users to lookup their own profiles | ||||
| * | | | Lint | Brendan Abolivier | 2019-07-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add test case | Brendan Abolivier | 2019-07-08 | 1 | -0/+47 |
| | | | | |||||
* | | | | Remove access-token support from RegistrationHandler.register (#5641) | Richard van der Hoff | 2019-07-08 | 1 | -25/+28 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | Nothing uses this now, so we can remove the dead code, and clean up the API. Since we're changing the shape of the return value anyway, we take the opportunity to give the method a better name. | ||||
* | | | Move get_or_create_user to test code (#5628) | Richard van der Hoff | 2019-07-08 | 1 | -9/+59 |
| | | | | | | | | | This is only used in tests, so... | ||||
* | | | Add origin_server_ts and sender fields to m.replace (#5613) | Andrew Morgan | 2019-07-05 | 1 | -6/+18 |
| |/ |/| | | | | | | | Riot team would like some extra fields as part of m.replace, so here you go. Fixes: #5598 | ||||
* | | Fixes to the federation rate limiter (#5621) | Richard van der Hoff | 2019-07-05 | 3 | -6/+137 |
| | | | | | | | | | | | | | | - Put the default window_size back to 1000ms (broken by #5181) - Make the `rc_federation` config actually do something - fix an off-by-one error in the 'concurrent' limit - Avoid creating an unused `_PerHostRatelimiter` object for every single incoming request | ||||
* | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 19 | -65/+65 |
| | | |||||
* | | Fix media repo breaking (#5593) | Amber Brown | 2019-07-02 | 2 | -12/+33 |
|/ | |||||
* | Make the http server handle coroutine-making REST servlets (#5475) | Amber Brown | 2019-06-29 | 2 | -18/+47 |
| | |||||
* | Update the TLS cipher string and provide configurability for TLS on outgoing ↵ | Amber Brown | 2019-06-28 | 1 | -1/+114 |
| | | | | federation (#5550) | ||||
* | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 1 | -1/+1 |
| | |||||
* | Pass config_dir_path and data_dir_path into Config.read_config. (#5522) | Richard van der Hoff | 2019-06-24 | 4 | -4/+4 |
| | | | | | | * Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config | ||||
* | Run Black. (#5482) | Amber Brown | 2019-06-20 | 56 | -710/+684 |
| | |||||
* | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 1 | -1/+1 |
| | |||||
* | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 1 | -0/+41 |
| | | | | | | | Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL. | ||||
* | Merge pull request #5388 from matrix-org/erikj/fix_email_push | Erik Johnston | 2019-06-17 | 1 | -23/+70 |
|\ | | | | | Fix email notifications for unnamed rooms with multiple people | ||||
| * | Add test | Erik Johnston | 2019-06-07 | 1 | -1/+28 |
| | | |||||
| * | Refactor email tests | Erik Johnston | 2019-06-07 | 1 | -22/+42 |
| | | |||||
* | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules | Brendan Abolivier | 2019-06-14 | 1 | -0/+79 |
|\ \ | | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events | ||||
| * | | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 1 | -0/+79 |
| | | | |||||
* | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive | Erik Johnston | 2019-06-14 | 1 | -10/+10 |
|\ \ \ | | | | | | | | | Prometheus histograms are cumalative | ||||
| * | | | Prometheus histograms are cumalative | Erik Johnston | 2019-06-14 | 1 | -10/+10 |
| | | | | |||||
* | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 1 | -25/+42 |
|/ / / | |||||
* | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 1 | -0/+45 |
| | | | |||||
* | | | fix prometheus rendering error | Amber H. Brown | 2019-06-14 | 1 | -38/+23 |
| | | | |||||
* | | | Expose statistics on extrems to prometheus (#5384) | Amber Brown | 2019-06-13 | 3 | -80/+206 |
| | | | |||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 6 | -24/+253 |
|\ \ \ | |||||
| * | | | Bump bleach version so that tests can run on old deps. | Erik Johnston | 2019-06-11 | 4 | -24/+0 |
| | | | | |||||
| * | | | Change password reset links to /_matrix. | Erik Johnston | 2019-06-11 | 2 | -0/+253 |
| |/ / | |||||
* | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-10 | 6 | -106/+341 |
|\| | | |||||
| * | | Merge pull request #5417 from matrix-org/rav/shared_ssl_context | Erik Johnston | 2019-06-10 | 6 | -106/+341 |
| |\ \ | | | | | | | | | Share an SSL context object between SSL connections | ||||
| | * | | fix ci on py2, again | Richard van der Hoff | 2019-06-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix CI on python 2.7 | Richard van der Hoff | 2019-06-10 | 1 | -6/+4 |
| | | | | |||||
| | * | | Tests for SSL certs for federation connections | Richard van der Hoff | 2019-06-10 | 6 | -106/+343 |
| | |/ | | | | | | | | | | Add some tests for bad certificates for federation and .well-known connections | ||||
* | | | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms | Erik Johnston | 2019-06-10 | 1 | -1/+49 |
|\| | | | | | | | | Fix key verification when key stored with null valid_until_ms | ||||
| * | | Fix key verification when key stored with null valid_until_ms | Erik Johnston | 2019-06-10 | 1 | -1/+49 |
| |/ | | | | | | | | | | | | | | | | | | | Some keys are stored in the synapse database with a null valid_until_ms which caused an exception to be thrown when using that key. We fix this by treating nulls as zeroes, i.e. they keys will match verification requests with a minimum_valid_until_ms of zero (i.e. don't validate ts) but will not match requests with a non-zero minimum_valid_until_ms. Fixes #5391. | ||||
* | | Merge pull request #5363 from ↵ | Brendan Abolivier | 2019-06-10 | 1 | -0/+35 |
|\ \ | |/ |/| | | | | | matrix-org/babolivier/account_validity_send_mail_auth Don't check whether the user's account is expired on /send_mail requests | ||||
| * | Don't check whether the user's account is expired on /send_mail requests | Brendan Abolivier | 2019-06-05 | 1 | -0/+35 |
| | | |||||
* | | Prevent multiple device list updates from breaking a batch send (#5156) | Andrew Morgan | 2019-06-06 | 1 | -0/+69 |
| | | | | | | fixes #5153 | ||||
* | | Set default room version to v4. (#5379) | Neil Johnson | 2019-06-06 | 2 | -1/+8 |
| | | | | | | | | Set default room version to v4. | ||||
* | | Add ability to perform password reset via email without trusting the ↵ | Andrew Morgan | 2019-06-06 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | identity server (#5377) Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368 | ||||
* | | Stop hardcoding trust of old matrix.org key (#5374) | Richard van der Hoff | 2019-06-06 | 2 | -15/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few changes going on here: * We make checking the signature on a key server response optional: if no verify_keys are specified, we trust to TLS to validate the connection. * We change the default config so that it does not require responses to be signed by the old key. * We replace the old 'perspectives' config with 'trusted_key_servers', which is also formatted slightly differently. * We emit a warning to the logs every time we trust a key server response signed by the old key. | ||||
* | | Merge pull request #5359 from matrix-org/rav/enable_tls_verification | Richard van der Hoff | 2019-06-06 | 1 | -3/+9 |
|\ \ | | | | | | | Validate federation server TLS certificates by default. | ||||
| * \ | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification | Richard van der Hoff | 2019-06-05 | 1 | -3/+59 |
| |\ \ | |||||
| * | | | Validate federation server TLS certificates by default. | Richard van der Hoff | 2019-06-05 | 1 | -3/+9 |
| | | | | |||||
* | | | | Merge pull request #5353 from matrix-org/rav/verify_key_logging | Richard van der Hoff | 2019-06-06 | 1 | -10/+8 |
|\ \ \ \ | |_|/ / |/| | | | Associate a request_name with each verify request, for logging | ||||
| * | | | Associate a request_name with each verify request, for logging | Richard van der Hoff | 2019-06-05 | 1 | -10/+8 |
| |/ / | | | | | | | | | | | | | | | | | | | Also: * rename VerifyKeyRequest->VerifyJsonRequest * calculate key_ids on VerifyJsonRequest construction * refactor things to pass around VerifyJsonRequests instead of 4-tuples | ||||
* / / | Fix background updates to handle redactions/rejections (#5352) | Erik Johnston | 2019-06-06 | 1 | -3/+59 |
|/ / | | | | | | | | | | | | | | | * Fix background updates to handle redactions/rejections In background updates based on current state delta stream we need to handle that we may not have all the events (or at least that `get_events` may raise an exception). | ||||
* | | Don't bomb out on direct key fetches as soon as one fails | Richard van der Hoff | 2019-06-04 | 1 | -7/+5 |
| | | |||||
* | | Enforce validity period on server_keys for fed requests. (#5321) | Richard van der Hoff | 2019-06-03 | 1 | -27/+108 |
| | | | | | | | | | | | | | | | | When handling incoming federation requests, make sure that we have an up-to-date copy of the signing key. We do not yet enforce the validity period for event signatures. | ||||
* | | Unify v1 and v2 REST client APIs (#5226) | Amber Brown | 2019-06-03 | 3 | -3/+2 |
| | | |||||
* | | Merge pull request #5309 from matrix-org/rav/limit_displayname_length | Richard van der Hoff | 2019-06-01 | 1 | -2/+60 |
|\ \ | | | | | | | Limit displaynames and avatar URLs | ||||
| * | | add some tests | Richard van der Hoff | 2019-06-01 | 1 | -2/+60 |
| | | | |||||
* | | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_delta | Erik Johnston | 2019-05-31 | 1 | -5/+10 |
|\ \ \ | | | | | | | | | Allow configuring a range for the account validity startup job | ||||
| * | | | Move delta from +10% to -10% | Brendan Abolivier | 2019-05-31 | 1 | -2/+2 |
| | | | | |||||
| * | | | Make max_delta equal to period * 10% | Brendan Abolivier | 2019-05-31 | 1 | -17/+1 |
| | | | | |||||
| * | | | Typo | Brendan Abolivier | 2019-05-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Allow configuring a range for the account validity startup job | Brendan Abolivier | 2019-05-28 | 1 | -0/+21 |
| | |/ | |/| | | | | | | | | | | When enabling the account validity feature, Synapse will look at startup for registered account without an expiration date, and will set one equals to 'now + validity_period' for them. On large servers, it can mean that a large number of users will have the same expiration date, which means that they will all be sent a renewal email at the same time, which isn't ideal. In order to mitigate this, this PR allows server admins to define a 'max_delta' so that the expiration date is a random value in the [now + validity_period ; now + validity_period + max_delta] range. This allows renewal emails to be progressively sent over a configured period instead of being sent all in one big batch. | ||||
* | | | Merge pull request #5278 from matrix-org/erikj/cleanup_bad_extremities | Erik Johnston | 2019-05-30 | 1 | -0/+248 |
|\ \ \ | | | | | | | | | Add DB bg update to cleanup extremities. | ||||
| * | | | Add test | Erik Johnston | 2019-05-29 | 1 | -0/+248 |
| | | | | |||||
* | | | | Implement the SHHS complexity API (#5216) | Amber Brown | 2019-05-30 | 1 | -0/+90 |
|/ / / | |||||
* | | | Merge pull request #5251 from matrix-org/rav/server_keys/01-check_sig | Richard van der Hoff | 2019-05-28 | 1 | -9/+75 |
|\ \ \ | | | | | | | | | Ensure that server_keys fetched via a notary server are correctly signed. | ||||
| * | | | Require sig from origin server on perspectives responses | Richard van der Hoff | 2019-05-23 | 1 | -9/+75 |
| | | | | |||||
* | | | | Simplification to Keyring.wait_for_previous_lookups. (#5250) | Richard van der Hoff | 2019-05-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | The list of server names was redundant, since it was equivalent to the keys on the server_to_deferred map. This reduces the number of large lists being passed around, and has the benefit of deduplicating the entries in `wait_on`. | ||||
* | | | | Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchers | Erik Johnston | 2019-05-23 | 1 | -6/+28 |
|\| | | | | | | | | | | | Factor out KeyFetchers from KeyRing | ||||
| * | | | Factor out KeyFetchers from KeyRing | Richard van der Hoff | 2019-05-23 | 1 | -6/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than have three methods which have to have the same interface, factor out a separate interface which is provided by three implementations. I find it easier to grok the code this way. | ||||
* | | | | Add config option for setting homeserver's default room version (#5223) | Andrew Morgan | 2019-05-23 | 1 | -2/+5 |
|/ / / | | | | | | | | | | | | | Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file. | ||||
* | | | Store key validity time in the storage layer | Richard van der Hoff | 2019-05-23 | 2 | -22/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is a first step to checking that the key is valid at the required moment. The idea here is that, rather than passing VerifyKey objects in and out of the storage layer, we instead pass FetchKeyResult objects, which simply wrap the VerifyKey and add a valid_until_ts field. | ||||
* | | | Rewrite store_server_verify_key to store several keys at once (#5234) | Richard van der Hoff | 2019-05-23 | 2 | -16/+42 |
| | | | | | | | | | | | | | | | Storing server keys hammered the database a bit. This replaces the implementation which stored a single key, with one which can do many updates at once. | ||||
* | | | Room Statistics (#4338) | Amber Brown | 2019-05-21 | 2 | -0/+268 |
| |/ |/| | |||||
* | | Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactions | Erik Johnston | 2019-05-21 | 1 | -1/+26 |
|\ \ | | | | | | | Block attempts to annotate the same event twice | ||||
| * | | Block attempts to annotate the same event twice | Erik Johnston | 2019-05-20 | 1 | -1/+26 |
| | | | |||||
* | | | Merge pull request #5204 from ↵ | Brendan Abolivier | 2019-05-21 | 1 | -0/+55 |
|\ \ \ | |/ / |/| / | |/ | | | matrix-org/babolivier/account_validity_expiration_date Add startup background job for account validity | ||||
| * | Add startup background job for account validity | Brendan Abolivier | 2019-05-17 | 1 | -0/+55 |
| | | | | | | | | If account validity is enabled in the server's configuration, this job will run at startup as a background job and will stick an expiration date to any registered account missing one. | ||||
* | | Rename relation types to match MSC | Erik Johnston | 2019-05-20 | 1 | -11/+11 |
| | | |||||
* | | Merge pull request #5209 from matrix-org/erikj/reactions_base | Erik Johnston | 2019-05-20 | 1 | -0/+539 |
|\ \ | | | | | | | Land basic reaction and edit support. | ||||
| * | | Fixup comments | Erik Johnston | 2019-05-20 | 1 | -2/+2 |
| | | | |||||
| * | | Correctly update aggregation counts after redaction | Erik Johnston | 2019-05-20 | 1 | -0/+37 |
| | | | |||||
| * | | Make tests use different user for each reaction it sends | Erik Johnston | 2019-05-17 | 1 | -12/+68 |
| | | | | | | | | | | | | As users aren't allowed to react with the same emoji more than once. | ||||
| * | | Add basic editing support | Erik Johnston | 2019-05-16 | 1 | -9/+82 |
| | | | |||||
| * | | Check that event is visible in new APIs | Erik Johnston | 2019-05-16 | 1 | -1/+1 |
| | | | |||||
| * | | Add aggregations API | Erik Johnston | 2019-05-16 | 1 | -3/+248 |
| | | | |||||
| * | | Add simple pagination API | Erik Johnston | 2019-05-15 | 1 | -0/+30 |
| | | | |||||
| * | | Add simple send_relation API and track in DB | Erik Johnston | 2019-05-15 | 1 | -0/+98 |
| | | | |||||
| * | | Merge branch 'erikj/fix_config_ratelimiting' into erikj/test | Erik Johnston | 2019-05-14 | 1 | -1/+2 |
| |\ \ | |||||
* | | | | Limit UserIds to a length that fits in a state key (#5198) | ReidAnderson | 2019-05-20 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #5196 from matrix-org/babolivier/per_room_profiles | Brendan Abolivier | 2019-05-17 | 1 | -1/+69 |
|\ \ \ \ | | |_|/ | |/| | | Add an option to disable per-room profiles | ||||
| * | | | Lint | Brendan Abolivier | 2019-05-16 | 1 | -1/+0 |
| | | | | |||||
| * | | | Lint | Brendan Abolivier | 2019-05-16 | 1 | -1/+3 |
| | | | | |||||
| * | | | Forgot copyright | Brendan Abolivier | 2019-05-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add test case | Brendan Abolivier | 2019-05-16 | 1 | -1/+67 |
| | | | | |||||
* | | | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_only | David Baker | 2019-05-16 | 2 | -2/+9 |
|\ \ \ \ | |/ / / |/| | | | Re-order registration stages to do msisdn & email auth last | ||||
| * | | | Terms might not be the last stage | David Baker | 2019-05-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2019-05-13 | 1 | -11/+11 |
| |\ \ \ | | | | | | | | | | | | | | | | dbkr/add_dummy_flow_to_recaptcha_only | ||||
| * | | | | And now I realise why the test is failing... | David Baker | 2019-05-13 | 1 | -1/+8 |
| | | | | | |||||
* | | | | | Make all the rate limiting options more consistent (#5181) | Amber Brown | 2019-05-15 | 1 | -12/+8 |
| | | | | | |||||
* | | | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array | Erik Johnston | 2019-05-15 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | Expose DataStore._get_events as get_events_as_list | ||||
| * | | | Expose DataStore._get_events as get_events_as_list | Erik Johnston | 2019-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This is in preparation for reaction work which requires it. | ||||
* | | | | Use correct config option for ratelimiting in tests | Erik Johnston | 2019-05-14 | 1 | -1/+2 |
|/ / / | |||||
* | | | Migrate all tests to use the dict-based config format instead of hanging ↵ | Amber Brown | 2019-05-13 | 21 | -203/+238 |
| | | | | | | | | | | | | items off HomeserverConfig (#5171) | ||||
* | | | Add ability to blacklist ip ranges for federation traffic (#5043) | Andrew Morgan | 2019-05-13 | 1 | -0/+71 |
| |/ |/| | |||||
* | | URL preview blacklisting fixes (#5155) | Andrew Morgan | 2019-05-10 | 1 | -11/+11 |
|/ | | | Prevents a SynapseError being raised inside of a IResolutionReceiver and instead opts to just return 0 results. This thus means that we have to lump a failed lookup and a blacklisted lookup together with the same error message, but the substitute should be generic enough to cover both cases. | ||||
* | Run Black on the tests again (#5170) | Amber Brown | 2019-05-10 | 53 | -1169/+828 |
| | |||||
* | Fix bogus imports in tests (#5154) | Brendan Abolivier | 2019-05-08 | 3 | -5/+6 |
| | |||||
* | add options to require an access_token to GET /profile and /publicRooms on ↵ | Matthew Hodgson | 2019-05-08 | 2 | -1/+123 |
| | | | | | | | | | | | | | | | | | CS API (#5083) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit. | ||||
* | Do checks on aliases for incoming m.room.aliases events (#5128) | Brendan Abolivier | 2019-05-08 | 1 | -0/+169 |
| | | | | | Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended. | ||||
* | Remove the requirement to authenticate for /admin/server_version. (#5122) | Richard van der Hoff | 2019-05-07 | 2 | -26/+26 |
| | | | | | | | | | This endpoint isn't much use for its intended purpose if you first need to get yourself an admin's auth token. I've restricted it to the `/_synapse/admin` path to make it a bit easier to lock down for those concerned about exposing this information. I don't imagine anyone is using it in anger currently. | ||||
* | Add admin api for sending server_notices (#5121) | Richard van der Hoff | 2019-05-02 | 15 | -20/+23 |
| | |||||
* | Move admin api impl to its own package | Richard van der Hoff | 2019-05-01 | 16 | -37/+63 |
| | | | | It doesn't really belong under rest/client/v1 any more. | ||||
* | Config option for verifying federation certificates (MSC 1711) (#4967) | Andrew Morgan | 2019-04-25 | 1 | -1/+2 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-04-17 | 23 | -327/+928 |
|\ | | | | | | | babolivier/account_expiration | ||||
| * | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 1 | -1/+99 |
| |\ | | | | | | | Send out emails with links to extend an account's validity period | ||||
| * | | Remove periods from copyright headers (#5046) | Andrew Morgan | 2019-04-11 | 2 | -2/+2 |
| | | | |||||
| * | | Merge pull request #5027 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-09 | 2 | -3/+52 |
| |\ \ | | | | | | | | | Add time-based account expiration | ||||
| * | | | Rewrite Datastore.get_server_verify_keys | Richard van der Hoff | 2019-04-09 | 1 | -3/+50 |
| | | | | | | | | | | | | | | | | Rewrite this so that it doesn't hammer the database. | ||||
| * | | | Rewrite test_keys as a HomeserverTestCase | Richard van der Hoff | 2019-04-08 | 1 | -19/+15 |
| | | | | |||||
| * | | | Fix from_server buglet in get_keys_from_perspectives | Richard van der Hoff | 2019-04-08 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | make sure we store the name of the server the keys came from, rather than the origin server, after doing a fetch-from-perspectives. | ||||
| * | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanups | Richard van der Hoff | 2019-04-08 | 1 | -0/+130 |
| |\ \ \ | | | | | | | | | | | Cleanups in the Keyring | ||||
| | * | | | test for get_keys_from_perspectives | Richard van der Hoff | 2019-04-04 | 1 | -0/+67 |
| | | | | | |||||
| | * | | | add a test for get_keys_from_server | Richard van der Hoff | 2019-04-04 | 1 | -0/+63 |
| | | | | | |||||
| * | | | | Add config option to block users from looking up 3PIDs (#5010) | Brendan Abolivier | 2019-04-04 | 2 | -1/+66 |
| | | | | | |||||
| * | | | | Add unit test for deleting groups | Erik Johnston | 2019-04-03 | 1 | -0/+124 |
| | | | | | |||||
| * | | | | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986) | Richard van der Hoff | 2019-04-03 | 1 | -107/+104 |
| | | | | | | | | | | | | | | | | | | | | This is a bit fiddly due to the keyring doing weird things with logcontexts. | ||||
| * | | | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 1 | -118/+0 |
| | | | | | | | | | | | | Remove presence list support as per MSC 1819 | ||||
| * | | | Fix sync bug when accepting invites (#4956) | Richard van der Hoff | 2019-04-02 | 3 | -49/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this time we really will fix #4422. We need to make sure that the cache on `get_rooms_for_user_with_stream_ordering` is invalidated *before* the SyncHandler is notified for the new events, and we can now do so reliably via the `events` stream. | ||||
| * | | | Neilj/fix threepid auth check (with tests) (#4474) | Neil Johnson | 2019-04-01 | 1 | -0/+32 |
| | | | | | | | | | | | | test threepid checking | ||||
| * | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 9 | -26/+32 |
| | | | | | | | | | | | | | | | | Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions. | ||||
| * | | | Merge pull request #4942 from matrix-org/erikj/fix_presence | Erik Johnston | 2019-03-28 | 1 | -1/+175 |
| |\ \ \ | | | | | | | | | | | Use event streams to calculate presence | ||||
| | * | | | Review comments | Erik Johnston | 2019-03-28 | 1 | -5/+9 |
| | | | | | |||||
| | * | | | Add unit tests | Erik Johnston | 2019-03-27 | 1 | -1/+171 |
| | | | | | |||||
| * | | | | Move replication.tcp.streams into a package | Richard van der Hoff | 2019-03-27 | 1 | -1/+1 |
| |/ / / | |||||
* | | / | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 1 | -8/+87 |
| |_|/ |/| | | |||||
* | | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 1 | -1/+99 |
| |/ |/| | |||||
* | | Add account expiration feature | Brendan Abolivier | 2019-04-09 | 2 | -3/+52 |
|/ | |||||
* | Make federation endpoints more tolerant of trailing slashes v2 (#4935) | Andrew Morgan | 2019-03-26 | 1 | -3/+3 |
| | | | Redo of https://github.com/matrix-org/synapse/pull/4840 | ||||
* | Fix bug where read-receipts lost their timestamps (#4927) | Richard van der Hoff | 2019-03-25 | 4 | -0/+148 |
| | | | | | Make sure that they are sent correctly over the replication stream. Fixes: #4898 | ||||
* | Use an explicit dbname for postgres connections in the tests. (#4928) | Richard van der Hoff | 2019-03-25 | 1 | -18/+16 |
| | | | | | | I don't have a database with the same name as my user, so leaving the database name unset fails. While we're at it, clear out some unused stuff in the test setup. | ||||
* | Merge pull request #4869 from matrix-org/erikj/yaml_load | Erik Johnston | 2019-03-22 | 2 | -3/+3 |
|\ | | | | | Fix yaml warnings by using safe_load | ||||
| * | Use yaml safe_load | Erik Johnston | 2019-03-22 | 2 | -3/+3 |
| | | |||||
* | | Some more porting to HomeserverTestCase and remove old RESTHelper (#4913) | Amber Brown | 2019-03-22 | 4 | -230/+123 |
| | | |||||
* | | Remove trailing slashes from outbound federation requests and retry on 400 ↵ | Andrew Morgan | 2019-03-21 | 2 | -0/+101 |
|\ \ | |/ |/| | | | | | (#4840) As per #3622, we remove trailing slashes from outbound federation requests. However, to ensure that we remain backwards compatible with previous versions of Synapse, if we receive a HTTP 400 with `M_UNRECOGNIZED`, then we are likely talking to an older version of Synapse in which case we retry with a trailing slash appended to the request path. | ||||
| * | lint | Andrew Morgan | 2019-03-20 | 1 | -1/+1 |
| | | |||||
| * | New test, fix issues | Andrew Morgan | 2019-03-20 | 1 | -0/+45 |
| | | |||||
| * | Fix comments. v0.99.2 -> v0.99.3 | Andrew Morgan | 2019-03-20 | 1 | -1/+1 |
| | | |||||
| * | Federation test fixed! | Andrew Morgan | 2019-03-20 | 1 | -2/+5 |
| | | |||||
| * | Better exception handling | Andrew Morgan | 2019-03-18 | 1 | -4/+1 |
| | | |||||
| * | Correct var name | Andrew Morgan | 2019-03-13 | 1 | -0/+54 |
| | | |||||
| * | i should have given up x3 | Andrew Morgan | 2019-03-13 | 1 | -39/+0 |
| | | |||||
| * | i should have given up x2 | Andrew Morgan | 2019-03-13 | 1 | -0/+39 |
| | | |||||
| * | Switch to wrapper function around _send_request | Andrew Morgan | 2019-03-13 | 1 | -2/+2 |
| | | |||||
| * | Correct argument name | Andrew Morgan | 2019-03-12 | 1 | -2/+2 |
| | | |||||
| * | Cleaner way of implementing trailing slashes | Andrew Morgan | 2019-03-12 | 1 | -2/+4 |
| | | |||||
| * | and again | Andrew Morgan | 2019-03-11 | 1 | -1/+1 |
| | | |||||
| * | Fix syntax error | Andrew Morgan | 2019-03-11 | 1 | -1/+1 |
| | | |||||
| * | We're calling different functions now | Andrew Morgan | 2019-03-11 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms | Erik Johnston | 2019-03-21 | 1 | -1/+65 |
|\ \ | | | | | | | Deny peeking into rooms that have been blocked | ||||
| * | | isort | Erik Johnston | 2019-03-21 | 1 | -1/+1 |
| | | | |||||
| * | | Deny peeking into rooms that have been blocked | Erik Johnston | 2019-03-21 | 1 | -1/+65 |
| | | | |||||
* | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 1 | -1/+74 |
|\ \ \ | | | | | | | | | Fixup shutdown room API | ||||
| * | | | Fix typo and add description | Erik Johnston | 2019-03-21 | 1 | -1/+5 |
| |/ / | |||||
| * | | Rejig testcase to make it more extensible | Erik Johnston | 2019-03-21 | 1 | -17/+22 |
| | | | |||||
| * | | Remove debug | Erik Johnston | 2019-03-21 | 1 | -1/+0 |
| | | | |||||
| * | | Add tests | Erik Johnston | 2019-03-21 | 1 | -1/+66 |
| | | | |||||
* | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directory | Erik Johnston | 2019-03-21 | 2 | -3/+58 |
|\ \ \ | | | | | | | | | Add option to disable search room lists | ||||
| * | | | Add test | Erik Johnston | 2019-03-20 | 2 | -3/+58 |
| | | | | |||||
* | | | | Log requests which are simulated by the unit tests. (#4905) | Richard van der Hoff | 2019-03-20 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | Rather than stubbing out the access_log, make it actually log the requests, which makes it a lot more obvious what is going on during tests. | ||||
* | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_search | Erik Johnston | 2019-03-20 | 1 | -0/+52 |
|\ \ \ \ | |_|/ / |/| | | | Add option to disable searching in the user dir | ||||
| * | | | Add test | Erik Johnston | 2019-03-20 | 1 | -0/+52 |
| |/ / | |||||
* / / | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 1 | -0/+128 |
|/ / | | | | | | | Rate-limit outgoing read-receipts as per #4730. | ||||
* | | Fix RegistrationTestCase | Richard van der Hoff | 2019-03-19 | 1 | -2/+9 |
| | | | | | | | | turns out this relies on there being a `user_consent_version` set. | ||||
* | | Use a regular HomeServerConfig object for unit tests | Richard van der Hoff | 2019-03-19 | 1 | -11/+15 |
| | | | | | | | | | | | | | | Rather than using a Mock for the homeserver config, use a genuine HomeServerConfig object. This makes for a more realistic test, and means that we don't have to keep remembering to add things to the mock config every time we add a new config setting. | ||||
* | | Fix resource limits tests | Richard van der Hoff | 2019-03-19 | 1 | -2/+5 |
| | | | | | | | | | | Make sure that we have a `server_notices_mxid` set, given that we are relying on it. | ||||
* | | Fix registration test | Richard van der Hoff | 2019-03-19 | 1 | -1/+2 |
| | | | | | | | | | | * Set allow_guest_access = True, since we rely on it * config doesn't have a `hostname` attribute; it is `server_name` | ||||
* | | Fix email test | Richard van der Hoff | 2019-03-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | The Mailer expects the config object to have `email_smtp_pass` and `email_riot_base_url` attributes (and it won't by default, because the default config impl doesn't set any of the attributes unless email_enable_notifs is set). | ||||
* | | Merge remote-tracking branch 'origin/develop' into HEAD | Richard van der Hoff | 2019-03-19 | 1 | -2/+22 |
|\ \ | |||||
| * | | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 1 | -2/+22 |
| | | | |||||
* | | | Enforce hs_disabled_message correctly | Richard van der Hoff | 2019-03-19 | 1 | -0/+17 |
|/ / | | | | | | | | | Fixes a bug where hs_disabled_message was not enforced for 3pid-based requests if there was no server_notices_mxid configured. | ||||
* | | Migrate the user directory initial population to a background task (#4864) | Amber Brown | 2019-03-19 | 3 | -45/+79 |
| | | |||||
* | | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 2 | -0/+47 |
| | | |||||
* | | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 3 | -4/+128 |
| | | | | | | Add two ratelimiters on login (per-IP address and per-userID). | ||||
* | | Revert "Make federation endpoints more tolerant of trailing slashes for some ↵ | Erik Johnston | 2019-03-14 | 1 | -3/+3 |
| | | | | | | | | | | | | endpoints (#4793)" This reverts commit 290552fd836f4ae2dc1d893a7f72f7fff85365d3. | ||||
* | | Merge pull request #4846 from matrix-org/hawkowl/userdir-search | Erik Johnston | 2019-03-14 | 3 | -15/+22 |
|\ \ | |/ |/| | Improve searching in the userdir | ||||
| * | fixup | Amber Brown | 2019-03-13 | 1 | -20/+1 |
| | | |||||
| * | fixup | Amber Brown | 2019-03-12 | 1 | -2/+2 |
| | | |||||
| * | fixup | Amber Brown | 2019-03-12 | 1 | -16/+20 |
| | | |||||
| * | fixes | Amber Brown | 2019-03-12 | 1 | -4/+12 |
| | | |||||
| * | setup master | Amber Brown | 2019-03-11 | 1 | -0/+2 |
| | |