From 892fb8846a3759f9572d42e8b3d3f2baad2b8b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20K=C3=B6sters?= Date: Sun, 6 Oct 2024 14:18:54 +0200 Subject: [PATCH 1/3] Bump version --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 19e75ceb..9a98f2a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -487,7 +487,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "conduit" -version = "0.9.0-alpha" +version = "0.9.0" dependencies = [ "async-trait", "axum 0.7.5", diff --git a/Cargo.toml b/Cargo.toml index 67128f07..fba2f59a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ license = "Apache-2.0" name = "conduit" readme = "README.md" repository = "https://gitlab.com/famedly/conduit" -version = "0.9.0-alpha" +version = "0.9.0" # See also `rust-toolchain.toml` rust-version = "1.79.0" From 6767ca8bc8235d5a5d8adcb51f6c57a63e7bf211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20K=C3=B6sters?= Date: Mon, 7 Oct 2024 00:02:36 +0200 Subject: [PATCH 2/3] fix: config options for well_known have changed --- Cargo.lock | 2 +- Cargo.toml | 2 +- docs/configuration.md | 3 ++- docs/delegation.md | 12 ++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a98f2a5..4b020ed8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -487,7 +487,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "conduit" -version = "0.9.0" +version = "0.10.0-alpha" dependencies = [ "async-trait", "axum 0.7.5", diff --git a/Cargo.toml b/Cargo.toml index fba2f59a..0cdde4ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ license = "Apache-2.0" name = "conduit" readme = "README.md" repository = "https://gitlab.com/famedly/conduit" -version = "0.9.0" +version = "0.10.0-alpha" # See also `rust-toolchain.toml` rust-version = "1.79.0" diff --git a/docs/configuration.md b/docs/configuration.md index 2239ac5d..b2b4f3a4 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -58,7 +58,8 @@ The `global` section contains the following fields: | `turn_secret` | `string` | The TURN secret | `""` | | `turn_ttl` | `integer` | The TURN TTL in seconds | `86400` | | `emergency_password` | `string` | Set a password to login as the `conduit` user in case of emergency | N/A | -| `well_known` | `table` | Used for [delegation](delegation.md) | See [delegation](delegation.md) | +| `well_known_client` | `string` | Used for [delegation](delegation.md) | See [delegation](delegation.md) | +| `well_known_server` | `string` | Used for [delegation](delegation.md) | See [delegation](delegation.md) | ### TLS diff --git a/docs/delegation.md b/docs/delegation.md index c8e5391c..28d962f7 100644 --- a/docs/delegation.md +++ b/docs/delegation.md @@ -16,18 +16,18 @@ are connected to the server running Conduit using something like a VPN. > **Note**: this will automatically allow you to use [sliding sync][0] without any extra configuration -To configure it, use the following options in the `global.well_known` table: +To configure it, use the following options: | Field | Type | Description | Default | | --- | --- | --- | --- | -| `client` | `String` | The URL that clients should use to connect to Conduit | `https://` | -| `server` | `String` | The hostname and port servers should use to connect to Conduit | `:443` | +| `well_known_client` | `String` | The URL that clients should use to connect to Conduit | `https://` | +| `well_known_server` | `String` | The hostname and port servers should use to connect to Conduit | `:443` | ### Example ```toml -[global.well_known] -client = "https://matrix.example.org" -server = "matrix.example.org:443" +[global] +well_known_client = "https://matrix.example.org" +well_known_server = "matrix.example.org:443" ``` ## Manual From a2b72f48b9beaa9b0228f099ebaee0b953349371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Tue, 8 Oct 2024 19:41:04 +0300 Subject: [PATCH 3/3] fix: remove content-disposition debug prints --- src/database/mod.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/database/mod.rs b/src/database/mod.rs index 0035862a..2317f7a8 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -972,11 +972,9 @@ impl KeyValueDatabase { if content_disposition.contains("filename=") && !content_disposition.contains("filename=\"") { - println!("{}", &content_disposition); content_disposition = content_disposition.replacen("filename=", "filename=\"", 1); content_disposition.push('"'); - println!("{}", &content_disposition); let mut new_key = mediaid[..(mediaid.len() - removed_bytes)].to_vec(); assert!(*new_key.last().unwrap() == 0xff);