Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Doc | Brendan Abolivier | 2019-06-10 | 1 | -0/+5 |
| | |||||
* | Don't check whether the user's account is expired on /send_mail requests | Brendan Abolivier | 2019-06-05 | 2 | -3/+9 |
| | |||||
* | Only parse from email if provided | Brendan Abolivier | 2019-06-04 | 1 | -4/+5 |
| | |||||
* | Lint | Brendan Abolivier | 2019-06-04 | 1 | -1/+0 |
| | |||||
* | Make account validity renewal emails work when email notifs are disabled | Brendan Abolivier | 2019-06-04 | 1 | -42/+57 |
| | |||||
* | Fix schema update for account validity | Brendan Abolivier | 2019-05-28 | 1 | -0/+3 |
| | |||||
* | Doc | Brendan Abolivier | 2019-05-21 | 1 | -0/+8 |
| | |||||
* | Do the select and insert in a single transaction | Brendan Abolivier | 2019-05-21 | 1 | -10/+6 |
| | |||||
* | Add startup background job for account validity | Brendan Abolivier | 2019-05-17 | 2 | -12/+66 |
| | | | | 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. | ||||
* | Add option to disable per-room profiles | Brendan Abolivier | 2019-05-16 | 2 | -0/+20 |
| | |||||
* | Make /sync attempt to return device updates for both joined and invited ↵ | Matthew Hodgson | 2019-05-16 | 1 | -19/+25 |
| | | | | users (#3484) | ||||
* | Merge pull request #5187 from ↵ | David Baker | 2019-05-16 | 1 | -18/+22 |
|\ | | | | | | | | | matrix-org/dbkr/only_check_threepid_not_in_use_if_actually_registering Only check 3pids not in use when registering | ||||
| * | Only check 3pids not in use when registering | David Baker | 2019-05-14 | 1 | -18/+22 |
| | | | | | | | | | | | | | | | | | | We checked that 3pids were not already in use before we checked if we were going to return the account previously registered in the same UI auth session, in which case the 3pids will definitely be in use. https://github.com/vector-im/riot-web/issues/9586 | ||||
* | | Make all the rate limiting options more consistent (#5181) | Amber Brown | 2019-05-15 | 5 | -91/+104 |
| | | |||||
* | | Drop support for v2_alpha API prefix (#5190) | Richard van der Hoff | 2019-05-15 | 7 | -26/+20 |
| | | |||||
* | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | 0.99.4 | Richard van der Hoff | 2019-05-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #5183 from matrix-org/erikj/async_serialize_event | Erik Johnston | 2019-05-15 | 12 | -101/+193 |
|\ \ \ | | | | | | | | | Allow client event serialization to be async | ||||
| * | | | Update docstring with correct return type | Erik Johnston | 2019-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | Newsfile | Erik Johnston | 2019-05-14 | 1 | -6/+6 |
| | | | | |||||
| * | | | Allow client event serialization to be async | Erik Johnston | 2019-05-14 | 12 | -95/+187 |
| | |/ | |/| | |||||
* | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array | Erik Johnston | 2019-05-15 | 5 | -29/+53 |
|\ \ \ | | | | | | | | | Expose DataStore._get_events as get_events_as_list | ||||
| * | | | Update docstring with correct type | Erik Johnston | 2019-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | Expose DataStore._get_events as get_events_as_list | Erik Johnston | 2019-05-14 | 5 | -29/+53 |
| |/ / | | | | | | | | | | This is in preparation for reaction work which requires it. | ||||
* / / | comment about user_joined_room | Richard van der Hoff | 2019-05-14 | 1 | -0/+1 |
|/ / | |||||
* | | Migrate all tests to use the dict-based config format instead of hanging ↵ | Amber Brown | 2019-05-13 | 1 | -0/+1 |
| | | | | | | | | items off HomeserverConfig (#5171) | ||||
* | | Add ability to blacklist ip ranges for federation traffic (#5043) | Andrew Morgan | 2019-05-13 | 3 | -14/+78 |
|/ | |||||
* | 0.99.4rc1 v0.99.4rc1 | Brendan Abolivier | 2019-05-13 | 1 | -1/+1 |
| | |||||
* | Fix CI after new release of isort | Brendan Abolivier | 2019-05-13 | 1 | -1/+0 |
| | |||||
* | URL preview blacklisting fixes (#5155) | Andrew Morgan | 2019-05-10 | 2 | -20/+35 |
| | | | 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. | ||||
* | Revert 085ae346ace418e0fc043ac5f568f85ebf80038e | David Baker | 2019-05-10 | 1 | -1/+1 |
| | | | | Accidentally went straight to develop | ||||
* | Add a DUMMY stage to captcha-only registration flow | David Baker | 2019-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. https://github.com/vector-im/riot-web/issues/9586 | ||||
* | Run `black` on per_destination_queue | Richard van der Hoff | 2019-05-09 | 1 | -35/+39 |
| | | | | ... mostly to fix pep8 fails | ||||
* | Limit the number of EDUs in transactions to 100 as expected by receiver (#5138) | Quentin Dufour | 2019-05-09 | 2 | -27/+31 |
| | | | Fixes #3951. | ||||
* | add options to require an access_token to GET /profile and /publicRooms on ↵ | Matthew Hodgson | 2019-05-08 | 5 | -12/+114 |
| | | | | | | | | | | | | | | | | | 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. | ||||
* | Merge pull request #5037 from matrix-org/erikj/limit_inflight_dns | Erik Johnston | 2019-05-08 | 1 | -1/+82 |
|\ | | | | | Limit in flight DNS requests | ||||
| * | Limit in flight DNS requests | Erik Johnston | 2019-04-09 | 1 | -1/+82 |
| | | | | | | | | | | | | | | This is to work around a bug in twisted where a large number of concurrent DNS requests cause it to tight loop forever. c.f. https://twistedmatrix.com/trac/ticket/9620#ticket | ||||
* | | Do checks on aliases for incoming m.room.aliases events (#5128) | Brendan Abolivier | 2019-05-08 | 5 | -8/+55 |
| | | | | | | | | | | 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. | ||||
* | | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_invite | Erik Johnston | 2019-05-07 | 1 | -0/+11 |
|\ \ | | | | | | | Ratelimit 3pid invites | ||||
| * | | Rate limit early | Erik Johnston | 2019-05-02 | 1 | -2/+3 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-04-26 | 63 | -959/+1158 |
| |\ \ | | | | | | | | | | | | | erikj/ratelimit_3pid_invite | ||||
| * | | | Ratelimit 3pid invites | Erik Johnston | 2019-04-26 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | We do ratelimit sending the 3PID invite events, but that happens after spamming the identity server. | ||||
* | | | | Remove the requirement to authenticate for /admin/server_version. (#5122) | Richard van der Hoff | 2019-05-07 | 1 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-03 | 4 | -13/+37 |
|\ \ \ \ | |||||
| * | | | | 0.99.3.2 v0.99.3.2 github/release-v0.99.3.2 release-v0.99.3.2 | Richard van der Hoff | 2019-05-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | pin urllib3 to <1.25 | Richard van der Hoff | 2019-05-03 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | 0.99.3.1 | Richard van der Hoff | 2019-05-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #5134 from matrix-org/rav/url_preview_blacklist | Richard van der Hoff | 2019-05-03 | 1 | -10/+21 |
| |\ \ \ \ | | | | | | | | | | | | | Blacklist 0.0.0.0 and :: by default for URL previews | ||||
| | * | | | | more config comment updates | Richard van der Hoff | 2019-05-03 | 1 | -2/+5 |
| | | | | | | |||||
| | * | | | | Blacklist 0.0.0.0 and :: by default for URL previews | Richard van der Hoff | 2019-05-03 | 1 | -10/+18 |
| | | | | | | |||||
| * | | | | | Merge pull request #5133 from matrix-org/rav/systemrandom | Richard van der Hoff | 2019-05-03 | 1 | -2/+7 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Use SystemRandom for token generation. | ||||
| | * | | | | Use SystemRandom for token generation | Richard van der Hoff | 2019-05-03 | 1 | -2/+7 |
| | | | | | | |||||
* | | | | | | Add admin api for sending server_notices (#5121) | Richard van der Hoff | 2019-05-02 | 3 | -3/+118 |
| | | | | | | |||||
* | | | | | | Merge pull request #5124 from matrix-org/babolivier/aliases | Brendan Abolivier | 2019-05-02 | 3 | -2/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add some limitations to alias creation | ||||
| * | | | | | | Add some limitations to alias creation | Brendan Abolivier | 2019-05-02 | 3 | -2/+34 |
| | | | | | | | |||||
* | | | | | | | Factor out an "assert_requester_is_admin" function (#5120) | Richard van der Hoff | 2019-05-02 | 3 | -76/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than copying-and-pasting the same four lines hundreds of times | ||||
* | | | | | | | fix examples | Richard van der Hoff | 2019-05-01 | 1 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Move admin api impl to its own package | Richard van der Hoff | 2019-05-01 | 3 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't really belong under rest/client/v1 any more. | ||||
* | | | | | | | Move admin API to a new prefix | Richard van der Hoff | 2019-05-01 | 4 | -24/+64 |
| | | | | | | | |||||
* | | | | | | | Move admin API away from ClientV1RestServlet | Richard van der Hoff | 2019-05-01 | 1 | -33/+33 |
|/ / / / / / | |||||
* | | | | | | Add a default .m.rule.tombstone push rule (#4867) | Travis Ralston | 2019-04-29 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a default .m.rule.tombstone push rule In support of MSC1930: https://github.com/matrix-org/matrix-doc/pull/1930 * changelog * Appease the changelog linter | ||||
* | | | | | | Merge pull request #5100 from matrix-org/rav/verification_hackery | Richard van der Hoff | 2019-04-29 | 2 | -18/+54 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Improve logging when event-signature checking fails | ||||
| * | | | | | more logging improvements | Richard van der Hoff | 2019-04-25 | 1 | -8/+11 |
| | | | | | | |||||
| * | | | | | remove extraneous exception logging | Richard van der Hoff | 2019-04-25 | 2 | -18/+34 |
| | | | | | | |||||
| * | | | | | Clarify logging when PDU signature checking fails | Richard van der Hoff | 2019-04-25 | 2 | -3/+20 |
| | | | | | | |||||
* | | | | | | Fix infinite loop in presence handler | Richard van der Hoff | 2019-04-26 | 2 | -0/+23 |
|/ / / / / | | | | | | | | | | | | | | | | Fixes #5102 | ||||
* | | | | | Config option for verifying federation certificates (MSC 1711) (#4967) | Andrew Morgan | 2019-04-25 | 4 | -15/+121 |
| | | | | | |||||
* | | | | | Remove log error for .well-known/matrix/client (#4972) | Michael Kaye | 2019-04-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Prevent "producer not unregistered" message (#5009) | Amber Brown | 2019-04-24 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Don't crash on lack of expiry templates | Brendan Abolivier | 2019-04-18 | 1 | -2/+6 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-04-17 | 139 | -4477/+4027 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | babolivier/account_expiration | ||||
| * \ \ \ \ | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 14 | -39/+573 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Send out emails with links to extend an account's validity period | ||||
| * \ \ \ \ \ | Merge pull request #5071 from matrix-org/babolivier/3pid-check | Brendan Abolivier | 2019-04-17 | 1 | -0/+18 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make sure we're not registering the same 3pid twice | ||||
| | * | | | | | | Make sure we're not registering the same 3pid twice | Brendan Abolivier | 2019-04-17 | 1 | -0/+18 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #5070 from matrix-org/erikj/postpath | Erik Johnston | 2019-04-17 | 1 | -8/+8 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | Remove usage of request.postpath | ||||
| | * | | | | | Remove usage of request.postpath | Erik Johnston | 2019-04-16 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an undocumented variable in twisted, and relies on the servlet being mounted in the right way. This also breaks getting push rules on workers. | ||||
| * | | | | | | Merge pull request #5065 from matrix-org/erikj/fix_versions | Erik Johnston | 2019-04-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | VersionRestServlet doesn't take a param | ||||
| | * | | | | | | VersionRestServlet doesn't take a param | Erik Johnston | 2019-04-15 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Add systemd-python to optional dependencies (#4339) | Silke Hofstra | 2019-04-16 | 1 | -5/+9 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using systemd-python allows for logging to the systemd journal, as is documented in: `synapse/contrib/systemd/log_config.yaml`. Signed-off-by: Silke Hofstra <silke@slxh.eu> | ||||
| * | | | | | | Merge pull request #5063 from matrix-org/erikj/move_endpoints | Erik Johnston | 2019-04-15 | 2 | -4/+14 |
| |\| | | | | | | | | | | | | | | | | | | | Move some rest endpoints to client reader | ||||
| | * | | | | | Only handle GET requests for /push_rules | Erik Johnston | 2019-04-15 | 1 | -0/+7 |
| | | | | | | | |||||
| | * | | | | | Move some rest endpoints to client reader | Erik Johnston | 2019-04-15 | 1 | -4/+7 |
| | | | | | | | |||||
| * | | | | | | Remove periods from copyright headers (#5046) | Andrew Morgan | 2019-04-11 | 9 | -9/+9 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #5033 from matrix-org/erikj/fix_schema_delta | Erik Johnston | 2019-04-10 | 1 | -1/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix schema upgrade when dropping tables | ||||
| | * | | | | | | Fix schema upgrade when dropping tables | Erik Johnston | 2019-04-09 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to drop tables in the correct order due to foreign table constraints (on `application_services`), otherwise the DROP TABLE command will fail. Introduced in #4992. | ||||
| * | | | | | | | Fix disappearing exceptions in manhole. (#5035) | Richard van der Hoff | 2019-04-10 | 1 | -2/+57 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | Avoid sending syntax errors from the manhole to sentry. | ||||
| * | | | | | | Merge pull request #5027 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-09 | 5 | -0/+84 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Add time-based account expiration | ||||
| * | | | | | | Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_k | Richard van der Hoff | 2019-04-09 | 3 | -71/+72 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Rewrite Datastore.get_server_verify_keys | ||||
| | * | | | | | | Rewrite Datastore.get_server_verify_keys | Richard van der Hoff | 2019-04-09 | 2 | -49/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite this so that it doesn't hammer the database. | ||||
| | * | | | | | | Replace SlavedKeyStore with a shim | Richard van der Hoff | 2019-04-08 | 1 | -14/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we're pulling everything out of KeyStore anyway, we may as well simplify it. | ||||
| | * | | | | | | Remove redundant merged_keys dict | Richard van der Hoff | 2019-04-08 | 1 | -8/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no point in collecting a merged dict of keys: it is sufficient to consider just the new keys which have been fetched by the most recent key_fetch_fns. | ||||
| * | | | | | | | Bump psycopg requirement (#5032) | Richard van der Hoff | 2019-04-09 | 1 | -1/+3 |
| |/ / / / / / | |||||
| * | | | | | | Remove unused server_tls_certificates functions (#5028) | Richard van der Hoff | 2019-04-08 | 4 | -62/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been unused since #4120, and with the demise of perspectives, it is unlikely that they will ever be used again. | ||||
| * | | | | | | add context to phonehome stats (#5020) | Neil Johnson | 2019-04-08 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | add context to phonehome stats | ||||
| * | | | | | | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys | Richard van der Hoff | 2019-04-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix from_server buglet in get_keys_from_perspectives | ||||
| | * | | | | | | Fix from_server buglet in get_keys_from_perspectives | Richard van der Hoff | 2019-04-08 | 1 | -1/+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. | ||||
| * | | | | | | | drop tables listed in #1830 (#4992) | Neil Johnson | 2019-04-08 | 24 | -752/+42 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tables dropped: * application_services, * application_services_regex, * transaction_id_to_pdu, * stats_reporting * current_state_resets * event_content_hashes * event_destinations * event_edge_hashes * event_signatures * feedback * room_hosts * state_forward_extremities | ||||
| * | | | | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanups | Richard van der Hoff | 2019-04-08 | 2 | -33/+50 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Cleanups in the Keyring | ||||
| | * | | | | | | Hoist server_name check out of process_v2_response | Richard van der Hoff | 2019-04-04 | 1 | -13/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's easier to check it in the caller than to complicate the interface with an extra param. | ||||
| | * | | | | | | Clean up Keyring.process_v2_response | Richard van der Hoff | 2019-04-04 | 1 | -23/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make this just return the key dict, rather than a single-entry dict mapping the server name to the key dict. It's easy for the caller to get the server name from from the response object anyway. | ||||
| | * | | | | | | Fix docstring on get_server_keys_json | Richard van der Hoff | 2019-04-04 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Add config option to block users from looking up 3PIDs (#5010) | Brendan Abolivier | 2019-04-04 | 2 | -0/+10 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Clean up the database pagination code (#5007) | Amber Brown | 2019-04-05 | 2 | -67/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rewrite & simplify * changelog * cleanup potential sql injection | ||||
| * | | | | | | Merge pull request #5002 from matrix-org/erikj/delete_group | Erik Johnston | 2019-04-04 | 3 | -0/+136 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add delete group admin API | ||||
| | * | | | | | | Add admin API for group deletion | Erik Johnston | 2019-04-03 | 1 | -0/+26 |
| | | | | | | | | |||||
| | * | | | | | | Add functions to delete a group | Erik Johnston | 2019-04-03 | 2 | -0/+110 |
| | | | | | | | | |||||
| * | | | | | | | Prevent kicking users who aren't in the room (#4999) | Andrew Morgan | 2019-04-04 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | Prevent kick events from succeeding if the user is not currently in the room. | ||||
| * | | | | | | | Avoid redundant URL encoding (#4555) | Marcel Krüger | 2019-04-04 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not double encode fallback redirect URL Signed-off-by: Marcel Fabian Krüger <zauguin@gmail.com> | ||||
| * / / / / / | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 11 | -18/+29 |
| |/ / / / / | |||||
| * | | | | | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 7 | -338/+22 |
| | | | | | | | | | | | | | | | | | | Remove presence list support as per MSC 1819 | ||||
| * | | | | | Merge pull request #4982 from matrix-org/erikj/msc1915 | Erik Johnston | 2019-04-03 | 6 | -17/+215 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Implement MSC1915 - 3PID unbind APIs | ||||
| | * | | | | | Correctly handle id_server param | Erik Johnston | 2019-04-02 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Remove threepid binding if id server returns 400/404/501 | Erik Johnston | 2019-04-02 | 1 | -9/+10 |
| | | | | | | | |||||
| | * | | | | | Fixup docstrings | Erik Johnston | 2019-04-02 | 3 | -7/+9 |
| | | | | | | | |||||
| | * | | | | | Add unbind API to /r0 as it is now stabalised | Erik Johnston | 2019-04-01 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Grandfather in existing user threepids | Erik Johnston | 2019-04-01 | 2 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assume, as we did before, that users bound their threepid to one of the trusted identity servers. So we simply fill the new table with all threepids in `user_threepids` joined with the trusted identity servers. | ||||
| | * | | | | | Allowing specifying IS to use in unbind API. | Erik Johnston | 2019-04-01 | 4 | -8/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the homeserver will use the identity server used during the binding of the 3PID to unbind the 3PID. However, we need to allow clients to explicitly ask the homeserver to unbind via a particular identity server, for the case where the 3PID was bound out of band from the homeserver. Implements MSC915. | ||||
| | * | | | | | For unbind poke IS used during binding of 3PID | Erik Johnston | 2019-04-01 | 1 | -9/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the behaviour from using the server specified trusted identity server to using the IS that used during the binding of the 3PID, if known. This is the behaviour specified by MSC1915. | ||||
| | * | | | | | Track IS used to bind 3PIDs | Erik Johnston | 2019-04-01 | 3 | -0/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will then be used to know which IS to default to when unbinding the threepid. | ||||
| * | | | | | | Run black on the rest of the storage module (#4996) | Amber Brown | 2019-04-03 | 41 | -2455/+2130 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startup | Erik Johnston | 2019-04-02 | 4 | -8/+73 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make starting pushers faster during start up | ||||
| | * | | | | | | Make starting pushers faster during start up | Erik Johnston | 2019-04-02 | 4 | -8/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We start all pushers on start up and immediately start a background process to fetch push to send. This makes start up incredibly painful when dealing with many pushers. Instead, let's do a quick fast DB check to see if there *may* be push to send and only start the background processes for those pushers. We also stagger starting up and doing those checks so that we don't try and handle all pushers at once. | ||||
| * | | | | | | | Transfer related groups on room upgrade (#4990) | Andrew Morgan | 2019-04-02 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Transfers the m.room.related_groups state event on room upgrade. | ||||
| * | | | | | | | Add config.signing_key_path. (#4974) | Richard van der Hoff | 2019-04-02 | 1 | -1/+2 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by @andrewshadura | ||||
| * | | | | | | Fix sync bug when accepting invites (#4956) | Richard van der Hoff | 2019-04-02 | 3 | -20/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | Merge branch 'master' into develop | Neil Johnson | 2019-04-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 18 | -142/+188 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | 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 #4955 from matrix-org/rav/merge_state_into_events | Richard van der Hoff | 2019-03-28 | 8 | -49/+140 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Combine the CurrentStateDeltaStream into the EventStream | ||||
| | * | | | | | Combine the CurrentStateDeltaStream into the EventStream | Richard van der Hoff | 2019-03-27 | 5 | -33/+43 |
| | | | | | | | |||||
| | * | | | | | Make EventStream rows have a type | Richard van der Hoff | 2019-03-27 | 4 | -17/+98 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as a precursor to combining it with the CurrentStateDelta stream. | ||||
| * | | | | | | Merge pull request #4954 from matrix-org/rav/refactor_parse_row | Richard van der Hoff | 2019-03-28 | 3 | -5/+21 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactors to replication stream row update/parsing | ||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_row | Richard van der Hoff | 2019-03-28 | 2 | -380/+335 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Skip building a ROW_TYPE when building updates | Richard van der Hoff | 2019-03-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're about to turn it straight into a JSON object anyway so building a ROW_TYPE is a bit pointless, and reduces flexibility in the update_function. | ||||
| | * | | | | | | Add parse_row method to replication stream class | Richard van der Hoff | 2019-03-27 | 3 | -3/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow individual stream classes to override how a row is parsed. | ||||
| * | | | | | | | remove log line for password (#4965) | Neil Johnson | 2019-03-28 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove log line for password. | ||||
| * | | | | | | | Allow password providers to bind emails (#4947) | Andrew Morgan | 2019-03-28 | 2 | -4/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | This PR allows password provider modules to bind email addresses when a user is registering and is motivated by matrix-org/matrix-synapse-ldap3#58 | ||||
| * | | | | | | | Merge pull request #4942 from matrix-org/erikj/fix_presence | Erik Johnston | 2019-03-28 | 3 | -32/+236 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Use event streams to calculate presence | ||||
| | * | | | | | | Use an assert | Erik Johnston | 2019-03-28 | 1 | -2/+1 |
| | | | | | | | | |||||
| | * | | | | | | Review comments | Erik Johnston | 2019-03-28 | 1 | -44/+62 |
| | | | | | | | | |||||
| | * | | | | | | Use event streams to calculate presence | Erik Johnston | 2019-03-27 | 3 | -32/+219 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Primarily this fixes a bug in the handling of remote users joining a room where the server sent out the presence for all local users in the room to all servers in the room. We also change to using the state delta stream, rather than the distributor, as it will make it easier to split processing out of the master process (as well as being more flexible). Finally, when sending presence states to newly joined servers we filter out old presence states to reduce the number sent. Initially we filter out states that are offline and have a last active more than a week ago, though this can be changed down the line. Fixes #3962 | ||||
| * | | | | | | | Merge pull request #4953 from matrix-org/rav/refactor_replication_streams | Richard van der Hoff | 2019-03-28 | 6 | -76/+133 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | Split up replication.tcp.streams into smaller files | ||||
| | * | | | | | | move FederationStream out to its own file | Richard van der Hoff | 2019-03-27 | 4 | -23/+43 |
| | | | | | | | | |||||
| | * | | | | | | move EventsStream out to its own file | Richard van der Hoff | 2019-03-27 | 3 | -23/+42 |
| | | | | | | | | |||||
| | * | | | | | | Move replication.tcp.streams into a package | Richard van der Hoff | 2019-03-27 | 3 | -34/+52 |
| | | | | | | | | |||||
| * | | | | | | | Run `black` on some storage modules that the stats branch touches (#4959) | Amber Brown | 2019-03-29 | 2 | -380/+335 |
| |/ / / / / / | |||||
| * / / / / / | Fix/improve some docstrings in the replication code. (#4949) | Richard van der Hoff | 2019-03-27 | 2 | -7/+19 |
| |/ / / / / | |||||
* | | | / / | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 5 | -18/+116 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 14 | -39/+573 |
| |_|/ / |/| | | | |||||
* | | | | Add account expiration feature | Brendan Abolivier | 2019-04-09 | 6 | -1/+85 |
| |/ / |/| | | |||||
* | | | 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3 | Neil Johnson | 2019-04-01 | 1 | -1/+1 |
| | | | |||||
* | | | bump version | Neil Johnson | 2019-03-27 | 1 | -1/+1 |
|/ / | |||||
* | | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 6 | -26/+122 |
| | | | | | | | | | | Adds a new method, check_3pid_auth, which gives password providers the chance to allow authentication with third-party identifiers such as email or msisdn. | ||||
* | | Use the state event amount for userdir import batching, not room count (#4944) | Amber Brown | 2019-03-27 | 1 | -8/+20 |
| | | |||||
* | | Make federation endpoints more tolerant of trailing slashes v2 (#4935) | Andrew Morgan | 2019-03-26 | 3 | -8/+9 |
| | | | | | | Redo of https://github.com/matrix-org/synapse/pull/4840 | ||||
* | | Fix ClientReplicationStreamProtocol.__str__ (#4929) | Richard van der Hoff | 2019-03-25 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | `__str__` depended on `self.addr`, which was absent from ClientReplicationStreamProtocol, so attempting to call str on such an object would raise an exception. We can calculate the peer addr from the transport, so there is no need for addr anyway. | ||||
* | | Fix bug where read-receipts lost their timestamps (#4927) | Richard van der Hoff | 2019-03-25 | 3 | -12/+30 |
| | | | | | | | | | | Make sure that they are sent correctly over the replication stream. Fixes: #4898 | ||||
* | | Refactor out state delta handling into its own class (#4917) | Amber Brown | 2019-03-25 | 4 | -110/+151 |
| | | |||||
* | | Merge pull request #4869 from matrix-org/erikj/yaml_load | Erik Johnston | 2019-03-22 | 3 | -5/+5 |
|\ \ | | | | | | | Fix yaml warnings by using safe_load | ||||
| * | | Use yaml safe_load | Erik Johnston | 2019-03-22 | 3 | -5/+5 |
| | | | |||||
* | | | Remove trailing slashes from outbound federation requests and retry on 400 ↵ | Andrew Morgan | 2019-03-21 | 2 | -17/+89 |
|\ \ \ | |/ / |/| | | | | | | | | (#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. | ||||
| * | | Clean up backoff_on_404 and metehod calls | Andrew Morgan | 2019-03-21 | 1 | -9/+13 |
| | | | |||||
| * | | kwargs doesn't like commas on calling funcs either. TIL | Andrew Morgan | 2019-03-20 | 1 | -2/+2 |
| | | | |||||
| * | | lint | Andrew Morgan | 2019-03-20 | 1 | -2/+6 |
| | | | |||||
| * | | New test, fix issues | Andrew Morgan | 2019-03-20 | 1 | -49/+28 |
| | | | |||||
| * | | Fix comments. v0.99.2 -> v0.99.3 | Andrew Morgan | 2019-03-20 | 1 | -5/+5 |
| | | | |||||
| * | | Just return if not doing any trailing slash shennanigans | Andrew Morgan | 2019-03-20 | 1 | -0/+2 |
| | | | |||||
| * | | lint | Andrew Morgan | 2019-03-18 | 1 | -1/+1 |
| | | | |||||
| * | | Better exception handling | Andrew Morgan | 2019-03-18 | 1 | -16/+17 |
| | | | |||||
| * | | Correct var name | Andrew Morgan | 2019-03-13 | 1 | -2/+2 |
| | | | |||||
| * | | receiving a 400 caused an exception. handle it | Andrew Morgan | 2019-03-13 | 1 | -5/+12 |
| | | | |||||
| * | | is this what purgatory feels like | Andrew Morgan | 2019-03-13 | 1 | -3/+3 |
| | | | |||||
| * | | i should have given up x2 | Andrew Morgan | 2019-03-13 | 1 | -18/+13 |
| | | | |||||
| * | | i should have given up | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
| | | | |||||
| * | | there comes a time when you should give up. but you dont | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
| | | | |||||
| * | | as above | Andrew Morgan | 2019-03-13 | 1 | -2/+4 |
| | | | |||||
| * | | no kwargs today | Andrew Morgan | 2019-03-13 | 1 | -7/+12 |
| | | | |||||
| * | | Or perhaps I was the one who was drunk | Andrew Morgan | 2019-03-13 | 1 | -6/+3 |
| | | | |||||
| * | | go home python, you're drunk | Andrew Morgan | 2019-03-13 | 1 | -4/+2 |
| | | | |||||
| * | | Syntax checker is bork | Andrew Morgan | 2019-03-13 | 1 | -6/+5 |
| | | | |||||
| * | | Destructure again | Andrew Morgan | 2019-03-13 | 1 | -7/+8 |
| | | | |||||
| * | | Are you happy now | Andrew Morgan | 2019-03-13 | 1 | -2/+2 |
| | | | |||||
| * | | Syntax test | Andrew Morgan | 2019-03-13 | 1 | -6/+5 |
| | | | |||||
| * | | Remove testing code | Andrew Morgan | 2019-03-13 | 1 | -3/+0 |
| | | | |||||
| * | | Add missing docstring detail | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
| | | | |||||
| * | | Fix syntax issues | Andrew Morgan | 2019-03-13 | 1 | -7/+10 |
| | | | |||||
| * | | Switch to wrapper function around _send_request | Andrew Morgan | 2019-03-13 | 2 | -37/+76 |
| | | | |||||
| * | | Retry on 400:M_UNRECOGNIZED | Andrew Morgan | 2019-03-13 | 1 | -6/+10 |
| | | | |||||
| * | | Fix paranthesis indent | Andrew Morgan | 2019-03-13 | 1 | -1/+2 |
| | | | |||||
| * | | Add workaround note | Andrew Morgan | 2019-03-13 | 1 | -10/+4 |
| | | | |||||
| * | | Cleaner way of implementing trailing slashes | Andrew Morgan | 2019-03-12 | 2 | -68/+62 |
| | | | |||||
| * | | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 2 | -9/+9 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 4 | -19/+53 |
| |\ \ \ | |||||
| * | | | | lint | Andrew Morgan | 2019-03-08 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Retry certain federation requests on 404 | Andrew Morgan | 2019-03-08 | 2 | -5/+50 |
| | | | | | |||||
| * | | | | Remove trailing slashes from outbound federation requests | Andrew Morgan | 2019-03-08 | 1 | -7/+7 |
| | | | | | |||||
* | | | | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms | Erik Johnston | 2019-03-21 | 2 | -2/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Deny peeking into rooms that have been blocked | ||||
| * | | | | | Deny peeking into rooms that have been blocked | Erik Johnston | 2019-03-21 | 2 | -2/+11 |
| | | | | | | |||||
* | | | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 6 | -24/+62 |
|\| | | | | | | | | | | | | | | | | | Fixup shutdown room API | ||||
| * | | | | | Fix upsert | Erik Johnston | 2019-03-21 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Revert spurious delete | Erik Johnston | 2019-03-20 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | comment block_room | Erik Johnston | 2019-03-20 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Use flags | Erik Johnston | 2019-03-20 | 5 | -15/+17 |
| | | | | | | |||||
| * | | | | | Move requester check into assert_accepted_privacy_policy | Erik Johnston | 2019-03-20 | 1 | -5/+8 |
| | | | | | | |||||
| * | | | | | Gracefully handle failing to kick user | Erik Johnston | 2019-03-20 | 1 | -19/+27 |
| | | | | | | |||||
| * | | | | | Log new room ID | Erik Johnston | 2019-03-20 | 1 | -1/+6 |
| | | | | | | |||||
| * | | | | | Only require consent for events with an associated request | Erik Johnston | 2019-03-20 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a number of instances where a server or admin may puppet a user to join/leave rooms, which we don't want to fail if the user has not consented to the privacy policy. We fix this by adding a check to test if the requester has an associated access_token, which is used as a proxy to answer the question of whether the action is being done on behalf of a real request from the user. | ||||
| * | | | | | Allow blocking a room multiple times | Erik Johnston | 2019-03-20 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directory | Erik Johnston | 2019-03-21 | 3 | -0/+32 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add option to disable search room lists | ||||
| * | | | | | | Disable publishing to room list when its disabled | Erik Johnston | 2019-03-20 | 1 | -0/+8 |
| | | | | | | | |||||
| * | | | | | | Pull out config option | Erik Johnston | 2019-03-20 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Return before we log | Erik Johnston | 2019-03-20 | 1 | -4/+5 |
| | | | | | | | |||||
| * | | | | | | Fix up config comments | Erik Johnston | 2019-03-20 | 1 | -3/+4 |
| | | | | | | | |||||
| * | | | | | | Add option to disable search room lists | Erik Johnston | 2019-03-19 | 2 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This disables both local and remote room list searching. | ||||
* | | | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_search | Erik Johnston | 2019-03-20 | 2 | -0/+15 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Add option to disable searching in the user dir | ||||
| * | | | | | | Fix up sample config | Erik Johnston | 2019-03-20 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Update synapse/config/user_directory.py | Richard van der Hoff | 2019-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re> | ||||
| * | | | | | | Add option to disable searching in the user dir | Erik Johnston | 2019-03-19 | 2 | -0/+13 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | We still populate it, as it can still be accessed via the admin API. | ||||
* | | | | | | Batching in the user directory import (#4900) | Amber Brown | 2019-03-21 | 1 | -0/+13 |
| | | | | | | |||||
* | | | | | | Add a config option for torture-testing worker replication. (#4902) | Richard van der Hoff | 2019-03-20 | 2 | -1/+22 |
| | | | | | | | | | | | | | | | | | | Setting this to 50 or so makes a bunch of sytests fail in worker mode. | ||||
* | | | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 4 | -22/+171 |
|/ / / / / | | | | | | | | | | | | | | | | Rate-limit outgoing read-receipts as per #4730. | ||||
* | | | | | Use a regular HomeServerConfig object for unit tests | Richard van der Hoff | 2019-03-19 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | Merge remote-tracking branch 'origin/develop' into HEAD | Richard van der Hoff | 2019-03-19 | 3 | -4/+16 |
|\ \ \ \ \ | |||||
| * | | | | | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 2 | -3/+15 |
| | | | | | | |||||
| * | | | | | Fix user directory background update (#4887) | Erik Johnston | 2019-03-19 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Enforce hs_disabled_message correctly | Richard van der Hoff | 2019-03-19 | 1 | -3/+5 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Fixes a bug where hs_disabled_message was not enforced for 3pid-based requests if there was no server_notices_mxid configured. | ||||
* | | | | | Comment out most options in the generated config. (#4863) | Richard van der Hoff | 2019-03-19 | 14 | -98/+149 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it so that most options in the config are optional, and commented out in the generated config. The reasons this is a good thing are as follows: * If we decide that we should change the default for an option, we can do so, and only those admins that have deliberately chosen to override that option will be stuck on the old setting. * It moves us towards a point where we can get rid of the super-surprising feature of synapse where the default settings for the config come from the generated yaml. * It makes setting up a test config for unit testing an order of magnitude easier (see forthcoming PR). * It makes the generated config more consistent, and hopefully easier for users to understand. | ||||
* | | | | | Migrate the user directory initial population to a background task (#4864) | Amber Brown | 2019-03-19 | 4 | -256/+325 |
| | | | | | |||||
* | | | | | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 2 | -5/+32 |
| | | | | | |||||
* | | | | | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 6 | -22/+102 |
| | | | | | | | | | | | | | | | Add two ratelimiters on login (per-IP address and per-userID). | ||||
* | | | | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queue | Richard van der Hoff | 2019-03-15 | 7 | -761/+864 |
|\ \ \ \ \ | | | | | | | | | | | | | Split TransactionQueue up | ||||
| * | | | | | Rename and move the classes | Richard van der Hoff | 2019-03-13 | 7 | -811/+864 |
| | | | | | | |||||
| * | | | | | Factor per-destination stuff out of TransactionQueue | Richard van der Hoff | 2019-03-13 | 1 | -132/+182 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is easier than having to have a million fields keyed on destination. | ||||
* | | | | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_worker | Richard van der Hoff | 2019-03-15 | 5 | -55/+110 |
|\| | | | | | | | | | | | | | | | | | Move client receipt processing to federation sender worker. | ||||
| * | | | | | Move client receipt processing to federation sender worker. | Richard van der Hoff | 2019-03-13 | 4 | -33/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly a prerequisite for #4730, but also fits with the general theme of "move everything off the master that we possibly can". | ||||
| * | | | | | declare a ReadReceipt class | Richard van der Hoff | 2019-03-13 | 2 | -24/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm going to use this in queues and things, so it'll be useful to give it more of a structure. | ||||
* | | | | | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ci | Erik Johnston | 2019-03-15 | 4 | -17/+53 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow passing --daemonize to workers | ||||
| * | | | | | | Correctly handle all command line options | Erik Johnston | 2019-03-14 | 3 | -16/+42 |
| | | | | | | | |||||
| * | | | | | | Allow passing --daemonize to workers | Erik Johnston | 2019-03-13 | 2 | -1/+11 |
| | | | | | | | |||||
* | | | | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ↵ | Erik Johnston | 2019-03-14 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoints (#4793)" This reverts commit 290552fd836f4ae2dc1d893a7f72f7fff85365d3. | ||||
* | | | | | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-search | Erik Johnston | 2019-03-14 | 7 | -123/+183 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Improve searching in the userdir | ||||
| * | | | | | | fixup | Amber Brown | 2019-03-13 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | fixup | Amber Brown | 2019-03-13 | 3 | -55/+16 |
| | | | | | | | |||||
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 3 | -160/+139 |
| | | | | | | | |||||
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | use the old method | Amber Brown | 2019-03-12 | 1 | -3/+2 |
| | | | | | | | |||||
| * | | | | | | fix | Amber Brown | 2019-03-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | pep8 | Amber Brown | 2019-03-12 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | fixes | Amber Brown | 2019-03-12 | 3 | -48/+62 |
| | | | | | | |