Revert "Merge branch 'quenting/hotfix-delegated-auth-admin' of https:…

…//github.com/matrix-org/synapse into quenting/hotfix-delegated-auth-admin" This reverts commit b04af11, reversing changes made to 10b4e12.
matrix-org · Sep 4, 2023 · 01597b8 · 01597b8
1 parent b04af11
commit 01597b8
Show file tree

Hide file tree

Showing 184 changed files with 1,688 additions and 2,097 deletions.
diff --git a/.ci/scripts/calculate_jobs.py b/.ci/scripts/calculate_jobs.py
@@ -47,9 +47,10 @@ def set_output(key: str, value: str):
             "database": "sqlite",
             "extras": "all",
         }
-        for version in ("3.9", "3.10", "3.11", "3.12.0-rc.1")
+        for version in ("3.9", "3.10", "3.11")
     )
 
+
 trial_postgres_tests = [
     {
         "python-version": "3.8",

diff --git a/.github/workflows/latest_deps.yml b/.github/workflows/latest_deps.yml
@@ -57,8 +57,8 @@ jobs:
       # `pip install matrix-synapse[all]` as closely as possible.
       - run: poetry update --no-dev
       - run: poetry run pip list > after.txt && (diff -u before.txt after.txt || true)
-      - name: Remove unhelpful options from mypy config
-        run: sed -e '/warn_unused_ignores = True/d' -e '/warn_redundant_casts = True/d' -i mypy.ini
+      - name: Remove warn_unused_ignores from mypy config
+        run: sed '/warn_unused_ignores = True/d' -i mypy.ini
       - run: poetry run mypy
   trial:
     needs: check_repo

diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml
@@ -54,8 +54,8 @@ jobs:
           poetry remove twisted
           poetry add --extras tls git+https://github.com/twisted/twisted.git#${{ inputs.twisted_ref || 'trunk' }}
           poetry install --no-interaction --extras "all test"
-      - name: Remove unhelpful options from mypy config
-        run: sed -e '/warn_unused_ignores = True/d' -e '/warn_redundant_casts = True/d' -i mypy.ini
+      - name: Remove warn_unused_ignores from mypy config
+        run: sed '/warn_unused_ignores = True/d' -i mypy.ini
       - run: poetry run mypy
 
   trial:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/changelog.d/15816.feature b/changelog.d/15816.feature
diff --git a/changelog.d/16008.doc b/changelog.d/16008.doc
diff --git a/changelog.d/16099.misc b/changelog.d/16099.misc
diff --git a/changelog.d/16113.feature b/changelog.d/16113.feature
diff --git a/changelog.d/16121.misc b/changelog.d/16121.misc
diff --git a/changelog.d/16135.misc b/changelog.d/16135.misc
diff --git a/changelog.d/16136.feature b/changelog.d/16136.feature
diff --git a/changelog.d/16155.bugfix b/changelog.d/16155.bugfix
diff --git a/changelog.d/16168.doc b/changelog.d/16168.doc
diff --git a/changelog.d/16170.misc b/changelog.d/16170.misc
diff --git a/changelog.d/16171.misc b/changelog.d/16171.misc
diff --git a/changelog.d/16172.misc b/changelog.d/16172.misc
diff --git a/changelog.d/16175.misc b/changelog.d/16175.misc
diff --git a/changelog.d/16178.doc b/changelog.d/16178.doc
diff --git a/changelog.d/16179.misc b/changelog.d/16179.misc
diff --git a/changelog.d/16180.misc b/changelog.d/16180.misc
diff --git a/changelog.d/16183.misc b/changelog.d/16183.misc
diff --git a/changelog.d/16184.misc b/changelog.d/16184.misc
diff --git a/changelog.d/16185.bugfix b/changelog.d/16185.bugfix
diff --git a/changelog.d/16186.misc b/changelog.d/16186.misc
diff --git a/changelog.d/16187.misc b/changelog.d/16187.misc
diff --git a/changelog.d/16188.misc b/changelog.d/16188.misc
diff --git a/changelog.d/16201.misc b/changelog.d/16201.misc
diff --git a/changelog.d/16205.bugfix b/changelog.d/16205.bugfix
diff --git a/changelog.d/16210.bugfix b/changelog.d/16210.bugfix
diff --git a/changelog.d/16211.bugfix b/changelog.d/16211.bugfix
diff --git a/changelog.d/16212.misc b/changelog.d/16212.misc
diff --git a/changelog.d/16213.misc b/changelog.d/16213.misc
diff --git a/changelog.d/16220.bugfix b/changelog.d/16220.bugfix
diff --git a/changelog.d/16241.misc b/changelog.d/16241.misc
diff --git a/docs/admin_api/account_validity.md b/docs/admin_api/account_validity.md
@@ -1,7 +1,5 @@
 # Account validity API
 
-**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
-
 This API allows a server administrator to manage the validity of an account. To
 use it, you must enable the account validity feature (under
 `account_validity`) in Synapse's configuration.

diff --git a/docs/admin_api/register_api.md b/docs/admin_api/register_api.md
@@ -1,7 +1,5 @@
 # Shared-Secret Registration
 
-**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
-
 This API allows for the creation of users in an administrative and
 non-interactive way. This is generally used for bootstrapping a Synapse
 instance with administrator accounts.

diff --git a/docs/admin_api/user_admin_api.md b/docs/admin_api/user_admin_api.md
@@ -218,7 +218,7 @@ The following parameters should be set in the URL:
 - `name` - Is optional and filters to only return users with user ID localparts
   **or** displaynames that contain this value.
 - `guests` - string representing a bool - Is optional and if `false` will **exclude** guest users.
-  Defaults to `true` to include guest users. This parameter is not supported when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
+  Defaults to `true` to include guest users.
 - `admins` - Optional flag to filter admins. If `true`, only admins are queried. If `false`, admins are excluded from 
   the query. When the flag is absent (the default), **both** admins and non-admins are included in the search results.
 - `deactivated` - string representing a bool - Is optional and if `true` will **include** deactivated users.
@@ -390,8 +390,6 @@ The following actions are **NOT** performed. The list may be incomplete.
 
 ## Reset password
 
-**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
-
 Changes the password of another user. This will automatically log the user out of all their devices.
 
 The api is:
@@ -415,8 +413,6 @@ The parameter `logout_devices` is optional and defaults to `true`.
 
 ## Get whether a user is a server administrator or not
 
-**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
-
 The api is:
 
 ```
@@ -434,8 +430,6 @@ A response body like the following is returned:
 
 ## Change whether a user is a server administrator or not
 
-**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
-
 Note that you cannot demote yourself.
 
 The api is:
@@ -729,8 +723,6 @@ delete largest/smallest or newest/oldest files first.
 
 ## Login as a user
 
-**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
-
 Get an access token that can be used to authenticate as that user. Useful for
 when admins wish to do actions on behalf of a user.
 

diff --git a/docs/development/releases.md b/docs/development/releases.md
@@ -12,7 +12,7 @@ Note that this schedule might be modified depending on the availability of the
 Synapse team, e.g. releases may be skipped to avoid holidays.
 
 Release announcements can be found in the
-[release category of the Matrix blog](https://matrix.org/category/releases).
+[release category of the Matrix blog](https://matrix.org/blog/category/releases).
 
 ## Bugfix releases
 
@@ -34,4 +34,4 @@ be held to be released together.
 
 In some cases, a pre-disclosure of a security release will be issued as a notice
 to Synapse operators that there is an upcoming security release. These can be
-found in the [security category of the Matrix blog](https://matrix.org/category/security).
+found in the [security category of the Matrix blog](https://matrix.org/blog/category/security).
diff --git a/docs/usage/administration/admin_api/registration_tokens.md b/docs/usage/administration/admin_api/registration_tokens.md
@@ -1,7 +1,5 @@
 # Registration Tokens
 
-**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
-
 This API allows you to manage tokens which can be used to authenticate
 registration requests, as proposed in
 [MSC3231](https://github.com/matrix-org/matrix-doc/blob/main/proposals/3231-token-authenticated-registration.md)

diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md
@@ -3420,7 +3420,6 @@ Has the following sub-options:
    to style the login flow according to the identity provider in question.
    See the [spec](https://spec.matrix.org/latest/) for possible options here.
 * `server_url`: The URL of the CAS authorization endpoint.
-* `protocol_version`: The CAS protocol version, defaults to none (version 3 is required if you want to use "required_attributes").
 * `displayname_attribute`: The attribute of the CAS response to use as the display name.
    If no name is given here, no displayname will be set.
 * `required_attributes`:  It is possible to configure Synapse to only allow logins if CAS attributes
@@ -3434,7 +3433,6 @@ Example configuration:
 cas_config:
   enabled: true
   server_url: "https://cas-server.com"
-  protocol_version: 3
   displayname_attribute: name
   required_attributes:
     userGroup: "staff"
@@ -3867,19 +3865,6 @@ Example configuration:
 ```yaml
 forget_rooms_on_leave: false
 ```
----
-### `exclude_rooms_from_sync`
-A list of rooms to exclude from sync responses. This is useful for server
-administrators wishing to group users into a room without these users being able
-to see it from their client.
-
-By default, no room is excluded.
-
-Example configuration:
-```yaml
-exclude_rooms_from_sync:
-    - !foo:example.com
-```
 
 ---
 ## Opentracing

diff --git a/mypy.ini b/mypy.ini
@@ -87,9 +87,18 @@ ignore_missing_imports = True
 [mypy-saml2.*]
 ignore_missing_imports = True
 
+[mypy-service_identity.*]
+ignore_missing_imports = True
+
 [mypy-srvlookup.*]
 ignore_missing_imports = True
 
 # https://github.com/twisted/treq/pull/366
 [mypy-treq.*]
 ignore_missing_imports = True
+
+[mypy-incremental.*]
+ignore_missing_imports = True
+
+[mypy-setuptools_rust.*]
+ignore_missing_imports = True