kaslo/synapse
1
0
Fork 0
Code Wiki Activity
19,730 Commits 1,048 Branches 805 Tags
93db8f1992887d0e01e31331a1ee2ad030d62b87
Commit Graph

756 Commits

Author SHA1 Message Date
Andrew Morgan
93db8f1992 Merge commit 'cf7d3c90d' into dinsic 2021-04-16 12:33:45 +01:00
Andrew Morgan
0da5273f71 Stabilise all knock-related unstable identifiers that would be in state (#96) 2021-03-23 13:44:34 +00:00
Andrew Morgan
232b324c38 Port "Add support for no_proxy and case insensitive env variables" from 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.
 2021-03-22 17:48:42 +00:00
Andrew Morgan
7a61b0e752 Change knock room version to v7 (#88) 2021-03-18 17:26:13 +00:00
Andrew Morgan
6bf58d8194 Add knocking support (#81) 
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.
 2021-02-09 19:07:00 +00:00
Mathieu Velten
d2953b3562 Add a parameter to enable/disable freeze feature (#78) 2021-01-21 15:17:40 +01:00
Andrew Morgan
e97045613c Ensure we read account validity templates from custom template dir if provided (#77) 2021-01-19 10:07:15 +00:00
Andrew Morgan
945055e6f7 Merge commit 'd3ed93504' into anoa/dinsic_release_1_23_1 2020-12-31 17:19:35 +00:00
Andrew Morgan
a839d0f32d Merge commit '09ac0569f' into anoa/dinsic_release_1_23_1 2020-12-31 17:19:14 +00:00
Andrew Morgan
0c897c7410 Merge commit '7c4344747' into anoa/dinsic_release_1_23_1 2020-12-31 17:08:54 +00:00
Andrew Morgan
1077d50c65 Merged commit 'deff8f628' into anoa/dinsic_release_1_23_1 2020-12-31 16:20:32 +00:00
Andrew Morgan
5c51806d1d Merge commit 'acfe3b306' into anoa/dinsic_release_1_23_1 2020-12-31 15:22:27 +00:00
Andrew Morgan
6ee9980843 Merge commit '129ae841e' into anoa/dinsic_release_1_23_1 2020-12-31 14:55:29 +00:00
Andrew Morgan
917d0f9250 Merge commit 'f12589547' into anoa/dinsic_release_1_23_1 2020-12-31 14:55:18 +00:00
Andrew Morgan
3dd861e6aa Merge commit '9debe657a' into anoa/dinsic_release_1_23_1 2020-12-31 14:36:00 +00:00
Andrew Morgan
551681c29d Merge commit 'c3119d153' into anoa/dinsic_release_1_23_1 2020-12-31 14:35:35 +00:00
Andrew Morgan
de6773523d Merge commit 'ef2d62701' into anoa/dinsic_release_1_23_1 2020-12-31 14:34:59 +00:00
Andrew Morgan
b90b34744a Merge commit 'c97da1e45' into anoa/dinsic_release_1_23_1 2020-12-31 13:40:57 +00:00
Andrew Morgan
3efa169750 Merge commit '88e1d0c52' into anoa/dinsic_release_1_23_1 2020-12-31 13:40:45 +00:00
Andrew Morgan
47c25048c5 Merge commit '24229fac0' into anoa/dinsic_release_1_23_1 2020-12-31 13:40:07 +00:00
Andrew Morgan
8f05de1d97 Merge commit 'de5cafe98' into dinsic 2020-12-31 11:43:55 +00:00
Andrew Morgan
b30484ab34 Merge commit '3ee17585c' into dinsic 2020-12-31 11:23:56 +00:00
Andrew Morgan
5fc0dd8126 Merge commit '74976a8e4' into dinsic 2020-12-31 11:23:24 +00:00
Andrew Morgan
63e8ab5481 Allow users to click account renewal links multiple times without hitting an 'Invalid Token' page (#74) 2020-12-30 17:43:08 +00:00
Patrick Cloke
0d86b11666 Support PyJWT v2.0.0. (#8986) 
Tests were broken due to an API changing. The code used in Synapse
proper should be compatible with both versions already.
 2020-12-29 18:41:36 +00:00
Aaron Raimist
cd9e72b185 Add X-Robots-Tag header to stop crawlers from indexing media (#8887) 
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>
 2020-12-08 22:51:03 +00:00
Will Hunt
ff1f0ee094 Call set_avatar_url with target_user, not user_id (#8872) 
* 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>
 2020-12-07 19:13:07 +00:00
Patrick Cloke
b774c555d8 Add additional validation to pusher URLs. (#8865) 
Pusher URLs now must end in `/_matrix/push/v1/notify` per the
specification.
 2020-12-04 10:51:56 -05:00
Richard van der Hoff
cf3b8156be Fix errorcode for disabled registration (#8867) 
The spec says we should return `M_FORBIDDEN` when someone tries to register and
registration is disabled.
 2020-12-03 15:41:19 +00:00
Richard van der Hoff
ed5172852a Merge pull request #8858 from matrix-org/rav/sso_uia 
UIA: offer only available auth flows
 2020-12-02 20:06:53 +00:00
Richard van der Hoff
f347f0cd58 remove unused FakeResponse (#8864) 2020-12-02 18:58:25 +00:00
Richard van der Hoff
0bac276890 UIA: offer only available auth flows 
During user-interactive auth, do not offer password auth to users with no
password, nor SSO auth to users with no SSO.

Fixes #7559.
 2020-12-02 18:54:15 +00:00
Patrick Cloke
30fba62108 Apply an IP range blacklist to push and key revocation requests. (#8821) 
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).
 2020-12-02 11:09:24 -05:00
Andrew Morgan
edb3d3f827 Allow specifying room version in 'RestHelper.create_room_as' and add typing (#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.
 2020-12-02 10:38:18 +00:00
Richard van der Hoff
4d9496559d Support "identifier" dicts in UIA (#8848) 
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.
 2020-12-01 17:42:26 +00:00
Richard van der Hoff
09ac0569fe Fix broken testcase (#8851) 
This test was broken by #8565. It doesn't need to set set `self.clock`
here anyway - that is done by `setUp`.
 2020-12-01 11:04:57 +00:00
Jonathan de Jong
ca60822b34 Simplify the way the HomeServer object caches its internal attributes. (#8565) 
Changes `@cache_in_self` to use underscore-prefixed attributes.
 2020-11-30 13:28:44 -05:00
Dirk Klimpel
3f0ff53158 Remove deprecated /_matrix/client/*/admin endpoints (#8785) 
These are now only available via `/_synapse/admin/v1`.
 2020-11-25 16:26:11 -05:00
Erik Johnston
03e392f787 Fix tests on develop (#8777) 
This was broken due to #8617 and #8761.
 2020-11-18 15:43:11 +00:00
Richard van der Hoff
deff8f628d Merge pull request #8761 from matrix-org/rav/test_request_rendering 
Make `make_request` actually render the request
 2020-11-17 15:17:04 +00:00
Erik Johnston
f737368a26 Add admin API for logging in as a user (#8617) 2020-11-17 10:51:25 +00:00
Richard van der Hoff
acfe3b3065 Remove redundant HomeserverTestCase.render 2020-11-16 18:24:08 +00:00
Richard van der Hoff
be8fa65d0b Remove redundant calls to render() 2020-11-16 18:24:08 +00:00
Richard van der Hoff
129ae841e5 Make make_request actually render the request 
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.
 2020-11-16 18:24:00 +00:00
Richard van der Hoff
1f41422c98 Fix the URL in the URL preview tests 
the preview resource is mointed at preview_url, not url_preview
 2020-11-16 18:24:00 +00:00
Richard van der Hoff
3dc1871219 Merge pull request #8757 from matrix-org/rav/pass_site_to_make_request 
Pass a Site into `make_request`
 2020-11-16 18:22:24 +00:00
Richard van der Hoff
f125895475 Move wait_until_result into FakeChannel (#8758) 
FakeChannel has everything we need, and this more accurately models the real
flow.
 2020-11-16 18:21:47 +00:00
Richard van der Hoff
bebfb9a97b Merge branch 'develop' into rav/pass_site_to_make_request 2020-11-16 15:22:40 +00:00
Richard van der Hoff
791d7cd6f0 Rename create_test_json_resource to create_test_resource (#8759) 
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.
 2020-11-16 14:45:52 +00:00
Richard van der Hoff
ebc405446e Add a custom_headers param to make_request (#8760) 
Some tests want to set some custom HTTP request headers, so provide a way to do
that before calling requestReceived().
 2020-11-16 14:45:22 +00:00