Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | (#5849) Convert rst to markdown (#6040) | Andrew Morgan | 2020-02-25 | 41 | -2192/+2088 |
|\ | |||||
| * | (#5849) Convert rst to markdown (#6040) | dstipp | 2019-09-17 | 41 | -2192/+2088 |
| | | | | | | | | | | Converting some of the rst documentation to markdown. Attempted to preserve whitespace and line breaks to minimize cosmetic change. | ||||
* | | Fix race condition in room stats. (#6029) | Andrew Morgan | 2020-02-25 | 2 | -4/+11 |
|\| | |||||
| * | Fix race condition in room stats. (#6029) | Erik Johnston | 2019-09-17 | 2 | -4/+11 |
| | | | | | | | | | | Broke in #5971 Basically the bug is that if get_current_state_deltas returns no new updates and we then take the max pos, its possible that we miss an update that happens in between the two calls. (e.g. get_current_state_deltas looks up to stream pos 5, then an event persists and so getting the max stream pos returns 6, meaning that next time we check for things with a stream pos bigger than 6) | ||||
* | | Add 'failure_ts' column to 'destinations' table (#6016) | Andrew Morgan | 2020-02-25 | 7 | -12/+195 |
|\| | |||||
| * | Add 'failure_ts' column to 'destinations' table (#6016) | Richard van der Hoff | 2019-09-17 | 7 | -12/+195 |
| | | | | | | | | Track the time that a server started failing at, for general analysis purposes. | ||||
* | | Fix well-known lookups with the federation certificate whitelist (#5997) | Andrew Morgan | 2020-02-25 | 5 | -15/+63 |
|\| | |||||
| * | Fix well-known lookups with the federation certificate whitelist (#5997) | Amber Brown | 2019-09-14 | 5 | -15/+63 |
| | | |||||
* | | Add developer docs for using SAML without a server (#6032) | Andrew Morgan | 2020-02-25 | 2 | -0/+38 |
|\| | |||||
| * | Add developer docs for using SAML without a server (#6032) | Travis Ralston | 2019-09-13 | 2 | -0/+38 |
| | | |||||
* | | add explanations on how to actually include an access_token (#6031) | Andrew Morgan | 2020-02-25 | 1 | -0/+12 |
|\ \ | |||||
| * | | add explanations on how to actually include an access_token (#6031) | axel simon | 2019-09-13 | 1 | -0/+12 |
| | | | |||||
* | | | README: link to reverse_proxy.rst (#6027) | Andrew Morgan | 2020-02-25 | 1 | -0/+13 |
|\| | | |||||
| * | | README: link to reverse_proxy.rst (#6027) | Richard van der Hoff | 2019-09-12 | 1 | -0/+13 |
| | | | |||||
* | | | Fix for structured logging tests stomping on logs (#6023) | Andrew Morgan | 2020-02-25 | 13 | -41/+154 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix for structured logging tests stomping on logs (#6023) | Amber Brown | 2019-09-13 | 13 | -41/+154 |
| | | | |||||
* | | | Remove the cap on federation retry interval. (#6026) | Andrew Morgan | 2020-02-25 | 2 | -2/+3 |
|\| | | |||||
| * | | Remove the cap on federation retry interval. (#6026) | Richard van der Hoff | 2019-09-12 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | Essentially the intention here is to end up blacklisting servers which never respond to federation requests. Fixes https://github.com/matrix-org/synapse/issues/5113. | ||||
* | | | Fix bug in calculating the federation retry backoff period (#6025) | Andrew Morgan | 2020-02-25 | 2 | -2/+4 |
|\| | | |||||
| * | | Fix bug in calculating the federation retry backoff period (#6025) | Richard van der Hoff | 2019-09-12 | 2 | -2/+4 |
| | | | | | | | | | | | | This was intended to introduce an element of jitter; instead it gave you a 30/60 chance of resetting to zero. | ||||
* | | | Merge pull request #6024 from matrix-org/dbkr/fix_sso_fallback_login | Andrew Morgan | 2020-02-25 | 2 | -1/+2 |
|\| | | |||||
| * | | Merge pull request #6024 from matrix-org/dbkr/fix_sso_fallback_login | David Baker | 2019-09-12 | 2 | -1/+2 |
| |\ \ | | | | | | | | | Fix SSO fallback login | ||||
| | * | | changelog | David Baker | 2019-09-12 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fix SSO fallback login | David Baker | 2019-09-12 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | Well, it worked, but forgot to remove the thing saying login was unavailable. | ||||
* | | | add report_stats_endpoint config option (#6012) | Andrew Morgan | 2020-02-25 | 4 | -2/+19 |
|\| | | |||||
| * | | add report_stats_endpoint config option (#6012) | Sorunome | 2019-09-12 | 4 | -2/+19 |
| | | | | | | | | | This PR adds the optional `report_stats_endpoint` to configure where stats are reported to, if enabled. | ||||
* | | | Blow up config if opentracing is missing (#5985) | Andrew Morgan | 2020-02-25 | 2 | -0/+8 |
|\| | | |||||
| * | | Blow up config if opentracing is missing (#5985) | Jorik Schellekens | 2019-09-12 | 2 | -0/+8 |
| | | | | | | | | | | | | * Blow up config if opentracing is missing | ||||
* | | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-register | Andrew Morgan | 2020-02-25 | 3 | -2/+28 |
|\| | | |||||
| * | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-register | Jason Robinson | 2019-09-12 | 3 | -2/+28 |
| |\ \ | | | | | | | | | Ensure support users can be registered even if MAU limit is reached | ||||
| | * | | Ensure support users can be registered even if MAU limit is reached | Jason Robinson | 2019-09-11 | 3 | -2/+28 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | This allows support users to be created even on MAU limits via the admin API. Support users are excluded from MAU after creation, so it makes sense to exclude them in creation - except if the whole host is in disabled state. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2020-02-25 | 6 | -32/+274 |
|\| | | |||||
| * | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2019-09-11 | 6 | -35/+238 |
| | | | | | | | | | | | | | | | | | | | | | This is a redo of https://github.com/matrix-org/synapse/pull/5897 but with `id_access_token` accepted. Implements [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134) plus Identity Service v2 authentication ala [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140). Identity lookup-related functions were also moved from `RoomMemberHandler` to `IdentityHandler`. | ||||
* | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Andrew Morgan | 2020-02-25 | 7 | -12/+103 |
|\| | | |||||
| * | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Erik Johnston | 2019-09-11 | 7 | -12/+103 |
| |\ \ | | | | | | | | | Allow use of different ratelimits for admin redactions. | ||||
| | * | | Update sample config | Erik Johnston | 2019-09-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix comments | Erik Johnston | 2019-09-11 | 4 | -5/+5 |
| | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | ||||
| | * | | Add test for admin redaction ratelimiting. | Erik Johnston | 2019-09-11 | 1 | -0/+25 |
| | | | | |||||
| | * | | Fix how we check for self redaction | Erik Johnston | 2019-09-11 | 1 | -4/+18 |
| | | | | |||||
| | * | | Update sample config | Erik Johnston | 2019-09-11 | 1 | -0/+7 |
| | | | | |||||
| | * | | Newsfile | Erik Johnston | 2019-09-11 | 1 | -0/+1 |
| | | | | |||||
| | * | | Allow use of different ratelimits for admin redactions. | Erik Johnston | 2019-09-11 | 4 | -12/+56 |
| | | | | | | | | | | | | | | | | | | | | This is useful to allow room admins to quickly deal with a large number of abusive messages. | ||||
* | | | | Clean up some code in the retry logic (#6017) | Andrew Morgan | 2020-02-25 | 3 | -36/+14 |
|\| | | | |||||
| * | | | Clean up some code in the retry logic (#6017) | Richard van der Hoff | 2019-09-11 | 3 | -36/+14 |
| | | | | | | | | | | | | | | | | * remove some unused code * make things which were constants into constants for efficiency and clarity | ||||
* | | | | Add note about extra arg to send_membership_event, remove arg in ↵ | Andrew Morgan | 2020-02-25 | 2 | -10/+3 |
|\| | | | | | | | | | | | | | | | remote_reject_invite (#6009) | ||||
| * | | | Add note about extra arg to send_membership_event, remove arg in ↵ | Andrew Morgan | 2019-09-11 | 2 | -10/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote_reject_invite (#6009) Some small fixes to `room_member.py` found while doing other PRs. 1. Add requester to the base `_remote_reject_invite` method. 2. `send_membership_event`'s docstring was out of date and took in a `remote_room_hosts` arg that was not used and no calling function provided. | ||||
* | | | | Check dependencies on setup in the nicer way. (#5989) | Andrew Morgan | 2020-02-25 | 4 | -28/+20 |
|\| | | | |||||
| * | | | Check dependencies on setup in the nicer way. (#5989) | Jorik Schellekens | 2019-09-11 | 4 | -28/+20 |
| | | | | |||||
* | | | | Fix existing v2 identity server calls (MSC2140) (#6013) | Andrew Morgan | 2020-02-25 | 4 | -3/+28 |
|\| | | | |||||
| * | | | Fix existing v2 identity server calls (MSC2140) (#6013) | Andrew Morgan | 2019-09-11 | 2 | -2/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two things I missed while implementing [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R80). 1. Access tokens should be provided to the identity server as `access_token`, not `id_access_token`, even though the homeserver may accept the tokens as `id_access_token`. 2. Access tokens must be sent to the identity server in a query parameter, the JSON body is not allowed. We now send the access token as part of an `Authorization: ...` header, which fixes both things. The breaking code was added in https://github.com/matrix-org/synapse/pull/5892 Sytest PR: https://github.com/matrix-org/sytest/pull/697 | ||||
* | | | | Remove origin parameter from add_display_name_to_third_party_invite and add ↵ | Andrew Morgan | 2020-02-25 | 4 | -4/+10 |
|\| | | | | | | | | | | | | | | | params to docstring (#6010) | ||||
| * | | | Remove origin parameter from add_display_name_to_third_party_invite and add ↵ | Andrew Morgan | 2019-09-11 | 4 | -4/+10 |
| |/ / | | | | | | | | | | | | | | | | | | | params to docstring (#6010) Another small fixup noticed during work on a larger PR. The `origin` field of `add_display_name_to_third_party_invite` is not used and likely was just carried over from the `on_PUT` method of `FederationThirdPartyInviteExchangeServlet` which, like all other servlets, provides an `origin` argument. Since it's not used anywhere in the handler function though, we should remove it from the function arguments. | ||||
* | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation | Andrew Morgan | 2020-02-25 | 4 | -41/+46 |
|\| | | |||||
| * | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation | Erik Johnston | 2019-09-10 | 4 | -42/+46 |
| |\ \ | | | | | | | | | Use account_threepid_delegate for 3pid validation | ||||
| | * | | Add changelog | Andrew Morgan | 2019-09-10 | 3 | -4/+5 |
| | | | | |||||
| | * | | Use account_threepid_delegate for 3pid validation | Andrew Morgan | 2019-09-10 | 3 | -42/+45 |
| | | | | |||||
* | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Andrew Morgan | 2020-02-25 | 4 | -10/+69 |
|\| | | | |||||
| * | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Jason Robinson | 2019-09-09 | 4 | -10/+69 |
| |\ \ \ | | | | | | | | | | | Only count real users when checking for auto-creation of auto-join room | ||||
| | * | | | Fix code style, again | Jason Robinson | 2019-09-09 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| | * | | | Simplify count_real_users SQL to only count user_type is null rows | Jason Robinson | 2019-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| | * | | | Simplify is_real_user_txn check to trust user_type is null if real user | Jason Robinson | 2019-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| | * | | | Auto-fix a few code style issues | Jason Robinson | 2019-09-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| | * | | | Only count real users when checking for auto-creation of auto-join room | Jason Robinson | 2019-09-09 | 4 | -10/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if the first registered user was a "support" or "bot" user, when the first real user registers, the auto-join rooms were not created. Fix to exclude non-real (ie users with a special user type) users when counting how many users there are to determine whether we should auto-create a room. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Andrew Morgan | 2020-02-25 | 6 | -2/+220 |
|\| | | | | |||||
| * | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Erik Johnston | 2019-09-09 | 6 | -2/+220 |
| |\ \ \ \ | | | | | | | | | | | | | Censor redactions in DB after a month | ||||
| | * | | | | Fix comments | Erik Johnston | 2019-09-09 | 1 | -2/+3 |
| | | | | | | |||||
| | * | | | | Default to censoring redactions after seven days | Erik Johnston | 2019-09-09 | 2 | -7/+11 |
| | | | | | | |||||
| | * | | | | Use better names in SQL | Erik Johnston | 2019-09-09 | 1 | -5/+8 |
| | | | | | | |||||
| | * | | | | Fixup comment | Erik Johnston | 2019-09-09 | 1 | -4/+12 |
| | | | | | | |||||
| | * | | | | Don't start looping call unless enabled | Erik Johnston | 2019-09-09 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Handle setting retention period to 0 | Erik Johnston | 2019-09-09 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-09-05 | 144 | -1781/+2395 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/censor_redactions | ||||
| | * | | | | | Fix test | Erik Johnston | 2019-09-05 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Make redaction retention period configurable | Erik Johnston | 2019-09-05 | 4 | -3/+27 |
| | | | | | | | |||||
| | * | | | | | Newsfile | Erik Johnston | 2019-08-30 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Censor redactions in DB after a month | Erik Johnston | 2019-08-30 | 3 | -1/+175 |
| | | | | | | | |||||
* | | | | | | | Add a build info metric to Prometheus (#6005) | Andrew Morgan | 2020-02-25 | 3 | -2/+33 |
|\| | | | | | | |||||
| * | | | | | | Add a build info metric to Prometheus (#6005) | Amber Brown | 2019-09-10 | 3 | -2/+33 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6003 from matrix-org/erikj/push_opentracing | Andrew Morgan | 2020-02-25 | 2 | -1/+13 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #6003 from matrix-org/erikj/push_opentracing | Erik Johnston | 2019-09-09 | 2 | -1/+13 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Add opentracing span for HTTP push | ||||
| | * | | | | | Newsfile | Erik Johnston | 2019-09-09 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Add opentracing span for HTTP push | Erik Johnston | 2019-09-09 | 1 | -1/+12 |
| |/ / / / / | |||||
* | | | | | | Servers-known-about statistic (#5981) | Andrew Morgan | 2020-02-25 | 7 | -60/+226 |
|\| | | | | | |||||
| * | | | | | Servers-known-about statistic (#5981) | Amber Brown | 2019-09-07 | 7 | -60/+226 |
| | | | | | | |||||
* | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995) | Andrew Morgan | 2020-02-25 | 2 | -1/+8 |
|\| | | | | | |||||
| * | | | | | Ensure a sid parameter is passed to bind_threepid (#5995) | Andrew Morgan | 2019-09-06 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | `sid` is required to be part of `three_pid_creds`. We were 500'ing if it wasn't provided instead of returning `M_MISSING_PARAM`. | ||||
* | | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag | Andrew Morgan | 2020-02-25 | 3 | -2/+7 |
|\| | | | | | |||||
| * | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag | Erik Johnston | 2019-09-06 | 3 | -2/+7 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Correctly handle non-bool m.federate flag | ||||
| | * | | | | Newsfile | Erik Johnston | 2019-09-06 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Correctly handle non-bool m.federate flag | Erik Johnston | 2019-09-06 | 2 | -2/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #5993 from matrix-org/anoa/worker_store_reg | Andrew Morgan | 2020-02-25 | 2 | -79/+80 |
|\| | | | | | |||||
| * | | | | | Merge pull request #5993 from matrix-org/anoa/worker_store_reg | Erik Johnston | 2019-09-06 | 2 | -79/+80 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Move get_threepid_validation_session and delete_threepid_session into RegistrationWorkerStore | ||||
| | * | | | | | Move delete_threepid_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -25/+25 |
| | | | | | | | |||||
| | * | | | | | Change changelog | Andrew Morgan | 2019-09-06 | 2 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Move get_threepid_validation_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -54/+54 |
| | | | | | | | |||||
| | * | | | | | Add changelog | Andrew Morgan | 2019-09-06 | 1 | -0/+1 |
| | |/ / / / | |||||
* | | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fix | Andrew Morgan | 2020-02-25 | 3 | -2/+3 |
|\| | | | | | |||||
| * | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fix | Erik Johnston | 2019-09-06 | 3 | -2/+3 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix destructuring assumption bug with using load_jinja2_templates | ||||
| | * | | | | Apply suggestions from code review | Andrew Morgan | 2019-09-06 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
| | * | | | | Add changelog | Andrew Morgan | 2019-09-06 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Fix destructuring assumption bug | Andrew Morgan | 2019-09-06 | 2 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs | Andrew Morgan | 2020-02-25 | 2 | -5/+6 |
|\| | | | | |||||
| * | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs | Erik Johnston | 2019-09-06 | 2 | -5/+6 |
| |\ \ \ \ | | | | | | | | | | | | | Don't assume there is a 'self' arg in @trace decorator | ||||
| | * | | | | Update changelog | Erik Johnston | 2019-09-06 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Newsfile | Erik Johnston | 2019-09-06 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Don't assume there is a 'self' arg in @trace decorator | Erik Johnston | 2019-09-06 | 1 | -5/+5 |
| | | | | | | |||||
* | | | | | | Remove extraneous unittest.DEBUG's | Andrew Morgan | 2020-02-25 | 2 | -2/+0 |
| | | | | | | |||||
* | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵ | Andrew Morgan | 2020-02-25 | 29 | -305/+820 |
|\| | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987) | ||||
| * | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵ | Andrew Morgan | 2019-09-06 | 29 | -302/+820 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987) This is a combination of a few different PRs, finally all being merged into `develop`: * #5875 * #5876 * #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](https://github.com/matrix-org/synapse/commit/891afb57cbdf9867f2848341b29c75d6f35eef5a#diff-e591d42d30690ffb79f63bb726200891) in #5969. What's left is just giving /versions access to the config file, which could be useful in the future) * #5835 * #5969 * #5940 Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged. UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged. | ||||
* | | | | | Trace how long it takes for the send trasaction to complete, including ↵ | Andrew Morgan | 2020-02-25 | 4 | -38/+58 |
|\| | | | | | | | | | | | | | | | | | | | retrys (#5986) | ||||
| * | | | | Trace how long it takes for the send trasaction to complete, including ↵ | Jorik Schellekens | 2019-09-05 | 4 | -38/+58 |
| | | | | | | | | | | | | | | | | | | | | retrys (#5986) | ||||
* | | | | | Gracefully handle log context slips and missing opentracing import errors. ↵ | Andrew Morgan | 2020-02-25 | 2 | -24/+59 |
|\| | | | | | | | | | | | | | | | | | | | (#5988) | ||||
| * | | | | Gracefully handle log context slips and missing opentracing import errors. ↵ | Jorik Schellekens | 2019-09-05 | 2 | -24/+59 |
| | |/ / | |/| | | | | | | | | | | (#5988) | ||||
* | | | | Merge pull request #5984 from ↵ | Andrew Morgan | 2020-02-25 | 5 | -8/+16 |
|\| | | | | | | | | | | | | | | | matrix-org/joriks/opentracing_link_send_to_edu_contexts | ||||
| * | | | Merge pull request #5984 from ↵ | Erik Johnston | 2019-09-05 | 5 | -8/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | matrix-org/joriks/opentracing_link_send_to_edu_contexts Link the send loop with the edus contexts | ||||
| | * | | | use access methods (duh..) | Jorik Schellekens | 2019-09-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
| | * | | | Bugfix phrasing | Jorik Schellekens | 2019-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
| | * | | | Opentracing context cannot be none | Jorik Schellekens | 2019-09-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | newsfile | Jorik Schellekens | 2019-09-05 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Link the send loop with the edus contexts | Jorik Schellekens | 2019-09-05 | 3 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contexts were being filtered too early so the send loop wasn't being linked to them unless the destination was whitelisted. | ||||
* | | | | | Add opentracing to all client servlets (#5983) | Andrew Morgan | 2020-02-25 | 6 | -18/+26 |
|\| | | | | |||||
| * | | | | Add opentracing to all client servlets (#5983) | Jorik Schellekens | 2019-09-05 | 6 | -18/+26 |
| | | | | | |||||
* | | | | | Increase expected state events in tests for new room by one | Andrew Morgan | 2020-02-25 | 1 | -1/+6 |
| | | | | | |||||
* | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2020-02-25 | 4 | -47/+133 |
|\| | | | | |||||
| * | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2019-09-05 | 4 | -47/+132 |
| | | | | | |||||
* | | | | | Fix opentracing contexts missing from outbound replication requests (#5982) | Andrew Morgan | 2020-02-25 | 2 | -4/+17 |
|\| | | | | |||||
| * | | | | Fix opentracing contexts missing from outbound replication requests (#5982) | Jorik Schellekens | 2019-09-05 | 2 | -4/+17 |
| | | | | | |||||
* | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2020-02-25 | 3 | -1/+36 |
|\| | | | | |||||
| * | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2019-09-05 | 3 | -1/+36 |
| |/ / / | | | | | | | | | Implements `POST /_matrix/client/r0/account/3pid/unbind` from [MSC2140](https://github.com/matrix-org/matrix-doc/blob/dbkr/tos_2/proposals/2140-terms-of-service-2.md#post-_matrixclientr0account3pidunbind). | ||||
* | | | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2020-02-25 | 4 | -64/+10 |
|\| | | | |||||
| * | | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2019-09-04 | 4 | -64/+10 |
| | | | | | | | | | | | | Removes the `bind_email` and `bind_msisdn` parameters from the `/register` C/S API endpoint as per [MSC2140: Terms of Service for ISes and IMs](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R107). | ||||
* | | | | Cleanup event auth type initialisation (#5975) | Andrew Morgan | 2020-02-25 | 2 | -5/+6 |
|\| | | | |||||
| * | | | Cleanup event auth type initialisation (#5975) | Andrew Morgan | 2019-09-04 | 2 | -5/+6 |
| | | | | | | | | | | | | Very small code cleanup. | ||||
* | | | | Fix and refactor room and user stats (#5971) | Andrew Morgan | 2020-02-25 | 11 | -646/+1638 |
|\| | | | |||||
| * | | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 11 | -641/+1642 |
| | | | | | | | | | | | | Previously the stats were not being correctly populated. | ||||
| * | | | code cleanups | Andrew Morgan | 2019-09-03 | 1 | -7/+2 |
| | | | | |||||
* | | | | Ensure the list media admin API is always available (#5966) | Andrew Morgan | 2020-02-25 | 3 | -5/+7 |
|\| | | | |||||
| * | | | Ensure the list media admin API is always available (#5966) | Travis Ralston | 2019-09-03 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure the list media admin API is always available This API is required for some external media repo implementations to operate (mostly for doing quarantine operations on a room). * changelog | ||||
| * | | | Fix docstring | Andrew Morgan | 2019-09-03 | 1 | -2/+1 |
| | | | | |||||
| * | | | Remove unnecessary variable declaration | Andrew Morgan | 2019-09-03 | 1 | -1/+0 |
| | | | | |||||
* | | | | Docker packaging should not su-exec or chmod if already running as UID/GID ↵ | Andrew Morgan | 2020-02-25 | 2 | -35/+50 |
|\| | | | | | | | | | | | | | | | (#5970) | ||||
| * | | | Docker packaging should not su-exec or chmod if already running as UID/GID ↵ | Michael Kaye | 2019-09-03 | 2 | -35/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5970) Adjust su-exec to only be used if needed. If UID == getuid() and GID == getgid() then we do not need to su-exec, and chmod will not work. | ||||
* | | | | Ensure an auth instance is available to ListMediaInRoom (#5967) | Andrew Morgan | 2020-02-25 | 3 | -1/+3 |
|\| | | | |||||
| * | | | Ensure an auth instance is available to ListMediaInRoom (#5967) | Travis Ralston | 2019-09-03 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure an auth instance is available to ListMediaInRoom Fixes https://github.com/matrix-org/synapse/issues/5737 * Changelog | ||||
| * | | | fix typo | Matthew Hodgson | 2019-09-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove double return statements (#5962) | Andrew Morgan | 2020-02-25 | 15 | -20/+1 |
|\| | | | |||||
| * | | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 15 | -20/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully. | ||||
* | | | | Opentrace device lists (#5853) | Andrew Morgan | 2020-02-25 | 8 | -58/+118 |
|\| | | | |||||
| * | | | Opentrace device lists (#5853) | Jorik Schellekens | 2019-09-03 | 8 | -58/+118 |
| | | | | | | | | | | | | Trace device list changes. | ||||
* | | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2020-02-24 | 3 | -218/+2 |
|\| | | | |||||
| * | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2019-09-02 | 3 | -137/+2 |
| | | | | | | | | | | | | These methods were part of the v1 C/S API. Remove them as they are no longer used by any code paths. | ||||
* | | | | fix thumbnail storage location (#5915) | Andrew Morgan | 2020-02-24 | 2 | -1/+2 |
|\| | | | |||||
| * | | | fix thumbnail storage location (#5915) | L0ric0 | 2019-09-02 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix thumbnail storage location Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Add changelog file. Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Update Changelog Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> | ||||
* | | | | Update INSTALL.md to say that Python 2 is no longer supported (#5953) | Andrew Morgan | 2020-02-24 | 2 | -2/+3 |
|\| | | | |||||
| * | | | Update INSTALL.md to say that Python 2 is no longer supported (#5953) | Aaron Raimist | 2019-09-02 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
* | | | | Revert "Add m.id_access_token flag (#5930)" (#5945) | Andrew Morgan | 2020-02-24 | 2 | -7/+1 |
|\| | | | |||||
| * | | | Revert "Add m.id_access_token flag (#5930)" (#5945) | Andrew Morgan | 2019-08-30 | 2 | -7/+1 |
| | | | | | | | | | | | | This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58. | ||||
* | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2020-02-24 | 82 | -300/+289 |
|\| | | | |||||
| * | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 81 | -286/+287 |
| | | | | | | | | | | | | | | | | | | | | 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 :) | ||||
| * | | | Move buildkite config to the pipelines repo (#5943) | Amber Brown | 2019-08-31 | 3 | -310/+16 |
| | | | | |||||
| * | | | Add m.id_access_token flag (#5930) | Andrew Morgan | 2019-08-30 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927 | ||||
| * | | | Removed unused jenkins/ folder and script (#5938) | Amber Brown | 2019-08-30 | 2 | -16/+1 |
| | | | | |||||
| * | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937) | Andrew Morgan | 2019-08-30 | 4 | -166/+9 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 71fc04069a5770a204c3514e0237d7374df257a8. This broke 3PID invites as #5892 was required for it to work correctly. | ||||
| * | | | Fix buildkite pipeline plugin matrix-org/annotate using the wrong variable ↵ | Amber Brown | 2019-08-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | config | ||||
* | | | | Move buildkite config to the pipelines repo (#5943) | Amber Brown | 2020-02-24 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | Note: I kept it in the repo for now ~anoa | ||||
* | | | | Add m.id_access_token flag (#5930) | Andrew Morgan | 2020-02-24 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927 | ||||
* | | | | Removed unused jenkins/ folder and script (#5938) | Amber Brown | 2020-02-24 | 2 | -16/+1 |
| | | | | |||||
* | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" | Andrew Morgan | 2020-02-24 | 10 | -320/+183 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456. | ||||
* | | | | Fix coverage in sytest and use plugins for buildkite (#5922) | Andrew Morgan | 2020-02-24 | 8 | -32/+92 |
|\| | | | |||||
| * | | | Fix coverage in sytest and use plugins for buildkite (#5922) | Amber Brown | 2019-08-29 | 8 | -32/+92 |
| |/ / | |||||
* | | | Add a link to python's logging config schema (#5926) | Andrew Morgan | 2020-02-24 | 3 | -2/+5 |
|\| | | |||||
| * | | Add a link to python's logging config schema (#5926) | Jorik Schellekens | 2019-08-28 | 3 | -2/+5 |
| | | | |||||
* | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Andrew Morgan | 2020-02-24 | 5 | -2/+9 |
|\| | | |||||
| * | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 5 | -2/+9 |
| |\ \ | | | | | | | | | Exempt support users from consent | ||||
| | * | | Removing entry for 5903 | Will Hunt | 2019-08-28 | 1 | -1/+0 |
| | | | | |||||
| | * | | Apply suggestions from code review | Will Hunt | 2019-08-23 | 1 | -2/+2 |
| | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
| | * | | Update changelog | Half-Shot | 2019-08-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Exempt bot users | Half-Shot | 2019-08-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent | Half-Shot | 2019-08-23 | 2 | -1/+3 |
| | |\ \ | |||||
| | | * | | Add changelog | Half-Shot | 2019-08-23 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Add bot type | Half-Shot | 2019-08-23 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Fix registration test | Half-Shot | 2019-08-23 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | newsfile 5902 | Half-Shot | 2019-08-23 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Ignore consent for support users | Half-Shot | 2019-08-23 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Return user_type in get_user_by_id | Half-Shot | 2019-08-23 | 1 | -1/+4 |
| | |/ / | |||||
* | | | | Let synctl use a config directory. (#5904) | Andrew Morgan | 2020-02-24 | 3 | -6/+15 |
|\| | | | |||||
| * | | | Let synctl use a config directory. (#5904) | Jorik Schellekens | 2019-08-28 | 3 | -6/+15 |
| | | | | | | | | | | | | * Let synctl use a config directory. | ||||
* | | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2020-02-24 | 10 | -183/+320 |
|\| | | | |||||
| * | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2019-08-28 | 4 | -9/+166 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/5861 Adds support for the v2 lookup API as defined in [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134). Currently this is only used for 3PID invites. Sytest PR: https://github.com/matrix-org/sytest/pull/679 | ||||
* | | | | Config templating (#5900) | Andrew Morgan | 2020-02-21 | 9 | -46/+366 |
|\| | | | |||||
| * | | | Config templating (#5900) | Jorik Schellekens | 2019-08-28 | 9 | -46/+366 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | Andrew Morgan | 2020-02-21 | 31 | -81/+1328 |
|\| | | | |||||
| * | | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 31 | -82/+1328 |
| | | | | |||||
* | | | | Fix a cache-invalidation bug for worker-based deployments (#5920) | Andrew Morgan | 2020-02-21 | 2 | -8/+17 |
|\| | | | |||||
| * | | | Fix a cache-invalidation bug for worker-based deployments (#5920) | Richard van der Hoff | 2019-08-28 | 2 | -8/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the caches on worker processes were not being correctly invalidated when a room's state was changed in a way that did not affect the membership list of the room. We need to make sure we send out cache invalidations even when no memberships are changing. | ||||
* | | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | Andrew Morgan | 2020-02-21 | 5 | -9/+62 |
|\| | | | |||||
| * | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | reivilibre | 2019-08-28 | 5 | -9/+62 |
| |\ \ \ | | | | | | | | | | | Add GET method to admin API /users/@user:dom/admin | ||||
| | * | | | Document GET method for retrieving admin bit of user in admin API | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
| | * | | | Add GET method to admin API /users/@user:dom/admin | Olivier Wilkinson (reivilibre) | 2019-08-27 | 4 | -9/+43 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
* | | | | | Typographical corrections in docker/README (#5921) | Andrew Morgan | 2020-02-21 | 1 | -5/+5 |
|\| | | | | |||||
| * | | | | Typographical corrections in docker/README (#5921) | Victor Goff | 2019-08-28 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | Andrew Morgan | 2020-02-21 | 4 | -16/+96 |
|\| | | | | |||||
| * | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | reivilibre | 2019-08-28 | 4 | -16/+96 |
| |\ \ \ \ | | | | | | | | | | | | | MSC2197 Search Filters over Federation | ||||
| | * | | | | Newsfile on one line | Olivier Wilkinson (reivilibre) | 2019-08-20 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
| | * | | | | Use MSC2197 on stable prefix as it has almost finished FCP | Olivier Wilkinson (reivilibre) | 2019-08-20 | 2 | -26/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
| | * | | | | Newsfile | Olivier Wilkinson (reivilibre) | 2019-08-15 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
| | * | | | | Add support for inbound MSC2197 requests on unstable Federation API | Olivier Wilkinson (reivilibre) | 2019-08-15 | 1 | -1/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
| | * | | | | Support MSC2197 outbound with unstable prefix | Olivier Wilkinson (reivilibre) | 2019-08-15 | 2 | -16/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
* | | | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookups | Andrew Morgan | 2020-02-21 | 7 | -215/+283 |
|\| | | | | | |||||
| * | | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookups | Erik Johnston | 2019-08-27 | 7 | -215/+283 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Refactor MatrixFederationAgent to retry SRV. | ||||
| | * | | | | | Fix off by one error in SRV result shuffling | Erik Johnston | 2019-08-27 | 1 | -8/+13 |
| | | | | | | | |||||
| | * | | | | | Fixup comments | Erik Johnston | 2019-08-23 | 1 | -1/+9 |
| | | | | | | | |||||
| | * | | | | | Fix logcontexts | Erik Johnston | 2019-08-23 | 1 | -4/+8 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-08-22 | 47 | -284/+850 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | erikj/reliable_lookups | ||||
| | * | | | | | | Make changelog entry be a feature | Erik Johnston | 2019-08-20 | 1 | -0/+0 |
| | | | | | | | | |||||
| | * | | | | | | Remove now unused pick_server_from_list | Erik Johnston | 2019-08-20 | 1 | -30/+0 |
| | | | | | | | | |||||
| | * | | | | | | Fixup _sort_server_list to be slightly more efficient | Erik Johnston | 2019-08-20 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also document that we are using the algorithm described in RFC2782 and ensure we handle zero weight correctly. | ||||
| | * | | | | | | Remove test debugs | Erik Johnston | 2019-08-20 | 3 | -3/+0 |
| | | | | | | | | |||||
| | * | | | | | | Newsfile | Erik Johnston | 2019-08-15 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Refactor MatrixFederationAgent to retry SRV. | Erik Johnston | 2019-08-15 | 4 | -194/+268 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | | | Allow schema deltas to be engine-specific (#5911) | Andrew Morgan | 2020-02-21 | 2 | -5/+20 |
|\| | | | | | | | |||||
| * | | | | | | | Allow schema deltas to be engine-specific (#5911) | reivilibre | 2019-08-27 | 2 | -5/+20 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow schema deltas to be engine-specific Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Code style (Black) Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
| | * | | | | | | | Code style (Black) | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
| | * | | | | | | | Newsfile | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
| | * | | | | | | | Allow schema deltas to be engine-specific | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -5/+21 |
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
* | | | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit | Andrew Morgan | 2020-02-21 | 2 | -1/+2 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit | Richard van der Hoff | 2019-08-27 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Increase profile display name limit | ||||
| | * | | | | | | | Increase max display name limit | Neil Johnson | 2019-08-24 | 2 | -1/+2 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge pull request #5895 from matrix-org/erikj/notary_key | Andrew Morgan | 2020-02-21 | 6 | -27/+57 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #5895 from matrix-org/erikj/notary_key | Erik Johnston | 2019-08-27 | 5 | -26/+56 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add config option to sign remote key query responses with a separate key. | ||||
| | * | | | | | | | Don't implicitly include server signing key | Erik Johnston | 2019-08-23 | 1 | -7/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixup review comments | Erik Johnston | 2019-08-23 | 3 | -6/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Newsfile | Erik Johnston | 2019-08-21 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Only sign when we respond to remote key requests | Erik Johnston | 2019-08-21 | 2 | -23/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Add config option for keys to use to sign keys | Erik Johnston | 2019-08-21 | 3 | -9/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows servers to separate keys that are used to sign remote keys when acting as a notary server. | ||||
| * | | | | | | | | Update 5909.misc | Richard van der Hoff | 2019-08-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #5909 from aaronraimist/public_base_url | Andrew Morgan | 2020-02-21 | 3 | -2/+3 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #5909 from aaronraimist/public_base_url | Richard van der Hoff | 2019-08-27 | 3 | -2/+3 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | public_base_url is actually public_baseurl | ||||
| | * | | | | | | | Add changelog | Aaron Raimist | 2019-08-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| | * | | | | | | | public_base_url is actually public_baseurl | Aaron Raimist | 2019-08-26 | 2 | -2/+2 |
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
* | | | | | | | | Add Admin API capability to set adminship of a user (#5878) | Andrew Morgan | 2020-02-21 | 6 | -0/+132 |
|\| | | | | | | | |||||
| * | | | | | | | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 6 | -0/+132 |
| |/ / / / / / | | | | | | | | | | | | | | | Admin API: Set adminship of a user | ||||
* | | | | | | | Propagate opentracing contexts through EDUs (#5852) | Andrew Morgan | 2020-02-21 | 9 | -94/+234 |
|\| | | | | | | |||||
| * | | | | | | Propagate opentracing contexts through EDUs (#5852) | Jorik Schellekens | 2019-08-22 | 9 | -94/+234 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate opentracing contexts through EDUs Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
* | | | | | | | Merge pull request #5877 from ↵ | Andrew Morgan | 2020-02-21 | 3 | -51/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration | ||||
| * | | | | | | Merge pull request #5877 from ↵ | Richard van der Hoff | 2019-08-22 | 2 | -53/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration Remove shared secret registration | ||||
| | * | | | | | | Remove shared secret registration from client/r0/register endpoint | Manuel Stahl | 2019-08-22 | 2 | -53/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This type of registration was probably never used. It only includes the user name in the HMAC but not the password. Shared secret registration is still available via client/r0/admin/register. Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de> | ||||
* | | | | | | | | Opentracing across workers (#5771) | Andrew Morgan | 2020-02-21 | 5 | -83/+123 |
|\| | | | | | | | |||||
| * | | | | | | | Opentracing across workers (#5771) | Jorik Schellekens | 2019-08-22 | 5 | -83/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate opentracing contexts across workers Also includes some Convenience modifications to opentracing for servlets, notably: - Add boolean to skip the whitelisting check on inject extract methods. - useful when injecting into carriers locally. Otherwise we'd always have to include our own servername and whitelist our servername - start_active_span_from_request instead of header - Add boolean to decide whether to extract context from a request to a servlet | ||||
| * | | | | | | | Revert "Do not send consent notices if "no-consent-required" is set" | Brendan Abolivier | 2019-08-22 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 27a686e53b8ba3f2e2f102fae73e598c00ec0086. |