kaslo/synapse
1
0
Fork 0
Code Wiki Activity
19,905 Commits 1,047 Branches 805 Tags
9d9bd2bb81fc2e2de4d894840a780c7c67fd2086
Commit Graph

19905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Morgan
9d9bd2bb81 Merge commit '631dd06f2' into anoa/dinsic_release_1_31_0 2021-04-22 16:22:43 +01:00
Andrew Morgan
06a99a44f7 Merge commit '12702be95' into anoa/dinsic_release_1_31_0 2021-04-22 16:22:35 +01:00
Andrew Morgan
72b2cb5460 Merge commit '420031906' into anoa/dinsic_release_1_31_0 2021-04-22 16:22:27 +01:00
Andrew Morgan
527049b71a Merge commit '233c8b9fc' into anoa/dinsic_release_1_31_0 2021-04-22 16:22:21 +01:00
Andrew Morgan
dabcff44bb Merge commit 'dc3c83a93' into anoa/dinsic_release_1_31_0 2021-04-22 16:22:14 +01:00
Andrew Morgan
3f2491d6a0 Fix mypy check fail 2021-04-22 16:21:58 +01:00
Andrew Morgan
77f011b8fd Merge commit '98a64b7f7' into anoa/dinsic_release_1_31_0 2021-04-22 16:21:11 +01:00
Andrew Morgan
bae39a4777 Merge commit '3dd6ba135' into anoa/dinsic_release_1_31_0 2021-04-21 16:17:14 +01:00
Andrew Morgan
cbd4e6ba68 Merge commit 'fa6deb298' into anoa/dinsic_release_1_31_0 2021-04-21 16:17:10 +01:00
Andrew Morgan
a01843fd88 Merge commit '2fb1c2b6e' into anoa/dinsic_release_1_31_0 2021-04-21 16:17:02 +01:00
Andrew Morgan
64150ac9ba Merge commit 'a03d71dc9' into anoa/dinsic_release_1_31_0 2021-04-21 16:16:41 +01:00
Andrew Morgan
a1a9b51fd7 Merge commit '63593134a' into anoa/dinsic_release_1_31_0 2021-04-21 16:16:30 +01:00
Andrew Morgan
4c970214af Merge commit '23d701864' into anoa/dinsic_release_1_31_0 2021-04-21 16:16:22 +01:00
Andrew Morgan
c7cd7b4545 Merge commit '0312266ee' into anoa/dinsic_release_1_31_0 2021-04-21 16:16:10 +01:00
Andrew Morgan
7ba1c62875 Merge commit '2fe0fb21f' into anoa/dinsic_release_1_31_0 2021-04-21 15:35:38 +01:00
Andrew Morgan
1ca3f40437 Merge commit '1c9a85056' into anoa/dinsic_release_1_31_0 2021-04-21 15:35:26 +01:00
Andrew Morgan
744f456324 Merge commit '9999eb2d0' into anoa/dinsic_release_1_31_0 2021-04-21 15:35:15 +01:00
Andrew Morgan
82b462401f Merge commit '4218473f9' into anoa/dinsic_release_1_31_0 2021-04-21 15:34:28 +01:00
Andrew Morgan
52620bdb83 Merge commit '28877fade' into anoa/dinsic_release_1_31_0 2021-04-21 15:09:52 +01:00
Andrew Morgan
995136eb38 Merge commit 'a7a913918' into anoa/dinsic_release_1_31_0 2021-04-20 17:42:58 +01:00
Andrew Morgan
ed6742cb30 Merge commit 'c9c1c9d82' into anoa/dinsic_release_1_31_0 2021-04-20 16:59:59 +01:00
Andrew Morgan
de2918f0cb Merge commit '7932d4e9f' into anoa/dinsic_release_1_31_0 2021-04-20 16:41:37 +01:00
Andrew Morgan
83c1c8a56b Merge commit 'ff5c4da12' into anoa/dinsic_release_1_31_0 2021-04-20 16:41:22 +01:00
Andrew Morgan
59766708cf Fix old-style uses of self.make_request in dinum test code 2021-04-16 15:46:03 +01:00
Andrew Morgan
ec2cab331d Merge commit 'bd30cfe86' into anoa/dinsic_release_1_31_0 2021-04-16 15:45:40 +01:00
Andrew Morgan
7fd80c73cc Merge commit '8388a7fb3' into anoa/dinsic_release_1_31_0 2021-04-16 15:06:31 +01:00
Andrew Morgan
394e6d2c72 Merge commit '01333681b' into anoa/dinsic_release_1_31_0 2021-04-16 15:06:19 +01:00
Andrew Morgan
22927d6ee8 lint 2021-04-16 15:06:06 +01:00
Andrew Morgan
cf1e0196bb Merge commit 'f14428b25' into anoa/dinsic_release_1_31_0 2021-04-16 15:02:53 +01:00
Andrew Morgan
eb19dc5578 Merge commit 'c64002e1c' into anoa/dinsic_release_1_31_0 2021-04-16 14:26:36 +01:00
Andrew Morgan
8011007148 Merge commit '6ff34e00d' into anoa/dinsic_release_1_31_0 2021-04-16 14:26:27 +01:00
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