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

19730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Morgan
93db8f1992 Merge commit 'cf7d3c90d' into dinsic 2021-04-16 12:33:45 +01:00
Andrew Morgan
0060eb332c Port "Allow providing credentials to HTTPS_PROXY (#9657)" from mainline (#95) 
* 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
 2021-03-23 15:35:38 +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
396e7d4079 Remove extraneous print (#94) 2021-03-19 17:44:40 +00:00
Andrew Morgan
815ab46f63 Fix the pipeline to use knock v7 Complement branch (#92) 2021-03-19 15:42:20 +00:00
Andrew Morgan
9aa6276c8c Cap mypy tests at twisted==20.3.0 (#90) 2021-03-19 15:10:08 +00:00
Andrew Morgan
7a61b0e752 Change knock room version to v7 (#88) 2021-03-18 17:26:13 +00:00
Andrew Morgan
934785866f Allow knock->knock transitions (#86) 
Small change to the event auth rules that allows transitioning from knock->knock (in case you want to update your knock reason, or change profile information etc).

Coincides with the same commit in [the mainline PR](https://github.com/matrix-org/synapse/pull/6739) and [this update on MSC2403](49a72862a9).
 2021-03-02 11:07:20 +00:00
Mathieu Velten
fe551bf15a change check_threepid_can_be_invited to async (#85) 2021-03-01 16:10:19 +01:00
Andrew Morgan
8f97c6c2da Add a config option to prioritise local users in user directory search 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
 2021-02-19 12:11:02 +00:00
Andrew Morgan
79a213ecec Send a ver query parameter for make_knock (#83) 
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
 2021-02-17 15:29:36 +00:00
Andrew Morgan
d180754623 Show knock rooms in the public room directory and inform clients they can be knocked on (#82) 
This PR implements the ["Changes regarding the Public Rooms Directory"](https://github.com/Sorunome/matrix-doc/blob/soru/knock/proposals/2403-knock.md#changes-regarding-the-public-rooms-directory) section of knocking MSC2403.

Specifically, it:

* Allows rooms with `join_rule` "knock" to be returned by the query behind the public rooms directory
* Adds the field `join_rule` to each room entry returned by a public rooms directory query, so clients can know whether to attempt a join or knock on a room

This PR is a clone of [the mainline PR](https://github.com/matrix-org/synapse/pull/9359). Complement tests for this change: https://github.com/matrix-org/complement/pull/72.
 2021-02-10 14:51:12 +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
Andrew Morgan
2c896f1dfb Add complement running monolith synapse to buildkite pipeline (#80) 2021-02-09 12:32:55 +00:00
Andrew Morgan
28106a581f Fix Python Old-Deps CI step (#79) 
* Fix the Python 3.5 old-deps build. (#9146)

setuptools 51.0.0 dropped support for Python 3.5.

* Fix Python 3.5 old deps build by using a compatible pip version. (#9217)

Co-authored-by: Dan Callahan <danc@element.io>

pip 21.0 stopped supporting Python 3.5.

Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
 2021-02-09 11:47:28 +00:00
Andrew Morgan
d36bfdd64d Remove riot email registration backwards compatibility hack 
This was causing a LoginError to be propagated up to the registration servlet, which was
expecting a InteractiveAuthIncompleteError in order to store a password_hash from the
client for the session. DINUM relies on this happening.

More info here: https://github.com/matrix-org/synapse/issues/9263
 2021-01-29 14:41:56 +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
Mathieu Velten
09276e023b Change check_3pid_allowed to async (#76) 2021-01-18 17:58:51 +01:00
Andrew Morgan
2e0bc9804c Merge pull request #75 from matrix-org/anoa/dinsic_release_1_24_0 
Updating DINUM's synapse branch from v1.21.2 -> v1.24.0.

Shouldn't be any deprecations or config file changes to worry about.

This merge is paired with one for Sytest as well: matrix-org/sytest#999
 2021-01-04 02:58:27 +00:00
Andrew Morgan
088c97dd3b Better align mainline and dinsic buildkite pipelines 2021-01-03 21:09:53 -05:00
Andrew Morgan
4fd2bd67dd Merge commit '3e8292d48' into anoa/dinsic_release_1_23_1 2020-12-31 17:57:00 +00:00
Andrew Morgan
72a1c62278 Merge commit '1cec3d145' into anoa/dinsic_release_1_23_1 2020-12-31 17:21:56 +00:00
Andrew Morgan
44d62d0804 Merge commit '9b26a4ac8' into anoa/dinsic_release_1_23_1 2020-12-31 17:20:00 +00:00
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
9ab7375f9d Merge commit 'a090b8620' into anoa/dinsic_release_1_23_1 2020-12-31 17:09:21 +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
3cf5e8b3f9 Merge commit '03e392f78' into anoa/dinsic_release_1_23_1 2020-12-31 16:50:11 +00:00
Andrew Morgan
56257fb995 Merge commit 'ef366720d' into anoa/dinsic_release_1_23_1 2020-12-31 16:20:49 +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
ca151ff0bd Merge commit '4a54b821b' into anoa/dinsic_release_1_23_1 2020-12-31 14:35:50 +00:00
Andrew Morgan
883c742960 Merge commit '89700dfb8' into anoa/dinsic_release_1_23_1 2020-12-31 14:35:45 +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
71289856e5 Merge commit 'b4289795e' into anoa/dinsic_release_1_23_1 2020-12-31 14:35:16 +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
8c2f42374b Merge commit 'fedfdfd75' into anoa/dinsic_release_1_23_1 2020-12-31 12:07:35 +00:00
Andrew Morgan
468d7f6777 Merge commit '7a3adbd7a' into anoa/dinsic_release_1_23_1 2020-12-31 12:06:40 +00:00