Andrew Morgan
192bf29ca0
Merge commit '693dab487' into anoa/dinsic_release_1_23_1
2020-12-31 17:19:54 +00:00
Andrew Morgan
b0c601e00e
Merge commit '53b12688d' into anoa/dinsic_release_1_23_1
2020-12-31 17:19:48 +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
fce9ace555
Merge commit '8ca120df7' into anoa/dinsic_release_1_23_1
2020-12-31 16:50:13 +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
535afe4313
Merge commit 'f27a78969' into anoa/dinsic_release_1_23_1
2020-12-31 14:35:28 +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
468d7f6777
Merge commit '7a3adbd7a' into anoa/dinsic_release_1_23_1
2020-12-31 12:06:40 +00:00
Andrew Morgan
a190ad61b3
Merge commit '2b7c18087' into anoa/dinsic_release_1_23_1
2020-12-31 11:58:26 +00:00
Andrew Morgan
7e1a0bf068
Merge commit 'b19b63e6b' into anoa/dinsic_release_1_23_1
2020-12-31 11:51:30 +00:00
Andrew Morgan
9e11250574
Merge commit '9146a8a69' into dinsic
2020-12-31 11:44:21 +00:00
Andrew Morgan
7df02e4431
Merge commit '70259d8c' into dinsic
2020-12-31 11:44:13 +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
Patrick Cloke
22c6c19f91
Fix a regression that mapping providers should be able to redirect users. ( #8878 )
...
This was broken in #8801 .
2020-12-04 08:25:15 -05:00
Patrick Cloke
8388384a64
Fix a regression when grandfathering SAML users. ( #8855 )
...
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.
2020-12-02 07:45:42 -05:00
Patrick Cloke
c21bdc813f
Add basic SAML tests for mapping users. ( #8800 )
2020-12-02 07:09:21 -05:00
Richard van der Hoff
d3ed93504b
Create a PasswordProvider wrapper object ( #8849 )
...
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.
2020-12-02 10:38:50 +00: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
89f7930730
Don't offer password login when it is disabled ( #8835 )
...
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.
2020-12-01 13:04:03 +00:00
Richard van der Hoff
ddc4343683
Add some tests for password_auth_providers ( #8819 )
...
These things seemed to be completely untested, so I added a load of tests for
them.
2020-12-01 11:10:42 +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
Andrew Morgan
17fa58bdd1
Add a config option to change whether unread push notification counts are 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?).
2020-11-30 18:43:54 +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
Patrick Cloke
4fd222ad70
Support trying multiple localparts for OpenID Connect. ( #8801 )
...
Abstracts the SAML and OpenID Connect code which attempts to regenerate
the localpart of a matrix ID if it is already in use.
2020-11-25 10:04:22 -05:00
Patrick Cloke
79bfe966e0
Improve error checking for OIDC/SAML mapping providers ( #8774 )
...
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.
2020-11-19 14:25:17 -05:00
Richard van der Hoff
950bb0305f
Consistently use room_id from federation request body ( #8776 )
...
* 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".
2020-11-19 10:05:33 +00: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
Patrick Cloke
ee382025b0
Abstract shared SSO code. ( #8765 )
...
De-duplicates code between the SAML and OIDC implementations.
2020-11-17 09:46:23 -05: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