Compare commits
3 Commits
rav/all_co
...
patch-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
6452c704ce | ||
|
|
0abc0cbe52 | ||
|
|
336a85d1fa |
2
.github/workflows/docker.yml
vendored
2
.github/workflows/docker.yml
vendored
@@ -30,7 +30,7 @@ jobs:
|
|||||||
run: docker buildx inspect
|
run: docker buildx inspect
|
||||||
|
|
||||||
- name: Install Cosign
|
- name: Install Cosign
|
||||||
uses: sigstore/cosign-installer@v3.5.0
|
uses: sigstore/cosign-installer@v3.4.0
|
||||||
|
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|||||||
4
.github/workflows/docs-pr.yaml
vendored
4
.github/workflows/docs-pr.yaml
vendored
@@ -19,7 +19,7 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Setup mdbook
|
- name: Setup mdbook
|
||||||
uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
|
uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
|
||||||
with:
|
with:
|
||||||
mdbook-version: '0.4.17'
|
mdbook-version: '0.4.17'
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup mdbook
|
- name: Setup mdbook
|
||||||
uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
|
uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
|
||||||
with:
|
with:
|
||||||
mdbook-version: '0.4.17'
|
mdbook-version: '0.4.17'
|
||||||
|
|
||||||
|
|||||||
6
.github/workflows/docs.yaml
vendored
6
.github/workflows/docs.yaml
vendored
@@ -56,7 +56,7 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Setup mdbook
|
- name: Setup mdbook
|
||||||
uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
|
uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
|
||||||
with:
|
with:
|
||||||
mdbook-version: '0.4.17'
|
mdbook-version: '0.4.17'
|
||||||
|
|
||||||
@@ -80,7 +80,7 @@ jobs:
|
|||||||
|
|
||||||
# Deploy to the target directory.
|
# Deploy to the target directory.
|
||||||
- name: Deploy to gh pages
|
- name: Deploy to gh pages
|
||||||
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
|
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
publish_dir: ./book
|
publish_dir: ./book
|
||||||
@@ -110,7 +110,7 @@ jobs:
|
|||||||
|
|
||||||
# Deploy to the target directory.
|
# Deploy to the target directory.
|
||||||
- name: Deploy to gh pages
|
- name: Deploy to gh pages
|
||||||
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
|
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
publish_dir: ./dev-docs/_build/html
|
publish_dir: ./dev-docs/_build/html
|
||||||
|
|||||||
18
.github/workflows/tests.yml
vendored
18
.github/workflows/tests.yml
vendored
@@ -81,7 +81,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@1.66.0
|
uses: dtolnay/rust-toolchain@1.65.0
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- uses: matrix-org/setup-python-poetry@v1
|
- uses: matrix-org/setup-python-poetry@v1
|
||||||
with:
|
with:
|
||||||
@@ -148,7 +148,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@1.66.0
|
uses: dtolnay/rust-toolchain@1.65.0
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
- name: Setup Poetry
|
- name: Setup Poetry
|
||||||
@@ -208,7 +208,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
ref: ${{ github.event.pull_request.head.sha }}
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@1.66.0
|
uses: dtolnay/rust-toolchain@1.65.0
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- uses: matrix-org/setup-python-poetry@v1
|
- uses: matrix-org/setup-python-poetry@v1
|
||||||
with:
|
with:
|
||||||
@@ -225,7 +225,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@1.66.0
|
uses: dtolnay/rust-toolchain@1.65.0
|
||||||
with:
|
with:
|
||||||
components: clippy
|
components: clippy
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
@@ -344,7 +344,7 @@ jobs:
|
|||||||
postgres:${{ matrix.job.postgres-version }}
|
postgres:${{ matrix.job.postgres-version }}
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@1.66.0
|
uses: dtolnay/rust-toolchain@1.65.0
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
- uses: matrix-org/setup-python-poetry@v1
|
- uses: matrix-org/setup-python-poetry@v1
|
||||||
@@ -386,7 +386,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@1.66.0
|
uses: dtolnay/rust-toolchain@1.65.0
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
# There aren't wheels for some of the older deps, so we need to install
|
# There aren't wheels for some of the older deps, so we need to install
|
||||||
@@ -498,7 +498,7 @@ jobs:
|
|||||||
run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers
|
run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@1.66.0
|
uses: dtolnay/rust-toolchain@1.65.0
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
- name: Run SyTest
|
- name: Run SyTest
|
||||||
@@ -642,7 +642,7 @@ jobs:
|
|||||||
path: synapse
|
path: synapse
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@1.66.0
|
uses: dtolnay/rust-toolchain@1.65.0
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
- name: Prepare Complement's Prerequisites
|
- name: Prepare Complement's Prerequisites
|
||||||
@@ -674,7 +674,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@1.66.0
|
uses: dtolnay/rust-toolchain@1.65.0
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
- run: cargo test
|
- run: cargo test
|
||||||
|
|||||||
39
CHANGES.md
39
CHANGES.md
@@ -1,42 +1,3 @@
|
|||||||
# Synapse 1.105.0 (2024-04-16)
|
|
||||||
|
|
||||||
No significant changes since 1.105.0rc1.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Synapse 1.105.0rc1 (2024-04-11)
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
- Stabilize support for [MSC4010](https://github.com/matrix-org/matrix-spec-proposals/pull/4010) which clarifies the interaction of push rules and account data. Contributed by @clokep. ([\#17022](https://github.com/element-hq/synapse/issues/17022))
|
|
||||||
- Stabilize support for [MSC3981](https://github.com/matrix-org/matrix-spec-proposals/pull/3981): `/relations` recursion. Contributed by @clokep. ([\#17023](https://github.com/element-hq/synapse/issues/17023))
|
|
||||||
- Add support for moving `/pushrules` off of main process. ([\#17037](https://github.com/element-hq/synapse/issues/17037), [\#17038](https://github.com/element-hq/synapse/issues/17038))
|
|
||||||
|
|
||||||
### Bugfixes
|
|
||||||
|
|
||||||
- Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations. ([\#16930](https://github.com/element-hq/synapse/issues/16930), [\#16932](https://github.com/element-hq/synapse/issues/16932), [\#16942](https://github.com/element-hq/synapse/issues/16942), [\#17064](https://github.com/element-hq/synapse/issues/17064), [\#17065](https://github.com/element-hq/synapse/issues/17065), [\#17066](https://github.com/element-hq/synapse/issues/17066))
|
|
||||||
- Fix server notice rooms not always being created as unencrypted rooms, even when `encryption_enabled_by_default_for_room_type` is in use (server notices are always unencrypted). ([\#17033](https://github.com/element-hq/synapse/issues/17033))
|
|
||||||
- Fix the `.m.rule.encrypted_room_one_to_one` and `.m.rule.room_one_to_one` default underride push rules being in the wrong order. Contributed by @Sumpy1. ([\#17043](https://github.com/element-hq/synapse/issues/17043))
|
|
||||||
|
|
||||||
### Internal Changes
|
|
||||||
|
|
||||||
- Refactor auth chain fetching to reduce duplication. ([\#17044](https://github.com/element-hq/synapse/issues/17044))
|
|
||||||
- Improve database performance by adding a missing index to `access_tokens.refresh_token_id`. ([\#17045](https://github.com/element-hq/synapse/issues/17045), [\#17054](https://github.com/element-hq/synapse/issues/17054))
|
|
||||||
- Improve database performance by reducing number of receipts fetched when sending push notifications. ([\#17049](https://github.com/element-hq/synapse/issues/17049))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### Updates to locked dependencies
|
|
||||||
|
|
||||||
* Bump packaging from 23.2 to 24.0. ([\#17027](https://github.com/element-hq/synapse/issues/17027))
|
|
||||||
* Bump regex from 1.10.3 to 1.10.4. ([\#17028](https://github.com/element-hq/synapse/issues/17028))
|
|
||||||
* Bump ruff from 0.3.2 to 0.3.5. ([\#17060](https://github.com/element-hq/synapse/issues/17060))
|
|
||||||
* Bump serde_json from 1.0.114 to 1.0.115. ([\#17041](https://github.com/element-hq/synapse/issues/17041))
|
|
||||||
* Bump types-pillow from 10.2.0.20240125 to 10.2.0.20240406. ([\#17061](https://github.com/element-hq/synapse/issues/17061))
|
|
||||||
* Bump types-requests from 2.31.0.20240125 to 2.31.0.20240406. ([\#17063](https://github.com/element-hq/synapse/issues/17063))
|
|
||||||
* Bump typing-extensions from 4.9.0 to 4.11.0. ([\#17062](https://github.com/element-hq/synapse/issues/17062))
|
|
||||||
|
|
||||||
# Synapse 1.104.0 (2024-04-02)
|
# Synapse 1.104.0 (2024-04-02)
|
||||||
|
|
||||||
### Bugfixes
|
### Bugfixes
|
||||||
|
|||||||
104
Cargo.lock
generated
104
Cargo.lock
generated
@@ -13,9 +13,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anyhow"
|
name = "anyhow"
|
||||||
version = "1.0.82"
|
version = "1.0.81"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
|
checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arc-swap"
|
name = "arc-swap"
|
||||||
@@ -29,12 +29,6 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "base64"
|
|
||||||
version = "0.21.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "bitflags"
|
||||||
version = "1.3.2"
|
version = "1.3.2"
|
||||||
@@ -59,27 +53,12 @@ dependencies = [
|
|||||||
"generic-array",
|
"generic-array",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bytes"
|
|
||||||
version = "1.6.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cfg-if"
|
name = "cfg-if"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cpufeatures"
|
|
||||||
version = "0.2.12"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crypto-common"
|
name = "crypto-common"
|
||||||
version = "0.1.6"
|
version = "0.1.6"
|
||||||
@@ -101,12 +80,6 @@ dependencies = [
|
|||||||
"subtle",
|
"subtle",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fnv"
|
|
||||||
version = "1.0.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "generic-array"
|
name = "generic-array"
|
||||||
version = "0.14.6"
|
version = "0.14.6"
|
||||||
@@ -117,30 +90,6 @@ dependencies = [
|
|||||||
"version_check",
|
"version_check",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "headers"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
|
|
||||||
dependencies = [
|
|
||||||
"base64",
|
|
||||||
"bytes",
|
|
||||||
"headers-core",
|
|
||||||
"http",
|
|
||||||
"httpdate",
|
|
||||||
"mime",
|
|
||||||
"sha1",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "headers-core"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
|
|
||||||
dependencies = [
|
|
||||||
"http",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "heck"
|
name = "heck"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
@@ -153,23 +102,6 @@ version = "0.4.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "http"
|
|
||||||
version = "1.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
|
|
||||||
dependencies = [
|
|
||||||
"bytes",
|
|
||||||
"fnv",
|
|
||||||
"itoa",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "httpdate"
|
|
||||||
version = "1.0.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indoc"
|
name = "indoc"
|
||||||
version = "2.0.4"
|
version = "2.0.4"
|
||||||
@@ -190,9 +122,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.153"
|
version = "0.2.135"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lock_api"
|
name = "lock_api"
|
||||||
@@ -225,12 +157,6 @@ dependencies = [
|
|||||||
"autocfg",
|
"autocfg",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mime"
|
|
||||||
version = "0.3.17"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "once_cell"
|
name = "once_cell"
|
||||||
version = "1.15.0"
|
version = "1.15.0"
|
||||||
@@ -380,9 +306,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex"
|
name = "regex"
|
||||||
version = "1.10.4"
|
version = "1.10.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
|
checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aho-corasick",
|
"aho-corasick",
|
||||||
"memchr",
|
"memchr",
|
||||||
@@ -441,26 +367,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_json"
|
name = "serde_json"
|
||||||
version = "1.0.115"
|
version = "1.0.114"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
|
checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"itoa",
|
"itoa",
|
||||||
"ryu",
|
"ryu",
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "sha1"
|
|
||||||
version = "0.10.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"cpufeatures",
|
|
||||||
"digest",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "smallvec"
|
name = "smallvec"
|
||||||
version = "1.10.0"
|
version = "1.10.0"
|
||||||
@@ -490,10 +405,7 @@ version = "0.1.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"blake2",
|
"blake2",
|
||||||
"bytes",
|
|
||||||
"headers",
|
|
||||||
"hex",
|
"hex",
|
||||||
"http",
|
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"log",
|
"log",
|
||||||
"pyo3",
|
"pyo3",
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
Adds validation to ensure that the `limit` parameter on `/publicRooms` is non-negative.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Return `400 M_NOT_JSON` upon receiving invalid JSON in query parameters across various client and admin endpoints, rather than an internal server error.
|
|
||||||
1
changelog.d/16930.bugfix
Normal file
1
changelog.d/16930.bugfix
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
|
||||||
1
changelog.d/16932.bugfix
Normal file
1
changelog.d/16932.bugfix
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
|
||||||
1
changelog.d/16942.bugfix
Normal file
1
changelog.d/16942.bugfix
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
|
||||||
@@ -1 +0,0 @@
|
|||||||
Make the CSAPI endpoint `/keys/device_signing/upload` idempotent.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Use new receipts column to optimise receipt and push action SQL queries. Contributed by Nick @ Beeper (@fizzadar).
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Fix mypy with latest Twisted release.
|
|
||||||
1
changelog.d/17037.feature
Normal file
1
changelog.d/17037.feature
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Add support for moving `/pushrules` off of main process.
|
||||||
1
changelog.d/17038.feature
Normal file
1
changelog.d/17038.feature
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Add support for moving `/pushrules` off of main process.
|
||||||
1
changelog.d/17044.misc
Normal file
1
changelog.d/17044.misc
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Refactor auth chain fetching to reduce duplication.
|
||||||
1
changelog.d/17045.misc
Normal file
1
changelog.d/17045.misc
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Improve database performance by adding a missing index to `access_tokens.refresh_token_id`.
|
||||||
1
changelog.d/17049.misc
Normal file
1
changelog.d/17049.misc
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Improve database performance by reducing number of receipts fetched when sending push notifications.
|
||||||
1
changelog.d/17058.doc
Normal file
1
changelog.d/17058.doc
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Document [`/v1/make_knock`](https://spec.matrix.org/v1.10/server-server-api/#get_matrixfederationv1make_knockroomiduserid) and [`/v1/send_knock/](https://spec.matrix.org/v1.10/server-server-api/#put_matrixfederationv1send_knockroomideventid) federation endpoints as worker-compatible.
|
||||||
@@ -1 +0,0 @@
|
|||||||
Add a prompt in the contributing guide to manually configure icu4c.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Bump minimum supported Rust version to 1.66.0.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Add helpers to transform Twisted requests to Rust http Requests/Responses.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Support delegating the rendezvous mechanism described MSC4108 to an external implementation.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Use new receipts column to optimise receipt and push action SQL queries. Contributed by Nick @ Beeper (@fizzadar).
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Clarify what part of message retention is still experimental.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
`complement.sh`: run tests from all test packages.
|
|
||||||
12
debian/changelog
vendored
12
debian/changelog
vendored
@@ -1,15 +1,3 @@
|
|||||||
matrix-synapse-py3 (1.105.0) stable; urgency=medium
|
|
||||||
|
|
||||||
* New Synapse release 1.105.0.
|
|
||||||
|
|
||||||
-- Synapse Packaging team <packages@matrix.org> Tue, 16 Apr 2024 15:53:23 +0100
|
|
||||||
|
|
||||||
matrix-synapse-py3 (1.105.0~rc1) stable; urgency=medium
|
|
||||||
|
|
||||||
* New Synapse release 1.105.0rc1.
|
|
||||||
|
|
||||||
-- Synapse Packaging team <packages@matrix.org> Thu, 11 Apr 2024 12:15:49 +0100
|
|
||||||
|
|
||||||
matrix-synapse-py3 (1.104.0) stable; urgency=medium
|
matrix-synapse-py3 (1.104.0) stable; urgency=medium
|
||||||
|
|
||||||
* New Synapse release 1.104.0.
|
* New Synapse release 1.104.0.
|
||||||
|
|||||||
@@ -102,8 +102,6 @@ experimental_features:
|
|||||||
msc3391_enabled: true
|
msc3391_enabled: true
|
||||||
# Filtering /messages by relation type.
|
# Filtering /messages by relation type.
|
||||||
msc3874_enabled: true
|
msc3874_enabled: true
|
||||||
# no UIA for x-signing upload for the first time
|
|
||||||
msc3967_enabled: true
|
|
||||||
|
|
||||||
server_notices:
|
server_notices:
|
||||||
system_mxid_localpart: _server
|
system_mxid_localpart: _server
|
||||||
|
|||||||
@@ -86,8 +86,6 @@ poetry install --extras all
|
|||||||
This will install the runtime and developer dependencies for the project. Be sure to check
|
This will install the runtime and developer dependencies for the project. Be sure to check
|
||||||
that the `poetry install` step completed cleanly.
|
that the `poetry install` step completed cleanly.
|
||||||
|
|
||||||
For OSX users, be sure to set `PKG_CONFIG_PATH` to support `icu4c`. Run `brew info icu4c` for more details.
|
|
||||||
|
|
||||||
## Running Synapse via poetry
|
## Running Synapse via poetry
|
||||||
|
|
||||||
To start a local instance of Synapse in the locked poetry environment, create a config file:
|
To start a local instance of Synapse in the locked poetry environment, create a config file:
|
||||||
|
|||||||
@@ -7,10 +7,8 @@ follow the semantics described in
|
|||||||
and allow server and room admins to configure how long messages should
|
and allow server and room admins to configure how long messages should
|
||||||
be kept in a homeserver's database before being purged from it.
|
be kept in a homeserver's database before being purged from it.
|
||||||
**Please note that, as this feature isn't part of the Matrix
|
**Please note that, as this feature isn't part of the Matrix
|
||||||
specification yet, the use of `m.room.retention` events for per-room
|
specification yet, this implementation is to be considered as
|
||||||
retention policies is to be considered as experimental. However, the use
|
experimental.**
|
||||||
of a default message retention policy is considered a stable feature
|
|
||||||
in Synapse.**
|
|
||||||
|
|
||||||
A message retention policy is mainly defined by its `max_lifetime`
|
A message retention policy is mainly defined by its `max_lifetime`
|
||||||
parameter, which defines how long a message can be kept around after
|
parameter, which defines how long a message can be kept around after
|
||||||
|
|||||||
@@ -211,6 +211,8 @@ information.
|
|||||||
^/_matrix/federation/v1/make_leave/
|
^/_matrix/federation/v1/make_leave/
|
||||||
^/_matrix/federation/(v1|v2)/send_join/
|
^/_matrix/federation/(v1|v2)/send_join/
|
||||||
^/_matrix/federation/(v1|v2)/send_leave/
|
^/_matrix/federation/(v1|v2)/send_leave/
|
||||||
|
^/_matrix/federation/v1/make_knock/
|
||||||
|
^/_matrix/federation/v1/send_knock/
|
||||||
^/_matrix/federation/(v1|v2)/invite/
|
^/_matrix/federation/(v1|v2)/invite/
|
||||||
^/_matrix/federation/v1/event_auth/
|
^/_matrix/federation/v1/event_auth/
|
||||||
^/_matrix/federation/v1/timestamp_to_event/
|
^/_matrix/federation/v1/timestamp_to_event/
|
||||||
|
|||||||
88
poetry.lock
generated
88
poetry.lock
generated
@@ -1,4 +1,4 @@
|
|||||||
# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
|
# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "alabaster"
|
name = "alabaster"
|
||||||
@@ -1602,13 +1602,13 @@ tests = ["Sphinx", "doubles", "flake8", "flake8-quotes", "gevent", "mock", "pyte
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "packaging"
|
name = "packaging"
|
||||||
version = "24.0"
|
version = "23.2"
|
||||||
description = "Core utilities for Python packages"
|
description = "Core utilities for Python packages"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.7"
|
python-versions = ">=3.7"
|
||||||
files = [
|
files = [
|
||||||
{file = "packaging-24.0-py3-none-any.whl", hash = "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5"},
|
{file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
|
||||||
{file = "packaging-24.0.tar.gz", hash = "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"},
|
{file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1848,17 +1848,17 @@ files = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyasn1-modules"
|
name = "pyasn1-modules"
|
||||||
version = "0.4.0"
|
version = "0.3.0"
|
||||||
description = "A collection of ASN.1-based protocols modules"
|
description = "A collection of ASN.1-based protocols modules"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.8"
|
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
|
||||||
files = [
|
files = [
|
||||||
{file = "pyasn1_modules-0.4.0-py3-none-any.whl", hash = "sha256:be04f15b66c206eed667e0bb5ab27e2b1855ea54a842e5037738099e8ca4ae0b"},
|
{file = "pyasn1_modules-0.3.0-py2.py3-none-any.whl", hash = "sha256:d3ccd6ed470d9ffbc716be08bd90efbd44d0734bc9303818f7336070984a162d"},
|
||||||
{file = "pyasn1_modules-0.4.0.tar.gz", hash = "sha256:831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6"},
|
{file = "pyasn1_modules-0.3.0.tar.gz", hash = "sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.dependencies]
|
[package.dependencies]
|
||||||
pyasn1 = ">=0.4.6,<0.7.0"
|
pyasn1 = ">=0.4.6,<0.6.0"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pycparser"
|
name = "pycparser"
|
||||||
@@ -1983,13 +1983,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pygithub"
|
name = "pygithub"
|
||||||
version = "2.3.0"
|
version = "2.2.0"
|
||||||
description = "Use the full Github API v3"
|
description = "Use the full Github API v3"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.7"
|
python-versions = ">=3.7"
|
||||||
files = [
|
files = [
|
||||||
{file = "PyGithub-2.3.0-py3-none-any.whl", hash = "sha256:65b499728be3ce7b0cd2cd760da3b32f0f4d7bc55e5e0677617f90f6564e793e"},
|
{file = "PyGithub-2.2.0-py3-none-any.whl", hash = "sha256:41042ea53e4c372219db708c38d2ca1fd4fadab75475bac27d89d339596cfad1"},
|
||||||
{file = "PyGithub-2.3.0.tar.gz", hash = "sha256:0148d7347a1cdeed99af905077010aef81a4dad988b0ba51d4108bf66b443f7e"},
|
{file = "PyGithub-2.2.0.tar.gz", hash = "sha256:e39be7c4dc39418bdd6e3ecab5931c636170b8b21b4d26f9ecf7e6102a3b51c3"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.dependencies]
|
[package.dependencies]
|
||||||
@@ -2444,28 +2444,28 @@ files = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruff"
|
name = "ruff"
|
||||||
version = "0.3.7"
|
version = "0.3.2"
|
||||||
description = "An extremely fast Python linter and code formatter, written in Rust."
|
description = "An extremely fast Python linter and code formatter, written in Rust."
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.7"
|
python-versions = ">=3.7"
|
||||||
files = [
|
files = [
|
||||||
{file = "ruff-0.3.7-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:0e8377cccb2f07abd25e84fc5b2cbe48eeb0fea9f1719cad7caedb061d70e5ce"},
|
{file = "ruff-0.3.2-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:77f2612752e25f730da7421ca5e3147b213dca4f9a0f7e0b534e9562c5441f01"},
|
||||||
{file = "ruff-0.3.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:15a4d1cc1e64e556fa0d67bfd388fed416b7f3b26d5d1c3e7d192c897e39ba4b"},
|
{file = "ruff-0.3.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:9966b964b2dd1107797be9ca7195002b874424d1d5472097701ae8f43eadef5d"},
|
||||||
{file = "ruff-0.3.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d28bdf3d7dc71dd46929fafeec98ba89b7c3550c3f0978e36389b5631b793663"},
|
{file = "ruff-0.3.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b83d17ff166aa0659d1e1deaf9f2f14cbe387293a906de09bc4860717eb2e2da"},
|
||||||
{file = "ruff-0.3.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:379b67d4f49774ba679593b232dcd90d9e10f04d96e3c8ce4a28037ae473f7bb"},
|
{file = "ruff-0.3.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb875c6cc87b3703aeda85f01c9aebdce3d217aeaca3c2e52e38077383f7268a"},
|
||||||
{file = "ruff-0.3.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c060aea8ad5ef21cdfbbe05475ab5104ce7827b639a78dd55383a6e9895b7c51"},
|
{file = "ruff-0.3.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:be75e468a6a86426430373d81c041b7605137a28f7014a72d2fc749e47f572aa"},
|
||||||
{file = "ruff-0.3.7-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:ebf8f615dde968272d70502c083ebf963b6781aacd3079081e03b32adfe4d58a"},
|
{file = "ruff-0.3.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:967978ac2d4506255e2f52afe70dda023fc602b283e97685c8447d036863a302"},
|
||||||
{file = "ruff-0.3.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d48098bd8f5c38897b03604f5428901b65e3c97d40b3952e38637b5404b739a2"},
|
{file = "ruff-0.3.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1231eacd4510f73222940727ac927bc5d07667a86b0cbe822024dd00343e77e9"},
|
||||||
{file = "ruff-0.3.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:da8a4fda219bf9024692b1bc68c9cff4b80507879ada8769dc7e985755d662ea"},
|
{file = "ruff-0.3.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c6d613b19e9a8021be2ee1d0e27710208d1603b56f47203d0abbde906929a9b"},
|
||||||
{file = "ruff-0.3.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c44e0149f1d8b48c4d5c33d88c677a4aa22fd09b1683d6a7ff55b816b5d074f"},
|
{file = "ruff-0.3.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8439338a6303585d27b66b4626cbde89bb3e50fa3cae86ce52c1db7449330a7"},
|
||||||
{file = "ruff-0.3.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3050ec0af72b709a62ecc2aca941b9cd479a7bf2b36cc4562f0033d688e44fa1"},
|
{file = "ruff-0.3.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:de8b480d8379620cbb5ea466a9e53bb467d2fb07c7eca54a4aa8576483c35d36"},
|
||||||
{file = "ruff-0.3.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:a29cc38e4c1ab00da18a3f6777f8b50099d73326981bb7d182e54a9a21bb4ff7"},
|
{file = "ruff-0.3.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b74c3de9103bd35df2bb05d8b2899bf2dbe4efda6474ea9681280648ec4d237d"},
|
||||||
{file = "ruff-0.3.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:5b15cc59c19edca917f51b1956637db47e200b0fc5e6e1878233d3a938384b0b"},
|
{file = "ruff-0.3.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:f380be9fc15a99765c9cf316b40b9da1f6ad2ab9639e551703e581a5e6da6745"},
|
||||||
{file = "ruff-0.3.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:e491045781b1e38b72c91247cf4634f040f8d0cb3e6d3d64d38dcf43616650b4"},
|
{file = "ruff-0.3.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:0ac06a3759c3ab9ef86bbeca665d31ad3aa9a4b1c17684aadb7e61c10baa0df4"},
|
||||||
{file = "ruff-0.3.7-py3-none-win32.whl", hash = "sha256:bc931de87593d64fad3a22e201e55ad76271f1d5bfc44e1a1887edd0903c7d9f"},
|
{file = "ruff-0.3.2-py3-none-win32.whl", hash = "sha256:9bd640a8f7dd07a0b6901fcebccedadeb1a705a50350fb86b4003b805c81385a"},
|
||||||
{file = "ruff-0.3.7-py3-none-win_amd64.whl", hash = "sha256:5ef0e501e1e39f35e03c2acb1d1238c595b8bb36cf7a170e7c1df1b73da00e74"},
|
{file = "ruff-0.3.2-py3-none-win_amd64.whl", hash = "sha256:0c1bdd9920cab5707c26c8b3bf33a064a4ca7842d91a99ec0634fec68f9f4037"},
|
||||||
{file = "ruff-0.3.7-py3-none-win_arm64.whl", hash = "sha256:789e144f6dc7019d1f92a812891c645274ed08af6037d11fc65fcbc183b7d59f"},
|
{file = "ruff-0.3.2-py3-none-win_arm64.whl", hash = "sha256:5f65103b1d76e0d600cabd577b04179ff592064eaa451a70a81085930e907d0b"},
|
||||||
{file = "ruff-0.3.7.tar.gz", hash = "sha256:d5c1aebee5162c2226784800ae031f660c350e7a3402c4d1f8ea4e97e232e3ba"},
|
{file = "ruff-0.3.2.tar.gz", hash = "sha256:fa78ec9418eb1ca3db392811df3376b46471ae93792a81af2d1cbb0e5dcb5142"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2954,13 +2954,13 @@ docs = ["sphinx (<7.0.0)"]
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "twine"
|
name = "twine"
|
||||||
version = "5.0.0"
|
version = "4.0.2"
|
||||||
description = "Collection of utilities for publishing packages on PyPI"
|
description = "Collection of utilities for publishing packages on PyPI"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.8"
|
python-versions = ">=3.7"
|
||||||
files = [
|
files = [
|
||||||
{file = "twine-5.0.0-py3-none-any.whl", hash = "sha256:a262933de0b484c53408f9edae2e7821c1c45a3314ff2df9bdd343aa7ab8edc0"},
|
{file = "twine-4.0.2-py3-none-any.whl", hash = "sha256:929bc3c280033347a00f847236564d1c52a3e61b1ac2516c97c48f3ceab756d8"},
|
||||||
{file = "twine-5.0.0.tar.gz", hash = "sha256:89b0cc7d370a4b66421cc6102f269aa910fe0f1861c124f573cf2ddedbc10cf4"},
|
{file = "twine-4.0.2.tar.gz", hash = "sha256:9e102ef5fdd5a20661eb88fad46338806c3bd32cf1db729603fe3697b1bc83c8"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.dependencies]
|
[package.dependencies]
|
||||||
@@ -3109,13 +3109,13 @@ files = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "types-pillow"
|
name = "types-pillow"
|
||||||
version = "10.2.0.20240415"
|
version = "10.2.0.20240125"
|
||||||
description = "Typing stubs for Pillow"
|
description = "Typing stubs for Pillow"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.8"
|
python-versions = ">=3.8"
|
||||||
files = [
|
files = [
|
||||||
{file = "types-Pillow-10.2.0.20240415.tar.gz", hash = "sha256:dd6058027639bcdc66ba78b228cc25fdae42524c2150c78c804da427e7e76e70"},
|
{file = "types-Pillow-10.2.0.20240125.tar.gz", hash = "sha256:c449b2c43b9fdbe0494a7b950e6b39a4e50516091213fec24ef3f33c1d017717"},
|
||||||
{file = "types_Pillow-10.2.0.20240415-py3-none-any.whl", hash = "sha256:f933332b7e96010bae9b9cf82a4c9979ff0c270d63f5c5bbffb2d789b85cd00b"},
|
{file = "types_Pillow-10.2.0.20240125-py3-none-any.whl", hash = "sha256:322dbae32b4b7918da5e8a47c50ac0f24b0aa72a804a23857620f2722b03c858"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3156,13 +3156,13 @@ files = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "types-requests"
|
name = "types-requests"
|
||||||
version = "2.31.0.20240406"
|
version = "2.31.0.20240125"
|
||||||
description = "Typing stubs for requests"
|
description = "Typing stubs for requests"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.8"
|
python-versions = ">=3.8"
|
||||||
files = [
|
files = [
|
||||||
{file = "types-requests-2.31.0.20240406.tar.gz", hash = "sha256:4428df33c5503945c74b3f42e82b181e86ec7b724620419a2966e2de604ce1a1"},
|
{file = "types-requests-2.31.0.20240125.tar.gz", hash = "sha256:03a28ce1d7cd54199148e043b2079cdded22d6795d19a2c2a6791a4b2b5e2eb5"},
|
||||||
{file = "types_requests-2.31.0.20240406-py3-none-any.whl", hash = "sha256:6216cdac377c6b9a040ac1c0404f7284bd13199c0e1bb235f4324627e8898cf5"},
|
{file = "types_requests-2.31.0.20240125-py3-none-any.whl", hash = "sha256:9592a9a4cb92d6d75d9b491a41477272b710e021011a2a3061157e2fb1f1a5d1"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.dependencies]
|
[package.dependencies]
|
||||||
@@ -3181,13 +3181,13 @@ files = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "typing-extensions"
|
name = "typing-extensions"
|
||||||
version = "4.11.0"
|
version = "4.9.0"
|
||||||
description = "Backported and Experimental Type Hints for Python 3.8+"
|
description = "Backported and Experimental Type Hints for Python 3.8+"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.8"
|
python-versions = ">=3.8"
|
||||||
files = [
|
files = [
|
||||||
{file = "typing_extensions-4.11.0-py3-none-any.whl", hash = "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"},
|
{file = "typing_extensions-4.9.0-py3-none-any.whl", hash = "sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd"},
|
||||||
{file = "typing_extensions-4.11.0.tar.gz", hash = "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0"},
|
{file = "typing_extensions-4.9.0.tar.gz", hash = "sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3451,4 +3451,4 @@ user-search = ["pyicu"]
|
|||||||
[metadata]
|
[metadata]
|
||||||
lock-version = "2.0"
|
lock-version = "2.0"
|
||||||
python-versions = "^3.8.0"
|
python-versions = "^3.8.0"
|
||||||
content-hash = "1951f2b4623138d47db08a405edd970e67599d05804bb459af21a085e1665f69"
|
content-hash = "b510fa05f4ea33194bec079f5d04ebb3f9ffbb5c1ea96a0341d57ba770ef81e6"
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
|
|||||||
|
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "matrix-synapse"
|
name = "matrix-synapse"
|
||||||
version = "1.105.0"
|
version = "1.104.0"
|
||||||
description = "Homeserver for the Matrix decentralised comms protocol"
|
description = "Homeserver for the Matrix decentralised comms protocol"
|
||||||
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
|
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
@@ -321,7 +321,7 @@ all = [
|
|||||||
# This helps prevents merge conflicts when running a batch of dependabot updates.
|
# This helps prevents merge conflicts when running a batch of dependabot updates.
|
||||||
isort = ">=5.10.1"
|
isort = ">=5.10.1"
|
||||||
black = ">=22.7.0"
|
black = ">=22.7.0"
|
||||||
ruff = "0.3.7"
|
ruff = "0.3.2"
|
||||||
# Type checking only works with the pydantic.v1 compat module from pydantic v2
|
# Type checking only works with the pydantic.v1 compat module from pydantic v2
|
||||||
pydantic = "^2"
|
pydantic = "^2"
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ name = "synapse"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.66.0"
|
rust-version = "1.65.0"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
name = "synapse"
|
name = "synapse"
|
||||||
@@ -23,9 +23,6 @@ name = "synapse.synapse_rust"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0.63"
|
anyhow = "1.0.63"
|
||||||
bytes = "1.6.0"
|
|
||||||
headers = "0.4.0"
|
|
||||||
http = "1.1.0"
|
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
log = "0.4.17"
|
log = "0.4.17"
|
||||||
pyo3 = { version = "0.20.0", features = [
|
pyo3 = { version = "0.20.0", features = [
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2024 New Vector, Ltd
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* See the GNU Affero General Public License for more details:
|
|
||||||
* <https://www.gnu.org/licenses/agpl-3.0.html>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#![allow(clippy::new_ret_no_self)]
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
use http::{HeaderMap, StatusCode};
|
|
||||||
use pyo3::{exceptions::PyValueError, import_exception};
|
|
||||||
|
|
||||||
import_exception!(synapse.api.errors, SynapseError);
|
|
||||||
|
|
||||||
impl SynapseError {
|
|
||||||
pub fn new(
|
|
||||||
code: StatusCode,
|
|
||||||
message: String,
|
|
||||||
errcode: &'static str,
|
|
||||||
additional_fields: Option<HashMap<String, String>>,
|
|
||||||
headers: Option<HeaderMap>,
|
|
||||||
) -> pyo3::PyErr {
|
|
||||||
// Transform the HeaderMap into a HashMap<String, String>
|
|
||||||
let headers = if let Some(headers) = headers {
|
|
||||||
let mut map = HashMap::with_capacity(headers.len());
|
|
||||||
for (key, value) in headers.iter() {
|
|
||||||
let Ok(value) = value.to_str() else {
|
|
||||||
// This should never happen, but we don't want to panic in case it does
|
|
||||||
return PyValueError::new_err(
|
|
||||||
"Could not construct SynapseError: header value is not valid ASCII",
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
map.insert(key.as_str().to_owned(), value.to_owned());
|
|
||||||
}
|
|
||||||
Some(map)
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
|
|
||||||
SynapseError::new_err((code.as_u16(), message, errcode, additional_fields, headers))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
import_exception!(synapse.api.errors, NotFoundError);
|
|
||||||
|
|
||||||
impl NotFoundError {
|
|
||||||
pub fn new() -> pyo3::PyErr {
|
|
||||||
NotFoundError::new_err(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
165
rust/src/http.rs
165
rust/src/http.rs
@@ -1,165 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2024 New Vector, Ltd
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* See the GNU Affero General Public License for more details:
|
|
||||||
* <https://www.gnu.org/licenses/agpl-3.0.html>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use bytes::{Buf, BufMut, Bytes, BytesMut};
|
|
||||||
use headers::{Header, HeaderMapExt};
|
|
||||||
use http::{HeaderName, HeaderValue, Method, Request, Response, StatusCode, Uri};
|
|
||||||
use pyo3::{
|
|
||||||
exceptions::PyValueError,
|
|
||||||
types::{PyBytes, PySequence, PyTuple},
|
|
||||||
PyAny, PyResult,
|
|
||||||
};
|
|
||||||
|
|
||||||
use crate::errors::SynapseError;
|
|
||||||
|
|
||||||
/// Read a file-like Python object by chunks
|
|
||||||
///
|
|
||||||
/// # Errors
|
|
||||||
///
|
|
||||||
/// Returns an error if calling the `read` on the Python object failed
|
|
||||||
fn read_io_body(body: &PyAny, chunk_size: usize) -> PyResult<Bytes> {
|
|
||||||
let mut buf = BytesMut::new();
|
|
||||||
loop {
|
|
||||||
let bytes: &PyBytes = body.call_method1("read", (chunk_size,))?.downcast()?;
|
|
||||||
if bytes.as_bytes().is_empty() {
|
|
||||||
return Ok(buf.into());
|
|
||||||
}
|
|
||||||
buf.put(bytes.as_bytes());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Transform a Twisted `IRequest` to an [`http::Request`]
|
|
||||||
///
|
|
||||||
/// It uses the following members of `IRequest`:
|
|
||||||
/// - `content`, which is expected to be a file-like object with a `read` method
|
|
||||||
/// - `uri`, which is expected to be a valid URI as `bytes`
|
|
||||||
/// - `method`, which is expected to be a valid HTTP method as `bytes`
|
|
||||||
/// - `requestHeaders`, which is expected to have a `getAllRawHeaders` method
|
|
||||||
///
|
|
||||||
/// # Errors
|
|
||||||
///
|
|
||||||
/// Returns an error if the Python object doesn't properly implement `IRequest`
|
|
||||||
pub fn http_request_from_twisted(request: &PyAny) -> PyResult<Request<Bytes>> {
|
|
||||||
let content = request.getattr("content")?;
|
|
||||||
let body = read_io_body(content, 4096)?;
|
|
||||||
|
|
||||||
let mut req = Request::new(body);
|
|
||||||
|
|
||||||
let uri: &PyBytes = request.getattr("uri")?.downcast()?;
|
|
||||||
*req.uri_mut() =
|
|
||||||
Uri::try_from(uri.as_bytes()).map_err(|_| PyValueError::new_err("invalid uri"))?;
|
|
||||||
|
|
||||||
let method: &PyBytes = request.getattr("method")?.downcast()?;
|
|
||||||
*req.method_mut() = Method::from_bytes(method.as_bytes())
|
|
||||||
.map_err(|_| PyValueError::new_err("invalid method"))?;
|
|
||||||
|
|
||||||
let headers_iter = request
|
|
||||||
.getattr("requestHeaders")?
|
|
||||||
.call_method0("getAllRawHeaders")?
|
|
||||||
.iter()?;
|
|
||||||
|
|
||||||
for header in headers_iter {
|
|
||||||
let header = header?;
|
|
||||||
let header: &PyTuple = header.downcast()?;
|
|
||||||
let name: &PyBytes = header.get_item(0)?.downcast()?;
|
|
||||||
let name = HeaderName::from_bytes(name.as_bytes())
|
|
||||||
.map_err(|_| PyValueError::new_err("invalid header name"))?;
|
|
||||||
|
|
||||||
let values: &PySequence = header.get_item(1)?.downcast()?;
|
|
||||||
for index in 0..values.len()? {
|
|
||||||
let value: &PyBytes = values.get_item(index)?.downcast()?;
|
|
||||||
let value = HeaderValue::from_bytes(value.as_bytes())
|
|
||||||
.map_err(|_| PyValueError::new_err("invalid header value"))?;
|
|
||||||
req.headers_mut().append(name.clone(), value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(req)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Send an [`http::Response`] through a Twisted `IRequest`
|
|
||||||
///
|
|
||||||
/// It uses the following members of `IRequest`:
|
|
||||||
///
|
|
||||||
/// - `responseHeaders`, which is expected to have a `addRawHeader(bytes, bytes)` method
|
|
||||||
/// - `setResponseCode(int)` method
|
|
||||||
/// - `write(bytes)` method
|
|
||||||
/// - `finish()` method
|
|
||||||
///
|
|
||||||
/// # Errors
|
|
||||||
///
|
|
||||||
/// Returns an error if the Python object doesn't properly implement `IRequest`
|
|
||||||
pub fn http_response_to_twisted<B>(request: &PyAny, response: Response<B>) -> PyResult<()>
|
|
||||||
where
|
|
||||||
B: Buf,
|
|
||||||
{
|
|
||||||
let (parts, mut body) = response.into_parts();
|
|
||||||
|
|
||||||
request.call_method1("setResponseCode", (parts.status.as_u16(),))?;
|
|
||||||
|
|
||||||
let response_headers = request.getattr("responseHeaders")?;
|
|
||||||
for (name, value) in parts.headers.iter() {
|
|
||||||
response_headers.call_method1("addRawHeader", (name.as_str(), value.as_bytes()))?;
|
|
||||||
}
|
|
||||||
|
|
||||||
while body.remaining() != 0 {
|
|
||||||
let chunk = body.chunk();
|
|
||||||
request.call_method1("write", (chunk,))?;
|
|
||||||
body.advance(chunk.len());
|
|
||||||
}
|
|
||||||
|
|
||||||
request.call_method0("finish")?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// An extension trait for [`HeaderMap`] that provides typed access to headers, and throws the
|
|
||||||
/// right python exceptions when the header is missing or fails to parse.
|
|
||||||
///
|
|
||||||
/// [`HeaderMap`]: headers::HeaderMap
|
|
||||||
pub trait HeaderMapPyExt: HeaderMapExt {
|
|
||||||
/// Get a header from the map, returning an error if it is missing or invalid.
|
|
||||||
fn typed_get_required<H>(&self) -> PyResult<H>
|
|
||||||
where
|
|
||||||
H: Header,
|
|
||||||
{
|
|
||||||
self.typed_get_optional::<H>()?.ok_or_else(|| {
|
|
||||||
SynapseError::new(
|
|
||||||
StatusCode::BAD_REQUEST,
|
|
||||||
format!("Missing required header: {}", H::name()),
|
|
||||||
"M_MISSING_PARAM",
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Get a header from the map, returning `None` if it is missing and an error if it is invalid.
|
|
||||||
fn typed_get_optional<H>(&self) -> PyResult<Option<H>>
|
|
||||||
where
|
|
||||||
H: Header,
|
|
||||||
{
|
|
||||||
self.typed_try_get::<H>().map_err(|_| {
|
|
||||||
SynapseError::new(
|
|
||||||
StatusCode::BAD_REQUEST,
|
|
||||||
format!("Invalid header: {}", H::name()),
|
|
||||||
"M_INVALID_PARAM",
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<T: HeaderMapExt> HeaderMapPyExt for T {}
|
|
||||||
@@ -3,9 +3,7 @@ use pyo3::prelude::*;
|
|||||||
use pyo3_log::ResetHandle;
|
use pyo3_log::ResetHandle;
|
||||||
|
|
||||||
pub mod acl;
|
pub mod acl;
|
||||||
pub mod errors;
|
|
||||||
pub mod events;
|
pub mod events;
|
||||||
pub mod http;
|
|
||||||
pub mod push;
|
pub mod push;
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
|
|||||||
@@ -304,12 +304,12 @@ pub const BASE_APPEND_UNDERRIDE_RULES: &[PushRule] = &[
|
|||||||
default_enabled: true,
|
default_enabled: true,
|
||||||
},
|
},
|
||||||
PushRule {
|
PushRule {
|
||||||
rule_id: Cow::Borrowed("global/underride/.m.rule.encrypted_room_one_to_one"),
|
rule_id: Cow::Borrowed("global/underride/.m.rule.room_one_to_one"),
|
||||||
priority_class: 1,
|
priority_class: 1,
|
||||||
conditions: Cow::Borrowed(&[
|
conditions: Cow::Borrowed(&[
|
||||||
Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
|
Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
|
||||||
key: Cow::Borrowed("type"),
|
key: Cow::Borrowed("type"),
|
||||||
pattern: Cow::Borrowed("m.room.encrypted"),
|
pattern: Cow::Borrowed("m.room.message"),
|
||||||
})),
|
})),
|
||||||
Condition::Known(KnownCondition::RoomMemberCount {
|
Condition::Known(KnownCondition::RoomMemberCount {
|
||||||
is: Some(Cow::Borrowed("2")),
|
is: Some(Cow::Borrowed("2")),
|
||||||
@@ -320,12 +320,12 @@ pub const BASE_APPEND_UNDERRIDE_RULES: &[PushRule] = &[
|
|||||||
default_enabled: true,
|
default_enabled: true,
|
||||||
},
|
},
|
||||||
PushRule {
|
PushRule {
|
||||||
rule_id: Cow::Borrowed("global/underride/.m.rule.room_one_to_one"),
|
rule_id: Cow::Borrowed("global/underride/.m.rule.encrypted_room_one_to_one"),
|
||||||
priority_class: 1,
|
priority_class: 1,
|
||||||
conditions: Cow::Borrowed(&[
|
conditions: Cow::Borrowed(&[
|
||||||
Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
|
Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
|
||||||
key: Cow::Borrowed("type"),
|
key: Cow::Borrowed("type"),
|
||||||
pattern: Cow::Borrowed("m.room.message"),
|
pattern: Cow::Borrowed("m.room.encrypted"),
|
||||||
})),
|
})),
|
||||||
Condition::Known(KnownCondition::RoomMemberCount {
|
Condition::Known(KnownCondition::RoomMemberCount {
|
||||||
is: Some(Cow::Borrowed("2")),
|
is: Some(Cow::Borrowed("2")),
|
||||||
|
|||||||
@@ -214,6 +214,8 @@ fi
|
|||||||
|
|
||||||
extra_test_args=()
|
extra_test_args=()
|
||||||
|
|
||||||
|
test_packages="./tests/csapi ./tests ./tests/msc3874 ./tests/msc3890 ./tests/msc3391 ./tests/msc3930 ./tests/msc3902"
|
||||||
|
|
||||||
# Enable dirty runs, so tests will reuse the same container where possible.
|
# Enable dirty runs, so tests will reuse the same container where possible.
|
||||||
# This significantly speeds up tests, but increases the possibility of test pollution.
|
# This significantly speeds up tests, but increases the possibility of test pollution.
|
||||||
export COMPLEMENT_ENABLE_DIRTY_RUNS=1
|
export COMPLEMENT_ENABLE_DIRTY_RUNS=1
|
||||||
@@ -276,12 +278,7 @@ fi
|
|||||||
export PASS_SYNAPSE_LOG_TESTING=1
|
export PASS_SYNAPSE_LOG_TESTING=1
|
||||||
|
|
||||||
# Run the tests!
|
# Run the tests!
|
||||||
|
echo "Images built; running complement with ${extra_test_args[@]} $@ $test_packages"
|
||||||
cd "$COMPLEMENT_DIR"
|
cd "$COMPLEMENT_DIR"
|
||||||
|
|
||||||
# This isn't whitespace-safe but *does* work on the prehistoric version of bash
|
go test -v -tags "synapse_blacklist" -count=1 "${extra_test_args[@]}" "$@" $test_packages
|
||||||
# on OSX.
|
|
||||||
test_packages=( $(find ./tests -type d) )
|
|
||||||
|
|
||||||
echo "Images built; running complement with ${extra_test_args[@]} $@ ${test_packages[@]}"
|
|
||||||
|
|
||||||
go test -v -tags "synapse_blacklist" -count=1 "${extra_test_args[@]}" "$@" "${test_packages[@]}"
|
|
||||||
|
|||||||
@@ -393,6 +393,11 @@ class ExperimentalConfig(Config):
|
|||||||
# MSC3967: Do not require UIA when first uploading cross signing keys
|
# MSC3967: Do not require UIA when first uploading cross signing keys
|
||||||
self.msc3967_enabled = experimental.get("msc3967_enabled", False)
|
self.msc3967_enabled = experimental.get("msc3967_enabled", False)
|
||||||
|
|
||||||
|
# MSC3981: Recurse relations
|
||||||
|
self.msc3981_recurse_relations = experimental.get(
|
||||||
|
"msc3981_recurse_relations", False
|
||||||
|
)
|
||||||
|
|
||||||
# MSC3861: Matrix architecture change to delegate authentication via OIDC
|
# MSC3861: Matrix architecture change to delegate authentication via OIDC
|
||||||
try:
|
try:
|
||||||
self.msc3861 = MSC3861(**experimental.get("msc3861", {}))
|
self.msc3861 = MSC3861(**experimental.get("msc3861", {}))
|
||||||
@@ -404,6 +409,11 @@ class ExperimentalConfig(Config):
|
|||||||
# Check that none of the other config options conflict with MSC3861 when enabled
|
# Check that none of the other config options conflict with MSC3861 when enabled
|
||||||
self.msc3861.check_config_conflicts(self.root)
|
self.msc3861.check_config_conflicts(self.root)
|
||||||
|
|
||||||
|
# MSC4010: Do not allow setting m.push_rules account data.
|
||||||
|
self.msc4010_push_rules_account_data = experimental.get(
|
||||||
|
"msc4010_push_rules_account_data", False
|
||||||
|
)
|
||||||
|
|
||||||
self.msc4028_push_encrypted_events = experimental.get(
|
self.msc4028_push_encrypted_events = experimental.get(
|
||||||
"msc4028_push_encrypted_events", False
|
"msc4028_push_encrypted_events", False
|
||||||
)
|
)
|
||||||
@@ -411,14 +421,3 @@ class ExperimentalConfig(Config):
|
|||||||
self.msc4069_profile_inhibit_propagation = experimental.get(
|
self.msc4069_profile_inhibit_propagation = experimental.get(
|
||||||
"msc4069_profile_inhibit_propagation", False
|
"msc4069_profile_inhibit_propagation", False
|
||||||
)
|
)
|
||||||
|
|
||||||
# MSC4108: Mechanism to allow OIDC sign in and E2EE set up via QR code
|
|
||||||
self.msc4108_delegation_endpoint: Optional[str] = experimental.get(
|
|
||||||
"msc4108_delegation_endpoint", None
|
|
||||||
)
|
|
||||||
|
|
||||||
if self.msc4108_delegation_endpoint is not None and not self.msc3861.enabled:
|
|
||||||
raise ConfigError(
|
|
||||||
"MSC4108 requires MSC3861 to be enabled",
|
|
||||||
("experimental", "msc4108_delegation_endpoint"),
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -1476,42 +1476,6 @@ class E2eKeysHandler:
|
|||||||
else:
|
else:
|
||||||
return exists, self.clock.time_msec() < ts_replacable_without_uia_before
|
return exists, self.clock.time_msec() < ts_replacable_without_uia_before
|
||||||
|
|
||||||
async def has_different_keys(self, user_id: str, body: JsonDict) -> bool:
|
|
||||||
"""
|
|
||||||
Check if a key provided in `body` differs from the same key stored in the DB. Returns
|
|
||||||
true on the first difference. If a key exists in `body` but does not exist in the DB,
|
|
||||||
returns True. If `body` has no keys, this always returns False.
|
|
||||||
Note by 'key' we mean Matrix key rather than JSON key.
|
|
||||||
|
|
||||||
The purpose of this function is to detect whether or not we need to apply UIA checks.
|
|
||||||
We must apply UIA checks if any key in the database is being overwritten. If a key is
|
|
||||||
being inserted for the first time, or if the key exactly matches what is in the database,
|
|
||||||
then no UIA check needs to be performed.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
user_id: The user who sent the `body`.
|
|
||||||
body: The JSON request body from POST /keys/device_signing/upload
|
|
||||||
Returns:
|
|
||||||
True if any key in `body` has a different value in the database.
|
|
||||||
"""
|
|
||||||
# Ensure that each key provided in the request body exactly matches the one we have stored.
|
|
||||||
# The first time we see the DB having a different key to the matching request key, bail.
|
|
||||||
# Note: we do not care if the DB has a key which the request does not specify, as we only
|
|
||||||
# care about *replacements* or *insertions* (i.e UPSERT)
|
|
||||||
req_body_key_to_db_key = {
|
|
||||||
"master_key": "master",
|
|
||||||
"self_signing_key": "self_signing",
|
|
||||||
"user_signing_key": "user_signing",
|
|
||||||
}
|
|
||||||
for req_body_key, db_key in req_body_key_to_db_key.items():
|
|
||||||
if req_body_key in body:
|
|
||||||
existing_key = await self.store.get_e2e_cross_signing_key(
|
|
||||||
user_id, db_key
|
|
||||||
)
|
|
||||||
if existing_key != body[req_body_key]:
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _check_cross_signing_key(
|
def _check_cross_signing_key(
|
||||||
key: JsonDict, user_id: str, key_type: str, signing_key: Optional[VerifyKey] = None
|
key: JsonDict, user_id: str, key_type: str, signing_key: Optional[VerifyKey] = None
|
||||||
|
|||||||
@@ -956,7 +956,6 @@ class RoomCreationHandler:
|
|||||||
room_alias=room_alias,
|
room_alias=room_alias,
|
||||||
power_level_content_override=power_level_content_override,
|
power_level_content_override=power_level_content_override,
|
||||||
creator_join_profile=creator_join_profile,
|
creator_join_profile=creator_join_profile,
|
||||||
ignore_forced_encryption=ignore_forced_encryption,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# we avoid dropping the lock between invites, as otherwise joins can
|
# we avoid dropping the lock between invites, as otherwise joins can
|
||||||
|
|||||||
@@ -1259,51 +1259,6 @@ class SyncHandler:
|
|||||||
await_full_state = True
|
await_full_state = True
|
||||||
lazy_load_members = False
|
lazy_load_members = False
|
||||||
|
|
||||||
# For a non-gappy sync if the events in the timeline are simply a linear
|
|
||||||
# chain (i.e. no merging/branching of the graph), then we know the state
|
|
||||||
# delta between the end of the previous sync and start of the new one is
|
|
||||||
# empty.
|
|
||||||
#
|
|
||||||
# c.f. #16941 for an example of why we can't do this for all non-gappy
|
|
||||||
# syncs.
|
|
||||||
is_linear_timeline = True
|
|
||||||
if batch.events:
|
|
||||||
# We need to make sure the first event in our batch points to the
|
|
||||||
# last event in the previous batch.
|
|
||||||
last_event_id_prev_batch = (
|
|
||||||
await self.store.get_last_event_in_room_before_stream_ordering(
|
|
||||||
room_id,
|
|
||||||
end_token=since_token.room_key,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
prev_event_id = last_event_id_prev_batch
|
|
||||||
for e in batch.events:
|
|
||||||
if e.prev_event_ids() != [prev_event_id]:
|
|
||||||
is_linear_timeline = False
|
|
||||||
break
|
|
||||||
prev_event_id = e.event_id
|
|
||||||
|
|
||||||
if is_linear_timeline and not batch.limited:
|
|
||||||
state_ids: StateMap[str] = {}
|
|
||||||
if lazy_load_members:
|
|
||||||
if members_to_fetch and batch.events:
|
|
||||||
# We're lazy-loading, so the client might need some more
|
|
||||||
# member events to understand the events in this timeline.
|
|
||||||
# So we fish out all the member events corresponding to the
|
|
||||||
# timeline here. The caller will then dedupe any redundant
|
|
||||||
# ones.
|
|
||||||
|
|
||||||
state_ids = await self._state_storage_controller.get_state_ids_for_event(
|
|
||||||
batch.events[0].event_id,
|
|
||||||
# we only want members!
|
|
||||||
state_filter=StateFilter.from_types(
|
|
||||||
(EventTypes.Member, member) for member in members_to_fetch
|
|
||||||
),
|
|
||||||
await_full_state=False,
|
|
||||||
)
|
|
||||||
return state_ids
|
|
||||||
|
|
||||||
if batch:
|
if batch:
|
||||||
state_at_timeline_start = (
|
state_at_timeline_start = (
|
||||||
await self._state_storage_controller.get_state_ids_for_event(
|
await self._state_storage_controller.get_state_ids_for_event(
|
||||||
|
|||||||
@@ -262,8 +262,7 @@ class _ProxyResponseBody(protocol.Protocol):
|
|||||||
self._request.finish()
|
self._request.finish()
|
||||||
else:
|
else:
|
||||||
# Abort the underlying request since our remote request also failed.
|
# Abort the underlying request since our remote request also failed.
|
||||||
if self._request.channel:
|
self._request.transport.abortConnection()
|
||||||
self._request.channel.forceAbortClient()
|
|
||||||
|
|
||||||
|
|
||||||
class ProxySite(Site):
|
class ProxySite(Site):
|
||||||
|
|||||||
@@ -153,9 +153,9 @@ def return_json_error(
|
|||||||
# Only respond with an error response if we haven't already started writing,
|
# Only respond with an error response if we haven't already started writing,
|
||||||
# otherwise lets just kill the connection
|
# otherwise lets just kill the connection
|
||||||
if request.startedWriting:
|
if request.startedWriting:
|
||||||
if request.channel:
|
if request.transport:
|
||||||
try:
|
try:
|
||||||
request.channel.forceAbortClient()
|
request.transport.abortConnection()
|
||||||
except Exception:
|
except Exception:
|
||||||
# abortConnection throws if the connection is already closed
|
# abortConnection throws if the connection is already closed
|
||||||
pass
|
pass
|
||||||
@@ -909,18 +909,7 @@ def set_cors_headers(request: "SynapseRequest") -> None:
|
|||||||
request.setHeader(
|
request.setHeader(
|
||||||
b"Access-Control-Allow-Methods", b"GET, HEAD, POST, PUT, DELETE, OPTIONS"
|
b"Access-Control-Allow-Methods", b"GET, HEAD, POST, PUT, DELETE, OPTIONS"
|
||||||
)
|
)
|
||||||
if request.path is not None and request.path.startswith(
|
if request.experimental_cors_msc3886:
|
||||||
b"/_matrix/client/unstable/org.matrix.msc4108/rendezvous"
|
|
||||||
):
|
|
||||||
request.setHeader(
|
|
||||||
b"Access-Control-Allow-Headers",
|
|
||||||
b"Content-Type, If-Match, If-None-Match",
|
|
||||||
)
|
|
||||||
request.setHeader(
|
|
||||||
b"Access-Control-Expose-Headers",
|
|
||||||
b"Synapse-Trace-Id, Server, ETag",
|
|
||||||
)
|
|
||||||
elif request.experimental_cors_msc3886:
|
|
||||||
request.setHeader(
|
request.setHeader(
|
||||||
b"Access-Control-Allow-Headers",
|
b"Access-Control-Allow-Headers",
|
||||||
b"X-Requested-With, Content-Type, Authorization, Date, If-Match, If-None-Match",
|
b"X-Requested-With, Content-Type, Authorization, Date, If-Match, If-None-Match",
|
||||||
|
|||||||
@@ -19,11 +19,9 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
"""This module contains base REST classes for constructing REST servlets."""
|
""" This module contains base REST classes for constructing REST servlets. """
|
||||||
|
|
||||||
import enum
|
import enum
|
||||||
import logging
|
import logging
|
||||||
import urllib.parse as urlparse
|
|
||||||
from http import HTTPStatus
|
from http import HTTPStatus
|
||||||
from typing import (
|
from typing import (
|
||||||
TYPE_CHECKING,
|
TYPE_CHECKING,
|
||||||
@@ -67,49 +65,17 @@ def parse_integer(request: Request, name: str, default: int) -> int: ...
|
|||||||
|
|
||||||
|
|
||||||
@overload
|
@overload
|
||||||
def parse_integer(
|
def parse_integer(request: Request, name: str, *, required: Literal[True]) -> int: ...
|
||||||
request: Request, name: str, *, default: int, negative: bool
|
|
||||||
) -> int: ...
|
|
||||||
|
|
||||||
|
|
||||||
@overload
|
@overload
|
||||||
def parse_integer(
|
def parse_integer(
|
||||||
request: Request, name: str, *, default: int, negative: bool = False
|
request: Request, name: str, default: Optional[int] = None, required: bool = False
|
||||||
) -> int: ...
|
|
||||||
|
|
||||||
|
|
||||||
@overload
|
|
||||||
def parse_integer(
|
|
||||||
request: Request, name: str, *, required: Literal[True], negative: bool = False
|
|
||||||
) -> int: ...
|
|
||||||
|
|
||||||
|
|
||||||
@overload
|
|
||||||
def parse_integer(
|
|
||||||
request: Request, name: str, *, default: Literal[None], negative: bool = False
|
|
||||||
) -> None: ...
|
|
||||||
|
|
||||||
|
|
||||||
@overload
|
|
||||||
def parse_integer(request: Request, name: str, *, negative: bool) -> Optional[int]: ...
|
|
||||||
|
|
||||||
|
|
||||||
@overload
|
|
||||||
def parse_integer(
|
|
||||||
request: Request,
|
|
||||||
name: str,
|
|
||||||
default: Optional[int] = None,
|
|
||||||
required: bool = False,
|
|
||||||
negative: bool = False,
|
|
||||||
) -> Optional[int]: ...
|
) -> Optional[int]: ...
|
||||||
|
|
||||||
|
|
||||||
def parse_integer(
|
def parse_integer(
|
||||||
request: Request,
|
request: Request, name: str, default: Optional[int] = None, required: bool = False
|
||||||
name: str,
|
|
||||||
default: Optional[int] = None,
|
|
||||||
required: bool = False,
|
|
||||||
negative: bool = False,
|
|
||||||
) -> Optional[int]:
|
) -> Optional[int]:
|
||||||
"""Parse an integer parameter from the request string
|
"""Parse an integer parameter from the request string
|
||||||
|
|
||||||
@@ -119,17 +85,16 @@ def parse_integer(
|
|||||||
default: value to use if the parameter is absent, defaults to None.
|
default: value to use if the parameter is absent, defaults to None.
|
||||||
required: whether to raise a 400 SynapseError if the parameter is absent,
|
required: whether to raise a 400 SynapseError if the parameter is absent,
|
||||||
defaults to False.
|
defaults to False.
|
||||||
negative: whether to allow negative integers, defaults to True.
|
|
||||||
Returns:
|
Returns:
|
||||||
An int value or the default.
|
An int value or the default.
|
||||||
|
|
||||||
Raises:
|
Raises:
|
||||||
SynapseError: if the parameter is absent and required, if the
|
SynapseError: if the parameter is absent and required, or if the
|
||||||
parameter is present and not an integer, or if the
|
parameter is present and not an integer.
|
||||||
parameter is illegitimate negative.
|
|
||||||
"""
|
"""
|
||||||
args: Mapping[bytes, Sequence[bytes]] = request.args # type: ignore
|
args: Mapping[bytes, Sequence[bytes]] = request.args # type: ignore
|
||||||
return parse_integer_from_args(args, name, default, required, negative)
|
return parse_integer_from_args(args, name, default, required)
|
||||||
|
|
||||||
|
|
||||||
@overload
|
@overload
|
||||||
@@ -155,7 +120,6 @@ def parse_integer_from_args(
|
|||||||
name: str,
|
name: str,
|
||||||
default: Optional[int] = None,
|
default: Optional[int] = None,
|
||||||
required: bool = False,
|
required: bool = False,
|
||||||
negative: bool = False,
|
|
||||||
) -> Optional[int]: ...
|
) -> Optional[int]: ...
|
||||||
|
|
||||||
|
|
||||||
@@ -164,7 +128,6 @@ def parse_integer_from_args(
|
|||||||
name: str,
|
name: str,
|
||||||
default: Optional[int] = None,
|
default: Optional[int] = None,
|
||||||
required: bool = False,
|
required: bool = False,
|
||||||
negative: bool = True,
|
|
||||||
) -> Optional[int]:
|
) -> Optional[int]:
|
||||||
"""Parse an integer parameter from the request string
|
"""Parse an integer parameter from the request string
|
||||||
|
|
||||||
@@ -174,37 +137,33 @@ def parse_integer_from_args(
|
|||||||
default: value to use if the parameter is absent, defaults to None.
|
default: value to use if the parameter is absent, defaults to None.
|
||||||
required: whether to raise a 400 SynapseError if the parameter is absent,
|
required: whether to raise a 400 SynapseError if the parameter is absent,
|
||||||
defaults to False.
|
defaults to False.
|
||||||
negative: whether to allow negative integers, defaults to True.
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
An int value or the default.
|
An int value or the default.
|
||||||
|
|
||||||
Raises:
|
Raises:
|
||||||
SynapseError: if the parameter is absent and required, if the
|
SynapseError: if the parameter is absent and required, or if the
|
||||||
parameter is present and not an integer, or if the
|
parameter is present and not an integer.
|
||||||
parameter is illegitimate negative.
|
|
||||||
"""
|
"""
|
||||||
name_bytes = name.encode("ascii")
|
name_bytes = name.encode("ascii")
|
||||||
|
|
||||||
if name_bytes not in args:
|
if name_bytes in args:
|
||||||
if not required:
|
try:
|
||||||
|
return int(args[name_bytes][0])
|
||||||
|
except Exception:
|
||||||
|
message = "Query parameter %r must be an integer" % (name,)
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST, message, errcode=Codes.INVALID_PARAM
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
if required:
|
||||||
|
message = "Missing integer query parameter %r" % (name,)
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST, message, errcode=Codes.MISSING_PARAM
|
||||||
|
)
|
||||||
|
else:
|
||||||
return default
|
return default
|
||||||
|
|
||||||
message = f"Missing required integer query parameter {name}"
|
|
||||||
raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.MISSING_PARAM)
|
|
||||||
|
|
||||||
try:
|
|
||||||
integer = int(args[name_bytes][0])
|
|
||||||
except Exception:
|
|
||||||
message = f"Query parameter {name} must be an integer"
|
|
||||||
raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.INVALID_PARAM)
|
|
||||||
|
|
||||||
if not negative and integer < 0:
|
|
||||||
message = f"Query parameter {name} must be a positive integer."
|
|
||||||
raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.INVALID_PARAM)
|
|
||||||
|
|
||||||
return integer
|
|
||||||
|
|
||||||
|
|
||||||
@overload
|
@overload
|
||||||
def parse_boolean(request: Request, name: str, default: bool) -> bool: ...
|
def parse_boolean(request: Request, name: str, default: bool) -> bool: ...
|
||||||
@@ -451,87 +410,6 @@ def parse_string(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def parse_json(
|
|
||||||
request: Request,
|
|
||||||
name: str,
|
|
||||||
default: Optional[dict] = None,
|
|
||||||
required: bool = False,
|
|
||||||
encoding: str = "ascii",
|
|
||||||
) -> Optional[JsonDict]:
|
|
||||||
"""
|
|
||||||
Parse a JSON parameter from the request query string.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
request: the twisted HTTP request.
|
|
||||||
name: the name of the query parameter.
|
|
||||||
default: value to use if the parameter is absent,
|
|
||||||
defaults to None.
|
|
||||||
required: whether to raise a 400 SynapseError if the
|
|
||||||
parameter is absent, defaults to False.
|
|
||||||
encoding: The encoding to decode the string content with.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
A JSON value, or `default` if the named query parameter was not found
|
|
||||||
and `required` was False.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
SynapseError if the parameter is absent and required, or if the
|
|
||||||
parameter is present and not a JSON object.
|
|
||||||
"""
|
|
||||||
args: Mapping[bytes, Sequence[bytes]] = request.args # type: ignore
|
|
||||||
return parse_json_from_args(
|
|
||||||
args,
|
|
||||||
name,
|
|
||||||
default,
|
|
||||||
required=required,
|
|
||||||
encoding=encoding,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def parse_json_from_args(
|
|
||||||
args: Mapping[bytes, Sequence[bytes]],
|
|
||||||
name: str,
|
|
||||||
default: Optional[dict] = None,
|
|
||||||
required: bool = False,
|
|
||||||
encoding: str = "ascii",
|
|
||||||
) -> Optional[JsonDict]:
|
|
||||||
"""
|
|
||||||
Parse a JSON parameter from the request query string.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
args: a mapping of request args as bytes to a list of bytes (e.g. request.args).
|
|
||||||
name: the name of the query parameter.
|
|
||||||
default: value to use if the parameter is absent,
|
|
||||||
defaults to None.
|
|
||||||
required: whether to raise a 400 SynapseError if the
|
|
||||||
parameter is absent, defaults to False.
|
|
||||||
encoding: the encoding to decode the string content with.
|
|
||||||
|
|
||||||
A JSON value, or `default` if the named query parameter was not found
|
|
||||||
and `required` was False.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
SynapseError if the parameter is absent and required, or if the
|
|
||||||
parameter is present and not a JSON object.
|
|
||||||
"""
|
|
||||||
name_bytes = name.encode("ascii")
|
|
||||||
|
|
||||||
if name_bytes not in args:
|
|
||||||
if not required:
|
|
||||||
return default
|
|
||||||
|
|
||||||
message = f"Missing required integer query parameter {name}"
|
|
||||||
raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.MISSING_PARAM)
|
|
||||||
|
|
||||||
json_str = parse_string_from_args(args, name, required=True, encoding=encoding)
|
|
||||||
|
|
||||||
try:
|
|
||||||
return json_decoder.decode(urlparse.unquote(json_str))
|
|
||||||
except Exception:
|
|
||||||
message = f"Query parameter {name} must be a valid JSON object"
|
|
||||||
raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.NOT_JSON)
|
|
||||||
|
|
||||||
|
|
||||||
EnumT = TypeVar("EnumT", bound=enum.Enum)
|
EnumT = TypeVar("EnumT", bound=enum.Enum)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -150,8 +150,7 @@ class SynapseRequest(Request):
|
|||||||
self.get_method(),
|
self.get_method(),
|
||||||
self.get_redacted_uri(),
|
self.get_redacted_uri(),
|
||||||
)
|
)
|
||||||
if self.channel:
|
self.transport.abortConnection()
|
||||||
self.channel.forceAbortClient()
|
|
||||||
return
|
return
|
||||||
super().handleContentChunk(data)
|
super().handleContentChunk(data)
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ from http import HTTPStatus
|
|||||||
from typing import TYPE_CHECKING, Tuple
|
from typing import TYPE_CHECKING, Tuple
|
||||||
|
|
||||||
from synapse.api.constants import Direction
|
from synapse.api.constants import Direction
|
||||||
from synapse.api.errors import NotFoundError, SynapseError
|
from synapse.api.errors import Codes, NotFoundError, SynapseError
|
||||||
from synapse.federation.transport.server import Authenticator
|
from synapse.federation.transport.server import Authenticator
|
||||||
from synapse.http.servlet import RestServlet, parse_enum, parse_integer, parse_string
|
from synapse.http.servlet import RestServlet, parse_enum, parse_integer, parse_string
|
||||||
from synapse.http.site import SynapseRequest
|
from synapse.http.site import SynapseRequest
|
||||||
@@ -61,8 +61,22 @@ class ListDestinationsRestServlet(RestServlet):
|
|||||||
async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
||||||
await assert_requester_is_admin(self._auth, request)
|
await assert_requester_is_admin(self._auth, request)
|
||||||
|
|
||||||
start = parse_integer(request, "from", default=0, negative=False)
|
start = parse_integer(request, "from", default=0)
|
||||||
limit = parse_integer(request, "limit", default=100, negative=False)
|
limit = parse_integer(request, "limit", default=100)
|
||||||
|
|
||||||
|
if start < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter from must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
|
if limit < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter limit must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
destination = parse_string(request, "destination")
|
destination = parse_string(request, "destination")
|
||||||
|
|
||||||
@@ -181,8 +195,22 @@ class DestinationMembershipRestServlet(RestServlet):
|
|||||||
if not await self._store.is_destination_known(destination):
|
if not await self._store.is_destination_known(destination):
|
||||||
raise NotFoundError("Unknown destination")
|
raise NotFoundError("Unknown destination")
|
||||||
|
|
||||||
start = parse_integer(request, "from", default=0, negative=False)
|
start = parse_integer(request, "from", default=0)
|
||||||
limit = parse_integer(request, "limit", default=100, negative=False)
|
limit = parse_integer(request, "limit", default=100)
|
||||||
|
|
||||||
|
if start < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter from must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
|
if limit < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter limit must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
direction = parse_enum(request, "dir", Direction, default=Direction.FORWARDS)
|
direction = parse_enum(request, "dir", Direction, default=Direction.FORWARDS)
|
||||||
|
|
||||||
|
|||||||
@@ -311,17 +311,29 @@ class DeleteMediaByDateSize(RestServlet):
|
|||||||
) -> Tuple[int, JsonDict]:
|
) -> Tuple[int, JsonDict]:
|
||||||
await assert_requester_is_admin(self.auth, request)
|
await assert_requester_is_admin(self.auth, request)
|
||||||
|
|
||||||
before_ts = parse_integer(request, "before_ts", required=True, negative=False)
|
before_ts = parse_integer(request, "before_ts", required=True)
|
||||||
size_gt = parse_integer(request, "size_gt", default=0, negative=False)
|
size_gt = parse_integer(request, "size_gt", default=0)
|
||||||
keep_profiles = parse_boolean(request, "keep_profiles", default=True)
|
keep_profiles = parse_boolean(request, "keep_profiles", default=True)
|
||||||
|
|
||||||
if before_ts < 30000000000: # Dec 1970 in milliseconds, Aug 2920 in seconds
|
if before_ts < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter before_ts must be a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
elif before_ts < 30000000000: # Dec 1970 in milliseconds, Aug 2920 in seconds
|
||||||
raise SynapseError(
|
raise SynapseError(
|
||||||
HTTPStatus.BAD_REQUEST,
|
HTTPStatus.BAD_REQUEST,
|
||||||
"Query parameter before_ts you provided is from the year 1970. "
|
"Query parameter before_ts you provided is from the year 1970. "
|
||||||
+ "Double check that you are providing a timestamp in milliseconds.",
|
+ "Double check that you are providing a timestamp in milliseconds.",
|
||||||
errcode=Codes.INVALID_PARAM,
|
errcode=Codes.INVALID_PARAM,
|
||||||
)
|
)
|
||||||
|
if size_gt < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter size_gt must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
# This check is useless, we keep it for the legacy endpoint only.
|
# This check is useless, we keep it for the legacy endpoint only.
|
||||||
if server_name is not None and self.server_name != server_name:
|
if server_name is not None and self.server_name != server_name:
|
||||||
@@ -377,8 +389,22 @@ class UserMediaRestServlet(RestServlet):
|
|||||||
if user is None:
|
if user is None:
|
||||||
raise NotFoundError("Unknown user")
|
raise NotFoundError("Unknown user")
|
||||||
|
|
||||||
start = parse_integer(request, "from", default=0, negative=False)
|
start = parse_integer(request, "from", default=0)
|
||||||
limit = parse_integer(request, "limit", default=100, negative=False)
|
limit = parse_integer(request, "limit", default=100)
|
||||||
|
|
||||||
|
if start < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter from must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
|
if limit < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter limit must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
# If neither `order_by` nor `dir` is set, set the default order
|
# If neither `order_by` nor `dir` is set, set the default order
|
||||||
# to newest media is on top for backward compatibility.
|
# to newest media is on top for backward compatibility.
|
||||||
@@ -421,8 +447,22 @@ class UserMediaRestServlet(RestServlet):
|
|||||||
if user is None:
|
if user is None:
|
||||||
raise NotFoundError("Unknown user")
|
raise NotFoundError("Unknown user")
|
||||||
|
|
||||||
start = parse_integer(request, "from", default=0, negative=False)
|
start = parse_integer(request, "from", default=0)
|
||||||
limit = parse_integer(request, "limit", default=100, negative=False)
|
limit = parse_integer(request, "limit", default=100)
|
||||||
|
|
||||||
|
if start < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter from must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
|
if limit < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter limit must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
# If neither `order_by` nor `dir` is set, set the default order
|
# If neither `order_by` nor `dir` is set, set the default order
|
||||||
# to newest media is on top for backward compatibility.
|
# to newest media is on top for backward compatibility.
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
import logging
|
import logging
|
||||||
from http import HTTPStatus
|
from http import HTTPStatus
|
||||||
from typing import TYPE_CHECKING, List, Optional, Tuple, cast
|
from typing import TYPE_CHECKING, List, Optional, Tuple, cast
|
||||||
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
import attr
|
import attr
|
||||||
|
|
||||||
@@ -37,7 +38,6 @@ from synapse.http.servlet import (
|
|||||||
assert_params_in_dict,
|
assert_params_in_dict,
|
||||||
parse_enum,
|
parse_enum,
|
||||||
parse_integer,
|
parse_integer,
|
||||||
parse_json,
|
|
||||||
parse_json_object_from_request,
|
parse_json_object_from_request,
|
||||||
parse_string,
|
parse_string,
|
||||||
)
|
)
|
||||||
@@ -51,6 +51,7 @@ from synapse.storage.databases.main.room import RoomSortOrder
|
|||||||
from synapse.streams.config import PaginationConfig
|
from synapse.streams.config import PaginationConfig
|
||||||
from synapse.types import JsonDict, RoomID, ScheduledTask, UserID, create_requester
|
from synapse.types import JsonDict, RoomID, ScheduledTask, UserID, create_requester
|
||||||
from synapse.types.state import StateFilter
|
from synapse.types.state import StateFilter
|
||||||
|
from synapse.util import json_decoder
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from synapse.api.auth import Auth
|
from synapse.api.auth import Auth
|
||||||
@@ -775,8 +776,14 @@ class RoomEventContextServlet(RestServlet):
|
|||||||
limit = parse_integer(request, "limit", default=10)
|
limit = parse_integer(request, "limit", default=10)
|
||||||
|
|
||||||
# picking the API shape for symmetry with /messages
|
# picking the API shape for symmetry with /messages
|
||||||
filter_json = parse_json(request, "filter", encoding="utf-8")
|
filter_str = parse_string(request, "filter", encoding="utf-8")
|
||||||
event_filter = Filter(self._hs, filter_json) if filter_json else None
|
if filter_str:
|
||||||
|
filter_json = urlparse.unquote(filter_str)
|
||||||
|
event_filter: Optional[Filter] = Filter(
|
||||||
|
self._hs, json_decoder.decode(filter_json)
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
event_filter = None
|
||||||
|
|
||||||
event_context = await self.room_context_handler.get_event_context(
|
event_context = await self.room_context_handler.get_event_context(
|
||||||
requester,
|
requester,
|
||||||
@@ -907,16 +914,21 @@ class RoomMessagesRestServlet(RestServlet):
|
|||||||
)
|
)
|
||||||
# Twisted will have processed the args by now.
|
# Twisted will have processed the args by now.
|
||||||
assert request.args is not None
|
assert request.args is not None
|
||||||
|
|
||||||
filter_json = parse_json(request, "filter", encoding="utf-8")
|
|
||||||
event_filter = Filter(self._hs, filter_json) if filter_json else None
|
|
||||||
|
|
||||||
as_client_event = b"raw" not in request.args
|
as_client_event = b"raw" not in request.args
|
||||||
if (
|
filter_str = parse_string(request, "filter", encoding="utf-8")
|
||||||
event_filter
|
if filter_str:
|
||||||
and event_filter.filter_json.get("event_format", "client") == "federation"
|
filter_json = urlparse.unquote(filter_str)
|
||||||
):
|
event_filter: Optional[Filter] = Filter(
|
||||||
as_client_event = False
|
self._hs, json_decoder.decode(filter_json)
|
||||||
|
)
|
||||||
|
if (
|
||||||
|
event_filter
|
||||||
|
and event_filter.filter_json.get("event_format", "client")
|
||||||
|
== "federation"
|
||||||
|
):
|
||||||
|
as_client_event = False
|
||||||
|
else:
|
||||||
|
event_filter = None
|
||||||
|
|
||||||
msgs = await self._pagination_handler.get_messages(
|
msgs = await self._pagination_handler.get_messages(
|
||||||
room_id=room_id,
|
room_id=room_id,
|
||||||
|
|||||||
@@ -63,12 +63,38 @@ class UserMediaStatisticsRestServlet(RestServlet):
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
start = parse_integer(request, "from", default=0, negative=False)
|
start = parse_integer(request, "from", default=0)
|
||||||
limit = parse_integer(request, "limit", default=100, negative=False)
|
if start < 0:
|
||||||
from_ts = parse_integer(request, "from_ts", default=0, negative=False)
|
raise SynapseError(
|
||||||
until_ts = parse_integer(request, "until_ts", negative=False)
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter from must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
|
limit = parse_integer(request, "limit", default=100)
|
||||||
|
if limit < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter limit must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
|
from_ts = parse_integer(request, "from_ts", default=0)
|
||||||
|
if from_ts < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter from_ts must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
|
until_ts = parse_integer(request, "until_ts")
|
||||||
if until_ts is not None:
|
if until_ts is not None:
|
||||||
|
if until_ts < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter until_ts must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
if until_ts <= from_ts:
|
if until_ts <= from_ts:
|
||||||
raise SynapseError(
|
raise SynapseError(
|
||||||
HTTPStatus.BAD_REQUEST,
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
|||||||
@@ -90,8 +90,22 @@ class UsersRestServletV2(RestServlet):
|
|||||||
async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
||||||
await assert_requester_is_admin(self.auth, request)
|
await assert_requester_is_admin(self.auth, request)
|
||||||
|
|
||||||
start = parse_integer(request, "from", default=0, negative=False)
|
start = parse_integer(request, "from", default=0)
|
||||||
limit = parse_integer(request, "limit", default=100, negative=False)
|
limit = parse_integer(request, "limit", default=100)
|
||||||
|
|
||||||
|
if start < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter from must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
|
if limit < 0:
|
||||||
|
raise SynapseError(
|
||||||
|
HTTPStatus.BAD_REQUEST,
|
||||||
|
"Query parameter limit must be a string representing a positive integer.",
|
||||||
|
errcode=Codes.INVALID_PARAM,
|
||||||
|
)
|
||||||
|
|
||||||
user_id = parse_string(request, "user_id")
|
user_id = parse_string(request, "user_id")
|
||||||
name = parse_string(request, "name", encoding="utf-8")
|
name = parse_string(request, "name", encoding="utf-8")
|
||||||
|
|||||||
@@ -81,7 +81,8 @@ class AccountDataServlet(RestServlet):
|
|||||||
raise AuthError(403, "Cannot add account data for other users.")
|
raise AuthError(403, "Cannot add account data for other users.")
|
||||||
|
|
||||||
# Raise an error if the account data type cannot be set directly.
|
# Raise an error if the account data type cannot be set directly.
|
||||||
_check_can_set_account_data_type(account_data_type)
|
if self._hs.config.experimental.msc4010_push_rules_account_data:
|
||||||
|
_check_can_set_account_data_type(account_data_type)
|
||||||
|
|
||||||
body = parse_json_object_from_request(request)
|
body = parse_json_object_from_request(request)
|
||||||
|
|
||||||
@@ -107,7 +108,10 @@ class AccountDataServlet(RestServlet):
|
|||||||
raise AuthError(403, "Cannot get account data for other users.")
|
raise AuthError(403, "Cannot get account data for other users.")
|
||||||
|
|
||||||
# Push rules are stored in a separate table and must be queried separately.
|
# Push rules are stored in a separate table and must be queried separately.
|
||||||
if account_data_type == AccountDataTypes.PUSH_RULES:
|
if (
|
||||||
|
self._hs.config.experimental.msc4010_push_rules_account_data
|
||||||
|
and account_data_type == AccountDataTypes.PUSH_RULES
|
||||||
|
):
|
||||||
account_data: Optional[JsonMapping] = (
|
account_data: Optional[JsonMapping] = (
|
||||||
await self._push_rules_handler.push_rules_for_user(requester.user)
|
await self._push_rules_handler.push_rules_for_user(requester.user)
|
||||||
)
|
)
|
||||||
@@ -158,7 +162,8 @@ class UnstableAccountDataServlet(RestServlet):
|
|||||||
raise AuthError(403, "Cannot delete account data for other users.")
|
raise AuthError(403, "Cannot delete account data for other users.")
|
||||||
|
|
||||||
# Raise an error if the account data type cannot be set directly.
|
# Raise an error if the account data type cannot be set directly.
|
||||||
_check_can_set_account_data_type(account_data_type)
|
if self._hs.config.experimental.msc4010_push_rules_account_data:
|
||||||
|
_check_can_set_account_data_type(account_data_type)
|
||||||
|
|
||||||
await self.handler.remove_account_data_for_user(user_id, account_data_type)
|
await self.handler.remove_account_data_for_user(user_id, account_data_type)
|
||||||
|
|
||||||
@@ -204,7 +209,15 @@ class RoomAccountDataServlet(RestServlet):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Raise an error if the account data type cannot be set directly.
|
# Raise an error if the account data type cannot be set directly.
|
||||||
_check_can_set_account_data_type(account_data_type)
|
if self._hs.config.experimental.msc4010_push_rules_account_data:
|
||||||
|
_check_can_set_account_data_type(account_data_type)
|
||||||
|
elif account_data_type == ReceiptTypes.FULLY_READ:
|
||||||
|
raise SynapseError(
|
||||||
|
405,
|
||||||
|
"Cannot set m.fully_read through this API."
|
||||||
|
" Use /rooms/!roomId:server.name/read_markers",
|
||||||
|
Codes.BAD_JSON,
|
||||||
|
)
|
||||||
|
|
||||||
body = parse_json_object_from_request(request)
|
body = parse_json_object_from_request(request)
|
||||||
|
|
||||||
@@ -243,7 +256,10 @@ class RoomAccountDataServlet(RestServlet):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Room-specific push rules are not currently supported.
|
# Room-specific push rules are not currently supported.
|
||||||
if account_data_type == AccountDataTypes.PUSH_RULES:
|
if (
|
||||||
|
self._hs.config.experimental.msc4010_push_rules_account_data
|
||||||
|
and account_data_type == AccountDataTypes.PUSH_RULES
|
||||||
|
):
|
||||||
account_data: Optional[JsonMapping] = {}
|
account_data: Optional[JsonMapping] = {}
|
||||||
else:
|
else:
|
||||||
account_data = await self.store.get_account_data_for_room_and_type(
|
account_data = await self.store.get_account_data_for_room_and_type(
|
||||||
@@ -301,7 +317,8 @@ class UnstableRoomAccountDataServlet(RestServlet):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Raise an error if the account data type cannot be set directly.
|
# Raise an error if the account data type cannot be set directly.
|
||||||
_check_can_set_account_data_type(account_data_type)
|
if self._hs.config.experimental.msc4010_push_rules_account_data:
|
||||||
|
_check_can_set_account_data_type(account_data_type)
|
||||||
|
|
||||||
await self.handler.remove_account_data_for_room(
|
await self.handler.remove_account_data_for_room(
|
||||||
user_id, room_id, account_data_type
|
user_id, room_id, account_data_type
|
||||||
|
|||||||
@@ -409,18 +409,7 @@ class SigningKeyUploadServlet(RestServlet):
|
|||||||
# But first-time setup is fine
|
# But first-time setup is fine
|
||||||
|
|
||||||
elif self.hs.config.experimental.msc3967_enabled:
|
elif self.hs.config.experimental.msc3967_enabled:
|
||||||
# MSC3967 allows this endpoint to 200 OK for idempotency. Resending exactly the same
|
# If we already have a master key then cross signing is set up and we require UIA to reset
|
||||||
# keys should just 200 OK without doing a UIA prompt.
|
|
||||||
keys_are_different = await self.e2e_keys_handler.has_different_keys(
|
|
||||||
user_id, body
|
|
||||||
)
|
|
||||||
if not keys_are_different:
|
|
||||||
# FIXME: we do not fallthrough to upload_signing_keys_for_user because confusingly
|
|
||||||
# if we do, we 500 as it looks like it tries to INSERT the same key twice, causing a
|
|
||||||
# unique key constraint violation. This sounds like a bug?
|
|
||||||
return 200, {}
|
|
||||||
# the keys are different, is x-signing set up? If no, then the keys don't exist which is
|
|
||||||
# why they are different. If yes, then we need to UIA to change them.
|
|
||||||
if is_cross_signing_setup:
|
if is_cross_signing_setup:
|
||||||
await self.auth_handler.validate_user_via_ui_auth(
|
await self.auth_handler.validate_user_via_ui_auth(
|
||||||
requester,
|
requester,
|
||||||
@@ -431,6 +420,7 @@ class SigningKeyUploadServlet(RestServlet):
|
|||||||
can_skip_ui_auth=False,
|
can_skip_ui_auth=False,
|
||||||
)
|
)
|
||||||
# Otherwise we don't require UIA since we are setting up cross signing for first time
|
# Otherwise we don't require UIA since we are setting up cross signing for first time
|
||||||
|
|
||||||
else:
|
else:
|
||||||
# Previous behaviour is to always require UIA but allow it to be skipped
|
# Previous behaviour is to always require UIA but allow it to be skipped
|
||||||
await self.auth_handler.validate_user_via_ui_auth(
|
await self.auth_handler.validate_user_via_ui_auth(
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ class RelationPaginationServlet(RestServlet):
|
|||||||
self.auth = hs.get_auth()
|
self.auth = hs.get_auth()
|
||||||
self._store = hs.get_datastores().main
|
self._store = hs.get_datastores().main
|
||||||
self._relations_handler = hs.get_relations_handler()
|
self._relations_handler = hs.get_relations_handler()
|
||||||
|
self._support_recurse = hs.config.experimental.msc3981_recurse_relations
|
||||||
|
|
||||||
async def on_GET(
|
async def on_GET(
|
||||||
self,
|
self,
|
||||||
@@ -69,9 +70,12 @@ class RelationPaginationServlet(RestServlet):
|
|||||||
pagination_config = await PaginationConfig.from_request(
|
pagination_config = await PaginationConfig.from_request(
|
||||||
self._store, request, default_limit=5, default_dir=Direction.BACKWARDS
|
self._store, request, default_limit=5, default_dir=Direction.BACKWARDS
|
||||||
)
|
)
|
||||||
recurse = parse_boolean(request, "recurse", default=False) or parse_boolean(
|
if self._support_recurse:
|
||||||
request, "org.matrix.msc3981.recurse", default=False
|
recurse = parse_boolean(request, "recurse", default=False) or parse_boolean(
|
||||||
)
|
request, "org.matrix.msc3981.recurse", default=False
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
recurse = False
|
||||||
|
|
||||||
# The unstable version of this API returns an extra field for client
|
# The unstable version of this API returns an extra field for client
|
||||||
# compatibility, see https://github.com/matrix-org/synapse/issues/12930.
|
# compatibility, see https://github.com/matrix-org/synapse/issues/12930.
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
||||||
#
|
#
|
||||||
# Copyright 2022 The Matrix.org Foundation C.I.C.
|
# Copyright 2022 The Matrix.org Foundation C.I.C.
|
||||||
# Copyright (C) 2023-2024 New Vector, Ltd
|
# Copyright (C) 2023 New Vector, Ltd
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU Affero General Public License as
|
# it under the terms of the GNU Affero General Public License as
|
||||||
@@ -34,7 +34,7 @@ if TYPE_CHECKING:
|
|||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class MSC3886RendezvousServlet(RestServlet):
|
class RendezvousServlet(RestServlet):
|
||||||
"""
|
"""
|
||||||
This is a placeholder implementation of [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886)
|
This is a placeholder implementation of [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886)
|
||||||
simple client rendezvous capability that is used by the "Sign in with QR" functionality.
|
simple client rendezvous capability that is used by the "Sign in with QR" functionality.
|
||||||
@@ -76,30 +76,6 @@ class MSC3886RendezvousServlet(RestServlet):
|
|||||||
# PUT, GET and DELETE are not implemented as they should be fulfilled by the redirect target.
|
# PUT, GET and DELETE are not implemented as they should be fulfilled by the redirect target.
|
||||||
|
|
||||||
|
|
||||||
class MSC4108DelegationRendezvousServlet(RestServlet):
|
|
||||||
PATTERNS = client_patterns(
|
|
||||||
"/org.matrix.msc4108/rendezvous$", releases=[], v1=False, unstable=True
|
|
||||||
)
|
|
||||||
|
|
||||||
def __init__(self, hs: "HomeServer"):
|
|
||||||
super().__init__()
|
|
||||||
redirection_target: Optional[str] = (
|
|
||||||
hs.config.experimental.msc4108_delegation_endpoint
|
|
||||||
)
|
|
||||||
assert (
|
|
||||||
redirection_target is not None
|
|
||||||
), "Servlet is only registered if there is a delegation target"
|
|
||||||
self.endpoint = redirection_target.encode("utf-8")
|
|
||||||
|
|
||||||
async def on_POST(self, request: SynapseRequest) -> None:
|
|
||||||
respond_with_redirect(
|
|
||||||
request, self.endpoint, statusCode=TEMPORARY_REDIRECT, cors=True
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
|
def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
|
||||||
if hs.config.experimental.msc3886_endpoint is not None:
|
if hs.config.experimental.msc3886_endpoint is not None:
|
||||||
MSC3886RendezvousServlet(hs).register(http_server)
|
RendezvousServlet(hs).register(http_server)
|
||||||
|
|
||||||
if hs.config.experimental.msc4108_delegation_endpoint is not None:
|
|
||||||
MSC4108DelegationRendezvousServlet(hs).register(http_server)
|
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ from synapse.http.servlet import (
|
|||||||
parse_boolean,
|
parse_boolean,
|
||||||
parse_enum,
|
parse_enum,
|
||||||
parse_integer,
|
parse_integer,
|
||||||
parse_json,
|
|
||||||
parse_json_object_from_request,
|
parse_json_object_from_request,
|
||||||
parse_string,
|
parse_string,
|
||||||
parse_strings_from_args,
|
parse_strings_from_args,
|
||||||
@@ -66,6 +65,7 @@ from synapse.rest.client.transactions import HttpTransactionCache
|
|||||||
from synapse.streams.config import PaginationConfig
|
from synapse.streams.config import PaginationConfig
|
||||||
from synapse.types import JsonDict, Requester, StreamToken, ThirdPartyInstanceID, UserID
|
from synapse.types import JsonDict, Requester, StreamToken, ThirdPartyInstanceID, UserID
|
||||||
from synapse.types.state import StateFilter
|
from synapse.types.state import StateFilter
|
||||||
|
from synapse.util import json_decoder
|
||||||
from synapse.util.cancellation import cancellable
|
from synapse.util.cancellation import cancellable
|
||||||
from synapse.util.stringutils import parse_and_validate_server_name, random_string
|
from synapse.util.stringutils import parse_and_validate_server_name, random_string
|
||||||
|
|
||||||
@@ -499,7 +499,7 @@ class PublicRoomListRestServlet(RestServlet):
|
|||||||
if server:
|
if server:
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
limit: Optional[int] = parse_integer(request, "limit", 0, negative=False)
|
limit: Optional[int] = parse_integer(request, "limit", 0)
|
||||||
since_token = parse_string(request, "since")
|
since_token = parse_string(request, "since")
|
||||||
|
|
||||||
if limit == 0:
|
if limit == 0:
|
||||||
@@ -703,16 +703,21 @@ class RoomMessageListRestServlet(RestServlet):
|
|||||||
)
|
)
|
||||||
# Twisted will have processed the args by now.
|
# Twisted will have processed the args by now.
|
||||||
assert request.args is not None
|
assert request.args is not None
|
||||||
|
|
||||||
filter_json = parse_json(request, "filter", encoding="utf-8")
|
|
||||||
event_filter = Filter(self._hs, filter_json) if filter_json else None
|
|
||||||
|
|
||||||
as_client_event = b"raw" not in request.args
|
as_client_event = b"raw" not in request.args
|
||||||
if (
|
filter_str = parse_string(request, "filter", encoding="utf-8")
|
||||||
event_filter
|
if filter_str:
|
||||||
and event_filter.filter_json.get("event_format", "client") == "federation"
|
filter_json = urlparse.unquote(filter_str)
|
||||||
):
|
event_filter: Optional[Filter] = Filter(
|
||||||
as_client_event = False
|
self._hs, json_decoder.decode(filter_json)
|
||||||
|
)
|
||||||
|
if (
|
||||||
|
event_filter
|
||||||
|
and event_filter.filter_json.get("event_format", "client")
|
||||||
|
== "federation"
|
||||||
|
):
|
||||||
|
as_client_event = False
|
||||||
|
else:
|
||||||
|
event_filter = None
|
||||||
|
|
||||||
msgs = await self.pagination_handler.get_messages(
|
msgs = await self.pagination_handler.get_messages(
|
||||||
room_id=room_id,
|
room_id=room_id,
|
||||||
@@ -893,8 +898,14 @@ class RoomEventContextServlet(RestServlet):
|
|||||||
limit = parse_integer(request, "limit", default=10)
|
limit = parse_integer(request, "limit", default=10)
|
||||||
|
|
||||||
# picking the API shape for symmetry with /messages
|
# picking the API shape for symmetry with /messages
|
||||||
filter_json = parse_json(request, "filter", encoding="utf-8")
|
filter_str = parse_string(request, "filter", encoding="utf-8")
|
||||||
event_filter = Filter(self._hs, filter_json) if filter_json else None
|
if filter_str:
|
||||||
|
filter_json = urlparse.unquote(filter_str)
|
||||||
|
event_filter: Optional[Filter] = Filter(
|
||||||
|
self._hs, json_decoder.decode(filter_json)
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
event_filter = None
|
||||||
|
|
||||||
event_context = await self.room_context_handler.get_event_context(
|
event_context = await self.room_context_handler.get_event_context(
|
||||||
requester, room_id, event_id, limit, event_filter
|
requester, room_id, event_id, limit, event_filter
|
||||||
|
|||||||
@@ -132,17 +132,13 @@ class VersionsRestServlet(RestServlet):
|
|||||||
# Adds support for relation-based redactions as per MSC3912.
|
# Adds support for relation-based redactions as per MSC3912.
|
||||||
"org.matrix.msc3912": self.config.experimental.msc3912_enabled,
|
"org.matrix.msc3912": self.config.experimental.msc3912_enabled,
|
||||||
# Whether recursively provide relations is supported.
|
# Whether recursively provide relations is supported.
|
||||||
# TODO This is no longer needed once unstable MSC3981 does not need to be supported.
|
"org.matrix.msc3981": self.config.experimental.msc3981_recurse_relations,
|
||||||
"org.matrix.msc3981": True,
|
|
||||||
# Adds support for deleting account data.
|
# Adds support for deleting account data.
|
||||||
"org.matrix.msc3391": self.config.experimental.msc3391_enabled,
|
"org.matrix.msc3391": self.config.experimental.msc3391_enabled,
|
||||||
# Allows clients to inhibit profile update propagation.
|
# Allows clients to inhibit profile update propagation.
|
||||||
"org.matrix.msc4069": self.config.experimental.msc4069_profile_inhibit_propagation,
|
"org.matrix.msc4069": self.config.experimental.msc4069_profile_inhibit_propagation,
|
||||||
# Allows clients to handle push for encrypted events.
|
# Allows clients to handle push for encrypted events.
|
||||||
"org.matrix.msc4028": self.config.experimental.msc4028_push_encrypted_events,
|
"org.matrix.msc4028": self.config.experimental.msc4028_push_encrypted_events,
|
||||||
# MSC4108: Mechanism to allow OIDC sign in and E2EE set up via QR code
|
|
||||||
"org.matrix.msc4108": self.config.experimental.msc4108_delegation_endpoint
|
|
||||||
is not None,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -72,6 +72,9 @@ class PreviewUrlResource(RestServlet):
|
|||||||
# XXX: if get_user_by_req fails, what should we do in an async render?
|
# XXX: if get_user_by_req fails, what should we do in an async render?
|
||||||
requester = await self.auth.get_user_by_req(request)
|
requester = await self.auth.get_user_by_req(request)
|
||||||
url = parse_string(request, "url", required=True)
|
url = parse_string(request, "url", required=True)
|
||||||
ts = parse_integer(request, "ts", default=self.clock.time_msec())
|
ts = parse_integer(request, "ts")
|
||||||
|
if ts is None:
|
||||||
|
ts = self.clock.time_msec()
|
||||||
|
|
||||||
og = await self.url_previewer.preview(url, requester.user, ts)
|
og = await self.url_previewer.preview(url, requester.user, ts)
|
||||||
respond_with_json_bytes(request, 200, og, send_cors=True)
|
respond_with_json_bytes(request, 200, og, send_cors=True)
|
||||||
|
|||||||
@@ -385,6 +385,7 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
|
|||||||
WITH all_receipts AS (
|
WITH all_receipts AS (
|
||||||
SELECT room_id, thread_id, MAX(event_stream_ordering) AS max_receipt_stream_ordering
|
SELECT room_id, thread_id, MAX(event_stream_ordering) AS max_receipt_stream_ordering
|
||||||
FROM receipts_linearized
|
FROM receipts_linearized
|
||||||
|
LEFT JOIN events USING (room_id, event_id)
|
||||||
WHERE
|
WHERE
|
||||||
{receipt_types_clause}
|
{receipt_types_clause}
|
||||||
AND user_id = ?
|
AND user_id = ?
|
||||||
@@ -620,12 +621,13 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
|
|||||||
SELECT notif_count, COALESCE(unread_count, 0), thread_id
|
SELECT notif_count, COALESCE(unread_count, 0), thread_id
|
||||||
FROM event_push_summary
|
FROM event_push_summary
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT thread_id, MAX(event_stream_ordering) AS threaded_receipt_stream_ordering
|
SELECT thread_id, MAX(stream_ordering) AS threaded_receipt_stream_ordering
|
||||||
FROM receipts_linearized
|
FROM receipts_linearized
|
||||||
|
LEFT JOIN events USING (room_id, event_id)
|
||||||
WHERE
|
WHERE
|
||||||
user_id = ?
|
user_id = ?
|
||||||
AND room_id = ?
|
AND room_id = ?
|
||||||
AND event_stream_ordering > ?
|
AND stream_ordering > ?
|
||||||
AND {receipt_types_clause}
|
AND {receipt_types_clause}
|
||||||
GROUP BY thread_id
|
GROUP BY thread_id
|
||||||
) AS receipts USING (thread_id)
|
) AS receipts USING (thread_id)
|
||||||
@@ -657,12 +659,13 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
|
|||||||
sql = f"""
|
sql = f"""
|
||||||
SELECT COUNT(*), thread_id FROM event_push_actions
|
SELECT COUNT(*), thread_id FROM event_push_actions
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT thread_id, MAX(event_stream_ordering) AS threaded_receipt_stream_ordering
|
SELECT thread_id, MAX(stream_ordering) AS threaded_receipt_stream_ordering
|
||||||
FROM receipts_linearized
|
FROM receipts_linearized
|
||||||
|
LEFT JOIN events USING (room_id, event_id)
|
||||||
WHERE
|
WHERE
|
||||||
user_id = ?
|
user_id = ?
|
||||||
AND room_id = ?
|
AND room_id = ?
|
||||||
AND event_stream_ordering > ?
|
AND stream_ordering > ?
|
||||||
AND {receipt_types_clause}
|
AND {receipt_types_clause}
|
||||||
GROUP BY thread_id
|
GROUP BY thread_id
|
||||||
) AS receipts USING (thread_id)
|
) AS receipts USING (thread_id)
|
||||||
@@ -735,12 +738,13 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
|
|||||||
thread_id
|
thread_id
|
||||||
FROM event_push_actions
|
FROM event_push_actions
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT thread_id, MAX(event_stream_ordering) AS threaded_receipt_stream_ordering
|
SELECT thread_id, MAX(stream_ordering) AS threaded_receipt_stream_ordering
|
||||||
FROM receipts_linearized
|
FROM receipts_linearized
|
||||||
|
LEFT JOIN events USING (room_id, event_id)
|
||||||
WHERE
|
WHERE
|
||||||
user_id = ?
|
user_id = ?
|
||||||
AND room_id = ?
|
AND room_id = ?
|
||||||
AND event_stream_ordering > ?
|
AND stream_ordering > ?
|
||||||
AND {receipt_types_clause}
|
AND {receipt_types_clause}
|
||||||
GROUP BY thread_id
|
GROUP BY thread_id
|
||||||
) AS receipts USING (thread_id)
|
) AS receipts USING (thread_id)
|
||||||
@@ -906,8 +910,9 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
|
|||||||
# given this function generally gets called with only one room and
|
# given this function generally gets called with only one room and
|
||||||
# thread ID.
|
# thread ID.
|
||||||
sql = f"""
|
sql = f"""
|
||||||
SELECT room_id, thread_id, MAX(event_stream_ordering)
|
SELECT room_id, thread_id, MAX(stream_ordering)
|
||||||
FROM receipts_linearized
|
FROM receipts_linearized
|
||||||
|
INNER JOIN events USING (room_id, event_id)
|
||||||
WHERE {receipt_types_clause}
|
WHERE {receipt_types_clause}
|
||||||
AND {thread_ids_clause}
|
AND {thread_ids_clause}
|
||||||
AND {room_ids_clause}
|
AND {room_ids_clause}
|
||||||
@@ -1437,8 +1442,9 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
|
|||||||
)
|
)
|
||||||
|
|
||||||
sql = """
|
sql = """
|
||||||
SELECT r.stream_id, r.room_id, r.user_id, r.thread_id, r.event_stream_ordering
|
SELECT r.stream_id, r.room_id, r.user_id, r.thread_id, e.stream_ordering
|
||||||
FROM receipts_linearized AS r
|
FROM receipts_linearized AS r
|
||||||
|
INNER JOIN events AS e USING (event_id)
|
||||||
WHERE ? < r.stream_id AND r.stream_id <= ? AND user_id LIKE ?
|
WHERE ? < r.stream_id AND r.stream_id <= ? AND user_id LIKE ?
|
||||||
ORDER BY r.stream_id ASC
|
ORDER BY r.stream_id ASC
|
||||||
LIMIT ?
|
LIMIT ?
|
||||||
|
|||||||
@@ -178,13 +178,14 @@ class ReceiptsWorkerStore(SQLBaseStore):
|
|||||||
)
|
)
|
||||||
|
|
||||||
sql = f"""
|
sql = f"""
|
||||||
SELECT event_id, event_stream_ordering
|
SELECT event_id, stream_ordering
|
||||||
FROM receipts_linearized
|
FROM receipts_linearized
|
||||||
|
INNER JOIN events USING (room_id, event_id)
|
||||||
WHERE {clause}
|
WHERE {clause}
|
||||||
AND user_id = ?
|
AND user_id = ?
|
||||||
AND room_id = ?
|
AND room_id = ?
|
||||||
AND thread_id IS NULL
|
AND thread_id IS NULL
|
||||||
ORDER BY event_stream_ordering DESC
|
ORDER BY stream_ordering DESC
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@@ -734,13 +735,10 @@ class ReceiptsWorkerStore(SQLBaseStore):
|
|||||||
thread_clause = "r.thread_id = ?"
|
thread_clause = "r.thread_id = ?"
|
||||||
thread_args = (thread_id,)
|
thread_args = (thread_id,)
|
||||||
|
|
||||||
# If the receipt doesn't have a stream ordering it is because we
|
|
||||||
# don't have the associated event, and so must be a remote receipt.
|
|
||||||
# Hence it's safe to just allow new receipts to clobber it.
|
|
||||||
sql = f"""
|
sql = f"""
|
||||||
SELECT r.event_stream_ordering, r.event_id FROM receipts_linearized AS r
|
SELECT stream_ordering, event_id FROM events
|
||||||
WHERE r.room_id = ? AND r.receipt_type = ? AND r.user_id = ?
|
INNER JOIN receipts_linearized AS r USING (event_id, room_id)
|
||||||
AND r.event_stream_ordering IS NOT NULL AND {thread_clause}
|
WHERE r.room_id = ? AND r.receipt_type = ? AND r.user_id = ? AND {thread_clause}
|
||||||
"""
|
"""
|
||||||
txn.execute(
|
txn.execute(
|
||||||
sql,
|
sql,
|
||||||
|
|||||||
@@ -2108,13 +2108,6 @@ class RegistrationBackgroundUpdateStore(RegistrationWorkerStore):
|
|||||||
unique=False,
|
unique=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
self.db_pool.updates.register_background_index_update(
|
|
||||||
update_name="access_tokens_refresh_token_id_idx",
|
|
||||||
index_name="access_tokens_refresh_token_id_idx",
|
|
||||||
table="access_tokens",
|
|
||||||
columns=("refresh_token_id",),
|
|
||||||
)
|
|
||||||
|
|
||||||
async def _background_update_set_deactivated_flag(
|
async def _background_update_set_deactivated_flag(
|
||||||
self, progress: JsonDict, batch_size: int
|
self, progress: JsonDict, batch_size: int
|
||||||
) -> int:
|
) -> int:
|
||||||
@@ -2273,6 +2266,13 @@ class RegistrationStore(StatsStore, RegistrationBackgroundUpdateStore):
|
|||||||
):
|
):
|
||||||
super().__init__(database, db_conn, hs)
|
super().__init__(database, db_conn, hs)
|
||||||
|
|
||||||
|
self.db_pool.updates.register_background_index_update(
|
||||||
|
update_name="access_tokens_refresh_token_id_idx",
|
||||||
|
index_name="access_tokens_refresh_token_id_idx",
|
||||||
|
table="access_tokens",
|
||||||
|
columns=("refresh_token_id",),
|
||||||
|
)
|
||||||
|
|
||||||
self._ignore_unknown_session_error = (
|
self._ignore_unknown_session_error = (
|
||||||
hs.config.server.request_token_inhibit_3pid_errors
|
hs.config.server.request_token_inhibit_3pid_errors
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
--
|
|
||||||
-- This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
||||||
--
|
|
||||||
-- Copyright (C) 2023 New Vector, Ltd
|
|
||||||
--
|
|
||||||
-- This program is free software: you can redistribute it and/or modify
|
|
||||||
-- it under the terms of the GNU Affero General Public License as
|
|
||||||
-- published by the Free Software Foundation, either version 3 of the
|
|
||||||
-- License, or (at your option) any later version.
|
|
||||||
--
|
|
||||||
-- See the GNU Affero General Public License for more details:
|
|
||||||
-- <https://www.gnu.org/licenses/agpl-3.0.html>.
|
|
||||||
|
|
||||||
INSERT INTO background_updates (ordering, update_name, progress_json) VALUES
|
|
||||||
(8404, 'access_tokens_refresh_token_id_idx', '{}');
|
|
||||||
@@ -1101,56 +1101,6 @@ class E2eKeysHandlerTestCase(unittest.HomeserverTestCase):
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_has_different_keys(self) -> None:
|
|
||||||
"""check that has_different_keys returns True when the keys provided are different to what
|
|
||||||
is in the database."""
|
|
||||||
local_user = "@boris:" + self.hs.hostname
|
|
||||||
keys1 = {
|
|
||||||
"master_key": {
|
|
||||||
# private key: 2lonYOM6xYKdEsO+6KrC766xBcHnYnim1x/4LFGF8B0
|
|
||||||
"user_id": local_user,
|
|
||||||
"usage": ["master"],
|
|
||||||
"keys": {
|
|
||||||
"ed25519:nqOvzeuGWT/sRx3h7+MHoInYj3Uk2LD/unI9kDYcHwk": "nqOvzeuGWT/sRx3h7+MHoInYj3Uk2LD/unI9kDYcHwk"
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
self.get_success(self.handler.upload_signing_keys_for_user(local_user, keys1))
|
|
||||||
is_different = self.get_success(
|
|
||||||
self.handler.has_different_keys(
|
|
||||||
local_user,
|
|
||||||
{
|
|
||||||
"master_key": keys1["master_key"],
|
|
||||||
},
|
|
||||||
)
|
|
||||||
)
|
|
||||||
self.assertEqual(is_different, False)
|
|
||||||
# change the usage => different keys
|
|
||||||
keys1["master_key"]["usage"] = ["develop"]
|
|
||||||
is_different = self.get_success(
|
|
||||||
self.handler.has_different_keys(
|
|
||||||
local_user,
|
|
||||||
{
|
|
||||||
"master_key": keys1["master_key"],
|
|
||||||
},
|
|
||||||
)
|
|
||||||
)
|
|
||||||
self.assertEqual(is_different, True)
|
|
||||||
keys1["master_key"]["usage"] = ["master"] # reset
|
|
||||||
# change the key => different keys
|
|
||||||
keys1["master_key"]["keys"] = {
|
|
||||||
"ed25519:nqOvzeuGWT/sRx3h7+MHoInYj3Uk2LD/unIc0rncs": "nqOvzeuGWT/sRx3h7+MHoInYj3Uk2LD/unIc0rncs"
|
|
||||||
}
|
|
||||||
is_different = self.get_success(
|
|
||||||
self.handler.has_different_keys(
|
|
||||||
local_user,
|
|
||||||
{
|
|
||||||
"master_key": keys1["master_key"],
|
|
||||||
},
|
|
||||||
)
|
|
||||||
)
|
|
||||||
self.assertEqual(is_different, True)
|
|
||||||
|
|
||||||
def test_query_devices_remote_sync(self) -> None:
|
def test_query_devices_remote_sync(self) -> None:
|
||||||
"""Tests that querying keys for a remote user that we share a room with,
|
"""Tests that querying keys for a remote user that we share a room with,
|
||||||
but haven't yet fetched the keys for, returns the cross signing keys
|
but haven't yet fetched the keys for, returns the cross signing keys
|
||||||
|
|||||||
@@ -435,101 +435,6 @@ class SyncTestCase(tests.unittest.HomeserverTestCase):
|
|||||||
[s2_event],
|
[s2_event],
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_state_includes_changes_on_long_lived_forks(self) -> None:
|
|
||||||
"""State changes that happen on a fork of the DAG must be included in `state`
|
|
||||||
|
|
||||||
Given the following DAG:
|
|
||||||
|
|
||||||
E1
|
|
||||||
↗ ↖
|
|
||||||
| S2
|
|
||||||
| ↑
|
|
||||||
--|------|----
|
|
||||||
E3 |
|
|
||||||
--|------|----
|
|
||||||
| E4
|
|
||||||
| |
|
|
||||||
|
|
||||||
... and a filter that means we only return 1 event, represented by the dashed
|
|
||||||
horizontal lines: `S2` must be included in the `state` section on the second sync.
|
|
||||||
"""
|
|
||||||
alice = self.register_user("alice", "password")
|
|
||||||
alice_tok = self.login(alice, "password")
|
|
||||||
alice_requester = create_requester(alice)
|
|
||||||
room_id = self.helper.create_room_as(alice, is_public=True, tok=alice_tok)
|
|
||||||
|
|
||||||
# Do an initial sync as Alice to get a known starting point.
|
|
||||||
initial_sync_result = self.get_success(
|
|
||||||
self.sync_handler.wait_for_sync_for_user(
|
|
||||||
alice_requester, generate_sync_config(alice)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
last_room_creation_event_id = (
|
|
||||||
initial_sync_result.joined[0].timeline.events[-1].event_id
|
|
||||||
)
|
|
||||||
|
|
||||||
# Send a state event, and a regular event, both using the same prev ID
|
|
||||||
with self._patch_get_latest_events([last_room_creation_event_id]):
|
|
||||||
s2_event = self.helper.send_state(room_id, "s2", {}, tok=alice_tok)[
|
|
||||||
"event_id"
|
|
||||||
]
|
|
||||||
e3_event = self.helper.send(room_id, "e3", tok=alice_tok)["event_id"]
|
|
||||||
|
|
||||||
# Do an incremental sync, this will return E3 but *not* S2 at this
|
|
||||||
# point.
|
|
||||||
incremental_sync = self.get_success(
|
|
||||||
self.sync_handler.wait_for_sync_for_user(
|
|
||||||
alice_requester,
|
|
||||||
generate_sync_config(
|
|
||||||
alice,
|
|
||||||
filter_collection=FilterCollection(
|
|
||||||
self.hs, {"room": {"timeline": {"limit": 1}}}
|
|
||||||
),
|
|
||||||
),
|
|
||||||
since_token=initial_sync_result.next_batch,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
room_sync = incremental_sync.joined[0]
|
|
||||||
self.assertEqual(room_sync.room_id, room_id)
|
|
||||||
self.assertTrue(room_sync.timeline.limited)
|
|
||||||
self.assertEqual(
|
|
||||||
[e.event_id for e in room_sync.timeline.events],
|
|
||||||
[e3_event],
|
|
||||||
)
|
|
||||||
self.assertEqual(
|
|
||||||
[e.event_id for e in room_sync.state.values()],
|
|
||||||
[],
|
|
||||||
)
|
|
||||||
|
|
||||||
# Now send another event that points to S2, but not E3.
|
|
||||||
with self._patch_get_latest_events([s2_event]):
|
|
||||||
e4_event = self.helper.send(room_id, "e4", tok=alice_tok)["event_id"]
|
|
||||||
|
|
||||||
# Doing an incremental sync should return S2 in state.
|
|
||||||
incremental_sync = self.get_success(
|
|
||||||
self.sync_handler.wait_for_sync_for_user(
|
|
||||||
alice_requester,
|
|
||||||
generate_sync_config(
|
|
||||||
alice,
|
|
||||||
filter_collection=FilterCollection(
|
|
||||||
self.hs, {"room": {"timeline": {"limit": 1}}}
|
|
||||||
),
|
|
||||||
),
|
|
||||||
since_token=incremental_sync.next_batch,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
room_sync = incremental_sync.joined[0]
|
|
||||||
self.assertEqual(room_sync.room_id, room_id)
|
|
||||||
self.assertFalse(room_sync.timeline.limited)
|
|
||||||
self.assertEqual(
|
|
||||||
[e.event_id for e in room_sync.timeline.events],
|
|
||||||
[e4_event],
|
|
||||||
)
|
|
||||||
self.assertEqual(
|
|
||||||
[e.event_id for e in room_sync.state.values()],
|
|
||||||
[s2_event],
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_state_includes_changes_on_ungappy_syncs(self) -> None:
|
def test_state_includes_changes_on_ungappy_syncs(self) -> None:
|
||||||
"""Test `state` where the sync is not gappy.
|
"""Test `state` where the sync is not gappy.
|
||||||
|
|
||||||
|
|||||||
@@ -277,8 +277,7 @@ class DeleteMediaByDateSizeTestCase(_AdminMediaTests):
|
|||||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||||
self.assertEqual(Codes.MISSING_PARAM, channel.json_body["errcode"])
|
self.assertEqual(Codes.MISSING_PARAM, channel.json_body["errcode"])
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
"Missing required integer query parameter before_ts",
|
"Missing integer query parameter 'before_ts'", channel.json_body["error"]
|
||||||
channel.json_body["error"],
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_invalid_parameter(self) -> None:
|
def test_invalid_parameter(self) -> None:
|
||||||
@@ -321,7 +320,7 @@ class DeleteMediaByDateSizeTestCase(_AdminMediaTests):
|
|||||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||||
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
|
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
"Query parameter size_gt must be a positive integer.",
|
"Query parameter size_gt must be a string representing a positive integer.",
|
||||||
channel.json_body["error"],
|
channel.json_body["error"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,6 @@
|
|||||||
import json
|
import json
|
||||||
import time
|
import time
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
from http import HTTPStatus
|
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
from unittest.mock import AsyncMock, Mock
|
from unittest.mock import AsyncMock, Mock
|
||||||
|
|
||||||
@@ -2191,33 +2190,6 @@ class RoomMessagesTestCase(unittest.HomeserverTestCase):
|
|||||||
chunk = channel.json_body["chunk"]
|
chunk = channel.json_body["chunk"]
|
||||||
self.assertEqual(len(chunk), 0, [event["content"] for event in chunk])
|
self.assertEqual(len(chunk), 0, [event["content"] for event in chunk])
|
||||||
|
|
||||||
def test_room_message_filter_query_validation(self) -> None:
|
|
||||||
# Test json validation in (filter) query parameter.
|
|
||||||
# Does not test the validity of the filter, only the json validation.
|
|
||||||
|
|
||||||
# Check Get with valid json filter parameter, expect 200.
|
|
||||||
valid_filter_str = '{"types": ["m.room.message"]}'
|
|
||||||
channel = self.make_request(
|
|
||||||
"GET",
|
|
||||||
f"/_synapse/admin/v1/rooms/{self.room_id}/messages?dir=b&filter={valid_filter_str}",
|
|
||||||
access_token=self.admin_user_tok,
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(channel.code, HTTPStatus.OK, channel.json_body)
|
|
||||||
|
|
||||||
# Check Get with invalid json filter parameter, expect 400 NOT_JSON.
|
|
||||||
invalid_filter_str = "}}}{}"
|
|
||||||
channel = self.make_request(
|
|
||||||
"GET",
|
|
||||||
f"/_synapse/admin/v1/rooms/{self.room_id}/messages?dir=b&filter={invalid_filter_str}",
|
|
||||||
access_token=self.admin_user_tok,
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(channel.code, HTTPStatus.BAD_REQUEST, channel.json_body)
|
|
||||||
self.assertEqual(
|
|
||||||
channel.json_body["errcode"], Codes.NOT_JSON, channel.json_body
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
||||||
servlets = [
|
servlets = [
|
||||||
@@ -2550,39 +2522,6 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||||||
else:
|
else:
|
||||||
self.fail("Event %s from events_after not found" % j)
|
self.fail("Event %s from events_after not found" % j)
|
||||||
|
|
||||||
def test_room_event_context_filter_query_validation(self) -> None:
|
|
||||||
# Test json validation in (filter) query parameter.
|
|
||||||
# Does not test the validity of the filter, only the json validation.
|
|
||||||
|
|
||||||
# Create a user with room and event_id.
|
|
||||||
user_id = self.register_user("test", "test")
|
|
||||||
user_tok = self.login("test", "test")
|
|
||||||
room_id = self.helper.create_room_as(user_id, tok=user_tok)
|
|
||||||
event_id = self.helper.send(room_id, "message 1", tok=user_tok)["event_id"]
|
|
||||||
|
|
||||||
# Check Get with valid json filter parameter, expect 200.
|
|
||||||
valid_filter_str = '{"types": ["m.room.message"]}'
|
|
||||||
channel = self.make_request(
|
|
||||||
"GET",
|
|
||||||
f"/_synapse/admin/v1/rooms/{room_id}/context/{event_id}?filter={valid_filter_str}",
|
|
||||||
access_token=self.admin_user_tok,
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(channel.code, HTTPStatus.OK, channel.json_body)
|
|
||||||
|
|
||||||
# Check Get with invalid json filter parameter, expect 400 NOT_JSON.
|
|
||||||
invalid_filter_str = "}}}{}"
|
|
||||||
channel = self.make_request(
|
|
||||||
"GET",
|
|
||||||
f"/_synapse/admin/v1/rooms/{room_id}/context/{event_id}?filter={invalid_filter_str}",
|
|
||||||
access_token=self.admin_user_tok,
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(channel.code, HTTPStatus.BAD_REQUEST, channel.json_body)
|
|
||||||
self.assertEqual(
|
|
||||||
channel.json_body["errcode"], Codes.NOT_JSON, channel.json_body
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class MakeRoomAdminTestCase(unittest.HomeserverTestCase):
|
class MakeRoomAdminTestCase(unittest.HomeserverTestCase):
|
||||||
servlets = [
|
servlets = [
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ from synapse.util import Clock
|
|||||||
from tests import unittest
|
from tests import unittest
|
||||||
from tests.server import FakeChannel
|
from tests.server import FakeChannel
|
||||||
from tests.test_utils.event_injection import inject_event
|
from tests.test_utils.event_injection import inject_event
|
||||||
|
from tests.unittest import override_config
|
||||||
|
|
||||||
|
|
||||||
class BaseRelationsTestCase(unittest.HomeserverTestCase):
|
class BaseRelationsTestCase(unittest.HomeserverTestCase):
|
||||||
@@ -956,6 +957,7 @@ class RelationPaginationTestCase(BaseRelationsTestCase):
|
|||||||
|
|
||||||
|
|
||||||
class RecursiveRelationTestCase(BaseRelationsTestCase):
|
class RecursiveRelationTestCase(BaseRelationsTestCase):
|
||||||
|
@override_config({"experimental_features": {"msc3981_recurse_relations": True}})
|
||||||
def test_recursive_relations(self) -> None:
|
def test_recursive_relations(self) -> None:
|
||||||
"""Generate a complex, multi-level relationship tree and query it."""
|
"""Generate a complex, multi-level relationship tree and query it."""
|
||||||
# Create a thread with a few messages in it.
|
# Create a thread with a few messages in it.
|
||||||
@@ -1001,7 +1003,7 @@ class RecursiveRelationTestCase(BaseRelationsTestCase):
|
|||||||
channel = self.make_request(
|
channel = self.make_request(
|
||||||
"GET",
|
"GET",
|
||||||
f"/_matrix/client/v1/rooms/{self.room}/relations/{self.parent_id}"
|
f"/_matrix/client/v1/rooms/{self.room}/relations/{self.parent_id}"
|
||||||
"?dir=f&limit=20&recurse=true",
|
"?dir=f&limit=20&org.matrix.msc3981.recurse=true",
|
||||||
access_token=self.user_token,
|
access_token=self.user_token,
|
||||||
)
|
)
|
||||||
self.assertEqual(200, channel.code, channel.json_body)
|
self.assertEqual(200, channel.code, channel.json_body)
|
||||||
@@ -1022,6 +1024,7 @@ class RecursiveRelationTestCase(BaseRelationsTestCase):
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@override_config({"experimental_features": {"msc3981_recurse_relations": True}})
|
||||||
def test_recursive_relations_with_filter(self) -> None:
|
def test_recursive_relations_with_filter(self) -> None:
|
||||||
"""The event_type and rel_type still apply."""
|
"""The event_type and rel_type still apply."""
|
||||||
# Create a thread with a few messages in it.
|
# Create a thread with a few messages in it.
|
||||||
@@ -1049,7 +1052,7 @@ class RecursiveRelationTestCase(BaseRelationsTestCase):
|
|||||||
channel = self.make_request(
|
channel = self.make_request(
|
||||||
"GET",
|
"GET",
|
||||||
f"/_matrix/client/v1/rooms/{self.room}/relations/{self.parent_id}/{RelationTypes.ANNOTATION}"
|
f"/_matrix/client/v1/rooms/{self.room}/relations/{self.parent_id}/{RelationTypes.ANNOTATION}"
|
||||||
"?dir=f&limit=20&recurse=true",
|
"?dir=f&limit=20&org.matrix.msc3981.recurse=true",
|
||||||
access_token=self.user_token,
|
access_token=self.user_token,
|
||||||
)
|
)
|
||||||
self.assertEqual(200, channel.code, channel.json_body)
|
self.assertEqual(200, channel.code, channel.json_body)
|
||||||
@@ -1062,7 +1065,7 @@ class RecursiveRelationTestCase(BaseRelationsTestCase):
|
|||||||
channel = self.make_request(
|
channel = self.make_request(
|
||||||
"GET",
|
"GET",
|
||||||
f"/_matrix/client/v1/rooms/{self.room}/relations/{self.parent_id}/{RelationTypes.ANNOTATION}/m.reaction"
|
f"/_matrix/client/v1/rooms/{self.room}/relations/{self.parent_id}/{RelationTypes.ANNOTATION}/m.reaction"
|
||||||
"?dir=f&limit=20&recurse=true",
|
"?dir=f&limit=20&org.matrix.msc3981.recurse=true",
|
||||||
access_token=self.user_token,
|
access_token=self.user_token,
|
||||||
)
|
)
|
||||||
self.assertEqual(200, channel.code, channel.json_body)
|
self.assertEqual(200, channel.code, channel.json_body)
|
||||||
|
|||||||
@@ -27,10 +27,8 @@ from synapse.util import Clock
|
|||||||
|
|
||||||
from tests import unittest
|
from tests import unittest
|
||||||
from tests.unittest import override_config
|
from tests.unittest import override_config
|
||||||
from tests.utils import HAS_AUTHLIB
|
|
||||||
|
|
||||||
msc3886_endpoint = "/_matrix/client/unstable/org.matrix.msc3886/rendezvous"
|
endpoint = "/_matrix/client/unstable/org.matrix.msc3886/rendezvous"
|
||||||
msc4108_endpoint = "/_matrix/client/unstable/org.matrix.msc4108/rendezvous"
|
|
||||||
|
|
||||||
|
|
||||||
class RendezvousServletTestCase(unittest.HomeserverTestCase):
|
class RendezvousServletTestCase(unittest.HomeserverTestCase):
|
||||||
@@ -43,35 +41,11 @@ class RendezvousServletTestCase(unittest.HomeserverTestCase):
|
|||||||
return self.hs
|
return self.hs
|
||||||
|
|
||||||
def test_disabled(self) -> None:
|
def test_disabled(self) -> None:
|
||||||
channel = self.make_request("POST", msc3886_endpoint, {}, access_token=None)
|
channel = self.make_request("POST", endpoint, {}, access_token=None)
|
||||||
self.assertEqual(channel.code, 404)
|
|
||||||
channel = self.make_request("POST", msc4108_endpoint, {}, access_token=None)
|
|
||||||
self.assertEqual(channel.code, 404)
|
self.assertEqual(channel.code, 404)
|
||||||
|
|
||||||
@override_config({"experimental_features": {"msc3886_endpoint": "/asd"}})
|
@override_config({"experimental_features": {"msc3886_endpoint": "/asd"}})
|
||||||
def test_msc3886_redirect(self) -> None:
|
def test_redirect(self) -> None:
|
||||||
channel = self.make_request("POST", msc3886_endpoint, {}, access_token=None)
|
channel = self.make_request("POST", endpoint, {}, access_token=None)
|
||||||
self.assertEqual(channel.code, 307)
|
self.assertEqual(channel.code, 307)
|
||||||
self.assertEqual(channel.headers.getRawHeaders("Location"), ["/asd"])
|
self.assertEqual(channel.headers.getRawHeaders("Location"), ["/asd"])
|
||||||
|
|
||||||
@unittest.skip_unless(HAS_AUTHLIB, "requires authlib")
|
|
||||||
@override_config(
|
|
||||||
{
|
|
||||||
"disable_registration": True,
|
|
||||||
"experimental_features": {
|
|
||||||
"msc4108_delegation_endpoint": "https://asd",
|
|
||||||
"msc3861": {
|
|
||||||
"enabled": True,
|
|
||||||
"issuer": "https://issuer",
|
|
||||||
"client_id": "client_id",
|
|
||||||
"client_auth_method": "client_secret_post",
|
|
||||||
"client_secret": "client_secret",
|
|
||||||
"admin_token": "admin_token_value",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
)
|
|
||||||
def test_msc4108_delegation(self) -> None:
|
|
||||||
channel = self.make_request("POST", msc4108_endpoint, {}, access_token=None)
|
|
||||||
self.assertEqual(channel.code, 307)
|
|
||||||
self.assertEqual(channel.headers.getRawHeaders("Location"), ["https://asd"])
|
|
||||||
|
|||||||
@@ -2175,31 +2175,6 @@ class RoomMessageListTestCase(RoomBase):
|
|||||||
chunk = channel.json_body["chunk"]
|
chunk = channel.json_body["chunk"]
|
||||||
self.assertEqual(len(chunk), 0, [event["content"] for event in chunk])
|
self.assertEqual(len(chunk), 0, [event["content"] for event in chunk])
|
||||||
|
|
||||||
def test_room_message_filter_query_validation(self) -> None:
|
|
||||||
# Test json validation in (filter) query parameter.
|
|
||||||
# Does not test the validity of the filter, only the json validation.
|
|
||||||
|
|
||||||
# Check Get with valid json filter parameter, expect 200.
|
|
||||||
valid_filter_str = '{"types": ["m.room.message"]}'
|
|
||||||
channel = self.make_request(
|
|
||||||
"GET",
|
|
||||||
f"/rooms/{self.room_id}/messages?access_token=x&dir=b&filter={valid_filter_str}",
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(channel.code, HTTPStatus.OK, channel.json_body)
|
|
||||||
|
|
||||||
# Check Get with invalid json filter parameter, expect 400 NOT_JSON.
|
|
||||||
invalid_filter_str = "}}}{}"
|
|
||||||
channel = self.make_request(
|
|
||||||
"GET",
|
|
||||||
f"/rooms/{self.room_id}/messages?access_token=x&dir=b&filter={invalid_filter_str}",
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(channel.code, HTTPStatus.BAD_REQUEST, channel.json_body)
|
|
||||||
self.assertEqual(
|
|
||||||
channel.json_body["errcode"], Codes.NOT_JSON, channel.json_body
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class RoomMessageFilterTestCase(RoomBase):
|
class RoomMessageFilterTestCase(RoomBase):
|
||||||
"""Tests /rooms/$room_id/messages REST events."""
|
"""Tests /rooms/$room_id/messages REST events."""
|
||||||
@@ -3238,33 +3213,6 @@ class ContextTestCase(unittest.HomeserverTestCase):
|
|||||||
self.assertDictEqual(events_after[0].get("content"), {}, events_after[0])
|
self.assertDictEqual(events_after[0].get("content"), {}, events_after[0])
|
||||||
self.assertEqual(events_after[1].get("content"), {}, events_after[1])
|
self.assertEqual(events_after[1].get("content"), {}, events_after[1])
|
||||||
|
|
||||||
def test_room_event_context_filter_query_validation(self) -> None:
|
|
||||||
# Test json validation in (filter) query parameter.
|
|
||||||
# Does not test the validity of the filter, only the json validation.
|
|
||||||
event_id = self.helper.send(self.room_id, "message 7", tok=self.tok)["event_id"]
|
|
||||||
|
|
||||||
# Check Get with valid json filter parameter, expect 200.
|
|
||||||
valid_filter_str = '{"types": ["m.room.message"]}'
|
|
||||||
channel = self.make_request(
|
|
||||||
"GET",
|
|
||||||
f"/rooms/{self.room_id}/context/{event_id}?filter={valid_filter_str}",
|
|
||||||
access_token=self.tok,
|
|
||||||
)
|
|
||||||
self.assertEqual(channel.code, HTTPStatus.OK, channel.json_body)
|
|
||||||
|
|
||||||
# Check Get with invalid json filter parameter, expect 400 NOT_JSON.
|
|
||||||
invalid_filter_str = "}}}{}"
|
|
||||||
channel = self.make_request(
|
|
||||||
"GET",
|
|
||||||
f"/rooms/{self.room_id}/context/{event_id}?filter={invalid_filter_str}",
|
|
||||||
access_token=self.tok,
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(channel.code, HTTPStatus.BAD_REQUEST, channel.json_body)
|
|
||||||
self.assertEqual(
|
|
||||||
channel.json_body["errcode"], Codes.NOT_JSON, channel.json_body
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class RoomAliasListTestCase(unittest.HomeserverTestCase):
|
class RoomAliasListTestCase(unittest.HomeserverTestCase):
|
||||||
servlets = [
|
servlets = [
|
||||||
|
|||||||
Reference in New Issue
Block a user