fix(media): return an error when content is failed to be parsed as an image

2024-06-05 13:35:01 +01:00
56 changed files with 1588 additions and 3042 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -103,11 +103,6 @@ artifacts:
    - ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
    - cp result/bin/conduit aarch64-unknown-linux-musl

-    - mkdir -p target/aarch64-unknown-linux-musl/release
-    - cp result/bin/conduit target/aarch64-unknown-linux-musl/release
-    - direnv exec . cargo deb --no-strip --no-build --target aarch64-unknown-linux-musl
-    - mv target/aarch64-unknown-linux-musl/debian/*.deb aarch64-unknown-linux-musl.deb
-
    - ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl
    - cp result oci-image-arm64v8.tar.gz

@ -119,7 +114,6 @@ artifacts:
      - x86_64-unknown-linux-musl
      - aarch64-unknown-linux-musl
      - x86_64-unknown-linux-musl.deb
-      - aarch64-unknown-linux-musl.deb
      - oci-image-amd64.tar.gz
      - oci-image-arm64v8.tar.gz
      - public
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -16,10 +16,10 @@ license = "Apache-2.0"
 name = "conduit"
 readme = "README.md"
 repository = "https://gitlab.com/famedly/conduit"
-version = "0.10.0-alpha"
+version = "0.8.0-alpha"

 # See also `rust-toolchain.toml`
-rust-version = "1.79.0"
+rust-version = "1.78.0"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@ -28,24 +28,43 @@ workspace = true

 [dependencies]
 # Web framework
-axum = { version = "0.7", default-features = false, features = [
+axum = { version = "0.6.18", default-features = false, features = [
  "form",
+  "headers",
  "http1",
  "http2",
  "json",
  "matched-path",
 ], optional = true }
-axum-extra = { version = "0.9", features = ["typed-header"] }
-axum-server = { version = "0.6", features = ["tls-rustls"] }
+axum-server = { version = "0.5.1", features = ["tls-rustls"] }
 tower = { version = "0.4.13", features = ["util"] }
-tower-http = { version = "0.5", features = [
+tower-http = { version = "0.4.1", features = [
  "add-extension",
  "cors",
  "sensitive-headers",
  "trace",
  "util",
 ] }
-tower-service = "0.3"
+
+# Used for matrix spec type definitions and helpers
+#ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
+ruma = { git = "https://github.com/ruma/ruma", rev = "c5f8137ba9741b2317313256b57e6e14b61fb419", features = [
+  "appservice-api-c",
+  "client-api",
+  "compat",
+  "federation-api",
+  "push-gateway-api-c",
+  "rand",
+  "ring-compat",
+  "server-util",
+  "state-res",
+  "unstable-exhaustive-types",
+  "unstable-msc2448",
+  "unstable-msc3575",
+  "unstable-unspecified",
+] }
+#ruma = { git = "https://github.com/timokoesters/ruma", rev = "4ec9c69bb7e09391add2382b3ebac97b6e8f4c64", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] }
+#ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] }

 # Async runtime and utilities
 tokio = { version = "1.28.1", features = ["fs", "macros", "signal", "sync"] }
@ -56,7 +75,7 @@ persy = { version = "1.4.4", optional = true, features = ["background_ops"] }

 # Used for the http request / response body type for Ruma endpoints used with reqwest
 bytes = "1.4.0"
-http = "1"
+http = "0.2.9"
 # Used to find data directory for default db path
 directories = "5"
 # Used for ruma wrapper
@ -70,14 +89,8 @@ rand = "0.8.5"
 # Used to hash passwords
 rust-argon2 = "2"
 # Used to send requests
-hyper = "1.1"
-hyper-util = { version = "0.1", features = [
-  "client",
-  "client-legacy",
-  "http1",
-  "http2",
-] }
-reqwest = { version = "0.12", default-features = false, features = [
+hyper = "0.14.26"
+reqwest = { version = "0.11.18", default-features = false, features = [
  "rustls-tls-native-roots",
  "socks",
 ] }
@ -100,13 +113,11 @@ regex = "1.8.1"
 # jwt jsonwebtokens
 jsonwebtoken = "9.2.0"
 # Performance measurements
-opentelemetry = "0.22"
-opentelemetry-jaeger-propagator = "0.1"
-opentelemetry-otlp = "0.15"
-opentelemetry_sdk = { version = "0.22", features = ["rt-tokio"] }
-tracing = "0.1.37"
+opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
+opentelemetry-jaeger = { version = "0.17.0", features = ["rt-tokio"] }
+tracing = { version = "0.1.37", features = [] }
 tracing-flame = "0.2.0"
-tracing-opentelemetry = "0.23"
+tracing-opentelemetry = "0.18.0"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }

 lru-cache = "0.1.2"
@ -147,25 +158,6 @@ tikv-jemallocator = { version = "0.5.0", features = [

 sd-notify = { version = "0.4.1", optional = true }

-# Used for matrix spec type definitions and helpers
-[dependencies.ruma]
-features = [
-  "appservice-api-c",
-  "client-api",
-  "compat",
-  "federation-api",
-  "push-gateway-api-c",
-  "rand",
-  "ring-compat",
-  "server-util",
-  "state-res",
-  "unstable-exhaustive-types",
-  "unstable-msc2448",
-  "unstable-msc3575",
-  "unstable-unspecified",
-]
-git = "https://github.com/ruma/ruma"
-
 [dependencies.rocksdb]
 features = ["lz4", "multi-threaded-cf", "zstd"]
 optional = true
--- a/README.md
+++ b/README.md
@ -56,13 +56,6 @@ If you have any questions, feel free to
 - Send an direct message to `@timokoesters:fachschaften.org` on Matrix
 - [Open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new)

-#### Security
-
-If you believe you have found a security issue, please send a message to [Timo](https://matrix.to/#/@timo:conduit.rs)
-and/or [Matthias](https://matrix.to/#/@matthias:ahouansou.cz) on Matrix, or send an email to
-[conduit@koesters.xyz](mailto:conduit@koesters.xyz). Please do not disclose details about the issue to anyone else before
-a fix is released publically.
-
 #### Thanks to

 Thanks to FUTO, Famedly, Prototype Fund (DLR and German BMBF) and all individuals for financially supporting this project.
--- a/complement/Dockerfile
+++ b/complement/Dockerfile
@ -1,4 +1,4 @@
-FROM rust:1.79.0
+FROM rust:1.78.0

 WORKDIR /workdir

--- a/docs/configuration.md
+++ b/docs/configuration.md
@ -6,8 +6,6 @@

 > **Note:** If you update the configuration file, you must restart Conduit for the changes to take effect

-> **Note:** You can also configure Conduit by using `CONDUIT_{field_name}` environment variables. To set values inside a table, use `CONDUIT_{table_name}__{field_name}`. Example: `CONDUIT_SERVER_NAME="example.org"`
-
 Conduit's configuration file is divided into the following sections:

 - [Global](#global)
@ -58,8 +56,7 @@ 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_client` | `string` | Used for [delegation](delegation.md) | See [delegation](delegation.md) |
-| `well_known_server` | `string` | Used for [delegation](delegation.md) | See [delegation](delegation.md) |
+| `well_known` | `table` | Used for [delegation](delegation.md) | See [delegation](delegation.md) |


 ### TLS
--- 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:
+To configure it, use the following options in the `global.well_known` table:
 | Field | Type | Description | Default |
 | --- | --- | --- | --- |
-| `well_known_client` | `String` | The URL that clients should use to connect to Conduit | `https://<server_name>` |
-| `well_known_server` | `String` | The hostname and port servers should use to connect to Conduit | `<server_name>:443` |
+| `client` | `String` | The URL that clients should use to connect to Conduit | `https://<server_name>` |
+| `server` | `String` | The hostname and port servers should use to connect to Conduit | `<server_name>:443` |

 ### Example

 ```toml
-[global]
-well_known_client = "https://matrix.example.org"
-well_known_server = "matrix.example.org:443"
+[global.well_known]
+client = "https://matrix.example.org"
+server = "matrix.example.org:443"
 ```

 ## Manual
--- a/docs/deploying/docker.md
+++ b/docs/deploying/docker.md
@ -64,7 +64,6 @@ docker run -d -p 8448:6167 \
  -e CONDUIT_MAX_REQUEST_SIZE="20000000" \
  -e CONDUIT_TRUSTED_SERVERS="[\"matrix.org\"]" \
  -e CONDUIT_MAX_CONCURRENT_REQUESTS="100" \
-  -e CONDUIT_PORT="6167" \
  --name conduit <link>
 ```

--- a/docs/deploying/generic.md
+++ b/docs/deploying/generic.md
@ -17,7 +17,6 @@ You may simply download the binary that fits your machine. Run `uname -m` to see
 | Target | Type | Download |
 |-|-|-|
 | `x86_64-unknown-linux-musl` | Statically linked Debian package | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/x86_64-unknown-linux-musl.deb?job=artifacts) |
-| `aarch64-unknown-linux-musl` | Statically linked Debian package | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/aarch64-unknown-linux-musl.deb?job=artifacts) |
 | `x86_64-unknown-linux-musl` | Statically linked binary | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/x86_64-unknown-linux-musl?job=artifacts) |
 | `aarch64-unknown-linux-musl` | Statically linked binary | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/aarch64-unknown-linux-musl?job=artifacts) |
 | `x86_64-unknown-linux-gnu` | OCI image | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/oci-image-amd64.tar.gz?job=artifacts) |
@ -31,7 +30,6 @@ If you use a system with an older glibc version (e.g. RHEL8), you might need to
 | Target | Type | Download |
 |-|-|-|
 | `x86_64-unknown-linux-musl` | Statically linked Debian package | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/x86_64-unknown-linux-musl.deb?job=artifacts) |
-| `aarch64-unknown-linux-musl` | Statically linked Debian package | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/aarch64-unknown-linux-musl.deb?job=artifacts) |
 | `x86_64-unknown-linux-musl` | Statically linked binary | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/x86_64-unknown-linux-musl?job=artifacts) |
 | `aarch64-unknown-linux-musl` | Statically linked binary | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/aarch64-unknown-linux-musl?job=artifacts) |
 | `x86_64-unknown-linux-gnu` | OCI image | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/oci-image-amd64.tar.gz?job=artifacts) |
--- a/docs/turn.md
+++ b/docs/turn.md
@ -2,7 +2,7 @@

 ## General instructions

-* It is assumed you have a [Coturn server](https://github.com/coturn/coturn) up and running. See [Synapse reference implementation](https://github.com/element-hq/synapse/blob/develop/docs/turn-howto.md).
+* It is assumed you have a [Coturn server](https://github.com/coturn/coturn) up and running. See [Synapse reference implementation](https://github.com/matrix-org/synapse/blob/develop/docs/turn-howto.md).

 ## Edit/Add a few settings to your existing conduit.toml

--- a/flake.nix
+++ b/flake.nix
@ -59,7 +59,7 @@
            file = ./rust-toolchain.toml;

            # See also `rust-toolchain.toml`
-            sha256 = "sha256-Ngiz76YP4HTY75GGdH2P+APE/DEIx2R/Dn+BwwOyzZU=";
+            sha256 = "sha256-opUgs6ckUQCyDxcB9Wy51pqhd0MPGHUVbwRKKPGiwZU=";
          };
      });
    in
--- a/nix/shell.nix
+++ b/nix/shell.nix
@ -23,7 +23,7 @@ mkShell {
  };

  # Development tools
-  nativeBuildInputs = [
+  nativeBuildInputs = default.nativeBuildInputs ++ [
    # Always use nightly rustfmt because most of its options are unstable
    #
    # This needs to come before `toolchain` in this list, otherwise
@ -57,5 +57,5 @@ mkShell {

    # Useful for editing the book locally
    mdbook
-  ] ++ default.nativeBuildInputs ;
+  ];
 }
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@ -2,6 +2,7 @@
 #
 # Other files that need upkeep when this changes:
 #
+# * `.gitlab-ci.yml`
 # * `Cargo.toml`
 # * `flake.nix`
 #
@ -9,7 +10,7 @@
 # If you're having trouble making the relevant changes, bug a maintainer.

 [toolchain]
-channel = "1.79.0"
+channel = "1.78.0"
 components = [
  # For rust-analyzer
  "rust-src",
--- a/src/api/client_server/account.rs
+++ b/src/api/client_server/account.rs
@ -77,7 +77,7 @@ pub async fn get_register_available_route(
 pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<register::v3::Response> {
    if !services().globals.allow_registration().await && body.appservice_info.is_none() {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "Registration has been disabled.",
        ));
    }
@ -315,11 +315,7 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 pub async fn change_password_route(
    body: Ruma<change_password::v3::Request>,
 ) -> Result<change_password::v3::Response> {
-    let sender_user = body
-        .sender_user
-        .as_ref()
-        // In the future password changes could be performed with UIA with 3PIDs, but we don't support that currently
-        .ok_or_else(|| Error::BadRequest(ErrorKind::MissingToken, "Missing access token."))?;
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
    let sender_device = body.sender_device.as_ref().expect("user is authenticated");

    let mut uiaainfo = UiaaInfo {
@ -406,11 +402,7 @@ pub async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoami::v3:
 pub async fn deactivate_route(
    body: Ruma<deactivate::v3::Request>,
 ) -> Result<deactivate::v3::Response> {
-    let sender_user = body
-        .sender_user
-        .as_ref()
-        // In the future password changes could be performed with UIA with SSO, but we don't support that currently
-        .ok_or_else(|| Error::BadRequest(ErrorKind::MissingToken, "Missing access token."))?;
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
    let sender_device = body.sender_device.as_ref().expect("user is authenticated");

    let mut uiaainfo = UiaaInfo {
--- a/src/api/client_server/alias.rs
+++ b/src/api/client_server/alias.rs
@ -18,8 +18,6 @@ use ruma::{
 pub async fn create_alias_route(
    body: Ruma<create_alias::v3::Request>,
 ) -> Result<create_alias::v3::Response> {
-    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-
    if body.room_alias.server_name() != services().globals.server_name() {
        return Err(Error::BadRequest(
            ErrorKind::InvalidParam,
@ -57,7 +55,7 @@ pub async fn create_alias_route(
    services()
        .rooms
        .alias
-        .set_alias(&body.room_alias, &body.room_id, sender_user)?;
+        .set_alias(&body.room_alias, &body.room_id)?;

    Ok(create_alias::v3::Response::new())
 }
@ -66,12 +64,11 @@ pub async fn create_alias_route(
 ///
 /// Deletes a room alias from this server.
 ///
+/// - TODO: additional access control checks
 /// - TODO: Update canonical alias event
 pub async fn delete_alias_route(
    body: Ruma<delete_alias::v3::Request>,
 ) -> Result<delete_alias::v3::Response> {
-    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-
    if body.room_alias.server_name() != services().globals.server_name() {
        return Err(Error::BadRequest(
            ErrorKind::InvalidParam,
@ -97,10 +94,7 @@ pub async fn delete_alias_route(
        ));
    }

-    services()
-        .rooms
-        .alias
-        .remove_alias(&body.room_alias, sender_user)?;
+    services().rooms.alias.remove_alias(&body.room_alias)?;

    // TODO: update alt_aliases?

--- a/src/api/client_server/context.rs
+++ b/src/api/client_server/context.rs
@ -54,7 +54,7 @@ pub async fn get_context_route(
        .user_can_see_event(sender_user, &room_id, &body.event_id)?
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "You don't have permission to view this event.",
        ));
    }
--- a/src/api/client_server/media.rs
+++ b/src/api/client_server/media.rs
@ -1,24 +1,12 @@
-// Unauthenticated media is deprecated
-#![allow(deprecated)]
-
 use std::time::Duration;

 use crate::{service::media::FileMeta, services, utils, Error, Result, Ruma};
-use http::header::{CONTENT_DISPOSITION, CONTENT_TYPE};
-use ruma::{
-    api::{
-        client::{
-            authenticated_media::{
-                get_content, get_content_as_filename, get_content_thumbnail, get_media_config,
-            },
-            error::ErrorKind,
-            media::{self, create_content},
-        },
-        federation::authenticated_media::{self as federation_media, FileOrLocation},
+use ruma::api::client::{
+    error::ErrorKind,
+    media::{
+        create_content, get_content, get_content_as_filename, get_content_thumbnail,
+        get_media_config,
    },
-    http_headers::{ContentDisposition, ContentDispositionType},
-    media::Method,
-    ServerName, UInt,
 };

 const MXC_LENGTH: usize = 32;
@ -27,20 +15,9 @@ const MXC_LENGTH: usize = 32;
 ///
 /// Returns max upload size.
 pub async fn get_media_config_route(
-    _body: Ruma<media::get_media_config::v3::Request>,
-) -> Result<media::get_media_config::v3::Response> {
-    Ok(media::get_media_config::v3::Response {
-        upload_size: services().globals.max_request_size().into(),
-    })
-}
-
-/// # `GET /_matrix/client/v1/media/config`
-///
-/// Returns max upload size.
-pub async fn get_media_config_auth_route(
-    _body: Ruma<get_media_config::v1::Request>,
-) -> Result<get_media_config::v1::Response> {
-    Ok(get_media_config::v1::Response {
+    _body: Ruma<get_media_config::v3::Request>,
+) -> Result<get_media_config::v3::Response> {
+    Ok(get_media_config::v3::Response {
        upload_size: services().globals.max_request_size().into(),
    })
 }
@ -64,10 +41,10 @@ pub async fn create_content_route(
        .media
        .create(
            mxc.clone(),
-            Some(
-                ContentDisposition::new(ContentDispositionType::Inline)
-                    .with_filename(body.filename.clone()),
-            ),
+            body.filename
+                .as_ref()
+                .map(|filename| "inline; filename=".to_owned() + filename)
+                .as_deref(),
            body.content_type.as_deref(),
            &body.file,
        )
@ -81,67 +58,28 @@ pub async fn create_content_route(

 pub async fn get_remote_content(
    mxc: &str,
-    server_name: &ServerName,
+    server_name: &ruma::ServerName,
    media_id: String,
-) -> Result<get_content::v1::Response, Error> {
-    let content_response = match services()
+) -> Result<get_content::v3::Response, Error> {
+    let content_response = services()
        .sending
        .send_federation_request(
            server_name,
-            federation_media::get_content::v1::Request {
-                media_id: media_id.clone(),
+            get_content::v3::Request {
+                allow_remote: false,
+                server_name: server_name.to_owned(),
+                media_id,
                timeout_ms: Duration::from_secs(20),
+                allow_redirect: false,
            },
        )
-        .await
-    {
-        Ok(federation_media::get_content::v1::Response {
-            metadata: _,
-            content: FileOrLocation::File(content),
-        }) => get_content::v1::Response {
-            file: content.file,
-            content_type: content.content_type,
-            content_disposition: content.content_disposition,
-        },
-
-        Ok(federation_media::get_content::v1::Response {
-            metadata: _,
-            content: FileOrLocation::Location(url),
-        }) => get_location_content(url).await?,
-        Err(Error::BadRequest(ErrorKind::Unrecognized, _)) => {
-            let media::get_content::v3::Response {
-                file,
-                content_type,
-                content_disposition,
-                ..
-            } = services()
-                .sending
-                .send_federation_request(
-                    server_name,
-                    media::get_content::v3::Request {
-                        server_name: server_name.to_owned(),
-                        media_id,
-                        timeout_ms: Duration::from_secs(20),
-                        allow_remote: false,
-                        allow_redirect: true,
-                    },
-                )
-                .await?;
-
-            get_content::v1::Response {
-                file,
-                content_type,
-                content_disposition,
-            }
-        }
-        Err(e) => return Err(e),
-    };
+        .await?;

    services()
        .media
        .create(
            mxc.to_owned(),
-            content_response.content_disposition.clone(),
+            content_response.content_disposition.as_deref(),
            content_response.content_type.as_deref(),
            &content_response.file,
        )
@ -156,57 +94,31 @@ pub async fn get_remote_content(
 ///
 /// - Only allows federation if `allow_remote` is true
 pub async fn get_content_route(
-    body: Ruma<media::get_content::v3::Request>,
-) -> Result<media::get_content::v3::Response> {
-    let get_content::v1::Response {
-        file,
-        content_disposition,
-        content_type,
-    } = get_content(&body.server_name, body.media_id.clone(), body.allow_remote).await?;
+    body: Ruma<get_content::v3::Request>,
+) -> Result<get_content::v3::Response> {
+    let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);

-    Ok(media::get_content::v3::Response {
-        file,
-        content_type,
-        content_disposition,
-        cross_origin_resource_policy: Some("cross-origin".to_owned()),
-    })
-}
-
-/// # `GET /_matrix/client/v1/media/download/{serverName}/{mediaId}`
-///
-/// Load media from our server or over federation.
-pub async fn get_content_auth_route(
-    body: Ruma<get_content::v1::Request>,
-) -> Result<get_content::v1::Response> {
-    get_content(&body.server_name, body.media_id.clone(), true).await
-}
-
-async fn get_content(
-    server_name: &ServerName,
-    media_id: String,
-    allow_remote: bool,
-) -> Result<get_content::v1::Response, Error> {
-    let mxc = format!("mxc://{}/{}", server_name, media_id);
-
-    if let Ok(Some(FileMeta {
+    if let Some(FileMeta {
        content_disposition,
        content_type,
        file,
-    })) = services().media.get(mxc.clone()).await
+    }) = services().media.get(mxc.clone()).await?
    {
-        Ok(get_content::v1::Response {
+        Ok(get_content::v3::Response {
            file,
            content_type,
-            content_disposition: Some(content_disposition),
+            content_disposition,
+            cross_origin_resource_policy: Some("cross-origin".to_owned()),
        })
-    } else if server_name != services().globals.server_name() && allow_remote {
+    } else if &*body.server_name != services().globals.server_name() && body.allow_remote {
        let remote_content_response =
-            get_remote_content(&mxc, server_name, media_id.clone()).await?;
+            get_remote_content(&mxc, &body.server_name, body.media_id.clone()).await?;

-        Ok(get_content::v1::Response {
+        Ok(get_content::v3::Response {
            content_disposition: remote_content_response.content_disposition,
            content_type: remote_content_response.content_type,
            file: remote_content_response.file,
+            cross_origin_resource_policy: Some("cross-origin".to_owned()),
        })
    } else {
        Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
@ -219,74 +131,29 @@ async fn get_content(
 ///
 /// - Only allows federation if `allow_remote` is true
 pub async fn get_content_as_filename_route(
-    body: Ruma<media::get_content_as_filename::v3::Request>,
-) -> Result<media::get_content_as_filename::v3::Response> {
-    let get_content_as_filename::v1::Response {
-        file,
-        content_type,
-        content_disposition,
-    } = get_content_as_filename(
-        &body.server_name,
-        body.media_id.clone(),
-        body.filename.clone(),
-        body.allow_remote,
-    )
-    .await?;
+    body: Ruma<get_content_as_filename::v3::Request>,
+) -> Result<get_content_as_filename::v3::Response> {
+    let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);

-    Ok(media::get_content_as_filename::v3::Response {
-        file,
-        content_type,
-        content_disposition,
-        cross_origin_resource_policy: Some("cross-origin".to_owned()),
-    })
-}
-
-/// # `GET /_matrix/client/v1/media/download/{serverName}/{mediaId}/{fileName}`
-///
-/// Load media from our server or over federation, permitting desired filename.
-pub async fn get_content_as_filename_auth_route(
-    body: Ruma<get_content_as_filename::v1::Request>,
-) -> Result<get_content_as_filename::v1::Response, Error> {
-    get_content_as_filename(
-        &body.server_name,
-        body.media_id.clone(),
-        body.filename.clone(),
-        true,
-    )
-    .await
-}
-
-async fn get_content_as_filename(
-    server_name: &ServerName,
-    media_id: String,
-    filename: String,
-    allow_remote: bool,
-) -> Result<get_content_as_filename::v1::Response, Error> {
-    let mxc = format!("mxc://{}/{}", server_name, media_id);
-
-    if let Ok(Some(FileMeta {
+    if let Some(FileMeta {
        file, content_type, ..
-    })) = services().media.get(mxc.clone()).await
+    }) = services().media.get(mxc.clone()).await?
    {
-        Ok(get_content_as_filename::v1::Response {
+        Ok(get_content_as_filename::v3::Response {
            file,
            content_type,
-            content_disposition: Some(
-                ContentDisposition::new(ContentDispositionType::Inline)
-                    .with_filename(Some(filename.clone())),
-            ),
+            content_disposition: Some(format!("inline; filename={}", body.filename)),
+            cross_origin_resource_policy: Some("cross-origin".to_owned()),
        })
-    } else if server_name != services().globals.server_name() && allow_remote {
+    } else if &*body.server_name != services().globals.server_name() && body.allow_remote {
        let remote_content_response =
-            get_remote_content(&mxc, server_name, media_id.clone()).await?;
+            get_remote_content(&mxc, &body.server_name, body.media_id.clone()).await?;

-        Ok(get_content_as_filename::v1::Response {
-            content_disposition: Some(
-                ContentDisposition::new(ContentDispositionType::Inline)
-                    .with_filename(Some(filename.clone())),
-            ),
+        Ok(get_content_as_filename::v3::Response {
+            content_disposition: Some(format!("inline: filename={}", body.filename)),
            content_type: remote_content_response.content_type,
            file: remote_content_response.file,
+            cross_origin_resource_policy: Some("cross-origin".to_owned()),
        })
    } else {
        Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
@ -299,169 +166,62 @@ async fn get_content_as_filename(
 ///
 /// - Only allows federation if `allow_remote` is true
 pub async fn get_content_thumbnail_route(
-    body: Ruma<media::get_content_thumbnail::v3::Request>,
-) -> Result<media::get_content_thumbnail::v3::Response> {
-    let get_content_thumbnail::v1::Response { file, content_type } = get_content_thumbnail(
-        &body.server_name,
-        body.media_id.clone(),
-        body.height,
-        body.width,
-        body.method.clone(),
-        body.animated,
-        body.allow_remote,
-    )
-    .await?;
+    body: Ruma<get_content_thumbnail::v3::Request>,
+) -> Result<get_content_thumbnail::v3::Response> {
+    let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);

-    Ok(media::get_content_thumbnail::v3::Response {
-        file,
-        content_type,
-        cross_origin_resource_policy: Some("cross-origin".to_owned()),
-    })
-}
-
-/// # `GET /_matrix/client/v1/media/thumbnail/{serverName}/{mediaId}`
-///
-/// Load media thumbnail from our server or over federation.
-pub async fn get_content_thumbnail_auth_route(
-    body: Ruma<get_content_thumbnail::v1::Request>,
-) -> Result<get_content_thumbnail::v1::Response> {
-    get_content_thumbnail(
-        &body.server_name,
-        body.media_id.clone(),
-        body.height,
-        body.width,
-        body.method.clone(),
-        body.animated,
-        true,
-    )
-    .await
-}
-
-async fn get_content_thumbnail(
-    server_name: &ServerName,
-    media_id: String,
-    height: UInt,
-    width: UInt,
-    method: Option<Method>,
-    animated: Option<bool>,
-    allow_remote: bool,
-) -> Result<get_content_thumbnail::v1::Response, Error> {
-    let mxc = format!("mxc://{}/{}", server_name, media_id);
-
-    if let Ok(Some(FileMeta {
+    if let Some(FileMeta {
        file, content_type, ..
-    })) = services()
+    }) = services()
        .media
        .get_thumbnail(
            mxc.clone(),
-            width
+            body.width
                .try_into()
                .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
-            height
+            body.height
                .try_into()
-                .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
+                .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
        )
-        .await
+        .await?
    {
-        Ok(get_content_thumbnail::v1::Response { file, content_type })
-    } else if server_name != services().globals.server_name() && allow_remote {
-        let thumbnail_response = match services()
+        Ok(get_content_thumbnail::v3::Response {
+            file,
+            content_type,
+            cross_origin_resource_policy: Some("cross-origin".to_owned()),
+        })
+    } else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+        let get_thumbnail_response = services()
            .sending
            .send_federation_request(
-                server_name,
-                federation_media::get_content_thumbnail::v1::Request {
-                    height,
-                    width,
-                    method: method.clone(),
-                    media_id: media_id.clone(),
+                &body.server_name,
+                get_content_thumbnail::v3::Request {
+                    allow_remote: false,
+                    height: body.height,
+                    width: body.width,
+                    method: body.method.clone(),
+                    server_name: body.server_name.clone(),
+                    media_id: body.media_id.clone(),
                    timeout_ms: Duration::from_secs(20),
-                    animated,
+                    allow_redirect: false,
                },
            )
-            .await
-        {
-            Ok(federation_media::get_content_thumbnail::v1::Response {
-                metadata: _,
-                content: FileOrLocation::File(content),
-            }) => get_content_thumbnail::v1::Response {
-                file: content.file,
-                content_type: content.content_type,
-            },
-
-            Ok(federation_media::get_content_thumbnail::v1::Response {
-                metadata: _,
-                content: FileOrLocation::Location(url),
-            }) => {
-                let get_content::v1::Response {
-                    file, content_type, ..
-                } = get_location_content(url).await?;
-
-                get_content_thumbnail::v1::Response { file, content_type }
-            }
-            Err(Error::BadRequest(ErrorKind::Unrecognized, _)) => {
-                let media::get_content_thumbnail::v3::Response {
-                    file, content_type, ..
-                } = services()
-                    .sending
-                    .send_federation_request(
-                        server_name,
-                        media::get_content_thumbnail::v3::Request {
-                            height,
-                            width,
-                            method: method.clone(),
-                            server_name: server_name.to_owned(),
-                            media_id: media_id.clone(),
-                            timeout_ms: Duration::from_secs(20),
-                            allow_redirect: false,
-                            animated,
-                            allow_remote: false,
-                        },
-                    )
-                    .await?;
-
-                get_content_thumbnail::v1::Response { file, content_type }
-            }
-            Err(e) => return Err(e),
-        };
+            .await?;

        services()
            .media
            .upload_thumbnail(
                mxc,
-                thumbnail_response.content_type.as_deref(),
-                width.try_into().expect("all UInts are valid u32s"),
-                height.try_into().expect("all UInts are valid u32s"),
-                &thumbnail_response.file,
+                None,
+                get_thumbnail_response.content_type.as_deref(),
+                body.width.try_into().expect("all UInts are valid u32s"),
+                body.height.try_into().expect("all UInts are valid u32s"),
+                &get_thumbnail_response.file,
            )
            .await?;

-        Ok(thumbnail_response)
+        Ok(get_thumbnail_response)
    } else {
        Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
    }
 }
-
-async fn get_location_content(url: String) -> Result<get_content::v1::Response, Error> {
-    let client = services().globals.default_client();
-    let response = client.get(url).send().await?;
-    let headers = response.headers();
-
-    let content_type = headers
-        .get(CONTENT_TYPE)
-        .and_then(|header| header.to_str().ok())
-        .map(ToOwned::to_owned);
-
-    let content_disposition = headers
-        .get(CONTENT_DISPOSITION)
-        .map(|header| header.as_bytes())
-        .map(TryFrom::try_from)
-        .and_then(Result::ok);
-
-    let file = response.bytes().await?.to_vec();
-
-    Ok(get_content::v1::Response {
-        file,
-        content_type,
-        content_disposition,
-    })
-}
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@ -18,8 +18,9 @@ use ruma::{
        },
        StateEventType, TimelineEventType,
    },
-    state_res, CanonicalJsonObject, CanonicalJsonValue, EventId, MilliSecondsSinceUnixEpoch,
-    OwnedEventId, OwnedRoomId, OwnedServerName, OwnedUserId, RoomId, RoomVersionId, UserId,
+    serde::Base64,
+    state_res, CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId,
+    OwnedServerName, OwnedUserId, RoomId, RoomVersionId, UserId,
 };
 use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
 use std::{
@ -31,10 +32,7 @@ use tokio::sync::RwLock;
 use tracing::{debug, error, info, warn};

 use crate::{
-    service::{
-        globals::SigningKeys,
-        pdu::{gen_event_id_canonical_json, PduBuilder},
-    },
+    service::pdu::{gen_event_id_canonical_json, PduBuilder},
    services, utils, Error, PduEvent, Result, Ruma,
 };

@ -97,7 +95,7 @@ pub async fn join_room_by_id_or_alias_route(

    let (servers, room_id) = match OwnedRoomId::try_from(body.room_id_or_alias) {
        Ok(room_id) => {
-            let mut servers = body.via.clone();
+            let mut servers = body.server_name.clone();
            servers.extend(
                services()
                    .rooms
@ -241,7 +239,6 @@ pub async fn kick_user_route(
                unsigned: None,
                state_key: Some(body.user_id.to_string()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &body.room_id,
@ -314,7 +311,6 @@ pub async fn ban_user_route(body: Ruma<ban_user::v3::Request>) -> Result<ban_use
                unsigned: None,
                state_key: Some(body.user_id.to_string()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &body.room_id,
@ -388,7 +384,6 @@ pub async fn unban_user_route(
                unsigned: None,
                state_key: Some(body.user_id.to_string()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &body.room_id,
@ -456,7 +451,7 @@ pub async fn get_member_events_route(
        .user_can_see_state_events(sender_user, &body.room_id)?
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "You don't have permission to view this room.",
        ));
    }
@ -491,7 +486,7 @@ pub async fn joined_members_route(
        .user_can_see_state_events(sender_user, &body.room_id)?
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "You don't have permission to view this room.",
        ));
    }
@ -627,7 +622,7 @@ async fn join_room_by_id_helper(
        let event_id = format!(
            "${}",
            ruma::signatures::reference_hash(&join_event_stub, &room_version_id)
-                .expect("Event format validated when event was hashed")
+                .expect("ruma can calculate reference hashes")
        );
        let event_id = <&EventId>::try_from(event_id.as_str())
            .expect("ruma's reference hashes are valid event ids");
@ -941,7 +936,6 @@ async fn join_room_by_id_helper(
                    unsigned: None,
                    state_key: Some(sender_user.to_string()),
                    redacts: None,
-                    timestamp: None,
                },
                sender_user,
                room_id,
@ -1136,7 +1130,7 @@ async fn make_join_request(
 async fn validate_and_add_event_id(
    pdu: &RawJsonValue,
    room_version: &RoomVersionId,
-    pub_key_map: &RwLock<BTreeMap<String, SigningKeys>>,
+    pub_key_map: &RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
 ) -> Result<(OwnedEventId, CanonicalJsonObject)> {
    let mut value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|e| {
        error!("Invalid PDU in server response: {:?}: {:?}", pdu, e);
@ -1145,7 +1139,7 @@ async fn validate_and_add_event_id(
    let event_id = EventId::parse(format!(
        "${}",
        ruma::signatures::reference_hash(&value, room_version)
-            .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid PDU format"))?
+            .expect("ruma can calculate reference hashes")
    ))
    .expect("ruma's reference hashes are valid event ids");

@ -1183,35 +1177,8 @@ async fn validate_and_add_event_id(
        }
    }

-    let origin_server_ts = value.get("origin_server_ts").ok_or_else(|| {
-        error!("Invalid PDU, no origin_server_ts field");
-        Error::BadRequest(
-            ErrorKind::MissingParam,
-            "Invalid PDU, no origin_server_ts field",
-        )
-    })?;
-
-    let origin_server_ts: MilliSecondsSinceUnixEpoch = {
-        let ts = origin_server_ts.as_integer().ok_or_else(|| {
-            Error::BadRequest(
-                ErrorKind::InvalidParam,
-                "origin_server_ts must be an integer",
-            )
-        })?;
-
-        MilliSecondsSinceUnixEpoch(i64::from(ts).try_into().map_err(|_| {
-            Error::BadRequest(ErrorKind::InvalidParam, "Time must be after the unix epoch")
-        })?)
-    };
-
-    let unfiltered_keys = (*pub_key_map.read().await).clone();
-
-    let keys =
-        services()
-            .globals
-            .filter_keys_server_map(unfiltered_keys, origin_server_ts, room_version);
-
-    if let Err(e) = ruma::signatures::verify_event(&keys, &value, room_version) {
+    if let Err(e) = ruma::signatures::verify_event(&*pub_key_map.read().await, &value, room_version)
+    {
        warn!("Event {} failed verification {:?} {}", event_id, pdu, e);
        back_off(event_id).await;
        return Err(Error::BadServerResponse("Event failed verification."));
@ -1264,7 +1231,6 @@ pub(crate) async fn invite_helper<'a>(
                    unsigned: None,
                    state_key: Some(user_id.to_string()),
                    redacts: None,
-                    timestamp: None,
                },
                sender_user,
                room_id,
@ -1348,7 +1314,7 @@ pub(crate) async fn invite_helper<'a>(
            .is_joined(sender_user, room_id)?
        {
            return Err(Error::BadRequest(
-                ErrorKind::forbidden(),
+                ErrorKind::Forbidden,
                "You don't have permission to view this room.",
            ));
        }
@ -1384,7 +1350,6 @@ pub(crate) async fn invite_helper<'a>(
                    unsigned: None,
                    state_key: Some(user_id.to_string()),
                    redacts: None,
-                    timestamp: None,
                },
                sender_user,
                room_id,
@ -1512,7 +1477,6 @@ pub async fn leave_room(user_id: &UserId, room_id: &RoomId, reason: Option<Strin
                    unsigned: None,
                    state_key: Some(user_id.to_string()),
                    redacts: None,
-                    timestamp: None,
                },
                user_id,
                room_id,
@ -1614,7 +1578,7 @@ async fn remote_leave_room(user_id: &UserId, room_id: &RoomId) -> Result<()> {
    let event_id = EventId::parse(format!(
        "${}",
        ruma::signatures::reference_hash(&leave_event_stub, &room_version_id)
-            .expect("Event format validated when event was hashed")
+            .expect("ruma can calculate reference hashes")
    ))
    .expect("ruma's reference hashes are valid event ids");

--- a/src/api/client_server/message.rs
+++ b/src/api/client_server/message.rs
@ -43,7 +43,7 @@ pub async fn send_message_event_route(
        && !services().globals.allow_encryption()
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "Encryption has been disabled",
        ));
    }
@ -84,11 +84,6 @@ pub async fn send_message_event_route(
                unsigned: Some(unsigned),
                state_key: None,
                redacts: None,
-                timestamp: if body.appservice_info.is_some() {
-                    body.timestamp
-                } else {
-                    None
-                },
            },
            sender_user,
            &body.room_id,
--- a/src/api/client_server/profile.rs
+++ b/src/api/client_server/profile.rs
@ -65,7 +65,6 @@ pub async fn set_displayname_route(
                    unsigned: None,
                    state_key: Some(sender_user.to_string()),
                    redacts: None,
-                    timestamp: None,
                },
                room_id,
            ))
@ -201,7 +200,6 @@ pub async fn set_avatar_url_route(
                    unsigned: None,
                    state_key: Some(sender_user.to_string()),
                    redacts: None,
-                    timestamp: None,
                },
                room_id,
            ))
--- a/src/api/client_server/redact.rs
+++ b/src/api/client_server/redact.rs
@ -44,7 +44,6 @@ pub async fn redact_event_route(
                unsigned: None,
                state_key: None,
                redacts: Some(body.event_id.into()),
-                timestamp: None,
            },
            sender_user,
            &body.room_id,
--- a/src/api/client_server/room.rs
+++ b/src/api/client_server/room.rs
@ -72,7 +72,7 @@ pub async fn create_room_route(
        && !services().users.is_admin(sender_user)?
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "Room creation has been disabled.",
        ));
    }
@ -230,7 +230,6 @@ pub async fn create_room_route(
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &room_id,
@ -259,7 +258,6 @@ pub async fn create_room_route(
                unsigned: None,
                state_key: Some(sender_user.to_string()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &room_id,
@ -313,7 +311,6 @@ pub async fn create_room_route(
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &room_id,
@ -337,7 +334,6 @@ pub async fn create_room_route(
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                sender_user,
                &room_id,
@ -364,7 +360,6 @@ pub async fn create_room_route(
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &room_id,
@ -386,7 +381,6 @@ pub async fn create_room_route(
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &room_id,
@ -409,7 +403,6 @@ pub async fn create_room_route(
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &room_id,
@ -454,7 +447,6 @@ pub async fn create_room_route(
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                sender_user,
                &room_id,
@ -477,7 +469,6 @@ pub async fn create_room_route(
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                sender_user,
                &room_id,
@ -494,10 +485,7 @@ pub async fn create_room_route(

    // Homeserver specific stuff
    if let Some(alias) = alias {
-        services()
-            .rooms
-            .alias
-            .set_alias(&alias, &room_id, sender_user)?;
+        services().rooms.alias.set_alias(&alias, &room_id)?;
    }

    if body.visibility == room::Visibility::Public {
@ -534,7 +522,7 @@ pub async fn get_room_event_route(
        &body.event_id,
    )? {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "You don't have permission to view this event.",
        ));
    }
@ -563,7 +551,7 @@ pub async fn get_room_aliases_route(
        .is_joined(sender_user, &body.room_id)?
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "You don't have permission to view this room.",
        ));
    }
@ -638,7 +626,6 @@ pub async fn upgrade_room_route(
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &body.room_id,
@ -740,7 +727,6 @@ pub async fn upgrade_room_route(
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &replacement_room,
@ -769,7 +755,6 @@ pub async fn upgrade_room_route(
                unsigned: None,
                state_key: Some(sender_user.to_string()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &replacement_room,
@ -812,7 +797,6 @@ pub async fn upgrade_room_route(
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                sender_user,
                &replacement_room,
@ -831,7 +815,7 @@ pub async fn upgrade_room_route(
        services()
            .rooms
            .alias
-            .set_alias(&alias, &replacement_room, sender_user)?;
+            .set_alias(&alias, &replacement_room)?;
    }

    // Get the old room power levels
@ -863,7 +847,6 @@ pub async fn upgrade_room_route(
                unsigned: None,
                state_key: Some("".to_owned()),
                redacts: None,
-                timestamp: None,
            },
            sender_user,
            &body.room_id,
--- a/src/api/client_server/search.rs
+++ b/src/api/client_server/search.rs
@ -43,7 +43,7 @@ pub async fn search_events_route(
            .is_joined(sender_user, &room_id)?
        {
            return Err(Error::BadRequest(
-                ErrorKind::forbidden(),
+                ErrorKind::Forbidden,
                "You don't have permission to view this room.",
            ));
        }
@ -89,12 +89,11 @@ pub async fn search_events_route(
                .get_pdu_from_id(result)
                .ok()?
                .filter(|pdu| {
-                    !pdu.is_redacted()
-                        && services()
-                            .rooms
-                            .state_accessor
-                            .user_can_see_event(sender_user, &pdu.room_id, &pdu.event_id)
-                            .unwrap_or(false)
+                    services()
+                        .rooms
+                        .state_accessor
+                        .user_can_see_event(sender_user, &pdu.room_id, &pdu.event_id)
+                        .unwrap_or(false)
                })
                .map(|pdu| pdu.to_room_event())
        })
--- a/src/api/client_server/session.rs
+++ b/src/api/client_server/session.rs
@ -63,7 +63,7 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
                UserId::parse(user)
            } else {
                warn!("Bad login type: {:?}", &body.login_info);
-                return Err(Error::BadRequest(ErrorKind::forbidden(), "Bad login type."));
+                return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
            }
            .map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;

@ -78,7 +78,7 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
                .users
                .password_hash(&user_id)?
                .ok_or(Error::BadRequest(
-                    ErrorKind::forbidden(),
+                    ErrorKind::Forbidden,
                    "Wrong username or password.",
                ))?;

@ -93,7 +93,7 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re

            if !hash_matches {
                return Err(Error::BadRequest(
-                    ErrorKind::forbidden(),
+                    ErrorKind::Forbidden,
                    "Wrong username or password.",
                ));
            }
@ -143,7 +143,7 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
                UserId::parse(user)
            } else {
                warn!("Bad login type: {:?}", &body.login_info);
-                return Err(Error::BadRequest(ErrorKind::forbidden(), "Bad login type."));
+                return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
            }
            .map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;

--- a/src/api/client_server/state.rs
+++ b/src/api/client_server/state.rs
@ -10,7 +10,7 @@ use ruma::{
        room::canonical_alias::RoomCanonicalAliasEventContent, AnyStateEventContent, StateEventType,
    },
    serde::Raw,
-    EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId,
+    EventId, RoomId, UserId,
 };
 use tracing::log::warn;

@ -32,11 +32,6 @@ pub async fn send_state_event_for_key_route(
        &body.event_type,
        &body.body.body, // Yes, I hate it too
        body.state_key.to_owned(),
-        if body.appservice_info.is_some() {
-            body.timestamp
-        } else {
-            None
-        },
    )
    .await?;

@ -59,7 +54,7 @@ pub async fn send_state_event_for_empty_key_route(
    // Forbid m.room.encryption if encryption is disabled
    if body.event_type == StateEventType::RoomEncryption && !services().globals.allow_encryption() {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "Encryption has been disabled",
        ));
    }
@ -70,11 +65,6 @@ pub async fn send_state_event_for_empty_key_route(
        &body.event_type.to_string().into(),
        &body.body.body,
        body.state_key.to_owned(),
-        if body.appservice_info.is_some() {
-            body.timestamp
-        } else {
-            None
-        },
    )
    .await?;

@ -98,7 +88,7 @@ pub async fn get_state_events_route(
        .user_can_see_state_events(sender_user, &body.room_id)?
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "You don't have permission to view the room state.",
        ));
    }
@ -131,7 +121,7 @@ pub async fn get_state_events_for_key_route(
        .user_can_see_state_events(sender_user, &body.room_id)?
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "You don't have permission to view the room state.",
        ));
    }
@ -170,7 +160,7 @@ pub async fn get_state_events_for_empty_key_route(
        .user_can_see_state_events(sender_user, &body.room_id)?
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "You don't have permission to view the room state.",
        ));
    }
@ -200,7 +190,6 @@ async fn send_state_event_for_key_helper(
    event_type: &StateEventType,
    json: &Raw<AnyStateEventContent>,
    state_key: String,
-    timestamp: Option<MilliSecondsSinceUnixEpoch>,
 ) -> Result<Arc<EventId>> {
    let sender_user = sender;

@ -225,7 +214,7 @@ async fn send_state_event_for_key_helper(
                    .is_none()
            {
                return Err(Error::BadRequest(
-                    ErrorKind::forbidden(),
+                    ErrorKind::Forbidden,
                    "You are only allowed to send canonical_alias \
                    events when it's aliases already exists",
                ));
@ -254,7 +243,6 @@ async fn send_state_event_for_key_helper(
                unsigned: None,
                state_key: Some(state_key),
                redacts: None,
-                timestamp,
            },
            sender_user,
            room_id,
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@ -12,7 +12,7 @@ use ruma::{
                Ephemeral, Filter, GlobalAccountData, InviteState, InvitedRoom, JoinedRoom,
                LeftRoom, Presence, RoomAccountData, RoomSummary, Rooms, State, Timeline, ToDevice,
            },
-            v4::{SlidingOp, SlidingSyncRoomHero},
+            v4::SlidingOp,
            DeviceLists, UnreadNotificationsCount,
        },
        uiaa::UiaaResponse,
@ -716,7 +716,7 @@ async fn load_joined_room(
                                        .state_cache
                                        .is_invited(&user_id, room_id)?)
                                {
-                                    Ok::<_, Error>(Some(user_id))
+                                    Ok::<_, Error>(Some(state_key.clone()))
                                } else {
                                    Ok(None)
                                }
@ -1572,7 +1572,7 @@ pub async fn sync_events_v4_route(
            sender_user.clone(),
            sender_device.clone(),
            conn_id.clone(),
-            body.room_subscriptions.clone(),
+            body.room_subscriptions,
        );
    }

@ -1638,37 +1638,33 @@ pub async fn sync_events_v4_route(
                    .get_member(room_id, &member)
                    .ok()
                    .flatten()
-                    .map(|memberevent| SlidingSyncRoomHero {
-                        user_id: member,
-                        name: memberevent.displayname,
-                        avatar: memberevent.avatar_url,
+                    .map(|memberevent| {
+                        (
+                            memberevent
+                                .displayname
+                                .unwrap_or_else(|| member.to_string()),
+                            memberevent.avatar_url,
+                        )
                    })
            })
            .take(5)
            .collect::<Vec<_>>();
        let name = match &heroes[..] {
            [] => None,
-            [only] => Some(
-                only.name
-                    .clone()
-                    .unwrap_or_else(|| only.user_id.to_string()),
-            ),
+            [only] => Some(only.0.clone()),
            [firsts @ .., last] => Some(
                firsts
                    .iter()
-                    .map(|h| h.name.clone().unwrap_or_else(|| h.user_id.to_string()))
+                    .map(|h| h.0.clone())
                    .collect::<Vec<_>>()
                    .join(", ")
                    + " and "
-                    + &last
-                        .name
-                        .clone()
-                        .unwrap_or_else(|| last.user_id.to_string()),
+                    + &last.0,
            ),
        };

        let avatar = if let [only] = &heroes[..] {
-            only.avatar.clone()
+            only.1.clone()
        } else {
            None
        };
@ -1729,16 +1725,6 @@ pub async fn sync_events_v4_route(
                ),
                num_live: None, // Count events in timeline greater than global sync counter
                timestamp: None,
-                heroes: if body
-                    .room_subscriptions
-                    .get(room_id)
-                    .map(|sub| sub.include_heroes.unwrap_or_default())
-                    .unwrap_or_default()
-                {
-                    Some(heroes)
-                } else {
-                    None
-                },
            },
        );
    }
--- a/src/api/client_server/typing.rs
+++ b/src/api/client_server/typing.rs
@ -17,7 +17,7 @@ pub async fn create_typing_event_route(
        .is_joined(sender_user, &body.room_id)?
    {
        return Err(Error::BadRequest(
-            ErrorKind::forbidden(),
+            ErrorKind::Forbidden,
            "You are not in this room.",
        ));
    }
--- a/src/api/client_server/unversioned.rs
+++ b/src/api/client_server/unversioned.rs
@ -27,10 +27,7 @@ pub async fn get_supported_versions_route(
            "v1.4".to_owned(),
            "v1.5".to_owned(),
        ],
-        unstable_features: BTreeMap::from_iter([
-            ("org.matrix.e2e_cross_signing".to_owned(), true),
-            ("org.matrix.msc3916.stable".to_owned(), true),
-        ]),
+        unstable_features: BTreeMap::from_iter([("org.matrix.e2e_cross_signing".to_owned(), true)]),
    };

    Ok(resp)
--- a/src/api/ruma_wrapper/axum.rs
+++ b/src/api/ruma_wrapper/axum.rs
@ -2,22 +2,18 @@ use std::{collections::BTreeMap, iter::FromIterator, str};

 use axum::{
    async_trait,
-    body::Body,
-    extract::{FromRequest, Path},
-    response::{IntoResponse, Response},
-    RequestExt, RequestPartsExt,
-};
-use axum_extra::{
+    body::{Full, HttpBody},
+    extract::{rejection::TypedHeaderRejectionReason, FromRequest, Path, TypedHeader},
    headers::{authorization::Bearer, Authorization},
-    typed_header::TypedHeaderRejectionReason,
-    TypedHeader,
+    response::{IntoResponse, Response},
+    BoxError, RequestExt, RequestPartsExt,
 };
-use bytes::{BufMut, BytesMut};
+use bytes::{Buf, BufMut, Bytes, BytesMut};
 use http::{Request, StatusCode};
 use ruma::{
    api::{client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse},
    server_util::authorization::XMatrix,
-    CanonicalJsonValue, MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedUserId, UserId,
+    CanonicalJsonValue, OwnedDeviceId, OwnedUserId, UserId,
 };
 use serde::Deserialize;
 use tracing::{debug, error, warn};
@ -33,33 +29,37 @@ enum Token {
 }

 #[async_trait]
-impl<T, S> FromRequest<S> for Ruma<T>
+impl<T, S, B> FromRequest<S, B> for Ruma<T>
 where
    T: IncomingRequest,
+    B: HttpBody + Send + 'static,
+    B::Data: Send,
+    B::Error: Into<BoxError>,
 {
    type Rejection = Error;

-    async fn from_request(req: Request<Body>, _state: &S) -> Result<Self, Self::Rejection> {
+    async fn from_request(req: Request<B>, _state: &S) -> Result<Self, Self::Rejection> {
        #[derive(Deserialize)]
        struct QueryParams {
            access_token: Option<String>,
            user_id: Option<String>,
        }

-        let (mut parts, mut body) = {
-            let limited_req = req.with_limited_body();
-            let (parts, body) = limited_req.into_parts();
-            let body = axum::body::to_bytes(
-                body,
-                services()
-                    .globals
-                    .max_request_size()
-                    .try_into()
-                    .unwrap_or(usize::MAX),
-            )
-            .await
-            .map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
-            (parts, body)
+        let (mut parts, mut body) = match req.with_limited_body() {
+            Ok(limited_req) => {
+                let (parts, body) = limited_req.into_parts();
+                let body = to_bytes(body)
+                    .await
+                    .map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
+                (parts, body)
+            }
+            Err(original_req) => {
+                let (parts, body) = original_req.into_parts();
+                let body = to_bytes(body)
+                    .await
+                    .map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
+                (parts, body)
+            }
        };

        let metadata = T::METADATA;
@ -135,7 +135,7 @@ where

                    if !services().users.exists(&user_id)? {
                        return Err(Error::BadRequest(
-                            ErrorKind::forbidden(),
+                            ErrorKind::Forbidden,
                            "User does not exist.",
                        ));
                    }
@ -175,7 +175,7 @@ where
                                _ => "Unknown header-related error",
                            };

-                            Error::BadRequest(ErrorKind::forbidden(), msg)
+                            Error::BadRequest(ErrorKind::Forbidden, msg)
                        })?;

                    if let Some(dest) = x_matrix.destination {
@ -189,7 +189,7 @@ where

                    let origin_signatures = BTreeMap::from_iter([(
                        x_matrix.key.clone(),
-                        CanonicalJsonValue::String(x_matrix.sig.to_string()),
+                        CanonicalJsonValue::String(x_matrix.sig),
                    )]);

                    let signatures = BTreeMap::from_iter([(
@ -234,7 +234,7 @@ where
                    let keys_result = services()
                        .rooms
                        .event_handler
-                        .fetch_signing_keys(&x_matrix.origin, vec![x_matrix.key.to_string()], false)
+                        .fetch_signing_keys(&x_matrix.origin, vec![x_matrix.key.to_string()])
                        .await;

                    let keys = match keys_result {
@ -242,25 +242,14 @@ where
                        Err(e) => {
                            warn!("Failed to fetch signing keys: {}", e);
                            return Err(Error::BadRequest(
-                                ErrorKind::forbidden(),
+                                ErrorKind::Forbidden,
                                "Failed to fetch signing keys.",
                            ));
                        }
                    };

-                    // Only verify_keys that are currently valid should be used for validating requests
-                    // as per MSC4029
-                    let pub_key_map = BTreeMap::from_iter([(
-                        x_matrix.origin.as_str().to_owned(),
-                        if keys.valid_until_ts > MilliSecondsSinceUnixEpoch::now() {
-                            keys.verify_keys
-                                .into_iter()
-                                .map(|(id, key)| (id, key.key))
-                                .collect()
-                        } else {
-                            BTreeMap::new()
-                        },
-                    )]);
+                    let pub_key_map =
+                        BTreeMap::from_iter([(x_matrix.origin.as_str().to_owned(), keys)]);

                    match ruma::signatures::verify_json(&pub_key_map, &request_map) {
                        Ok(()) => (None, None, Some(x_matrix.origin), None),
@ -279,7 +268,7 @@ where
                            }

                            return Err(Error::BadRequest(
-                                ErrorKind::forbidden(),
+                                ErrorKind::Forbidden,
                                "Failed to verify X-Matrix signatures.",
                            ));
                        }
@ -362,8 +351,60 @@ where
 impl<T: OutgoingResponse> IntoResponse for RumaResponse<T> {
    fn into_response(self) -> Response {
        match self.0.try_into_http_response::<BytesMut>() {
-            Ok(res) => res.map(BytesMut::freeze).map(Body::from).into_response(),
+            Ok(res) => res.map(BytesMut::freeze).map(Full::new).into_response(),
            Err(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
        }
    }
 }
+
+// copied from hyper under the following license:
+// Copyright (c) 2014-2021 Sean McArthur
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+pub(crate) async fn to_bytes<T>(body: T) -> Result<Bytes, T::Error>
+where
+    T: HttpBody,
+{
+    futures_util::pin_mut!(body);
+
+    // If there's only 1 chunk, we can just return Buf::to_bytes()
+    let mut first = if let Some(buf) = body.data().await {
+        buf?
+    } else {
+        return Ok(Bytes::new());
+    };
+
+    let second = if let Some(buf) = body.data().await {
+        buf?
+    } else {
+        return Ok(first.copy_to_bytes(first.remaining()));
+    };
+
+    // With more than 1 buf, we gotta flatten into a Vec first.
+    let cap = first.remaining() + second.remaining() + body.size_hint().lower() as usize;
+    let mut vec = Vec::with_capacity(cap);
+    vec.put(first);
+    vec.put(second);
+
+    while let Some(buf) = body.data().await {
+        vec.put(buf?);
+    }
+
+    Ok(vec.into())
+}
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@ -59,7 +59,7 @@ pub struct Config {
    pub allow_unstable_room_versions: bool,
    #[serde(default = "default_default_room_version")]
    pub default_room_version: RoomVersionId,
-    #[serde(default, flatten)]
+    #[serde(default)]
    pub well_known: WellKnownConfig,
    #[serde(default = "false_fn")]
    pub allow_jaeger: bool,
@ -97,9 +97,7 @@ pub struct TlsConfig {

 #[derive(Clone, Debug, Deserialize, Default)]
 pub struct WellKnownConfig {
-    #[serde(rename = "well_known_client")]
    pub client: Option<Url>,
-    #[serde(rename = "well_known_server")]
    pub server: Option<OwnedServerName>,
 }

--- a/src/database/key_value/globals.rs
+++ b/src/database/key_value/globals.rs
@ -1,19 +1,15 @@
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};

 use async_trait::async_trait;
 use futures_util::{stream::FuturesUnordered, StreamExt};
 use lru_cache::LruCache;
 use ruma::{
-    api::federation::discovery::{OldVerifyKey, ServerSigningKeys},
+    api::federation::discovery::{ServerSigningKeys, VerifyKey},
    signatures::Ed25519KeyPair,
-    DeviceId, ServerName, UserId,
+    DeviceId, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, ServerName, UserId,
 };

-use crate::{
-    database::KeyValueDatabase,
-    service::{self, globals::SigningKeys},
-    services, utils, Error, Result,
-};
+use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};

 pub const COUNTER: &[u8] = b"c";
 pub const LAST_CHECK_FOR_UPDATES_COUNT: &[u8] = b"u";
@ -241,97 +237,64 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
        self.global.remove(b"keypair")
    }

-    fn add_signing_key_from_trusted_server(
+    fn add_signing_key(
        &self,
        origin: &ServerName,
        new_keys: ServerSigningKeys,
-    ) -> Result<SigningKeys> {
-        let prev_keys = self.server_signingkeys.get(origin.as_bytes())?;
+    ) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
+        // Not atomic, but this is not critical
+        let signingkeys = self.server_signingkeys.get(origin.as_bytes())?;

-        Ok(
-            if let Some(mut prev_keys) =
-                prev_keys.and_then(|keys| serde_json::from_slice::<ServerSigningKeys>(&keys).ok())
-            {
-                let ServerSigningKeys {
-                    verify_keys,
-                    old_verify_keys,
-                    ..
-                } = new_keys;
+        let mut keys = signingkeys
+            .and_then(|keys| serde_json::from_slice(&keys).ok())
+            .unwrap_or_else(|| {
+                // Just insert "now", it doesn't matter
+                ServerSigningKeys::new(origin.to_owned(), MilliSecondsSinceUnixEpoch::now())
+            });

-                prev_keys.verify_keys.extend(verify_keys);
-                prev_keys.old_verify_keys.extend(old_verify_keys);
-                prev_keys.valid_until_ts = new_keys.valid_until_ts;
+        let ServerSigningKeys {
+            verify_keys,
+            old_verify_keys,
+            ..
+        } = new_keys;

-                self.server_signingkeys.insert(
-                    origin.as_bytes(),
-                    &serde_json::to_vec(&prev_keys).expect("serversigningkeys can be serialized"),
-                )?;
+        keys.verify_keys.extend(verify_keys);
+        keys.old_verify_keys.extend(old_verify_keys);

-                prev_keys.into()
-            } else {
-                self.server_signingkeys.insert(
-                    origin.as_bytes(),
-                    &serde_json::to_vec(&new_keys).expect("serversigningkeys can be serialized"),
-                )?;
+        self.server_signingkeys.insert(
+            origin.as_bytes(),
+            &serde_json::to_vec(&keys).expect("serversigningkeys can be serialized"),
+        )?;

-                new_keys.into()
-            },
-        )
-    }
+        let mut tree = keys.verify_keys;
+        tree.extend(
+            keys.old_verify_keys
+                .into_iter()
+                .map(|old| (old.0, VerifyKey::new(old.1.key))),
+        );

-    fn add_signing_key_from_origin(
-        &self,
-        origin: &ServerName,
-        new_keys: ServerSigningKeys,
-    ) -> Result<SigningKeys> {
-        let prev_keys = self.server_signingkeys.get(origin.as_bytes())?;
-
-        Ok(
-            if let Some(mut prev_keys) =
-                prev_keys.and_then(|keys| serde_json::from_slice::<ServerSigningKeys>(&keys).ok())
-            {
-                let ServerSigningKeys {
-                    verify_keys,
-                    old_verify_keys,
-                    ..
-                } = new_keys;
-
-                // Moving `verify_keys` no longer present to `old_verify_keys`
-                for (key_id, key) in prev_keys.verify_keys {
-                    if !verify_keys.contains_key(&key_id) {
-                        prev_keys
-                            .old_verify_keys
-                            .insert(key_id, OldVerifyKey::new(prev_keys.valid_until_ts, key.key));
-                    }
-                }
-
-                prev_keys.verify_keys = verify_keys;
-                prev_keys.old_verify_keys.extend(old_verify_keys);
-                prev_keys.valid_until_ts = new_keys.valid_until_ts;
-
-                self.server_signingkeys.insert(
-                    origin.as_bytes(),
-                    &serde_json::to_vec(&prev_keys).expect("serversigningkeys can be serialized"),
-                )?;
-
-                prev_keys.into()
-            } else {
-                self.server_signingkeys.insert(
-                    origin.as_bytes(),
-                    &serde_json::to_vec(&new_keys).expect("serversigningkeys can be serialized"),
-                )?;
-
-                new_keys.into()
-            },
-        )
+        Ok(tree)
    }

    /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found for the server.
-    fn signing_keys_for(&self, origin: &ServerName) -> Result<Option<SigningKeys>> {
+    fn signing_keys_for(
+        &self,
+        origin: &ServerName,
+    ) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
        let signingkeys = self
            .server_signingkeys
            .get(origin.as_bytes())?
-            .and_then(|bytes| serde_json::from_slice::<SigningKeys>(&bytes).ok());
+            .and_then(|bytes| serde_json::from_slice(&bytes).ok())
+            .map(|keys: ServerSigningKeys| {
+                let mut tree = keys.verify_keys;
+                tree.extend(
+                    keys.old_verify_keys
+                        .into_iter()
+                        .map(|old| (old.0, VerifyKey::new(old.1.key))),
+                );
+                tree
+            })
+            .unwrap_or_else(BTreeMap::new);

        Ok(signingkeys)
    }
--- a/src/database/key_value/media.rs
+++ b/src/database/key_value/media.rs
@ -1,4 +1,4 @@
-use ruma::{api::client::error::ErrorKind, http_headers::ContentDisposition};
+use ruma::api::client::error::ErrorKind;

 use crate::{database::KeyValueDatabase, service, utils, Error, Result};

@ -8,7 +8,7 @@ impl service::media::Data for KeyValueDatabase {
        mxc: String,
        width: u32,
        height: u32,
-        content_disposition: &ContentDisposition,
+        content_disposition: Option<&str>,
        content_type: Option<&str>,
    ) -> Result<Vec<u8>> {
        let mut key = mxc.as_bytes().to_vec();
@ -16,7 +16,12 @@ impl service::media::Data for KeyValueDatabase {
        key.extend_from_slice(&width.to_be_bytes());
        key.extend_from_slice(&height.to_be_bytes());
        key.push(0xff);
-        key.extend_from_slice(content_disposition.to_string().as_bytes());
+        key.extend_from_slice(
+            content_disposition
+                .as_ref()
+                .map(|f| f.as_bytes())
+                .unwrap_or_default(),
+        );
        key.push(0xff);
        key.extend_from_slice(
            content_type
@ -35,7 +40,7 @@ impl service::media::Data for KeyValueDatabase {
        mxc: String,
        width: u32,
        height: u32,
-    ) -> Result<(ContentDisposition, Option<String>, Vec<u8>)> {
+    ) -> Result<(Option<String>, Option<String>, Vec<u8>)> {
        let mut prefix = mxc.as_bytes().to_vec();
        prefix.push(0xff);
        prefix.extend_from_slice(&width.to_be_bytes());
@ -63,9 +68,15 @@ impl service::media::Data for KeyValueDatabase {
            .next()
            .ok_or_else(|| Error::bad_database("Media ID in db is invalid."))?;

-        let content_disposition = content_disposition_bytes.try_into().unwrap_or_else(|_| {
-            ContentDisposition::new(ruma::http_headers::ContentDispositionType::Inline)
-        });
+        let content_disposition = if content_disposition_bytes.is_empty() {
+            None
+        } else {
+            Some(
+                utils::string_from_bytes(content_disposition_bytes).map_err(|_| {
+                    Error::bad_database("Content Disposition in mediaid_file is invalid unicode.")
+                })?,
+            )
+        };
        Ok((content_disposition, content_type, key))
    }
 }
--- a/src/database/key_value/rooms/alias.rs
+++ b/src/database/key_value/rooms/alias.rs
@ -1,15 +1,9 @@
-use ruma::{
-    api::client::error::ErrorKind, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId,
-    UserId,
-};
+use ruma::{api::client::error::ErrorKind, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId};

 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};

 impl service::rooms::alias::Data for KeyValueDatabase {
-    fn set_alias(&self, alias: &RoomAliasId, room_id: &RoomId, user_id: &UserId) -> Result<()> {
-        // Comes first as we don't want a stuck alias
-        self.alias_userid
-            .insert(alias.alias().as_bytes(), user_id.as_bytes())?;
+    fn set_alias(&self, alias: &RoomAliasId, room_id: &RoomId) -> Result<()> {
        self.alias_roomid
            .insert(alias.alias().as_bytes(), room_id.as_bytes())?;
        let mut aliasid = room_id.as_bytes().to_vec();
@ -28,13 +22,13 @@ impl service::rooms::alias::Data for KeyValueDatabase {
                self.aliasid_alias.remove(&key)?;
            }
            self.alias_roomid.remove(alias.alias().as_bytes())?;
-            self.alias_userid.remove(alias.alias().as_bytes())
        } else {
-            Err(Error::BadRequest(
+            return Err(Error::BadRequest(
                ErrorKind::NotFound,
                "Alias does not exist.",
-            ))
+            ));
        }
+        Ok(())
    }

    fn resolve_local_alias(&self, alias: &RoomAliasId) -> Result<Option<OwnedRoomId>> {
@ -63,16 +57,4 @@ impl service::rooms::alias::Data for KeyValueDatabase {
                .map_err(|_| Error::bad_database("Invalid alias in aliasid_alias."))
        }))
    }
-
-    fn who_created_alias(&self, alias: &RoomAliasId) -> Result<Option<OwnedUserId>> {
-        self.alias_userid
-            .get(alias.alias().as_bytes())?
-            .map(|bytes| {
-                UserId::parse(utils::string_from_bytes(&bytes).map_err(|_| {
-                    Error::bad_database("User ID in alias_userid is invalid unicode.")
-                })?)
-                .map_err(|_| Error::bad_database("User ID in alias_roomid is invalid."))
-            })
-            .transpose()
-    }
 }
--- a/src/database/key_value/rooms/search.rs
+++ b/src/database/key_value/rooms/search.rs
@ -2,46 +2,24 @@ use ruma::RoomId;

 use crate::{database::KeyValueDatabase, service, services, utils, Result};

-/// Splits a string into tokens used as keys in the search inverted index
-///
-/// This may be used to tokenize both message bodies (for indexing) or search
-/// queries (for querying).
-fn tokenize(body: &str) -> impl Iterator<Item = String> + '_ {
-    body.split_terminator(|c: char| !c.is_alphanumeric())
-        .filter(|s| !s.is_empty())
-        .filter(|word| word.len() <= 50)
-        .map(str::to_lowercase)
-}
-
 impl service::rooms::search::Data for KeyValueDatabase {
    fn index_pdu<'a>(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()> {
-        let mut batch = tokenize(message_body).map(|word| {
-            let mut key = shortroomid.to_be_bytes().to_vec();
-            key.extend_from_slice(word.as_bytes());
-            key.push(0xff);
-            key.extend_from_slice(pdu_id); // TODO: currently we save the room id a second time here
-            (key, Vec::new())
-        });
+        let mut batch = message_body
+            .split_terminator(|c: char| !c.is_alphanumeric())
+            .filter(|s| !s.is_empty())
+            .filter(|word| word.len() <= 50)
+            .map(str::to_lowercase)
+            .map(|word| {
+                let mut key = shortroomid.to_be_bytes().to_vec();
+                key.extend_from_slice(word.as_bytes());
+                key.push(0xff);
+                key.extend_from_slice(pdu_id); // TODO: currently we save the room id a second time here
+                (key, Vec::new())
+            });

        self.tokenids.insert_batch(&mut batch)
    }

-    fn deindex_pdu(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()> {
-        let batch = tokenize(message_body).map(|word| {
-            let mut key = shortroomid.to_be_bytes().to_vec();
-            key.extend_from_slice(word.as_bytes());
-            key.push(0xFF);
-            key.extend_from_slice(pdu_id); // TODO: currently we save the room id a second time here
-            key
-        });
-
-        for token in batch {
-            self.tokenids.remove(&token)?;
-        }
-
-        Ok(())
-    }
-
    fn search_pdus<'a>(
        &'a self,
        room_id: &RoomId,
@ -55,7 +33,11 @@ impl service::rooms::search::Data for KeyValueDatabase {
            .to_be_bytes()
            .to_vec();

-        let words: Vec<_> = tokenize(search_string).collect();
+        let words: Vec<_> = search_string
+            .split_terminator(|c: char| !c.is_alphanumeric())
+            .filter(|s| !s.is_empty())
+            .map(str::to_lowercase)
+            .collect();

        let iterators = words.clone().into_iter().map(move |word| {
            let mut prefix2 = prefix.clone();
--- a/src/database/key_value/uiaa.rs
+++ b/src/database/key_value/uiaa.rs
@ -80,7 +80,7 @@ impl service::uiaa::Data for KeyValueDatabase {
                .userdevicesessionid_uiaainfo
                .get(&userdevicesessionid)?
                .ok_or(Error::BadRequest(
-                    ErrorKind::forbidden(),
+                    ErrorKind::Forbidden,
                    "UIAA session does not exist.",
                ))?,
        )
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@ -6,7 +6,6 @@ use crate::{
    SERVICES,
 };
 use abstraction::{KeyValueDatabaseEngine, KvTree};
-use base64::{engine::general_purpose, Engine};
 use directories::ProjectDirs;
 use lru_cache::LruCache;

@ -102,8 +101,6 @@ pub struct KeyValueDatabase {
    pub(super) userroomid_leftstate: Arc<dyn KvTree>,
    pub(super) roomuserid_leftcount: Arc<dyn KvTree>,

-    pub(super) alias_userid: Arc<dyn KvTree>, // User who created the alias
-
    pub(super) disabledroomids: Arc<dyn KvTree>, // Rooms where incoming federation handling is disabled

    pub(super) lazyloadedids: Arc<dyn KvTree>, // LazyLoadedIds = UserId + DeviceId + RoomId + LazyLoadedUserId
@ -330,8 +327,6 @@ impl KeyValueDatabase {
            userroomid_leftstate: builder.open_tree("userroomid_leftstate")?,
            roomuserid_leftcount: builder.open_tree("roomuserid_leftcount")?,

-            alias_userid: builder.open_tree("alias_userid")?,
-
            disabledroomids: builder.open_tree("disabledroomids")?,

            lazyloadedids: builder.open_tree("lazyloadedids")?,
@ -425,7 +420,7 @@ impl KeyValueDatabase {
        }

        // If the database has any data, perform data migrations before starting
-        let latest_database_version = 16;
+        let latest_database_version = 13;

        if services().users.count()? > 0 {
            // MIGRATIONS
@ -942,86 +937,6 @@ impl KeyValueDatabase {
                warn!("Migration: 12 -> 13 finished");
            }

-            if services().globals.database_version()? < 16 {
-                // Reconstruct all media using the filesystem
-                db.mediaid_file.clear().unwrap();
-
-                for file in fs::read_dir(services().globals.get_media_folder()).unwrap() {
-                    let file = file.unwrap();
-                    let mediaid = general_purpose::URL_SAFE_NO_PAD
-                        .decode(file.file_name().into_string().unwrap())
-                        .unwrap();
-
-                    let mut parts = mediaid.rsplit(|&b| b == 0xff);
-
-                    let mut removed_bytes = 0;
-
-                    let content_type_bytes = parts.next().unwrap();
-                    removed_bytes += content_type_bytes.len() + 1;
-
-                    let content_disposition_bytes = parts
-                        .next()
-                        .ok_or_else(|| Error::bad_database("Media ID in db is invalid."))?;
-                    removed_bytes += content_disposition_bytes.len();
-
-                    let mut content_disposition =
-                        utils::string_from_bytes(content_disposition_bytes).map_err(|_| {
-                            Error::bad_database("Content Disposition in mediaid_file is invalid.")
-                        })?;
-
-                    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);
-
-                        let mut shorter_key = new_key.clone();
-                        shorter_key.extend(
-                            ruma::http_headers::ContentDisposition::new(
-                                ruma::http_headers::ContentDispositionType::Inline,
-                            )
-                            .to_string()
-                            .as_bytes(),
-                        );
-                        shorter_key.push(0xff);
-                        shorter_key.extend_from_slice(content_type_bytes);
-
-                        new_key.extend_from_slice(content_disposition.to_string().as_bytes());
-                        new_key.push(0xff);
-                        new_key.extend_from_slice(content_type_bytes);
-
-                        // Some file names are too long. Ignore those.
-                        match fs::rename(
-                            services().globals.get_media_file(&mediaid),
-                            services().globals.get_media_file(&new_key),
-                        ) {
-                            Ok(_) => {
-                                db.mediaid_file.insert(&new_key, &[])?;
-                            }
-                            Err(_) => {
-                                fs::rename(
-                                    services().globals.get_media_file(&mediaid),
-                                    services().globals.get_media_file(&shorter_key),
-                                )
-                                .unwrap();
-                                db.mediaid_file.insert(&shorter_key, &[])?;
-                            }
-                        }
-                    } else {
-                        db.mediaid_file.insert(&mediaid, &[])?;
-                    }
-                }
-                services().globals.bump_database_version(16)?;
-
-                warn!("Migration: 13 -> 16 finished");
-            }
-
            assert_eq!(
                services().globals.database_version().unwrap(),
                latest_database_version
--- a/src/main.rs
+++ b/src/main.rs
@ -1,7 +1,6 @@
 use std::{future::Future, io, net::SocketAddr, sync::atomic, time::Duration};

 use axum::{
-    body::Body,
    extract::{DefaultBodyLimit, FromRequestParts, MatchedPath},
    middleware::map_response,
    response::{IntoResponse, Response},
@ -57,7 +56,7 @@ async fn main() {
                ))
                .nested(),
            )
-            .merge(Env::prefixed("CONDUIT_").global().split("__"));
+            .merge(Env::prefixed("CONDUIT_").global());

    let config = match raw_config.extract::<Config>() {
        Ok(s) => s,
@ -70,13 +69,11 @@ async fn main() {
    config.warn_deprecated();

    if config.allow_jaeger {
-        opentelemetry::global::set_text_map_propagator(
-            opentelemetry_jaeger_propagator::Propagator::new(),
-        );
-        let tracer = opentelemetry_otlp::new_pipeline()
-            .tracing()
-            .with_exporter(opentelemetry_otlp::new_exporter().tonic())
-            .install_batch(opentelemetry_sdk::runtime::Tokio)
+        opentelemetry::global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new());
+        let tracer = opentelemetry_jaeger::new_agent_pipeline()
+            .with_auto_split_batch(true)
+            .with_service_name("conduit")
+            .install_batch(opentelemetry::runtime::Tokio)
            .unwrap();
        let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);

@ -228,9 +225,9 @@ async fn run_server() -> io::Result<()> {
    Ok(())
 }

-async fn spawn_task(
-    req: http::Request<Body>,
-    next: axum::middleware::Next,
+async fn spawn_task<B: Send + 'static>(
+    req: http::Request<B>,
+    next: axum::middleware::Next<B>,
 ) -> std::result::Result<Response, StatusCode> {
    if services().globals.shutdown.load(atomic::Ordering::Relaxed) {
        return Err(StatusCode::SERVICE_UNAVAILABLE);
@ -240,9 +237,9 @@ async fn spawn_task(
        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)
 }

-async fn unrecognized_method(
-    req: http::Request<Body>,
-    next: axum::middleware::Next,
+async fn unrecognized_method<B: Send>(
+    req: http::Request<B>,
+    next: axum::middleware::Next<B>,
 ) -> std::result::Result<Response, StatusCode> {
    let method = req.method().clone();
    let uri = req.uri().clone();
@ -379,14 +376,10 @@ fn routes(config: &Config) -> Router {
        .ruma_route(client_server::turn_server_route)
        .ruma_route(client_server::send_event_to_device_route)
        .ruma_route(client_server::get_media_config_route)
-        .ruma_route(client_server::get_media_config_auth_route)
        .ruma_route(client_server::create_content_route)
        .ruma_route(client_server::get_content_route)
-        .ruma_route(client_server::get_content_auth_route)
        .ruma_route(client_server::get_content_as_filename_route)
-        .ruma_route(client_server::get_content_as_filename_auth_route)
        .ruma_route(client_server::get_content_thumbnail_route)
-        .ruma_route(client_server::get_content_thumbnail_auth_route)
        .ruma_route(client_server::get_devices_route)
        .ruma_route(client_server::get_device_route)
        .ruma_route(client_server::update_device_route)
@ -444,8 +437,6 @@ fn routes(config: &Config) -> Router {
            .ruma_route(server_server::create_join_event_v2_route)
            .ruma_route(server_server::create_invite_route)
            .ruma_route(server_server::get_devices_route)
-            .ruma_route(server_server::get_content_route)
-            .ruma_route(server_server::get_content_thumbnail_route)
            .ruma_route(server_server::get_room_information_route)
            .ruma_route(server_server::get_profile_information_route)
            .ruma_route(server_server::get_keys_route)
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@ -1,4 +1,9 @@
-use std::{collections::BTreeMap, convert::TryFrom, sync::Arc, time::Instant};
+use std::{
+    collections::BTreeMap,
+    convert::{TryFrom, TryInto},
+    sync::Arc,
+    time::Instant,
+};

 use clap::Parser;
 use regex::Regex;
@ -19,8 +24,7 @@ use ruma::{
        },
        TimelineEventType,
    },
-    EventId, MilliSecondsSinceUnixEpoch, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId,
-    RoomVersionId, ServerName, UserId,
+    EventId, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId, RoomVersionId, ServerName, UserId,
 };
 use serde_json::value::to_raw_value;
 use tokio::sync::{mpsc, Mutex, RwLock};
@ -246,7 +250,6 @@ impl Service {
                                    unsigned: None,
                                    state_key: None,
                                    redacts: None,
-                                    timestamp: None,
                                },
                                conduit_user,
                                &conduit_room,
@ -860,46 +863,15 @@ impl Service {
                            services()
                                .rooms
                                .event_handler
-                                // Generally we shouldn't be checking against expired keys unless required, so in the admin
-                                // room it might be best to not allow expired keys
                                .fetch_required_signing_keys(&value, &pub_key_map)
                                .await?;

-                            let mut expired_key_map = BTreeMap::new();
-                            let mut valid_key_map = BTreeMap::new();
-
-                            for (server, keys) in pub_key_map.into_inner().into_iter() {
-                                if keys.valid_until_ts > MilliSecondsSinceUnixEpoch::now() {
-                                    valid_key_map.insert(
-                                        server,
-                                        keys.verify_keys
-                                            .into_iter()
-                                            .map(|(id, key)| (id, key.key))
-                                            .collect(),
-                                    );
-                                } else {
-                                    expired_key_map.insert(
-                                        server,
-                                        keys.verify_keys
-                                            .into_iter()
-                                            .map(|(id, key)| (id, key.key))
-                                            .collect(),
-                                    );
-                                }
-                            }
-
-                            if ruma::signatures::verify_json(&valid_key_map, &value).is_ok() {
-                                RoomMessageEventContent::text_plain("Signature correct")
-                            } else if let Err(e) =
-                                ruma::signatures::verify_json(&expired_key_map, &value)
-                            {
-                                RoomMessageEventContent::text_plain(format!(
+                            let pub_key_map = pub_key_map.read().await;
+                            match ruma::signatures::verify_json(&pub_key_map, &value) {
+                                Ok(_) => RoomMessageEventContent::text_plain("Signature correct"),
+                                Err(e) => RoomMessageEventContent::text_plain(format!(
                                    "Signature verification failed: {e}"
-                                ))
-                            } else {
-                                RoomMessageEventContent::text_plain(
-                                    "Signature correct (with expired keys)",
-                                )
+                                )),
                            }
                        }
                        Err(e) => RoomMessageEventContent::text_plain(format!("Invalid json: {e}")),
@ -953,15 +925,7 @@ impl Service {
                {
                    RoomMessageEventContent::text_plain("No such alias exists")
                } else {
-                    // We execute this as the server user for two reasons
-                    // 1. If the user can execute commands in the admin room, they can always remove the alias.
-                    // 2. In the future, we are likely going to be able to allow users to execute commands via
-                    //   other methods, such as IPC, which would lead to us not knowing their user id
-
-                    services()
-                        .rooms
-                        .alias
-                        .remove_alias(&alias, services().globals.server_user())?;
+                    services().rooms.alias.remove_alias(&alias)?;
                    RoomMessageEventContent::text_plain("Alias removed sucessfully")
                }
            }
@ -1106,7 +1070,6 @@ impl Service {
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                conduit_user,
                &room_id,
@ -1135,7 +1098,6 @@ impl Service {
                    unsigned: None,
                    state_key: Some(conduit_user.to_string()),
                    redacts: None,
-                    timestamp: None,
                },
                conduit_user,
                &room_id,
@ -1161,7 +1123,6 @@ impl Service {
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                conduit_user,
                &room_id,
@ -1181,7 +1142,6 @@ impl Service {
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                conduit_user,
                &room_id,
@ -1203,7 +1163,6 @@ impl Service {
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                conduit_user,
                &room_id,
@ -1225,7 +1184,6 @@ impl Service {
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                conduit_user,
                &room_id,
@ -1246,7 +1204,6 @@ impl Service {
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                conduit_user,
                &room_id,
@ -1267,7 +1224,6 @@ impl Service {
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                conduit_user,
                &room_id,
@ -1276,7 +1232,9 @@ impl Service {
            .await?;

        // 6. Room alias
-        let alias: OwnedRoomAliasId = services().globals.admin_alias().to_owned();
+        let alias: OwnedRoomAliasId = format!("#admins:{}", services().globals.server_name())
+            .try_into()
+            .expect("#admins:server_name is a valid alias name");

        services()
            .rooms
@ -1292,7 +1250,6 @@ impl Service {
                    unsigned: None,
                    state_key: Some("".to_owned()),
                    redacts: None,
-                    timestamp: None,
                },
                conduit_user,
                &room_id,
@ -1300,10 +1257,7 @@ impl Service {
            )
            .await?;

-        services()
-            .rooms
-            .alias
-            .set_alias(&alias, &room_id, conduit_user)?;
+        services().rooms.alias.set_alias(&alias, &room_id)?;

        Ok(())
    }
@ -1312,10 +1266,15 @@ impl Service {
    ///
    /// Errors are propagated from the database, and will have None if there is no admin room
    pub(crate) fn get_admin_room(&self) -> Result<Option<OwnedRoomId>> {
+        let admin_room_alias: Box<RoomAliasId> =
+            format!("#admins:{}", services().globals.server_name())
+                .try_into()
+                .expect("#admins:server_name is a valid alias name");
+
        services()
            .rooms
            .alias
-            .resolve_local_alias(services().globals.admin_alias())
+            .resolve_local_alias(&admin_room_alias)
    }

    /// Invite the user to the conduit admin room.
@ -1362,7 +1321,6 @@ impl Service {
                        unsigned: None,
                        state_key: Some(user_id.to_string()),
                        redacts: None,
-                        timestamp: None,
                    },
                    conduit_user,
                    &room_id,
@ -1389,7 +1347,6 @@ impl Service {
                        unsigned: None,
                        state_key: Some(user_id.to_string()),
                        redacts: None,
-                        timestamp: None,
                    },
                    user_id,
                    &room_id,
@ -1416,7 +1373,6 @@ impl Service {
                        unsigned: None,
                        state_key: Some("".to_owned()),
                        redacts: None,
-                        timestamp: None,
                    },
                    conduit_user,
                    &room_id,
@ -1436,7 +1392,6 @@ impl Service {
                unsigned: None,
                state_key: None,
                redacts: None,
-                timestamp: None,
            },
            conduit_user,
            &room_id,
@ -1445,15 +1400,6 @@ impl Service {
        }
        Ok(())
    }
-
-    /// Checks whether a given user is an admin of this server
-    pub fn user_is_admin(&self, user_id: &UserId) -> Result<bool> {
-        let Some(admin_room) = self.get_admin_room()? else {
-            return Ok(false);
-        };
-
-        services().rooms.state_cache.is_joined(user_id, &admin_room)
-    }
 }

 #[cfg(test)]
--- a/src/service/globals/data.rs
+++ b/src/service/globals/data.rs
@ -1,71 +1,13 @@
-use std::{
-    collections::BTreeMap,
-    time::{Duration, SystemTime},
-};
+use std::collections::BTreeMap;

-use crate::{services, Result};
 use async_trait::async_trait;
 use ruma::{
-    api::federation::discovery::{OldVerifyKey, ServerSigningKeys, VerifyKey},
-    serde::Base64,
+    api::federation::discovery::{ServerSigningKeys, VerifyKey},
    signatures::Ed25519KeyPair,
-    DeviceId, MilliSecondsSinceUnixEpoch, ServerName, UserId,
+    DeviceId, OwnedServerSigningKeyId, ServerName, UserId,
 };
-use serde::Deserialize;

-/// Similar to ServerSigningKeys, but drops a few unnecessary fields we don't require post-validation
-#[derive(Deserialize, Debug, Clone)]
-pub struct SigningKeys {
-    pub verify_keys: BTreeMap<String, VerifyKey>,
-    pub old_verify_keys: BTreeMap<String, OldVerifyKey>,
-    pub valid_until_ts: MilliSecondsSinceUnixEpoch,
-}
-
-impl SigningKeys {
-    /// Creates the SigningKeys struct, using the keys of the current server
-    pub fn load_own_keys() -> Self {
-        let mut keys = Self {
-            verify_keys: BTreeMap::new(),
-            old_verify_keys: BTreeMap::new(),
-            valid_until_ts: MilliSecondsSinceUnixEpoch::from_system_time(
-                SystemTime::now() + Duration::from_secs(7 * 86400),
-            )
-            .expect("Should be valid until year 500,000,000"),
-        };
-
-        keys.verify_keys.insert(
-            format!("ed25519:{}", services().globals.keypair().version()),
-            VerifyKey {
-                key: Base64::new(services().globals.keypair.public_key().to_vec()),
-            },
-        );
-
-        keys
-    }
-}
-
-impl From<ServerSigningKeys> for SigningKeys {
-    fn from(value: ServerSigningKeys) -> Self {
-        let ServerSigningKeys {
-            verify_keys,
-            old_verify_keys,
-            valid_until_ts,
-            ..
-        } = value;
-
-        Self {
-            verify_keys: verify_keys
-                .into_iter()
-                .map(|(id, key)| (id.to_string(), key))
-                .collect(),
-            old_verify_keys: old_verify_keys
-                .into_iter()
-                .map(|(id, key)| (id.to_string(), key))
-                .collect(),
-            valid_until_ts,
-        }
-    }
-}
+use crate::Result;

 #[async_trait]
 pub trait Data: Send + Sync {
@ -79,23 +21,17 @@ pub trait Data: Send + Sync {
    fn clear_caches(&self, amount: u32);
    fn load_keypair(&self) -> Result<Ed25519KeyPair>;
    fn remove_keypair(&self) -> Result<()>;
-    /// Only extends the cached keys, not moving any verify_keys to old_verify_keys, as if we suddenly
-    /// recieve requests from the origin server, we want to be able to accept requests from them
-    fn add_signing_key_from_trusted_server(
+    fn add_signing_key(
        &self,
        origin: &ServerName,
        new_keys: ServerSigningKeys,
-    ) -> Result<SigningKeys>;
-    /// Extends cached keys, as well as moving verify_keys that are not present in these new keys to
-    /// old_verify_keys, so that potnetially comprimised keys cannot be used to make requests
-    fn add_signing_key_from_origin(
-        &self,
-        origin: &ServerName,
-        new_keys: ServerSigningKeys,
-    ) -> Result<SigningKeys>;
+    ) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>>;

    /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found for the server.
-    fn signing_keys_for(&self, origin: &ServerName) -> Result<Option<SigningKeys>>;
+    fn signing_keys_for(
+        &self,
+        origin: &ServerName,
+    ) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>>;
    fn database_version(&self) -> Result<u64>;
    fn bump_database_version(&self, new_version: u64) -> Result<()>;
 }
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@ -1,19 +1,25 @@
 mod data;
-pub use data::{Data, SigningKeys};
+pub use data::Data;
 use ruma::{
-    serde::Base64, MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedEventId, OwnedRoomAliasId,
-    OwnedRoomId, OwnedServerName, OwnedUserId, RoomAliasId,
+    serde::Base64, OwnedDeviceId, OwnedEventId, OwnedRoomId, OwnedServerName,
+    OwnedServerSigningKeyId, OwnedUserId,
 };

-use crate::api::server_server::DestinationResponse;
+use crate::api::server_server::FedDest;

 use crate::{services, Config, Error, Result};
 use futures_util::FutureExt;
 use hickory_resolver::TokioAsyncResolver;
-use hyper_util::client::legacy::connect::dns::{GaiResolver, Name as HyperName};
-use reqwest::dns::{Addrs, Name, Resolve, Resolving};
+use hyper::{
+    client::connect::dns::{GaiResolver, Name},
+    service::Service as HyperService,
+};
+use reqwest::dns::{Addrs, Resolve, Resolving};
 use ruma::{
-    api::{client::sync::sync_events, federation::discovery::ServerSigningKeys},
+    api::{
+        client::sync::sync_events,
+        federation::discovery::{ServerSigningKeys, VerifyKey},
+    },
    DeviceId, RoomVersionId, ServerName, UserId,
 };
 use std::{
@ -24,7 +30,6 @@ use std::{
    iter,
    net::{IpAddr, SocketAddr},
    path::PathBuf,
-    str::FromStr,
    sync::{
        atomic::{self, AtomicBool},
        Arc, RwLock as StdRwLock,
@ -32,12 +37,11 @@ use std::{
    time::{Duration, Instant},
 };
 use tokio::sync::{broadcast, watch::Receiver, Mutex, RwLock, Semaphore};
-use tower_service::Service as TowerService;
 use tracing::{error, info};

 use base64::{engine::general_purpose, Engine as _};

-type WellKnownMap = HashMap<OwnedServerName, DestinationResponse>;
+type WellKnownMap = HashMap<OwnedServerName, (FedDest, String)>;
 type TlsNameMap = HashMap<String, (Vec<IpAddr>, u16)>;
 type RateLimitState = (Instant, u32); // Time if last failed try, number of failed tries
 type SyncHandle = (
@ -69,7 +73,6 @@ pub struct Service {
    pub roomid_mutex_federation: RwLock<HashMap<OwnedRoomId, Arc<Mutex<()>>>>, // this lock will be held longer
    pub roomid_federationhandletime: RwLock<HashMap<OwnedRoomId, (OwnedEventId, Instant)>>,
    server_user: OwnedUserId,
-    admin_alias: OwnedRoomAliasId,
    pub stateres_mutex: Arc<Mutex<()>>,
    pub rotate: RotationHandler,

@ -136,19 +139,11 @@ impl Resolve for Resolver {
            })
            .unwrap_or_else(|| {
                let this = &mut self.inner.clone();
-                Box::pin(
-                    TowerService::<HyperName>::call(
-                        this,
-                        // Beautiful hack, please remove this in the future.
-                        HyperName::from_str(name.as_str())
-                            .expect("reqwest Name is just wrapper for hyper-util Name"),
-                    )
-                    .map(|result| {
-                        result
-                            .map(|addrs| -> Addrs { Box::new(addrs) })
-                            .map_err(|err| -> Box<dyn StdError + Send + Sync> { Box::new(err) })
-                    }),
-                )
+                Box::pin(HyperService::<Name>::call(this, name).map(|result| {
+                    result
+                        .map(|addrs| -> Addrs { Box::new(addrs) })
+                        .map_err(|err| -> Box<dyn StdError + Send + Sync> { Box::new(err) })
+                }))
            })
    }
 }
@ -192,8 +187,6 @@ impl Service {

        let mut s = Self {
            allow_registration: RwLock::new(config.allow_registration),
-            admin_alias: RoomAliasId::parse(format!("#admins:{}", &config.server_name))
-                .expect("#admins:server_name is a valid alias name"),
            server_user: UserId::parse(format!("@conduit:{}", &config.server_name))
                .expect("@conduit:server_name is valid"),
            db,
@ -293,10 +286,6 @@ impl Service {
        self.server_user.as_ref()
    }

-    pub fn admin_alias(&self) -> &RoomAliasId {
-        self.admin_alias.as_ref()
-    }
-
    pub fn max_request_size(&self) -> u32 {
        self.config.max_request_size
    }
@ -389,89 +378,36 @@ impl Service {
        room_versions
    }

+    /// TODO: the key valid until timestamp is only honored in room version > 4
+    /// Remove the outdated keys and insert the new ones.
+    ///
    /// This doesn't actually check that the keys provided are newer than the old set.
-    pub fn add_signing_key_from_trusted_server(
+    pub fn add_signing_key(
        &self,
        origin: &ServerName,
        new_keys: ServerSigningKeys,
-    ) -> Result<SigningKeys> {
-        self.db
-            .add_signing_key_from_trusted_server(origin, new_keys)
+    ) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
+        self.db.add_signing_key(origin, new_keys)
    }

-    /// Same as from_trusted_server, except it will move active keys not present in `new_keys` to old_signing_keys
-    pub fn add_signing_key_from_origin(
+    /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found for the server.
+    pub fn signing_keys_for(
        &self,
        origin: &ServerName,
-        new_keys: ServerSigningKeys,
-    ) -> Result<SigningKeys> {
-        self.db.add_signing_key_from_origin(origin, new_keys)
-    }
-
-    /// This returns Ok(None) when there are no keys found for the server.
-    pub fn signing_keys_for(&self, origin: &ServerName) -> Result<Option<SigningKeys>> {
-        Ok(self.db.signing_keys_for(origin)?.or_else(|| {
-            if origin == self.server_name() {
-                Some(SigningKeys::load_own_keys())
-            } else {
-                None
-            }
-        }))
-    }
-
-    /// Filters the key map of multiple servers down to keys that should be accepted given the expiry time,
-    /// room version, and timestamp of the paramters
-    pub fn filter_keys_server_map(
-        &self,
-        keys: BTreeMap<String, SigningKeys>,
-        timestamp: MilliSecondsSinceUnixEpoch,
-        room_version_id: &RoomVersionId,
-    ) -> BTreeMap<String, BTreeMap<String, Base64>> {
-        keys.into_iter()
-            .filter_map(|(server, keys)| {
-                self.filter_keys_single_server(keys, timestamp, room_version_id)
-                    .map(|keys| (server, keys))
-            })
-            .collect()
-    }
-
-    /// Filters the keys of a single server down to keys that should be accepted given the expiry time,
-    /// room version, and timestamp of the paramters
-    pub fn filter_keys_single_server(
-        &self,
-        keys: SigningKeys,
-        timestamp: MilliSecondsSinceUnixEpoch,
-        room_version_id: &RoomVersionId,
-    ) -> Option<BTreeMap<String, Base64>> {
-        if keys.valid_until_ts > timestamp
-            // valid_until_ts MUST be ignored in room versions 1, 2, 3, and 4.
-            // https://spec.matrix.org/v1.10/server-server-api/#get_matrixkeyv2server
-                || matches!(room_version_id, RoomVersionId::V1
-                    | RoomVersionId::V2
-                    | RoomVersionId::V4
-                    | RoomVersionId::V3)
-        {
-            // Given that either the room version allows stale keys, or the valid_until_ts is
-            // in the future, all verify_keys are valid
-            let mut map: BTreeMap<_, _> = keys
-                .verify_keys
-                .into_iter()
-                .map(|(id, key)| (id, key.key))
-                .collect();
-
-            map.extend(keys.old_verify_keys.into_iter().filter_map(|(id, key)| {
-                // Even on old room versions, we don't allow old keys if they are expired
-                if key.expired_ts > timestamp {
-                    Some((id, key.key))
-                } else {
-                    None
-                }
-            }));
-
-            Some(map)
-        } else {
-            None
+    ) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
+        let mut keys = self.db.signing_keys_for(origin)?;
+        if origin == self.server_name() {
+            keys.insert(
+                format!("ed25519:{}", services().globals.keypair().version())
+                    .try_into()
+                    .expect("found invalid server signing keys in DB"),
+                VerifyKey {
+                    key: Base64::new(self.keypair.public_key().to_vec()),
+                },
+            );
        }
+
+        Ok(keys)
    }

    pub fn database_version(&self) -> Result<u64> {
--- a/src/service/media/data.rs
+++ b/src/service/media/data.rs
@ -1,5 +1,3 @@
-use ruma::http_headers::ContentDisposition;
-
 use crate::Result;

 pub trait Data: Send + Sync {
@ -8,7 +6,7 @@ pub trait Data: Send + Sync {
        mxc: String,
        width: u32,
        height: u32,
-        content_disposition: &ContentDisposition,
+        content_disposition: Option<&str>,
        content_type: Option<&str>,
    ) -> Result<Vec<u8>>;

@ -18,5 +16,5 @@ pub trait Data: Send + Sync {
        mxc: String,
        width: u32,
        height: u32,
-    ) -> Result<(ContentDisposition, Option<String>, Vec<u8>)>;
+    ) -> Result<(Option<String>, Option<String>, Vec<u8>)>;
 }
--- a/src/service/media/mod.rs
+++ b/src/service/media/mod.rs
@ -2,7 +2,7 @@ mod data;
 use std::io::Cursor;

 pub use data::Data;
-use ruma::http_headers::{ContentDisposition, ContentDispositionType};
+use ruma::api::client::error::ErrorKind;

 use crate::{services, Result};
 use image::imageops::FilterType;
@ -13,7 +13,7 @@ use tokio::{
 };

 pub struct FileMeta {
-    pub content_disposition: ContentDisposition,
+    pub content_disposition: Option<String>,
    pub content_type: Option<String>,
    pub file: Vec<u8>,
 }
@ -27,17 +27,14 @@ impl Service {
    pub async fn create(
        &self,
        mxc: String,
-        content_disposition: Option<ContentDisposition>,
+        content_disposition: Option<&str>,
        content_type: Option<&str>,
        file: &[u8],
    ) -> Result<()> {
-        let content_disposition =
-            content_disposition.unwrap_or(ContentDisposition::new(ContentDispositionType::Inline));
-
        // Width, Height = 0 if it's not a thumbnail
        let key = self
            .db
-            .create_file_metadata(mxc, 0, 0, &content_disposition, content_type)?;
+            .create_file_metadata(mxc, 0, 0, content_disposition, content_type)?;

        let path = services().globals.get_media_file(&key);
        let mut f = File::create(path).await?;
@ -50,18 +47,15 @@ impl Service {
    pub async fn upload_thumbnail(
        &self,
        mxc: String,
+        content_disposition: Option<&str>,
        content_type: Option<&str>,
        width: u32,
        height: u32,
        file: &[u8],
    ) -> Result<()> {
-        let key = self.db.create_file_metadata(
-            mxc,
-            width,
-            height,
-            &ContentDisposition::new(ContentDispositionType::Inline),
-            content_type,
-        )?;
+        let key =
+            self.db
+                .create_file_metadata(mxc, width, height, content_disposition, content_type)?;

        let path = services().globals.get_media_file(&key);
        let mut f = File::create(path).await?;
@ -124,110 +118,115 @@ impl Service {
            .thumbnail_properties(width, height)
            .unwrap_or((0, 0, false)); // 0, 0 because that's the original file

-        if let Ok((content_disposition, content_type, key)) =
-            self.db.search_file_metadata(mxc.clone(), width, height)
-        {
-            // Using saved thumbnail
-            let path = services().globals.get_media_file(&key);
-            let mut file = Vec::new();
-            File::open(path).await?.read_to_end(&mut file).await?;
+        Ok(
+            if let Ok((content_disposition, content_type, key)) =
+                self.db.search_file_metadata(mxc.clone(), width, height)
+            {
+                // Using saved thumbnail
+                let path = services().globals.get_media_file(&key);
+                let mut file = Vec::new();
+                File::open(path).await?.read_to_end(&mut file).await?;

-            Ok(Some(FileMeta {
-                content_disposition,
-                content_type,
-                file: file.to_vec(),
-            }))
-        } else if let Ok((content_disposition, content_type, key)) =
-            self.db.search_file_metadata(mxc.clone(), 0, 0)
-        {
-            // Generate a thumbnail
-            let path = services().globals.get_media_file(&key);
-            let mut file = Vec::new();
-            File::open(path).await?.read_to_end(&mut file).await?;
-
-            if let Ok(image) = image::load_from_memory(&file) {
-                let original_width = image.width();
-                let original_height = image.height();
-                if width > original_width || height > original_height {
-                    return Ok(Some(FileMeta {
-                        content_disposition,
-                        content_type,
-                        file: file.to_vec(),
-                    }));
-                }
-
-                let thumbnail = if crop {
-                    image.resize_to_fill(width, height, FilterType::CatmullRom)
-                } else {
-                    let (exact_width, exact_height) = {
-                        // Copied from image::dynimage::resize_dimensions
-                        let ratio = u64::from(original_width) * u64::from(height);
-                        let nratio = u64::from(width) * u64::from(original_height);
-
-                        let use_width = nratio <= ratio;
-                        let intermediate = if use_width {
-                            u64::from(original_height) * u64::from(width)
-                                / u64::from(original_width)
-                        } else {
-                            u64::from(original_width) * u64::from(height)
-                                / u64::from(original_height)
-                        };
-                        if use_width {
-                            if intermediate <= u64::from(u32::MAX) {
-                                (width, intermediate as u32)
-                            } else {
-                                (
-                                    (u64::from(width) * u64::from(u32::MAX) / intermediate) as u32,
-                                    u32::MAX,
-                                )
-                            }
-                        } else if intermediate <= u64::from(u32::MAX) {
-                            (intermediate as u32, height)
-                        } else {
-                            (
-                                u32::MAX,
-                                (u64::from(height) * u64::from(u32::MAX) / intermediate) as u32,
-                            )
-                        }
-                    };
-
-                    image.thumbnail_exact(exact_width, exact_height)
-                };
-
-                let mut thumbnail_bytes = Vec::new();
-                thumbnail.write_to(
-                    &mut Cursor::new(&mut thumbnail_bytes),
-                    image::ImageFormat::Png,
-                )?;
-
-                // Save thumbnail in database so we don't have to generate it again next time
-                let thumbnail_key = self.db.create_file_metadata(
-                    mxc,
-                    width,
-                    height,
-                    &content_disposition,
-                    content_type.as_deref(),
-                )?;
-
-                let path = services().globals.get_media_file(&thumbnail_key);
-                let mut f = File::create(path).await?;
-                f.write_all(&thumbnail_bytes).await?;
-
-                Ok(Some(FileMeta {
-                    content_disposition,
-                    content_type,
-                    file: thumbnail_bytes.to_vec(),
-                }))
-            } else {
-                // Couldn't parse file to generate thumbnail, send original
-                Ok(Some(FileMeta {
+                Some(FileMeta {
                    content_disposition,
                    content_type,
                    file: file.to_vec(),
-                }))
-            }
-        } else {
-            Ok(None)
-        }
+                })
+            } else if let Ok((content_disposition, content_type, key)) =
+                self.db.search_file_metadata(mxc.clone(), 0, 0)
+            {
+                // Generate a thumbnail
+                let path = services().globals.get_media_file(&key);
+                let mut file = Vec::new();
+                File::open(path).await?.read_to_end(&mut file).await?;
+
+                if let Ok(image) = image::load_from_memory(&file) {
+                    let original_width = image.width();
+                    let original_height = image.height();
+                    if width > original_width || height > original_height {
+                        Some(FileMeta {
+                            content_disposition,
+                            content_type,
+                            file: file.to_vec(),
+                        })
+                    } else {
+                        let thumbnail = if crop {
+                            image.resize_to_fill(width, height, FilterType::CatmullRom)
+                        } else {
+                            let (exact_width, exact_height) = {
+                                // Copied from image::dynimage::resize_dimensions
+                                let ratio = u64::from(original_width) * u64::from(height);
+                                let nratio = u64::from(width) * u64::from(original_height);
+
+                                let use_width = nratio <= ratio;
+                                let intermediate = if use_width {
+                                    u64::from(original_height) * u64::from(width)
+                                        / u64::from(original_width)
+                                } else {
+                                    u64::from(original_width) * u64::from(height)
+                                        / u64::from(original_height)
+                                };
+                                if use_width {
+                                    if intermediate <= u64::from(::std::u32::MAX) {
+                                        (width, intermediate as u32)
+                                    } else {
+                                        (
+                                            (u64::from(width) * u64::from(::std::u32::MAX)
+                                                / intermediate)
+                                                as u32,
+                                            ::std::u32::MAX,
+                                        )
+                                    }
+                                } else if intermediate <= u64::from(::std::u32::MAX) {
+                                    (intermediate as u32, height)
+                                } else {
+                                    (
+                                        ::std::u32::MAX,
+                                        (u64::from(height) * u64::from(::std::u32::MAX)
+                                            / intermediate)
+                                            as u32,
+                                    )
+                                }
+                            };
+
+                            image.thumbnail_exact(exact_width, exact_height)
+                        };
+
+                        let mut thumbnail_bytes = Vec::new();
+                        thumbnail.write_to(
+                            &mut Cursor::new(&mut thumbnail_bytes),
+                            image::ImageFormat::Png,
+                        )?;
+
+                        // Save thumbnail in database so we don't have to generate it again next time
+                        let thumbnail_key = self.db.create_file_metadata(
+                            mxc,
+                            width,
+                            height,
+                            content_disposition.as_deref(),
+                            content_type.as_deref(),
+                        )?;
+
+                        let path = services().globals.get_media_file(&thumbnail_key);
+                        let mut f = File::create(path).await?;
+                        f.write_all(&thumbnail_bytes).await?;
+
+                        Some(FileMeta {
+                            content_disposition,
+                            content_type,
+                            file: thumbnail_bytes.to_vec(),
+                        })
+                    }
+                } else {
+                    // Couldn't parse file to generate thumbnail, likely not an image
+                    return Err(crate::Error::BadRequest(
+                        ErrorKind::Unknown,
+                        "Unable to generate thumbnail for the requested content",
+                    ));
+                }
+            } else {
+                None
+            },
+        )
    }
 }
--- a/src/service/pdu.rs
+++ b/src/service/pdu.rs
@ -1,6 +1,5 @@
 use crate::Error;
 use ruma::{
-    api::client::error::ErrorKind,
    canonical_json::redact_content_in_place,
    events::{
        room::{member::RoomMemberEventContent, redaction::RoomRedactionEventContent},
@ -73,23 +72,6 @@ impl PduEvent {
        Ok(())
    }

-    pub fn is_redacted(&self) -> bool {
-        #[derive(Deserialize)]
-        struct ExtractRedactedBecause {
-            redacted_because: Option<serde::de::IgnoredAny>,
-        }
-
-        let Some(unsigned) = &self.unsigned else {
-            return false;
-        };
-
-        let Ok(unsigned) = ExtractRedactedBecause::deserialize(&**unsigned) else {
-            return false;
-        };
-
-        unsigned.redacted_because.is_some()
-    }
-
    pub fn remove_transaction_id(&mut self) -> crate::Result<()> {
        if let Some(unsigned) = &self.unsigned {
            let mut unsigned: BTreeMap<String, Box<RawJsonValue>> =
@ -444,7 +426,7 @@ pub(crate) fn gen_event_id_canonical_json(
        "${}",
        // Anything higher than version3 behaves the same
        ruma::signatures::reference_hash(&value, room_version_id)
-            .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid PDU format"))?
+            .expect("ruma can calculate reference hashes")
    )
    .try_into()
    .expect("ruma's reference hashes are valid event ids");
@ -461,8 +443,4 @@ pub struct PduBuilder {
    pub unsigned: Option<BTreeMap<String, serde_json::Value>>,
    pub state_key: Option<String>,
    pub redacts: Option<Arc<EventId>>,
-    /// For timestamped messaging, should only be used for appservices
-    ///
-    /// Will be set to current time if None
-    pub timestamp: Option<MilliSecondsSinceUnixEpoch>,
 }
--- a/src/service/rooms/alias/data.rs
+++ b/src/service/rooms/alias/data.rs
@ -1,12 +1,9 @@
 use crate::Result;
-use ruma::{OwnedRoomAliasId, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId, UserId};
+use ruma::{OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId};

 pub trait Data: Send + Sync {
    /// Creates or updates the alias to the given room id.
-    fn set_alias(&self, alias: &RoomAliasId, room_id: &RoomId, user_id: &UserId) -> Result<()>;
-
-    /// Finds the user who assigned the given alias to a room
-    fn who_created_alias(&self, alias: &RoomAliasId) -> Result<Option<OwnedUserId>>;
+    fn set_alias(&self, alias: &RoomAliasId, room_id: &RoomId) -> Result<()>;

    /// Forgets about an alias. Returns an error if the alias did not exist.
    fn remove_alias(&self, alias: &RoomAliasId) -> Result<()>;
--- a/src/service/rooms/alias/mod.rs
+++ b/src/service/rooms/alias/mod.rs
@ -1,17 +1,9 @@
 mod data;

 pub use data::Data;
-use tracing::error;

-use crate::{services, Error, Result};
-use ruma::{
-    api::client::error::ErrorKind,
-    events::{
-        room::power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent},
-        StateEventType,
-    },
-    OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId, UserId,
-};
+use crate::Result;
+use ruma::{OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId};

 pub struct Service {
    pub db: &'static dyn Data,
@ -19,71 +11,13 @@ pub struct Service {

 impl Service {
    #[tracing::instrument(skip(self))]
-    pub fn set_alias(&self, alias: &RoomAliasId, room_id: &RoomId, user_id: &UserId) -> Result<()> {
-        if alias == services().globals.admin_alias() && user_id != services().globals.server_user()
-        {
-            Err(Error::BadRequest(
-                ErrorKind::forbidden(),
-                "Only the server user can set this alias",
-            ))
-        } else {
-            self.db.set_alias(alias, room_id, user_id)
-        }
+    pub fn set_alias(&self, alias: &RoomAliasId, room_id: &RoomId) -> Result<()> {
+        self.db.set_alias(alias, room_id)
    }

    #[tracing::instrument(skip(self))]
-    fn user_can_remove_alias(&self, alias: &RoomAliasId, user_id: &UserId) -> Result<bool> {
-        let Some(room_id) = self.resolve_local_alias(alias)? else {
-            return Err(Error::BadRequest(ErrorKind::NotFound, "Alias not found."));
-        };
-
-        // The creator of an alias can remove it
-        if self
-            .db
-            .who_created_alias(alias)?
-            .map(|user| user == user_id)
-            .unwrap_or_default()
-            // Server admins can remove any local alias
-            || services().admin.user_is_admin(user_id)?
-            // Always allow the Conduit user to remove the alias, since there may not be an admin room
-            || services().globals.server_user ()== user_id
-        {
-            Ok(true)
-            // Checking whether the user is able to change canonical aliases of the room
-        } else if let Some(event) = services().rooms.state_accessor.room_state_get(
-            &room_id,
-            &StateEventType::RoomPowerLevels,
-            "",
-        )? {
-            serde_json::from_str(event.content.get())
-                .map_err(|_| Error::bad_database("Invalid event content for m.room.power_levels"))
-                .map(|content: RoomPowerLevelsEventContent| {
-                    RoomPowerLevels::from(content)
-                        .user_can_send_state(user_id, StateEventType::RoomCanonicalAlias)
-                })
-        // If there is no power levels event, only the room creator can change canonical aliases
-        } else if let Some(event) = services().rooms.state_accessor.room_state_get(
-            &room_id,
-            &StateEventType::RoomCreate,
-            "",
-        )? {
-            Ok(event.sender == user_id)
-        } else {
-            error!("Room {} has no m.room.create event (VERY BAD)!", room_id);
-            Err(Error::bad_database("Room has no m.room.create event"))
-        }
-    }
-
-    #[tracing::instrument(skip(self))]
-    pub fn remove_alias(&self, alias: &RoomAliasId, user_id: &UserId) -> Result<()> {
-        if self.user_can_remove_alias(alias, user_id)? {
-            self.db.remove_alias(alias)
-        } else {
-            Err(Error::BadRequest(
-                ErrorKind::forbidden(),
-                "User is not permitted to remove this alias.",
-            ))
-        }
+    pub fn remove_alias(&self, alias: &RoomAliasId) -> Result<()> {
+        self.db.remove_alias(alias)
    }

    #[tracing::instrument(skip(self))]
--- a/src/service/rooms/auth_chain/mod.rs
+++ b/src/service/rooms/auth_chain/mod.rs
@ -133,10 +133,7 @@ impl Service {
            match services().rooms.timeline.get_pdu(&event_id) {
                Ok(Some(pdu)) => {
                    if pdu.room_id != room_id {
-                        return Err(Error::BadRequest(
-                            ErrorKind::forbidden(),
-                            "Evil event in db",
-                        ));
+                        return Err(Error::BadRequest(ErrorKind::Forbidden, "Evil event in db"));
                    }
                    for auth_event in &pdu.auth_events {
                        let sauthevent = services()
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@ -9,7 +9,6 @@ use std::{
 };

 use futures_util::{stream::FuturesUnordered, Future, StreamExt};
-use globals::SigningKeys;
 use ruma::{
    api::{
        client::error::ErrorKind,
@ -31,6 +30,7 @@ use ruma::{
        StateEventType, TimelineEventType,
    },
    int,
+    serde::Base64,
    state_res::{self, RoomVersion, StateMap},
    uint, CanonicalJsonObject, CanonicalJsonValue, EventId, MilliSecondsSinceUnixEpoch,
    OwnedServerName, OwnedServerSigningKeyId, RoomId, RoomVersionId, ServerName,
@ -78,7 +78,7 @@ impl Service {
        room_id: &'a RoomId,
        value: BTreeMap<String, CanonicalJsonValue>,
        is_timeline_event: bool,
-        pub_key_map: &'a RwLock<BTreeMap<String, SigningKeys>>,
+        pub_key_map: &'a RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
    ) -> Result<Option<Vec<u8>>> {
        // 0. Check the server is in the room
        if !services().rooms.metadata.exists(room_id)? {
@ -90,7 +90,7 @@ impl Service {

        if services().rooms.metadata.is_disabled(room_id)? {
            return Err(Error::BadRequest(
-                ErrorKind::forbidden(),
+                ErrorKind::Forbidden,
                "Federation of this room is currently disabled on this server.",
            ));
        }
@ -162,7 +162,7 @@ impl Service {
            // Check for disabled again because it might have changed
            if services().rooms.metadata.is_disabled(room_id)? {
                return Err(Error::BadRequest(
-                    ErrorKind::forbidden(),
+                    ErrorKind::Forbidden,
                    "Federation of this room is currently disabled on this server.",
                ));
            }
@ -304,12 +304,19 @@ impl Service {
        room_id: &'a RoomId,
        mut value: BTreeMap<String, CanonicalJsonValue>,
        auth_events_known: bool,
-        pub_key_map: &'a RwLock<BTreeMap<String, SigningKeys>>,
+        pub_key_map: &'a RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
    ) -> AsyncRecursiveType<'a, Result<(Arc<PduEvent>, BTreeMap<String, CanonicalJsonValue>)>> {
        Box::pin(async move {
            // 1.1. Remove unsigned field
            value.remove("unsigned");

+            // TODO: For RoomVersion6 we must check that Raw<..> is canonical do we anywhere?: https://matrix.org/docs/spec/rooms/v6#canonical-json
+
+            // We go through all the signatures we see on the value and fetch the corresponding signing
+            // keys
+            self.fetch_required_signing_keys(&value, pub_key_map)
+                .await?;
+
            // 2. Check signatures, otherwise drop
            // 3. check content hash, redact if doesn't match
            let create_event_content: RoomCreateEventContent =
@ -322,80 +329,41 @@ impl Service {
            let room_version =
                RoomVersion::new(room_version_id).expect("room version is supported");

-            // TODO: For RoomVersion6 we must check that Raw<..> is canonical do we anywhere?: https://matrix.org/docs/spec/rooms/v6#canonical-json
-
-            // We go through all the signatures we see on the value and fetch the corresponding signing
-            // keys
-            self.fetch_required_signing_keys(&value, pub_key_map)
-                .await?;
-
-            let origin_server_ts = value.get("origin_server_ts").ok_or_else(|| {
-                error!("Invalid PDU, no origin_server_ts field");
-                Error::BadRequest(
-                    ErrorKind::MissingParam,
-                    "Invalid PDU, no origin_server_ts field",
-                )
-            })?;
-
-            let origin_server_ts: MilliSecondsSinceUnixEpoch = {
-                let ts = origin_server_ts.as_integer().ok_or_else(|| {
-                    Error::BadRequest(
-                        ErrorKind::InvalidParam,
-                        "origin_server_ts must be an integer",
-                    )
-                })?;
-
-                MilliSecondsSinceUnixEpoch(i64::from(ts).try_into().map_err(|_| {
-                    Error::BadRequest(ErrorKind::InvalidParam, "Time must be after the unix epoch")
-                })?)
-            };
-
            let guard = pub_key_map.read().await;
-
-            let pkey_map = (*guard).clone();
-
-            // Removing all the expired keys, unless the room version allows stale keys
-            let filtered_keys = services().globals.filter_keys_server_map(
-                pkey_map,
-                origin_server_ts,
-                room_version_id,
-            );
-
-            let mut val =
-                match ruma::signatures::verify_event(&filtered_keys, &value, room_version_id) {
-                    Err(e) => {
-                        // Drop
-                        warn!("Dropping bad event {}: {}", event_id, e,);
-                        return Err(Error::BadRequest(
-                            ErrorKind::InvalidParam,
-                            "Signature verification failed",
-                        ));
-                    }
-                    Ok(ruma::signatures::Verified::Signatures) => {
-                        // Redact
-                        warn!("Calculated hash does not match: {}", event_id);
-                        let obj = match ruma::canonical_json::redact(value, room_version_id, None) {
-                            Ok(obj) => obj,
-                            Err(_) => {
-                                return Err(Error::BadRequest(
-                                    ErrorKind::InvalidParam,
-                                    "Redaction failed",
-                                ))
-                            }
-                        };
-
-                        // Skip the PDU if it is redacted and we already have it as an outlier event
-                        if services().rooms.timeline.get_pdu_json(event_id)?.is_some() {
+            let mut val = match ruma::signatures::verify_event(&guard, &value, room_version_id) {
+                Err(e) => {
+                    // Drop
+                    warn!("Dropping bad event {}: {}", event_id, e,);
+                    return Err(Error::BadRequest(
+                        ErrorKind::InvalidParam,
+                        "Signature verification failed",
+                    ));
+                }
+                Ok(ruma::signatures::Verified::Signatures) => {
+                    // Redact
+                    warn!("Calculated hash does not match: {}", event_id);
+                    let obj = match ruma::canonical_json::redact(value, room_version_id, None) {
+                        Ok(obj) => obj,
+                        Err(_) => {
                            return Err(Error::BadRequest(
                                ErrorKind::InvalidParam,
-                                "Event was redacted and we already knew about it",
-                            ));
+                                "Redaction failed",
+                            ))
                        }
+                    };

-                        obj
+                    // Skip the PDU if it is redacted and we already have it as an outlier event
+                    if services().rooms.timeline.get_pdu_json(event_id)?.is_some() {
+                        return Err(Error::BadRequest(
+                            ErrorKind::InvalidParam,
+                            "Event was redacted and we already knew about it",
+                        ));
                    }
-                    Ok(ruma::signatures::Verified::All) => value,
-                };
+
+                    obj
+                }
+                Ok(ruma::signatures::Verified::All) => value,
+            };

            drop(guard);

@ -519,7 +487,7 @@ impl Service {
        create_event: &PduEvent,
        origin: &ServerName,
        room_id: &RoomId,
-        pub_key_map: &RwLock<BTreeMap<String, SigningKeys>>,
+        pub_key_map: &RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
    ) -> Result<Option<Vec<u8>>> {
        // Skip the PDU if we already have it as a timeline event
        if let Ok(Some(pduid)) = services().rooms.timeline.get_pdu_id(&incoming_pdu.event_id) {
@ -1129,7 +1097,7 @@ impl Service {
        create_event: &'a PduEvent,
        room_id: &'a RoomId,
        room_version_id: &'a RoomVersionId,
-        pub_key_map: &'a RwLock<BTreeMap<String, SigningKeys>>,
+        pub_key_map: &'a RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
    ) -> AsyncRecursiveType<'a, Vec<(Arc<PduEvent>, Option<BTreeMap<String, CanonicalJsonValue>>)>>
    {
        Box::pin(async move {
@ -1312,7 +1280,7 @@ impl Service {
        create_event: &PduEvent,
        room_id: &RoomId,
        room_version_id: &RoomVersionId,
-        pub_key_map: &RwLock<BTreeMap<String, SigningKeys>>,
+        pub_key_map: &RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
        initial_set: Vec<Arc<EventId>>,
    ) -> Result<(
        Vec<Arc<EventId>>,
@ -1410,7 +1378,7 @@ impl Service {
    pub(crate) async fn fetch_required_signing_keys(
        &self,
        event: &BTreeMap<String, CanonicalJsonValue>,
-        pub_key_map: &RwLock<BTreeMap<String, SigningKeys>>,
+        pub_key_map: &RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
    ) -> Result<()> {
        let signatures = event
            .get("signatures")
@ -1439,7 +1407,6 @@ impl Service {
                        )
                    })?,
                    signature_ids,
-                    true,
                )
                .await;

@ -1467,7 +1434,7 @@ impl Service {
        pdu: &RawJsonValue,
        servers: &mut BTreeMap<OwnedServerName, BTreeMap<OwnedServerSigningKeyId, QueryCriteria>>,
        room_version: &RoomVersionId,
-        pub_key_map: &mut RwLockWriteGuard<'_, BTreeMap<String, SigningKeys>>,
+        pub_key_map: &mut RwLockWriteGuard<'_, BTreeMap<String, BTreeMap<String, Base64>>>,
    ) -> Result<()> {
        let value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|e| {
            error!("Invalid PDU in server response: {:?}: {:?}", pdu, e);
@ -1477,7 +1444,7 @@ impl Service {
        let event_id = format!(
            "${}",
            ruma::signatures::reference_hash(&value, room_version)
-                .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid PDU format"))?
+                .expect("ruma can calculate reference hashes")
        );
        let event_id = <&EventId>::try_from(event_id.as_str())
            .expect("ruma's reference hashes are valid event ids");
@ -1518,18 +1485,8 @@ impl Service {

            let signature_ids = signature_object.keys().cloned().collect::<Vec<_>>();

-            let contains_all_ids = |keys: &SigningKeys| {
-                signature_ids.iter().all(|id| {
-                    keys.verify_keys
-                        .keys()
-                        .map(ToString::to_string)
-                        .any(|key_id| id == &key_id)
-                        || keys
-                            .old_verify_keys
-                            .keys()
-                            .map(ToString::to_string)
-                            .any(|key_id| id == &key_id)
-                })
+            let contains_all_ids = |keys: &BTreeMap<String, Base64>| {
+                signature_ids.iter().all(|id| keys.contains_key(id))
            };

            let origin = <&ServerName>::try_from(signature_server.as_str()).map_err(|_| {
@ -1542,14 +1499,19 @@ impl Service {

            trace!("Loading signing keys for {}", origin);

-            if let Some(result) = services().globals.signing_keys_for(origin)? {
-                if !contains_all_ids(&result) {
-                    trace!("Signing key not loaded for {}", origin);
-                    servers.insert(origin.to_owned(), BTreeMap::new());
-                }
+            let result: BTreeMap<_, _> = services()
+                .globals
+                .signing_keys_for(origin)?
+                .into_iter()
+                .map(|(k, v)| (k.to_string(), v.key))
+                .collect();

-                pub_key_map.insert(origin.to_string(), result);
+            if !contains_all_ids(&result) {
+                trace!("Signing key not loaded for {}", origin);
+                servers.insert(origin.to_owned(), BTreeMap::new());
            }
+
+            pub_key_map.insert(origin.to_string(), result);
        }

        Ok(())
@ -1559,7 +1521,7 @@ impl Service {
        &self,
        event: &create_join_event::v2::Response,
        room_version: &RoomVersionId,
-        pub_key_map: &RwLock<BTreeMap<String, SigningKeys>>,
+        pub_key_map: &RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
    ) -> Result<()> {
        let mut servers: BTreeMap<
            OwnedServerName,
@ -1622,7 +1584,10 @@ impl Service {

                    let result = services()
                        .globals
-                        .add_signing_key_from_trusted_server(&k.server_name, k.clone())?;
+                        .add_signing_key(&k.server_name, k.clone())?
+                        .into_iter()
+                        .map(|(k, v)| (k.to_string(), v.key))
+                        .collect::<BTreeMap<_, _>>();

                    pkm.insert(k.server_name.to_string(), result);
                }
@ -1653,9 +1618,12 @@ impl Service {
            if let (Ok(get_keys_response), origin) = result {
                info!("Result is from {origin}");
                if let Ok(key) = get_keys_response.server_key.deserialize() {
-                    let result = services()
+                    let result: BTreeMap<_, _> = services()
                        .globals
-                        .add_signing_key_from_origin(&origin, key)?;
+                        .add_signing_key(&origin, key)?
+                        .into_iter()
+                        .map(|(k, v)| (k.to_string(), v.key))
+                        .collect();
                    pub_key_map.write().await.insert(origin.to_string(), result);
                }
            }
@ -1687,6 +1655,11 @@ impl Service {
                }
            };

+        if acl_event_content.allow.is_empty() {
+            // Ignore broken acl events
+            return Ok(());
+        }
+
        if acl_event_content.is_allowed(server_name) {
            Ok(())
        } else {
@ -1695,7 +1668,7 @@ impl Service {
                server_name, room_id
            );
            Err(Error::BadRequest(
-                ErrorKind::forbidden(),
+                ErrorKind::Forbidden,
                "Server was denied by room ACL",
            ))
        }
@ -1708,23 +1681,9 @@ impl Service {
        &self,
        origin: &ServerName,
        signature_ids: Vec<String>,
-        // Whether to ask for keys from trusted servers. Should be false when getting
-        // keys for validating requests, as per MSC4029
-        query_via_trusted_servers: bool,
-    ) -> Result<SigningKeys> {
-        let contains_all_ids = |keys: &SigningKeys| {
-            signature_ids.iter().all(|id| {
-                keys.verify_keys
-                    .keys()
-                    .map(ToString::to_string)
-                    .any(|key_id| id == &key_id)
-                    || keys
-                        .old_verify_keys
-                        .keys()
-                        .map(ToString::to_string)
-                        .any(|key_id| id == &key_id)
-            })
-        };
+    ) -> Result<BTreeMap<String, Base64>> {
+        let contains_all_ids =
+            |keys: &BTreeMap<String, Base64>| signature_ids.iter().all(|id| keys.contains_key(id));

        let permit = services()
            .globals
@ -1785,172 +1744,94 @@ impl Service {

        trace!("Loading signing keys for {}", origin);

-        let result = services().globals.signing_keys_for(origin)?;
+        let mut result: BTreeMap<_, _> = services()
+            .globals
+            .signing_keys_for(origin)?
+            .into_iter()
+            .map(|(k, v)| (k.to_string(), v.key))
+            .collect();

-        let mut expires_soon_or_has_expired = false;
-
-        if let Some(result) = result.clone() {
-            let ts_threshold = MilliSecondsSinceUnixEpoch::from_system_time(
-                SystemTime::now() + Duration::from_secs(30 * 60),
-            )
-            .expect("Should be valid until year 500,000,000");
-
-            debug!(
-                "The treshhold is {:?}, found time is {:?} for server {}",
-                ts_threshold, result.valid_until_ts, origin
-            );
-
-            if contains_all_ids(&result) {
-                // We want to ensure that the keys remain valid by the time the other functions that handle signatures reach them
-                if result.valid_until_ts > ts_threshold {
-                    debug!(
-                        "Keys for {} are deemed as valid, as they expire at {:?}",
-                        &origin, &result.valid_until_ts
-                    );
-                    return Ok(result);
-                }
-
-                expires_soon_or_has_expired = true;
-            }
+        if contains_all_ids(&result) {
+            return Ok(result);
        }

-        let mut keys = result.unwrap_or_else(|| SigningKeys {
-            verify_keys: BTreeMap::new(),
-            old_verify_keys: BTreeMap::new(),
-            valid_until_ts: MilliSecondsSinceUnixEpoch::now(),
-        });
-
-        // We want to set this to the max, and then lower it whenever we see older keys
-        keys.valid_until_ts = MilliSecondsSinceUnixEpoch::from_system_time(
-            SystemTime::now() + Duration::from_secs(7 * 86400),
-        )
-        .expect("Should be valid until year 500,000,000");
-
        debug!("Fetching signing keys for {} over federation", origin);

-        if let Some(mut server_key) = services()
+        if let Some(server_key) = services()
            .sending
            .send_federation_request(origin, get_server_keys::v2::Request::new())
            .await
            .ok()
            .and_then(|resp| resp.server_key.deserialize().ok())
        {
-            // Keys should only be valid for a maximum of seven days
-            server_key.valid_until_ts = server_key.valid_until_ts.min(
-                MilliSecondsSinceUnixEpoch::from_system_time(
-                    SystemTime::now() + Duration::from_secs(7 * 86400),
-                )
-                .expect("Should be valid until year 500,000,000"),
-            );
-
            services()
                .globals
-                .add_signing_key_from_origin(origin, server_key.clone())?;
+                .add_signing_key(origin, server_key.clone())?;

-            if keys.valid_until_ts > server_key.valid_until_ts {
-                keys.valid_until_ts = server_key.valid_until_ts;
-            }
-
-            keys.verify_keys.extend(
+            result.extend(
                server_key
                    .verify_keys
                    .into_iter()
-                    .map(|(id, key)| (id.to_string(), key)),
+                    .map(|(k, v)| (k.to_string(), v.key)),
            );
-            keys.old_verify_keys.extend(
+            result.extend(
                server_key
                    .old_verify_keys
                    .into_iter()
-                    .map(|(id, key)| (id.to_string(), key)),
+                    .map(|(k, v)| (k.to_string(), v.key)),
            );

-            if contains_all_ids(&keys) {
-                return Ok(keys);
+            if contains_all_ids(&result) {
+                return Ok(result);
            }
        }

-        if query_via_trusted_servers {
-            for server in services().globals.trusted_servers() {
-                debug!("Asking {} for {}'s signing key", server, origin);
-                if let Some(server_keys) = services()
-                    .sending
-                    .send_federation_request(
-                        server,
-                        get_remote_server_keys::v2::Request::new(
-                            origin.to_owned(),
-                            MilliSecondsSinceUnixEpoch::from_system_time(
-                                SystemTime::now()
-                                    .checked_add(Duration::from_secs(3600))
-                                    .expect("SystemTime to large"),
-                            )
-                            .expect("time is valid"),
-                        ),
-                    )
-                    .await
-                    .ok()
-                    .map(|resp| {
-                        resp.server_keys
+        for server in services().globals.trusted_servers() {
+            debug!("Asking {} for {}'s signing key", server, origin);
+            if let Some(server_keys) = services()
+                .sending
+                .send_federation_request(
+                    server,
+                    get_remote_server_keys::v2::Request::new(
+                        origin.to_owned(),
+                        MilliSecondsSinceUnixEpoch::from_system_time(
+                            SystemTime::now()
+                                .checked_add(Duration::from_secs(3600))
+                                .expect("SystemTime to large"),
+                        )
+                        .expect("time is valid"),
+                    ),
+                )
+                .await
+                .ok()
+                .map(|resp| {
+                    resp.server_keys
+                        .into_iter()
+                        .filter_map(|e| e.deserialize().ok())
+                        .collect::<Vec<_>>()
+                })
+            {
+                trace!("Got signing keys: {:?}", server_keys);
+                for k in server_keys {
+                    services().globals.add_signing_key(origin, k.clone())?;
+                    result.extend(
+                        k.verify_keys
                            .into_iter()
-                            .filter_map(|e| e.deserialize().ok())
-                            .collect::<Vec<_>>()
-                    })
-                {
-                    trace!("Got signing keys: {:?}", server_keys);
-                    for mut k in server_keys {
-                        if k.valid_until_ts
-                        // Half an hour should give plenty of time for the server to respond with keys that are still
-                        // valid, given we requested keys which are valid at least an hour from now
-                            < MilliSecondsSinceUnixEpoch::from_system_time(
-                                SystemTime::now() + Duration::from_secs(30 * 60),
-                            )
-                            .expect("Should be valid until year 500,000,000")
-                        {
-                            // Keys should only be valid for a maximum of seven days
-                            k.valid_until_ts = k.valid_until_ts.min(
-                                MilliSecondsSinceUnixEpoch::from_system_time(
-                                    SystemTime::now() + Duration::from_secs(7 * 86400),
-                                )
-                                .expect("Should be valid until year 500,000,000"),
-                            );
+                            .map(|(k, v)| (k.to_string(), v.key)),
+                    );
+                    result.extend(
+                        k.old_verify_keys
+                            .into_iter()
+                            .map(|(k, v)| (k.to_string(), v.key)),
+                    );
+                }

-                            if keys.valid_until_ts > k.valid_until_ts {
-                                keys.valid_until_ts = k.valid_until_ts;
-                            }
-
-                            services()
-                                .globals
-                                .add_signing_key_from_trusted_server(origin, k.clone())?;
-                            keys.verify_keys.extend(
-                                k.verify_keys
-                                    .into_iter()
-                                    .map(|(id, key)| (id.to_string(), key)),
-                            );
-                            keys.old_verify_keys.extend(
-                                k.old_verify_keys
-                                    .into_iter()
-                                    .map(|(id, key)| (id.to_string(), key)),
-                            );
-                        } else {
-                            warn!(
-                                "Server {} gave us keys older than we requested, valid until: {:?}",
-                                origin, k.valid_until_ts
-                            );
-                        }
-
-                        if contains_all_ids(&keys) {
-                            return Ok(keys);
-                        }
-                    }
+                if contains_all_ids(&result) {
+                    return Ok(result);
                }
            }
        }

-        // We should return these keys if fresher keys were not found
-        if expires_soon_or_has_expired {
-            info!("Returning stale keys for {}", origin);
-            return Ok(keys);
-        }
-
        drop(permit);

        back_off(signature_ids).await;
--- a/src/service/rooms/search/data.rs
+++ b/src/service/rooms/search/data.rs
@ -4,8 +4,6 @@ use ruma::RoomId;
 pub trait Data: Send + Sync {
    fn index_pdu(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()>;

-    fn deindex_pdu(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()>;
-
    #[allow(clippy::type_complexity)]
    fn search_pdus<'a>(
        &'a self,
--- a/src/service/rooms/search/mod.rs
+++ b/src/service/rooms/search/mod.rs
@ -15,16 +15,6 @@ impl Service {
        self.db.index_pdu(shortroomid, pdu_id, message_body)
    }

-    #[tracing::instrument(skip(self))]
-    pub fn deindex_pdu<'a>(
-        &self,
-        shortroomid: u64,
-        pdu_id: &[u8],
-        message_body: &str,
-    ) -> Result<()> {
-        self.db.deindex_pdu(shortroomid, pdu_id, message_body)
-    }
-
    #[tracing::instrument(skip(self))]
    pub fn search_pdus<'a>(
        &'a self,
--- a/src/service/rooms/spaces/mod.rs
+++ b/src/service/rooms/spaces/mod.rs
@ -408,7 +408,7 @@ impl Service {
                    debug!("User is not allowed to see room {room_id}");
                    // This error will be caught later
                    return Err(Error::BadRequest(
-                        ErrorKind::forbidden(),
+                        ErrorKind::Forbidden,
                        "User is not allowed to see the room",
                    ));
                }
--- a/src/service/rooms/state_accessor/mod.rs
+++ b/src/service/rooms/state_accessor/mod.rs
@ -321,7 +321,6 @@ impl Service {
            unsigned: None,
            state_key: Some(target_user.into()),
            redacts: None,
-            timestamp: None,
        };

        Ok(services()
--- a/src/service/rooms/timeline/mod.rs
+++ b/src/service/rooms/timeline/mod.rs
@ -21,9 +21,10 @@ use ruma::{
        GlobalAccountDataEventType, StateEventType, TimelineEventType,
    },
    push::{Action, Ruleset, Tweak},
+    serde::Base64,
    state_res::{self, Event, RoomVersion},
-    uint, user_id, CanonicalJsonObject, CanonicalJsonValue, EventId, MilliSecondsSinceUnixEpoch,
-    OwnedEventId, OwnedRoomId, OwnedServerName, RoomId, RoomVersionId, ServerName, UserId,
+    uint, user_id, CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId,
+    OwnedServerName, RoomId, RoomVersionId, ServerName, UserId,
 };
 use serde::Deserialize;
 use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
@ -32,10 +33,7 @@ use tracing::{error, info, warn};

 use crate::{
    api::server_server,
-    service::{
-        globals::SigningKeys,
-        pdu::{EventHash, PduBuilder},
-    },
+    service::pdu::{EventHash, PduBuilder},
    services, utils, Error, PduEvent, Result,
 };

@ -401,7 +399,7 @@ impl Service {
                                &pdu.room_id,
                                false,
                            )? {
-                                self.redact_pdu(redact_id, pdu, shortroomid)?;
+                                self.redact_pdu(redact_id, pdu)?;
                            }
                        }
                    }
@ -418,7 +416,7 @@ impl Service {
                                &pdu.room_id,
                                false,
                            )? {
-                                self.redact_pdu(redact_id, pdu, shortroomid)?;
+                                self.redact_pdu(redact_id, pdu)?;
                            }
                        }
                    }
@ -498,14 +496,7 @@ impl Service {
                        && services().globals.emergency_password().is_none();

                    if let Some(admin_room) = services().admin.get_admin_room()? {
-                        if to_conduit
-                            && !from_conduit
-                            && admin_room == pdu.room_id
-                            && services()
-                                .rooms
-                                .state_cache
-                                .is_joined(server_user, &admin_room)?
-                        {
+                        if to_conduit && !from_conduit && admin_room == pdu.room_id {
                            services().admin.process_message(body);
                        }
                    }
@ -665,7 +656,6 @@ impl Service {
            unsigned,
            state_key,
            redacts,
-            timestamp,
        } = pdu_builder;

        let prev_events: Vec<_> = services()
@ -735,9 +725,9 @@ impl Service {
            event_id: ruma::event_id!("$thiswillbefilledinlater").into(),
            room_id: room_id.to_owned(),
            sender: sender.to_owned(),
-            origin_server_ts: timestamp
-                .map(|ts| ts.get())
-                .unwrap_or_else(|| MilliSecondsSinceUnixEpoch::now().get()),
+            origin_server_ts: utils::millis_since_unix_epoch()
+                .try_into()
+                .expect("time is valid"),
            kind: event_type,
            content,
            state_key,
@ -772,7 +762,7 @@ impl Service {

        if !auth_check {
            return Err(Error::BadRequest(
-                ErrorKind::forbidden(),
+                ErrorKind::Forbidden,
                "Event is not authorized.",
            ));
        }
@ -815,7 +805,7 @@ impl Service {
        pdu.event_id = EventId::parse_arc(format!(
            "${}",
            ruma::signatures::reference_hash(&pdu_json, &room_version_id)
-                .expect("Event format validated when event was hashed")
+                .expect("ruma can calculate reference hashes")
        ))
        .expect("ruma's reference hashes are valid event ids");

@ -852,7 +842,7 @@ impl Service {
                    TimelineEventType::RoomEncryption => {
                        warn!("Encryption is not allowed in the admins room");
                        return Err(Error::BadRequest(
-                            ErrorKind::forbidden(),
+                            ErrorKind::Forbidden,
                            "Encryption is not allowed in the admins room.",
                        ));
                    }
@ -875,7 +865,7 @@ impl Service {
                            if target == server_user {
                                warn!("Conduit user cannot leave from admins room");
                                return Err(Error::BadRequest(
-                                    ErrorKind::forbidden(),
+                                    ErrorKind::Forbidden,
                                    "Conduit user cannot leave from admins room.",
                                ));
                            }
@ -891,7 +881,7 @@ impl Service {
                            if count < 2 {
                                warn!("Last admin cannot leave from admins room");
                                return Err(Error::BadRequest(
-                                    ErrorKind::forbidden(),
+                                    ErrorKind::Forbidden,
                                    "Last admin cannot leave from admins room.",
                                ));
                            }
@ -901,7 +891,7 @@ impl Service {
                            if target == server_user {
                                warn!("Conduit user cannot be banned in admins room");
                                return Err(Error::BadRequest(
-                                    ErrorKind::forbidden(),
+                                    ErrorKind::Forbidden,
                                    "Conduit user cannot be banned in admins room.",
                                ));
                            }
@ -917,7 +907,7 @@ impl Service {
                            if count < 2 {
                                warn!("Last admin cannot be banned in admins room");
                                return Err(Error::BadRequest(
-                                    ErrorKind::forbidden(),
+                                    ErrorKind::Forbidden,
                                    "Last admin cannot be banned in admins room.",
                                ));
                            }
@ -949,7 +939,7 @@ impl Service {
                            false,
                        )? {
                            return Err(Error::BadRequest(
-                                ErrorKind::forbidden(),
+                                ErrorKind::Forbidden,
                                "User cannot redact this event.",
                            ));
                        }
@ -970,7 +960,7 @@ impl Service {
                            false,
                        )? {
                            return Err(Error::BadRequest(
-                                ErrorKind::forbidden(),
+                                ErrorKind::Forbidden,
                                "User cannot redact this event.",
                            ));
                        }
@ -1110,33 +1100,14 @@ impl Service {

    /// Replace a PDU with the redacted form.
    #[tracing::instrument(skip(self, reason))]
-    pub fn redact_pdu(
-        &self,
-        event_id: &EventId,
-        reason: &PduEvent,
-        shortroomid: u64,
-    ) -> Result<()> {
+    pub fn redact_pdu(&self, event_id: &EventId, reason: &PduEvent) -> Result<()> {
        // TODO: Don't reserialize, keep original json
        if let Some(pdu_id) = self.get_pdu_id(event_id)? {
            let mut pdu = self
                .get_pdu_from_id(&pdu_id)?
                .ok_or_else(|| Error::bad_database("PDU ID points to invalid PDU."))?;
-
-            #[derive(Deserialize)]
-            struct ExtractBody {
-                body: String,
-            }
-
-            if let Ok(content) = serde_json::from_str::<ExtractBody>(pdu.content.get()) {
-                services()
-                    .rooms
-                    .search
-                    .deindex_pdu(shortroomid, &pdu_id, &content.body)?;
-            }
-
            let room_version_id = services().rooms.state.get_room_version(&pdu.room_id)?;
            pdu.redact(room_version_id, reason)?;
-
            self.replace_pdu(
                &pdu_id,
                &utils::to_canonical_object(&pdu).expect("PDU is an object"),
@ -1217,7 +1188,7 @@ impl Service {
        &self,
        origin: &ServerName,
        pdu: Box<RawJsonValue>,
-        pub_key_map: &RwLock<BTreeMap<String, SigningKeys>>,
+        pub_key_map: &RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
    ) -> Result<()> {
        let (event_id, value, room_id) = server_server::parse_incoming_pdu(&pdu)?;

--- a/src/service/uiaa/mod.rs
+++ b/src/service/uiaa/mod.rs
@ -86,7 +86,7 @@ impl Service {

                    if !hash_matches {
                        uiaainfo.auth_error = Some(ruma::api::client::error::StandardErrorBody {
-                            kind: ErrorKind::forbidden(),
+                            kind: ErrorKind::Forbidden,
                            message: "Invalid username or password.".to_owned(),
                        });
                        return Ok((false, uiaainfo));
@ -101,7 +101,7 @@ impl Service {
                    uiaainfo.completed.push(AuthType::RegistrationToken);
                } else {
                    uiaainfo.auth_error = Some(ruma::api::client::error::StandardErrorBody {
-                        kind: ErrorKind::forbidden(),
+                        kind: ErrorKind::Forbidden,
                        message: "Invalid registration token.".to_owned(),
                    });
                    return Ok((false, uiaainfo));
--- a/src/service/users/mod.rs
+++ b/src/service/users/mod.rs
@ -9,6 +9,7 @@ pub use data::Data;
 use ruma::{
    api::client::{
        device::Device,
+        error::ErrorKind,
        filter::FilterDefinition,
        sync::sync_events::{
            self,
@ -19,7 +20,7 @@ use ruma::{
    events::AnyToDeviceEvent,
    serde::Raw,
    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, OwnedDeviceId, OwnedDeviceKeyId, OwnedMxcUri,
-    OwnedRoomId, OwnedUserId, UInt, UserId,
+    OwnedRoomId, OwnedUserId, RoomAliasId, UInt, UserId,
 };

 use crate::{services, Error, Result};
@ -261,14 +262,19 @@ impl Service {

    /// Check if a user is an admin
    pub fn is_admin(&self, user_id: &UserId) -> Result<bool> {
-        if let Some(admin_room_id) = services().admin.get_admin_room()? {
-            services()
-                .rooms
-                .state_cache
-                .is_joined(user_id, &admin_room_id)
-        } else {
-            Ok(false)
-        }
+        let admin_room_alias_id =
+            RoomAliasId::parse(format!("#admins:{}", services().globals.server_name()))
+                .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid alias."))?;
+        let admin_room_id = services()
+            .rooms
+            .alias
+            .resolve_local_alias(&admin_room_alias_id)?
+            .unwrap();
+
+        services()
+            .rooms
+            .state_cache
+            .is_joined(user_id, &admin_room_id)
    }

    /// Create a new user account on this homeserver.
--- a/src/utils/error.rs
+++ b/src/utils/error.rs
@ -128,7 +128,7 @@ impl Error {
                kind.clone(),
                match kind {
                    WrongRoomKeysVersion { .. }
-                    | Forbidden { .. }
+                    | Forbidden
                    | GuestAccessForbidden
                    | ThreepidAuthFailed
                    | ThreepidDenied => StatusCode::FORBIDDEN,