summary refs log tree commit diff
path: root/tests (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '3f58fc848' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-11/+176
|\
| * Handle additional errors when previewing URLs. (#9333)Patrick Cloke2021-02-081-11/+92
| | | | | | | | * Handle the case of lxml not finding a document tree. * Parse the document encoding from the XML tag.
| * Merge pull request #9150 from Yoric/develop-contextDavid Teller2021-02-081-0/+84
| |\ | | | | | | New API /_synapse/admin/rooms/{roomId}/context/{eventId}
| | * FIXUP: linterDavid Teller2021-01-281-1/+3
| | |
| | * FIXUP: Now testing that the user is admin!David Teller2021-01-281-1/+35
| | |
| | * New API /_synapse/admin/rooms/{roomId}/context/{eventId}David Teller2021-01-281-0/+48
| | | | | | | | | | | | Signed-off-by: David Teller <davidt@element.io>
* | | Merge commit '5a9cdaa6e' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-2/+49
|\| |
| * | Merge branch 'erikj/media_spam_checker' into developErik Johnston2021-02-041-0/+94
| |\ \
| * | | Handle empty rooms when generating email notifications. (#9257)Patrick Cloke2021-02-041-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | Fixes some exceptions if the room state isn't quite as expected. If the expected state events aren't found, try to find them in the historical room state. If they still aren't found, fallback to a reasonable, although ugly, value.
* | | | Merge commit '7e8083eb4' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-0/+94
|\ \ \ \ | | |/ / | |/| |
| * | | Add check_media_file_for_spam spam checker hookErik Johnston2021-02-041-0/+94
| | | |
* | | | Merge commit '2ab6e67ab' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-48/+60
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'social_login_hotfixes' into developRichard van der Hoff2021-02-031-4/+12
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/release-v1.27.0' into social_login_hotfixesRichard van der Hoff2021-02-031-47/+0
| | |\| |
| * | | | Convert blacklisted IPv4 addresses to compatible IPv6 addresses. (#9240)Patrick Cloke2021-02-031-1/+60
| | |/ / | |/| | | | | | Also add a few more IP ranges to the default blacklist.
| * | | Honour ratelimit flag for application services for invite ratelimiting (#9302)Erik Johnston2021-02-031-47/+0
| | | |
* | | | Merge commit 'e288499c6' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-4/+12
|\ \ \ \ | | |/ / | |/| |
| * | | Social login UI polish (#9301)Richard van der Hoff2021-02-031-4/+12
| |/ /
* | | Merge commit '261093072' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-9/+51
|\| |
| * | Add an admin API to get the current room state (#9168)Travis Ralston2021-02-021-0/+15
| | | | | | | | | | | | | | | This could arguably replace the existing admin API for `/members`, however that is out of scope of this change. This sort of endpoint is ideal for moderation use cases as well as other applications, such as needing to retrieve various bits of information about a room to perform a task (like syncing power levels between two places). This endpoint exposes nothing more than an admin would be able to access with a `select *` query on their database.
| * | Put OIDC callback URI under /_synapse/client. (#9288)Richard van der Hoff2021-02-011-9/+6
| | |
| * | Refactor email summary generation. (#9260)Patrick Cloke2021-02-011-0/+30
| | | | | | | | | | | | | | | | | | * Fixes a case where no summary text was returned. * The use of messages_from_person vs. messages_from_person_and_others was tweaked to depend on whether there was 1 sender or multiple senders, not based on if there was 1 room or multiple rooms.
* | | Up invite ratelimiting for testsAndrew Morgan2021-04-221-0/+4
| | |
* | | Merge commit '18ab35284' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-226-22/+151
|\| |
| * | Merge branch 'social_login' into developRichard van der Hoff2021-02-015-36/+40
| |\ \
| | * | Replace username picker with a template (#9275)Richard van der Hoff2021-02-011-3/+2
| | | | | | | | | | | | | | | | | | | | There's some prelimiary work here to pull out the construction of a jinja environment to a separate function. I wanted to load the template at display time rather than load time, so that it's easy to update on the fly. Honestly, I think we should do this with all our templates: the risk of ending up with malformed templates is far outweighed by the improved turnaround time for an admin trying to update them.
| | * | Improve styling and wording of SSO redirect confirm template (#9272)Richard van der Hoff2021-02-013-18/+22
| | | |
| * | | Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-292-1/+127
| | | |
* | | | Merge commit '9c715a5f1' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-15/+16
|\ \ \ \ | | |/ / | |/| |
| * | | Fix SSO on workers (#9271)Richard van der Hoff2021-02-012-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8966. * Factor out build_synapse_client_resource_tree Start a function which will mount resources common to all workers. * Move sso init into build_synapse_client_resource_tree ... so that we don't have to do it for each worker * Fix SSO-login-via-a-worker Expose the SSO login endpoints on workers, like the documentation says. * Update workers config for new endpoints Add documentation for endpoints recently added (#8942, #9017, #9262) * remove submit_token from workers endpoints list this *doesn't* work on workers (yet). * changelog * Add a comment about the odd path for SAML2Resource
| * | | Split out a separate endpoint to complete SSO registration (#9262)Richard van der Hoff2021-02-011-1/+13
| | | | | | | | | | | | There are going to be a couple of paths to get to the final step of SSO reg, and I want the URL in the browser to consistent. So, let's move the final step onto a separate path, which we redirect to.
* | | | Merge commit 'e19396d62' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-224-8/+97
|\ \ \ \ | | |/ / | |/| |
| * | | Ratelimit 3PID /requestToken API (#9238)Erik Johnston2021-01-284-8/+97
| | |/ | |/|
* | | Merge commit '2e537a028' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-2/+93
|\| |
| * | Merge branch 'social_login' into developRichard van der Hoff2021-01-272-2/+93
| |\|
| | * Implement MSC2858 support (#9183)Richard van der Hoff2021-01-272-2/+93
| | | | | | | | | Fixes #8928.
* | | Merge commit '1baab2035' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-16/+54
|\| |
| * | Precompute joined hosts and store in Redis (#9198)Erik Johnston2021-01-261-16/+25
| | |
| * | Try to recover from unknown encodings when previewing media. (#9164)Patrick Cloke2021-01-261-0/+29
| | | | | | | | | | | | | | | | | | Treat unknown encodings (according to lxml) as UTF-8 when generating a preview for HTML documents. This isn't fully accurate, but will hopefully give a reasonable title and summary.
* | | Merge commit 'cee4010f9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-6/+66
|\| |
| * | Add an admin API for shadow-banning users. (#9209)Patrick Cloke2021-01-252-6/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This expands the current shadow-banning feature to be usable via the admin API and adds documentation for it. A shadow-banned users receives successful responses to their client-server API requests, but the events are not propagated into rooms. Shadow-banning a user should be used as a tool of last resort and may lead to confusing or broken behaviour for the client.
* | | Merge commit 'fdf834694' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-2/+254
|\| |
| * | Merge tag 'v1.26.0rc2' into developPatrick Cloke2021-01-251-0/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.26.0rc2 (2021-01-25) ============================== Bugfixes -------- - Fix receipts and account data not being sent down sync. Introduced in v1.26.0rc1. ([\#9193](https://github.com/matrix-org/synapse/issues/9193), [\#9195](https://github.com/matrix-org/synapse/issues/9195)) - Fix chain cover update to handle events with duplicate auth events. Introduced in v1.26.0rc1. ([\#9210](https://github.com/matrix-org/synapse/issues/9210)) Internal Changes ---------------- - Add an `oidc-` prefix to any `idp_id`s which are given in the `oidc_providers` configuration. ([\#9189](https://github.com/matrix-org/synapse/issues/9189)) - Bump minimum `psycopg2` version to v2.8. ([\#9204](https://github.com/matrix-org/synapse/issues/9204))
| * | Handle missing content keys when calculating presentable names. (#9165)Patrick Cloke2021-01-252-1/+230
| | | | | | | | | | | | Treat the content as untrusted and do not assume it is of the proper form.
| * | Return a 404 if no valid thumbnail is found. (#9163)Patrick Cloke2021-01-211-1/+24
| | | | | | | | | | | | | | | | | | If no thumbnail of the requested type exists, return a 404 instead of erroring. This doesn't quite match the spec (which does not define what happens if no thumbnail can be found), but is consistent with what Synapse already does.
* | | Merge commit 'a01605c13' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-0/+12
|\ \ \ | | |/ | |/|
| * | Fix chain cover update to handle events with duplicate auth events (#9210)Erik Johnston2021-01-221-0/+12
| | |
* | | Merge commit '939ef657c' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-27/+196
|\ \ \ | | |/ | |/|
| * | Add tests for List Users Admin API (#9045)Dirk Klimpel2021-01-211-27/+196
| |/
* | Merge commit '42a8e8137' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-1/+1
|\|
| * Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-211-1/+1
| | | | | | ... to avoid clashes with other SSO mechanisms
* | Merge commit '0cd2938bc' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-1/+1
|\|
| * Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-201-1/+1
| |
* | Merge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-10/+0
|\|
| * Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-202-10/+0
| |
* | Merge commit '73b03722f' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-6/+106
|\|
| * Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-181-6/+106
| |
* | Merge commit '2b467d0b6' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-226-114/+370
|\|
| * Fix bugs in handling clientRedirectUrl, and improve OIDC tests (#9127, #9128)Richard van der Hoff2021-01-184-82/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Factor out a common TestHtmlParser Looks like I'm doing this in a few different places. * Improve OIDC login test Complete the OIDC login flow, rather than giving up halfway through. * Ensure that OIDC login works with multiple OIDC providers * Fix bugs in handling clientRedirectUrl - don't drop duplicate query-params, or params with no value - allow utf-8 in query-params
| * Fix test failure due to bad mergeRichard van der Hoff2021-01-151-1/+3
| | | | | | | | | | | | | | 0dd2649c1 (#9112) changed the signature of `auth_via_oidc`. Meanwhile, 26d10331e (#9091) introduced a new test which relied on the old signature of `auth_via_oidc`. The two branches were never tested together until they landed in develop.
| * Make chain cover index bg update go faster (#9124)Erik Johnston2021-01-151-31/+186
| | | | | | | | | | | | We do this by allowing a single iteration to process multiple rooms at a time, as there are often a lot of really tiny rooms, which can massively slow things down.
* | Merge commit '9de6b9411' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-3/+3
|\|
| * Land support for multiple OIDC providers (#9110)Richard van der Hoff2021-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the final step for supporting multiple OIDC providers concurrently. First of all, we reorganise the config so that you can specify a list of OIDC providers, instead of a single one. Before: oidc_config: enabled: true issuer: "https://oidc_provider" # etc After: oidc_providers: - idp_id: prov1 issuer: "https://oidc_provider" - idp_id: prov2 issuer: "https://another_oidc_provider" The old format is still grandfathered in. With that done, it's then simply a matter of having OidcHandler instantiate a new OidcProvider for each configured provider.
* | Merge commit '3e4cdfe5d' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-5/+108
|\|
| * Add an admin API endpoint to protect media. (#9086)Patrick Cloke2021-01-151-3/+5
| | | | | | | | | | | | Protecting media stops it from being quarantined when e.g. all media in a room is quarantined. This is useful for sticker packs and other media that is uploaded by server administrators, but used by many people.
| * Avoid raising the body exceeded error multiple times. (#9108)Patrick Cloke2021-01-152-2/+103
| | | | | | | | | | Previously this code generated unreferenced `Deferred` instances which caused "Unhandled Deferreds" errors to appear in error situations.
* | Merge commit 'd34c6e127' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-224-126/+115
|\|
| * Improve UsernamePickerTestCase (#9112)Richard van der Hoff2021-01-154-125/+113
| | | | | | | | | | * make the OIDC bits of the test work at a higher level - via the REST api instead of poking the OIDCHandler directly. * Move it to test_login.py, where I think it fits better.
| * Store an IdP ID in the OIDC session (#9109)Richard van der Hoff2021-01-151-1/+2
| | | | | | | | | | Again in preparation for handling more than one OIDC provider, add a new caveat to the macaroon used as an OIDC session cookie, which remembers which OIDC provider we are talking to. In future, when we get a callback, we'll need it to make sure we talk to the right IdP. As part of this, I'm adding an idp_id and idp_name field to the OIDC configuration object. They aren't yet documented, and we'll just use the old values by default.
* | Merge commit '20af31088' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-0/+35
|\|
| * Merge pull request #9091 from matrix-org/rav/error_on_bad_ssoRichard van der Hoff2021-01-151-0/+27
| |\ | | | | | | Give the user a better error when they present bad SSO creds
| | * Add a test for wrong user returned by SSORichard van der Hoff2021-01-131-0/+27
| | |
| * | Fix event chain bg update. (#9118)Erik Johnston2021-01-141-0/+8
| | | | | | | | | | | | We passed in a graph to `sorted_topologically` which didn't have an entry for each node (as we dropped nodes with no edges).
* | | Merge commit '631dd06f2' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-45/+162
|\| |
| * | Add background update for add chain cover index (#9029)Erik Johnston2021-01-141-0/+114
| | |
| * | Split OidcProvider out of OidcHandler (#9107)Richard van der Hoff2021-01-141-45/+48
| |/ | | | | | | | | | | | | The idea here is that we will have an instance of OidcProvider for each configured IdP, with OidcHandler just doing the marshalling of them. For now it's still hardcoded with a single provider.
* | Merge commit '233c8b9fc' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-42/+226
|\|
| * Add a test for UI-Auth-via-SSO (#9082)Richard van der Hoff2021-01-133-42/+226
| | | | | | | | | | * Add complete test for UI-Auth-via-SSO. * review comments
* | Merge commit '98a64b7f7' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2219-170/+1135
|\|
| * Add basic domain validation for `DomainSpecificString.is_valid`. (#9071)Patrick Cloke2021-01-131-0/+4
| | | | | | | | | | This checks that the domain given to `DomainSpecificString.is_valid` (e.g. `UserID`, `RoomAlias`, etc.) is of a valid form. Previously some validation was done on the localpart (e.g. the sigil), but not the domain portion.
| * Merge branch 'master' into developErik Johnston2021-01-131-0/+130
| |\
| * | Preparatory refactors of OidcHandler (#9067)Richard van der Hoff2021-01-131-24/+37
| | | | | | | | | | | | | | | | | | | | | | | | Some light refactoring of OidcHandler, in preparation for bigger things: * remove inheritance from deprecated BaseHandler * add an object to hold the things that go into a session cookie * factor out a separate class for manipulating said cookies
| * | Remove user's avatar URL and displayname when deactivated. (#8932)Dirk Klimpel2021-01-125-3/+284
| | | | | | | | | This only applies if the user's data is to be erased.
| * | Handle bad JSON data being returned from the federation API. (#9070)Patrick Cloke2021-01-121-1/+1
| | |
| * | Remove SynapseRequest.get_user_agent (#9069)Richard van der Hoff2021-01-123-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SynapseRequest is in danger of becoming a bit of a dumping-ground for "useful stuff relating to Requests", which isn't really its intention (its purpose is to override render, finished and connectionLost to set up the LoggingContext and write the right entries to the request log). Putting utility functions inside SynapseRequest means that lots of our code ends up requiring a SynapseRequest when there is nothing synapse-specific about the Request at all, and any old twisted.web.iweb.IRequest will do. This increases code coupling and makes testing more difficult. In short: move get_user_agent out to a utility function.
| * | Also support remote users on the joined_rooms admin API. (#8948)David Teller2021-01-111-6/+52
| | | | | | | | | | | | For remote users, only the rooms which the server knows about are returned. Local users have all of their joined rooms returned.
| * | Removes unnecessary declarations in the tests for the admin API. (#9063)Dirk Klimpel2021-01-116-17/+0
| | |
| * | Use a chain cover index to efficiently calculate auth chain difference (#8868)Erik Johnston2021-01-113-25/+737
| | |
* | | Merge commit '3dd6ba135' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-211-0/+128
|\ \ \ | | |/ | |/|
| * | Don't apply the IP range blacklist to proxy connections (#9084)Marcus2021-01-121-0/+130
| | | | | | | | | | | | | | | It is expected that the proxy would be on a private IP address so the configured proxy should be connected to regardless of the IP range blacklist.
* | | Merge commit 'a03d71dc9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-213-36/+302
|\ \ \ | | |/ | |/|
| * | Merge pull request #9036 from matrix-org/rav/multi_idp/testsRichard van der Hoff2021-01-082-36/+249
| |\ \ | | | | | | | | Add tests for the IdP picker
| | * | Add some tests for the IDP picker flowRichard van der Hoff2021-01-072-3/+191
| | | |
| | * | Fix type hints in test_login.pyRichard van der Hoff2021-01-071-24/+54
| | | |
| | * | black-format tests/rest/client/v1/test_login.pyRichard van der Hoff2021-01-071-11/+6
| | | | | | | | | | | | | | | | | | | | black seems to want to reformat this, despite `black --check` being happy with it :/
| * | | Fix validate_config on nested objects (#9054)Richard van der Hoff2021-01-081-0/+53
| | | |
* | | | Merge commit '23d701864' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-218-36/+259
|\| | |
| * | | Improve the performance of calculating ignored users in large rooms (#9024)Patrick Cloke2021-01-071-0/+120
| |/ / | | | | | | | | | | | | | | | This allows for efficiently finding which users ignore a particular user. Co-authored-by: Erik Johnston <erik@matrix.org>
| * | Skip unit tests which require optional dependencies (#9031)Richard van der Hoff2021-01-076-13/+89
| | | | | | | | | If we are lacking an optional dependency, skip the tests that rely on it.
| * | Empty iterables should count towards cache usage. (#9028)Patrick Cloke2021-01-061-23/+50
| | |
* | | Merge commit '0312266ee' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-22/+165
|\| |
| * | Implement MSC2176: Updated redaction rules (#8984)Patrick Cloke2021-01-051-21/+164
| | | | | | | | | | | | An experimental room version ("org.matrix.msc2176") contains the new redaction rules for testing.
| * | Combine the SSO Redirect Servlets (#9015)Richard van der Hoff2021-01-041-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement CasHandler.handle_redirect_request ... to make it match OidcHandler and SamlHandler * Clean up interface for OidcHandler.handle_redirect_request Make it accept `client_redirect_url=None`. * Clean up interface for `SamlHandler.handle_redirect_request` ... bring it into line with CAS and OIDC by making it take a Request parameter, move the magic for `client_redirect_url` for UIA into the handler, and fix the return type to be a `str` rather than a `bytes`. * Define a common protocol for SSO auth provider impls * Give SsoIdentityProvider an ID and register them * Combine the SSO Redirect servlets Now that the SsoHandler knows about the identity providers, we can combine the various *RedirectServlets into a single implementation which delegates to the right IdP. * changelog
* | Merge commit '1c9a85056' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-214-26/+144
|\|
| * Add type hints to the crypto module. (#8999)Patrick Cloke2021-01-041-5/+5
| |
| * Use the SSO handler helpers for CAS registration/login. (#8856)Patrick Cloke2021-01-031-0/+121
| |
| * Fix RoomDirectoryFederationTests and make them actually run (#8998)Andrew Morgan2020-12-302-21/+18
| | | | | | | | | | | | | | | | | | | | The `RoomDirectoryFederationTests` tests were not being run unless explicitly called as an `__init__.py` file was not present in `tests/federation/transport/`. Thus the folder was not a python module, and `trial` did not look inside for any test cases to run. This was found while working on #6739. This PR adds a `__init__.py` and also fixes the test in a couple ways: - Switch to subclassing `unittest.FederatingHomeserverTestCase` instead, which sets up federation endpoints for us. - Supply a `federation_auth_origin` to `make_request` in order to more act like the request is coming from another server, instead of just an unauthenicated client requesting a federation endpoint. I found that the second point makes no difference to the test passing, but felt like the right thing to do if we're testing over federation.
* | Merge commit '9999eb2d0' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-211-1/+0
|\|
| * Drop the unused local_invites table. (#8979)Patrick Cloke2020-12-291-1/+0
| | | | | | This table has been unused since Synapse v1.17.0.
| * Support PyJWT v2.0.0. (#8986)Patrick Cloke2020-12-221-4/+12
| | | | | | | | Tests were broken due to an API changing. The code used in Synapse proper should be compatible with both versions already.
* | Merge commit '4218473f9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-1/+194
|\|
| * Allow server admin to get admin bit in rooms where local user is an admin ↵Erik Johnston2020-12-181-0/+138
| | | | | | | | | | | | | | (#8756) This adds an admin API that allows a server admin to get power in a room if a local user has power in a room. Will also invite the user if they're not in the room and its a private room. Can specify another user (rather than the admin user) to be granted power. Co-authored-by: Matthew Hodgson <matthew@matrix.org>
| * Fix mainline ordering in state res v2 (#8971)Erik Johnston2020-12-181-1/+56
| | | | | | | | | | | | This had two effects 1) it'd give the wrong answer and b) would iterate *all* power levels in the auth chain of each event. The latter of which can be *very* expensive for certain types of IRC bridge rooms that have large numbers of power level changes.
* | Merge commit '28877fade' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-213-33/+212
|\|
| * Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-182-2/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The final part (for now) of my work to implement a username picker in synapse itself. The idea is that we allow `UsernameMappingProvider`s to return `localpart=None`, in which case, rather than redirecting the browser back to the client, we redirect to a username-picker resource, which allows the user to enter a username. We *then* complete the SSO flow (including doing the client permission checks). The static resources for the username picker itself (in https://github.com/matrix-org/synapse/tree/rav/username_picker/synapse/res/username_picker) are essentially lifted wholesale from https://github.com/matrix-org/matrix-synapse-saml-mozilla/tree/master/matrix_synapse_saml_mozilla/res. As the comment says, we might want to think about making them customisable, but that can be a follow-up. Fixes #8876.
| * Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-181-31/+63
| |
* | Merge commit 'a7a913918' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-202-2/+378
|\|
| * Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-181-2/+44
| |\
| | * Update tests/test_mau.pyErik Johnston2020-12-171-1/+2
| | | | | | | | | Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * Correctly handle AS registerations and add testErik Johnston2020-12-171-2/+43
| | |
| * | Try and drop stale extremities. (#8929)Erik Johnston2020-12-181-0/+334
| | | | | | | | | | | | If we see stale extremities while persisting events, and notice that they don't change the result of state resolution, we drop them.
* | | Merge commit 'c9c1c9d82' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-205-5/+221
|\| |
| * | Fix `UsersListTestCase` (#8964)Richard van der Hoff2020-12-171-6/+4
| | |
| * | Use the simple dictionary in full text search for the user directory (#8959)Brendan Abolivier2020-12-171-0/+23
| | | | | | | | | | | | | | | * Use the simple dictionary in fts for the user directory * Clarify naming
| * | Fix a bug that deactivated users appear in the directory (#8933)Dirk Klimpel2020-12-172-2/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug that deactivated users appear in the directory when their profile information was updated. To change profile information of deactivated users is neccesary for example you will remove displayname or avatar. But they should not appear in directory. They are deactivated. Co-authored-by: Erik Johnston <erikj@jki.re>
| * | Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-173-3/+112
| | |
* | | Merge commit 'ff5c4da12' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-202-4/+31
|\| |
| * | Add a maximum size for well-known lookups. (#8950)Patrick Cloke2020-12-161-0/+27
| | |
| * | Push login completion down into SsoHandler (#8941)Richard van der Hoff2020-12-161-4/+4
| | | | | | | | | This is another part of my work towards fixing #8876. It moves some of the logic currently in the SAML and OIDC handlers - in particular the call to `AuthHandler.complete_sso_login` down into the `SsoHandler`.
* | | Fix old-style uses of self.make_request in dinum test codeAndrew Morgan2021-04-168-73/+43
| | |
* | | Merge commit 'bd30cfe86' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-1660-1036/+783
|\| |
| * | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-163-9/+9
| | | | | | | | | This improves type hinting and should use less memory.
| * | Merge pull request #8951 from matrix-org/rav/username_picker_2Richard van der Hoff2020-12-162-82/+105
| |\ \ | | | | | | | | More preparatory refactoring of the OidcHandler tests
| * | | lintRichard van der Hoff2020-12-155-7/+3
| | | |
| * | | Remove spurious "SynapseRequest" result from `make_request"Richard van der Hoff2020-12-1559-983/+742
| | | | | | | | | | | | | | | | This was never used, so let's get rid of it.
| * | | Remove redundant reading of SynapseRequest.argsRichard van der Hoff2020-12-151-9/+1
| | | | | | | | | | | | | | | | this didn't seem to be doing a lot, so remove it.
| * | | Skip redundant check on `request.args`Richard van der Hoff2020-12-151-2/+1
| | | |
| * | | remove 'response' result from `_get_shared_rooms`Richard van der Hoff2020-12-151-8/+9
| | | |
| * | | Replace `request.code` with `channel.code`Richard van der Hoff2020-12-158-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | The two are equivalent, but really we want to check the HTTP result that got returned to the channel, not the code that the Request object *intended* to return to the channel.
* | | | Merge commit '8388a7fb3' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-162-82/+105
|\ \ \ \ | | |/ / | |/| |
| * | | Make `_make_callback_with_userinfo` asyncRichard van der Hoff2020-12-151-68/+83
| | | | | | | | | | | | | | | | | | | | | | | | ... so that we can test its behaviour when it raises. Also pull it out to the top level so that I can use it from other test classes.
| * | | Remove spurious mocking of complete_sso_loginRichard van der Hoff2020-12-151-2/+0
| | | | | | | | | | | | | | | | The tests that need this all do it already.
| * | | Test `get_extra_attributes` fallbackRichard van der Hoff2020-12-152-12/+22
| |/ / | | | | | | | | | | | | despite the warnings saying "don't implement get_extra_attributes", we had implemented it, so the tests weren't doing what we thought they were.
* | | Merge commit '01333681b' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-168-204/+276
|\| |
| * | Preparatory refactoring of the SamlHandlerTestCase (#8938)Richard van der Hoff2020-12-153-54/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move simple_async_mock to test_utils ... so that it can be re-used * Remove references to `SamlHandler._map_saml_response_to_user` from tests This method is going away, so we can no longer use it as a test point. Instead, factor out a higher-level method which takes a SAML object, and verify correct behaviour by mocking out `AuthHandler.complete_sso_login`. * changelog
| * | Fix startup failure with localdb_enabled: False (#8937)Richard van der Hoff2020-12-141-0/+23
| | |
| * | Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-144-10/+7
| | |
| * | Preparatory refactoring of the OidcHandlerTestCase (#8911)Richard van der Hoff2020-12-141-141/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove references to handler._auth_handler (and replace them with hs.get_auth_handler) * Factor out a utility function for building Requests * Remove mocks of `OidcHandler._map_userinfo_to_user` This method is going away, so mocking it out is no longer a valid approach. Instead, we mock out lower-level methods (eg _remote_id_from_userinfo), or simply allow the regular implementation to proceed and update the expectations accordingly. * Remove references to `OidcHandler._map_userinfo_to_user` from tests This method is going away, so we can no longer use it as a test point. Instead we build mock "callback" requests which we pass into `handle_oidc_callback`, and verify correct behaviour by mocking out `AuthHandler.complete_sso_login`.
* | | lintAndrew Morgan2021-04-161-1/+3
| | |
* | | Merge commit 'f14428b25' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-165-29/+124
|\| |
| * | Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-111-2/+2
| | | | | | | | | | | | Spam checker modules can now provide async methods. This is implemented in a backwards-compatible manner.
| * | Improve tests for structured logging. (#8916)Patrick Cloke2020-12-111-27/+46
| | |
| * | Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-112-0/+60
| | |
| * | Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-111-0/+16
| | | | | | | | | Fixes #8866
* | | Merge commit 'c64002e1c' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-161-1/+1
|\| |
| * | Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-091-1/+1
| | | | | | | | | | | | This defaults `ip_range_blacklist` to reserved IP ranges and also adds an `ip_range_whitelist` setting to override it.
* | | Merge commit '6ff34e00d' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-161-0/+23
|\| |
| * | Skip the SAML tests if xmlsec1 isn't available. (#8905)Patrick Cloke2020-12-091-0/+23
| | |
* | | Merge commit 'cf7d3c90d' into dinsicAndrew Morgan2021-04-1625-281/+679
|\| |
| * | Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-081-0/+13
| | | | | | | | | | | | | | | | | | | | | Fixes / related to: https://github.com/matrix-org/synapse/issues/6533 This should do essentially the same thing as a robots.txt file telling robots to not index the media repo. https://developers.google.com/search/reference/robots_meta_tag Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | Call set_avatar_url with target_user, not user_id (#8872)Will Hunt2020-12-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Call set_avatar_url with target_user, not user_id Fixes https://github.com/matrix-org/synapse/issues/8871 * Create 8872.bugfix * Update synapse/rest/admin/users.py Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> * Testing * Update changelog.d/8872.bugfix Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | Do not raise a 500 exception when previewing empty media. (#8883)Patrick Cloke2020-12-071-11/+16
| | |
| * | Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-042-8/+120
| | | | | | | | | | | | Authentication is done by checking a shared secret provided in the Synapse configuration file.
| * | Pass room_id to get_auth_chain_difference (#8879)Erik Johnston2020-12-042-12/+20
| | | | | | | | | | | | | | | This is so that we can choose which algorithm to use based on the room ID.
| * | Add additional validation to pusher URLs. (#8865)Patrick Cloke2020-12-043-27/+89
| | | | | | | | | | | | Pusher URLs now must end in `/_matrix/push/v1/notify` per the specification.
| * | Merge tag 'v1.24.0rc2' into developPatrick Cloke2020-12-042-2/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.24.0rc2 (2020-12-04) ============================== Bugfixes -------- - Fix a regression in v1.24.0rc1 which failed to allow SAML mapping providers which were unable to redirect users to an additional page. ([\#8878](https://github.com/matrix-org/synapse/issues/8878)) Internal Changes ---------------- - Add support for the `prometheus_client` newer than 0.9.0. Contributed by Jordan Bancino. ([\#8875](https://github.com/matrix-org/synapse/issues/8875))
| * | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-031-0/+1
| | | | | | | | | | | | The spec says we should return `M_FORBIDDEN` when someone tries to register and registration is disabled.
| * | Merge remote-tracking branch 'origin/develop' into rav/remove_unused_mocksRichard van der Hoff2020-12-029-95/+279
| |\ \
| | * \ Merge pull request #8858 from matrix-org/rav/sso_uiaRichard van der Hoff2020-12-028-57/+279
| | |\ \ | | | | | | | | | | UIA: offer only available auth flows
| | | * | UIA: offer only available auth flowsRichard van der Hoff2020-12-023-18/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During user-interactive auth, do not offer password auth to users with no password, nor SSO auth to users with no SSO. Fixes #7559.
| | | * | Factor out FakeResponse from test_oidcRichard van der Hoff2020-12-022-16/+28
| | | | |
| | | * | fix up various test casesRichard van der Hoff2020-12-024-16/+37
| | | | | | | | | | | | | | | | | | | | | | | | | A few test cases were relying on being able to mount non-client servlets on the test resource. it's better to give them their own Resources.
| | | * | Add `create_resource_dict` method to HomeserverTestCaseRichard van der Hoff2020-12-021-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than using a single JsonResource, construct a resource tree, as we do in the prod code, and allow testcases to add extra resources by overriding `create_resource_dict`.
| | * | | remove unused FakeResponse (#8864)Richard van der Hoff2020-12-021-26/+0
| | | | |
| * | | | remove unused DeferredMockCallableRichard van der Hoff2020-12-021-90/+1
| | | | |
| * | | | remove unused `resource_for_federation`Richard van der Hoff2020-12-022-18/+13
| | | | | | | | | | | | | | | | | | | | This is now only used in `test_typing`, so move it there.
| * | | | Remove redundant mockingRichard van der Hoff2020-12-025-36/+5
| |/ / /
| * | | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-0228-40/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the `federation_ip_range_blacklist` configuration setting with an `ip_range_blacklist` setting with wider scope. It now applies to: * Federation * Identity servers * Push notifications * Checking key validitity for third-party invite events The old `federation_ip_range_blacklist` setting is still honored if present, but with reduced scope (it only applies to federation and identity servers).
| * | | Correctly handle unpersisted events when calculating auth chain difference. ↵Erik Johnston2020-12-022-1/+132
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | (#8827) We do state res with unpersisted events when calculating the new current state of the room, so that should be the only thing impacted. I don't think this is tooooo big of a deal as: 1. the next time a state event happens in the room the current state should correct itself; 2. in the common case all the unpersisted events' auth events will be pulled in by other state, so will still return the correct result (or one which is sufficiently close to not affect the result); and 3. we mostly use the state at an event to do important operations, which isn't affected by this.
* | | Port "Allow providing credentials to HTTPS_PROXY (#9657)" from mainline (#95)Andrew Morgan2021-03-231-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow providing credentials to HTTPS_PROXY (#9657) Addresses https://github.com/matrix-org/synapse-dinsic/issues/70 This PR causes `ProxyAgent` to attempt to extract credentials from an `HTTPS_PROXY` env var. If credentials are found, a `Proxy-Authorization` header ([details](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Proxy-Authorization)) is sent to the proxy server to authenticate against it. The headers are *not* passed to the remote server. Also added some type hints. * lint
* | | Stabilise all knock-related unstable identifiers that would be in state (#96)Andrew Morgan2021-03-231-3/+8
| | |
* | | Port "Add support for no_proxy and case insensitive env variables" from ↵Andrew Morgan2021-03-2229-59/+224
| | | | | | | | | | | | | | | | | | | | | mainline to dinsic (#93) This PR is simply porting https://github.com/matrix-org/synapse/pull/9372 to dinsic. I also had to bring in https://github.com/matrix-org/synapse/pull/8821 and https://github.com/matrix-org/synapse/pull/9084 for this code to work properly - a sign that we should merge mainline into dinsic again soon.
* | | Change knock room version to v7 (#88)Andrew Morgan2021-03-182-6/+7
| | |
* | | Add a config option to prioritise local users in user directory search ↵Andrew Morgan2021-02-191-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | results (#84) * Add a config option to prioritise local users in user directory search results (#9383) This PR adds a homeserver config option, `user_directory.prefer_local_users`, that when enabled will show local users higher in user directory search results than remote users. This option is off by default. Note that turning this on doesn't necessarily mean that remote users will always be put below local users, but they should be assuming all other ranking factors (search query match, profile information present etc) are identical. This is useful for, say, University networks that are openly federating, but want to prioritise local students and staff in the user directory over other random users. * Don't mix simple and english psql query types
* | | Send a ver query parameter for make_knock (#83)Andrew Morgan2021-02-171-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | This informs the remote server of the room versions we support. If the room we're trying to knock on has a version that is not one of our supported room versions, the remote server will return an unsupported room version error. Noticed in https://github.com/matrix-org/matrix-doc/pull/2403#discussion_r577042144 Ported from https://github.com/matrix-org/synapse/pull/6739
* | | Add knocking support (#81)Andrew Morgan2021-02-092-2/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | Implement knocking as defined by https://github.com/matrix-org/matrix-doc/pull/2403 This is the base knocking stuff, taken from https://github.com/matrix-org/synapse/pull/6739 and does not include any public room directory changes. While knocking hasn't merged yet on mainline due to waiting on getting Complement into Synapse's CI, the code has been well-tested.
* | | Add a parameter to enable/disable freeze feature (#78)Mathieu Velten2021-01-211-0/+1
| | |
* | | Ensure we read account validity templates from custom template dir if ↵Andrew Morgan2021-01-191-0/+51
| | | | | | | | | | | | provided (#77)
* | | Merge commit '693dab487' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-2/+29
|\ \ \ | | |/ | |/|
| * | Fix a regression that mapping providers should be able to redirect users. ↵Patrick Cloke2020-12-042-2/+29
| |/ | | | | | | | | (#8878) This was broken in #8801.
* | Merge commit '53b12688d' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-17/+193
|\|
| * Fix a regression when grandfathering SAML users. (#8855)Patrick Cloke2020-12-022-1/+41
| | | | | | | | | | | | This was broken in #8801 when abstracting code shared with OIDC. After this change both SAML and OIDC have a concept of grandfathering users, but with different implementations.
| * Add basic SAML tests for mapping users. (#8800)Patrick Cloke2020-12-022-17/+153
| |
* | Merge commit 'd3ed93504' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-313-10/+630
|\|
| * Create a `PasswordProvider` wrapper object (#8849)Richard van der Hoff2020-12-021-2/+3
| | | | | | | | The idea here is to abstract out all the conditional code which tests which methods a given password provider has, to provide a consistent interface.
| * Allow specifying room version in 'RestHelper.create_room_as' and add typing ↵Andrew Morgan2020-12-021-2/+25
| | | | | | | | | | (#8854) This PR adds a `room_version` argument to the `RestHelper`'s `create_room_as` function for tests. I plan to use this for testing knocking, which currently uses an unstable room version.
| * Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-012-18/+26
| | | | | | | | | | | | | | | | | | | | The spec requires synapse to support `identifier` dicts for `m.login.password` user-interactive auth, which it did not (instead, it required an undocumented `user` parameter.) To fix this properly, we need to pull the code that interprets `identifier` into `AuthHandler.validate_login` so that it can be called from the UIA code. Fixes #5665.
| * Don't offer password login when it is disabled (#8835)Richard van der Hoff2020-12-011-3/+105
| | | | | | Fix a minor bug where we would offer "m.login.password" login if a custom auth provider supported it, even if password login was disabled.
| * Add some tests for `password_auth_providers` (#8819)Richard van der Hoff2020-12-011-0/+486
| | | | | | | | These things seemed to be completely untested, so I added a load of tests for them.
* | Merge commit '09ac0569f' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-317-17/+178
|\|
| * Fix broken testcase (#8851)Richard van der Hoff2020-12-011-1/+0
| | | | | | | | This test was broken by #8565. It doesn't need to set set `self.clock` here anyway - that is done by `setUp`.
| * Add a config option to change whether unread push notification counts are ↵Andrew Morgan2020-11-301-2/+161
| | | | | | | | | | | | | | | | per-message or per-room (#8820) This PR adds a new config option to the `push` section of the homeserver config, `group_unread_count_by_room`. By default Synapse will group push notifications by room (so if you have 1000 unread messages, if they lie in 55 rooms, you'll see an unread count on your phone of 55). However, it is also useful to be able to send out the true count of unread messages if desired. If `group_unread_count_by_room` is set to `false`, then with the above example, one would see an unread count of 1000 (email anyone?).
| * Simplify the way the `HomeServer` object caches its internal attributes. ↵Jonathan de Jong2020-11-305-14/+17
| | | | | | | | | | (#8565) Changes `@cache_in_self` to use underscore-prefixed attributes.
* | Merge commit '7c4344747' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-318-15/+209
|\|
| * Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-256-10/+118
| | | | | | These are now only available via `/_synapse/admin/v1`.
| * Support trying multiple localparts for OpenID Connect. (#8801)Patrick Cloke2020-11-251-1/+87
| | | | | | | | Abstracts the SAML and OpenID Connect code which attempts to regenerate the localpart of a matrix ID if it is already in use.
* | Merge commit '8ca120df7' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-21/+69
|\|
| * Improve error checking for OIDC/SAML mapping providers (#8774)Patrick Cloke2020-11-191-20/+69
| | | | | | | | | | | | Checks that the localpart returned by mapping providers for SAML and OIDC are valid before registering new users. Extends the OIDC tests for existing users and invalid data.
| * Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-11-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | * Consistently use room_id from federation request body Some federation APIs have a redundant `room_id` path param (see https://github.com/matrix-org/matrix-doc/issues/2330). We should make sure we consistently use either the path param or the body param, and the body param is easier. * Kill off some references to "context" Once upon a time, "rooms" were known as "contexts". I think this kills of the last references to "contexts".
| * Fix tests on develop (#8777)Erik Johnston2020-11-181-16/+0
| | | | | | This was broken due to #8617 and #8761.
| * Merge pull request #8761 from matrix-org/rav/test_request_renderingRichard van der Hoff2020-11-1758-813/+102
| |\ | | | | | | Make `make_request` actually render the request
| * | Abstract shared SSO code. (#8765)Patrick Cloke2020-11-171-7/+7
| | | | | | | | | De-duplicates code between the SAML and OIDC implementations.
| * | Add admin API for logging in as a user (#8617)Erik Johnston2020-11-176-42/+265
| | |
* | | Merged commit 'deff8f628' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-319-74/+261
| | |
* | | Merge commit 'acfe3b306' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3158-765/+44
|\ \ \ | | |/ | |/|
| * | Remove redundant `HomeserverTestCase.render`Richard van der Hoff2020-11-1644-629/+0
| | |
| * | Remove redundant calls to `render()`Richard van der Hoff2020-11-1613-106/+32
| | |
* | | Merge commit '129ae841e' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3115-141/+226
|\| |
| * | Make `make_request` actually render the requestRichard van der Hoff2020-11-169-68/+57
| | | | | | | | | | | | | | | | | | remove the stubbing out of `request.process`, so that `requestReceived` also renders the request via the appropriate resource. Replace render() with a stub for now.
| * | Fix the URL in the URL preview testsRichard van der Hoff2020-11-161-19/+22
| |/ | | | | | | the preview resource is mointed at preview_url, not url_preview
| * Merge pull request #8757 from matrix-org/rav/pass_site_to_make_requestRichard van der Hoff2020-11-1616-88/+227
| |\ | | | | | | Pass a Site into `make_request`
| | * fixup testRichard van der Hoff2020-11-161-0/+1
| | |
| | * Merge branch 'develop' into rav/pass_site_to_make_requestRichard van der Hoff2020-11-169-33/+33
| | |\
| | * | use global make_request() directly where we have a custom ResourceRichard van der Hoff2020-11-1511-60/+154
| | | | | | | | | | | | | | | | | | | | | | | | Where we want to render a request against a specific Resource, call the global make_request() function rather than the one in HomeserverTestCase, allowing us to pass in an appropriate `Site`.
| | * | fix dict handling for make_request()Richard van der Hoff2020-11-152-3/+2
| | | |
* | | | Merge commit 'f12589547' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3110-58/+58
|\| | |
| * | | Move `wait_until_result` into `FakeChannel` (#8758)Richard van der Hoff2020-11-162-25/+23
| | |/ | |/| | | | | | | FakeChannel has everything we need, and this more accurately models the real flow.
| * | Rename `create_test_json_resource` to `create_test_resource` (#8759)Richard van der Hoff2020-11-166-23/+15
| | | | | | | | | | | | | | | The root resource isn't necessarily a JsonResource, so rename this method accordingly, and update a couple of test classes to use the method rather than directly manipulating self.resource.
| * | Add a `custom_headers` param to `make_request` (#8760)Richard van der Hoff2020-11-163-11/+23
| | | | | | | | | | | | Some tests want to set some custom HTTP request headers, so provide a way to do that before calling requestReceived().
* | | Merge commit '9debe657a' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-314-26/+75
|\ \ \ | | |/ | |/|
| * | pass a Site into make_requestRichard van der Hoff2020-11-154-20/+68
| | |
| * | pass a Site into RestHelperRichard van der Hoff2020-11-152-6/+7
| |/
* | Merge commit 'c3119d153' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-315-75/+712
|\|
| * Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-051-0/+485
| | | | | | | | | | | | | | | | Add `GET /_synapse/admin/v1/statistics/users/media` to get statisics about local media usage by users. Related to #6094 It is the first API for statistics. Goal is to avoid/reduce usage of sql queries like [Wiki analyzing Synapse](https://github.com/matrix-org/synapse/wiki/SQL-for-analyzing-Synapse-PostgreSQL-database-stats) Signed-off-by: Dirk Klimpel dirk@klimpel.org
| * Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-052-8/+132
| | | | | | Add `displayname` to Shared-Secret Registration for admins to `POST /_synapse/admin/v1/register`
| * Consolidate purge table lists to prevent desyncronisation (#8713)Andrew Morgan2020-11-041-67/+38
| | | | | | I idly noticed that these lists were out of sync with each other, causing us to miss a table in a test case (`local_invites`). Let's consolidate this list instead to prevent this from happening in the future.
| * Block clients from sending server ACLs that lock the local server out. (#8708)Erik Johnston2020-11-031-0/+57
| | | | | | Fixes #4042
* | Merge commit 'f27a78969' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-315-4/+375
|\|
| * Implement and use an @lru_cache decorator (#8595)Richard van der Hoff2020-10-301-1/+59
| | | | | | We don't always need the full power of a DeferredCache.
| * Fail test cases if they fail to await all awaitables (#8690)Patrick Cloke2020-10-302-2/+38
| |
| * Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-302-1/+278
| | | | | | Fixes #6755
* | Merge commit 'ef2d62701' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3117-435/+315
|\|
| * Fix unit tests (#8689)Erik Johnston2020-10-291-1/+1
| | | | | | | | | | * Fix unit tests * Newsfile
| * Gracefully handle a pending logging connection during shutdown. (#8685)Patrick Cloke2020-10-291-0/+16
| |
| * Add ability for access tokens to belong to one user but grant access to ↵Erik Johnston2020-10-2910-33/+30
| | | | | | | | | | | | | | | | | | | | another user. (#8616) We do it this way round so that only the "owner" can delete the access token (i.e. `/logout/all` by the "owner" also deletes that token, but `/logout/all` by the "target user" doesn't). A future PR will add an API for creating such a token. When the target user and authenticated entity are different the `Processed request` log line will be logged with a: `{@admin:server as @bob:server} ...`. I'm not convinced by that format (especially since it adds spaces in there, making it harder to use `cut -d ' '` to chop off the start of log lines). Suggestions welcome.
| * Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-295-400/+258
| | | | | | | | | | | | | | This modifies the configuration of structured logging to be usable from the standard Python logging configuration. This also separates the formatting of logs from the transport allowing JSON logs to files or standard logs to sockets.
| * Don't require hiredis to run unit tests (#8680)Erik Johnston2020-10-291-1/+10
| |
* | Merge commit 'c97da1e45' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-316-6/+130
|\|
| * Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-281-0/+124
| | | | | | Add an admin API `GET /_synapse/admin/v1/users/<user_id>/pushers` like https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushers
| * Tell Black to format code for Python 3.5 (#8664)Dan Callahan2020-10-275-6/+6
| | | | | | | | | | | | | | | | This allows trailing commas in multi-line arg lists. Minor, but we might as well keep our formatting current with regard to our minimum supported Python version. Signed-off-by: Dan Callahan <danc@element.io>