WIP

`try_into_http_request` takes care of this already.

.gitignore

@@ -1,4 +1,64 @@
-/target
+# CMake
-**/*.rs.bk
+cmake-build-*/
 
+# IntelliJ
+.idea/
+out/
+*.iml
+modules.xml
+*.ipr
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# Linux backup files
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# Rust
+/target/
+
+### vscode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows shortcuts
+*.lnk
+
+# Conduit
 Rocket.toml
+conduit.toml
+
+# Etc.
+**/*.rs.bk

.gitlab-ci.yml

@@ -0,0 +1,13 @@
+image: "rust:latest"
+
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+before_script:
+  - apt-get update -yqq
+  - apt-get install -yqq --no-install-recommends build-essential libssl-dev pkg-config
+
+test:cargo:
+  script:
+    - rustc --version && cargo --version  # Print version info for debugging
+    - cargo test --workspace --verbose --locked

.gitlab/issue_templates/Issue Template.md

@@ -0,0 +1,15 @@
+# Headline
+
+### Description
+
+
+
+
+
+
+
+
+
+
+
+/label ~conduit

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "rust-analyzer.procMacro.enable": true
+}

CROSS_COMPILE.md

@@ -1,13 +1,11 @@
 Install docker:
 
+```
 $ sudo apt install docker
 $ sudo usermod -aG docker $USER
-
+$ exec sudo su -l $USER
-Then log out and back in.
-
 $ sudo systemctl start docker
-
 $ cargo install cross
-$ cross build --release --features tls_vendored --target armv7-unknown-linux-musleabihf
+$ cross build --release --target armv7-unknown-linux-musleabihf
-
+```
 The cross-compiled binary is at target/armv7-unknown-linux-musleabihf/release/conduit

Cargo.toml

@@ -4,7 +4,7 @@ description = "A Matrix homeserver written in Rust"
 license = "Apache-2.0"
 authors = ["timokoesters <timo@koesters.xyz>"]
 homepage = "https://conduit.rs"
-repository = "https://git.koesters.xyz/timo/conduit"
+repository = "https://gitlab.com/famedly/conduit"
 readme = "README.md"
 version = "0.1.0"
 edition = "2018"
@@ -14,56 +14,73 @@ edition = "2018"
 [dependencies]
 # Used to handle requests
 # TODO: This can become optional as soon as proper configs are supported
-rocket = { git = "https://github.com/SergioBenitez/Rocket.git", rev = "1f1f44f336e5a172361fc1860461bb03667b1ed2", features = ["tls"] } # Used to handle requests
+rocket = { git = "https://github.com/SergioBenitez/Rocket.git", rev = "801e04bd5369eb39e126c75f6d11e1e9597304d8", features = ["tls"] } # Used to handle requests
 #rocket = { git = "https://github.com/timokoesters/Rocket.git", branch = "empty_parameters", default-features = false, features = ["tls"] }
 
 # Used for matrix spec type definitions and helpers
-ruma = { git = "https://github.com/ruma/ruma", features = ["rand", "client-api", "federation-api", "unstable-pre-spec", "unstable-synapse-quirks", "unstable-exhaustive-types"], rev = "e8882fe8142d7b55ed4c8ccc6150946945f9e237" }
+ruma = { git = "https://github.com/ruma/ruma", rev = "097f20c837fcbaef1d9c18c30d3ec5a24a6e4ec2", features = ["client-reqwest", "compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "unstable-pre-spec", "unstable-exhaustive-types"] }
-# ruma = { git = "https://github.com/DevinR528/ruma", features = ["rand", "client-api", "federation-api", "unstable-exhaustive-types", "unstable-pre-spec", "unstable-synapse-quirks"], branch = "unstable-join" }
+#ruma = { git = "https://github.com/timokoesters/ruma", rev = "220d5b4a76b3b781f7f8297fbe6b14473b04214b", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "unstable-pre-spec", "unstable-exhaustive-types"] }
-# ruma = { path = "../ruma/ruma", features = ["unstable-exhaustive-types", "rand", "client-api", "federation-api", "unstable-pre-spec", "unstable-synapse-quirks"] }
+#ruma = { path = "../ruma/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "unstable-pre-spec", "unstable-exhaustive-types"] }
 
 # Used when doing state resolution
-# state-res = { git = "https://github.com/timokoesters/state-res", branch = "spec-comp", features = ["unstable-pre-spec"] }
+state-res = { git = "https://github.com/ruma/state-res", rev = "bca91bcc17df4d16942ff8b8c3be622b1795e3f0", features = ["unstable-pre-spec"] }
-state-res = { git = "https://github.com/ruma/state-res", branch = "timo-spec-comp", features = ["unstable-pre-spec", "gen-eventid"] }
+#state-res = { path = "../state-res", features = ["unstable-pre-spec"] }
-# state-res = { path = "../../state-res", features = ["unstable-pre-spec", "gen-eventid"] }
 
 # Used for long polling and federation sender, should be the same as rocket::tokio
-tokio = { version = "0.2.23" }
+tokio = "1.2.0"
 # Used for storing data permanently
-sled = { version = "0.34.6", default-features = false }
+sled = { version = "0.34.6", features = ["compression", "no_metrics"] }
+#sled = { git = "https://github.com/spacejam/sled.git", rev = "e4640e0773595229f398438886f19bca6f7326a2", features = ["compression"] }
+
+# Used for the http request / response body type for Ruma endpoints used with reqwest
+bytes = "1.0.1"
 # Used for emitting log entries
-log = "0.4.11"
+log = "0.4.14"
 # Used for rocket<->ruma conversions
-http = "0.2.1"
+http = "0.2.3"
 # Used to find data directory for default db path
 directories = "3.0.1"
-# Used for number types for ruma
-js_int = "0.1.9"
 # Used for ruma wrapper
-serde_json = { version = "1.0.60", features = ["raw_value"] }
+serde_json = { version = "1.0.64", features = ["raw_value"] }
+# Used for appservice registration files
+serde_yaml = "0.8.17"
 # Used for pdu definition
-serde = "1.0.117"
+serde = "1.0.123"
 # Used for secure identifiers
-rand = "0.7.3"
+rand = "0.8.3"
 # Used to hash passwords
 rust-argon2 = "0.8.3"
 # Used to send requests
-reqwest = "0.10.9"
+reqwest = { version = "0.11.3", default-features = false, features = ["rustls-tls-native-roots"] }
+# Custom TLS verifier
+rustls = { version = "0.19", features = ["dangerous_configuration"] }
+rustls-native-certs = "0.5.0"
+webpki = "0.21.0"
 # Used for conduit::Error type
-thiserror = "1.0.22"
+thiserror = "1.0.24"
 # Used to generate thumbnails for images
-image = { version = "0.23.12", default-features = false, features = ["jpeg", "png", "gif"] }
+image = { version = "0.23.14", default-features = false, features = ["jpeg", "png", "gif"] }
 # Used to encode server public key
 base64 = "0.13.0"
 # Used when hashing the state
-ring = "0.16.19"
+ring = "0.16.20"
 # Used when querying the SRV record of other servers
-trust-dns-resolver = "0.19.6"
+trust-dns-resolver = "0.20.0"
+# Used to find matching events for appservices
+regex = "1.4.3"
+# jwt jsonwebtokens
+jsonwebtoken = "7.2.0"
+# Performance measurements
+tracing = "0.1.25"
+opentelemetry = "0.12.0"
+tracing-subscriber = "0.2.16"
+tracing-opentelemetry = "0.11.0"
+opentelemetry-jaeger = "0.11.0"
+pretty_env_logger = "0.4.0"
 
 [features]
 default = ["conduit_bin"]
 conduit_bin = [] # TODO: add rocket to this when it is optional
-tls_vendored = ["reqwest/native-tls-vendored"]
 
 [[bin]]
 name = "conduit"
@@ -73,3 +90,26 @@ required-features = ["conduit_bin"]
 [lib]
 name = "conduit"
 path = "src/lib.rs"
+
+[package.metadata.deb]
+name = "matrix-conduit"
+maintainer = "Paul van Tilburg <paul@luon.net>"
+copyright = "2020, Timo Kösters <timo@koesters.xyz>"
+license-file = ["LICENSE", "3"]
+depends = "$auto, ca-certificates"
+extended-description = """\
+A fast Matrix homeserver that is optimized for smaller, personal servers, \
+instead of a server that has high scalability."""
+section = "net"
+priority = "optional"
+assets = [
+  ["debian/env.local", "etc/matrix-conduit/local", "644"],
+  ["debian/README.Debian", "usr/share/doc/matrix-conduit/", "644"],
+  ["README.md", "usr/share/doc/matrix-conduit/", "644"],
+  ["target/release/conduit", "usr/sbin/matrix-conduit", "755"],
+]
+conf-files = [
+  "/etc/matrix-conduit/local"
+]
+maintainer-scripts = "debian/"
+systemd-units = { unit-name = "matrix-conduit" }

DEPLOY.md

@@ -0,0 +1,209 @@
+# Deploying Conduit
+
+## Getting help
+
+If you run into any problems while setting up Conduit, write an email to `timo@koesters.xyz`, ask us in `#conduit:matrix.org` or [open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new).
+
+## Installing Conduit
+
+You have to download the binary that fits your machine. Run `uname -m` to see
+what you need. Now copy the right url:
+- x84_64: `https://conduit.rs/master/x86_64/conduit-bin`
+- armv7: `https://conduit.rs/master/armv7/conduit-bin`
+- armv8: `https://conduit.rs/master/armv8/conduit-bin`
+- arm: `https://conduit.rs/master/arm/conduit-bin`
+
+```bash
+$ sudo wget -O /usr/local/bin/matrix-conduit <url>
+$ sudo chmod +x /usr/local/bin/matrix-conduit
+```
+
+## Adding a Conduit user
+
+While Conduit can run as any user it is usually better to use dedicated users for different services.
+This also allows you to make sure that the file permissions are correctly set up.
+
+In Debian you can use this command to create a Conduit user:
+
+```
+sudo adduser --system conduit --no-create-home
+```
+
+## Setting up a systemd service
+
+Now we'll set up a systemd service for Conduit, so it's easy to start/stop
+Conduit and set it to autostart when your server reboots. Simply paste the
+default systemd service you can find below into
+`/etc/systemd/system/conduit.service`.
+
+```systemd
+[Unit]
+Description=Conduit Matrix Server
+After=network.target
+
+[Service]
+Environment="CONDUIT_CONFIG=/etc/matrix-conduit/conduit.toml"
+User=conduit
+Group=nogroup
+Restart=always
+ExecStart=/usr/local/bin/matrix-conduit
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Finally, run
+
+```bash
+$ sudo systemctl daemon-reload
+```
+
+
+## Creating the Conduit configuration file
+
+Now we need to create the Conduit's config file in `/etc/matrix-conduit/conduit.toml`. Paste this in **and take a moment to read it. You need to change at least the server name.**
+
+```toml
+[global]
+# The server_name is the name of this server. It is used as a suffix for user
+# and room ids. Examples: matrix.org, conduit.rs
+# The Conduit server needs to be reachable at https://your.server.name/ on port
+# 443 (client-server) and 8448 (federation) OR you can create /.well-known
+# files to redirect requests. See
+# https://matrix.org/docs/spec/client_server/latest#get-well-known-matrix-client
+# and https://matrix.org/docs/spec/server_server/r0.1.4#get-well-known-matrix-server
+# for more information
+
+# YOU NEED TO EDIT THIS
+#server_name = "your.server.name"
+
+# This is the only directory where Conduit will save its data
+database_path = "/var/lib/matrix-conduit/conduit_db"
+
+# The port Conduit will be running on. You need to set up a reverse proxy in
+# your web server (e.g. apache or nginx), so all requests to /_matrix on port
+# 443 and 8448 will be forwarded to the Conduit instance running on this port
+port = 6167
+
+# Max size for uploads
+max_request_size = 20_000_000 # in bytes
+
+# Disabling registration means no new users will be able to register on this server
+allow_registration = false
+
+# Disable encryption, so no new encrypted rooms can be created
+# Note: existing rooms will continue to work
+allow_encryption = true
+allow_federation = true
+
+#cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
+#max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
+#workers = 4 # default: cpu core count * 2
+
+address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy
+```
+
+## Setting the correct file permissions
+
+As we are using a Conduit specific user we need to allow it to read the config.
+To do that you can run this command on Debian:
+
+```
+sudo chown -R conduit:nogroup /etc/matrix-conduit
+```
+
+If you use the default database path you also need to run this:
+
+```
+sudo mkdir -p /var/lib/matrix-conduit/conduit_db
+sudo chown -R conduit:nogroup /var/lib/matrix-conduit/conduit_db
+```
+
+
+## Setting up the Reverse Proxy
+
+This depends on whether you use Apache, Nginx or another web server.
+
+### Apache
+
+Create `/etc/apache2/sites-enabled/050-conduit.conf` and copy-and-paste this:
+
+```
+Listen 8448
+
+<VirtualHost *:443 *:8448>
+
+ServerName your.server.name # EDIT THIS
+
+AllowEncodedSlashes NoDecode
+ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ nocanon
+ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/
+
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/your.server.name/fullchain.pem # EDIT THIS
+SSLCertificateKeyFile /etc/letsencrypt/live/your.server.name/privkey.pem # EDIT THIS
+</VirtualHost>
+```
+
+**You need to make some edits again.** When you are done, run
+
+```bash
+$ sudo systemctl reload apache2
+```
+
+
+### Nginx
+
+If you use Nginx and not Apache, add the following server section inside the
+http section of `/etc/nginx/nginx.conf`
+
+```
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+    listen 8448 ssl http2;
+    listen [::]:8448 ssl http2;
+    server_name your.server.name; # EDIT THIS
+    merge_slashes off;
+
+    location /_matrix/ {
+        proxy_pass http://127.0.0.1:6167$request_uri;
+        proxy_set_header Host $http_host;
+        proxy_buffering off;
+    }
+
+    ssl_certificate /etc/letsencrypt/live/your.server.name/fullchain.pem; # EDIT THIS
+    ssl_certificate_key /etc/letsencrypt/live/your.server.name/privkey.pem; # EDIT THIS
+    ssl_trusted_certificate /etc/letsencrypt/live/your.server.name/chain.pem; # EDIT THIS
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+}
+```
+**You need to make some edits again.** When you are done, run
+
+```bash
+$ sudo systemctl reload nginx
+```
+
+
+## SSL Certificate
+
+The easiest way to get an SSL certificate, if you don't have one already, is to install `certbot` and run this:
+
+```bash
+$ sudo certbot -d your.server.name
+```
+
+
+## You're done!
+
+Now you can start Conduit with:
+
+```bash
+$ sudo systemctl start conduit
+```
+
+Set it to start automatically when your system boots with:
+
+```bash
+$ sudo systemctl enable conduit
+```

DEPLOY_FROM_SOURCE.md

@@ -1,103 +0,0 @@
-# Deploy from source
-
-## Prerequisites
-
-Make sure you have `libssl-dev` and `pkg-config` installed and the [rust toolchain](https://rustup.rs) is available on at least on user.
-
-
-## Install Conduit
-
-```bash
-$ sudo useradd -m conduit
-$ sudo -u conduit cargo install --git "https://git.koesters.xyz/timo/conduit.git"
-```
-
-
-## Setup systemd service
-
-In this guide, we set up a systemd service for Conduit, so it's easy to start, stop Conduit and set it to autostart when your server reboots. Paste the default systemd service below and configure it to fit your setup (in /etc/systemd/system/conduit.service).
-
-```systemd
-[Unit]
-Description=Conduit
-After=network.target
-
-[Service]
-Environment="ROCKET_SERVER_NAME=YOURSERVERNAME.HERE" # EDIT THIS
-
-Environment="ROCKET_PORT=14004" # Reverse proxy port
-
-#Environment="ROCKET_MAX_REQUEST_SIZE=20000000" # in bytes
-#Environment="ROCKET_REGISTRATION_DISABLED=true"
-#Environment="ROCKET_ENCRYPTION_DISABLED=true"
-#Environment="ROCKET_FEDERATION_ENABLED=true"
-#Environment="ROCKET_LOG=normal" # Detailed logging
-
-Environment="ROCKET_ENV=production"
-User=conduit
-Group=conduit
-Type=simple
-Restart=always
-ExecStart=/home/conduit/.cargo/bin/conduit
-
-[Install]
-WantedBy=multi-user.target
-```
-
-Finally, run
-```bash
-$ sudo systemctl daemon-reload
-```
-
-
-## Setup Reverse Proxy
-
-This depends on whether you use Apache, Nginx or something else. For Apache it looks like this (in /etc/apache2/sites-enabled/050-conduit.conf):
-```
-<VirtualHost *:443>
-
-ServerName conduit.koesters.xyz # EDIT THIS
-
-AllowEncodedSlashes NoDecode
-
-ServerAlias conduit.koesters.xyz # EDIT THIS
-
-ProxyPreserveHost On
-ProxyRequests off
-AllowEncodedSlashes NoDecode
-ProxyPass / http://localhost:14004/ nocanon
-ProxyPassReverse / http://localhost:14004/ nocanon
-
-Include /etc/letsencrypt/options-ssl-apache.conf
-
-# EDIT THESE:
-SSLCertificateFile /etc/letsencrypt/live/conduit.koesters.xyz/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/conduit.koesters.xyz/privkey.pem
-</VirtualHost>
-```
-
-Then run
-```bash
-$ sudo systemctl reload apache2
-```
-
-
-## SSL Certificate
-
-The easiest way to get an SSL certificate for the domain is to install `certbot` and run this:
-```bash
-$ sudo certbot -d conduit.koesters.xyz
-```
-
-
-## You're done!
-
-Now you can start Conduit with
-```bash
-$ sudo systemctl start conduit
-```
-
-and set it to start automatically when your system boots with
-```bash
-$ sudo systemctl enable conduit
-```

README.md

@@ -1,29 +1,58 @@
 # Conduit
 ### A Matrix homeserver written in Rust
 
-[![Liberapay](https://img.shields.io/liberapay/receives/timokoesters?logo=liberapay)](https://liberapay.com/timokoesters)
-[![Matrix](https://img.shields.io/matrix/conduit:conduit.rs?server_fqdn=conduit.koesters.xyz)](https://matrix.to/#/#conduit:matrix.org)
-
 #### What is the goal?
 
 A fast Matrix homeserver that's easy to set up and just works. You can install
 it on a mini-computer like the Raspberry Pi to host Matrix for your family,
 friends or company.
 
+
 #### Can I try it out?
 
 Yes! Just open a Matrix client (<https://app.element.io> or Element Android for
 example) and register on the `https://conduit.koesters.xyz` homeserver.
 
+
+#### What is it build on?
+
+- [Ruma](https://www.ruma.io): Useful structures for endpoint requests and
+  responses that can be (de)serialized
+- [Sled](https://github.com/spacejam/sled): A simple (key, value) database with
+  good performance
+- [Rocket](https://rocket.rs): A flexible web framework
+
+
+#### What is the current status?
+
+Conduit can already be used chat with other users on Conduit, chat with users
+from other Matrix servers and even to chat with users on other platforms using
+appservices. When chatting with users on the same Conduit server, everything
+should work assuming you use a compatible client.
+
+**You should not join Matrix rooms without asking the admins first.** We do not
+know whether Conduit is safe for general use yet, so you should assume there is
+some chance that it breaks rooms permanently for all participating users. We
+are not aware of such a bug today, but we would like to do more testing.
+
+There are still a few important features missing:
+
+- Database stability (currently you might have to do manual upgrades or even wipe the db for new versions)
+- End-to-end encrypted chats over federation
+- Typing, presence, read receipts etc. over federation
+- Lots of testing
+
+Check out the [Conduit 1.0 Release Milestone](https://gitlab.com/famedly/conduit/-/milestones/3).
+
+
 #### How can I deploy my own?
 
-##### From source
+##### Deploy
 
-Clone the repo, build it with `cargo build --release` and call the binary
+Download or compile a Conduit binary, set up the config and call it from somewhere like a systemd script. [Read
-(target/release/conduit) from somewhere like a systemd script. [Read
+more](DEPLOY.md)
-more](DEPLOY_FROM_SOURCE.md)
 
-##### Using Docker
+##### Deploy using Docker
 
 Pull and run the docker image with
 
@@ -34,34 +63,23 @@ docker run -d -p 8448:8000 -v db:/srv/conduit/.local/share/conduit matrixconduit
 
 Or build and run it with docker or docker-compose. [Read more](docker/README.md)
 
-#### What is it build on?
-
-- [Ruma](https://www.ruma.io): Useful structures for endpoint requests and
-  responses that can be (de)serialized
-- [Sled](https://github.com/spacejam/sled): A simple (key, value) database with
-  good performance
-- [Rocket](https://rocket.rs): A flexible web framework
-
-#### What are the biggest things still missing?
-
-- Appservices (Bridges and Bots)
-- Most federation features (invites, e2ee)
-- Push notifications on mobile
-- Notification settings
-- Lots of testing
-
-Also check out the [milestones](https://git.koesters.xyz/timo/conduit/milestones).
 
 #### How can I contribute?
 
 1. Look for an issue you would like to work on and make sure it's not assigned
    to other users
 2. Ask someone to assign the issue to you (comment on the issue or chat in
-   #conduit:matrix.org)
+   #conduit:nordgedanken.dev)
-3. Fork the repo and work on the issue. #conduit:matrix.org is happy to help :)
+3. Fork the repo and work on the issue. #conduit:nordgedanken.dev is happy to help :)
-4. Submit a PR
+4. Submit a MR
 
 #### Donate
 
 Liberapay: <https://liberapay.com/timokoesters/>\
 Bitcoin: `bc1qnnykf986tw49ur7wx9rpw2tevpsztvar5x8w4n`
+
+
+#### Logo
+
+Lightning Bolt Logo: https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/nature/u26A1-bolt.svg \
+Logo License: https://github.com/mozilla/fxemoji/blob/gh-pages/LICENSE.md

Rocket-example.toml

@@ -1,31 +0,0 @@
-[global]
-# The name of this server
-# Note: If server name != hostname, you need a .well-known file for federation
-# to work
-server_name = "your.server.name"
-
-port = 14004
-
-# Max size for uploads
-#max_request_size = 20_000_000 # in bytes, ~20 MB
-
-# Disable registration. No new users will be able to register on this server
-#registration_disabled = true
-
-# Disable encryption, so no new encrypted rooms can be created
-# Note: existing rooms will continue to work
-#encryption_disabled = true
-
-#federation_enabled = true
-
-# Default path is in this user's data
-#database_path = "/home/timo/MyConduitServer"
-
-# You should probably leave this at 0.0.0.0
-address = "0.0.0.0"
-
-# TLS support
-# Note: Not necessary when using a reverse proxy:
-#[global.tls]
-#certs = "/etc/letsencrypt/live/your.server.name/fullchain.pem"
-#key = "/etc/letsencrypt/live/your.server.name/privkey.pem"

conduit-example.toml

@@ -0,0 +1,41 @@
+[global]
+# The server_name is the name of this server. It is used as a suffix for user
+# and room ids. Examples: matrix.org, conduit.rs
+# The Conduit server needs to be reachable at https://your.server.name/ on port
+# 443 (client-server) and 8448 (federation) OR you can create /.well-known
+# files to redirect requests. See
+# https://matrix.org/docs/spec/client_server/latest#get-well-known-matrix-client
+# and https://matrix.org/docs/spec/server_server/r0.1.4#get-well-known-matrix-server
+# for more information
+
+# YOU NEED TO EDIT THIS
+#server_name = "your.server.name"
+
+# This is the only directly where Conduit will save its data
+database_path = "/var/lib/conduit/conduit.db"
+
+# The port Conduit will be running on. You need to set up a reverse proxy in
+# your web server (e.g. apache or nginx), so all requests to /_matrix on port
+# 443 and 8448 will be forwarded to the Conduit instance running on this port
+port = 6167
+
+# Max size for uploads
+max_request_size = 20_000_000 # in bytes
+
+# Disable registration. No new users will be able to register on this server
+#allow_registration = false
+
+# Disable encryption, so no new encrypted rooms can be created
+# Note: existing rooms will continue to work
+#allow_encryption = false
+#allow_federation = false
+
+# Enable jaeger to support monitoring and troubleshooting through jaeger
+#allow_jaeger = false
+
+#cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
+#max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
+#log = "info,state_res=warn,rocket=off,_=off,sled=off"
+#workers = 4 # default: cpu core count * 2
+
+address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy

debian/README.Debian

@@ -0,0 +1,29 @@
+Conduit for Debian
+==================
+
+Configuration
+-------------
+
+When installed, Debconf handles the configuration of the homeserver (host)name,
+the address and port it listens on. These configuration variables end up in
+/etc/matrix-conduit/debian.
+
+You can tweak more detailed settings by uncommenting and setting the variables
+in /etc/matrix-conduit/local. This involves settings such as the maximum file
+size for download/upload, enabling federation, etc.
+
+Running
+-------
+
+The package uses the matrix-conduit.service systemd unit file to start and
+stop Conduit. It loads the configuration files mentioned above to set up the
+environment before running the server.
+
+This package assumes by default that Conduit is placed behind a reverse proxy
+such as Apache or nginx. This default deployment entails just listening on
+127.0.0.1 and the free port 14004 and is reachable via a client using the URL
+http://localhost:14004.
+
+At a later stage this packaging may support also setting up TLS and running
+stand-alone.  In this case, however, you need to set up some certificates and
+renewal, for it to work properly.

debian/config

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+# Ask for the Matrix homeserver name, address and port.
+db_input high matrix-conduit/hostname || true
+db_go
+
+db_input low matrix-conduit/address || true
+db_go
+
+db_input medium matrix-conduit/port || true
+db_go
+
+exit 0

debian/env.local

@@ -0,0 +1,33 @@
+# Conduit homeserver local configuration
+#
+# Conduit is an application based on the Rocket web framework.
+# Configuration of Conduit happens via Debconf (see the resulting config in
+# `/etc/matrix-conduit/debian`) and optionally by uncommenting and tweaking the
+# variables in this file below.
+
+# The maximum size of a Matrix HTTP requests in bytes.
+#
+# This mostly affects the size of files that can be downloaded/uploaded.
+# It defaults to 20971520 (20MB).
+#ROCKET_MAX_REQUEST_SIZE=20971520
+
+# Whether user registration is allowed.
+#
+# User registration is not disabled by default.
+#ROCKET_REGISTRATION_DISABLED=false
+
+# Whether encryption is enabled.
+#
+# (End-to-end) encryption is not disabled by default.
+#ROCKET_ENCRYPTION_DISABLED=false
+
+# Whether federation with other Matrix servers is enabled.
+#
+# Federation is not enabled by default; it is still experimental.
+#ROCKET_FEDERATION_ENABLED=false
+
+# The log level of the homeserver.
+#
+# The log level is "critical" by default.
+# Allowed values are: "off", "normal", "debug", "critical"
+#ROCKET_LOG="critical"

debian/matrix-conduit.service

@@ -0,0 +1,49 @@
+[Unit]
+Description=Conduit Matrix homeserver
+After=network.target
+
+[Service]
+User=_matrix-conduit
+Group=_matrix-conduit
+Type=simple
+
+AmbientCapabilities=
+CapabilityBoundingSet=
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+NoNewPrivileges=yes
+ProtectClock=yes
+ProtectControlGroups=yes
+ProtectHome=yes
+ProtectHostname=yes
+ProtectKernelLogs=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+ProtectSystem=strict
+PrivateDevices=yes
+PrivateMounts=yes
+PrivateTmp=yes
+PrivateUsers=yes
+RemoveIPC=yes
+RestrictAddressFamilies=AF_INET AF_INET6
+RestrictNamespaces=yes
+RestrictRealtime=yes
+RestrictSUIDSGID=yes
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+SystemCallErrorNumber=EPERM
+StateDirectory=matrix-conduit
+
+Environment="ROCKET_ENV=production"
+Environment="ROCKET_DATABASE_PATH=/var/lib/matrix-conduit"
+EnvironmentFile=/etc/matrix-conduit/debian
+EnvironmentFile=/etc/matrix-conduit/local
+
+ExecStart=/usr/sbin/matrix-conduit
+Restart=on-failure
+RestartSec=10
+StartLimitInterval=1m
+StartLimitBurst=5
+
+[Install]
+WantedBy=multi-user.target

debian/postinst

@@ -0,0 +1,73 @@
+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+CONDUIT_CONFIG_PATH=/etc/matrix-conduit
+CONDUIT_CONFIG_FILE="$CONDUIT_CONFIG_PATH/debian"
+CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit
+
+case "$1" in
+  configure)
+    # Create the `_matrix-conduit` user if it does not exist yet.
+    if ! getent passwd _matrix-conduit > /dev/null ; then
+      echo 'Adding system user for the Conduit Matrix homeserver' 1>&2
+      adduser --system --group --quiet \
+        --home $CONDUIT_DATABASE_PATH \
+        --disabled-login \
+        --force-badname \
+        _matrix-conduit
+    fi
+
+    # Create the database path if it does not exist yet.
+    if [ ! -d "$CONDUIT_DATABASE_PATH" ]; then
+      mkdir -p "$CONDUIT_DATABASE_PATH"
+      chown _matrix-conduit "$CONDUIT_DATABASE_PATH"
+    fi
+
+    # Write the debconf values in the config.
+    db_get matrix-conduit/hostname
+    ROCKET_SERVER_NAME="$RET"
+    db_get matrix-conduit/address
+    ROCKET_ADDRESS="$RET"
+    db_get matrix-conduit/port
+    ROCKET_PORT="$RET"
+    cat >"$CONDUIT_CONFIG_FILE" << EOF
+# Conduit homeserver Debian configuration
+#
+# Conduit is an application based on the Rocket web framework.
+# Configuration of Conduit happens via Debconf (of which the resulting config
+# is in this file) and optionally by uncommenting and tweaking the variables in
+# /etc/matrix-conduit/local.
+
+# THIS FILE IS GENERATED BY DEBCONF AND WILL BE OVERRIDDEN!
+#
+# Please make changes by running:
+#
+# \$ dpkg-reconfigure matrix-conduit
+#
+# or by providing overriding changes in /etc/matrix-conduit/local.
+
+# The server (host)name of the Matrix homeserver.
+#
+# This is the hostname the homeserver will be reachable at via a client.
+ROCKET_SERVER_NAME="$ROCKET_SERVER_NAME"
+
+# The address the Matrix homeserver listens on.
+#
+# By default the server listens on address 0.0.0.0. Change this to 127.0.0.1 to
+# only listen on the localhost when using a reverse proxy.
+ROCKET_ADDRESS="$ROCKET_ADDRESS"
+
+# The port of the Matrix homeserver.
+#
+# This port is could be any available port if accessed by a reverse proxy.
+# By default the server listens on port 8000.
+ROCKET_PORT="$ROCKET_PORT"
+
+# THIS FILE IS GENERATED BY DEBCONF AND WILL BE OVERRIDDEN!
+EOF
+    ;;
+esac
+
+#DEBHELPER#

debian/postrm

@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+CONDUIT_CONFIG_PATH=/etc/matrix-conduit
+CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit
+
+case $1 in
+  purge)
+    # Per https://www.debian.org/doc/debian-policy/ch-files.html#behavior
+    # "configuration files must be preserved when the package is removed, and
+    #  only deleted when the package is purged."
+    if [ -d "$CONDUIT_CONFIG_PATH" ]; then
+      rm -r "$CONDUIT_CONFIG_PATH"
+    fi
+
+    if [ -d "$CONDUIT_DATABASE_PATH" ]; then
+      rm -r "$CONDUIT_DATABASE_PATH"
+    fi
+    ;;
+esac
+
+#DEBHELPER#

debian/templates

@@ -0,0 +1,21 @@
+Template: matrix-conduit/hostname
+Type: string
+Default: localhost
+Description: The server (host)name of the Matrix homeserver
+ This is the hostname the homeserver will be reachable at via a client.
+ .
+ If set to "localhost", you can connect with a client locally and clients
+ from other hosts and also other homeservers will not be able to reach you!
+
+Template: matrix-conduit/address
+Type: string
+Default: 127.0.0.1
+Description: The listen address of the Matrix homeserver
+ This is the address the homeserver will listen on. Leave it set to 127.0.0.1
+ when using a reverse proxy.
+
+Template: matrix-conduit/port
+Type: string
+Default: 14004
+Description: The port of the Matrix homeserver
+ This port is most often just accessed by a reverse proxy.

rust-toolchain

@@ -1 +1 @@
-1.47.0
+1.50.0

rustfmt.toml

@@ -1 +1,2 @@
-merge_imports = true
+unstable_features = true
+imports_granularity="Crate"

src/appservice_server.rs

@@ -0,0 +1,98 @@
+use crate::{utils, Error, Result};
+use bytes::BytesMut;
+use log::warn;
+use ruma::{
+    api::{IncomingResponse, OutgoingRequest, SendAccessToken},
+    client::HttpClientExt,
+};
+use std::{
+    convert::{TryFrom, TryInto},
+    fmt::Debug,
+    time::Duration,
+};
+
+pub async fn send_request<T: OutgoingRequest>(
+    globals: &crate::database::globals::Globals,
+    registration: serde_yaml::Value,
+    request: T,
+) -> Result<T::IncomingResponse>
+where
+    T: Debug,
+{
+    let destination = registration.get("url").unwrap().as_str().unwrap();
+    let hs_token = registration.get("hs_token").unwrap().as_str().unwrap();
+
+    globals
+        .reqwest_client()
+        .send_customized_matrix_request(
+            &destination,
+            SendAccessToken::IfRequired(""),
+            request,
+            |http_request| {
+                let mut parts = http_request.uri().clone().into_parts();
+                let old_path_and_query = parts.path_and_query.unwrap().as_str().to_owned();
+                let symbol = if old_path_and_query.contains('?') {
+                    "&"
+                } else {
+                    "?"
+                };
+
+                parts.path_and_query =
+                    Some((old_path_and_query + symbol + "access_token=" + hs_token).parse()?);
+                *http_request.uri_mut() = parts.try_into()?;
+
+                Ok(())
+            },
+        )
+        .await
+        .map_err(|e| {
+            warn!("Appservice error: {}", e);
+            Error::BadServerResponse("Server returned an error.")
+        })?;
+
+    *reqwest_request.timeout_mut() = Some(Duration::from_secs(30));
+
+    let url = reqwest_request.url().clone();
+    let mut reqwest_response = globals.reqwest_client().execute(reqwest_request).await?;
+
+    // Because reqwest::Response -> http::Response is complicated:
+    let status = reqwest_response.status();
+    let mut http_response = http::Response::builder().status(status);
+    let headers = http_response.headers_mut().unwrap();
+
+    for (k, v) in reqwest_response.headers_mut().drain() {
+        if let Some(key) = k {
+            headers.insert(key, v);
+        }
+    }
+
+    let status = reqwest_response.status();
+
+    let body = reqwest_response.bytes().await.unwrap_or_else(|e| {
+        warn!("server error: {}", e);
+        Vec::new().into()
+    }); // TODO: handle timeout
+
+    if status != 200 {
+        warn!(
+            "Appservice returned bad response {} {}\n{}\n{:?}",
+            destination,
+            status,
+            url,
+            utils::string_from_bytes(&body)
+        );
+    }
+
+    let response = T::IncomingResponse::try_from_http_response(
+        http_response
+            .body(body)
+            .expect("reqwest body is valid http body"),
+    );
+    response.map_err(|_| {
+        warn!(
+            "Appservice returned invalid response bytes {}\n{}",
+            destination, url
+        );
+        Error::BadServerResponse("Server returned bad response.")
+    })
+}

src/client_server/account.rs

@@ -21,7 +21,7 @@ use ruma::{
         },
         EventType,
     },
-    RoomAliasId, RoomId, RoomVersionId, UserId,
+    push, RoomAliasId, RoomId, RoomVersionId, UserId,
 };
 
 use register::RegistrationKind;
@@ -40,6 +40,7 @@ const GUEST_NAME_LENGTH: usize = 10;
     feature = "conduit_bin",
     get("/_matrix/client/r0/register/available", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_register_available_route(
     db: State<'_, Database>,
     body: Ruma<get_username_availability::Request<'_>>,
@@ -82,11 +83,12 @@ pub async fn get_register_available_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/register", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn register_route(
     db: State<'_, Database>,
     body: Ruma<register::Request<'_>>,
 ) -> ConduitResult<register::Response> {
-    if db.globals.registration_disabled() {
+    if !db.globals.allow_registration() {
         return Err(Error::BadRequest(
             ErrorKind::Forbidden,
             "Registration has been disabled.",
@@ -139,18 +141,20 @@ pub async fn register_route(
         auth_error: None,
     };
 
-    if let Some(auth) = &body.auth {
+    if !body.from_appservice {
-        let (worked, uiaainfo) =
+        if let Some(auth) = &body.auth {
-            db.uiaa
+            let (worked, uiaainfo) =
-                .try_auth(&user_id, "".into(), auth, &uiaainfo, &db.users, &db.globals)?;
+                db.uiaa
-        if !worked {
+                    .try_auth(&user_id, "".into(), auth, &uiaainfo, &db.users, &db.globals)?;
+            if !worked {
+                return Err(Error::Uiaa(uiaainfo));
+            }
+        // Success!
+        } else {
+            uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
+            db.uiaa.create(&user_id, "".into(), &uiaainfo)?;
             return Err(Error::Uiaa(uiaainfo));
         }
-    // Success!
-    } else {
-        uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-        db.uiaa.create(&user_id, "".into(), &uiaainfo)?;
-        return Err(Error::Uiaa(uiaainfo));
     }
 
     if missing_username {
@@ -177,7 +181,7 @@ pub async fn register_route(
         EventType::PushRules,
         &ruma::events::push_rules::PushRulesEvent {
             content: ruma::events::push_rules::PushRulesEventContent {
-                global: crate::push_rules::default_pushrules(&user_id),
+                global: push::Ruleset::server_default(&user_id),
             },
         },
         &db.globals,
@@ -237,10 +241,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         // 2. Make conduit bot join
@@ -261,10 +262,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         // 3. Power levels
@@ -298,10 +296,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         // 4.1 Join Rules
@@ -318,10 +313,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         // 4.2 History Visibility
@@ -340,10 +332,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         // 4.3 Guest Access
@@ -360,10 +349,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         // 6. Events implied by name and topic
@@ -382,10 +368,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         db.rooms.build_and_append_pdu(
@@ -401,10 +384,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         // Room alias
@@ -426,10 +406,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         db.rooms.set_alias(&alias, Some(&room_id), &db.globals)?;
@@ -452,10 +429,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
         db.rooms.build_and_append_pdu(
             PduBuilder {
@@ -474,26 +448,16 @@ pub async fn register_route(
             },
             &user_id,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
 
         // Send welcome message
         db.rooms.build_and_append_pdu(
             PduBuilder {
                 event_type: EventType::RoomMessage,
-                content: serde_json::to_value(message::MessageEventContent::Text(
+                content: serde_json::to_value(message::MessageEventContent::text_html(
-                    message::TextMessageEventContent {
+                        "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing `/join #conduit:matrix.org`. **Important: Please don't join any other Matrix rooms over federation without permission from the room's admins.** Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(),
-                        body: "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing `/join #conduit:matrix.org`. **Important: Please don't join any other Matrix rooms over federation without permission from the room's admins.** Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(),
+                        "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing <code>/join #conduit:matrix.org</code>. <strong>Important: Please don't join any other Matrix rooms over federation without permission from the room's admins.</strong> Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(),
-                        formatted: Some(message::FormattedBody {
-                            format: message::MessageFormat::Html,
-                            body: "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing <code>/join #conduit:matrix.org</code>. <strong>Important: Please don't join any other Matrix rooms over federation without permission from the room's admins.</strong> Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(),
-                        }),
-                        relates_to: None,
-                        new_content: None,
-                    },
                 ))
                 .expect("event is valid, we just created it"),
                 unsigned: None,
@@ -502,10 +466,7 @@ pub async fn register_route(
             },
             &conduit_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
     }
 
@@ -532,6 +493,7 @@ pub async fn register_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/account/password", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn change_password_route(
     db: State<'_, Database>,
     body: Ruma<change_password::Request<'_>>,
@@ -570,16 +532,16 @@ pub async fn change_password_route(
 
     db.users.set_password(&sender_user, &body.new_password)?;
 
-    // TODO: Read logout_devices field when it's available and respect that, currently not supported in Ruma
+    if body.logout_devices {
-    // See: https://github.com/ruma/ruma/issues/107
+        // Logout all devices except the current one
-    // Logout all devices except the current one
+        for id in db
-    for id in db
+            .users
-        .users
+            .all_device_ids(&sender_user)
-        .all_device_ids(&sender_user)
+            .filter_map(|id| id.ok())
-        .filter_map(|id| id.ok())
+            .filter(|id| id != sender_device)
-        .filter(|id| id != sender_device)
+        {
-    {
+            db.users.remove_device(&sender_user, &id)?;
-        db.users.remove_device(&sender_user, &id)?;
+        }
     }
 
     db.flush().await?;
@@ -596,6 +558,7 @@ pub async fn change_password_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/account/whoami", data = "<body>")
 )]
+#[tracing::instrument(skip(body))]
 pub async fn whoami_route(body: Ruma<whoami::Request>) -> ConduitResult<whoami::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     Ok(whoami::Response {
@@ -616,6 +579,7 @@ pub async fn whoami_route(body: Ruma<whoami::Request>) -> ConduitResult<whoami::
     feature = "conduit_bin",
     post("/_matrix/client/r0/account/deactivate", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn deactivate_route(
     db: State<'_, Database>,
     body: Ruma<deactivate::Request<'_>>,
@@ -653,11 +617,11 @@ pub async fn deactivate_route(
     }
 
     // Leave all joined rooms and reject all invitations
-    for room_id in db
+    for room_id in db.rooms.rooms_joined(&sender_user).chain(
-        .rooms
+        db.rooms
-        .rooms_joined(&sender_user)
+            .rooms_invited(&sender_user)
-        .chain(db.rooms.rooms_invited(&sender_user))
+            .map(|t| t.map(|(r, _)| r)),
-    {
+    ) {
         let room_id = room_id?;
         let event = member::MemberEventContent {
             membership: member::MembershipState::Leave,
@@ -677,10 +641,7 @@ pub async fn deactivate_route(
             },
             &sender_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
     }
 
@@ -696,3 +657,17 @@ pub async fn deactivate_route(
     }
     .into())
 }
+
+/*/
+#[cfg_attr(
+    feature = "conduit_bin",
+    get("/_matrix/client/r0/account/3pid", data = "<body>")
+)]
+pub async fn third_party_route(
+    body: Ruma<account::add_3pid::Request<'_>>,
+) -> ConduitResult<account::add_3pid::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    Ok(account::add_3pid::Response::default().into())
+}
+*/

src/client_server/alias.rs

@@ -1,7 +1,9 @@
 use super::State;
-use crate::{server_server, ConduitResult, Database, Error, Ruma};
+use crate::{ConduitResult, Database, Error, Ruma};
+use regex::Regex;
 use ruma::{
     api::{
+        appservice,
         client::{
             error::ErrorKind,
             r0::alias::{create_alias, delete_alias, get_alias},
@@ -18,6 +20,7 @@ use rocket::{delete, get, put};
     feature = "conduit_bin",
     put("/_matrix/client/r0/directory/room/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn create_alias_route(
     db: State<'_, Database>,
     body: Ruma<create_alias::Request<'_>>,
@@ -38,6 +41,7 @@ pub async fn create_alias_route(
     feature = "conduit_bin",
     delete("/_matrix/client/r0/directory/room/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn delete_alias_route(
     db: State<'_, Database>,
     body: Ruma<delete_alias::Request<'_>>,
@@ -53,6 +57,7 @@ pub async fn delete_alias_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/directory/room/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_alias_route(
     db: State<'_, Database>,
     body: Ruma<get_alias::Request<'_>>,
@@ -65,23 +70,71 @@ pub async fn get_alias_helper(
     room_alias: &RoomAliasId,
 ) -> ConduitResult<get_alias::Response> {
     if room_alias.server_name() != db.globals.server_name() {
-        let response = server_server::send_request(
+        let response = db
-            &db.globals,
+            .sending
-            room_alias.server_name().to_owned(),
+            .send_federation_request(
-            federation::query::get_room_information::v1::Request { room_alias },
+                &db.globals,
-        )
+                room_alias.server_name(),
-        .await?;
+                federation::query::get_room_information::v1::Request { room_alias },
+            )
+            .await?;
 
         return Ok(get_alias::Response::new(response.room_id, response.servers).into());
     }
 
-    let room_id = db
+    let mut room_id = None;
-        .rooms
+    match db.rooms.id_from_alias(&room_alias)? {
-        .id_from_alias(&room_alias)?
+        Some(r) => room_id = Some(r),
-        .ok_or(Error::BadRequest(
+        None => {
-            ErrorKind::NotFound,
+            for (_id, registration) in db.appservice.iter_all().filter_map(|r| r.ok()) {
-            "Room with alias not found.",
+                let aliases = registration
-        ))?;
+                    .get("namespaces")
+                    .and_then(|ns| ns.get("aliases"))
+                    .and_then(|aliases| aliases.as_sequence())
+                    .map_or_else(Vec::new, |aliases| {
+                        aliases
+                            .iter()
+                            .map(|aliases| {
+                                aliases
+                                    .get("regex")
+                                    .and_then(|regex| regex.as_str())
+                                    .and_then(|regex| Regex::new(regex).ok())
+                            })
+                            .filter_map(|o| o)
+                            .collect::<Vec<_>>()
+                    });
+
+                if aliases
+                    .iter()
+                    .any(|aliases| aliases.is_match(room_alias.as_str()))
+                    && db
+                        .sending
+                        .send_appservice_request(
+                            &db.globals,
+                            registration,
+                            appservice::query::query_room_alias::v1::Request { room_alias },
+                        )
+                        .await
+                        .is_ok()
+                {
+                    room_id = Some(db.rooms.id_from_alias(&room_alias)?.ok_or_else(|| {
+                        Error::bad_config("Appservice lied to us. Room does not exist.")
+                    })?);
+                    break;
+                }
+            }
+        }
+    };
+
+    let room_id = match room_id {
+        Some(room_id) => room_id,
+        None => {
+            return Err(Error::BadRequest(
+                ErrorKind::NotFound,
+                "Room with alias not found.",
+            ))
+        }
+    };
 
     Ok(get_alias::Response::new(room_id, vec![db.globals.server_name().to_owned()]).into())
 }

src/client_server/backup.rs

@@ -17,6 +17,7 @@ use rocket::{delete, get, post, put};
     feature = "conduit_bin",
     post("/_matrix/client/unstable/room_keys/version", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn create_backup_route(
     db: State<'_, Database>,
     body: Ruma<create_backup::Request>,
@@ -35,6 +36,7 @@ pub async fn create_backup_route(
     feature = "conduit_bin",
     put("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn update_backup_route(
     db: State<'_, Database>,
     body: Ruma<update_backup::Request<'_>>,
@@ -52,6 +54,7 @@ pub async fn update_backup_route(
     feature = "conduit_bin",
     get("/_matrix/client/unstable/room_keys/version", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_latest_backup_route(
     db: State<'_, Database>,
     body: Ruma<get_latest_backup::Request>,
@@ -79,6 +82,7 @@ pub async fn get_latest_backup_route(
     feature = "conduit_bin",
     get("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_backup_route(
     db: State<'_, Database>,
     body: Ruma<get_backup::Request<'_>>,
@@ -105,6 +109,7 @@ pub async fn get_backup_route(
     feature = "conduit_bin",
     delete("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn delete_backup_route(
     db: State<'_, Database>,
     body: Ruma<delete_backup::Request<'_>>,
@@ -123,6 +128,7 @@ pub async fn delete_backup_route(
     feature = "conduit_bin",
     put("/_matrix/client/unstable/room_keys/keys", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn add_backup_keys_route(
     db: State<'_, Database>,
     body: Ruma<add_backup_keys::Request<'_>>,
@@ -156,6 +162,7 @@ pub async fn add_backup_keys_route(
     feature = "conduit_bin",
     put("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn add_backup_key_sessions_route(
     db: State<'_, Database>,
     body: Ruma<add_backup_key_sessions::Request<'_>>,
@@ -187,6 +194,7 @@ pub async fn add_backup_key_sessions_route(
     feature = "conduit_bin",
     put("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn add_backup_key_session_route(
     db: State<'_, Database>,
     body: Ruma<add_backup_key_session::Request<'_>>,
@@ -215,6 +223,7 @@ pub async fn add_backup_key_session_route(
     feature = "conduit_bin",
     get("/_matrix/client/unstable/room_keys/keys", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_backup_keys_route(
     db: State<'_, Database>,
     body: Ruma<get_backup_keys::Request<'_>>,
@@ -230,6 +239,7 @@ pub async fn get_backup_keys_route(
     feature = "conduit_bin",
     get("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_backup_key_sessions_route(
     db: State<'_, Database>,
     body: Ruma<get_backup_key_sessions::Request<'_>>,
@@ -247,6 +257,7 @@ pub async fn get_backup_key_sessions_route(
     feature = "conduit_bin",
     get("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_backup_key_session_route(
     db: State<'_, Database>,
     body: Ruma<get_backup_key_session::Request<'_>>,
@@ -256,12 +267,10 @@ pub async fn get_backup_key_session_route(
     let key_data = db
         .key_backups
         .get_session(&sender_user, &body.version, &body.room_id, &body.session_id)?
-        .ok_or_else(|| {
+        .ok_or(Error::BadRequest(
-            Error::BadRequest(
+            ErrorKind::NotFound,
-                ErrorKind::NotFound,
+            "Backup key not found for this user's session.",
-                "Backup key not found for this user's session.",
+        ))?;
-            )
-        })?;
 
     Ok(get_backup_key_session::Response { key_data }.into())
 }
@@ -270,6 +279,7 @@ pub async fn get_backup_key_session_route(
     feature = "conduit_bin",
     delete("/_matrix/client/unstable/room_keys/keys", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn delete_backup_keys_route(
     db: State<'_, Database>,
     body: Ruma<delete_backup_keys::Request<'_>>,
@@ -292,6 +302,7 @@ pub async fn delete_backup_keys_route(
     feature = "conduit_bin",
     delete("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn delete_backup_key_sessions_route(
     db: State<'_, Database>,
     body: Ruma<delete_backup_key_sessions::Request<'_>>,
@@ -314,6 +325,7 @@ pub async fn delete_backup_key_sessions_route(
     feature = "conduit_bin",
     delete("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn delete_backup_key_session_route(
     db: State<'_, Database>,
     body: Ruma<delete_backup_key_session::Request<'_>>,

src/client_server/capabilities.rs

@@ -1,5 +1,10 @@
 use crate::ConduitResult;
-use ruma::{api::client::r0::capabilities::get_capabilities, RoomVersionId};
+use ruma::{
+    api::client::r0::capabilities::{
+        get_capabilities, Capabilities, RoomVersionStability, RoomVersionsCapability,
+    },
+    RoomVersionId,
+};
 use std::collections::BTreeMap;
 
 #[cfg(feature = "conduit_bin")]
@@ -9,26 +14,16 @@ use rocket::get;
 ///
 /// Get information on this server's supported feature set and other relevent capabilities.
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/capabilities"))]
+#[tracing::instrument]
 pub async fn get_capabilities_route() -> ConduitResult<get_capabilities::Response> {
     let mut available = BTreeMap::new();
-    available.insert(
+    available.insert(RoomVersionId::Version6, RoomVersionStability::Stable);
-        RoomVersionId::Version5,
-        get_capabilities::RoomVersionStability::Stable,
-    );
-    available.insert(
-        RoomVersionId::Version6,
-        get_capabilities::RoomVersionStability::Stable,
-    );
 
-    Ok(get_capabilities::Response {
+    let mut capabilities = Capabilities::new();
-        capabilities: get_capabilities::Capabilities {
+    capabilities.room_versions = RoomVersionsCapability {
-            change_password: get_capabilities::ChangePasswordCapability::default(), // enabled by default
+        default: RoomVersionId::Version6,
-            room_versions: get_capabilities::RoomVersionsCapability {
+        available,
-                default: RoomVersionId::Version6,
+    };
-                available,
+
-            },
+    Ok(get_capabilities::Response { capabilities }.into())
-            custom_capabilities: BTreeMap::new(),
-        },
-    }
-    .into())
 }

src/client_server/config.rs

@@ -3,11 +3,16 @@ use crate::{ConduitResult, Database, Error, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::config::{get_global_account_data, set_global_account_data},
+        r0::config::{
+            get_global_account_data, get_room_account_data, set_global_account_data,
+            set_room_account_data,
+        },
     },
-    events::{custom::CustomEventContent, BasicEvent},
+    events::{custom::CustomEventContent, AnyBasicEventContent, BasicEvent},
     serde::Raw,
 };
+use serde::Deserialize;
+use serde_json::value::RawValue as RawJsonValue;
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};
@@ -16,13 +21,14 @@ use rocket::{get, put};
     feature = "conduit_bin",
     put("/_matrix/client/r0/user/<_>/account_data/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn set_global_account_data_route(
     db: State<'_, Database>,
     body: Ruma<set_global_account_data::Request<'_>>,
 ) -> ConduitResult<set_global_account_data::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let content = serde_json::from_str::<serde_json::Value>(body.data.get())
+    let data = serde_json::from_str(body.data.get())
         .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
 
     let event_type = body.event_type.to_string();
@@ -32,10 +38,7 @@ pub async fn set_global_account_data_route(
         sender_user,
         event_type.clone().into(),
         &BasicEvent {
-            content: CustomEventContent {
+            content: CustomEventContent { event_type, data },
-                event_type,
-                json: content,
-            },
         },
         &db.globals,
     )?;
@@ -45,22 +48,96 @@ pub async fn set_global_account_data_route(
     Ok(set_global_account_data::Response.into())
 }
 
+#[cfg_attr(
+    feature = "conduit_bin",
+    put(
+        "/_matrix/client/r0/user/<_>/rooms/<_>/account_data/<_>",
+        data = "<body>"
+    )
+)]
+#[tracing::instrument(skip(db, body))]
+pub async fn set_room_account_data_route(
+    db: State<'_, Database>,
+    body: Ruma<set_room_account_data::Request<'_>>,
+) -> ConduitResult<set_room_account_data::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    let data = serde_json::from_str(body.data.get())
+        .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
+
+    let event_type = body.event_type.to_string();
+
+    db.account_data.update(
+        Some(&body.room_id),
+        sender_user,
+        event_type.clone().into(),
+        &BasicEvent {
+            content: CustomEventContent { event_type, data },
+        },
+        &db.globals,
+    )?;
+
+    db.flush().await?;
+
+    Ok(set_room_account_data::Response.into())
+}
+
 #[cfg_attr(
     feature = "conduit_bin",
     get("/_matrix/client/r0/user/<_>/account_data/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_global_account_data_route(
     db: State<'_, Database>,
     body: Ruma<get_global_account_data::Request<'_>>,
 ) -> ConduitResult<get_global_account_data::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let data = db
+    let event = db
         .account_data
-        .get::<Raw<ruma::events::AnyBasicEvent>>(None, sender_user, body.event_type.clone().into())?
+        .get::<Box<RawJsonValue>>(None, sender_user, body.event_type.clone().into())?
         .ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
-
     db.flush().await?;
 
-    Ok(get_global_account_data::Response { account_data: data }.into())
+    let account_data = serde_json::from_str::<ExtractEventContent>(event.get())
+        .expect("event to contain a content field")
+        .content;
+
+    Ok(get_global_account_data::Response { account_data }.into())
+}
+
+#[cfg_attr(
+    feature = "conduit_bin",
+    get(
+        "/_matrix/client/r0/user/<_>/rooms/<_>/account_data/<_>",
+        data = "<body>"
+    )
+)]
+#[tracing::instrument(skip(db, body))]
+pub async fn get_room_account_data_route(
+    db: State<'_, Database>,
+    body: Ruma<get_room_account_data::Request<'_>>,
+) -> ConduitResult<get_room_account_data::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    let event = db
+        .account_data
+        .get::<Box<RawJsonValue>>(
+            Some(&body.room_id),
+            sender_user,
+            body.event_type.clone().into(),
+        )?
+        .ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
+    db.flush().await?;
+
+    let account_data = serde_json::from_str::<ExtractEventContent>(event.get())
+        .expect("event to contain a content field")
+        .content;
+
+    Ok(get_room_account_data::Response { account_data }.into())
+}
+
+#[derive(Deserialize)]
+struct ExtractEventContent {
+    content: Raw<AnyBasicEventContent>,
 }

src/client_server/context.rs

@@ -10,6 +10,7 @@ use rocket::get;
     feature = "conduit_bin",
     get("/_matrix/client/r0/rooms/<_>/context/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_context_route(
     db: State<'_, Database>,
     body: Ruma<get_context::Request<'_>>,
@@ -23,20 +24,25 @@ pub async fn get_context_route(
         ));
     }
 
+    let base_pdu_id = db
+        .rooms
+        .get_pdu_id(&body.event_id)?
+        .ok_or(Error::BadRequest(
+            ErrorKind::NotFound,
+            "Base event id not found.",
+        ))?;
+
+    let base_token = db.rooms.pdu_count(&base_pdu_id)?;
+
     let base_event = db
         .rooms
-        .get_pdu(&body.event_id)?
+        .get_pdu_from_id(&base_pdu_id)?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "Base event not found.",
         ))?
         .to_room_event();
 
-    let base_token = db
-        .rooms
-        .get_pdu_count(&body.event_id)?
-        .expect("event still exists");
-
     let events_before = db
         .rooms
         .pdus_until(&sender_user, &body.room_id, base_token)

src/client_server/device.rs

@@ -16,6 +16,7 @@ use rocket::{delete, get, post, put};
     feature = "conduit_bin",
     get("/_matrix/client/r0/devices", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_devices_route(
     db: State<'_, Database>,
     body: Ruma<get_devices::Request>,
@@ -35,6 +36,7 @@ pub async fn get_devices_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/devices/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_device_route(
     db: State<'_, Database>,
     body: Ruma<get_device::Request<'_>>,
@@ -53,6 +55,7 @@ pub async fn get_device_route(
     feature = "conduit_bin",
     put("/_matrix/client/r0/devices/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn update_device_route(
     db: State<'_, Database>,
     body: Ruma<update_device::Request<'_>>,
@@ -78,6 +81,7 @@ pub async fn update_device_route(
     feature = "conduit_bin",
     delete("/_matrix/client/r0/devices/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn delete_device_route(
     db: State<'_, Database>,
     body: Ruma<delete_device::Request<'_>>,
@@ -126,6 +130,7 @@ pub async fn delete_device_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/delete_devices", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn delete_devices_route(
     db: State<'_, Database>,
     body: Ruma<delete_devices::Request<'_>>,

src/client_server/directory.rs

@@ -1,5 +1,5 @@
 use super::State;
-use crate::{server_server, ConduitResult, Database, Error, Result, Ruma};
+use crate::{ConduitResult, Database, Error, Result, Ruma};
 use log::info;
 use ruma::{
     api::{
@@ -21,7 +21,7 @@ use ruma::{
         EventType,
     },
     serde::Raw,
-    ServerName,
+    ServerName, UInt,
 };
 
 #[cfg(feature = "conduit_bin")]
@@ -31,6 +31,7 @@ use rocket::{get, post, put};
     feature = "conduit_bin",
     post("/_matrix/client/r0/publicRooms", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_public_rooms_filtered_route(
     db: State<'_, Database>,
     body: Ruma<get_public_rooms_filtered::Request<'_>>,
@@ -50,6 +51,7 @@ pub async fn get_public_rooms_filtered_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/publicRooms", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_public_rooms_route(
     db: State<'_, Database>,
     body: Ruma<get_public_rooms::Request<'_>>,
@@ -78,6 +80,7 @@ pub async fn get_public_rooms_route(
     feature = "conduit_bin",
     put("/_matrix/client/r0/directory/list/room/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn set_room_visibility_route(
     db: State<'_, Database>,
     body: Ruma<set_room_visibility::Request<'_>>,
@@ -107,6 +110,7 @@ pub async fn set_room_visibility_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/directory/list/room/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_room_visibility_route(
     db: State<'_, Database>,
     body: Ruma<get_room_visibility::Request<'_>>,
@@ -124,7 +128,7 @@ pub async fn get_room_visibility_route(
 pub async fn get_public_rooms_filtered_helper(
     db: &Database,
     server: Option<&ServerName>,
-    limit: Option<js_int::UInt>,
+    limit: Option<UInt>,
     since: Option<&str>,
     filter: &IncomingFilter,
     _network: &IncomingRoomNetwork,
@@ -133,19 +137,21 @@ pub async fn get_public_rooms_filtered_helper(
         .clone()
         .filter(|server| *server != db.globals.server_name().as_str())
     {
-        let response = server_server::send_request(
+        let response = db
-            &db.globals,
+            .sending
-            other_server.to_owned(),
+            .send_federation_request(
-            federation::directory::get_public_rooms_filtered::v1::Request {
+                &db.globals,
-                limit,
+                other_server,
-                since: since.as_deref(),
+                federation::directory::get_public_rooms_filtered::v1::Request {
-                filter: Filter {
+                    limit,
-                    generic_search_term: filter.generic_search_term.as_deref(),
+                    since: since.as_deref(),
+                    filter: Filter {
+                        generic_search_term: filter.generic_search_term.as_deref(),
+                    },
+                    room_network: RoomNetwork::Matrix,
                 },
-                room_network: RoomNetwork::Matrix,
+            )
-            },
+            .await?;
-        )
-        .await?;
 
         return Ok(get_public_rooms_filtered::Response {
             chunk: response
@@ -203,17 +209,15 @@ pub async fn get_public_rooms_filtered_helper(
             .map(|room_id| {
                 let room_id = room_id?;
 
-                // TODO: Do not load full state?
-                let state = db.rooms.room_state_full(&room_id)?;
-
                 let chunk = PublicRoomsChunk {
                     aliases: Vec::new(),
-                    canonical_alias: state
+                    canonical_alias: db
-                        .get(&(EventType::RoomCanonicalAlias, "".to_owned()))
+                        .rooms
+                        .room_state_get(&room_id, &EventType::RoomCanonicalAlias, "")?
                         .map_or(Ok::<_, Error>(None), |s| {
                             Ok(serde_json::from_value::<
                                 Raw<canonical_alias::CanonicalAliasEventContent>,
-                            >(s.content.clone())
+                            >(s.content)
                             .expect("from_value::<Raw<..>> can never fail")
                             .deserialize()
                             .map_err(|_| {
@@ -221,11 +225,12 @@ pub async fn get_public_rooms_filtered_helper(
                             })?
                             .alias)
                         })?,
-                    name: state.get(&(EventType::RoomName, "".to_owned())).map_or(
+                    name: db
-                        Ok::<_, Error>(None),
+                        .rooms
-                        |s| {
+                        .room_state_get(&room_id, &EventType::RoomName, "")?
+                        .map_or(Ok::<_, Error>(None), |s| {
                             Ok(serde_json::from_value::<Raw<name::NameEventContent>>(
-                                s.content.clone(),
+                                s.content,
                             )
                             .expect("from_value::<Raw<..>> can never fail")
                             .deserialize()
@@ -234,16 +239,15 @@ pub async fn get_public_rooms_filtered_helper(
                             })?
                             .name()
                             .map(|n| n.to_owned()))
-                        },
+                        })?,
-                    )?,
                     num_joined_members: (db.rooms.room_members(&room_id).count() as u32).into(),
-                    room_id,
+                    topic: db
-                    topic: state.get(&(EventType::RoomTopic, "".to_owned())).map_or(
+                        .rooms
-                        Ok::<_, Error>(None),
+                        .room_state_get(&room_id, &EventType::RoomTopic, "")?
-                        |s| {
+                        .map_or(Ok::<_, Error>(None), |s| {
                             Ok(Some(
                                 serde_json::from_value::<Raw<topic::TopicEventContent>>(
-                                    s.content.clone(),
+                                    s.content,
                                 )
                                 .expect("from_value::<Raw<..>> can never fail")
                                 .deserialize()
@@ -252,14 +256,14 @@ pub async fn get_public_rooms_filtered_helper(
                                 })?
                                 .topic,
                             ))
-                        },
+                        })?,
-                    )?,
+                    world_readable: db
-                    world_readable: state
+                        .rooms
-                        .get(&(EventType::RoomHistoryVisibility, "".to_owned()))
+                        .room_state_get(&room_id, &EventType::RoomHistoryVisibility, "")?
                         .map_or(Ok::<_, Error>(false), |s| {
                             Ok(serde_json::from_value::<
                                 Raw<history_visibility::HistoryVisibilityEventContent>,
-                            >(s.content.clone())
+                            >(s.content)
                             .expect("from_value::<Raw<..>> can never fail")
                             .deserialize()
                             .map_err(|_| {
@@ -270,12 +274,13 @@ pub async fn get_public_rooms_filtered_helper(
                             .history_visibility
                                 == history_visibility::HistoryVisibility::WorldReadable)
                         })?,
-                    guest_can_join: state
+                    guest_can_join: db
-                        .get(&(EventType::RoomGuestAccess, "".to_owned()))
+                        .rooms
+                        .room_state_get(&room_id, &EventType::RoomGuestAccess, "")?
                         .map_or(Ok::<_, Error>(false), |s| {
                             Ok(
                             serde_json::from_value::<Raw<guest_access::GuestAccessEventContent>>(
-                                s.content.clone(),
+                                s.content,
                             )
                             .expect("from_value::<Raw<..>> can never fail")
                             .deserialize()
@@ -286,12 +291,13 @@ pub async fn get_public_rooms_filtered_helper(
                                 == guest_access::GuestAccess::CanJoin,
                         )
                         })?,
-                    avatar_url: state
+                    avatar_url: db
-                        .get(&(EventType::RoomAvatar, "".to_owned()))
+                        .rooms
+                        .room_state_get(&room_id, &EventType::RoomAvatar, "")?
                         .map(|s| {
                             Ok::<_, Error>(
                                 serde_json::from_value::<Raw<avatar::AvatarEventContent>>(
-                                    s.content.clone(),
+                                    s.content,
                                 )
                                 .expect("from_value::<Raw<..>> can never fail")
                                 .deserialize()
@@ -304,6 +310,7 @@ pub async fn get_public_rooms_filtered_helper(
                         .transpose()?
                         // url is now an Option<String> so we must flatten
                         .flatten(),
+                    room_id,
                 };
                 Ok(chunk)
             })

src/client_server/filter.rs

@@ -5,6 +5,7 @@ use ruma::api::client::r0::filter::{self, create_filter, get_filter};
 use rocket::{get, post};
 
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/user/<_>/filter/<_>"))]
+#[tracing::instrument]
 pub async fn get_filter_route() -> ConduitResult<get_filter::Response> {
     // TODO
     Ok(get_filter::Response::new(filter::IncomingFilterDefinition {
@@ -18,6 +19,7 @@ pub async fn get_filter_route() -> ConduitResult<get_filter::Response> {
 }
 
 #[cfg_attr(feature = "conduit_bin", post("/_matrix/client/r0/user/<_>/filter"))]
+#[tracing::instrument]
 pub async fn create_filter_route() -> ConduitResult<create_filter::Response> {
     // TODO
     Ok(create_filter::Response::new(utils::random_string(10)).into())

src/client_server/keys.rs

@@ -22,6 +22,7 @@ use rocket::{get, post};
     feature = "conduit_bin",
     post("/_matrix/client/r0/keys/upload", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn upload_keys_route(
     db: State<'_, Database>,
     body: Ruma<upload_keys::Request>,
@@ -70,6 +71,7 @@ pub async fn upload_keys_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/keys/query", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_keys_route(
     db: State<'_, Database>,
     body: Ruma<get_keys::Request<'_>>,
@@ -150,6 +152,7 @@ pub async fn get_keys_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/keys/claim", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn claim_keys_route(
     db: State<'_, Database>,
     body: Ruma<claim_keys::Request>,
@@ -183,6 +186,7 @@ pub async fn claim_keys_route(
     feature = "conduit_bin",
     post("/_matrix/client/unstable/keys/device_signing/upload", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn upload_signing_keys_route(
     db: State<'_, Database>,
     body: Ruma<upload_signing_keys::Request<'_>>,
@@ -240,6 +244,7 @@ pub async fn upload_signing_keys_route(
     feature = "conduit_bin",
     post("/_matrix/client/unstable/keys/signatures/upload", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn upload_signatures_route(
     db: State<'_, Database>,
     body: Ruma<upload_signatures::Request>,
@@ -300,6 +305,7 @@ pub async fn upload_signatures_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/keys/changes", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_key_changes_route(
     db: State<'_, Database>,
     body: Ruma<get_key_changes::Request<'_>>,

src/client_server/media.rs

@@ -1,7 +1,5 @@
 use super::State;
-use crate::{
+use crate::{database::media::FileMeta, utils, ConduitResult, Database, Error, Ruma};
-    database::media::FileMeta, server_server, utils, ConduitResult, Database, Error, Ruma,
-};
 use ruma::api::client::{
     error::ErrorKind,
     r0::media::{create_content, get_content, get_content_thumbnail, get_media_config},
@@ -14,6 +12,7 @@ use std::convert::TryInto;
 const MXC_LENGTH: usize = 32;
 
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/media/r0/config"))]
+#[tracing::instrument(skip(db))]
 pub async fn get_media_config_route(
     db: State<'_, Database>,
 ) -> ConduitResult<get_media_config::Response> {
@@ -27,6 +26,7 @@ pub async fn get_media_config_route(
     feature = "conduit_bin",
     post("/_matrix/media/r0/upload", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn create_content_route(
     db: State<'_, Database>,
     body: Ruma<create_content::Request<'_>>,
@@ -45,13 +45,18 @@ pub async fn create_content_route(
 
     db.flush().await?;
 
-    Ok(create_content::Response { content_uri: mxc }.into())
+    Ok(create_content::Response {
+        content_uri: mxc.try_into().expect("Invalid mxc:// URI"),
+        blurhash: None,
+    }
+    .into())
 }
 
 #[cfg_attr(
     feature = "conduit_bin",
     get("/_matrix/media/r0/download/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_content_route(
     db: State<'_, Database>,
     body: Ruma<get_content::Request<'_>>,
@@ -71,16 +76,18 @@ pub async fn get_content_route(
         }
         .into())
     } else if &*body.server_name != db.globals.server_name() && body.allow_remote {
-        let get_content_response = server_server::send_request(
+        let get_content_response = db
-            &db.globals,
+            .sending
-            body.server_name.clone(),
+            .send_federation_request(
-            get_content::Request {
+                &db.globals,
-                allow_remote: false,
+                &body.server_name,
-                server_name: &body.server_name,
+                get_content::Request {
-                media_id: &body.media_id,
+                    allow_remote: false,
-            },
+                    server_name: &body.server_name,
-        )
+                    media_id: &body.media_id,
-        .await?;
+                },
+            )
+            .await?;
 
         db.media.create(
             mxc,
@@ -99,6 +106,7 @@ pub async fn get_content_route(
     feature = "conduit_bin",
     get("/_matrix/media/r0/thumbnail/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_content_thumbnail_route(
     db: State<'_, Database>,
     body: Ruma<get_content_thumbnail::Request<'_>>,
@@ -118,19 +126,21 @@ pub async fn get_content_thumbnail_route(
     )? {
         Ok(get_content_thumbnail::Response { file, content_type }.into())
     } else if &*body.server_name != db.globals.server_name() && body.allow_remote {
-        let get_thumbnail_response = server_server::send_request(
+        let get_thumbnail_response = db
-            &db.globals,
+            .sending
-            body.server_name.clone(),
+            .send_federation_request(
-            get_content_thumbnail::Request {
+                &db.globals,
-                allow_remote: false,
+                &body.server_name,
-                height: body.height,
+                get_content_thumbnail::Request {
-                width: body.width,
+                    allow_remote: false,
-                method: body.method,
+                    height: body.height,
-                server_name: &body.server_name,
+                    width: body.width,
-                media_id: &body.media_id,
+                    method: body.method.clone(),
-            },
+                    server_name: &body.server_name,
-        )
+                    media_id: &body.media_id,
-        .await?;
+                },
+            )
+            .await?;
 
         db.media.upload_thumbnail(
             mxc,

src/client_server/membership.rs

@@ -4,7 +4,9 @@ use crate::{
     pdu::{PduBuilder, PduEvent},
     server_server, utils, ConduitResult, Database, Error, Result, Ruma,
 };
-use log::warn;
+use log::{error, warn};
+use member::{MemberEventContent, MembershipState};
+use rocket::futures;
 use ruma::{
     api::{
         client::{
@@ -15,18 +17,21 @@ use ruma::{
                 unban_user, IncomingThirdPartySigned,
             },
         },
-        federation,
+        federation::{self, membership::create_invite},
     },
-    events::{pdu::Pdu, room::member, EventType},
+    events::{
-    serde::{to_canonical_value, CanonicalJsonObject, Raw},
+        pdu::Pdu,
-    EventId, RoomId, RoomVersionId, ServerName, UserId,
+        room::{create::CreateEventContent, member},
+        EventType,
+    },
+    serde::{to_canonical_value, CanonicalJsonObject, CanonicalJsonValue, Raw},
+    uint, EventId, RoomId, RoomVersionId, ServerName, UserId,
 };
-use state_res::StateEvent;
+use state_res::EventMap;
 use std::{
-    collections::{BTreeMap, HashMap, HashSet},
+    collections::{BTreeMap, HashSet},
-    convert::TryFrom,
+    convert::{TryFrom, TryInto},
-    iter,
+    sync::{Arc, RwLock},
-    sync::Arc,
 };
 
 #[cfg(feature = "conduit_bin")]
@@ -36,15 +41,34 @@ use rocket::{get, post};
     feature = "conduit_bin",
     post("/_matrix/client/r0/rooms/<_>/join", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn join_room_by_id_route(
     db: State<'_, Database>,
     body: Ruma<join_room_by_id::Request<'_>>,
 ) -> ConduitResult<join_room_by_id::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    let mut servers = db
+        .rooms
+        .invite_state(&sender_user, &body.room_id)?
+        .unwrap_or_default()
+        .iter()
+        .filter_map(|event| {
+            serde_json::from_str::<serde_json::Value>(&event.json().to_string()).ok()
+        })
+        .filter_map(|event| event.get("sender").cloned())
+        .filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
+        .filter_map(|sender| UserId::try_from(sender).ok())
+        .map(|user| user.server_name().to_owned())
+        .collect::<HashSet<_>>();
+
+    servers.insert(body.room_id.server_name().to_owned());
+
     join_room_by_id_helper(
         &db,
         body.sender_user.as_ref(),
         &body.room_id,
-        &[body.room_id.server_name().to_owned()],
+        &servers,
         body.third_party_signed.as_ref(),
     )
     .await
@@ -54,16 +78,36 @@ pub async fn join_room_by_id_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/join/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn join_room_by_id_or_alias_route(
     db: State<'_, Database>,
     body: Ruma<join_room_by_id_or_alias::Request<'_>>,
 ) -> ConduitResult<join_room_by_id_or_alias::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
     let (servers, room_id) = match RoomId::try_from(body.room_id_or_alias.clone()) {
-        Ok(room_id) => (vec![room_id.server_name().to_owned()], room_id),
+        Ok(room_id) => {
+            let mut servers = db
+                .rooms
+                .invite_state(&sender_user, &room_id)?
+                .unwrap_or_default()
+                .iter()
+                .filter_map(|event| {
+                    serde_json::from_str::<serde_json::Value>(&event.json().to_string()).ok()
+                })
+                .filter_map(|event| event.get("sender").cloned())
+                .filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
+                .filter_map(|sender| UserId::try_from(sender).ok())
+                .map(|user| user.server_name().to_owned())
+                .collect::<HashSet<_>>();
+
+            servers.insert(room_id.server_name().to_owned());
+            (servers, room_id)
+        }
         Err(room_alias) => {
             let response = client_server::get_alias_helper(&db, &room_alias).await?;
 
-            (response.0.servers, response.0.room_id)
+            (response.0.servers.into_iter().collect(), response.0.room_id)
         }
     };
 
@@ -88,47 +132,14 @@ pub async fn join_room_by_id_or_alias_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/rooms/<_>/leave", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn leave_room_route(
     db: State<'_, Database>,
     body: Ruma<leave_room::Request<'_>>,
 ) -> ConduitResult<leave_room::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let mut event = serde_json::from_value::<Raw<member::MemberEventContent>>(
+    db.rooms.leave_room(sender_user, &body.room_id, &db).await?;
-        db.rooms
-            .room_state_get(
-                &body.room_id,
-                &EventType::RoomMember,
-                &sender_user.to_string(),
-            )?
-            .ok_or(Error::BadRequest(
-                ErrorKind::BadState,
-                "Cannot leave a room you are not a member of.",
-            ))?
-            .1
-            .content,
-    )
-    .expect("from_value::<Raw<..>> can never fail")
-    .deserialize()
-    .map_err(|_| Error::bad_database("Invalid member event in database."))?;
-
-    event.membership = member::MembershipState::Leave;
-
-    db.rooms.build_and_append_pdu(
-        PduBuilder {
-            event_type: EventType::RoomMember,
-            content: serde_json::to_value(event).expect("event is valid, we just created it"),
-            unsigned: None,
-            state_key: Some(sender_user.to_string()),
-            redacts: None,
-        },
-        &sender_user,
-        &body.room_id,
-        &db.globals,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
-    )?;
 
     db.flush().await?;
 
@@ -139,6 +150,7 @@ pub async fn leave_room_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/rooms/<_>/invite", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn invite_user_route(
     db: State<'_, Database>,
     body: Ruma<invite_user::Request<'_>>,
@@ -146,31 +158,8 @@ pub async fn invite_user_route(
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if let invite_user::IncomingInvitationRecipient::UserId { user_id } = &body.recipient {
-        db.rooms.build_and_append_pdu(
+        invite_helper(sender_user, user_id, &body.room_id, &db, false).await?;
-            PduBuilder {
-                event_type: EventType::RoomMember,
-                content: serde_json::to_value(member::MemberEventContent {
-                    membership: member::MembershipState::Invite,
-                    displayname: db.users.displayname(&user_id)?,
-                    avatar_url: db.users.avatar_url(&user_id)?,
-                    is_direct: None,
-                    third_party_invite: None,
-                })
-                .expect("event is valid, we just created it"),
-                unsigned: None,
-                state_key: Some(user_id.to_string()),
-                redacts: None,
-            },
-            &sender_user,
-            &body.room_id,
-            &db.globals,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
-        )?;
-
         db.flush().await?;
-
         Ok(invite_user::Response.into())
     } else {
         Err(Error::BadRequest(ErrorKind::NotFound, "User not found."))
@@ -181,6 +170,7 @@ pub async fn invite_user_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/rooms/<_>/kick", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn kick_user_route(
     db: State<'_, Database>,
     body: Ruma<kick_user::Request<'_>>,
@@ -198,7 +188,6 @@ pub async fn kick_user_route(
                 ErrorKind::BadState,
                 "Cannot kick member that's not in the room.",
             ))?
-            .1
             .content,
     )
     .expect("Raw::from_value always works")
@@ -218,10 +207,7 @@ pub async fn kick_user_route(
         },
         &sender_user,
         &body.room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     db.flush().await?;
@@ -233,6 +219,7 @@ pub async fn kick_user_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/rooms/<_>/ban", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn ban_user_route(
     db: State<'_, Database>,
     body: Ruma<ban_user::Request<'_>>,
@@ -256,7 +243,7 @@ pub async fn ban_user_route(
                 is_direct: None,
                 third_party_invite: None,
             }),
-            |(_, event)| {
+            |event| {
                 let mut event =
                     serde_json::from_value::<Raw<member::MemberEventContent>>(event.content)
                         .expect("Raw::from_value always works")
@@ -277,10 +264,7 @@ pub async fn ban_user_route(
         },
         &sender_user,
         &body.room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     db.flush().await?;
@@ -292,6 +276,7 @@ pub async fn ban_user_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/rooms/<_>/unban", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn unban_user_route(
     db: State<'_, Database>,
     body: Ruma<unban_user::Request<'_>>,
@@ -309,7 +294,6 @@ pub async fn unban_user_route(
                 ErrorKind::BadState,
                 "Cannot unban a user who is not banned.",
             ))?
-            .1
             .content,
     )
     .expect("from_value::<Raw<..>> can never fail")
@@ -328,10 +312,7 @@ pub async fn unban_user_route(
         },
         &sender_user,
         &body.room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     db.flush().await?;
@@ -343,6 +324,7 @@ pub async fn unban_user_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/rooms/<_>/forget", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn forget_room_route(
     db: State<'_, Database>,
     body: Ruma<forget_room::Request<'_>>,
@@ -360,6 +342,7 @@ pub async fn forget_room_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/joined_rooms", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn joined_rooms_route(
     db: State<'_, Database>,
     body: Ruma<joined_rooms::Request>,
@@ -380,6 +363,7 @@ pub async fn joined_rooms_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/rooms/<_>/members", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_member_events_route(
     db: State<'_, Database>,
     body: Ruma<get_member_events::Request<'_>>,
@@ -396,9 +380,10 @@ pub async fn get_member_events_route(
     Ok(get_member_events::Response {
         chunk: db
             .rooms
-            .room_state_type(&body.room_id, &EventType::RoomMember)?
+            .room_state_full(&body.room_id)?
-            .values()
+            .iter()
-            .map(|pdu| pdu.to_member_event())
+            .filter(|(key, _)| key.0 == EventType::RoomMember)
+            .map(|(_, pdu)| pdu.to_member_event())
             .collect(),
     }
     .into())
@@ -408,6 +393,7 @@ pub async fn get_member_events_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/rooms/<_>/joined_members", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn joined_members_route(
     db: State<'_, Database>,
     body: Ruma<joined_members::Request<'_>>,
@@ -442,11 +428,12 @@ pub async fn joined_members_route(
     Ok(joined_members::Response { joined }.into())
 }
 
+#[tracing::instrument(skip(db))]
 async fn join_room_by_id_helper(
     db: &Database,
     sender_user: Option<&UserId>,
     room_id: &RoomId,
-    servers: &[Box<ServerName>],
+    servers: &HashSet<Box<ServerName>>,
     _third_party_signed: Option<&IncomingThirdPartySigned>,
 ) -> ConduitResult<join_room_by_id::Response> {
     let sender_user = sender_user.expect("user is authenticated");
@@ -458,16 +445,18 @@ async fn join_room_by_id_helper(
         ));
 
         for remote_server in servers {
-            let make_join_response = server_server::send_request(
+            let make_join_response = db
-                &db.globals,
+                .sending
-                remote_server.clone(),
+                .send_federation_request(
-                federation::membership::create_join_event_template::v1::Request {
+                    &db.globals,
-                    room_id,
+                    remote_server,
-                    user_id: sender_user,
+                    federation::membership::create_join_event_template::v1::Request {
-                    ver: &[RoomVersionId::Version5, RoomVersionId::Version6],
+                        room_id,
-                },
+                        user_id: sender_user,
-            )
+                        ver: &[RoomVersionId::Version6],
-            .await;
+                    },
+                )
+                .await;
 
             make_join_response_and_server = make_join_response.map(|r| (r, remote_server));
 
@@ -478,21 +467,29 @@ async fn join_room_by_id_helper(
 
         let (make_join_response, remote_server) = make_join_response_and_server?;
 
+        let room_version = match make_join_response.room_version {
+            Some(room_version) if room_version == RoomVersionId::Version6 => room_version,
+            _ => return Err(Error::BadServerResponse("Room version is not supported")),
+        };
+
         let mut join_event_stub =
             serde_json::from_str::<CanonicalJsonObject>(make_join_response.event.json().get())
                 .map_err(|_| {
                     Error::BadServerResponse("Invalid make_join event json received from server.")
                 })?;
 
+        // TODO: Is origin needed?
         join_event_stub.insert(
             "origin".to_owned(),
-            to_canonical_value(db.globals.server_name())
+            CanonicalJsonValue::String(db.globals.server_name().as_str().to_owned()),
-                .map_err(|_| Error::bad_database("Invalid server name found"))?,
         );
         join_event_stub.insert(
             "origin_server_ts".to_owned(),
-            to_canonical_value(utils::millis_since_unix_epoch())
+            CanonicalJsonValue::Integer(
-                .expect("Timestamp is valid js_int value"),
+                utils::millis_since_unix_epoch()
+                    .try_into()
+                    .expect("Timestamp is valid js_int value"),
+            ),
         );
         join_event_stub.insert(
             "content".to_owned(),
@@ -514,14 +511,14 @@ async fn join_room_by_id_helper(
             db.globals.server_name().as_str(),
             db.globals.keypair(),
             &mut join_event_stub,
-            &RoomVersionId::Version6,
+            &room_version,
         )
         .expect("event is valid, we just created it");
 
         // Generate event id
         let event_id = EventId::try_from(&*format!(
             "${}",
-            ruma::signatures::reference_hash(&join_event_stub, &RoomVersionId::Version6)
+            ruma::signatures::reference_hash(&join_event_stub, &room_version)
                 .expect("ruma can calculate reference hashes")
         ))
         .expect("ruma's reference hashes are valid event ids");
@@ -529,167 +526,139 @@ async fn join_room_by_id_helper(
         // Add event_id back
         join_event_stub.insert(
             "event_id".to_owned(),
-            to_canonical_value(&event_id).expect("EventId is a valid CanonicalJsonValue"),
+            CanonicalJsonValue::String(event_id.as_str().to_owned()),
         );
 
         // It has enough fields to be called a proper event now
         let join_event = join_event_stub;
 
-        let send_join_response = server_server::send_request(
+        let send_join_response = db
-            &db.globals,
+            .sending
-            remote_server.clone(),
+            .send_federation_request(
-            federation::membership::create_join_event::v2::Request {
-                room_id,
-                event_id: &event_id,
-                pdu: PduEvent::convert_to_outgoing_federation_event(join_event.clone()),
-            },
-        )
-        .await?;
-
-        let add_event_id = |pdu: &Raw<Pdu>| -> Result<(EventId, CanonicalJsonObject)> {
-            let mut value = serde_json::from_str(pdu.json().get())
-                .expect("converting raw jsons to values always works");
-            let event_id = EventId::try_from(&*format!(
-                "${}",
-                ruma::signatures::reference_hash(&value, &RoomVersionId::Version6)
-                    .expect("ruma can calculate reference hashes")
-            ))
-            .expect("ruma's reference hashes are valid event ids");
-
-            value.insert(
-                "event_id".to_owned(),
-                to_canonical_value(&event_id)
-                    .expect("a valid EventId can be converted to CanonicalJsonValue"),
-            );
-
-            Ok((event_id, value))
-        };
-
-        let room_state = send_join_response.room_state.state.iter().map(add_event_id);
-
-        let state_events = room_state
-            .clone()
-            .map(|pdu: Result<(EventId, CanonicalJsonObject)>| Ok(pdu?.0))
-            .chain(iter::once(Ok(event_id.clone()))) // Add join event we just created
-            .collect::<Result<HashSet<EventId>>>()?;
-
-        let auth_chain = send_join_response
-            .room_state
-            .auth_chain
-            .iter()
-            .map(add_event_id);
-
-        let mut event_map = room_state
-            .chain(auth_chain)
-            .chain(iter::once(Ok((event_id, join_event)))) // Add join event we just created
-            .map(|r| {
-                let (event_id, value) = r?;
-                state_res::StateEvent::from_id_canon_obj(event_id.clone(), value.clone())
-                    .map(|ev| (event_id, Arc::new(ev)))
-                    .map_err(|e| {
-                        warn!("{:?}: {}", value, e);
-                        Error::BadServerResponse("Invalid PDU in send_join response.")
-                    })
-            })
-            .collect::<Result<BTreeMap<EventId, Arc<StateEvent>>>>()?;
-
-        let control_events = event_map
-            .values()
-            .filter(|pdu| pdu.is_power_event())
-            .map(|pdu| pdu.event_id())
-            .collect::<Vec<_>>();
-
-        // These events are not guaranteed to be sorted but they are resolved according to spec
-        // we auth them anyways to weed out faulty/malicious server. The following is basically the
-        // full state resolution algorithm.
-        let event_ids = event_map.keys().cloned().collect::<Vec<_>>();
-
-        let sorted_control_events = state_res::StateResolution::reverse_topological_power_sort(
-            &room_id,
-            &control_events,
-            &mut event_map,
-            &db.rooms,
-            &event_ids,
-        );
-
-        // Auth check each event against the "partial" state created by the preceding events
-        let resolved_control_events = state_res::StateResolution::iterative_auth_check(
-            room_id,
-            &RoomVersionId::Version6,
-            &sorted_control_events,
-            &BTreeMap::new(), // We have no "clean/resolved" events to add (these extend the `resolved_control_events`)
-            &mut event_map,
-            &db.rooms,
-        )
-        .expect("iterative auth check failed on resolved events");
-
-        // This removes the control events that failed auth, leaving the resolved
-        // to be mainline sorted. In the actual `state_res::StateResolution::resolve`
-        // function both are removed since these are all events we don't know of
-        // we must keep track of everything to add to our DB.
-        let events_to_sort = event_map
-            .keys()
-            .filter(|id| {
-                !sorted_control_events.contains(id)
-                    || resolved_control_events.values().any(|rid| *id == rid)
-            })
-            .cloned()
-            .collect::<Vec<_>>();
-
-        let power_level = resolved_control_events.get(&(EventType::RoomPowerLevels, "".into()));
-        // Sort the remaining non control events
-        let sorted_event_ids = state_res::StateResolution::mainline_sort(
-            room_id,
-            &events_to_sort,
-            power_level,
-            &mut event_map,
-            &db.rooms,
-        );
-
-        let resolved_events = state_res::StateResolution::iterative_auth_check(
-            room_id,
-            &RoomVersionId::Version6,
-            &sorted_event_ids,
-            &resolved_control_events,
-            &mut event_map,
-            &db.rooms,
-        )
-        .expect("iterative auth check failed on resolved events");
-
-        let mut state = HashMap::new();
-
-        // filter the events that failed the auth check keeping the remaining events
-        // sorted correctly
-        for ev_id in sorted_event_ids
-            .iter()
-            .filter(|id| resolved_events.values().any(|rid| rid == *id))
-        {
-            // this is a `state_res::StateEvent` that holds a `ruma::Pdu`
-            let pdu = event_map
-                .get(ev_id)
-                .expect("Found event_id in sorted events that is not in resolved state");
-
-            // We do not rebuild the PDU in this case only insert to DB
-            let count = db.globals.next_count()?;
-            let mut pdu_id = room_id.as_bytes().to_vec();
-            pdu_id.push(0xff);
-            pdu_id.extend_from_slice(&count.to_be_bytes());
-            db.rooms.append_pdu(
-                &PduEvent::from(&**pdu),
-                &utils::to_canonical_object(&**pdu).expect("Pdu is valid canonical object"),
-                count,
-                pdu_id.clone().into(),
                 &db.globals,
-                &db.account_data,
+                remote_server,
-                &db.admin,
+                federation::membership::create_join_event::v2::Request {
-            )?;
+                    room_id,
+                    event_id: &event_id,
+                    pdu: PduEvent::convert_to_outgoing_federation_event(join_event.clone()),
+                },
+            )
+            .await?;
 
-            if state_events.contains(ev_id) {
+        let count = db.globals.next_count()?;
-                state.insert((pdu.kind(), pdu.state_key()), pdu_id);
+
+        let mut pdu_id = room_id.as_bytes().to_vec();
+        pdu_id.push(0xff);
+        pdu_id.extend_from_slice(&count.to_be_bytes());
+
+        let pdu = PduEvent::from_id_val(&event_id, join_event.clone())
+            .map_err(|_| Error::BadServerResponse("Invalid join event PDU."))?;
+
+        let mut state = BTreeMap::new();
+        let pub_key_map = RwLock::new(BTreeMap::new());
+
+        for result in futures::future::join_all(
+            send_join_response
+                .room_state
+                .state
+                .iter()
+                .map(|pdu| validate_and_add_event_id(pdu, &room_version, &pub_key_map, &db)),
+        )
+        .await
+        {
+            let (event_id, value) = match result {
+                Ok(t) => t,
+                Err(_) => continue,
+            };
+
+            let pdu = PduEvent::from_id_val(&event_id, value.clone()).map_err(|e| {
+                warn!("{:?}: {}", value, e);
+                Error::BadServerResponse("Invalid PDU in send_join response.")
+            })?;
+
+            db.rooms.add_pdu_outlier(&event_id, &value)?;
+            if let Some(state_key) = &pdu.state_key {
+                if pdu.kind == EventType::RoomMember {
+                    let target_user_id = UserId::try_from(state_key.clone()).map_err(|e| {
+                        warn!(
+                            "Invalid user id in send_join response: {}: {}",
+                            state_key, e
+                        );
+                        Error::BadServerResponse("Invalid user id in send_join response.")
+                    })?;
+
+                    let invite_state = Vec::new(); // TODO add a few important events
+
+                    // Update our membership info, we do this here incase a user is invited
+                    // and immediately leaves we need the DB to record the invite event for auth
+                    db.rooms.update_membership(
+                        &pdu.room_id,
+                        &target_user_id,
+                        serde_json::from_value::<member::MembershipState>(
+                            pdu.content
+                                .get("membership")
+                                .ok_or(Error::BadServerResponse("Invalid member event content"))?
+                                .clone(),
+                        )
+                        .map_err(|_| {
+                            Error::BadServerResponse("Invalid membership state content.")
+                        })?,
+                        &pdu.sender,
+                        Some(invite_state),
+                        db,
+                    )?;
+                }
+                state.insert((pdu.kind.clone(), state_key.clone()), pdu.event_id.clone());
             }
         }
 
-        db.rooms.force_state(room_id, state)?;
+        state.insert(
+            (
+                pdu.kind.clone(),
+                pdu.state_key.clone().expect("join event has state key"),
+            ),
+            pdu.event_id.clone(),
+        );
+
+        if state.get(&(EventType::RoomCreate, "".to_owned())).is_none() {
+            return Err(Error::BadServerResponse("State contained no create event."));
+        }
+
+        db.rooms.force_state(room_id, state, &db)?;
+
+        for result in futures::future::join_all(
+            send_join_response
+                .room_state
+                .auth_chain
+                .iter()
+                .map(|pdu| validate_and_add_event_id(pdu, &room_version, &pub_key_map, &db)),
+        )
+        .await
+        {
+            let (event_id, value) = match result {
+                Ok(t) => t,
+                Err(_) => continue,
+            };
+
+            db.rooms.add_pdu_outlier(&event_id, &value)?;
+        }
+
+        // We append to state before appending the pdu, so we don't have a moment in time with the
+        // pdu without it's state. This is okay because append_pdu can't fail.
+        let statehashid = db.rooms.append_to_state(&pdu, &db.globals)?;
+
+        db.rooms.append_pdu(
+            &pdu,
+            utils::to_canonical_object(&pdu).expect("Pdu is valid canonical object"),
+            db.globals.next_count()?,
+            pdu_id.into(),
+            &[pdu.event_id.clone()],
+            db,
+        )?;
+
+        // We set the room state after inserting the pdu, so that we never have a moment in time
+        // where events in the current room state do not exist
+        db.rooms.set_room_state(&room_id, statehashid)?;
     } else {
         let event = member::MemberEventContent {
             membership: member::MembershipState::Join,
@@ -709,12 +678,287 @@ async fn join_room_by_id_helper(
             },
             &sender_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
     }
 
+    db.flush().await?;
+
     Ok(join_room_by_id::Response::new(room_id.clone()).into())
 }
+
+async fn validate_and_add_event_id(
+    pdu: &Raw<Pdu>,
+    room_version: &RoomVersionId,
+    pub_key_map: &RwLock<BTreeMap<String, BTreeMap<String, String>>>,
+    db: &Database,
+) -> Result<(EventId, CanonicalJsonObject)> {
+    let mut value = serde_json::from_str::<CanonicalJsonObject>(pdu.json().get()).map_err(|e| {
+        error!("{:?}: {:?}", pdu, e);
+        Error::BadServerResponse("Invalid PDU in server response")
+    })?;
+
+    server_server::fetch_required_signing_keys(&value, pub_key_map, db).await?;
+    if let Err(e) = ruma::signatures::verify_event(
+        &*pub_key_map
+            .read()
+            .map_err(|_| Error::bad_database("RwLock is poisoned."))?,
+        &value,
+        room_version,
+    ) {
+        warn!("Event failed verification: {}", e);
+        return Err(Error::BadServerResponse("Event failed verification."));
+    }
+
+    let event_id = EventId::try_from(&*format!(
+        "${}",
+        ruma::signatures::reference_hash(&value, &room_version)
+            .expect("ruma can calculate reference hashes")
+    ))
+    .expect("ruma's reference hashes are valid event ids");
+
+    value.insert(
+        "event_id".to_owned(),
+        CanonicalJsonValue::String(event_id.as_str().to_owned()),
+    );
+
+    Ok((event_id, value))
+}
+
+pub async fn invite_helper(
+    sender_user: &UserId,
+    user_id: &UserId,
+    room_id: &RoomId,
+    db: &Database,
+    is_direct: bool,
+) -> Result<()> {
+    if user_id.server_name() != db.globals.server_name() {
+        let prev_events = db
+            .rooms
+            .get_pdu_leaves(room_id)?
+            .into_iter()
+            .take(20)
+            .collect::<Vec<_>>();
+
+        let create_event = db
+            .rooms
+            .room_state_get(room_id, &EventType::RoomCreate, "")?;
+
+        let create_event_content = create_event
+            .as_ref()
+            .map(|create_event| {
+                Ok::<_, Error>(
+                    serde_json::from_value::<Raw<CreateEventContent>>(create_event.content.clone())
+                        .expect("Raw::from_value always works.")
+                        .deserialize()
+                        .map_err(|_| Error::bad_database("Invalid PowerLevels event in db."))?,
+                )
+            })
+            .transpose()?;
+
+        let create_prev_event = if prev_events.len() == 1
+            && Some(&prev_events[0]) == create_event.as_ref().map(|c| &c.event_id)
+        {
+            create_event.map(Arc::new)
+        } else {
+            None
+        };
+
+        // If there was no create event yet, assume we are creating a version 6 room right now
+        let room_version = create_event_content.map_or(RoomVersionId::Version6, |create_event| {
+            create_event.room_version
+        });
+
+        let content = serde_json::to_value(MemberEventContent {
+            avatar_url: None,
+            displayname: None,
+            is_direct: Some(is_direct),
+            membership: MembershipState::Invite,
+            third_party_invite: None,
+        })
+        .expect("member event is valid value");
+
+        let state_key = user_id.to_string();
+        let kind = EventType::RoomMember;
+
+        let auth_events =
+            db.rooms
+                .get_auth_events(room_id, &kind, &sender_user, Some(&state_key), &content)?;
+
+        // Our depth is the maximum depth of prev_events + 1
+        let depth = prev_events
+            .iter()
+            .filter_map(|event_id| Some(db.rooms.get_pdu(event_id).ok()??.depth))
+            .max()
+            .unwrap_or_else(|| uint!(0))
+            + uint!(1);
+
+        let mut unsigned = BTreeMap::new();
+
+        if let Some(prev_pdu) = db.rooms.room_state_get(room_id, &kind, &state_key)? {
+            unsigned.insert("prev_content".to_owned(), prev_pdu.content);
+            unsigned.insert(
+                "prev_sender".to_owned(),
+                serde_json::to_value(prev_pdu.sender).expect("UserId::to_value always works"),
+            );
+        }
+
+        let pdu = PduEvent {
+            event_id: ruma::event_id!("$thiswillbefilledinlater"),
+            room_id: room_id.clone(),
+            sender: sender_user.clone(),
+            origin_server_ts: utils::millis_since_unix_epoch()
+                .try_into()
+                .expect("time is valid"),
+            kind,
+            content,
+            state_key: Some(state_key),
+            prev_events,
+            depth,
+            auth_events: auth_events
+                .iter()
+                .map(|(_, pdu)| pdu.event_id.clone())
+                .collect(),
+            redacts: None,
+            unsigned,
+            hashes: ruma::events::pdu::EventHash {
+                sha256: "aaa".to_owned(),
+            },
+            signatures: BTreeMap::new(),
+        };
+
+        let auth_check = state_res::auth_check(
+            &room_version,
+            &Arc::new(pdu.clone()),
+            create_prev_event,
+            &auth_events,
+            None, // TODO: third_party_invite
+        )
+        .map_err(|e| {
+            error!("{:?}", e);
+            Error::bad_database("Auth check failed.")
+        })?;
+
+        if !auth_check {
+            return Err(Error::BadRequest(
+                ErrorKind::InvalidParam,
+                "Event is not authorized.",
+            ));
+        }
+
+        // Hash and sign
+        let mut pdu_json =
+            utils::to_canonical_object(&pdu).expect("event is valid, we just created it");
+
+        pdu_json.remove("event_id");
+
+        // Add origin because synapse likes that (and it's required in the spec)
+        pdu_json.insert(
+            "origin".to_owned(),
+            to_canonical_value(db.globals.server_name())
+                .expect("server name is a valid CanonicalJsonValue"),
+        );
+
+        ruma::signatures::hash_and_sign_event(
+            db.globals.server_name().as_str(),
+            db.globals.keypair(),
+            &mut pdu_json,
+            &room_version,
+        )
+        .expect("event is valid, we just created it");
+
+        let invite_room_state = db.rooms.calculate_invite_state(&pdu)?;
+        let response = db
+            .sending
+            .send_federation_request(
+                &db.globals,
+                user_id.server_name(),
+                create_invite::v2::Request {
+                    room_id: room_id.clone(),
+                    event_id: ruma::event_id!("$receivingservershouldsetthis"),
+                    room_version: RoomVersionId::Version6,
+                    event: PduEvent::convert_to_outgoing_federation_event(pdu_json),
+                    invite_room_state,
+                },
+            )
+            .await?;
+
+        let pub_key_map = RwLock::new(BTreeMap::new());
+        let mut auth_cache = EventMap::new();
+
+        // We do not add the event_id field to the pdu here because of signature and hashes checks
+        let (event_id, value) = match crate::pdu::gen_event_id_canonical_json(&response.event) {
+            Ok(t) => t,
+            Err(_) => {
+                // Event could not be converted to canonical json
+                return Err(Error::BadRequest(
+                    ErrorKind::InvalidParam,
+                    "Could not convert event to canonical json.",
+                ));
+            }
+        };
+
+        let origin = serde_json::from_value::<Box<ServerName>>(
+            serde_json::to_value(value.get("origin").ok_or(Error::BadRequest(
+                ErrorKind::InvalidParam,
+                "Event needs an origin field.",
+            ))?)
+            .expect("CanonicalJson is valid json value"),
+        )
+        .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Origin field is invalid."))?;
+
+        let pdu_id = server_server::handle_incoming_pdu(
+            &origin,
+            &event_id,
+            value,
+            true,
+            &db,
+            &pub_key_map,
+            &mut auth_cache,
+        )
+        .await
+        .map_err(|_| {
+            Error::BadRequest(
+                ErrorKind::InvalidParam,
+                "Error while handling incoming PDU.",
+            )
+        })?
+        .ok_or(Error::BadRequest(
+            ErrorKind::InvalidParam,
+            "Could not accept incoming PDU as timeline event.",
+        ))?;
+
+        for server in db
+            .rooms
+            .room_servers(room_id)
+            .filter_map(|r| r.ok())
+            .filter(|server| &**server != db.globals.server_name())
+        {
+            db.sending.send_pdu(&server, &pdu_id)?;
+        }
+
+        return Ok(());
+    }
+
+    db.rooms.build_and_append_pdu(
+        PduBuilder {
+            event_type: EventType::RoomMember,
+            content: serde_json::to_value(member::MemberEventContent {
+                membership: member::MembershipState::Invite,
+                displayname: db.users.displayname(&user_id)?,
+                avatar_url: db.users.avatar_url(&user_id)?,
+                is_direct: None,
+                third_party_invite: None,
+            })
+            .expect("event is valid, we just created it"),
+            unsigned: None,
+            state_key: Some(user_id.to_string()),
+            redacts: None,
+        },
+        &sender_user,
+        room_id,
+        &db,
+    )?;
+
+    Ok(())
+}

src/client_server/message.rs

@@ -5,10 +5,13 @@ use ruma::{
         error::ErrorKind,
         r0::message::{get_message_events, send_message_event},
     },
-    events::EventContent,
+    events::EventType,
     EventId,
 };
-use std::convert::{TryFrom, TryInto};
+use std::{
+    collections::BTreeMap,
+    convert::{TryFrom, TryInto},
+};
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};
@@ -17,12 +20,13 @@ use rocket::{get, put};
     feature = "conduit_bin",
     put("/_matrix/client/r0/rooms/<_>/send/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn send_message_event_route(
     db: State<'_, Database>,
     body: Ruma<send_message_event::Request<'_>>,
 ) -> ConduitResult<send_message_event::Response> {
     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 sender_device = body.sender_device.as_deref();
 
     // Check if this is a new transaction id
     if let Some(response) =
@@ -46,12 +50,12 @@ pub async fn send_message_event_route(
         return Ok(send_message_event::Response { event_id }.into());
     }
 
-    let mut unsigned = serde_json::Map::new();
+    let mut unsigned = BTreeMap::new();
     unsigned.insert("transaction_id".to_owned(), body.txn_id.clone().into());
 
     let event_id = db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: body.content.event_type().into(),
+            event_type: EventType::from(&body.event_type),
             content: serde_json::from_str(
                 body.json_body
                     .as_ref()
@@ -65,10 +69,7 @@ pub async fn send_message_event_route(
         },
         &sender_user,
         &body.room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     db.transaction_ids.add_txnid(
@@ -87,6 +88,7 @@ pub async fn send_message_event_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/rooms/<_>/messages", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_message_events_route(
     db: State<'_, Database>,
     body: Ruma<get_message_events::Request<'_>>,

src/client_server/mod.rs

@@ -75,6 +75,7 @@ const SESSION_ID_LENGTH: usize = 256;
 
 #[cfg(feature = "conduit_bin")]
 #[options("/<_..>")]
+#[tracing::instrument]
 pub async fn options_route() -> ConduitResult<send_event_to_device::Response> {
     Ok(send_event_to_device::Response.into())
 }

src/client_server/presence.rs

@@ -10,6 +10,7 @@ use rocket::put;
     feature = "conduit_bin",
     put("/_matrix/client/r0/presence/<_>/status", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn set_presence_route(
     db: State<'_, Database>,
     body: Ruma<set_presence::Request<'_>>,

src/client_server/profile.rs

@@ -19,6 +19,7 @@ use std::convert::TryInto;
     feature = "conduit_bin",
     put("/_matrix/client/r0/profile/<_>/displayname", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn set_displayname_route(
     db: State<'_, Database>,
     body: Ruma<set_display_name::Request<'_>>,
@@ -29,45 +30,48 @@ pub async fn set_displayname_route(
         .set_displayname(&sender_user, body.displayname.clone())?;
 
     // Send a new membership event and presence update into all joined rooms
-    for room_id in db.rooms.rooms_joined(&sender_user) {
+    for (pdu_builder, room_id) in db
-        let room_id = room_id?;
+        .rooms
-        db.rooms.build_and_append_pdu(
+        .rooms_joined(&sender_user)
-            PduBuilder {
+        .filter_map(|r| r.ok())
-                event_type: EventType::RoomMember,
+        .map(|room_id| {
-                content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
+            Ok::<_, Error>((
-                    displayname: body.displayname.clone(),
+                PduBuilder {
-                    ..serde_json::from_value::<Raw<_>>(
+                    event_type: EventType::RoomMember,
-                        db.rooms
+                    content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
-                            .room_state_get(
+                        displayname: body.displayname.clone(),
-                                &room_id,
+                        ..serde_json::from_value::<Raw<_>>(
-                                &EventType::RoomMember,
+                            db.rooms
-                                &sender_user.to_string(),
+                                .room_state_get(
-                            )?
+                                    &room_id,
-                            .ok_or_else(|| {
+                                    &EventType::RoomMember,
-                                Error::bad_database(
+                                    &sender_user.to_string(),
-                                    "Tried to send displayname update for user not in the room.",
+                                )?
-                                )
+                                .ok_or_else(|| {
-                            })?
+                                    Error::bad_database(
-                            .1
+                                        "Tried to send displayname update for user not in the \
-                            .content
+                                         room.",
-                            .clone(),
+                                    )
-                    )
+                                })?
-                    .expect("from_value::<Raw<..>> can never fail")
+                                .content,
-                    .deserialize()
+                        )
-                    .map_err(|_| Error::bad_database("Database contains invalid PDU."))?
+                        .expect("from_value::<Raw<..>> can never fail")
-                })
+                        .deserialize()
-                .expect("event is valid, we just created it"),
+                        .map_err(|_| Error::bad_database("Database contains invalid PDU."))?
-                unsigned: None,
+                    })
-                state_key: Some(sender_user.to_string()),
+                    .expect("event is valid, we just created it"),
-                redacts: None,
+                    unsigned: None,
-            },
+                    state_key: Some(sender_user.to_string()),
-            &sender_user,
+                    redacts: None,
-            &room_id,
+                },
-            &db.globals,
+                room_id,
-            &db.sending,
+            ))
-            &db.admin,
+        })
-            &db.account_data,
+        .filter_map(|r| r.ok())
-        )?;
+    {
+        let _ = db
+            .rooms
+            .build_and_append_pdu(pdu_builder, &sender_user, &room_id, &db);
 
         // Presence update
         db.rooms.edus.update_presence(
@@ -101,6 +105,7 @@ pub async fn set_displayname_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/profile/<_>/displayname", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_displayname_route(
     db: State<'_, Database>,
     body: Ruma<get_display_name::Request<'_>>,
@@ -115,6 +120,7 @@ pub async fn get_displayname_route(
     feature = "conduit_bin",
     put("/_matrix/client/r0/profile/<_>/avatar_url", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn set_avatar_url_route(
     db: State<'_, Database>,
     body: Ruma<set_avatar_url::Request<'_>>,
@@ -125,45 +131,48 @@ pub async fn set_avatar_url_route(
         .set_avatar_url(&sender_user, body.avatar_url.clone())?;
 
     // Send a new membership event and presence update into all joined rooms
-    for room_id in db.rooms.rooms_joined(&sender_user) {
+    for (pdu_builder, room_id) in db
-        let room_id = room_id?;
+        .rooms
-        db.rooms.build_and_append_pdu(
+        .rooms_joined(&sender_user)
-            PduBuilder {
+        .filter_map(|r| r.ok())
-                event_type: EventType::RoomMember,
+        .map(|room_id| {
-                content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
+            Ok::<_, Error>((
-                    avatar_url: body.avatar_url.clone(),
+                PduBuilder {
-                    ..serde_json::from_value::<Raw<_>>(
+                    event_type: EventType::RoomMember,
-                        db.rooms
+                    content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
-                            .room_state_get(
+                        avatar_url: body.avatar_url.clone(),
-                                &room_id,
+                        ..serde_json::from_value::<Raw<_>>(
-                                &EventType::RoomMember,
+                            db.rooms
-                                &sender_user.to_string(),
+                                .room_state_get(
-                            )?
+                                    &room_id,
-                            .ok_or_else(|| {
+                                    &EventType::RoomMember,
-                                Error::bad_database(
+                                    &sender_user.to_string(),
-                                    "Tried to send avatar url update for user not in the room.",
+                                )?
-                                )
+                                .ok_or_else(|| {
-                            })?
+                                    Error::bad_database(
-                            .1
+                                        "Tried to send displayname update for user not in the \
-                            .content
+                                         room.",
-                            .clone(),
+                                    )
-                    )
+                                })?
-                    .expect("from_value::<Raw<..>> can never fail")
+                                .content,
-                    .deserialize()
+                        )
-                    .map_err(|_| Error::bad_database("Database contains invalid PDU."))?
+                        .expect("from_value::<Raw<..>> can never fail")
-                })
+                        .deserialize()
-                .expect("event is valid, we just created it"),
+                        .map_err(|_| Error::bad_database("Database contains invalid PDU."))?
-                unsigned: None,
+                    })
-                state_key: Some(sender_user.to_string()),
+                    .expect("event is valid, we just created it"),
-                redacts: None,
+                    unsigned: None,
-            },
+                    state_key: Some(sender_user.to_string()),
-            &sender_user,
+                    redacts: None,
-            &room_id,
+                },
-            &db.globals,
+                room_id,
-            &db.sending,
+            ))
-            &db.admin,
+        })
-            &db.account_data,
+        .filter_map(|r| r.ok())
-        )?;
+    {
+        let _ = db
+            .rooms
+            .build_and_append_pdu(pdu_builder, &sender_user, &room_id, &db);
 
         // Presence update
         db.rooms.edus.update_presence(
@@ -197,6 +206,7 @@ pub async fn set_avatar_url_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/profile/<_>/avatar_url", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_avatar_url_route(
     db: State<'_, Database>,
     body: Ruma<get_avatar_url::Request<'_>>,
@@ -211,6 +221,7 @@ pub async fn get_avatar_url_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/profile/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_profile_route(
     db: State<'_, Database>,
     body: Ruma<get_profile::Request<'_>>,

src/client_server/push.rs

@@ -1,21 +1,26 @@
 use super::State;
 use crate::{ConduitResult, Database, Error, Ruma};
-use log::warn;
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::push::{get_pushers, get_pushrules_all, set_pushrule, set_pushrule_enabled},
+        r0::push::{
+            delete_pushrule, get_pushers, get_pushrule, get_pushrule_actions, get_pushrule_enabled,
+            get_pushrules_all, set_pusher, set_pushrule, set_pushrule_actions,
+            set_pushrule_enabled, RuleKind,
+        },
     },
-    events::EventType,
+    events::{push_rules, EventType},
+    push::{ConditionalPushRuleInit, PatternedPushRuleInit, SimplePushRuleInit},
 };
 
 #[cfg(feature = "conduit_bin")]
-use rocket::{get, post, put};
+use rocket::{delete, get, post, put};
 
 #[cfg_attr(
     feature = "conduit_bin",
     get("/_matrix/client/r0/pushrules", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_pushrules_all_route(
     db: State<'_, Database>,
     body: Ruma<get_pushrules_all::Request>,
@@ -24,7 +29,7 @@ pub async fn get_pushrules_all_route(
 
     let event = db
         .account_data
-        .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "PushRules event not found.",
@@ -36,16 +41,157 @@ pub async fn get_pushrules_all_route(
     .into())
 }
 
-#[cfg_attr(feature = "conduit_bin", put(
+#[cfg_attr(
-    "/_matrix/client/r0/pushrules/<_>/<_>/<_>",
+    feature = "conduit_bin",
-    //data = "<body>"
+    get("/_matrix/client/r0/pushrules/<_>/<_>/<_>", data = "<body>")
-))]
+)]
+#[tracing::instrument(skip(db, body))]
+pub async fn get_pushrule_route(
+    db: State<'_, Database>,
+    body: Ruma<get_pushrule::Request<'_>>,
+) -> ConduitResult<get_pushrule::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    let event = db
+        .account_data
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .ok_or(Error::BadRequest(
+            ErrorKind::NotFound,
+            "PushRules event not found.",
+        ))?;
+
+    let global = event.content.global;
+    let rule = match body.kind {
+        RuleKind::Override => global
+            .override_
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.clone().into()),
+        RuleKind::Underride => global
+            .underride
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.clone().into()),
+        RuleKind::Sender => global
+            .sender
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.clone().into()),
+        RuleKind::Room => global
+            .room
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.clone().into()),
+        RuleKind::Content => global
+            .content
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.clone().into()),
+        RuleKind::_Custom(_) => None,
+    };
+
+    if let Some(rule) = rule {
+        Ok(get_pushrule::Response { rule }.into())
+    } else {
+        Err(Error::BadRequest(
+            ErrorKind::NotFound,
+            "Push rule not found.",
+        ))
+    }
+}
+
+#[cfg_attr(
+    feature = "conduit_bin",
+    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>", data = "<req>")
+)]
+#[tracing::instrument(skip(db, req))]
 pub async fn set_pushrule_route(
     db: State<'_, Database>,
-    //body: Ruma<set_pushrule::Request>,
+    req: Ruma<set_pushrule::Request<'_>>,
 ) -> ConduitResult<set_pushrule::Response> {
-    // TODO
+    let sender_user = req.sender_user.as_ref().expect("user is authenticated");
-    warn!("TODO: set_pushrule_route");
+    let body = req.body;
+
+    if body.scope != "global" {
+        return Err(Error::BadRequest(
+            ErrorKind::InvalidParam,
+            "Scopes other than 'global' are not supported.",
+        ));
+    }
+
+    let mut event = db
+        .account_data
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .ok_or(Error::BadRequest(
+            ErrorKind::NotFound,
+            "PushRules event not found.",
+        ))?;
+
+    let global = &mut event.content.global;
+    match body.kind {
+        RuleKind::Override => {
+            global.override_.replace(
+                ConditionalPushRuleInit {
+                    actions: body.actions,
+                    default: false,
+                    enabled: true,
+                    rule_id: body.rule_id,
+                    conditions: body.conditions,
+                }
+                .into(),
+            );
+        }
+        RuleKind::Underride => {
+            global.underride.replace(
+                ConditionalPushRuleInit {
+                    actions: body.actions,
+                    default: false,
+                    enabled: true,
+                    rule_id: body.rule_id,
+                    conditions: body.conditions,
+                }
+                .into(),
+            );
+        }
+        RuleKind::Sender => {
+            global.sender.replace(
+                SimplePushRuleInit {
+                    actions: body.actions,
+                    default: false,
+                    enabled: true,
+                    rule_id: body.rule_id,
+                }
+                .into(),
+            );
+        }
+        RuleKind::Room => {
+            global.room.replace(
+                SimplePushRuleInit {
+                    actions: body.actions,
+                    default: false,
+                    enabled: true,
+                    rule_id: body.rule_id,
+                }
+                .into(),
+            );
+        }
+        RuleKind::Content => {
+            global.content.replace(
+                PatternedPushRuleInit {
+                    actions: body.actions,
+                    default: false,
+                    enabled: true,
+                    rule_id: body.rule_id,
+                    pattern: body.pattern.unwrap_or_default(),
+                }
+                .into(),
+            );
+        }
+        RuleKind::_Custom(_) => {}
+    }
+
+    db.account_data.update(
+        None,
+        &sender_user,
+        EventType::PushRules,
+        &event,
+        &db.globals,
+    )?;
 
     db.flush().await?;
 
@@ -54,33 +200,378 @@ pub async fn set_pushrule_route(
 
 #[cfg_attr(
     feature = "conduit_bin",
-    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>/enabled")
+    get("/_matrix/client/r0/pushrules/<_>/<_>/<_>/actions", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
+pub async fn get_pushrule_actions_route(
+    db: State<'_, Database>,
+    body: Ruma<get_pushrule_actions::Request<'_>>,
+) -> ConduitResult<get_pushrule_actions::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    if body.scope != "global" {
+        return Err(Error::BadRequest(
+            ErrorKind::InvalidParam,
+            "Scopes other than 'global' are not supported.",
+        ));
+    }
+
+    let mut event = db
+        .account_data
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .ok_or(Error::BadRequest(
+            ErrorKind::NotFound,
+            "PushRules event not found.",
+        ))?;
+
+    let global = &mut event.content.global;
+    let actions = match body.kind {
+        RuleKind::Override => global
+            .override_
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.actions.clone()),
+        RuleKind::Underride => global
+            .underride
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.actions.clone()),
+        RuleKind::Sender => global
+            .sender
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.actions.clone()),
+        RuleKind::Room => global
+            .room
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.actions.clone()),
+        RuleKind::Content => global
+            .content
+            .get(body.rule_id.as_str())
+            .map(|rule| rule.actions.clone()),
+        RuleKind::_Custom(_) => None,
+    };
+
+    db.flush().await?;
+
+    Ok(get_pushrule_actions::Response {
+        actions: actions.unwrap_or_default(),
+    }
+    .into())
+}
+
+#[cfg_attr(
+    feature = "conduit_bin",
+    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>/actions", data = "<body>")
+)]
+#[tracing::instrument(skip(db, body))]
+pub async fn set_pushrule_actions_route(
+    db: State<'_, Database>,
+    body: Ruma<set_pushrule_actions::Request<'_>>,
+) -> ConduitResult<set_pushrule_actions::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    if body.scope != "global" {
+        return Err(Error::BadRequest(
+            ErrorKind::InvalidParam,
+            "Scopes other than 'global' are not supported.",
+        ));
+    }
+
+    let mut event = db
+        .account_data
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .ok_or(Error::BadRequest(
+            ErrorKind::NotFound,
+            "PushRules event not found.",
+        ))?;
+
+    let global = &mut event.content.global;
+    match body.kind {
+        RuleKind::Override => {
+            if let Some(mut rule) = global.override_.get(body.rule_id.as_str()).cloned() {
+                rule.actions = body.actions.clone();
+                global.override_.replace(rule);
+            }
+        }
+        RuleKind::Underride => {
+            if let Some(mut rule) = global.underride.get(body.rule_id.as_str()).cloned() {
+                rule.actions = body.actions.clone();
+                global.underride.replace(rule);
+            }
+        }
+        RuleKind::Sender => {
+            if let Some(mut rule) = global.sender.get(body.rule_id.as_str()).cloned() {
+                rule.actions = body.actions.clone();
+                global.sender.replace(rule);
+            }
+        }
+        RuleKind::Room => {
+            if let Some(mut rule) = global.room.get(body.rule_id.as_str()).cloned() {
+                rule.actions = body.actions.clone();
+                global.room.replace(rule);
+            }
+        }
+        RuleKind::Content => {
+            if let Some(mut rule) = global.content.get(body.rule_id.as_str()).cloned() {
+                rule.actions = body.actions.clone();
+                global.content.replace(rule);
+            }
+        }
+        RuleKind::_Custom(_) => {}
+    };
+
+    db.account_data.update(
+        None,
+        &sender_user,
+        EventType::PushRules,
+        &event,
+        &db.globals,
+    )?;
+
+    db.flush().await?;
+
+    Ok(set_pushrule_actions::Response.into())
+}
+
+#[cfg_attr(
+    feature = "conduit_bin",
+    get("/_matrix/client/r0/pushrules/<_>/<_>/<_>/enabled", data = "<body>")
+)]
+#[tracing::instrument(skip(db, body))]
+pub async fn get_pushrule_enabled_route(
+    db: State<'_, Database>,
+    body: Ruma<get_pushrule_enabled::Request<'_>>,
+) -> ConduitResult<get_pushrule_enabled::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    if body.scope != "global" {
+        return Err(Error::BadRequest(
+            ErrorKind::InvalidParam,
+            "Scopes other than 'global' are not supported.",
+        ));
+    }
+
+    let mut event = db
+        .account_data
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .ok_or(Error::BadRequest(
+            ErrorKind::NotFound,
+            "PushRules event not found.",
+        ))?;
+
+    let global = &mut event.content.global;
+    let enabled = match body.kind {
+        RuleKind::Override => global
+            .override_
+            .iter()
+            .find(|rule| rule.rule_id == body.rule_id)
+            .map_or(false, |rule| rule.enabled),
+        RuleKind::Underride => global
+            .underride
+            .iter()
+            .find(|rule| rule.rule_id == body.rule_id)
+            .map_or(false, |rule| rule.enabled),
+        RuleKind::Sender => global
+            .sender
+            .iter()
+            .find(|rule| rule.rule_id == body.rule_id)
+            .map_or(false, |rule| rule.enabled),
+        RuleKind::Room => global
+            .room
+            .iter()
+            .find(|rule| rule.rule_id == body.rule_id)
+            .map_or(false, |rule| rule.enabled),
+        RuleKind::Content => global
+            .content
+            .iter()
+            .find(|rule| rule.rule_id == body.rule_id)
+            .map_or(false, |rule| rule.enabled),
+        RuleKind::_Custom(_) => false,
+    };
+
+    db.flush().await?;
+
+    Ok(get_pushrule_enabled::Response { enabled }.into())
+}
+
+#[cfg_attr(
+    feature = "conduit_bin",
+    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>/enabled", data = "<body>")
+)]
+#[tracing::instrument(skip(db, body))]
 pub async fn set_pushrule_enabled_route(
     db: State<'_, Database>,
+    body: Ruma<set_pushrule_enabled::Request<'_>>,
 ) -> ConduitResult<set_pushrule_enabled::Response> {
-    // TODO
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-    warn!("TODO: set_pushrule_enabled_route");
+
+    if body.scope != "global" {
+        return Err(Error::BadRequest(
+            ErrorKind::InvalidParam,
+            "Scopes other than 'global' are not supported.",
+        ));
+    }
+
+    let mut event = db
+        .account_data
+        .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .ok_or(Error::BadRequest(
+            ErrorKind::NotFound,
+            "PushRules event not found.",
+        ))?;
+
+    let global = &mut event.content.global;
+    match body.kind {
+        RuleKind::Override => {
+            if let Some(mut rule) = global.override_.get(body.rule_id.as_str()).cloned() {
+                global.override_.remove(&rule);
+                rule.enabled = body.enabled;
+                global.override_.insert(rule);
+            }
+        }
+        RuleKind::Underride => {
+            if let Some(mut rule) = global.underride.get(body.rule_id.as_str()).cloned() {
+                global.underride.remove(&rule);
+                rule.enabled = body.enabled;
+                global.underride.insert(rule);
+            }
+        }
+        RuleKind::Sender => {
+            if let Some(mut rule) = global.sender.get(body.rule_id.as_str()).cloned() {
+                global.sender.remove(&rule);
+                rule.enabled = body.enabled;
+                global.sender.insert(rule);
+            }
+        }
+        RuleKind::Room => {
+            if let Some(mut rule) = global.room.get(body.rule_id.as_str()).cloned() {
+                global.room.remove(&rule);
+                rule.enabled = body.enabled;
+                global.room.insert(rule);
+            }
+        }
+        RuleKind::Content => {
+            if let Some(mut rule) = global.content.get(body.rule_id.as_str()).cloned() {
+                global.content.remove(&rule);
+                rule.enabled = body.enabled;
+                global.content.insert(rule);
+            }
+        }
+        RuleKind::_Custom(_) => {}
+    }
+
+    db.account_data.update(
+        None,
+        &sender_user,
+        EventType::PushRules,
+        &event,
+        &db.globals,
+    )?;
 
     db.flush().await?;
 
     Ok(set_pushrule_enabled::Response.into())
 }
 
-#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/pushers"))]
+#[cfg_attr(
-pub async fn get_pushers_route() -> ConduitResult<get_pushers::Response> {
+    feature = "conduit_bin",
-    Ok(get_pushers::Response {
+    delete("/_matrix/client/r0/pushrules/<_>/<_>/<_>", data = "<body>")
-        pushers: Vec::new(),
+)]
+#[tracing::instrument(skip(db, body))]
+pub async fn delete_pushrule_route(
+    db: State<'_, Database>,
+    body: Ruma<delete_pushrule::Request<'_>>,
+) -> ConduitResult<delete_pushrule::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    if body.scope != "global" {
+        return Err(Error::BadRequest(
+            ErrorKind::InvalidParam,
+            "Scopes other than 'global' are not supported.",
+        ));
     }
-    .into())
+
-}
+    let mut event = db
+        .account_data
+        .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+        .ok_or(Error::BadRequest(
+            ErrorKind::NotFound,
+            "PushRules event not found.",
+        ))?;
+
+    let global = &mut event.content.global;
+    match body.kind {
+        RuleKind::Override => {
+            if let Some(rule) = global.override_.get(body.rule_id.as_str()).cloned() {
+                global.override_.remove(&rule);
+            }
+        }
+        RuleKind::Underride => {
+            if let Some(rule) = global.underride.get(body.rule_id.as_str()).cloned() {
+                global.underride.remove(&rule);
+            }
+        }
+        RuleKind::Sender => {
+            if let Some(rule) = global.sender.get(body.rule_id.as_str()).cloned() {
+                global.sender.remove(&rule);
+            }
+        }
+        RuleKind::Room => {
+            if let Some(rule) = global.room.get(body.rule_id.as_str()).cloned() {
+                global.room.remove(&rule);
+            }
+        }
+        RuleKind::Content => {
+            if let Some(rule) = global.content.get(body.rule_id.as_str()).cloned() {
+                global.content.remove(&rule);
+            }
+        }
+        RuleKind::_Custom(_) => {}
+    }
+
+    db.account_data.update(
+        None,
+        &sender_user,
+        EventType::PushRules,
+        &event,
+        &db.globals,
+    )?;
 
-#[cfg_attr(feature = "conduit_bin", post("/_matrix/client/r0/pushers/set"))]
-pub async fn set_pushers_route(db: State<'_, Database>) -> ConduitResult<get_pushers::Response> {
     db.flush().await?;
 
+    Ok(delete_pushrule::Response.into())
+}
+
+#[cfg_attr(
+    feature = "conduit_bin",
+    get("/_matrix/client/r0/pushers", data = "<body>")
+)]
+#[tracing::instrument(skip(db, body))]
+pub async fn get_pushers_route(
+    db: State<'_, Database>,
+    body: Ruma<get_pushers::Request>,
+) -> ConduitResult<get_pushers::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
     Ok(get_pushers::Response {
-        pushers: Vec::new(),
+        pushers: db.pusher.get_pushers(sender_user)?,
     }
     .into())
 }
+
+#[cfg_attr(
+    feature = "conduit_bin",
+    post("/_matrix/client/r0/pushers/set", data = "<body>")
+)]
+#[tracing::instrument(skip(db, body))]
+pub async fn set_pushers_route(
+    db: State<'_, Database>,
+    body: Ruma<set_pusher::Request>,
+) -> ConduitResult<set_pusher::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+    let pusher = body.pusher.clone();
+
+    db.pusher.set_pusher(sender_user, pusher)?;
+
+    db.flush().await?;
+
+    Ok(set_pusher::Response::default().into())
+}

src/client_server/read_marker.rs

@@ -1,7 +1,10 @@
 use super::State;
 use crate::{ConduitResult, Database, Error, Ruma};
 use ruma::{
-    api::client::{error::ErrorKind, r0::read_marker::set_read_marker},
+    api::client::{
+        error::ErrorKind,
+        r0::{read_marker::set_read_marker, receipt::create_receipt},
+    },
     events::{AnyEphemeralRoomEvent, AnyEvent, EventType},
 };
 
@@ -13,6 +16,7 @@ use std::{collections::BTreeMap, time::SystemTime};
     feature = "conduit_bin",
     post("/_matrix/client/r0/rooms/<_>/read_markers", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn set_read_marker_route(
     db: State<'_, Database>,
     body: Ruma<set_read_marker::Request<'_>>,
@@ -43,6 +47,8 @@ pub async fn set_read_marker_route(
             ))?,
             &db.globals,
         )?;
+        db.rooms
+            .reset_notification_counts(&sender_user, &body.room_id)?;
 
         let mut user_receipts = BTreeMap::new();
         user_receipts.insert(
@@ -76,3 +82,60 @@ pub async fn set_read_marker_route(
 
     Ok(set_read_marker::Response.into())
 }
+
+#[cfg_attr(
+    feature = "conduit_bin",
+    post("/_matrix/client/r0/rooms/<_>/receipt/<_>/<_>", data = "<body>")
+)]
+#[tracing::instrument(skip(db, body))]
+pub async fn create_receipt_route(
+    db: State<'_, Database>,
+    body: Ruma<create_receipt::Request<'_>>,
+) -> ConduitResult<create_receipt::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+    db.rooms.edus.private_read_set(
+        &body.room_id,
+        &sender_user,
+        db.rooms
+            .get_pdu_count(&body.event_id)?
+            .ok_or(Error::BadRequest(
+                ErrorKind::InvalidParam,
+                "Event does not exist.",
+            ))?,
+        &db.globals,
+    )?;
+    db.rooms
+        .reset_notification_counts(&sender_user, &body.room_id)?;
+
+    let mut user_receipts = BTreeMap::new();
+    user_receipts.insert(
+        sender_user.clone(),
+        ruma::events::receipt::Receipt {
+            ts: Some(SystemTime::now()),
+        },
+    );
+    let mut receipt_content = BTreeMap::new();
+    receipt_content.insert(
+        body.event_id.to_owned(),
+        ruma::events::receipt::Receipts {
+            read: Some(user_receipts),
+        },
+    );
+
+    db.rooms.edus.readreceipt_update(
+        &sender_user,
+        &body.room_id,
+        AnyEvent::Ephemeral(AnyEphemeralRoomEvent::Receipt(
+            ruma::events::receipt::ReceiptEvent {
+                content: ruma::events::receipt::ReceiptEventContent(receipt_content),
+                room_id: body.room_id.clone(),
+            },
+        )),
+        &db.globals,
+    )?;
+
+    db.flush().await?;
+
+    Ok(create_receipt::Response.into())
+}

src/client_server/redact.rs

@@ -12,6 +12,7 @@ use rocket::put;
     feature = "conduit_bin",
     put("/_matrix/client/r0/rooms/<_>/redact/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn redact_event_route(
     db: State<'_, Database>,
     body: Ruma<redact_event::Request<'_>>,
@@ -31,10 +32,7 @@ pub async fn redact_event_route(
         },
         &sender_user,
         &body.room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     db.flush().await?;

src/client_server/room.rs

@@ -1,4 +1,5 @@
 use super::State;
+use crate::client_server::invite_helper;
 use crate::{pdu::PduBuilder, ConduitResult, Database, Error, Ruma};
 use log::info;
 use ruma::{
@@ -22,6 +23,7 @@ use rocket::{get, post};
     feature = "conduit_bin",
     post("/_matrix/client/r0/createRoom", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn create_room_route(
     db: State<'_, Database>,
     body: Ruma<create_room::Request<'_>>,
@@ -65,10 +67,7 @@ pub async fn create_room_route(
         },
         &sender_user,
         &room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     // 2. Let the room creator join
@@ -89,17 +88,28 @@ pub async fn create_room_route(
         },
         &sender_user,
         &room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     // 3. Power levels
+
+    // Figure out preset. We need it for preset specific events
+    let preset = body
+        .preset
+        .clone()
+        .unwrap_or_else(|| match &body.visibility {
+            room::Visibility::Private => create_room::RoomPreset::PrivateChat,
+            room::Visibility::Public => create_room::RoomPreset::PublicChat,
+            room::Visibility::_Custom(_) => create_room::RoomPreset::PrivateChat, // Room visibility should not be custom
+        });
+
     let mut users = BTreeMap::new();
     users.insert(sender_user.clone(), 100.into());
-    for invite_ in &body.invite {
+
-        users.insert(invite_.clone(), 100.into());
+    if preset == create_room::RoomPreset::TrustedPrivateChat {
+        for invite_ in &body.invite {
+            users.insert(invite_.clone(), 100.into());
+        }
     }
 
     let power_levels_content = if let Some(power_levels) = &body.power_level_content_override {
@@ -133,24 +143,11 @@ pub async fn create_room_route(
         },
         &sender_user,
         &room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     // 4. Events set by preset
 
-    // Figure out preset. We need it for preset specific events
-    let preset = body
-        .preset
-        .clone()
-        .unwrap_or_else(|| match &body.visibility {
-            room::Visibility::Private => create_room::RoomPreset::PrivateChat,
-            room::Visibility::Public => create_room::RoomPreset::PublicChat,
-            room::Visibility::_Custom(s) => create_room::RoomPreset::_Custom(s.into()),
-        });
-
     // 4.1 Join Rules
     db.rooms.build_and_append_pdu(
         PduBuilder {
@@ -172,10 +169,7 @@ pub async fn create_room_route(
         },
         &sender_user,
         &room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     // 4.2 History Visibility
@@ -192,10 +186,7 @@ pub async fn create_room_route(
         },
         &sender_user,
         &room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     // 4.3 Guest Access
@@ -220,10 +211,7 @@ pub async fn create_room_route(
         },
         &sender_user,
         &room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     // 5. Events listed in initial_state
@@ -234,19 +222,12 @@ pub async fn create_room_route(
         .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid initial state event."))?;
 
         // Silently skip encryption events if they are not allowed
-        if pdu_builder.event_type == EventType::RoomEncryption && db.globals.encryption_disabled() {
+        if pdu_builder.event_type == EventType::RoomEncryption && !db.globals.allow_encryption() {
             continue;
         }
 
-        db.rooms.build_and_append_pdu(
+        db.rooms
-            pdu_builder,
+            .build_and_append_pdu(pdu_builder, &sender_user, &room_id, &db)?;
-            &sender_user,
-            &room_id,
-            &db.globals,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
-        )?;
     }
 
     // 6. Events implied by name and topic
@@ -266,10 +247,7 @@ pub async fn create_room_route(
             },
             &sender_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
     }
 
@@ -287,37 +265,13 @@ pub async fn create_room_route(
             },
             &sender_user,
             &room_id,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
     }
 
     // 7. Events implied by invite (and TODO: invite_3pid)
-    for user in &body.invite {
+    for user_id in &body.invite {
-        db.rooms.build_and_append_pdu(
+        let _ = invite_helper(sender_user, user_id, &room_id, &db, body.is_direct).await;
-            PduBuilder {
-                event_type: EventType::RoomMember,
-                content: serde_json::to_value(member::MemberEventContent {
-                    membership: member::MembershipState::Invite,
-                    displayname: db.users.displayname(&user)?,
-                    avatar_url: db.users.avatar_url(&user)?,
-                    is_direct: Some(body.is_direct),
-                    third_party_invite: None,
-                })
-                .expect("event is valid, we just created it"),
-                unsigned: None,
-                state_key: Some(user.to_string()),
-                redacts: None,
-            },
-            &sender_user,
-            &room_id,
-            &db.globals,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
-        )?;
     }
 
     // Homeserver specific stuff
@@ -340,6 +294,7 @@ pub async fn create_room_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/rooms/<_>/event/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_room_event_route(
     db: State<'_, Database>,
     body: Ruma<get_room_event::Request<'_>>,
@@ -367,6 +322,7 @@ pub async fn get_room_event_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/rooms/<_room_id>/upgrade", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn upgrade_room_route(
     db: State<'_, Database>,
     body: Ruma<upgrade_room::Request<'_>>,
@@ -374,10 +330,7 @@ pub async fn upgrade_room_route(
 ) -> ConduitResult<upgrade_room::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !matches!(
+    if !matches!(body.new_version, RoomVersionId::Version6) {
-        body.new_version,
-        RoomVersionId::Version5 | RoomVersionId::Version6
-    ) {
         return Err(Error::BadRequest(
             ErrorKind::UnsupportedRoomVersion,
             "This server does not support that room version.",
@@ -403,10 +356,7 @@ pub async fn upgrade_room_route(
         },
         sender_user,
         &body.room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     // Get the old room federations status
@@ -414,7 +364,6 @@ pub async fn upgrade_room_route(
         db.rooms
             .room_state_get(&body.room_id, &EventType::RoomCreate, "")?
             .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))?
-            .1
             .content,
     )
     .expect("Raw::from_value always works")
@@ -446,10 +395,7 @@ pub async fn upgrade_room_route(
         },
         sender_user,
         &replacement_room,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     // Join the new room
@@ -470,10 +416,7 @@ pub async fn upgrade_room_route(
         },
         sender_user,
         &replacement_room,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     // Recommended transferable state events list from the specs
@@ -492,7 +435,7 @@ pub async fn upgrade_room_route(
     // Replicate transferable state events to the new room
     for event_type in transferable_state_events {
         let event_content = match db.rooms.room_state_get(&body.room_id, &event_type, "")? {
-            Some((_, v)) => v.content.clone(),
+            Some(v) => v.content.clone(),
             None => continue, // Skipping missing events.
         };
 
@@ -506,10 +449,7 @@ pub async fn upgrade_room_route(
             },
             sender_user,
             &replacement_room,
-            &db.globals,
+            &db,
-            &db.sending,
-            &db.admin,
-            &db.account_data,
         )?;
     }
 
@@ -525,7 +465,6 @@ pub async fn upgrade_room_route(
             db.rooms
                 .room_state_get(&body.room_id, &EventType::RoomPowerLevels, "")?
                 .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))?
-                .1
                 .content,
         )
         .expect("database contains invalid PDU")
@@ -552,10 +491,7 @@ pub async fn upgrade_room_route(
         },
         sender_user,
         &body.room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     db.flush().await?;

src/client_server/search.rs

@@ -11,6 +11,7 @@ use std::collections::BTreeMap;
     feature = "conduit_bin",
     post("/_matrix/client/r0/search", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn search_events_route(
     db: State<'_, Database>,
     body: Ruma<search_events::Request<'_>>,
@@ -77,8 +78,8 @@ pub async fn search_events_route(
 
     Ok(search_events::Response::new(ResultCategories {
         room_events: ResultRoomEvents {
-            count: None,             // TODO? maybe not
+            count: Some((results.len() as u32).into()), // TODO: set this to none. Element shouldn't depend on it
-            groups: BTreeMap::new(), // TODO
+            groups: BTreeMap::new(),                    // TODO
             next_batch,
             results,
             state: BTreeMap::new(), // TODO

src/client_server/session.rs

@@ -8,6 +8,13 @@ use ruma::{
     },
     UserId,
 };
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+struct Claims {
+    sub: String,
+    exp: usize,
+}
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post};
@@ -17,8 +24,14 @@ use rocket::{get, post};
 /// Get the homeserver's supported login types. One of these should be used as the `type` field
 /// when logging in.
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/login"))]
+#[tracing::instrument]
 pub async fn get_login_types_route() -> ConduitResult<get_login_types::Response> {
-    Ok(get_login_types::Response::new(vec![get_login_types::LoginType::Password]).into())
+    Ok(
+        get_login_types::Response::new(vec![get_login_types::LoginType::Password(
+            Default::default(),
+        )])
+        .into(),
+    )
 }
 
 /// # `POST /_matrix/client/r0/login`
@@ -35,49 +48,74 @@ pub async fn get_login_types_route() -> ConduitResult<get_login_types::Response>
     feature = "conduit_bin",
     post("/_matrix/client/r0/login", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn login_route(
     db: State<'_, Database>,
     body: Ruma<login::Request<'_>>,
 ) -> ConduitResult<login::Response> {
     // Validate login method
-    let user_id =
+    // TODO: Other login methods
-        // TODO: Other login methods
+    let user_id = match &body.login_info {
-        if let (login::IncomingUserInfo::MatrixId(username), login::IncomingLoginInfo::Password { password }) =
+        login::IncomingLoginInfo::Password {
-            (&body.user, &body.login_info)
+            identifier,
-        {
+            password,
-            let user_id = UserId::parse_with_server_name(username.to_string(), db.globals.server_name())
+        } => {
-                .map_err(|_| Error::BadRequest(
+            let username = if let login::IncomingUserIdentifier::MatrixId(matrix_id) = identifier {
-                    ErrorKind::InvalidUsername,
+                matrix_id
-                    "Username is invalid."
+            } else {
-                ))?;
+                return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
-            let hash = db.users.password_hash(&user_id)?
+            };
-                .ok_or(Error::BadRequest(
+            let user_id =
-                    ErrorKind::Forbidden,
+                UserId::parse_with_server_name(username.to_owned(), db.globals.server_name())
-                    "Wrong username or password."
+                    .map_err(|_| {
-                ))?;
+                        Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
+                    })?;
+            let hash = db.users.password_hash(&user_id)?.ok_or(Error::BadRequest(
+                ErrorKind::Forbidden,
+                "Wrong username or password.",
+            ))?;
 
             if hash.is_empty() {
                 return Err(Error::BadRequest(
                     ErrorKind::UserDeactivated,
-                    "The user has been deactivated"
+                    "The user has been deactivated",
                 ));
             }
 
-            let hash_matches =
+            let hash_matches = argon2::verify_encoded(&hash, password.as_bytes()).unwrap_or(false);
-                argon2::verify_encoded(&hash, password.as_bytes()).unwrap_or(false);
 
             if !hash_matches {
-                return Err(Error::BadRequest(ErrorKind::Forbidden, "Wrong username or password."));
+                return Err(Error::BadRequest(
+                    ErrorKind::Forbidden,
+                    "Wrong username or password.",
+                ));
             }
 
             user_id
-        } else {
+        }
-            return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
+        login::IncomingLoginInfo::Token { token } => {
-        };
+            if let Some(jwt_decoding_key) = db.globals.jwt_decoding_key() {
+                let token = jsonwebtoken::decode::<Claims>(
+                    &token,
+                    &jwt_decoding_key,
+                    &jsonwebtoken::Validation::default(),
+                )
+                .map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Token is invalid."))?;
+                let username = token.claims.sub;
+                UserId::parse_with_server_name(username, db.globals.server_name()).map_err(
+                    |_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."),
+                )?
+            } else {
+                return Err(Error::BadRequest(
+                    ErrorKind::Unknown,
+                    "Token login is not supported (server has no jwt decoding key).",
+                ));
+            }
+        }
+    };
 
     // Generate new device id if the user didn't specify one
     let device_id = body
-        .body
         .device_id
         .clone()
         .unwrap_or_else(|| utils::random_string(DEVICE_ID_LENGTH).into());
@@ -85,14 +123,23 @@ pub async fn login_route(
     // Generate a new token for the device
     let token = utils::random_string(TOKEN_LENGTH);
 
-    // TODO: Don't always create a new device
+    // Determine if device_id was provided and exists in the db for this user
-    // Add device
+    let device_exists = body.device_id.as_ref().map_or(false, |device_id| {
-    db.users.create_device(
+        db.users
-        &user_id,
+            .all_device_ids(&user_id)
-        &device_id,
+            .any(|x| x.as_ref().map_or(false, |v| v == device_id))
-        &token,
+    });
-        body.initial_device_display_name.clone(),
+
-    )?;
+    if device_exists {
+        db.users.set_token(&user_id, &device_id, &token)?;
+    } else {
+        db.users.create_device(
+            &user_id,
+            &device_id,
+            &token,
+            body.initial_device_display_name.clone(),
+        )?;
+    }
 
     info!("{} logged in", user_id);
 
@@ -118,6 +165,7 @@ pub async fn login_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/logout", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn logout_route(
     db: State<'_, Database>,
     body: Ruma<logout::Request>,
@@ -145,6 +193,7 @@ pub async fn logout_route(
     feature = "conduit_bin",
     post("/_matrix/client/r0/logout/all", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn logout_all_route(
     db: State<'_, Database>,
     body: Ruma<logout_all::Request>,

src/client_server/state.rs

@@ -3,15 +3,16 @@ use crate::{pdu::PduBuilder, ConduitResult, Database, Error, Result, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::state::{
+        r0::state::{get_state_events, get_state_events_for_key, send_state_event},
-            get_state_events, get_state_events_for_empty_key, get_state_events_for_key,
-            send_state_event_for_empty_key, send_state_event_for_key,
-        },
     },
     events::{
-        room::history_visibility::{HistoryVisibility, HistoryVisibilityEventContent},
+        room::{
-        AnyStateEventContent, EventContent, EventType,
+            canonical_alias::CanonicalAliasEventContent,
+            history_visibility::{HistoryVisibility, HistoryVisibilityEventContent},
+        },
+        AnyStateEventContent, EventType,
     },
+    serde::Raw,
     EventId, RoomId, UserId,
 };
 
@@ -22,80 +23,59 @@ use rocket::{get, put};
     feature = "conduit_bin",
     put("/_matrix/client/r0/rooms/<_>/state/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn send_state_event_for_key_route(
     db: State<'_, Database>,
-    body: Ruma<send_state_event_for_key::Request<'_>>,
+    body: Ruma<send_state_event::Request<'_>>,
-) -> ConduitResult<send_state_event_for_key::Response> {
+) -> ConduitResult<send_state_event::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let content = serde_json::from_str::<serde_json::Value>(
-        body.json_body
-            .as_ref()
-            .ok_or(Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?
-            .get(),
-    )
-    .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?;
-
     let event_id = send_state_event_for_key_helper(
         &db,
         sender_user,
-        &body.content,
-        content,
         &body.room_id,
-        Some(body.state_key.to_owned()),
+        EventType::from(&body.event_type),
+        &body.body.body, // Yes, I hate it too
+        body.state_key.to_owned(),
     )
     .await?;
 
     db.flush().await?;
 
-    Ok(send_state_event_for_key::Response { event_id }.into())
+    Ok(send_state_event::Response { event_id }.into())
 }
 
 #[cfg_attr(
     feature = "conduit_bin",
     put("/_matrix/client/r0/rooms/<_>/state/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn send_state_event_for_empty_key_route(
     db: State<'_, Database>,
-    body: Ruma<send_state_event_for_empty_key::Request<'_>>,
+    body: Ruma<send_state_event::Request<'_>>,
-) -> ConduitResult<send_state_event_for_empty_key::Response> {
+) -> ConduitResult<send_state_event::Response> {
-    // This just calls send_state_event_for_key_route
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-    let Ruma {
-        body,
-        sender_user,
-        sender_device: _,
-        json_body,
-    } = body;
-
-    let json = serde_json::from_str::<serde_json::Value>(
-        json_body
-            .as_ref()
-            .ok_or(Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?
-            .get(),
-    )
-    .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?;
 
     let event_id = send_state_event_for_key_helper(
         &db,
-        sender_user
+        sender_user,
-            .as_ref()
-            .expect("no user for send state empty key rout"),
-        &body.content,
-        json,
         &body.room_id,
-        Some("".into()),
+        EventType::from(&body.event_type),
+        &body.body.body,
+        body.state_key.to_owned(),
     )
     .await?;
 
     db.flush().await?;
 
-    Ok(send_state_event_for_empty_key::Response { event_id }.into())
+    Ok(send_state_event::Response { event_id }.into())
 }
 
 #[cfg_attr(
     feature = "conduit_bin",
     get("/_matrix/client/r0/rooms/<_>/state", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_state_events_route(
     db: State<'_, Database>,
     body: Ruma<get_state_events::Request<'_>>,
@@ -109,7 +89,7 @@ pub async fn get_state_events_route(
         && !matches!(
             db.rooms
                 .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")?
-                .map(|(_, event)| {
+                .map(|event| {
                     serde_json::from_value::<HistoryVisibilityEventContent>(event.content)
                         .map_err(|_| {
                             Error::bad_database(
@@ -142,6 +122,7 @@ pub async fn get_state_events_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/rooms/<_>/state/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_state_events_for_key_route(
     db: State<'_, Database>,
     body: Ruma<get_state_events_for_key::Request<'_>>,
@@ -155,7 +136,7 @@ pub async fn get_state_events_for_key_route(
         && !matches!(
             db.rooms
                 .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")?
-                .map(|(_, event)| {
+                .map(|event| {
                     serde_json::from_value::<HistoryVisibilityEventContent>(event.content)
                         .map_err(|_| {
                             Error::bad_database(
@@ -179,11 +160,10 @@ pub async fn get_state_events_for_key_route(
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "State event not found.",
-        ))?
+        ))?;
-        .1;
 
     Ok(get_state_events_for_key::Response {
-        content: serde_json::value::to_raw_value(&event.content)
+        content: serde_json::from_value(event.content)
             .map_err(|_| Error::bad_database("Invalid event content in database"))?,
     }
     .into())
@@ -193,10 +173,11 @@ pub async fn get_state_events_for_key_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/rooms/<_>/state/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_state_events_for_empty_key_route(
     db: State<'_, Database>,
-    body: Ruma<get_state_events_for_empty_key::Request<'_>>,
+    body: Ruma<get_state_events_for_key::Request<'_>>,
-) -> ConduitResult<get_state_events_for_empty_key::Response> {
+) -> ConduitResult<get_state_events_for_key::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     #[allow(clippy::blocks_in_if_conditions)]
@@ -206,7 +187,7 @@ pub async fn get_state_events_for_empty_key_route(
         && !matches!(
             db.rooms
                 .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")?
-                .map(|(_, event)| {
+                .map(|event| {
                     serde_json::from_value::<HistoryVisibilityEventContent>(event.content)
                         .map_err(|_| {
                             Error::bad_database(
@@ -230,11 +211,10 @@ pub async fn get_state_events_for_empty_key_route(
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "State event not found.",
-        ))?
+        ))?;
-        .1;
 
-    Ok(get_state_events_for_empty_key::Response {
+    Ok(get_state_events_for_key::Response {
-        content: serde_json::value::to_raw_value(&event)
+        content: serde_json::from_value(event.content)
             .map_err(|_| Error::bad_database("Invalid event content in database"))?,
     }
     .into())
@@ -243,17 +223,19 @@ pub async fn get_state_events_for_empty_key_route(
 pub async fn send_state_event_for_key_helper(
     db: &Database,
     sender: &UserId,
-    content: &AnyStateEventContent,
-    json: serde_json::Value,
     room_id: &RoomId,
-    state_key: Option<String>,
+    event_type: EventType,
+    json: &Raw<AnyStateEventContent>,
+    state_key: String,
 ) -> Result<EventId> {
     let sender_user = sender;
 
-    if let AnyStateEventContent::RoomCanonicalAlias(canonical_alias) = content {
+    if let Ok(canonical_alias) =
+        serde_json::from_str::<CanonicalAliasEventContent>(json.json().get())
+    {
         let mut aliases = canonical_alias.alt_aliases.clone();
 
-        if let Some(alias) = canonical_alias.alias.clone() {
+        if let Some(alias) = canonical_alias.alias {
             aliases.push(alias);
         }
 
@@ -276,18 +258,15 @@ pub async fn send_state_event_for_key_helper(
 
     let event_id = db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: content.event_type().into(),
+            event_type,
-            content: json,
+            content: serde_json::from_str(json.json().get()).expect("content is valid json"),
             unsigned: None,
-            state_key,
+            state_key: Some(state_key),
             redacts: None,
         },
         &sender_user,
         &room_id,
-        &db.globals,
+        &db,
-        &db.sending,
-        &db.admin,
-        &db.account_data,
     )?;
 
     Ok(event_id)

src/client_server/sync.rs

@@ -11,7 +11,7 @@ use ruma::{
 use rocket::{get, tokio};
 use std::{
     collections::{hash_map, BTreeMap, HashMap, HashSet},
-    convert::TryFrom,
+    convert::{TryFrom, TryInto},
     time::Duration,
 };
 
@@ -30,6 +30,7 @@ use std::{
     feature = "conduit_bin",
     get("/_matrix/client/r0/sync", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn sync_events_route(
     db: State<'_, Database>,
     body: Ruma<sync_events::Request<'_>>,
@@ -91,147 +92,274 @@ pub async fn sync_events_route(
 
         // They /sync response doesn't always return all messages, so we say the output is
         // limited unless there are events in non_timeline_pdus
-        let mut limited = false;
+        let limited = non_timeline_pdus.next().is_some();
-
-        let mut state_pdus = Vec::new();
-        for (_, pdu) in non_timeline_pdus {
-            if pdu.state_key.is_some() {
-                state_pdus.push(pdu);
-            }
-            limited = true;
-        }
 
         // Database queries:
-        let encrypted_room = db
+
-            .rooms
+        let current_shortstatehash = db.rooms.current_shortstatehash(&room_id)?;
-            .room_state_get(&room_id, &EventType::RoomEncryption, "")?
-            .is_some();
 
         // These type is Option<Option<_>>. The outer Option is None when there is no event between
         // since and the current room state, meaning there should be no updates.
         // The inner Option is None when there is an event, but there is no state hash associated
         // with it. This can happen for the RoomCreate event, so all updates should arrive.
-        let first_pdu_after_since = db.rooms.pdus_after(sender_user, &room_id, since).next();
+        let first_pdu_before_since = db.rooms.pdus_until(sender_user, &room_id, since).next();
+        let pdus_after_since = db
+            .rooms
+            .pdus_after(sender_user, &room_id, since)
+            .next()
+            .is_some();
 
-        let since_state_hash = first_pdu_after_since
+        let since_shortstatehash = first_pdu_before_since.as_ref().map(|pdu| {
-            .as_ref()
+            db.rooms
-            .map(|pdu| db.rooms.pdu_state_hash(&pdu.as_ref().ok()?.0).ok()?);
+                .pdu_shortstatehash(&pdu.as_ref().ok()?.1.event_id)
-
+                .ok()?
-        let since_members = since_state_hash.as_ref().map(|state_hash| {
-            state_hash.as_ref().and_then(|state_hash| {
-                db.rooms
-                    .state_type(&state_hash, &EventType::RoomMember)
-                    .ok()
-            })
         });
 
-        let since_encryption = since_state_hash.as_ref().map(|state_hash| {
+        let (
-            state_hash.as_ref().and_then(|state_hash| {
+            heroes,
-                db.rooms
+            joined_member_count,
-                    .state_get(&state_hash, &EventType::RoomEncryption, "")
+            invited_member_count,
-                    .ok()
+            joined_since_last_sync,
-            })
+            state_events,
-        });
+        ) = if pdus_after_since && Some(current_shortstatehash) != since_shortstatehash {
-
+            let current_state = db.rooms.room_state_full(&room_id)?;
-        let current_members = db.rooms.room_state_type(&room_id, &EventType::RoomMember)?;
+            let current_members = current_state
-
+                .iter()
-        // Calculations:
+                .filter(|(key, _)| key.0 == EventType::RoomMember)
-        let new_encrypted_room =
+                .map(|(key, value)| (&key.1, value)) // Only keep state key
-            encrypted_room && since_encryption.map_or(false, |encryption| encryption.is_none());
+                .collect::<Vec<_>>();
-
+            let encrypted_room = current_state
-        let send_member_count = since_members.as_ref().map_or(false, |since_members| {
+                .get(&(EventType::RoomEncryption, "".to_owned()))
-            since_members.as_ref().map_or(true, |since_members| {
+                .is_some();
-                current_members.len() != since_members.len()
+            let since_state = since_shortstatehash
-            })
+                .as_ref()
-        });
+                .map(|since_shortstatehash| {
-
+                    Ok::<_, Error>(
-        let since_sender_member = since_members.as_ref().map(|since_members| {
+                        since_shortstatehash
-            since_members.as_ref().and_then(|members| {
+                            .map(|since_shortstatehash| db.rooms.state_full(since_shortstatehash))
-                members.get(sender_user.as_str()).and_then(|pdu| {
+                            .transpose()?,
-                    serde_json::from_value::<Raw<ruma::events::room::member::MemberEventContent>>(
-                        pdu.content.clone(),
                     )
+                })
+                .transpose()?;
+
+            let since_encryption = since_state.as_ref().map(|state| {
+                state
+                    .as_ref()
+                    .map(|state| state.get(&(EventType::RoomEncryption, "".to_owned())))
+            });
+
+            // Calculations:
+            let new_encrypted_room =
+                encrypted_room && since_encryption.map_or(true, |encryption| encryption.is_none());
+
+            let send_member_count = since_state.as_ref().map_or(true, |since_state| {
+                since_state.as_ref().map_or(true, |since_state| {
+                    current_members.len()
+                        != since_state
+                            .iter()
+                            .filter(|(key, _)| key.0 == EventType::RoomMember)
+                            .count()
+                })
+            });
+
+            let since_sender_member = since_state.as_ref().map(|since_state| {
+                since_state.as_ref().and_then(|state| {
+                    state
+                        .get(&(EventType::RoomMember, sender_user.as_str().to_owned()))
+                        .and_then(|pdu| {
+                            serde_json::from_value::<
+                                Raw<ruma::events::room::member::MemberEventContent>,
+                            >(pdu.content.clone())
+                            .expect("Raw::from_value always works")
+                            .deserialize()
+                            .map_err(|_| Error::bad_database("Invalid PDU in database."))
+                            .ok()
+                        })
+                })
+            });
+
+            if encrypted_room {
+                for (user_id, current_member) in current_members {
+                    let current_membership = serde_json::from_value::<
+                        Raw<ruma::events::room::member::MemberEventContent>,
+                    >(current_member.content.clone())
                     .expect("Raw::from_value always works")
                     .deserialize()
-                    .map_err(|_| Error::bad_database("Invalid PDU in database."))
+                    .map_err(|_| Error::bad_database("Invalid PDU in database."))?
-                    .ok()
+                    .membership;
-                })
-            })
-        });
 
-        if encrypted_room {
+                    let since_membership =
-            for (user_id, current_member) in current_members {
+                        since_state
-                let current_membership = serde_json::from_value::<
+                            .as_ref()
-                    Raw<ruma::events::room::member::MemberEventContent>,
+                            .map_or(MembershipState::Leave, |since_state| {
-                >(current_member.content.clone())
+                                since_state
-                .expect("Raw::from_value always works")
+                                    .as_ref()
-                .deserialize()
+                                    .and_then(|since_state| {
-                .map_err(|_| Error::bad_database("Invalid PDU in database."))?
+                                        since_state
-                .membership;
+                                            .get(&(EventType::RoomMember, user_id.clone()))
-
+                                            .and_then(|since_member| {
-                let since_membership =
+                                                serde_json::from_value::<
-                    since_members
+                                                Raw<ruma::events::room::member::MemberEventContent>,
-                        .as_ref()
+                                            >(
-                        .map_or(MembershipState::Join, |members| {
+                                                since_member.content.clone()
-                            members
+                                            )
-                                .as_ref()
+                                            .expect("Raw::from_value always works")
-                                .and_then(|members| {
+                                            .deserialize()
-                                    members.get(&user_id).and_then(|since_member| {
+                                            .map_err(|_| {
-                                        serde_json::from_value::<
+                                                Error::bad_database("Invalid PDU in database.")
-                                            Raw<ruma::events::room::member::MemberEventContent>,
+                                            })
-                                        >(
+                                            .ok()
-                                            since_member.content.clone()
+                                            })
-                                        )
-                                        .expect("Raw::from_value always works")
-                                        .deserialize()
-                                        .map_err(|_| {
-                                            Error::bad_database("Invalid PDU in database.")
-                                        })
-                                        .ok()
                                     })
-                                })
+                                    .map_or(MembershipState::Leave, |member| member.membership)
-                                .map_or(MembershipState::Leave, |member| member.membership)
+                            });
-                        });
 
-                let user_id = UserId::try_from(user_id)
+                    let user_id = UserId::try_from(user_id.clone())
-                    .map_err(|_| Error::bad_database("Invalid UserId in member PDU."))?;
+                        .map_err(|_| Error::bad_database("Invalid UserId in member PDU."))?;
 
-                match (since_membership, current_membership) {
+                    match (since_membership, current_membership) {
-                    (MembershipState::Leave, MembershipState::Join) => {
+                        (MembershipState::Leave, MembershipState::Join) => {
-                        // A new user joined an encrypted room
+                            // A new user joined an encrypted room
-                        if !share_encrypted_room(&db, &sender_user, &user_id, &room_id) {
+                            if !share_encrypted_room(&db, &sender_user, &user_id, &room_id) {
-                            device_list_updates.insert(user_id);
+                                device_list_updates.insert(user_id);
+                            }
                         }
+                        (MembershipState::Join, MembershipState::Leave) => {
+                            // Write down users that have left encrypted rooms we are in
+                            left_encrypted_users.insert(user_id);
+                        }
+                        _ => {}
                     }
-                    (MembershipState::Join, MembershipState::Leave) => {
-                        // Write down users that have left encrypted rooms we are in
-                        left_encrypted_users.insert(user_id);
-                    }
-                    _ => {}
                 }
             }
-        }
 
-        let joined_since_last_sync = since_sender_member.map_or(false, |member| {
+            let joined_since_last_sync = since_sender_member.map_or(true, |member| {
-            member.map_or(true, |member| member.membership != MembershipState::Join)
+                member.map_or(true, |member| member.membership != MembershipState::Join)
-        });
+            });
 
-        if joined_since_last_sync && encrypted_room || new_encrypted_room {
+            if joined_since_last_sync && encrypted_room || new_encrypted_room {
-            // If the user is in a new encrypted room, give them all joined users
+                // If the user is in a new encrypted room, give them all joined users
-            device_list_updates.extend(
+                device_list_updates.extend(
-                db.rooms
+                    db.rooms
-                    .room_members(&room_id)
+                        .room_members(&room_id)
-                    .filter_map(|user_id| Some(user_id.ok()?))
+                        .filter_map(|user_id| Some(user_id.ok()?))
-                    .filter(|user_id| {
+                        .filter(|user_id| {
-                        // Don't send key updates from the sender to the sender
+                            // Don't send key updates from the sender to the sender
-                        sender_user != user_id
+                            sender_user != user_id
-                    })
+                        })
-                    .filter(|user_id| {
+                        .filter(|user_id| {
-                        // Only send keys if the sender doesn't share an encrypted room with the target already
+                            // Only send keys if the sender doesn't share an encrypted room with the target already
-                        !share_encrypted_room(&db, sender_user, user_id, &room_id)
+                            !share_encrypted_room(&db, sender_user, user_id, &room_id)
-                    }),
+                        }),
-            );
+                );
-        }
+            }
+
+            let (joined_member_count, invited_member_count, heroes) = if send_member_count {
+                let joined_member_count = db.rooms.room_members(&room_id).count();
+                let invited_member_count = db.rooms.room_members_invited(&room_id).count();
+
+                // Recalculate heroes (first 5 members)
+                let mut heroes = Vec::new();
+
+                if joined_member_count + invited_member_count <= 5 {
+                    // Go through all PDUs and for each member event, check if the user is still joined or
+                    // invited until we have 5 or we reach the end
+
+                    for hero in db
+                        .rooms
+                        .all_pdus(&sender_user, &room_id)?
+                        .filter_map(|pdu| pdu.ok()) // Ignore all broken pdus
+                        .filter(|(_, pdu)| pdu.kind == EventType::RoomMember)
+                        .map(|(_, pdu)| {
+                            let content = serde_json::from_value::<
+                                Raw<ruma::events::room::member::MemberEventContent>,
+                            >(pdu.content.clone())
+                            .expect("Raw::from_value always works")
+                            .deserialize()
+                            .map_err(|_| {
+                                Error::bad_database("Invalid member event in database.")
+                            })?;
+
+                            if let Some(state_key) = &pdu.state_key {
+                                let user_id =
+                                    UserId::try_from(state_key.clone()).map_err(|_| {
+                                        Error::bad_database("Invalid UserId in member PDU.")
+                                    })?;
+
+                                // The membership was and still is invite or join
+                                if matches!(
+                                    content.membership,
+                                    MembershipState::Join | MembershipState::Invite
+                                ) && (db.rooms.is_joined(&user_id, &room_id)?
+                                    || db.rooms.is_invited(&user_id, &room_id)?)
+                                {
+                                    Ok::<_, Error>(Some(state_key.clone()))
+                                } else {
+                                    Ok(None)
+                                }
+                            } else {
+                                Ok(None)
+                            }
+                        })
+                        .filter_map(|u| u.ok()) // Filter out buggy users
+                        // Filter for possible heroes
+                        .filter_map(|u| u)
+                    {
+                        if heroes.contains(&hero) || hero == sender_user.as_str() {
+                            continue;
+                        }
+
+                        heroes.push(hero);
+                    }
+                }
+
+                (
+                    Some(joined_member_count),
+                    Some(invited_member_count),
+                    heroes,
+                )
+            } else {
+                (None, None, Vec::new())
+            };
+
+            let state_events = if joined_since_last_sync {
+                current_state
+                    .into_iter()
+                    .map(|(_, pdu)| pdu.to_sync_state_event())
+                    .collect()
+            } else {
+                match since_state {
+                    None => Vec::new(),
+                    Some(Some(since_state)) => current_state
+                        .iter()
+                        .filter(|(key, value)| {
+                            since_state.get(key).map(|e| &e.event_id) != Some(&value.event_id)
+                        })
+                        .filter(|(_, value)| {
+                            !timeline_pdus.iter().any(|(_, timeline_pdu)| {
+                                timeline_pdu.kind == value.kind
+                                    && timeline_pdu.state_key == value.state_key
+                            })
+                        })
+                        .map(|(_, pdu)| pdu.to_sync_state_event())
+                        .collect(),
+                    Some(None) => current_state
+                        .iter()
+                        .map(|(_, pdu)| pdu.to_sync_state_event())
+                        .collect(),
+                }
+            };
+
+            (
+                heroes,
+                joined_member_count,
+                invited_member_count,
+                joined_since_last_sync,
+                state_events,
+            )
+        } else {
+            (Vec::new(), None, None, false, Vec::new())
+        };
 
         // Look for device list updates in this room
         device_list_updates.extend(
@@ -240,89 +368,24 @@ pub async fn sync_events_route(
                 .filter_map(|r| r.ok()),
         );
 
-        let (joined_member_count, invited_member_count, heroes) = if send_member_count {
+        let notification_count = if send_notification_counts {
-            let joined_member_count = db.rooms.room_members(&room_id).count();
+            Some(
-            let invited_member_count = db.rooms.room_members_invited(&room_id).count();
+                db.rooms
-
+                    .notification_count(&sender_user, &room_id)?
-            // Recalculate heroes (first 5 members)
+                    .try_into()
-            let mut heroes = Vec::new();
+                    .expect("notification count can't go that high"),
-
-            if joined_member_count + invited_member_count <= 5 {
-                // Go through all PDUs and for each member event, check if the user is still joined or
-                // invited until we have 5 or we reach the end
-
-                for hero in db
-                    .rooms
-                    .all_pdus(&sender_user, &room_id)?
-                    .filter_map(|pdu| pdu.ok()) // Ignore all broken pdus
-                    .filter(|(_, pdu)| pdu.kind == EventType::RoomMember)
-                    .map(|(_, pdu)| {
-                        let content = serde_json::from_value::<
-                            Raw<ruma::events::room::member::MemberEventContent>,
-                        >(pdu.content.clone())
-                        .expect("Raw::from_value always works")
-                        .deserialize()
-                        .map_err(|_| Error::bad_database("Invalid member event in database."))?;
-
-                        if let Some(state_key) = &pdu.state_key {
-                            let user_id = UserId::try_from(state_key.clone()).map_err(|_| {
-                                Error::bad_database("Invalid UserId in member PDU.")
-                            })?;
-
-                            // The membership was and still is invite or join
-                            if matches!(
-                                content.membership,
-                                MembershipState::Join | MembershipState::Invite
-                            ) && (db.rooms.is_joined(&user_id, &room_id)?
-                                || db.rooms.is_invited(&user_id, &room_id)?)
-                            {
-                                Ok::<_, Error>(Some(state_key.clone()))
-                            } else {
-                                Ok(None)
-                            }
-                        } else {
-                            Ok(None)
-                        }
-                    })
-                    .filter_map(|u| u.ok()) // Filter out buggy users
-                    // Filter for possible heroes
-                    .filter_map(|u| u)
-                {
-                    if heroes.contains(&hero) || hero == sender_user.as_str() {
-                        continue;
-                    }
-
-                    heroes.push(hero);
-                }
-            }
-
-            (
-                Some(joined_member_count),
-                Some(invited_member_count),
-                heroes,
             )
         } else {
-            (None, None, Vec::new())
+            None
         };
 
-        let notification_count = if send_notification_counts {
+        let highlight_count = if send_notification_counts {
-            if let Some(last_read) = db.rooms.edus.private_read_get(&room_id, &sender_user)? {
+            Some(
-                Some(
+                db.rooms
-                    (db.rooms
+                    .highlight_count(&sender_user, &room_id)?
-                        .pdus_since(&sender_user, &room_id, last_read)?
+                    .try_into()
-                        .filter_map(|pdu| pdu.ok()) // Filter out buggy events
+                    .expect("highlight count can't go that high"),
-                        .filter(|(_, pdu)| {
+            )
-                            matches!(
-                                pdu.kind.clone(),
-                                EventType::RoomMessage | EventType::RoomEncrypted
-                            )
-                        })
-                        .count() as u32)
-                        .into(),
-                )
-            } else {
-                None
-            }
         } else {
             None
         };
@@ -334,7 +397,7 @@ pub async fn sync_events_route(
             })?;
 
         let room_events = timeline_pdus
-            .into_iter()
+            .iter()
             .map(|(_, pdu)| pdu.to_sync_room_event())
             .collect::<Vec<_>>();
 
@@ -376,7 +439,7 @@ pub async fn sync_events_route(
                 invited_member_count: invited_member_count.map(|n| (n as u32).into()),
             },
             unread_notifications: sync_events::UnreadNotificationsCount {
-                highlight_count: None,
+                highlight_count,
                 notification_count,
             },
             timeline: sync_events::Timeline {
@@ -384,17 +447,8 @@ pub async fn sync_events_route(
                 prev_batch,
                 events: room_events,
             },
-            // TODO: state before timeline
             state: sync_events::State {
-                events: if joined_since_last_sync {
+                events: state_events,
-                    db.rooms
-                        .room_state_full(&room_id)?
-                        .into_iter()
-                        .map(|(_, pdu)| pdu.to_sync_state_event())
-                        .collect()
-                } else {
-                    Vec::new()
-                },
             },
             ephemeral: sync_events::Ephemeral { events: edus },
         };
@@ -439,80 +493,17 @@ pub async fn sync_events_route(
     }
 
     let mut left_rooms = BTreeMap::new();
-    for room_id in db.rooms.rooms_left(&sender_user) {
+    for result in db.rooms.rooms_left(&sender_user) {
-        let room_id = room_id?;
+        let (room_id, left_state_events) = result?;
+        let left_count = db.rooms.get_left_count(&room_id, &sender_user)?;
 
-        let since_member = if let Some(since_member) = db
+        // Left before last sync
-            .rooms
+        if Some(since) >= left_count {
-            .pdus_after(sender_user, &room_id, since)
-            .next()
-            .and_then(|pdu| pdu.ok())
-            .and_then(|pdu| {
-                db.rooms
-                    .pdu_state_hash(&pdu.0)
-                    .ok()?
-                    .ok_or_else(|| Error::bad_database("Pdu in db doesn't have a state hash."))
-                    .ok()
-            })
-            .and_then(|state_hash| {
-                db.rooms
-                    .state_get(&state_hash, &EventType::RoomMember, sender_user.as_str())
-                    .ok()?
-                    .ok_or_else(|| Error::bad_database("State hash in db doesn't have a state."))
-                    .ok()
-            })
-            .and_then(|(pdu_id, pdu)| {
-                serde_json::from_value::<Raw<ruma::events::room::member::MemberEventContent>>(
-                    pdu.content.clone(),
-                )
-                .expect("Raw::from_value always works")
-                .deserialize()
-                .map_err(|_| Error::bad_database("Invalid PDU in database."))
-                .map(|content| (pdu_id, pdu, content))
-                .ok()
-            }) {
-            since_member
-        } else {
-            // We couldn't find the since_member event. This is very weird - we better abort
             continue;
-        };
+        }
 
-        let left_since_last_sync = since_member.2.membership == MembershipState::Join;
+        left_rooms.insert(
-
+            room_id.clone(),
-        let left_room = if left_since_last_sync {
-            device_list_left.extend(
-                db.rooms
-                    .room_members(&room_id)
-                    .filter_map(|user_id| Some(user_id.ok()?))
-                    .filter(|user_id| {
-                        // Don't send key updates from the sender to the sender
-                        sender_user != user_id
-                    })
-                    .filter(|user_id| {
-                        // Only send if the sender doesn't share any encrypted room with the target
-                        // anymore
-                        !share_encrypted_room(&db, sender_user, user_id, &room_id)
-                    }),
-            );
-
-            let pdus = db.rooms.pdus_since(&sender_user, &room_id, since)?;
-            let mut room_events = pdus
-                .filter_map(|pdu| pdu.ok()) // Filter out buggy events
-                .take_while(|(pdu_id, _)| since_member.0 != pdu_id)
-                .map(|(_, pdu)| pdu.to_sync_room_event())
-                .collect::<Vec<_>>();
-            room_events.push(since_member.1.to_sync_room_event());
-
-            sync_events::LeftRoom {
-                account_data: sync_events::AccountData { events: Vec::new() },
-                timeline: sync_events::Timeline {
-                    limited: false,
-                    prev_batch: Some(next_batch.clone()),
-                    events: room_events,
-                },
-                state: sync_events::State { events: Vec::new() },
-            }
-        } else {
             sync_events::LeftRoom {
                 account_data: sync_events::AccountData { events: Vec::new() },
                 timeline: sync_events::Timeline {
@@ -520,54 +511,31 @@ pub async fn sync_events_route(
                     prev_batch: Some(next_batch.clone()),
                     events: Vec::new(),
                 },
-                state: sync_events::State { events: Vec::new() },
+                state: sync_events::State {
-            }
+                    events: left_state_events,
-        };
+                },
-
+            },
-        if !left_room.is_empty() {
+        );
-            left_rooms.insert(room_id.clone(), left_room);
-        }
     }
 
     let mut invited_rooms = BTreeMap::new();
-    for room_id in db.rooms.rooms_invited(&sender_user) {
+    for result in db.rooms.rooms_invited(&sender_user) {
-        let room_id = room_id?;
+        let (room_id, invite_state_events) = result?;
-        let mut invited_since_last_sync = false;
+        let invite_count = db.rooms.get_invite_count(&room_id, &sender_user)?;
-        for pdu in db.rooms.pdus_since(&sender_user, &room_id, since)? {
-            let (_, pdu) = pdu?;
-            if pdu.kind == EventType::RoomMember && pdu.state_key == Some(sender_user.to_string()) {
-                let content = serde_json::from_value::<
-                    Raw<ruma::events::room::member::MemberEventContent>,
-                >(pdu.content.clone())
-                .expect("Raw::from_value always works")
-                .deserialize()
-                .map_err(|_| Error::bad_database("Invalid PDU in database."))?;
 
-                if content.membership == MembershipState::Invite {
+        // Invited before last sync
-                    invited_since_last_sync = true;
+        if Some(since) >= invite_count {
-                    break;
-                }
-            }
-        }
-
-        if !invited_since_last_sync {
             continue;
         }
 
-        let invited_room = sync_events::InvitedRoom {
+        invited_rooms.insert(
-            invite_state: sync_events::InviteState {
+            room_id.clone(),
-                events: db
+            sync_events::InvitedRoom {
-                    .rooms
+                invite_state: sync_events::InviteState {
-                    .room_state_full(&room_id)?
+                    events: invite_state_events,
-                    .into_iter()
+                },
-                    .map(|(_, pdu)| pdu.to_stripped_state_event())
-                    .collect(),
             },
-        };
+        );
-
-        if !invited_room.is_empty() {
-            invited_rooms.insert(room_id.clone(), invited_room);
-        }
     }
 
     for user_id in left_encrypted_users {
@@ -651,16 +619,13 @@ pub async fn sync_events_route(
         if duration.as_secs() > 30 {
             duration = Duration::from_secs(30);
         }
-        let mut delay = tokio::time::delay_for(duration);
+        let _ = tokio::time::timeout(duration, watcher).await;
-        tokio::select! {
-            _ = &mut delay => {}
-            _ = watcher => {}
-        }
     }
 
     Ok(response.into())
 }
 
+#[tracing::instrument(skip(db))]
 fn share_encrypted_room(
     db: &Database,
     sender_user: &UserId,

src/client_server/tag.rs

@@ -13,6 +13,7 @@ use rocket::{delete, get, put};
     feature = "conduit_bin",
     put("/_matrix/client/r0/user/<_>/rooms/<_>/tags/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn update_tag_route(
     db: State<'_, Database>,
     body: Ruma<create_tag::Request<'_>>,
@@ -49,6 +50,7 @@ pub async fn update_tag_route(
     feature = "conduit_bin",
     delete("/_matrix/client/r0/user/<_>/rooms/<_>/tags/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn delete_tag_route(
     db: State<'_, Database>,
     body: Ruma<delete_tag::Request<'_>>,
@@ -82,6 +84,7 @@ pub async fn delete_tag_route(
     feature = "conduit_bin",
     get("/_matrix/client/r0/user/<_>/rooms/<_>/tags", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn get_tags_route(
     db: State<'_, Database>,
     body: Ruma<get_tags::Request<'_>>,

src/client_server/thirdparty.rs

@@ -1,7 +1,6 @@
 use crate::ConduitResult;
 use ruma::api::client::r0::thirdparty::get_protocols;
 
-use log::warn;
 #[cfg(feature = "conduit_bin")]
 use rocket::get;
 use std::collections::BTreeMap;
@@ -10,8 +9,9 @@ use std::collections::BTreeMap;
     feature = "conduit_bin",
     get("/_matrix/client/r0/thirdparty/protocols")
 )]
+#[tracing::instrument]
 pub async fn get_protocols_route() -> ConduitResult<get_protocols::Response> {
-    warn!("TODO: get_protocols_route");
+    // TODO
     Ok(get_protocols::Response {
         protocols: BTreeMap::new(),
     }

src/client_server/to_device.rs

@@ -12,12 +12,13 @@ use rocket::put;
     feature = "conduit_bin",
     put("/_matrix/client/r0/sendToDevice/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn send_event_to_device_route(
     db: State<'_, Database>,
     body: Ruma<send_event_to_device::Request<'_>>,
 ) -> ConduitResult<send_event_to_device::Response> {
     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 sender_device = body.sender_device.as_deref();
 
     // Check if this is a new transaction id
     if db

src/client_server/typing.rs

@@ -10,6 +10,7 @@ use rocket::put;
     feature = "conduit_bin",
     put("/_matrix/client/r0/rooms/<_>/typing/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub fn create_typing_event_route(
     db: State<'_, Database>,
     body: Ruma<create_typing_event::Request<'_>>,

src/client_server/unversioned.rs

@@ -15,6 +15,7 @@ use rocket::get;
 /// Note: Unstable features are used while developing new features. Clients should avoid using
 /// unstable features in their stable releases
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/client/versions"))]
+#[tracing::instrument]
 pub async fn get_supported_versions_route() -> ConduitResult<get_supported_versions::Response> {
     let mut resp =
         get_supported_versions::Response::new(vec!["r0.5.0".to_owned(), "r0.6.0".to_owned()]);

src/client_server/user_directory.rs

@@ -9,6 +9,7 @@ use rocket::post;
     feature = "conduit_bin",
     post("/_matrix/client/r0/user_directory/search", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn search_users_route(
     db: State<'_, Database>,
     body: Ruma<search_users::Request<'_>>,

src/client_server/voip.rs

@@ -1,13 +1,18 @@
-use crate::{ConduitResult, Error};
+use crate::ConduitResult;
-use ruma::api::client::{error::ErrorKind, r0::message::send_message_event};
+use ruma::api::client::r0::voip::get_turn_server_info;
+use std::time::Duration;
 
 #[cfg(feature = "conduit_bin")]
 use rocket::get;
 
 #[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/voip/turnServer"))]
-pub async fn turn_server_route() -> ConduitResult<send_message_event::Response> {
+#[tracing::instrument]
-    Err(Error::BadRequest(
+pub async fn turn_server_route() -> ConduitResult<get_turn_server_info::Response> {
-        ErrorKind::NotFound,
+    Ok(get_turn_server_info::Response {
-        "There is no turn server yet.",
+        username: "".to_owned(),
-    ))
+        password: "".to_owned(),
+        uris: Vec::new(),
+        ttl: Duration::from_secs(60 * 60 * 24),
+    }
+    .into())
 }

src/database.rs

@@ -1,8 +1,10 @@
 pub mod account_data;
 pub mod admin;
+pub mod appservice;
 pub mod globals;
 pub mod key_backups;
 pub mod media;
+pub mod pusher;
 pub mod rooms;
 pub mod sending;
 pub mod transaction_ids;
@@ -16,30 +18,47 @@ use log::info;
 use rocket::futures::{self, channel::mpsc};
 use ruma::{DeviceId, ServerName, UserId};
 use serde::Deserialize;
-use std::{convert::TryInto, fs::remove_dir_all};
+use std::{
+    collections::HashMap,
+    fs::remove_dir_all,
+    sync::{Arc, RwLock},
+};
+use tokio::sync::Semaphore;
 
-#[derive(Clone, Deserialize)]
+#[derive(Clone, Debug, Deserialize)]
 pub struct Config {
-    #[serde(default = "default_server_name")]
     server_name: Box<ServerName>,
-    database_path: Option<String>,
+    database_path: String,
     #[serde(default = "default_cache_capacity")]
-    cache_capacity: u64,
+    cache_capacity: u32,
     #[serde(default = "default_max_request_size")]
     max_request_size: u32,
-    #[serde(default)]
+    #[serde(default = "default_max_concurrent_requests")]
-    registration_disabled: bool,
+    max_concurrent_requests: u16,
-    #[serde(default)]
+    #[serde(default = "true_fn")]
-    encryption_disabled: bool,
+    allow_registration: bool,
-    #[serde(default)]
+    #[serde(default = "true_fn")]
-    federation_enabled: bool,
+    allow_encryption: bool,
+    #[serde(default = "false_fn")]
+    allow_federation: bool,
+    #[serde(default = "false_fn")]
+    pub allow_jaeger: bool,
+    jwt_secret: Option<String>,
+    #[serde(default = "Vec::new")]
+    trusted_servers: Vec<Box<ServerName>>,
+    #[serde(default = "default_log")]
+    pub log: String,
 }
 
-fn default_server_name() -> Box<ServerName> {
+fn false_fn() -> bool {
-    "localhost".try_into().expect("")
+    false
 }
 
-fn default_cache_capacity() -> u64 {
+fn true_fn() -> bool {
+    true
+}
+
+fn default_cache_capacity() -> u32 {
     1024 * 1024 * 1024
 }
 
@@ -47,6 +66,14 @@ fn default_max_request_size() -> u32 {
     20 * 1024 * 1024 // Default to 20 MB
 }
 
+fn default_max_concurrent_requests() -> u16 {
+    4
+}
+
+fn default_log() -> String {
+    "info,state_res=warn,rocket=off,_=off,sled=off".to_owned()
+}
+
 #[derive(Clone)]
 pub struct Database {
     pub globals: globals::Globals,
@@ -59,6 +86,8 @@ pub struct Database {
     pub transaction_ids: transaction_ids::TransactionIds,
     pub sending: sending::Sending,
     pub admin: admin::Admin,
+    pub appservice: appservice::Appservice,
+    pub pusher: pusher::PushData,
     pub _db: sled::Db,
 }
 
@@ -77,46 +106,28 @@ impl Database {
 
     /// Load an existing database or create a new one.
     pub async fn load_or_create(config: Config) -> Result<Self> {
-        let path = config
-            .database_path
-            .clone()
-            .map(Ok::<_, Error>)
-            .unwrap_or_else(|| {
-                let path = ProjectDirs::from("xyz", "koesters", "conduit")
-                    .ok_or_else(|| {
-                        Error::bad_config("The OS didn't return a valid home directory path.")
-                    })?
-                    .data_dir()
-                    .join(config.server_name.as_str());
-
-                Ok(path
-                    .to_str()
-                    .ok_or_else(|| Error::bad_config("Database path contains invalid unicode."))?
-                    .to_owned())
-            })?;
-
         let db = sled::Config::default()
-            .path(&path)
+            .path(&config.database_path)
-            .cache_capacity(config.cache_capacity)
+            .cache_capacity(config.cache_capacity as u64)
-            .print_profile_on_drop(true)
+            .use_compression(true)
             .open()?;
 
-        info!("Opened sled database at {}", path);
+        info!("Opened sled database at {}", config.database_path);
 
         let (admin_sender, admin_receiver) = mpsc::unbounded();
 
         let db = Self {
-            globals: globals::Globals::load(db.open_tree("global")?, config).await?,
             users: users::Users {
                 userid_password: db.open_tree("userid_password")?,
                 userid_displayname: db.open_tree("userid_displayname")?,
                 userid_avatarurl: db.open_tree("userid_avatarurl")?,
                 userdeviceid_token: db.open_tree("userdeviceid_token")?,
                 userdeviceid_metadata: db.open_tree("userdeviceid_metadata")?,
+                userid_devicelistversion: db.open_tree("userid_devicelistversion")?,
                 token_userdeviceid: db.open_tree("token_userdeviceid")?,
                 onetimekeyid_onetimekeys: db.open_tree("onetimekeyid_onetimekeys")?,
                 userid_lastonetimekeyupdate: db.open_tree("userid_lastonetimekeyupdate")?,
-                keychangeid_userid: db.open_tree("devicekeychangeid_userid")?,
+                keychangeid_userid: db.open_tree("keychangeid_userid")?,
                 keyid_key: db.open_tree("keyid_key")?,
                 userid_masterkeyid: db.open_tree("userid_masterkeyid")?,
                 userid_selfsigningkeyid: db.open_tree("userid_selfsigningkeyid")?,
@@ -131,7 +142,7 @@ impl Database {
                     readreceiptid_readreceipt: db.open_tree("readreceiptid_readreceipt")?,
                     roomuserid_privateread: db.open_tree("roomuserid_privateread")?, // "Private" read receipt
                     roomuserid_lastprivatereadupdate: db
-                        .open_tree("roomid_lastprivatereadupdate")?,
+                        .open_tree("roomuserid_lastprivatereadupdate")?,
                     typingid_userid: db.open_tree("typingid_userid")?,
                     roomid_lasttypingupdate: db.open_tree("roomid_lasttypingupdate")?,
                     presenceid_presence: db.open_tree("presenceid_presence")?,
@@ -142,7 +153,7 @@ impl Database {
                 roomid_pduleaves: db.open_tree("roomid_pduleaves")?,
 
                 alias_roomid: db.open_tree("alias_roomid")?,
-                aliasid_alias: db.open_tree("alias_roomid")?,
+                aliasid_alias: db.open_tree("aliasid_alias")?,
                 publicroomids: db.open_tree("publicroomids")?,
 
                 tokenids: db.open_tree("tokenids")?,
@@ -151,13 +162,24 @@ impl Database {
                 userroomid_joined: db.open_tree("userroomid_joined")?,
                 roomuserid_joined: db.open_tree("roomuserid_joined")?,
                 roomuseroncejoinedids: db.open_tree("roomuseroncejoinedids")?,
-                userroomid_invited: db.open_tree("userroomid_invited")?,
+                userroomid_invitestate: db.open_tree("userroomid_invitestate")?,
-                roomuserid_invited: db.open_tree("roomuserid_invited")?,
+                roomuserid_invitecount: db.open_tree("roomuserid_invitecount")?,
-                userroomid_left: db.open_tree("userroomid_left")?,
+                userroomid_leftstate: db.open_tree("userroomid_leftstate")?,
+                roomuserid_leftcount: db.open_tree("roomuserid_leftcount")?,
 
-                stateid_pduid: db.open_tree("stateid_pduid")?,
+                userroomid_notificationcount: db.open_tree("userroomid_notificationcount")?,
-                pduid_statehash: db.open_tree("pduid_statehash")?,
+                userroomid_highlightcount: db.open_tree("userroomid_highlightcount")?,
-                roomid_statehash: db.open_tree("roomid_statehash")?,
+
+                statekey_shortstatekey: db.open_tree("statekey_shortstatekey")?,
+                stateid_shorteventid: db.open_tree("stateid_shorteventid")?,
+                eventid_shorteventid: db.open_tree("eventid_shorteventid")?,
+                shorteventid_eventid: db.open_tree("shorteventid_eventid")?,
+                shorteventid_shortstatehash: db.open_tree("shorteventid_shortstatehash")?,
+                roomid_shortstatehash: db.open_tree("roomid_shortstatehash")?,
+                statehash_shortstatehash: db.open_tree("statehash_shortstatehash")?,
+
+                eventid_outlierpdu: db.open_tree("eventid_outlierpdu")?,
+                prevevent_parent: db.open_tree("prevevent_parent")?,
             },
             account_data: account_data::AccountData {
                 roomuserdataid_accountdata: db.open_tree("roomuserdataid_accountdata")?,
@@ -168,7 +190,7 @@ impl Database {
             key_backups: key_backups::KeyBackups {
                 backupid_algorithm: db.open_tree("backupid_algorithm")?,
                 backupid_etag: db.open_tree("backupid_etag")?,
-                backupkeyid_backup: db.open_tree("backupkeyid_backupmetadata")?,
+                backupkeyid_backup: db.open_tree("backupkeyid_backup")?,
             },
             transaction_ids: transaction_ids::TransactionIds {
                 userdevicetxnid_response: db.open_tree("userdevicetxnid_response")?,
@@ -176,10 +198,21 @@ impl Database {
             sending: sending::Sending {
                 servernamepduids: db.open_tree("servernamepduids")?,
                 servercurrentpdus: db.open_tree("servercurrentpdus")?,
+                maximum_requests: Arc::new(Semaphore::new(config.max_concurrent_requests as usize)),
             },
             admin: admin::Admin {
                 sender: admin_sender,
             },
+            appservice: appservice::Appservice {
+                cached_registrations: Arc::new(RwLock::new(HashMap::new())),
+                id_appserviceregistrations: db.open_tree("id_appserviceregistrations")?,
+            },
+            pusher: pusher::PushData::new(&db)?,
+            globals: globals::Globals::load(
+                db.open_tree("global")?,
+                db.open_tree("servertimeout_signingkey")?,
+                config,
+            )?,
             _db: db,
         };
 
@@ -189,7 +222,7 @@ impl Database {
     }
 
     pub async fn watch(&self, user_id: &UserId, device_id: &DeviceId) {
-        let userid_bytes = user_id.to_string().as_bytes().to_vec();
+        let userid_bytes = user_id.as_bytes().to_vec();
         let mut userid_prefix = userid_bytes.clone();
         userid_prefix.push(0xff);
 
@@ -208,12 +241,16 @@ impl Database {
         );
 
         futures.push(self.rooms.userroomid_joined.watch_prefix(&userid_prefix));
-        futures.push(self.rooms.userroomid_invited.watch_prefix(&userid_prefix));
+        futures.push(
-        futures.push(self.rooms.userroomid_left.watch_prefix(&userid_prefix));
+            self.rooms
+                .userroomid_invitestate
+                .watch_prefix(&userid_prefix),
+        );
+        futures.push(self.rooms.userroomid_leftstate.watch_prefix(&userid_prefix));
 
         // Events for rooms we are in
         for room_id in self.rooms.rooms_joined(user_id).filter_map(|r| r.ok()) {
-            let roomid_bytes = room_id.to_string().as_bytes().to_vec();
+            let roomid_bytes = room_id.as_bytes().to_vec();
             let mut roomid_prefix = roomid_bytes.clone();
             roomid_prefix.push(0xff);
 
@@ -273,7 +310,8 @@ impl Database {
     }
 
     pub async fn flush(&self) -> Result<()> {
-        self._db.flush_async().await?;
+        // noop while we don't use sled 1.0
+        //self._db.flush_async().await?;
         Ok(())
     }
 }

src/database/account_data.rs

@@ -30,7 +30,7 @@ impl AccountData {
             .as_bytes()
             .to_vec();
         prefix.push(0xff);
-        prefix.extend_from_slice(&user_id.to_string().as_bytes());
+        prefix.extend_from_slice(&user_id.as_bytes());
         prefix.push(0xff);
 
         // Remove old entry
@@ -42,7 +42,7 @@ impl AccountData {
         let mut key = prefix;
         key.extend_from_slice(&globals.next_count()?.to_be_bytes());
         key.push(0xff);
-        key.extend_from_slice(event_type.to_string().as_bytes());
+        key.extend_from_slice(event_type.as_ref().as_bytes());
 
         let json = serde_json::to_value(data).expect("all types here can be serialized"); // TODO: maybe add error handling
         if json.get("type").is_none() || json.get("content").is_none() {
@@ -74,6 +74,7 @@ impl AccountData {
     }
 
     /// Returns all changes to the account data that happened after `since`.
+    #[tracing::instrument(skip(self))]
     pub fn changes_since(
         &self,
         room_id: Option<&RoomId>,
@@ -88,7 +89,7 @@ impl AccountData {
             .as_bytes()
             .to_vec();
         prefix.push(0xff);
-        prefix.extend_from_slice(&user_id.to_string().as_bytes());
+        prefix.extend_from_slice(&user_id.as_bytes());
         prefix.push(0xff);
 
         // Skip the data that's exactly at since, because we sent that last time
@@ -134,7 +135,7 @@ impl AccountData {
             .as_bytes()
             .to_vec();
         prefix.push(0xff);
-        prefix.extend_from_slice(&user_id.to_string().as_bytes());
+        prefix.extend_from_slice(&user_id.as_bytes());
         prefix.push(0xff);
         let kind = kind.clone();
 
@@ -147,7 +148,7 @@ impl AccountData {
                         k.rsplit(|&b| b == 0xff)
                             .next()
                             .map(|current_event_type| {
-                                current_event_type == kind.to_string().as_bytes()
+                                current_event_type == kind.as_ref().as_bytes()
                             })
                             .unwrap_or(false)
                     })

src/database/admin.rs

@@ -7,10 +7,11 @@ use ruma::{
     events::{room::message, EventType},
     UserId,
 };
-use tokio::select;
 
 pub enum AdminCommand {
-    SendTextMessage(message::TextMessageEventContent),
+    RegisterAppservice(serde_yaml::Value),
+    ListAppservices,
+    SendMessage(message::MessageEventContent),
 }
 
 #[derive(Clone)]
@@ -41,31 +42,48 @@ impl Admin {
                 .unwrap();
 
             if conduit_room.is_none() {
-                warn!("Conduit instance does not have an #admins room. Logging to that room will not work.");
+                warn!("Conduit instance does not have an #admins room. Logging to that room will not work. Restart Conduit after creating a user to fix this.");
             }
 
+            let send_message = |message: message::MessageEventContent| {
+                if let Some(conduit_room) = &conduit_room {
+                    db.rooms
+                        .build_and_append_pdu(
+                            PduBuilder {
+                                event_type: EventType::RoomMessage,
+                                content: serde_json::to_value(message)
+                                    .expect("event is valid, we just created it"),
+                                unsigned: None,
+                                state_key: None,
+                                redacts: None,
+                            },
+                            &conduit_user,
+                            &conduit_room,
+                            &db,
+                        )
+                        .unwrap();
+                }
+            };
+
             loop {
-                select! {
+                tokio::select! {
                     Some(event) = receiver.next() => {
                         match event {
-                            AdminCommand::SendTextMessage(message) => {
+                            AdminCommand::RegisterAppservice(yaml) => {
-                                if let Some(conduit_room) = &conduit_room {
+                                db.appservice.register_appservice(yaml).unwrap(); // TODO handle error
-                                    db.rooms.build_and_append_pdu(
+                            }
-                                        PduBuilder {
+                            AdminCommand::ListAppservices => {
-                                            event_type: EventType::RoomMessage,
+                                let appservices = db.appservice.iter_ids().collect::<Vec<_>>();
-                                            content: serde_json::to_value(message).expect("event is valid, we just created it"),
+                                let count = appservices.len();
-                                            unsigned: None,
+                                let output = format!(
-                                            state_key: None,
+                                    "Appservices ({}): {}",
-                                            redacts: None,
+                                    count,
-                                        },
+                                    appservices.into_iter().filter_map(|r| r.ok()).collect::<Vec<_>>().join(", ")
-                                        &conduit_user,
+                                );
-                                        &conduit_room,
+                                send_message(message::MessageEventContent::text_plain(output));
-                                        &db.globals,
+                            }
-                                        &db.sending,
+                            AdminCommand::SendMessage(message) => {
-                                        &db.admin,
+                                send_message(message);
-                                        &db.account_data,
-                                    ).unwrap();
-                                }
                             }
                         }
                     }

src/database/appservice.rs

@@ -0,0 +1,67 @@
+use crate::{utils, Error, Result};
+use std::{
+    collections::HashMap,
+    sync::{Arc, RwLock},
+};
+
+#[derive(Clone)]
+pub struct Appservice {
+    pub(super) cached_registrations: Arc<RwLock<HashMap<String, serde_yaml::Value>>>,
+    pub(super) id_appserviceregistrations: sled::Tree,
+}
+
+impl Appservice {
+    pub fn register_appservice(&self, yaml: serde_yaml::Value) -> Result<()> {
+        // TODO: Rumaify
+        let id = yaml.get("id").unwrap().as_str().unwrap();
+        self.id_appserviceregistrations
+            .insert(id, serde_yaml::to_string(&yaml).unwrap().as_bytes())?;
+        self.cached_registrations
+            .write()
+            .unwrap()
+            .insert(id.to_owned(), yaml);
+
+        Ok(())
+    }
+
+    pub fn get_registration(&self, id: &str) -> Result<Option<serde_yaml::Value>> {
+        self.cached_registrations
+            .read()
+            .unwrap()
+            .get(id)
+            .map_or_else(
+                || {
+                    Ok(self
+                        .id_appserviceregistrations
+                        .get(id)?
+                        .map(|bytes| {
+                            Ok::<_, Error>(serde_yaml::from_slice(&bytes).map_err(|_| {
+                                Error::bad_database(
+                                    "Invalid registration bytes in id_appserviceregistrations.",
+                                )
+                            })?)
+                        })
+                        .transpose()?)
+                },
+                |r| Ok(Some(r.clone())),
+            )
+    }
+
+    pub fn iter_ids(&self) -> impl Iterator<Item = Result<String>> {
+        self.id_appserviceregistrations.iter().keys().map(|id| {
+            Ok(utils::string_from_bytes(&id?).map_err(|_| {
+                Error::bad_database("Invalid id bytes in id_appserviceregistrations.")
+            })?)
+        })
+    }
+
+    pub fn iter_all(&self) -> impl Iterator<Item = Result<(String, serde_yaml::Value)>> + '_ {
+        self.iter_ids().filter_map(|id| id.ok()).map(move |id| {
+            Ok((
+                id.clone(),
+                self.get_registration(&id)?
+                    .expect("iter_ids only returns appservices that exist"),
+            ))
+        })
+    }
+}

src/database/globals.rs

@@ -1,25 +1,73 @@
 use crate::{database::Config, utils, Error, Result};
+use log::{error, info};
+use ruma::{
+    api::federation::discovery::{ServerSigningKeys, VerifyKey},
+    ServerName, ServerSigningKeyId,
+};
+use rustls::{ServerCertVerifier, WebPKIVerifier};
+use std::{
+    collections::{BTreeMap, HashMap},
+    sync::{Arc, RwLock},
+    time::Duration,
+};
 use trust_dns_resolver::TokioAsyncResolver;
-use std::collections::HashMap;
-use log::error;
-use ruma::ServerName;
-use std::sync::Arc;
-use std::sync::RwLock;
 
 pub const COUNTER: &str = "c";
 
+type WellKnownMap = HashMap<Box<ServerName>, (String, String)>;
+type TlsNameMap = HashMap<String, webpki::DNSName>;
 #[derive(Clone)]
 pub struct Globals {
+    pub actual_destination_cache: Arc<RwLock<WellKnownMap>>, // actual_destination, host
+    pub tls_name_override: Arc<RwLock<TlsNameMap>>,
     pub(super) globals: sled::Tree,
     config: Config,
     keypair: Arc<ruma::signatures::Ed25519KeyPair>,
     reqwest_client: reqwest::Client,
-    pub actual_destination_cache: Arc<RwLock<HashMap<Box<ServerName>, (String, Option<String>)>>>, // actual_destination, host
     dns_resolver: TokioAsyncResolver,
+    jwt_decoding_key: Option<jsonwebtoken::DecodingKey<'static>>,
+    pub(super) servertimeout_signingkey: sled::Tree, // ServerName + Timeout Timestamp -> algorithm:key + pubkey
+}
+
+struct MatrixServerVerifier {
+    inner: WebPKIVerifier,
+    tls_name_override: Arc<RwLock<TlsNameMap>>,
+}
+
+impl ServerCertVerifier for MatrixServerVerifier {
+    fn verify_server_cert(
+        &self,
+        roots: &rustls::RootCertStore,
+        presented_certs: &[rustls::Certificate],
+        dns_name: webpki::DNSNameRef<'_>,
+        ocsp_response: &[u8],
+    ) -> std::result::Result<rustls::ServerCertVerified, rustls::TLSError> {
+        if let Some(override_name) = self.tls_name_override.read().unwrap().get(dns_name.into()) {
+            let result = self.inner.verify_server_cert(
+                roots,
+                presented_certs,
+                override_name.as_ref(),
+                ocsp_response,
+            );
+            if result.is_ok() {
+                return result;
+            }
+            info!(
+                "Server {:?} is non-compliant, retrying TLS verification with original name",
+                dns_name
+            );
+        }
+        self.inner
+            .verify_server_cert(roots, presented_certs, dns_name, ocsp_response)
+    }
 }
 
 impl Globals {
-    pub async fn load(globals: sled::Tree, config: Config) -> Result<Self> {
+    pub fn load(
+        globals: sled::Tree,
+        servertimeout_signingkey: sled::Tree,
+        config: Config,
+    ) -> Result<Self> {
         let bytes = &*globals
             .update_and_fetch("keypair", utils::generate_keypair)?
             .expect("utils::generate_keypair always returns Some");
@@ -54,15 +102,41 @@ impl Globals {
             }
         };
 
+        let tls_name_override = Arc::new(RwLock::new(TlsNameMap::new()));
+        let verifier = Arc::new(MatrixServerVerifier {
+            inner: WebPKIVerifier::new(),
+            tls_name_override: tls_name_override.clone(),
+        });
+        let mut tlsconfig = rustls::ClientConfig::new();
+        tlsconfig.dangerous().set_certificate_verifier(verifier);
+        tlsconfig.root_store =
+            rustls_native_certs::load_native_certs().expect("Error loading system certificates");
+
+        let reqwest_client = reqwest::Client::builder()
+            .connect_timeout(Duration::from_secs(30))
+            .timeout(Duration::from_secs(60 * 3))
+            .pool_max_idle_per_host(1)
+            .use_preconfigured_tls(tlsconfig)
+            .build()
+            .unwrap();
+
+        let jwt_decoding_key = config
+            .jwt_secret
+            .as_ref()
+            .map(|secret| jsonwebtoken::DecodingKey::from_secret(secret.as_bytes()).into_static());
+
         Ok(Self {
             globals,
             config,
             keypair: Arc::new(keypair),
-            reqwest_client: reqwest::Client::new(),
+            reqwest_client,
-            dns_resolver: TokioAsyncResolver::tokio_from_system_conf().await.map_err(|_| {
+            dns_resolver: TokioAsyncResolver::tokio_from_system_conf().map_err(|_| {
                 Error::bad_config("Failed to set up trust dns resolver with system config.")
             })?,
-            actual_destination_cache: Arc::new(RwLock::new(HashMap::new())),
+            actual_destination_cache: Arc::new(RwLock::new(WellKnownMap::new())),
+            tls_name_override,
+            servertimeout_signingkey,
+            jwt_decoding_key,
         })
     }
 
@@ -101,19 +175,87 @@ impl Globals {
         self.config.max_request_size
     }
 
-    pub fn registration_disabled(&self) -> bool {
+    pub fn allow_registration(&self) -> bool {
-        self.config.registration_disabled
+        self.config.allow_registration
     }
 
-    pub fn encryption_disabled(&self) -> bool {
+    pub fn allow_encryption(&self) -> bool {
-        self.config.encryption_disabled
+        self.config.allow_encryption
     }
 
-    pub fn federation_enabled(&self) -> bool {
+    pub fn allow_federation(&self) -> bool {
-        self.config.federation_enabled
+        self.config.allow_federation
+    }
+
+    pub fn trusted_servers(&self) -> &[Box<ServerName>] {
+        &self.config.trusted_servers
     }
 
     pub fn dns_resolver(&self) -> &TokioAsyncResolver {
         &self.dns_resolver
     }
+
+    pub fn jwt_decoding_key(&self) -> Option<&jsonwebtoken::DecodingKey<'_>> {
+        self.jwt_decoding_key.as_ref()
+    }
+
+    /// 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(&self, origin: &ServerName, keys: &ServerSigningKeys) -> Result<()> {
+        let mut key1 = origin.as_bytes().to_vec();
+        key1.push(0xff);
+
+        let mut key2 = key1.clone();
+
+        let ts = keys
+            .valid_until_ts
+            .duration_since(std::time::UNIX_EPOCH)
+            .expect("time is valid")
+            .as_millis() as u64;
+
+        key1.extend_from_slice(&ts.to_be_bytes());
+        key2.extend_from_slice(&(ts + 1).to_be_bytes());
+
+        self.servertimeout_signingkey.insert(
+            key1,
+            serde_json::to_vec(&keys.verify_keys).expect("ServerSigningKeys are a valid string"),
+        )?;
+
+        self.servertimeout_signingkey.insert(
+            key2,
+            serde_json::to_vec(&keys.old_verify_keys)
+                .expect("ServerSigningKeys are a valid string"),
+        )?;
+
+        Ok(())
+    }
+
+    /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found for the server.
+    pub fn signing_keys_for(
+        &self,
+        origin: &ServerName,
+    ) -> Result<BTreeMap<ServerSigningKeyId, VerifyKey>> {
+        let mut response = BTreeMap::new();
+
+        let now = crate::utils::millis_since_unix_epoch();
+
+        for item in self.servertimeout_signingkey.scan_prefix(origin.as_bytes()) {
+            let (k, bytes) = item?;
+            let valid_until = k
+                .splitn(2, |&b| b == 0xff)
+                .nth(1)
+                .map(crate::utils::u64_from_bytes)
+                .ok_or_else(|| Error::bad_database("Invalid signing keys."))?
+                .map_err(|_| Error::bad_database("Invalid signing key valid until bytes"))?;
+            // If these keys are still valid use em!
+            if valid_until > now {
+                let btree: BTreeMap<_, _> = serde_json::from_slice(&bytes)
+                    .map_err(|_| Error::bad_database("Invalid BTreeMap<> of signing keys"))?;
+                response.extend(btree);
+            }
+        }
+        Ok(response)
+    }
 }

src/database/key_backups.rs

@@ -2,7 +2,7 @@ use crate::{utils, Error, Result};
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::backup::{BackupAlgorithm, KeyData, Sessions},
+        r0::backup::{BackupAlgorithm, KeyBackupData, RoomKeyBackup},
     },
     RoomId, UserId,
 };
@@ -24,7 +24,7 @@ impl KeyBackups {
     ) -> Result<String> {
         let version = globals.next_count()?.to_string();
 
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(&version.as_bytes());
 
@@ -39,7 +39,7 @@ impl KeyBackups {
     }
 
     pub fn delete_backup(&self, user_id: &UserId, version: &str) -> Result<()> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(&version.as_bytes());
 
@@ -67,7 +67,7 @@ impl KeyBackups {
         backup_metadata: &BackupAlgorithm,
         globals: &super::globals::Globals,
     ) -> Result<String> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(&version.as_bytes());
 
@@ -89,7 +89,7 @@ impl KeyBackups {
     }
 
     pub fn get_latest_backup(&self, user_id: &UserId) -> Result<Option<(String, BackupAlgorithm)>> {
-        let mut prefix = user_id.to_string().as_bytes().to_vec();
+        let mut prefix = user_id.as_bytes().to_vec();
         prefix.push(0xff);
         self.backupid_algorithm
             .scan_prefix(&prefix)
@@ -113,7 +113,7 @@ impl KeyBackups {
     }
 
     pub fn get_backup(&self, user_id: &UserId, version: &str) -> Result<Option<BackupAlgorithm>> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(version.as_bytes());
 
@@ -129,10 +129,10 @@ impl KeyBackups {
         version: &str,
         room_id: &RoomId,
         session_id: &str,
-        key_data: &KeyData,
+        key_data: &KeyBackupData,
         globals: &super::globals::Globals,
     ) -> Result<()> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(version.as_bytes());
 
@@ -147,20 +147,20 @@ impl KeyBackups {
             .insert(&key, &globals.next_count()?.to_be_bytes())?;
 
         key.push(0xff);
-        key.extend_from_slice(room_id.to_string().as_bytes());
+        key.extend_from_slice(room_id.as_bytes());
         key.push(0xff);
         key.extend_from_slice(session_id.as_bytes());
 
         self.backupkeyid_backup.insert(
             &key,
-            &*serde_json::to_string(&key_data).expect("KeyData::to_string always works"),
+            &*serde_json::to_string(&key_data).expect("KeyBackupData::to_string always works"),
         )?;
 
         Ok(())
     }
 
     pub fn count_keys(&self, user_id: &UserId, version: &str) -> Result<usize> {
-        let mut prefix = user_id.to_string().as_bytes().to_vec();
+        let mut prefix = user_id.as_bytes().to_vec();
         prefix.push(0xff);
         prefix.extend_from_slice(version.as_bytes());
 
@@ -168,7 +168,7 @@ impl KeyBackups {
     }
 
     pub fn get_etag(&self, user_id: &UserId, version: &str) -> Result<String> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(&version.as_bytes());
 
@@ -182,13 +182,17 @@ impl KeyBackups {
         .to_string())
     }
 
-    pub fn get_all(&self, user_id: &UserId, version: &str) -> Result<BTreeMap<RoomId, Sessions>> {
+    pub fn get_all(
-        let mut prefix = user_id.to_string().as_bytes().to_vec();
+        &self,
+        user_id: &UserId,
+        version: &str,
+    ) -> Result<BTreeMap<RoomId, RoomKeyBackup>> {
+        let mut prefix = user_id.as_bytes().to_vec();
         prefix.push(0xff);
         prefix.extend_from_slice(version.as_bytes());
         prefix.push(0xff);
 
-        let mut rooms = BTreeMap::<RoomId, Sessions>::new();
+        let mut rooms = BTreeMap::<RoomId, RoomKeyBackup>::new();
 
         for result in self.backupkeyid_backup.scan_prefix(&prefix).map(|r| {
             let (key, value) = r?;
@@ -211,15 +215,16 @@ impl KeyBackups {
             )
             .map_err(|_| Error::bad_database("backupkeyid_backup room_id is invalid room id."))?;
 
-            let key_data = serde_json::from_slice(&value)
+            let key_data = serde_json::from_slice(&value).map_err(|_| {
-                .map_err(|_| Error::bad_database("KeyData in backupkeyid_backup is invalid."))?;
+                Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
+            })?;
 
             Ok::<_, Error>((room_id, session_id, key_data))
         }) {
             let (room_id, session_id, key_data) = result?;
             rooms
                 .entry(room_id)
-                .or_insert_with(|| Sessions {
+                .or_insert_with(|| RoomKeyBackup {
                     sessions: BTreeMap::new(),
                 })
                 .sessions
@@ -234,8 +239,8 @@ impl KeyBackups {
         user_id: &UserId,
         version: &str,
         room_id: &RoomId,
-    ) -> BTreeMap<String, KeyData> {
+    ) -> BTreeMap<String, KeyBackupData> {
-        let mut prefix = user_id.to_string().as_bytes().to_vec();
+        let mut prefix = user_id.as_bytes().to_vec();
         prefix.push(0xff);
         prefix.extend_from_slice(version.as_bytes());
         prefix.push(0xff);
@@ -257,7 +262,7 @@ impl KeyBackups {
                     })?;
 
                 let key_data = serde_json::from_slice(&value).map_err(|_| {
-                    Error::bad_database("KeyData in backupkeyid_backup is invalid.")
+                    Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
                 })?;
 
                 Ok::<_, Error>((session_id, key_data))
@@ -272,8 +277,8 @@ impl KeyBackups {
         version: &str,
         room_id: &RoomId,
         session_id: &str,
-    ) -> Result<Option<KeyData>> {
+    ) -> Result<Option<KeyBackupData>> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(version.as_bytes());
         key.push(0xff);
@@ -284,14 +289,15 @@ impl KeyBackups {
         self.backupkeyid_backup
             .get(&key)?
             .map(|value| {
-                serde_json::from_slice(&value)
+                serde_json::from_slice(&value).map_err(|_| {
-                    .map_err(|_| Error::bad_database("KeyData in backupkeyid_backup is invalid."))
+                    Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
+                })
             })
             .transpose()
     }
 
     pub fn delete_all_keys(&self, user_id: &UserId, version: &str) -> Result<()> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(&version.as_bytes());
         key.push(0xff);
@@ -314,7 +320,7 @@ impl KeyBackups {
         version: &str,
         room_id: &RoomId,
     ) -> Result<()> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(&version.as_bytes());
         key.push(0xff);
@@ -340,7 +346,7 @@ impl KeyBackups {
         room_id: &RoomId,
         session_id: &str,
     ) -> Result<()> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(&version.as_bytes());
         key.push(0xff);

src/database/media.rs

@@ -226,16 +226,17 @@ impl Media {
                 }
 
                 let thumbnail = if crop {
-                    image.resize_to_fill(width, height, FilterType::Triangle)
+                    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 use_width = nratio <= ratio;
                         let intermediate = if use_width {
-                            u64::from(original_height) * u64::from(width) / u64::from(width)
+                            u64::from(original_height) * u64::from(width)
+                                / u64::from(original_width)
                         } else {
                             u64::from(original_width) * u64::from(height)
                                 / u64::from(original_height)
@@ -290,7 +291,12 @@ impl Media {
                     file: thumbnail_bytes.to_vec(),
                 }))
             } else {
-                Ok(None)
+                // Couldn't parse file to generate thumbnail, send original
+                Ok(Some(FileMeta {
+                    filename,
+                    content_type,
+                    file: file.to_vec(),
+                }))
             }
         } else {
             Ok(None)

src/database/pusher.rs

@@ -0,0 +1,327 @@
+use crate::{Database, Error, PduEvent, Result};
+use bytes::BytesMut;
+use log::{error, info, warn};
+use ruma::{
+    api::{
+        client::r0::push::{get_pushers, set_pusher, PusherKind},
+        push_gateway::send_event_notification::{
+            self,
+            v1::{Device, Notification, NotificationCounts, NotificationPriority},
+        },
+        IncomingResponse, OutgoingRequest, SendAccessToken,
+    },
+    events::{room::power_levels::PowerLevelsEventContent, EventType},
+    push::{Action, PushConditionRoomCtx, PushFormat, Ruleset, Tweak},
+    uint, UInt, UserId,
+};
+use sled::IVec;
+
+use std::{convert::TryFrom, fmt::Debug};
+
+#[derive(Debug, Clone)]
+pub struct PushData {
+    /// UserId + pushkey -> Pusher
+    pub(super) senderkey_pusher: sled::Tree,
+}
+
+impl PushData {
+    pub fn new(db: &sled::Db) -> Result<Self> {
+        Ok(Self {
+            senderkey_pusher: db.open_tree("senderkey_pusher")?,
+        })
+    }
+
+    pub fn set_pusher(&self, sender: &UserId, pusher: set_pusher::Pusher) -> Result<()> {
+        let mut key = sender.as_bytes().to_vec();
+        key.push(0xff);
+        key.extend_from_slice(pusher.pushkey.as_bytes());
+
+        // There are 2 kinds of pushers but the spec says: null deletes the pusher.
+        if pusher.kind.is_none() {
+            return self
+                .senderkey_pusher
+                .remove(key)
+                .map(|_| ())
+                .map_err(Into::into);
+        }
+
+        self.senderkey_pusher.insert(
+            key,
+            &*serde_json::to_string(&pusher).expect("Pusher is valid JSON string"),
+        )?;
+
+        Ok(())
+    }
+
+    pub fn get_pusher(&self, senderkey: &[u8]) -> Result<Option<get_pushers::Pusher>> {
+        self.senderkey_pusher
+            .get(senderkey)?
+            .map(|push| {
+                Ok(serde_json::from_slice(&*push)
+                    .map_err(|_| Error::bad_database("Invalid Pusher in db."))?)
+            })
+            .transpose()
+    }
+
+    pub fn get_pushers(&self, sender: &UserId) -> Result<Vec<get_pushers::Pusher>> {
+        let mut prefix = sender.as_bytes().to_vec();
+        prefix.push(0xff);
+
+        self.senderkey_pusher
+            .scan_prefix(prefix)
+            .values()
+            .map(|push| {
+                let push = push.map_err(|_| Error::bad_database("Invalid push bytes in db."))?;
+                Ok(serde_json::from_slice(&*push)
+                    .map_err(|_| Error::bad_database("Invalid Pusher in db."))?)
+            })
+            .collect()
+    }
+
+    pub fn get_pusher_senderkeys(&self, sender: &UserId) -> impl Iterator<Item = Result<IVec>> {
+        let mut prefix = sender.as_bytes().to_vec();
+        prefix.push(0xff);
+
+        self.senderkey_pusher
+            .scan_prefix(prefix)
+            .keys()
+            .map(|r| Ok(r?))
+    }
+}
+
+pub async fn send_request<T: OutgoingRequest>(
+    globals: &crate::database::globals::Globals,
+    destination: &str,
+    request: T,
+) -> Result<T::IncomingResponse>
+where
+    T: Debug,
+{
+    let destination = destination.replace("/_matrix/push/v1/notify", "");
+
+    let http_request = request
+        .try_into_http_request::<BytesMut>(&destination, SendAccessToken::IfRequired(""))
+        .map_err(|e| {
+            warn!("Failed to find destination {}: {}", destination, e);
+            Error::BadServerResponse("Invalid destination")
+        })?
+        .map(|body| body.freeze());
+
+    let reqwest_request = reqwest::Request::try_from(http_request)
+        .expect("all http requests are valid reqwest requests");
+
+    // TODO: we could keep this very short and let expo backoff do it's thing...
+    //*reqwest_request.timeout_mut() = Some(Duration::from_secs(5));
+
+    let url = reqwest_request.url().clone();
+    let reqwest_response = globals.reqwest_client().execute(reqwest_request).await;
+
+    // Because reqwest::Response -> http::Response is complicated:
+    match reqwest_response {
+        Ok(mut reqwest_response) => {
+            let status = reqwest_response.status();
+            let mut http_response = http::Response::builder().status(status);
+            let headers = http_response.headers_mut().unwrap();
+
+            for (k, v) in reqwest_response.headers_mut().drain() {
+                if let Some(key) = k {
+                    headers.insert(key, v);
+                }
+            }
+
+            let status = reqwest_response.status();
+
+            let body = reqwest_response.bytes().await.unwrap_or_else(|e| {
+                warn!("server error {}", e);
+                Vec::new().into()
+            }); // TODO: handle timeout
+
+            if status != 200 {
+                info!(
+                    "Push gateway returned bad response {} {}\n{}\n{:?}",
+                    destination,
+                    status,
+                    url,
+                    crate::utils::string_from_bytes(&body)
+                );
+            }
+
+            let response = T::IncomingResponse::try_from_http_response(
+                http_response
+                    .body(body)
+                    .expect("reqwest body is valid http body"),
+            );
+            response.map_err(|_| {
+                info!(
+                    "Push gateway returned invalid response bytes {}\n{}",
+                    destination, url
+                );
+                Error::BadServerResponse("Push gateway returned bad response.")
+            })
+        }
+        Err(e) => Err(e.into()),
+    }
+}
+
+pub async fn send_push_notice(
+    user: &UserId,
+    unread: UInt,
+    pusher: &get_pushers::Pusher,
+    ruleset: Ruleset,
+    pdu: &PduEvent,
+    db: &Database,
+) -> Result<()> {
+    let mut notify = None;
+    let mut tweaks = Vec::new();
+
+    for action in get_actions(user, &ruleset, pdu, db)? {
+        let n = match action {
+            Action::DontNotify => false,
+            // TODO: Implement proper support for coalesce
+            Action::Notify | Action::Coalesce => true,
+            Action::SetTweak(tweak) => {
+                tweaks.push(tweak.clone());
+                continue;
+            }
+        };
+
+        if notify.is_some() {
+            return Err(Error::bad_database(
+                r#"Malformed pushrule contains more than one of these actions: ["dont_notify", "notify", "coalesce"]"#,
+            ));
+        }
+
+        notify = Some(n);
+    }
+
+    if notify == Some(true) {
+        send_notice(unread, pusher, tweaks, pdu, db).await?;
+    }
+    // Else the event triggered no actions
+
+    Ok(())
+}
+
+pub fn get_actions<'a>(
+    user: &UserId,
+    ruleset: &'a Ruleset,
+    pdu: &PduEvent,
+    db: &Database,
+) -> Result<&'a [Action]> {
+    let power_levels: PowerLevelsEventContent = db
+        .rooms
+        .room_state_get(&pdu.room_id, &EventType::RoomPowerLevels, "")?
+        .map(|ev| {
+            serde_json::from_value(ev.content)
+                .map_err(|_| Error::bad_database("invalid m.room.power_levels event"))
+        })
+        .transpose()?
+        .unwrap_or_default();
+
+    let ctx = PushConditionRoomCtx {
+        room_id: pdu.room_id.clone(),
+        member_count: 10_u32.into(), // TODO: get member count efficiently
+        user_display_name: db
+            .users
+            .displayname(&user)?
+            .unwrap_or_else(|| user.localpart().to_owned()),
+        users_power_levels: power_levels.users,
+        default_power_level: power_levels.users_default,
+        notification_power_levels: power_levels.notifications,
+    };
+
+    Ok(ruleset.get_actions(&pdu.to_sync_room_event(), &ctx))
+}
+
+async fn send_notice(
+    unread: UInt,
+    pusher: &get_pushers::Pusher,
+    tweaks: Vec<Tweak>,
+    event: &PduEvent,
+    db: &Database,
+) -> Result<()> {
+    // TODO: email
+    if pusher.kind == PusherKind::Email {
+        return Ok(());
+    }
+
+    // TODO:
+    // Two problems with this
+    // 1. if "event_id_only" is the only format kind it seems we should never add more info
+    // 2. can pusher/devices have conflicting formats
+    let event_id_only = pusher.data.format == Some(PushFormat::EventIdOnly);
+    let url = if let Some(url) = &pusher.data.url {
+        url
+    } else {
+        error!("Http Pusher must have URL specified.");
+        return Ok(());
+    };
+
+    let mut device = Device::new(pusher.app_id.clone(), pusher.pushkey.clone());
+    let mut data_minus_url = pusher.data.clone();
+    // The url must be stripped off according to spec
+    data_minus_url.url = None;
+    device.data = Some(data_minus_url);
+
+    // Tweaks are only added if the format is NOT event_id_only
+    if !event_id_only {
+        device.tweaks = tweaks.clone();
+    }
+
+    let d = &[device];
+    let mut notifi = Notification::new(d);
+
+    notifi.prio = NotificationPriority::Low;
+    notifi.event_id = Some(&event.event_id);
+    notifi.room_id = Some(&event.room_id);
+    // TODO: missed calls
+    notifi.counts = NotificationCounts::new(unread, uint!(0));
+
+    if event.kind == EventType::RoomEncrypted
+        || tweaks
+            .iter()
+            .any(|t| matches!(t, Tweak::Highlight(true) | Tweak::Sound(_)))
+    {
+        notifi.prio = NotificationPriority::High
+    }
+
+    if event_id_only {
+        send_request(
+            &db.globals,
+            &url,
+            send_event_notification::v1::Request::new(notifi),
+        )
+        .await?;
+    } else {
+        notifi.sender = Some(&event.sender);
+        notifi.event_type = Some(&event.kind);
+        notifi.content = serde_json::value::to_raw_value(&event.content).ok();
+
+        if event.kind == EventType::RoomMember {
+            notifi.user_is_target = event.state_key.as_deref() == Some(event.sender.as_str());
+        }
+
+        let user_name = db.users.displayname(&event.sender)?;
+        notifi.sender_display_name = user_name.as_deref();
+        let room_name = db
+            .rooms
+            .room_state_get(&event.room_id, &EventType::RoomName, "")?
+            .map(|pdu| match pdu.content.get("name") {
+                Some(serde_json::Value::String(s)) => Some(s.to_string()),
+                _ => None,
+            })
+            .flatten();
+        notifi.room_name = room_name.as_deref();
+
+        send_request(
+            &db.globals,
+            &url,
+            send_event_notification::v1::Request::new(notifi),
+        )
+        .await?;
+    }
+
+    // TODO: email
+
+    Ok(())
+}

src/database/rooms/edus.rs

@@ -1,5 +1,4 @@
 use crate::{utils, Error, Result};
-use js_int::UInt;
 use ruma::{
     events::{
         presence::{PresenceEvent, PresenceEventContent},
@@ -7,10 +6,10 @@ use ruma::{
     },
     presence::PresenceState,
     serde::Raw,
-    RoomId, UserId,
+    RoomId, UInt, UserId,
 };
 use std::{
-    collections::HashMap,
+    collections::{HashMap, HashSet},
     convert::{TryFrom, TryInto},
     mem,
 };
@@ -35,7 +34,7 @@ impl RoomEdus {
         event: EduEvent,
         globals: &super::super::globals::Globals,
     ) -> Result<()> {
-        let mut prefix = room_id.to_string().as_bytes().to_vec();
+        let mut prefix = room_id.as_bytes().to_vec();
         prefix.push(0xff);
 
         // Remove old entry
@@ -50,7 +49,7 @@ impl RoomEdus {
                 key.rsplit(|&b| b == 0xff)
                     .next()
                     .expect("rsplit always returns an element")
-                    == user_id.to_string().as_bytes()
+                    == user_id.as_bytes()
             })
         {
             // This is the old room_latest
@@ -60,7 +59,7 @@ impl RoomEdus {
         let mut room_latest_id = prefix;
         room_latest_id.extend_from_slice(&globals.next_count()?.to_be_bytes());
         room_latest_id.push(0xff);
-        room_latest_id.extend_from_slice(&user_id.to_string().as_bytes());
+        room_latest_id.extend_from_slice(&user_id.as_bytes());
 
         self.readreceiptid_readreceipt.insert(
             room_latest_id,
@@ -71,12 +70,13 @@ impl RoomEdus {
     }
 
     /// Returns an iterator over the most recent read_receipts in a room that happened after the event with id `since`.
+    #[tracing::instrument(skip(self))]
     pub fn readreceipts_since(
         &self,
         room_id: &RoomId,
         since: u64,
     ) -> Result<impl Iterator<Item = Result<Raw<ruma::events::AnySyncEphemeralRoomEvent>>>> {
-        let mut prefix = room_id.to_string().as_bytes().to_vec();
+        let mut prefix = room_id.as_bytes().to_vec();
         prefix.push(0xff);
 
         let mut first_possible_edu = prefix.clone();
@@ -102,9 +102,9 @@ impl RoomEdus {
         count: u64,
         globals: &super::super::globals::Globals,
     ) -> Result<()> {
-        let mut key = room_id.to_string().as_bytes().to_vec();
+        let mut key = room_id.as_bytes().to_vec();
         key.push(0xff);
-        key.extend_from_slice(&user_id.to_string().as_bytes());
+        key.extend_from_slice(&user_id.as_bytes());
 
         self.roomuserid_privateread
             .insert(&key, &count.to_be_bytes())?;
@@ -116,10 +116,11 @@ impl RoomEdus {
     }
 
     /// Returns the private read marker.
+    #[tracing::instrument(skip(self))]
     pub fn private_read_get(&self, room_id: &RoomId, user_id: &UserId) -> Result<Option<u64>> {
-        let mut key = room_id.to_string().as_bytes().to_vec();
+        let mut key = room_id.as_bytes().to_vec();
         key.push(0xff);
-        key.extend_from_slice(&user_id.to_string().as_bytes());
+        key.extend_from_slice(&user_id.as_bytes());
 
         self.roomuserid_privateread.get(key)?.map_or(Ok(None), |v| {
             Ok(Some(utils::u64_from_bytes(&v).map_err(|_| {
@@ -130,9 +131,9 @@ impl RoomEdus {
 
     /// Returns the count of the last typing update in this room.
     pub fn last_privateread_update(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
-        let mut key = room_id.to_string().as_bytes().to_vec();
+        let mut key = room_id.as_bytes().to_vec();
         key.push(0xff);
-        key.extend_from_slice(&user_id.to_string().as_bytes());
+        key.extend_from_slice(&user_id.as_bytes());
 
         Ok(self
             .roomuserid_lastprivatereadupdate
@@ -154,7 +155,7 @@ impl RoomEdus {
         timeout: u64,
         globals: &super::super::globals::Globals,
     ) -> Result<()> {
-        let mut prefix = room_id.to_string().as_bytes().to_vec();
+        let mut prefix = room_id.as_bytes().to_vec();
         prefix.push(0xff);
 
         let count = globals.next_count()?.to_be_bytes();
@@ -165,10 +166,10 @@ impl RoomEdus {
         room_typing_id.extend_from_slice(&count);
 
         self.typingid_userid
-            .insert(&room_typing_id, &*user_id.to_string().as_bytes())?;
+            .insert(&room_typing_id, &*user_id.as_bytes())?;
 
         self.roomid_lasttypingupdate
-            .insert(&room_id.to_string().as_bytes(), &count)?;
+            .insert(&room_id.as_bytes(), &count)?;
 
         Ok(())
     }
@@ -180,7 +181,7 @@ impl RoomEdus {
         room_id: &RoomId,
         globals: &super::super::globals::Globals,
     ) -> Result<()> {
-        let mut prefix = room_id.to_string().as_bytes().to_vec();
+        let mut prefix = room_id.as_bytes().to_vec();
         prefix.push(0xff);
 
         let user_id = user_id.to_string();
@@ -199,10 +200,8 @@ impl RoomEdus {
         }
 
         if found_outdated {
-            self.roomid_lasttypingupdate.insert(
+            self.roomid_lasttypingupdate
-                &room_id.to_string().as_bytes(),
+                .insert(&room_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
-                &globals.next_count()?.to_be_bytes(),
-            )?;
         }
 
         Ok(())
@@ -214,7 +213,7 @@ impl RoomEdus {
         room_id: &RoomId,
         globals: &super::super::globals::Globals,
     ) -> Result<()> {
-        let mut prefix = room_id.to_string().as_bytes().to_vec();
+        let mut prefix = room_id.as_bytes().to_vec();
         prefix.push(0xff);
 
         let current_timestamp = utils::millis_since_unix_epoch();
@@ -247,16 +246,15 @@ impl RoomEdus {
         }
 
         if found_outdated {
-            self.roomid_lasttypingupdate.insert(
+            self.roomid_lasttypingupdate
-                &room_id.to_string().as_bytes(),
+                .insert(&room_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
-                &globals.next_count()?.to_be_bytes(),
-            )?;
         }
 
         Ok(())
     }
 
     /// Returns the count of the last typing update in this room.
+    #[tracing::instrument(skip(self, globals))]
     pub fn last_typing_update(
         &self,
         room_id: &RoomId,
@@ -266,7 +264,7 @@ impl RoomEdus {
 
         Ok(self
             .roomid_lasttypingupdate
-            .get(&room_id.to_string().as_bytes())?
+            .get(&room_id.as_bytes())?
             .map_or(Ok::<_, Error>(None), |bytes| {
                 Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| {
                     Error::bad_database("Count in roomid_lastroomactiveupdate is invalid.")
@@ -279,10 +277,10 @@ impl RoomEdus {
         &self,
         room_id: &RoomId,
     ) -> Result<SyncEphemeralRoomEvent<ruma::events::typing::TypingEventContent>> {
-        let mut prefix = room_id.to_string().as_bytes().to_vec();
+        let mut prefix = room_id.as_bytes().to_vec();
         prefix.push(0xff);
 
-        let mut user_ids = Vec::new();
+        let mut user_ids = HashSet::new();
 
         for user_id in self
             .typingid_userid
@@ -297,11 +295,13 @@ impl RoomEdus {
                 )
             })
         {
-            user_ids.push(user_id?);
+            user_ids.insert(user_id?);
         }
 
         Ok(SyncEphemeralRoomEvent {
-            content: ruma::events::typing::TypingEventContent { user_ids },
+            content: ruma::events::typing::TypingEventContent {
+                user_ids: user_ids.into_iter().collect(),
+            },
         })
     }
 
@@ -320,11 +320,11 @@ impl RoomEdus {
 
         let count = globals.next_count()?.to_be_bytes();
 
-        let mut presence_id = room_id.to_string().as_bytes().to_vec();
+        let mut presence_id = room_id.as_bytes().to_vec();
         presence_id.push(0xff);
         presence_id.extend_from_slice(&count);
         presence_id.push(0xff);
-        presence_id.extend_from_slice(&presence.sender.to_string().as_bytes());
+        presence_id.extend_from_slice(&presence.sender.as_bytes());
 
         self.presenceid_presence.insert(
             presence_id,
@@ -332,7 +332,7 @@ impl RoomEdus {
         )?;
 
         self.userid_lastpresenceupdate.insert(
-            &user_id.to_string().as_bytes(),
+            &user_id.as_bytes(),
             &utils::millis_since_unix_epoch().to_be_bytes(),
         )?;
 
@@ -340,9 +340,10 @@ impl RoomEdus {
     }
 
     /// Resets the presence timeout, so the user will stay in their current presence state.
+    #[tracing::instrument(skip(self))]
     pub fn ping_presence(&self, user_id: &UserId) -> Result<()> {
         self.userid_lastpresenceupdate.insert(
-            &user_id.to_string().as_bytes(),
+            &user_id.as_bytes(),
             &utils::millis_since_unix_epoch().to_be_bytes(),
         )?;
 
@@ -352,7 +353,7 @@ impl RoomEdus {
     /// Returns the timestamp of the last presence update of this user in millis since the unix epoch.
     pub fn last_presence_update(&self, user_id: &UserId) -> Result<Option<u64>> {
         self.userid_lastpresenceupdate
-            .get(&user_id.to_string().as_bytes())?
+            .get(&user_id.as_bytes())?
             .map(|bytes| {
                 utils::u64_from_bytes(&bytes).map_err(|_| {
                     Error::bad_database("Invalid timestamp in userid_lastpresenceupdate.")
@@ -383,11 +384,9 @@ impl RoomEdus {
                         .ok()?,
                 ))
             })
-            .take_while(|(_, timestamp)| current_timestamp - timestamp > 5 * 60_000)
+            .take_while(|(_, timestamp)| current_timestamp.saturating_sub(*timestamp) > 5 * 60_000)
         // 5 Minutes
         {
-            self.userid_lastpresenceupdate.remove(&user_id_bytes)?;
-
             // Send new presence events to set the user offline
             let count = globals.next_count()?.to_be_bytes();
             let user_id = utils::string_from_bytes(&user_id_bytes)
@@ -397,7 +396,7 @@ impl RoomEdus {
                 .try_into()
                 .map_err(|_| Error::bad_database("Invalid UserId in userid_lastpresenceupdate."))?;
             for room_id in rooms.rooms_joined(&user_id).filter_map(|r| r.ok()) {
-                let mut presence_id = room_id.to_string().as_bytes().to_vec();
+                let mut presence_id = room_id.as_bytes().to_vec();
                 presence_id.push(0xff);
                 presence_id.extend_from_slice(&count);
                 presence_id.push(0xff);
@@ -421,12 +420,18 @@ impl RoomEdus {
                     .expect("PresenceEvent can be serialized"),
                 )?;
             }
+
+            self.userid_lastpresenceupdate.insert(
+                &user_id.as_bytes(),
+                &utils::millis_since_unix_epoch().to_be_bytes(),
+            )?;
         }
 
         Ok(())
     }
 
     /// Returns an iterator over the most recent presence updates that happened after the event with id `since`.
+    #[tracing::instrument(skip(self, globals, rooms))]
     pub fn presence_since(
         &self,
         room_id: &RoomId,
@@ -436,7 +441,7 @@ impl RoomEdus {
     ) -> Result<HashMap<UserId, PresenceEvent>> {
         self.presence_maintain(rooms, globals)?;
 
-        let mut prefix = room_id.to_string().as_bytes().to_vec();
+        let mut prefix = room_id.as_bytes().to_vec();
         prefix.push(0xff);
 
         let mut first_possible_edu = prefix.clone();

src/database/sending.rs

@@ -1,82 +1,136 @@
-use std::{collections::HashMap, convert::TryFrom, time::SystemTime};
+use std::{
+    collections::HashMap,
+    convert::{TryFrom, TryInto},
+    fmt::Debug,
+    sync::Arc,
+    time::{Duration, Instant, SystemTime},
+};
 
-use crate::{server_server, utils, Error, PduEvent, Result};
+use crate::{
+    appservice_server, database::pusher, server_server, utils, Database, Error, PduEvent, Result,
+};
 use federation::transactions::send_transaction_message;
-use log::{debug, warn};
+use log::{error, warn};
+use ring::digest;
 use rocket::futures::stream::{FuturesUnordered, StreamExt};
-use ruma::{api::federation, ServerName};
+use ruma::{
+    api::{appservice, federation, OutgoingRequest},
+    events::{push_rules, EventType},
+    push, ServerName, UInt, UserId,
+};
 use sled::IVec;
-use tokio::select;
+use tokio::{select, sync::Semaphore};
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub enum OutgoingKind {
+    Appservice(Box<ServerName>),
+    Push(Vec<u8>, Vec<u8>), // user and pushkey
+    Normal(Box<ServerName>),
+}
 
 #[derive(Clone)]
 pub struct Sending {
     /// The state for a given state hash.
-    pub(super) servernamepduids: sled::Tree, // ServernamePduId = ServerName + PduId
+    pub(super) servernamepduids: sled::Tree, // ServernamePduId = (+ / $)SenderKey / ServerName / UserId + PduId
-    pub(super) servercurrentpdus: sled::Tree, // ServerCurrentPdus = ServerName + PduId (pduid can be empty for reservation)
+    pub(super) servercurrentpdus: sled::Tree, // ServerCurrentPdus = (+ / $)ServerName / UserId + PduId
+    pub(super) maximum_requests: Arc<Semaphore>,
+}
+
+enum TransactionStatus {
+    Running,
+    Failed(u32, Instant), // number of times failed, time of last failure
+    Retrying(u32),        // number of times failed
 }
 
 impl Sending {
-    pub fn start_handler(&self, globals: &super::globals::Globals, rooms: &super::rooms::Rooms) {
+    pub fn start_handler(&self, db: &Database) {
         let servernamepduids = self.servernamepduids.clone();
         let servercurrentpdus = self.servercurrentpdus.clone();
-        let rooms = rooms.clone();
+
-        let globals = globals.clone();
+        let db = db.clone();
 
         tokio::spawn(async move {
             let mut futures = FuturesUnordered::new();
 
             // Retry requests we could not finish yet
-            let mut current_transactions = HashMap::new();
+            let mut subscriber = servernamepduids.watch_prefix(b"");
+            let mut current_transaction_status = HashMap::<Vec<u8>, TransactionStatus>::new();
 
-            for (server, pdu) in servercurrentpdus
+            let mut initial_transactions = HashMap::<OutgoingKind, Vec<Vec<u8>>>::new();
+            for (key, outgoing_kind, pdu) in servercurrentpdus
                 .iter()
                 .filter_map(|r| r.ok())
-                .map(|(key, _)| {
+                .filter_map(|(key, _)| {
-                    let mut parts = key.splitn(2, |&b| b == 0xff);
+                    Self::parse_servercurrentpdus(&key)
-                    let server = parts.next().expect("splitn always returns one element");
+                        .ok()
-                    let pdu = parts.next().ok_or_else(|| {
+                        .map(|(k, p)| (key, k, p.to_vec()))
-                        Error::bad_database("Invalid bytes in servercurrentpdus.")
-                    })?;
-
-                    Ok::<_, Error>((
-                        Box::<ServerName>::try_from(utils::string_from_bytes(&server).map_err(
-                            |_| {
-                                Error::bad_database(
-                                    "Invalid server bytes in server_currenttransaction",
-                                )
-                            },
-                        )?)
-                        .map_err(|_| {
-                            Error::bad_database(
-                                "Invalid server string in server_currenttransaction",
-                            )
-                        })?,
-                        IVec::from(pdu),
-                    ))
                 })
-                .filter_map(|r| r.ok())
-                .filter(|(_, pdu)| !pdu.is_empty()) // Skip reservation key
-                .take(50)
-            // This should not contain more than 50 anyway
             {
-                current_transactions
+                let entry = initial_transactions
-                    .entry(server)
+                    .entry(outgoing_kind.clone())
-                    .or_insert_with(Vec::new)
+                    .or_insert_with(Vec::new);
-                    .push(pdu);
+
+                if entry.len() > 30 {
+                    warn!(
+                        "Dropping some current pdu: {:?} {:?} {:?}",
+                        key, outgoing_kind, pdu
+                    );
+                    servercurrentpdus.remove(key).unwrap();
+                    continue;
+                }
+
+                entry.push(pdu);
             }
 
-            for (server, pdus) in current_transactions {
+            for (outgoing_kind, pdus) in initial_transactions {
-                futures.push(Self::handle_event(server, pdus, &globals, &rooms));
+                let mut prefix = match &outgoing_kind {
+                    OutgoingKind::Appservice(server) => {
+                        let mut p = b"+".to_vec();
+                        p.extend_from_slice(server.as_bytes());
+                        p
+                    }
+                    OutgoingKind::Push(user, pushkey) => {
+                        let mut p = b"$".to_vec();
+                        p.extend_from_slice(&user);
+                        p.push(0xff);
+                        p.extend_from_slice(&pushkey);
+                        p
+                    }
+                    OutgoingKind::Normal(server) => {
+                        let mut p = Vec::new();
+                        p.extend_from_slice(server.as_bytes());
+                        p
+                    }
+                };
+                prefix.push(0xff);
+                current_transaction_status.insert(prefix, TransactionStatus::Running);
+                futures.push(Self::handle_event(outgoing_kind.clone(), pdus, &db));
             }
 
-            let mut subscriber = servernamepduids.watch_prefix(b"");
             loop {
                 select! {
-                    Some(server) = futures.next() => {
+                    Some(response) = futures.next() => {
-                        debug!("sending response: {:?}", &server);
+                        match response {
-                        match server {
+                            Ok(outgoing_kind) => {
-                            Ok((server, _response)) => {
+                                let mut prefix = match &outgoing_kind {
-                                let mut prefix = server.as_bytes().to_vec();
+                                    OutgoingKind::Appservice(server) => {
+                                        let mut p = b"+".to_vec();
+                                        p.extend_from_slice(server.as_bytes());
+                                        p
+                                    }
+                                    OutgoingKind::Push(user, pushkey) => {
+                                        let mut p = b"$".to_vec();
+                                        p.extend_from_slice(&user);
+                                        p.push(0xff);
+                                        p.extend_from_slice(&pushkey);
+                                        p
+                                    },
+                                    OutgoingKind::Normal(server) => {
+                                        let mut p = vec![];
+                                        p.extend_from_slice(server.as_bytes());
+                                        p
+                                    },
+                                };
                                 prefix.push(0xff);
 
                                 for key in servercurrentpdus
@@ -84,10 +138,7 @@ impl Sending {
                                     .keys()
                                     .filter_map(|r| r.ok())
                                 {
-                                    // Don't remove reservation yet
+                                    servercurrentpdus.remove(key).unwrap();
-                                    if prefix.len() != key.len() {
-                                        servercurrentpdus.remove(key).unwrap();
-                                    }
                                 }
 
                                 // Find events that have been added since starting the last request
@@ -96,9 +147,9 @@ impl Sending {
                                     .keys()
                                     .filter_map(|r| r.ok())
                                     .map(|k| {
-                                        k.subslice(prefix.len(), k.len() - prefix.len())
+                                        k[prefix.len()..].to_vec()
                                     })
-                                    .take(50)
+                                    .take(30)
                                     .collect::<Vec<_>>();
 
                                 if !new_pdus.is_empty() {
@@ -109,52 +160,143 @@ impl Sending {
                                         servernamepduids.remove(&current_key).unwrap();
                                     }
 
-                                    futures.push(Self::handle_event(server, new_pdus, &globals, &rooms));
+                                    futures.push(
+                                        Self::handle_event(
+                                            outgoing_kind.clone(),
+                                            new_pdus,
+                                            &db,
+                                        )
+                                    );
                                 } else {
-                                    servercurrentpdus.remove(&prefix).unwrap();
+                                    current_transaction_status.remove(&prefix);
-                                    // servercurrentpdus with the prefix should be empty now
                                 }
                             }
-                            Err((server, e)) => {
+                            Err((outgoing_kind, _)) => {
-                                warn!("Couldn't send transaction to {}: {}", server, e)
+                                let mut prefix = match &outgoing_kind {
-                                // TODO: exponential backoff
+                                    OutgoingKind::Appservice(serv) => {
+                                        let mut p = b"+".to_vec();
+                                        p.extend_from_slice(serv.as_bytes());
+                                        p
+                                    },
+                                    OutgoingKind::Push(user, pushkey) => {
+                                        let mut p = b"$".to_vec();
+                                        p.extend_from_slice(&user);
+                                        p.push(0xff);
+                                        p.extend_from_slice(&pushkey);
+                                        p
+                                    },
+                                    OutgoingKind::Normal(serv) => {
+                                        let mut p = vec![];
+                                        p.extend_from_slice(serv.as_bytes());
+                                        p
+                                    },
+                                };
+
+                                prefix.push(0xff);
+
+                                current_transaction_status.entry(prefix).and_modify(|e| *e = match e {
+                                    TransactionStatus::Running => TransactionStatus::Failed(1, Instant::now()),
+                                    TransactionStatus::Retrying(n) => TransactionStatus::Failed(*n+1, Instant::now()),
+                                    TransactionStatus::Failed(_, _) => {
+                                        error!("Request that was not even running failed?!");
+                                        return
+                                    },
+                                });
                             }
                         };
                     },
                     Some(event) = &mut subscriber => {
                         if let sled::Event::Insert { key, .. } = event {
-                            let servernamepduid = key.clone();
+                        // New sled version:
-                            let mut parts = servernamepduid.splitn(2, |&b| b == 0xff);
+                        //for (_tree, key, value_opt) in &event {
+                        //    if value_opt.is_none() {
+                        //        continue;
+                        //    }
 
-                            if let Some((server, pdu_id)) = utils::string_from_bytes(
+                            let servernamepduid = key.clone();
-                                    parts
+
-                                        .next()
+                            let mut retry = false;
-                                        .expect("splitn will always return 1 or more elements"),
+
-                                )
+                            if let Some((outgoing_kind, prefix, pdu_id)) = Self::parse_servercurrentpdus(&servernamepduid)
-                                .map_err(|_| Error::bad_database("ServerName in servernamepduid bytes are invalid."))
-                                .and_then(|server_str| Box::<ServerName>::try_from(server_str)
-                                    .map_err(|_| Error::bad_database("ServerName in servernamepduid is invalid.")))
                                 .ok()
-                                .and_then(|server| parts
+                                .map(|(outgoing_kind, pdu_id)| {
-                                    .next()
+                                    let mut prefix = match &outgoing_kind {
-                                    .ok_or_else(|| Error::bad_database("Invalid servernamepduid in db."))
+                                        OutgoingKind::Appservice(serv) => {
-                                    .ok()
+                                            let mut p = b"+".to_vec();
-                                    .map(|pdu_id| (server, pdu_id))
+                                            p.extend_from_slice(serv.as_bytes());
-                                )
+                                            p
-                                // TODO: exponential backoff
+                                    },
-                                .filter(|(server, _)| {
+                                        OutgoingKind::Push(user, pushkey) => {
-                                    let mut prefix = server.to_string().as_bytes().to_vec();
+                                            let mut p = b"$".to_vec();
+                                            p.extend_from_slice(&user);
+                                            p.push(0xff);
+                                            p.extend_from_slice(&pushkey);
+                                            p
+                                        },
+                                        OutgoingKind::Normal(serv) => {
+                                            let mut p = vec![];
+                                            p.extend_from_slice(serv.as_bytes());
+                                            p
+                                        },
+                                    };
                                     prefix.push(0xff);
 
-                                    servercurrentpdus
+                                    (outgoing_kind, prefix, pdu_id)
-                                        .compare_and_swap(prefix, Option::<&[u8]>::None, Some(&[])) // Try to reserve
+                                })
-                                        == Ok(Ok(()))
+                                .filter(|(_, prefix, _)| {
+                                    let entry = current_transaction_status.entry(prefix.clone());
+                                    let mut allow = true;
+
+                                    entry.and_modify(|e| match e {
+                                        TransactionStatus::Running | TransactionStatus::Retrying(_) => {
+                                            allow = false; // already running
+                                        },
+                                        TransactionStatus::Failed(tries, time) => {
+                                            // Fail if a request has failed recently (exponential backoff)
+                                            let mut min_elapsed_duration = Duration::from_secs(30) * (*tries) * (*tries);
+                                            if min_elapsed_duration > Duration::from_secs(60*60*24) {
+                                                min_elapsed_duration = Duration::from_secs(60*60*24);
+                                            }
+
+                                            if time.elapsed() < min_elapsed_duration {
+                                                allow = false;
+                                            } else {
+                                                retry = true;
+                                                *e = TransactionStatus::Retrying(*tries);
+                                            }
+                                        }
+                                    }).or_insert(TransactionStatus::Running);
+
+                                    allow
                                 })
                             {
-                                servercurrentpdus.insert(&key, &[]).unwrap();
+                                let mut pdus = Vec::new();
-                                servernamepduids.remove(&key).unwrap();
 
-                                futures.push(Self::handle_event(server, vec![pdu_id.into()], &globals, &rooms));
+                                if retry {
+                                    // We retry the previous transaction
+                                    for pdu in servercurrentpdus
+                                        .scan_prefix(&prefix)
+                                        .filter_map(|r| r.ok())
+                                        .filter_map(|(key, _)| {
+                                            Self::parse_servercurrentpdus(&key)
+                                                .ok()
+                                                .map(|(_, p)| p.to_vec())
+                                        })
+                                    {
+                                        pdus.push(pdu);
+                                    }
+                                } else {
+                                    servercurrentpdus.insert(&key, &[]).unwrap();
+                                    servernamepduids.remove(&key).unwrap();
+                                    pdus.push(pdu_id.to_vec());
+                                }
+                                futures.push(
+                                    Self::handle_event(
+                                        outgoing_kind,
+                                        pdus,
+                                        &db,
+                                    )
+                                );
                             }
                         }
                     }
@@ -163,6 +305,18 @@ impl Sending {
         });
     }
 
+    #[tracing::instrument(skip(self))]
+    pub fn send_push_pdu(&self, pdu_id: &[u8], senderkey: IVec) -> Result<()> {
+        let mut key = b"$".to_vec();
+        key.extend_from_slice(&senderkey);
+        key.push(0xff);
+        key.extend_from_slice(pdu_id);
+        self.servernamepduids.insert(key, b"")?;
+
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self))]
     pub fn send_pdu(&self, server: &ServerName, pdu_id: &[u8]) -> Result<()> {
         let mut key = server.as_bytes().to_vec();
         key.push(0xff);
@@ -172,56 +326,310 @@ impl Sending {
         Ok(())
     }
 
+    #[tracing::instrument(skip(self))]
+    pub fn send_pdu_appservice(&self, appservice_id: &str, pdu_id: &[u8]) -> Result<()> {
+        let mut key = b"+".to_vec();
+        key.extend_from_slice(appservice_id.as_bytes());
+        key.push(0xff);
+        key.extend_from_slice(pdu_id);
+        self.servernamepduids.insert(key, b"")?;
+
+        Ok(())
+    }
+
+    #[tracing::instrument]
+    fn calculate_hash(keys: &[Vec<u8>]) -> Vec<u8> {
+        // We only hash the pdu's event ids, not the whole pdu
+        let bytes = keys.join(&0xff);
+        let hash = digest::digest(&digest::SHA256, &bytes);
+        hash.as_ref().to_owned()
+    }
+
+    #[tracing::instrument(skip(db))]
     async fn handle_event(
-        server: Box<ServerName>,
+        kind: OutgoingKind,
-        pdu_ids: Vec<IVec>,
+        pdu_ids: Vec<Vec<u8>>,
-        globals: &super::globals::Globals,
+        db: &Database,
-        rooms: &super::rooms::Rooms,
+    ) -> std::result::Result<OutgoingKind, (OutgoingKind, Error)> {
-    ) -> std::result::Result<
+        match &kind {
-        (Box<ServerName>, send_transaction_message::v1::Response),
+            OutgoingKind::Appservice(server) => {
-        (Box<ServerName>, Error),
+                let pdu_jsons = pdu_ids
-    > {
+                    .iter()
-        let pdu_jsons = pdu_ids
+                    .map(|pdu_id| {
-            .iter()
+                        Ok::<_, (Box<ServerName>, Error)>(
-            .map(|pdu_id| {
+                            db.rooms
-                Ok::<_, (Box<ServerName>, Error)>(
+                                .get_pdu_from_id(pdu_id)
-                    // TODO: check room version and remove event_id if needed
-                    serde_json::from_str(
-                        PduEvent::convert_to_outgoing_federation_event(
-                            rooms
-                                .get_pdu_json_from_id(pdu_id)
                                 .map_err(|e| (server.clone(), e))?
                                 .ok_or_else(|| {
                                     (
                                         server.clone(),
                                         Error::bad_database(
-                                            "Event in servernamepduids not found in db.",
+                                            "[Appservice] Event in servernamepduids not found in db.",
+                                        ),
+                                    )
+                                })?
+                                .to_any_event(),
+                        )
+                    })
+                    .filter_map(|r| r.ok())
+                    .collect::<Vec<_>>();
+                let permit = db.sending.maximum_requests.acquire().await;
+
+                let response = appservice_server::send_request(
+                    &db.globals,
+                    db.appservice
+                        .get_registration(server.as_str())
+                        .unwrap()
+                        .unwrap(), // TODO: handle error
+                    appservice::event::push_events::v1::Request {
+                        events: &pdu_jsons,
+                        txn_id: &base64::encode_config(
+                            Self::calculate_hash(&pdu_ids),
+                            base64::URL_SAFE_NO_PAD,
+                        ),
+                    },
+                )
+                .await
+                .map(|_response| kind.clone())
+                .map_err(|e| (kind, e));
+
+                drop(permit);
+
+                response
+            }
+            OutgoingKind::Push(user, pushkey) => {
+                let pdus = pdu_ids
+                    .iter()
+                    .map(|pdu_id| {
+                        Ok::<_, (Vec<u8>, Error)>(
+                            db.rooms
+                                .get_pdu_from_id(pdu_id)
+                                .map_err(|e| (pushkey.clone(), e))?
+                                .ok_or_else(|| {
+                                    (
+                                        pushkey.clone(),
+                                        Error::bad_database(
+                                            "[Push] Event in servernamepduids not found in db.",
                                         ),
                                     )
                                 })?,
                         )
-                        .json()
+                    })
-                        .get(),
+                    .filter_map(|r| r.ok())
-                    )
+                    .collect::<Vec<_>>();
-                    .expect("Raw<..> is always valid"),
-                )
-            })
-            .filter_map(|r| r.ok())
-            .collect::<Vec<_>>();
 
-        server_server::send_request(
+                for pdu in pdus {
-            &globals,
+                    // Redacted events are not notification targets (we don't send push for them)
-            server.clone(),
+                    if pdu.unsigned.get("redacted_because").is_some() {
-            send_transaction_message::v1::Request {
+                        continue;
-                origin: globals.server_name(),
+                    }
-                pdus: &pdu_jsons,
+
-                edus: &[],
+                    let userid =
-                origin_server_ts: SystemTime::now(),
+                        UserId::try_from(utils::string_from_bytes(user).map_err(|_| {
-                transaction_id: &utils::random_string(16),
+                            (
-            },
+                                OutgoingKind::Push(user.clone(), pushkey.clone()),
-        )
+                                Error::bad_database("Invalid push user string in db."),
-        .await
+                            )
-        .map(|response| (server.clone(), response))
+                        })?)
-        .map_err(|e| (server, e))
+                        .map_err(|_| {
+                            (
+                                OutgoingKind::Push(user.clone(), pushkey.clone()),
+                                Error::bad_database("Invalid push user id in db."),
+                            )
+                        })?;
+
+                    let mut senderkey = user.clone();
+                    senderkey.push(0xff);
+                    senderkey.extend_from_slice(pushkey);
+
+                    let pusher = match db
+                        .pusher
+                        .get_pusher(&senderkey)
+                        .map_err(|e| (OutgoingKind::Push(user.clone(), pushkey.clone()), e))?
+                    {
+                        Some(pusher) => pusher,
+                        None => continue,
+                    };
+
+                    let rules_for_user = db
+                        .account_data
+                        .get::<push_rules::PushRulesEvent>(None, &userid, EventType::PushRules)
+                        .unwrap_or_default()
+                        .map(|ev| ev.content.global)
+                        .unwrap_or_else(|| push::Ruleset::server_default(&userid));
+
+                    let unread: UInt = db
+                        .rooms
+                        .notification_count(&userid, &pdu.room_id)
+                        .map_err(|e| (kind.clone(), e))?
+                        .try_into()
+                        .expect("notifiation count can't go that high");
+
+                    let permit = db.sending.maximum_requests.acquire().await;
+
+                    let _response = pusher::send_push_notice(
+                        &userid,
+                        unread,
+                        &pusher,
+                        rules_for_user,
+                        &pdu,
+                        db,
+                    )
+                    .await
+                    .map(|_response| kind.clone())
+                    .map_err(|e| (kind.clone(), e));
+
+                    drop(permit);
+                }
+                Ok(OutgoingKind::Push(user.clone(), pushkey.clone()))
+            }
+            OutgoingKind::Normal(server) => {
+                let pdu_jsons = pdu_ids
+                    .iter()
+                    .map(|pdu_id| {
+                        Ok::<_, (OutgoingKind, Error)>(
+                            // TODO: check room version and remove event_id if needed
+                            serde_json::from_str(
+                                PduEvent::convert_to_outgoing_federation_event(
+                                    db.rooms
+                                        .get_pdu_json_from_id(pdu_id)
+                                        .map_err(|e| (OutgoingKind::Normal(server.clone()), e))?
+                                        .ok_or_else(|| {
+                                            (
+                                                OutgoingKind::Normal(server.clone()),
+                                                Error::bad_database(
+                                                    "[Normal] Event in servernamepduids not found in db.",
+                                                ),
+                                            )
+                                        })?,
+                                )
+                                .json()
+                                .get(),
+                            )
+                            .expect("Raw<..> is always valid"),
+                        )
+                    })
+                    .filter_map(|r| r.ok())
+                    .collect::<Vec<_>>();
+
+                let permit = db.sending.maximum_requests.acquire().await;
+
+                let response = server_server::send_request(
+                    &db.globals,
+                    &*server,
+                    send_transaction_message::v1::Request {
+                        origin: db.globals.server_name(),
+                        pdus: &pdu_jsons,
+                        edus: &[],
+                        origin_server_ts: SystemTime::now(),
+                        transaction_id: &base64::encode_config(
+                            Self::calculate_hash(&pdu_ids),
+                            base64::URL_SAFE_NO_PAD,
+                        ),
+                    },
+                )
+                .await
+                .map(|response| {
+                    for pdu in response.pdus {
+                        if pdu.1.is_err() {
+                            warn!("Failed to send to {}: {:?}", server, pdu);
+                        }
+                    }
+                    kind.clone()
+                })
+                .map_err(|e| (kind, e));
+
+                drop(permit);
+
+                response
+            }
+        }
+    }
+
+    fn parse_servercurrentpdus(key: &IVec) -> Result<(OutgoingKind, IVec)> {
+        // Appservices start with a plus
+        Ok::<_, Error>(if key.starts_with(b"+") {
+            let mut parts = key[1..].splitn(2, |&b| b == 0xff);
+
+            let server = parts.next().expect("splitn always returns one element");
+            let pdu = parts
+                .next()
+                .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
+            let server = utils::string_from_bytes(&server).map_err(|_| {
+                Error::bad_database("Invalid server bytes in server_currenttransaction")
+            })?;
+
+            (
+                OutgoingKind::Appservice(Box::<ServerName>::try_from(server).map_err(|_| {
+                    Error::bad_database("Invalid server string in server_currenttransaction")
+                })?),
+                IVec::from(pdu),
+            )
+        } else if key.starts_with(b"$") {
+            let mut parts = key[1..].splitn(3, |&b| b == 0xff);
+
+            let user = parts.next().expect("splitn always returns one element");
+            let pushkey = parts
+                .next()
+                .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
+            let pdu = parts
+                .next()
+                .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
+            (
+                OutgoingKind::Push(user.to_vec(), pushkey.to_vec()),
+                IVec::from(pdu),
+            )
+        } else {
+            let mut parts = key.splitn(2, |&b| b == 0xff);
+
+            let server = parts.next().expect("splitn always returns one element");
+            let pdu = parts
+                .next()
+                .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
+            let server = utils::string_from_bytes(&server).map_err(|_| {
+                Error::bad_database("Invalid server bytes in server_currenttransaction")
+            })?;
+
+            (
+                OutgoingKind::Normal(Box::<ServerName>::try_from(server).map_err(|_| {
+                    Error::bad_database("Invalid server string in server_currenttransaction")
+                })?),
+                IVec::from(pdu),
+            )
+        })
+    }
+
+    #[tracing::instrument(skip(self, globals))]
+    pub async fn send_federation_request<T: OutgoingRequest>(
+        &self,
+        globals: &crate::database::globals::Globals,
+        destination: &ServerName,
+        request: T,
+    ) -> Result<T::IncomingResponse>
+    where
+        T: Debug,
+    {
+        let permit = self.maximum_requests.acquire().await;
+        let response = server_server::send_request(globals, destination, request).await;
+        drop(permit);
+
+        response
+    }
+
+    #[tracing::instrument(skip(self, globals))]
+    pub async fn send_appservice_request<T: OutgoingRequest>(
+        &self,
+        globals: &crate::database::globals::Globals,
+        registration: serde_yaml::Value,
+        request: T,
+    ) -> Result<T::IncomingResponse>
+    where
+        T: Debug,
+    {
+        let permit = self.maximum_requests.acquire().await;
+        let response = appservice_server::send_request(globals, registration, request).await;
+        drop(permit);
+
+        response
     }
 }

src/database/transaction_ids.rs

@@ -11,13 +11,13 @@ impl TransactionIds {
     pub fn add_txnid(
         &self,
         user_id: &UserId,
-        device_id: &DeviceId,
+        device_id: Option<&DeviceId>,
         txn_id: &str,
         data: &[u8],
     ) -> Result<()> {
         let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
-        key.extend_from_slice(device_id.as_bytes());
+        key.extend_from_slice(device_id.map(|d| d.as_bytes()).unwrap_or_default());
         key.push(0xff);
         key.extend_from_slice(txn_id.as_bytes());
 
@@ -29,12 +29,12 @@ impl TransactionIds {
     pub fn existing_txnid(
         &self,
         user_id: &UserId,
-        device_id: &DeviceId,
+        device_id: Option<&DeviceId>,
         txn_id: &str,
     ) -> Result<Option<IVec>> {
         let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
-        key.extend_from_slice(device_id.as_bytes());
+        key.extend_from_slice(device_id.map(|d| d.as_bytes()).unwrap_or_default());
         key.push(0xff);
         key.extend_from_slice(txn_id.as_bytes());
 

src/database/uiaa.rs

@@ -148,7 +148,7 @@ impl Uiaa {
         device_id: &DeviceId,
         uiaainfo: Option<&UiaaInfo>,
     ) -> Result<()> {
-        let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
+        let mut userdeviceid = user_id.as_bytes().to_vec();
         userdeviceid.push(0xff);
         userdeviceid.extend_from_slice(device_id.as_bytes());
 
@@ -170,7 +170,7 @@ impl Uiaa {
         device_id: &DeviceId,
         session: &str,
     ) -> Result<UiaaInfo> {
-        let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
+        let mut userdeviceid = user_id.as_bytes().to_vec();
         userdeviceid.push(0xff);
         userdeviceid.extend_from_slice(device_id.as_bytes());
 

src/database/users.rs

@@ -1,5 +1,4 @@
 use crate::{utils, Error, Result};
-use js_int::UInt;
 use ruma::{
     api::client::{
         error::ErrorKind,
@@ -10,8 +9,9 @@ use ruma::{
     },
     encryption::DeviceKeys,
     events::{AnyToDeviceEvent, EventType},
+    identifiers::MxcUri,
     serde::Raw,
-    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId,
+    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UInt, UserId,
 };
 use std::{collections::BTreeMap, convert::TryFrom, mem, time::SystemTime};
 
@@ -22,6 +22,7 @@ pub struct Users {
     pub(super) userid_avatarurl: sled::Tree,
     pub(super) userdeviceid_token: sled::Tree,
     pub(super) userdeviceid_metadata: sled::Tree, // This is also used to check if a device exists
+    pub(super) userid_devicelistversion: sled::Tree, // DevicelistVersion = u64
     pub(super) token_userdeviceid: sled::Tree,
 
     pub(super) onetimekeyid_onetimekeys: sled::Tree, // OneTimeKeyId = UserId + DeviceKeyId
@@ -151,21 +152,22 @@ impl Users {
     }
 
     /// Get a the avatar_url of a user.
-    pub fn avatar_url(&self, user_id: &UserId) -> Result<Option<String>> {
+    pub fn avatar_url(&self, user_id: &UserId) -> Result<Option<MxcUri>> {
         self.userid_avatarurl
             .get(user_id.to_string())?
-            .map_or(Ok(None), |bytes| {
+            .map(|bytes| {
-                Ok(Some(utils::string_from_bytes(&bytes).map_err(|_| {
+                let s = utils::string_from_bytes(&bytes)
-                    Error::bad_database("Avatar URL in db is invalid.")
+                    .map_err(|_| Error::bad_database("Avatar URL in db is invalid."))?;
-                })?))
+                MxcUri::try_from(s).map_err(|_| Error::bad_database("Avatar URL in db is invalid."))
             })
+            .transpose()
     }
 
     /// Sets a new avatar_url or removes it if avatar_url is None.
-    pub fn set_avatar_url(&self, user_id: &UserId, avatar_url: Option<String>) -> Result<()> {
+    pub fn set_avatar_url(&self, user_id: &UserId, avatar_url: Option<MxcUri>) -> Result<()> {
         if let Some(avatar_url) = avatar_url {
             self.userid_avatarurl
-                .insert(user_id.to_string(), &*avatar_url)?;
+                .insert(user_id.to_string(), avatar_url.to_string().as_str())?;
         } else {
             self.userid_avatarurl.remove(user_id.to_string())?;
         }
@@ -184,10 +186,14 @@ impl Users {
         // This method should never be called for nonexistent users.
         assert!(self.exists(user_id)?);
 
-        let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
+        let mut userdeviceid = user_id.as_bytes().to_vec();
         userdeviceid.push(0xff);
         userdeviceid.extend_from_slice(device_id.as_bytes());
 
+        self.userid_devicelistversion
+            .update_and_fetch(&user_id.as_bytes(), utils::increment)?
+            .expect("utils::increment will always put in a value");
+
         self.userdeviceid_metadata.insert(
             userdeviceid,
             serde_json::to_string(&Device {
@@ -207,7 +213,7 @@ impl Users {
 
     /// Removes a device from a user.
     pub fn remove_device(&self, user_id: &UserId, device_id: &DeviceId) -> Result<()> {
-        let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
+        let mut userdeviceid = user_id.as_bytes().to_vec();
         userdeviceid.push(0xff);
         userdeviceid.extend_from_slice(device_id.as_bytes());
 
@@ -226,6 +232,10 @@ impl Users {
 
         // TODO: Remove onetimekeys
 
+        self.userid_devicelistversion
+            .update_and_fetch(&user_id.as_bytes(), utils::increment)?
+            .expect("utils::increment will always put in a value");
+
         self.userdeviceid_metadata.remove(&userdeviceid)?;
 
         Ok(())
@@ -233,7 +243,7 @@ impl Users {
 
     /// Returns an iterator over all device ids of this user.
     pub fn all_device_ids(&self, user_id: &UserId) -> impl Iterator<Item = Result<Box<DeviceId>>> {
-        let mut prefix = user_id.to_string().as_bytes().to_vec();
+        let mut prefix = user_id.as_bytes().to_vec();
         prefix.push(0xff);
         // All devices have metadata
         self.userdeviceid_metadata
@@ -252,8 +262,8 @@ impl Users {
     }
 
     /// Replaces the access token of one device.
-    fn set_token(&self, user_id: &UserId, device_id: &DeviceId, token: &str) -> Result<()> {
+    pub fn set_token(&self, user_id: &UserId, device_id: &DeviceId, token: &str) -> Result<()> {
-        let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
+        let mut userdeviceid = user_id.as_bytes().to_vec();
         userdeviceid.push(0xff);
         userdeviceid.extend_from_slice(device_id.as_bytes());
 
@@ -281,7 +291,7 @@ impl Users {
         one_time_key_value: &OneTimeKey,
         globals: &super::globals::Globals,
     ) -> Result<()> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(device_id.as_bytes());
 
@@ -304,17 +314,16 @@ impl Users {
                 .expect("OneTimeKey::to_string always works"),
         )?;
 
-        self.userid_lastonetimekeyupdate.insert(
+        self.userid_lastonetimekeyupdate
-            &user_id.to_string().as_bytes(),
+            .insert(&user_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
-            &globals.next_count()?.to_be_bytes(),
-        )?;
 
         Ok(())
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn last_one_time_keys_update(&self, user_id: &UserId) -> Result<u64> {
         self.userid_lastonetimekeyupdate
-            .get(&user_id.to_string().as_bytes())?
+            .get(&user_id.as_bytes())?
             .map(|bytes| {
                 utils::u64_from_bytes(&bytes).map_err(|_| {
                     Error::bad_database("Count in roomid_lastroomactiveupdate is invalid.")
@@ -330,18 +339,16 @@ impl Users {
         key_algorithm: &DeviceKeyAlgorithm,
         globals: &super::globals::Globals,
     ) -> Result<Option<(DeviceKeyId, OneTimeKey)>> {
-        let mut prefix = user_id.to_string().as_bytes().to_vec();
+        let mut prefix = user_id.as_bytes().to_vec();
         prefix.push(0xff);
         prefix.extend_from_slice(device_id.as_bytes());
         prefix.push(0xff);
         prefix.push(b'"'); // Annoying quotation mark
-        prefix.extend_from_slice(key_algorithm.to_string().as_bytes());
+        prefix.extend_from_slice(key_algorithm.as_ref().as_bytes());
         prefix.push(b':');
 
-        self.userid_lastonetimekeyupdate.insert(
+        self.userid_lastonetimekeyupdate
-            &user_id.to_string().as_bytes(),
+            .insert(&user_id.as_bytes(), &globals.next_count()?.to_be_bytes())?;
-            &globals.next_count()?.to_be_bytes(),
-        )?;
 
         self.onetimekeyid_onetimekeys
             .scan_prefix(&prefix)
@@ -365,12 +372,13 @@ impl Users {
             .transpose()
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn count_one_time_keys(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
     ) -> Result<BTreeMap<DeviceKeyAlgorithm, UInt>> {
-        let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
+        let mut userdeviceid = user_id.as_bytes().to_vec();
         userdeviceid.push(0xff);
         userdeviceid.extend_from_slice(device_id.as_bytes());
 
@@ -406,7 +414,7 @@ impl Users {
         rooms: &super::rooms::Rooms,
         globals: &super::globals::Globals,
     ) -> Result<()> {
-        let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
+        let mut userdeviceid = user_id.as_bytes().to_vec();
         userdeviceid.push(0xff);
         userdeviceid.extend_from_slice(device_id.as_bytes());
 
@@ -431,7 +439,7 @@ impl Users {
     ) -> Result<()> {
         // TODO: Check signatures
 
-        let mut prefix = user_id.to_string().as_bytes().to_vec();
+        let mut prefix = user_id.as_bytes().to_vec();
         prefix.push(0xff);
 
         // Master key
@@ -529,9 +537,9 @@ impl Users {
         rooms: &super::rooms::Rooms,
         globals: &super::globals::Globals,
     ) -> Result<()> {
-        let mut key = target_id.to_string().as_bytes().to_vec();
+        let mut key = target_id.as_bytes().to_vec();
         key.push(0xff);
-        key.extend_from_slice(key_id.to_string().as_bytes());
+        key.extend_from_slice(key_id.as_bytes());
 
         let mut cross_signing_key =
             serde_json::from_slice::<serde_json::Value>(&self.keyid_key.get(&key)?.ok_or(
@@ -564,6 +572,7 @@ impl Users {
         Ok(())
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn keys_changed(
         &self,
         user_or_room_id: &str,
@@ -613,14 +622,14 @@ impl Users {
                 continue;
             }
 
-            let mut key = room_id.to_string().as_bytes().to_vec();
+            let mut key = room_id.as_bytes().to_vec();
             key.push(0xff);
             key.extend_from_slice(&count);
 
             self.keychangeid_userid.insert(key, &*user_id.to_string())?;
         }
 
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(&count);
         self.keychangeid_userid.insert(key, &*user_id.to_string())?;
@@ -633,7 +642,7 @@ impl Users {
         user_id: &UserId,
         device_id: &DeviceId,
     ) -> Result<Option<DeviceKeys>> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(device_id.as_bytes());
 
@@ -720,7 +729,7 @@ impl Users {
         content: serde_json::Value,
         globals: &super::globals::Globals,
     ) -> Result<()> {
-        let mut key = target_user_id.to_string().as_bytes().to_vec();
+        let mut key = target_user_id.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(target_device_id.as_bytes());
         key.push(0xff);
@@ -739,6 +748,7 @@ impl Users {
         Ok(())
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn get_to_device_events(
         &self,
         user_id: &UserId,
@@ -746,7 +756,7 @@ impl Users {
     ) -> Result<Vec<Raw<AnyToDeviceEvent>>> {
         let mut events = Vec::new();
 
-        let mut prefix = user_id.to_string().as_bytes().to_vec();
+        let mut prefix = user_id.as_bytes().to_vec();
         prefix.push(0xff);
         prefix.extend_from_slice(device_id.as_bytes());
         prefix.push(0xff);
@@ -761,13 +771,14 @@ impl Users {
         Ok(events)
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn remove_to_device_events(
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
         until: u64,
     ) -> Result<()> {
-        let mut prefix = user_id.to_string().as_bytes().to_vec();
+        let mut prefix = user_id.as_bytes().to_vec();
         prefix.push(0xff);
         prefix.extend_from_slice(device_id.as_bytes());
         prefix.push(0xff);
@@ -802,13 +813,17 @@ impl Users {
         device_id: &DeviceId,
         device: &Device,
     ) -> Result<()> {
-        let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
+        let mut userdeviceid = user_id.as_bytes().to_vec();
         userdeviceid.push(0xff);
         userdeviceid.extend_from_slice(device_id.as_bytes());
 
         // Only existing devices should be able to call this.
         assert!(self.userdeviceid_metadata.get(&userdeviceid)?.is_some());
 
+        self.userid_devicelistversion
+            .update_and_fetch(&user_id.as_bytes(), utils::increment)?
+            .expect("utils::increment will always put in a value");
+
         self.userdeviceid_metadata.insert(
             userdeviceid,
             serde_json::to_string(device)
@@ -825,7 +840,7 @@ impl Users {
         user_id: &UserId,
         device_id: &DeviceId,
     ) -> Result<Option<Device>> {
-        let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
+        let mut userdeviceid = user_id.as_bytes().to_vec();
         userdeviceid.push(0xff);
         userdeviceid.extend_from_slice(device_id.as_bytes());
 
@@ -838,8 +853,18 @@ impl Users {
             })
     }
 
+    pub fn get_devicelist_version(&self, user_id: &UserId) -> Result<Option<u64>> {
+        self.userid_devicelistversion
+            .get(user_id.as_bytes())?
+            .map_or(Ok(None), |bytes| {
+                utils::u64_from_bytes(&bytes)
+                    .map_err(|_| Error::bad_database("Invalid devicelistversion in db."))
+                    .map(Some)
+            })
+    }
+
     pub fn all_devices_metadata(&self, user_id: &UserId) -> impl Iterator<Item = Result<Device>> {
-        let mut key = user_id.to_string().as_bytes().to_vec();
+        let mut key = user_id.as_bytes().to_vec();
         key.push(0xff);
 
         self.userdeviceid_metadata

src/error.rs

@@ -1,14 +1,7 @@
-use std::{collections::HashMap, sync::RwLock, time::Duration, time::Instant};
-
 use log::error;
-use ruma::{
+use ruma::api::client::{error::ErrorKind, r0::uiaa::UiaaInfo};
-    api::client::{error::ErrorKind, r0::uiaa::UiaaInfo},
-    events::room::message,
-};
 use thiserror::Error;
 
-use crate::{database::admin::AdminCommand, Database};
-
 #[cfg(feature = "conduit_bin")]
 use {
     crate::RumaResponse,
@@ -34,7 +27,7 @@ pub enum Error {
         #[from]
         source: image::error::ImageError,
     },
-    #[error("Could not connect to server.")]
+    #[error("Could not connect to server: {source}")]
     ReqwestError {
         #[from]
         source: reqwest::Error,
@@ -107,46 +100,3 @@ where
         .respond_to(r)
     }
 }
-
-pub struct ConduitLogger {
-    pub db: Database,
-    pub last_logs: RwLock<HashMap<String, Instant>>,
-}
-
-impl log::Log for ConduitLogger {
-    fn enabled(&self, _metadata: &log::Metadata<'_>) -> bool {
-        true
-    }
-
-    fn log(&self, record: &log::Record<'_>) {
-        let output = format!("{} - {}", record.level(), record.args());
-
-        println!("{}", output);
-
-        if self.enabled(record.metadata())
-            && record
-                .module_path()
-                .map_or(false, |path| path.starts_with("conduit::"))
-        {
-            if self
-                .last_logs
-                .read()
-                .unwrap()
-                .get(&output)
-                .map_or(false, |i| i.elapsed() < Duration::from_secs(60 * 30))
-            {
-                return;
-            }
-
-            if let Ok(mut_last_logs) = &mut self.last_logs.try_write() {
-                mut_last_logs.insert(output.clone(), Instant::now());
-            }
-
-            self.db.admin.send(AdminCommand::SendTextMessage(
-                message::TextMessageEventContent::plain(output),
-            ));
-        }
-    }
-
-    fn flush(&self) {}
-}

src/lib.rs

@@ -1,8 +1,9 @@
+#![allow(clippy::suspicious_else_formatting)]
+pub mod appservice_server;
 pub mod client_server;
 mod database;
 mod error;
 mod pdu;
-mod push_rules;
 mod ruma_wrapper;
 pub mod server_server;
 mod utils;

src/main.rs

@@ -1,29 +1,38 @@
 #![warn(rust_2018_idioms)]
+#![allow(clippy::suspicious_else_formatting)]
 
+pub mod appservice_server;
 pub mod client_server;
 pub mod server_server;
 
 mod database;
 mod error;
 mod pdu;
-mod push_rules;
 mod ruma_wrapper;
 mod utils;
 
+use database::Config;
 pub use database::Database;
-pub use error::{ConduitLogger, Error, Result};
+pub use error::{Error, Result};
-use log::LevelFilter;
 pub use pdu::PduEvent;
 pub use rocket::State;
+use ruma::api::client::error::ErrorKind;
 pub use ruma_wrapper::{ConduitResult, Ruma, RumaResponse};
 
-use rocket::{fairing::AdHoc, routes};
+use rocket::{
+    catch, catchers,
+    figment::{
+        providers::{Env, Format, Toml},
+        Figment,
+    },
+    routes, Request,
+};
+use tracing::span;
+use tracing_subscriber::{prelude::*, Registry};
 
-fn setup_rocket() -> rocket::Rocket {
+fn setup_rocket(config: Figment, data: Database) -> rocket::Rocket<rocket::Build> {
-    // Force log level off, so we can use our own logger
+    rocket::custom(config)
-    std::env::set_var("ROCKET_LOG_LEVEL", "off");
+        .manage(data)
-
-    rocket::ignite()
         .mount(
             "/",
             routes![
@@ -40,12 +49,19 @@ fn setup_rocket() -> rocket::Rocket {
                 client_server::get_capabilities_route,
                 client_server::get_pushrules_all_route,
                 client_server::set_pushrule_route,
+                client_server::get_pushrule_route,
                 client_server::set_pushrule_enabled_route,
+                client_server::get_pushrule_enabled_route,
+                client_server::get_pushrule_actions_route,
+                client_server::set_pushrule_actions_route,
+                client_server::delete_pushrule_route,
                 client_server::get_room_event_route,
                 client_server::get_filter_route,
                 client_server::create_filter_route,
                 client_server::set_global_account_data_route,
+                client_server::set_room_account_data_route,
                 client_server::get_global_account_data_route,
+                client_server::get_room_account_data_route,
                 client_server::set_displayname_route,
                 client_server::get_displayname_route,
                 client_server::set_avatar_url_route,
@@ -69,6 +85,7 @@ fn setup_rocket() -> rocket::Rocket {
                 client_server::get_backup_key_sessions_route,
                 client_server::get_backup_keys_route,
                 client_server::set_read_marker_route,
+                client_server::create_receipt_route,
                 client_server::create_typing_event_route,
                 client_server::create_room_route,
                 client_server::redact_event_route,
@@ -122,6 +139,7 @@ fn setup_rocket() -> rocket::Rocket {
                 client_server::get_key_changes_route,
                 client_server::get_pushers_route,
                 client_server::set_pushers_route,
+                // client_server::third_party_route,
                 client_server::upgrade_room_route,
                 server_server::get_server_version_route,
                 server_server::get_server_keys_route,
@@ -129,29 +147,97 @@ fn setup_rocket() -> rocket::Rocket {
                 server_server::get_public_rooms_route,
                 server_server::get_public_rooms_filtered_route,
                 server_server::send_transaction_message_route,
+                server_server::get_event_route,
                 server_server::get_missing_events_route,
+                server_server::get_room_state_ids_route,
+                server_server::create_join_event_template_route,
+                server_server::create_join_event_route,
+                server_server::create_invite_route,
+                server_server::get_devices_route,
+                server_server::get_room_information_route,
                 server_server::get_profile_information_route,
             ],
         )
-        .attach(AdHoc::on_attach("Config", |rocket| async {
+        .register(
-            let data =
+            "/",
-                Database::load_or_create(rocket.figment().extract().expect("config is valid"))
+            catchers![
-                    .await
+                not_found_catcher,
-                    .expect("config is valid");
+                forbidden_catcher,
-
+                unknown_token_catcher,
-            data.sending.start_handler(&data.globals, &data.rooms);
+                missing_token_catcher,
-            log::set_boxed_logger(Box::new(ConduitLogger {
+                bad_json_catcher
-                db: data.clone(),
+            ],
-                last_logs: Default::default(),
+        )
-            }))
-            .unwrap();
-            log::set_max_level(LevelFilter::Info);
-
-            Ok(rocket.manage(data))
-        }))
 }
 
 #[rocket::main]
 async fn main() {
-    setup_rocket().launch().await.unwrap();
+    // Force log level off, so we can use our own logger
+    std::env::set_var("CONDUIT_LOG_LEVEL", "off");
+
+    let raw_config =
+        Figment::from(rocket::Config::release_default())
+            .merge(
+                Toml::file(Env::var("CONDUIT_CONFIG").expect(
+                    "The CONDUIT_CONFIG env var needs to be set. Example: /etc/conduit.toml",
+                ))
+                .nested(),
+            )
+            .merge(Env::prefixed("CONDUIT_").global());
+
+    let config = raw_config
+        .extract::<Config>()
+        .expect("It looks like your config is invalid. Please take a look at the error");
+
+    let db = Database::load_or_create(config.clone())
+        .await
+        .expect("config is valid");
+
+    db.sending.start_handler(&db);
+
+    if config.allow_jaeger {
+        let (tracer, _uninstall) = opentelemetry_jaeger::new_pipeline()
+            .with_service_name("conduit")
+            .install()
+            .unwrap();
+        let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
+        Registry::default().with(telemetry).try_init().unwrap();
+
+        let root = span!(tracing::Level::INFO, "app_start", work_units = 2);
+        let _enter = root.enter();
+    } else {
+        std::env::set_var("CONDUIT_LOG", config.log);
+        pretty_env_logger::init_custom_env("CONDUIT_LOG");
+    }
+
+    let rocket = setup_rocket(raw_config, db);
+    rocket.launch().await.unwrap();
+}
+
+#[catch(404)]
+fn not_found_catcher(_: &Request<'_>) -> String {
+    "404 Not Found".to_owned()
+}
+
+#[catch(580)]
+fn forbidden_catcher() -> Result<()> {
+    Err(Error::BadRequest(ErrorKind::Forbidden, "Forbidden."))
+}
+
+#[catch(581)]
+fn unknown_token_catcher() -> Result<()> {
+    Err(Error::BadRequest(
+        ErrorKind::UnknownToken { soft_logout: false },
+        "Unknown token.",
+    ))
+}
+
+#[catch(582)]
+fn missing_token_catcher() -> Result<()> {
+    Err(Error::BadRequest(ErrorKind::MissingToken, "Missing token."))
+}
+
+#[catch(583)]
+fn bad_json_catcher() -> Result<()> {
+    Err(Error::BadRequest(ErrorKind::BadJson, "Bad json."))
 }

src/pdu.rs

@@ -1,23 +1,18 @@
 use crate::Error;
-use js_int::UInt;
+use log::error;
 use ruma::{
     events::{
         pdu::EventHash, room::member::MemberEventContent, AnyEvent, AnyRoomEvent, AnyStateEvent,
         AnyStrippedStateEvent, AnySyncRoomEvent, AnySyncStateEvent, EventType, StateEvent,
     },
-    serde::{to_canonical_value, CanonicalJsonObject, CanonicalJsonValue, Raw},
+    serde::{CanonicalJsonObject, CanonicalJsonValue, Raw},
-    EventId, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, UserId,
+    EventId, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, UInt, UserId,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use std::{
+use std::{cmp::Ordering, collections::BTreeMap, convert::TryFrom, time::UNIX_EPOCH};
-    collections::BTreeMap,
-    convert::{TryFrom, TryInto},
-    sync::Arc,
-    time::UNIX_EPOCH,
-};
 
-#[derive(Deserialize, Serialize, Debug)]
+#[derive(Clone, Deserialize, Serialize, Debug)]
 pub struct PduEvent {
     pub event_id: EventId,
     pub room_id: RoomId,
@@ -33,13 +28,14 @@ pub struct PduEvent {
     pub auth_events: Vec<EventId>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub redacts: Option<EventId>,
-    #[serde(default, skip_serializing_if = "serde_json::Map::is_empty")]
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub unsigned: serde_json::Map<String, serde_json::Value>,
+    pub unsigned: BTreeMap<String, serde_json::Value>,
     pub hashes: EventHash,
     pub signatures: BTreeMap<Box<ServerName>, BTreeMap<ServerSigningKeyId, String>>,
 }
 
 impl PduEvent {
+    #[tracing::instrument(skip(self))]
     pub fn redact(&mut self, reason: &PduEvent) -> crate::Result<()> {
         self.unsigned.clear();
 
@@ -86,6 +82,7 @@ impl PduEvent {
         Ok(())
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn to_sync_room_event(&self) -> Raw<AnySyncRoomEvent> {
         let mut json = json!({
             "content": self.content,
@@ -107,6 +104,7 @@ impl PduEvent {
     }
 
     /// This only works for events that are also AnyRoomEvents.
+    #[tracing::instrument(skip(self))]
     pub fn to_any_event(&self) -> Raw<AnyEvent> {
         let mut json = json!({
             "content": self.content,
@@ -128,6 +126,7 @@ impl PduEvent {
         serde_json::from_value(json).expect("Raw::from_value always works")
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn to_room_event(&self) -> Raw<AnyRoomEvent> {
         let mut json = json!({
             "content": self.content,
@@ -149,6 +148,7 @@ impl PduEvent {
         serde_json::from_value(json).expect("Raw::from_value always works")
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn to_state_event(&self) -> Raw<AnyStateEvent> {
         let json = json!({
             "content": self.content,
@@ -164,6 +164,7 @@ impl PduEvent {
         serde_json::from_value(json).expect("Raw::from_value always works")
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn to_sync_state_event(&self) -> Raw<AnySyncStateEvent> {
         let json = json!({
             "content": self.content,
@@ -178,6 +179,7 @@ impl PduEvent {
         serde_json::from_value(json).expect("Raw::from_value always works")
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn to_stripped_state_event(&self) -> Raw<AnyStrippedStateEvent> {
         let json = json!({
             "content": self.content,
@@ -189,6 +191,7 @@ impl PduEvent {
         serde_json::from_value(json).expect("Raw::from_value always works")
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn to_member_event(&self) -> Raw<StateEvent<MemberEventContent>> {
         let json = json!({
             "content": self.content,
@@ -206,6 +209,7 @@ impl PduEvent {
     }
 
     /// This does not return a full `Pdu` it is only to satisfy ruma's types.
+    #[tracing::instrument]
     pub fn convert_to_outgoing_federation_event(
         mut pdu_json: CanonicalJsonObject,
     ) -> Raw<ruma::events::pdu::Pdu> {
@@ -227,72 +231,98 @@ impl PduEvent {
         )
         .expect("Raw::from_value always works")
     }
-}
 
-impl From<&state_res::StateEvent> for PduEvent {
+    pub fn from_id_val(
-    fn from(pdu: &state_res::StateEvent) -> Self {
+        event_id: &EventId,
-        Self {
+        mut json: CanonicalJsonObject,
-            event_id: pdu.event_id(),
+    ) -> Result<Self, serde_json::Error> {
-            room_id: pdu.room_id().clone(),
+        json.insert(
-            sender: pdu.sender().clone(),
+            "event_id".to_string(),
-            origin_server_ts: (pdu
+            CanonicalJsonValue::String(event_id.as_str().to_owned()),
-                .origin_server_ts()
+        );
-                .duration_since(UNIX_EPOCH)
+
-                .expect("time is valid")
+        serde_json::from_value(serde_json::to_value(json).expect("valid JSON"))
-                .as_millis() as u64)
-                .try_into()
-                .expect("time is valid"),
-            kind: pdu.kind(),
-            content: pdu.content().clone(),
-            state_key: Some(pdu.state_key()),
-            prev_events: pdu.prev_event_ids(),
-            depth: *pdu.depth(),
-            auth_events: pdu.auth_events(),
-            redacts: pdu.redacts().cloned(),
-            unsigned: pdu.unsigned().clone().into_iter().collect(),
-            hashes: pdu.hashes().clone(),
-            signatures: pdu.signatures(),
-        }
     }
 }
 
-impl PduEvent {
+impl state_res::Event for PduEvent {
-    pub fn convert_for_state_res(&self) -> Arc<state_res::StateEvent> {
+    fn event_id(&self) -> &EventId {
-        Arc::new(
+        &self.event_id
-            // For consistency of eventId (just in case) we use the one
+    }
-            // generated by conduit for everything.
+
-            state_res::StateEvent::from_id_value(
+    fn room_id(&self) -> &RoomId {
-                self.event_id.clone(),
+        &self.room_id
-                json!({
+    }
-                    "event_id": self.event_id,
+
-                    "room_id": self.room_id,
+    fn sender(&self) -> &UserId {
-                    "sender": self.sender,
+        &self.sender
-                    "origin_server_ts": self.origin_server_ts,
+    }
-                    "type": self.kind,
+    fn kind(&self) -> EventType {
-                    "content": self.content,
+        self.kind.clone()
-                    "state_key": self.state_key,
+    }
-                    "prev_events": self.prev_events,
+
-                    "depth": self.depth,
+    fn content(&self) -> serde_json::Value {
-                    "auth_events": self.auth_events,
+        self.content.clone()
-                    "redacts": self.redacts,
+    }
-                    "unsigned": self.unsigned,
+    fn origin_server_ts(&self) -> std::time::SystemTime {
-                    "hashes": self.hashes,
+        UNIX_EPOCH + std::time::Duration::from_millis(self.origin_server_ts.into())
-                    "signatures": self.signatures,
+    }
-                }),
+
-            )
+    fn state_key(&self) -> Option<String> {
-            .expect("all conduit PDUs are state events"),
+        self.state_key.clone()
-        )
+    }
+    fn prev_events(&self) -> Vec<EventId> {
+        self.prev_events.to_vec()
+    }
+    fn depth(&self) -> &UInt {
+        &self.depth
+    }
+    fn auth_events(&self) -> Vec<EventId> {
+        self.auth_events.to_vec()
+    }
+    fn redacts(&self) -> Option<&EventId> {
+        self.redacts.as_ref()
+    }
+    fn hashes(&self) -> &EventHash {
+        &self.hashes
+    }
+    fn signatures(&self) -> BTreeMap<Box<ServerName>, BTreeMap<ruma::ServerSigningKeyId, String>> {
+        self.signatures.clone()
+    }
+    fn unsigned(&self) -> &BTreeMap<String, serde_json::Value> {
+        &self.unsigned
+    }
+}
+
+// These impl's allow us to dedup state snapshots when resolving state
+// for incoming events (federation/send/{txn}).
+impl Eq for PduEvent {}
+impl PartialEq for PduEvent {
+    fn eq(&self, other: &Self) -> bool {
+        self.event_id == other.event_id
+    }
+}
+impl PartialOrd for PduEvent {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.event_id.partial_cmp(&other.event_id)
+    }
+}
+impl Ord for PduEvent {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.event_id.cmp(&other.event_id)
     }
 }
 
 /// Generates a correct eventId for the incoming pdu.
 ///
-/// Returns a tuple of the new `EventId` and the PDU with the eventId inserted as a `serde_json::Value`.
+/// Returns a tuple of the new `EventId` and the PDU as a `BTreeMap<String, CanonicalJsonValue>`.
-pub(crate) fn process_incoming_pdu(
+pub(crate) fn gen_event_id_canonical_json(
     pdu: &Raw<ruma::events::pdu::Pdu>,
-) -> (EventId, CanonicalJsonObject) {
+) -> crate::Result<(EventId, CanonicalJsonObject)> {
-    let mut value =
+    let value = serde_json::from_str(pdu.json().get()).map_err(|e| {
-        serde_json::from_str(pdu.json().get()).expect("A Raw<...> is always valid JSON");
+        error!("{:?}: {:?}", pdu, e);
+        Error::BadServerResponse("Invalid PDU in server response")
+    })?;
 
     let event_id = EventId::try_from(&*format!(
         "${}",
@@ -301,12 +331,7 @@ pub(crate) fn process_incoming_pdu(
     ))
     .expect("ruma's reference hashes are valid event ids");
 
-    value.insert(
+    Ok((event_id, value))
-        "event_id".to_owned(),
-        to_canonical_value(&event_id).expect("EventId is a valid CanonicalJsonValue"),
-    );
-
-    (event_id, value)
 }
 
 /// Build the start of a PDU in order to add it to the `Database`.
@@ -315,7 +340,7 @@ pub struct PduBuilder {
     #[serde(rename = "type")]
     pub event_type: EventType,
     pub content: serde_json::Value,
-    pub unsigned: Option<serde_json::Map<String, serde_json::Value>>,
+    pub unsigned: Option<BTreeMap<String, serde_json::Value>>,
     pub state_key: Option<String>,
     pub redacts: Option<EventId>,
 }

src/push_rules.rs

@@ -1,256 +0,0 @@
-use ruma::{
-    push::{
-        Action, ConditionalPushRule, ConditionalPushRuleInit, ContentPushRule, OverridePushRule,
-        PatternedPushRule, PatternedPushRuleInit, PushCondition, RoomMemberCountIs, Ruleset, Tweak,
-        UnderridePushRule,
-    },
-    UserId,
-};
-
-pub fn default_pushrules(user_id: &UserId) -> Ruleset {
-    let mut rules = Ruleset::default();
-
-    rules.add(ContentPushRule(contains_user_name_rule(&user_id)));
-
-    for rule in vec![
-        master_rule(),
-        suppress_notices_rule(),
-        invite_for_me_rule(),
-        member_event_rule(),
-        contains_display_name_rule(),
-        tombstone_rule(),
-        roomnotif_rule(),
-    ] {
-        rules.add(OverridePushRule(rule));
-    }
-
-    for rule in vec![
-        call_rule(),
-        encrypted_room_one_to_one_rule(),
-        room_one_to_one_rule(),
-        message_rule(),
-        encrypted_rule(),
-    ] {
-        rules.add(UnderridePushRule(rule));
-    }
-
-    rules
-}
-
-pub fn master_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![Action::DontNotify],
-        default: true,
-        enabled: false,
-        rule_id: ".m.rule.master".to_owned(),
-        conditions: vec![],
-    }
-    .into()
-}
-
-pub fn suppress_notices_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![Action::DontNotify],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.suppress_notices".to_owned(),
-        conditions: vec![PushCondition::EventMatch {
-            key: "content.msgtype".to_owned(),
-            pattern: "m.notice".to_owned(),
-        }],
-    }
-    .into()
-}
-
-pub fn invite_for_me_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![
-            Action::Notify,
-            Action::SetTweak(Tweak::Sound("default".to_owned())),
-            Action::SetTweak(Tweak::Highlight(false)),
-        ],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.invite_for_me".to_owned(),
-        conditions: vec![PushCondition::EventMatch {
-            key: "content.membership".to_owned(),
-            pattern: "m.invite".to_owned(),
-        }],
-    }
-    .into()
-}
-
-pub fn member_event_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![Action::DontNotify],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.member_event".to_owned(),
-        conditions: vec![PushCondition::EventMatch {
-            key: "content.membership".to_owned(),
-            pattern: "type".to_owned(),
-        }],
-    }
-    .into()
-}
-
-pub fn contains_display_name_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![
-            Action::Notify,
-            Action::SetTweak(Tweak::Sound("default".to_owned())),
-            Action::SetTweak(Tweak::Highlight(true)),
-        ],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.contains_display_name".to_owned(),
-        conditions: vec![PushCondition::ContainsDisplayName],
-    }
-    .into()
-}
-
-pub fn tombstone_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![Action::Notify, Action::SetTweak(Tweak::Highlight(true))],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.tombstone".to_owned(),
-        conditions: vec![
-            PushCondition::EventMatch {
-                key: "type".to_owned(),
-                pattern: "m.room.tombstone".to_owned(),
-            },
-            PushCondition::EventMatch {
-                key: "state_key".to_owned(),
-                pattern: "".to_owned(),
-            },
-        ],
-    }
-    .into()
-}
-
-pub fn roomnotif_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![Action::Notify, Action::SetTweak(Tweak::Highlight(true))],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.roomnotif".to_owned(),
-        conditions: vec![
-            PushCondition::EventMatch {
-                key: "content.body".to_owned(),
-                pattern: "@room".to_owned(),
-            },
-            PushCondition::SenderNotificationPermission {
-                key: "room".to_owned(),
-            },
-        ],
-    }
-    .into()
-}
-
-pub fn contains_user_name_rule(user_id: &UserId) -> PatternedPushRule {
-    PatternedPushRuleInit {
-        actions: vec![
-            Action::Notify,
-            Action::SetTweak(Tweak::Sound("default".to_owned())),
-            Action::SetTweak(Tweak::Highlight(true)),
-        ],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.contains_user_name".to_owned(),
-        pattern: user_id.localpart().to_owned(),
-    }
-    .into()
-}
-
-pub fn call_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![
-            Action::Notify,
-            Action::SetTweak(Tweak::Sound("ring".to_owned())),
-            Action::SetTweak(Tweak::Highlight(false)),
-        ],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.call".to_owned(),
-        conditions: vec![PushCondition::EventMatch {
-            key: "type".to_owned(),
-            pattern: "m.call.invite".to_owned(),
-        }],
-    }
-    .into()
-}
-
-pub fn encrypted_room_one_to_one_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![
-            Action::Notify,
-            Action::SetTweak(Tweak::Sound("default".to_owned())),
-            Action::SetTweak(Tweak::Highlight(false)),
-        ],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.encrypted_room_one_to_one".to_owned(),
-        conditions: vec![
-            PushCondition::RoomMemberCount {
-                is: RoomMemberCountIs::from(2_u32.into()..),
-            },
-            PushCondition::EventMatch {
-                key: "type".to_owned(),
-                pattern: "m.room.encrypted".to_owned(),
-            },
-        ],
-    }
-    .into()
-}
-
-pub fn room_one_to_one_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![
-            Action::Notify,
-            Action::SetTweak(Tweak::Sound("default".to_owned())),
-            Action::SetTweak(Tweak::Highlight(false)),
-        ],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.room_one_to_one".to_owned(),
-        conditions: vec![
-            PushCondition::RoomMemberCount {
-                is: RoomMemberCountIs::from(2_u32.into()..),
-            },
-            PushCondition::EventMatch {
-                key: "type".to_owned(),
-                pattern: "m.room.message".to_owned(),
-            },
-        ],
-    }
-    .into()
-}
-
-pub fn message_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![Action::Notify, Action::SetTweak(Tweak::Highlight(false))],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.message".to_owned(),
-        conditions: vec![PushCondition::EventMatch {
-            key: "type".to_owned(),
-            pattern: "m.room.message".to_owned(),
-        }],
-    }
-    .into()
-}
-
-pub fn encrypted_rule() -> ConditionalPushRule {
-    ConditionalPushRuleInit {
-        actions: vec![Action::Notify, Action::SetTweak(Tweak::Highlight(false))],
-        default: true,
-        enabled: true,
-        rule_id: ".m.rule.encrypted".to_owned(),
-        conditions: vec![PushCondition::EventMatch {
-            key: "type".to_owned(),
-            pattern: "m.room.encrypted".to_owned(),
-        }],
-    }
-    .into()
-}

src/ruma_wrapper.rs

@@ -1,29 +1,30 @@
 use crate::Error;
 use ruma::{
-    api::{AuthScheme, OutgoingRequest},
+    api::OutgoingResponse,
     identifiers::{DeviceId, UserId},
     Outgoing,
 };
-use std::{
+use std::ops::Deref;
-    convert::{TryFrom, TryInto},
-    ops::Deref,
-};
 
 #[cfg(feature = "conduit_bin")]
 use {
-    crate::utils,
+    crate::{server_server, utils},
-    log::warn,
+    log::{debug, warn},
     rocket::{
-        data::{
+        data::{self, ByteUnit, Data, FromData},
-            ByteUnit, Data, FromDataFuture, FromTransformedData, Transform, TransformFuture,
-            Transformed,
-        },
         http::Status,
         outcome::Outcome::*,
         response::{self, Responder},
         tokio::io::AsyncReadExt,
         Request, State,
     },
+    ruma::{
+        api::{AuthScheme, IncomingRequest},
+        signatures::CanonicalJsonValue,
+        ServerName,
+    },
+    std::collections::BTreeMap,
+    std::convert::TryFrom,
     std::io::Cursor,
 };
 
@@ -33,94 +34,261 @@ pub struct Ruma<T: Outgoing> {
     pub body: T::Incoming,
     pub sender_user: Option<UserId>,
     pub sender_device: Option<Box<DeviceId>>,
-    pub json_body: Option<Box<serde_json::value::RawValue>>, // This is None when body is not a valid string
+    // This is None when body is not a valid string
+    pub json_body: Option<Box<serde_json::value::RawValue>>,
+    pub from_appservice: bool,
 }
 
 #[cfg(feature = "conduit_bin")]
-impl<'a, T: Outgoing + OutgoingRequest> FromTransformedData<'a> for Ruma<T>
+#[rocket::async_trait]
+impl<'a, T: Outgoing> FromData<'a> for Ruma<T>
 where
-    <T as Outgoing>::Incoming: TryFrom<http::request::Request<std::vec::Vec<u8>>> + std::fmt::Debug,
+    T::Incoming: IncomingRequest,
-    <<T as Outgoing>::Incoming as std::convert::TryFrom<
-        http::request::Request<std::vec::Vec<u8>>,
-    >>::Error: std::fmt::Debug,
 {
-    type Error = (); // TODO: Better error handling
+    type Error = ();
-    type Owned = Data;
-    type Borrowed = Self::Owned;
 
-    fn transform<'r>(
+    async fn from_data(request: &'a Request<'_>, data: Data) -> data::Outcome<Self, Self::Error> {
-        _req: &'r Request<'_>,
+        let metadata = T::Incoming::METADATA;
-        data: Data,
+        let db = request
-    ) -> TransformFuture<'r, Self::Owned, Self::Error> {
+            .guard::<State<'_, crate::Database>>()
-        Box::pin(async move { Transform::Owned(Success(data)) })
+            .await
-    }
+            .expect("database was loaded");
 
-    fn from_data(
+        // Get token from header or query value
-        request: &'a Request<'_>,
+        let token = request
-        outcome: Transformed<'a, Self>,
+            .headers()
-    ) -> FromDataFuture<'a, Self, Self::Error> {
+            .get_one("Authorization")
-        Box::pin(async move {
+            .map(|s| s[7..].to_owned()) // Split off "Bearer "
-            let data = rocket::try_outcome!(outcome.owned());
+            .or_else(|| request.query_value("access_token").and_then(|r| r.ok()));
-            let db = request
-                .guard::<State<'_, crate::Database>>()
-                .await
-                .expect("database was loaded");
 
-            let (sender_user, sender_device) = match T::METADATA.authentication {
+        let limit = db.globals.max_request_size();
+        let mut handle = data.open(ByteUnit::Byte(limit.into()));
+        let mut body = Vec::new();
+        handle.read_to_end(&mut body).await.unwrap();
+
+        let (sender_user, sender_device, from_appservice) = if let Some((_id, registration)) = db
+            .appservice
+            .iter_all()
+            .filter_map(|r| r.ok())
+            .find(|(_id, registration)| {
+                registration
+                    .get("as_token")
+                    .and_then(|as_token| as_token.as_str())
+                    .map_or(false, |as_token| token.as_deref() == Some(as_token))
+            }) {
+            match metadata.authentication {
                 AuthScheme::AccessToken | AuthScheme::QueryOnlyAccessToken => {
-                    // Get token from header or query value
+                    let user_id = request.query_value::<String>("user_id").map_or_else(
-                    let token = match request
+                        || {
-                        .headers()
+                            UserId::parse_with_server_name(
-                        .get_one("Authorization")
+                                registration
-                        .map(|s| s[7..].to_owned()) // Split off "Bearer "
+                                    .get("sender_localpart")
-                        .or_else(|| request.get_query_value("access_token").and_then(|r| r.ok()))
+                                    .unwrap()
-                    {
+                                    .as_str()
-                        // TODO: M_MISSING_TOKEN
+                                    .unwrap(),
-                        None => return Failure((Status::Unauthorized, ())),
+                                db.globals.server_name(),
-                        Some(token) => token,
+                            )
-                    };
+                            .unwrap()
+                        },
+                        |string| {
+                            UserId::try_from(string.expect("parsing to string always works"))
+                                .unwrap()
+                        },
+                    );
 
-                    // Check if token is valid
+                    if !db.users.exists(&user_id).unwrap() {
-                    match db.users.find_from_token(&token).unwrap() {
+                        // Forbidden
-                        // TODO: M_UNKNOWN_TOKEN
+                        return Failure((Status::raw(580), ()));
-                        None => return Failure((Status::Unauthorized, ())),
+                    }
-                        Some((user_id, device_id)) => (Some(user_id), Some(device_id.into())),
+
+                    // TODO: Check if appservice is allowed to be that user
+                    (Some(user_id), None, true)
+                }
+                AuthScheme::ServerSignatures => (None, None, true),
+                AuthScheme::None => (None, None, true),
+            }
+        } else {
+            match metadata.authentication {
+                AuthScheme::AccessToken | AuthScheme::QueryOnlyAccessToken => {
+                    if let Some(token) = token {
+                        match db.users.find_from_token(&token).unwrap() {
+                            // Unknown Token
+                            None => return Failure((Status::raw(581), ())),
+                            Some((user_id, device_id)) => {
+                                (Some(user_id), Some(device_id.into()), false)
+                            }
+                        }
+                    } else {
+                        // Missing Token
+                        return Failure((Status::raw(582), ()));
                     }
                 }
-                _ => (None, None),
+                AuthScheme::ServerSignatures => {
-            };
+                    // Get origin from header
+                    let x_matrix = match request.headers().get_one("Authorization").map(|s| {
+                        // Split off "X-Matrix " and parse the rest
+                        s[9..]
+                            .split_terminator(',')
+                            .map(|field| {
+                                let mut splits = field.splitn(2, '=');
+                                (splits.next(), splits.next().map(|s| s.trim_matches('"')))
+                            })
+                            .collect::<BTreeMap<_, _>>()
+                    }) {
+                        Some(t) => t,
+                        None => {
+                            warn!("No Authorization header");
 
-            let mut http_request = http::Request::builder()
+                            // Forbidden
-                .uri(request.uri().to_string())
+                            return Failure((Status::raw(580), ()));
-                .method(&*request.method().to_string());
+                        }
-            for header in request.headers().iter() {
+                    };
-                http_request = http_request.header(header.name.as_str(), &*header.value);
-            }
 
-            let limit = db.globals.max_request_size();
+                    let origin_str = match x_matrix.get(&Some("origin")) {
-            let mut handle = data.open(ByteUnit::Byte(limit.into()));
+                        Some(Some(o)) => *o,
-            let mut body = Vec::new();
+                        _ => {
-            handle.read_to_end(&mut body).await.unwrap();
+                            warn!("Invalid X-Matrix header origin field: {:?}", x_matrix);
 
-            let http_request = http_request.body(body.clone()).unwrap();
+                            // Forbidden
-            log::debug!("{:?}", http_request);
+                            return Failure((Status::raw(580), ()));
+                        }
+                    };
 
-            match <T as Outgoing>::Incoming::try_from(http_request) {
+                    let origin = match Box::<ServerName>::try_from(origin_str) {
-                Ok(t) => Success(Ruma {
+                        Ok(s) => s,
-                    body: t,
+                        _ => {
-                    sender_user,
+                            warn!(
-                    sender_device,
+                                "Invalid server name in X-Matrix header origin field: {:?}",
-                    // TODO: Can we avoid parsing it again? (We only need this for append_pdu)
+                                x_matrix
-                    json_body: utils::string_from_bytes(&body)
+                            );
-                        .ok()
+
-                        .and_then(|s| serde_json::value::RawValue::from_string(s).ok()),
+                            // Forbidden
-                }),
+                            return Failure((Status::raw(580), ()));
-                Err(e) => {
+                        }
-                    warn!("{:?}", e);
+                    };
-                    Failure((Status::BadRequest, ()))
+
+                    let key = match x_matrix.get(&Some("key")) {
+                        Some(Some(k)) => *k,
+                        _ => {
+                            warn!("Invalid X-Matrix header key field: {:?}", x_matrix);
+
+                            // Forbidden
+                            return Failure((Status::raw(580), ()));
+                        }
+                    };
+
+                    let sig = match x_matrix.get(&Some("sig")) {
+                        Some(Some(s)) => *s,
+                        _ => {
+                            warn!("Invalid X-Matrix header sig field: {:?}", x_matrix);
+
+                            // Forbidden
+                            return Failure((Status::raw(580), ()));
+                        }
+                    };
+
+                    let json_body = serde_json::from_slice::<CanonicalJsonValue>(&body);
+
+                    let mut request_map = BTreeMap::<String, CanonicalJsonValue>::new();
+
+                    if let Ok(json_body) = json_body {
+                        request_map.insert("content".to_owned(), json_body);
+                    };
+
+                    request_map.insert(
+                        "method".to_owned(),
+                        CanonicalJsonValue::String(request.method().to_string()),
+                    );
+                    request_map.insert(
+                        "uri".to_owned(),
+                        CanonicalJsonValue::String(request.uri().to_string()),
+                    );
+                    request_map.insert(
+                        "origin".to_owned(),
+                        CanonicalJsonValue::String(origin.as_str().to_owned()),
+                    );
+                    request_map.insert(
+                        "destination".to_owned(),
+                        CanonicalJsonValue::String(db.globals.server_name().as_str().to_owned()),
+                    );
+
+                    let mut origin_signatures = BTreeMap::new();
+                    origin_signatures
+                        .insert(key.to_owned(), CanonicalJsonValue::String(sig.to_owned()));
+
+                    let mut signatures = BTreeMap::new();
+                    signatures.insert(
+                        origin.as_str().to_owned(),
+                        CanonicalJsonValue::Object(origin_signatures),
+                    );
+
+                    request_map.insert(
+                        "signatures".to_owned(),
+                        CanonicalJsonValue::Object(signatures),
+                    );
+
+                    let keys = match server_server::fetch_signing_keys(
+                        &db,
+                        &origin,
+                        vec![&key.to_owned()],
+                    )
+                    .await
+                    {
+                        Ok(b) => b,
+                        Err(e) => {
+                            warn!("Failed to fetch signing keys: {}", e);
+
+                            // Forbidden
+                            return Failure((Status::raw(580), ()));
+                        }
+                    };
+
+                    let mut pub_key_map = BTreeMap::new();
+                    pub_key_map.insert(origin.as_str().to_owned(), keys);
+
+                    match ruma::signatures::verify_json(&pub_key_map, &request_map) {
+                        Ok(()) => (None, None, false),
+                        Err(e) => {
+                            warn!("Failed to verify json request from {}: {}", origin, e);
+
+                            if request.uri().to_string().contains('@') {
+                                warn!("Request uri contained '@' character. Make sure your reverse proxy gives Conduit the raw uri (apache: use nocanon)");
+                            }
+
+                            // Forbidden
+                            return Failure((Status::raw(580), ()));
+                        }
+                    }
                 }
+                AuthScheme::None => (None, None, false),
             }
-        })
+        };
+
+        let mut http_request = http::Request::builder()
+            .uri(request.uri().to_string())
+            .method(&*request.method().to_string());
+        for header in request.headers().iter() {
+            http_request = http_request.header(header.name.as_str(), &*header.value);
+        }
+
+        let http_request = http_request.body(&*body).unwrap();
+        debug!("{:?}", http_request);
+        match <T::Incoming as IncomingRequest>::try_from_http_request(http_request) {
+            Ok(t) => Success(Ruma {
+                body: t,
+                sender_user,
+                sender_device,
+                // TODO: Can we avoid parsing it again? (We only need this for append_pdu)
+                json_body: utils::string_from_bytes(&body)
+                    .ok()
+                    .and_then(|s| serde_json::value::RawValue::from_string(s).ok()),
+                from_appservice,
+            }),
+            Err(e) => {
+                warn!("{:?}", e);
+                Failure((Status::raw(583), ()))
+            }
+        }
     }
 }
 
@@ -135,9 +303,9 @@ impl<T: Outgoing> Deref for Ruma<T> {
 /// This struct converts ruma responses into rocket http responses.
 pub type ConduitResult<T> = std::result::Result<RumaResponse<T>, Error>;
 
-pub struct RumaResponse<T: TryInto<http::Response<Vec<u8>>>>(pub T);
+pub struct RumaResponse<T: OutgoingResponse>(pub T);
 
-impl<T: TryInto<http::Response<Vec<u8>>>> From<T> for RumaResponse<T> {
+impl<T: OutgoingResponse> From<T> for RumaResponse<T> {
     fn from(t: T) -> Self {
         Self(t)
     }
@@ -146,40 +314,38 @@ impl<T: TryInto<http::Response<Vec<u8>>>> From<T> for RumaResponse<T> {
 #[cfg(feature = "conduit_bin")]
 impl<'r, 'o, T> Responder<'r, 'o> for RumaResponse<T>
 where
-    T: Send + TryInto<http::Response<Vec<u8>>>,
+    T: Send + OutgoingResponse,
-    T::Error: Send,
     'o: 'r,
 {
     fn respond_to(self, _: &'r Request<'_>) -> response::Result<'o> {
-        let http_response: Result<http::Response<_>, _> = self.0.try_into();
+        let http_response = self
-        match http_response {
+            .0
-            Ok(http_response) => {
+            .try_into_http_response::<Vec<u8>>()
-                let mut response = rocket::response::Response::build();
+            .map_err(|_| Status::InternalServerError)?;
 
-                let status = http_response.status();
+        let mut response = rocket::response::Response::build();
-                response.raw_status(status.into(), "");
 
-                for header in http_response.headers() {
+        let status = http_response.status();
-                    response
+        response.raw_status(status.into(), "");
-                        .raw_header(header.0.to_string(), header.1.to_str().unwrap().to_owned());
-                }
 
-                let http_body = http_response.into_body();
+        for header in http_response.headers() {
-
+            response.raw_header(header.0.to_string(), header.1.to_str().unwrap().to_owned());
-                response.sized_body(http_body.len(), Cursor::new(http_body));
-
-                response.raw_header("Access-Control-Allow-Origin", "*");
-                response.raw_header(
-                    "Access-Control-Allow-Methods",
-                    "GET, POST, PUT, DELETE, OPTIONS",
-                );
-                response.raw_header(
-                    "Access-Control-Allow-Headers",
-                    "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-                );
-                response.ok()
-            }
-            Err(_) => Err(Status::InternalServerError),
         }
+
+        let http_body = http_response.into_body();
+
+        response.sized_body(http_body.len(), Cursor::new(http_body));
+
+        response.raw_header("Access-Control-Allow-Origin", "*");
+        response.raw_header(
+            "Access-Control-Allow-Methods",
+            "GET, POST, PUT, DELETE, OPTIONS",
+        );
+        response.raw_header(
+            "Access-Control-Allow-Headers",
+            "Origin, X-Requested-With, Content-Type, Accept, Authorization",
+        );
+        response.raw_header("Access-Control-Max-Age", "86400");
+        response.ok()
     }
 }

src/utils.rs

@@ -2,7 +2,6 @@ use argon2::{Config, Variant};
 use cmp::Ordering;
 use rand::prelude::*;
 use ruma::serde::{try_from_json_map, CanonicalJsonError, CanonicalJsonObject};
-use sled::IVec;
 use std::{
     cmp,
     convert::TryInto,
@@ -55,6 +54,7 @@ pub fn random_string(length: usize) -> String {
     thread_rng()
         .sample_iter(&rand::distributions::Alphanumeric)
         .take(length)
+        .map(char::from)
         .collect()
 }
 
@@ -70,9 +70,9 @@ pub fn calculate_hash(password: &str) -> Result<String, argon2::Error> {
 }
 
 pub fn common_elements(
-    mut iterators: impl Iterator<Item = impl Iterator<Item = IVec>>,
+    mut iterators: impl Iterator<Item = impl Iterator<Item = Vec<u8>>>,
-    check_order: impl Fn(&IVec, &IVec) -> Ordering,
+    check_order: impl Fn(&[u8], &[u8]) -> Ordering,
-) -> Option<impl Iterator<Item = IVec>> {
+) -> Option<impl Iterator<Item = Vec<u8>>> {
     let first_iterator = iterators.next()?;
     let mut other_iterators = iterators.map(|i| i.peekable()).collect::<Vec<_>>();
 

tests/Complement.Dockerfile

@@ -1,3 +1,4 @@
+# For use in our CI only. This requires a build artifact created by a previous run pipline stage to be placed in cached_target/release/conduit
 FROM valkum/docker-rust-ci:latest as builder
 WORKDIR /workdir
 
@@ -9,7 +10,9 @@ ARG SCCACHE_ENDPOINT
 ARG SCCACHE_S3_USE_SSL
 
 COPY . .
-RUN cargo build
+RUN mkdir -p target/release
+RUN test -e cached_target/release/conduit && cp cached_target/release/conduit target/release/conduit || cargo build --release
+
 
 FROM valkum/docker-rust-ci:latest
 WORKDIR /workdir
@@ -17,24 +20,30 @@ WORKDIR /workdir
 RUN curl -OL "https://github.com/caddyserver/caddy/releases/download/v2.2.1/caddy_2.2.1_linux_amd64.tar.gz"
 RUN tar xzf caddy_2.2.1_linux_amd64.tar.gz
 
-COPY --from=builder /workdir/target/debug/conduit /workdir/conduit
+COPY cached_target/release/conduit /workdir/conduit
+RUN chmod +x /workdir/conduit
+RUN chmod +x /workdir/caddy
 
-COPY Rocket-example.toml Rocket.toml
+COPY conduit-example.toml conduit.toml
 
 ENV SERVER_NAME=localhost
 ENV ROCKET_LOG=normal
+ENV CONDUIT_CONFIG=/workdir/conduit.toml
 
-RUN sed -i "s/port = 14004/port = 8008/g" Rocket.toml
+RUN sed -i "s/port = 6167/port = 8008/g" conduit.toml
-RUN echo "federation_enabled = true" >> Rocket.toml
+RUN echo "allow_federation = true" >> conduit.toml
+RUN echo "allow_encryption = true" >> conduit.toml
+RUN echo "allow_registration = true" >> conduit.toml
+RUN echo "log = \"info,rocket=info,_=off,sled=off\"" >> conduit.toml
+RUN sed -i "s/address = \"127.0.0.1\"/address = \"0.0.0.0\"/g" conduit.toml
 
 # Enabled Caddy auto cert generation for complement provided CA.
-RUN echo '{"apps":{"http":{"https_port":8448,"servers":{"srv0":{"listen":[":8448"],"routes":[{"match":[{"host":["your.server.name"]}],"handle":[{"handler":"subroute","routes":[{"handle":[{"handler":"reverse_proxy","upstreams":[{"dial":"localhost:8008"}]}]}]}],"terminal":true}],"tls_connection_policies": [{"match": {"sni": ["your.server.name"]}}]}}},"pki": {"certificate_authorities": {"local": {"name": "Complement CA","root": {"certificate": "/ca/ca.crt","private_key": "/ca/ca.key"},"intermediate": {"certificate": "/ca/ca.crt","private_key": "/ca/ca.key"}}}},"tls":{"automation":{"policies":[{"subjects":["your.server.name"],"issuer":{"module":"internal"},"on_demand":true},{"issuer":{"module":"internal", "ca": "local"}}]}}}}' > caddy.json 
+RUN echo '{"logging":{"logs":{"default":{"level":"WARN"}}}, "apps":{"http":{"https_port":8448,"servers":{"srv0":{"listen":[":8448"],"routes":[{"match":[{"host":["your.server.name"]}],"handle":[{"handler":"subroute","routes":[{"handle":[{"handler":"reverse_proxy","upstreams":[{"dial":"127.0.0.1:8008"}]}]}]}],"terminal":true}],"tls_connection_policies": [{"match": {"sni": ["your.server.name"]}}]}}},"pki": {"certificate_authorities": {"local": {"name": "Complement CA","root": {"certificate": "/ca/ca.crt","private_key": "/ca/ca.key"},"intermediate": {"certificate": "/ca/ca.crt","private_key": "/ca/ca.key"}}}},"tls":{"automation":{"policies":[{"subjects":["your.server.name"],"issuer":{"module":"internal"},"on_demand":true},{"issuer":{"module":"internal", "ca": "local"}}]}}}}' > caddy.json 
  
 EXPOSE 8008 8448
 
 CMD ([ -z "${COMPLEMENT_CA}" ] && echo "Error: Need Complement PKI support" && true) || \
-    sed -i "s/server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" Rocket.toml && \
+    sed -i "s/#server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" conduit.toml && \
     sed -i "s/your.server.name/${SERVER_NAME}/g" caddy.json && \
     /workdir/caddy start --config caddy.json > /dev/null && \
     /workdir/conduit
-    

tests/sytest/are-we-synapse-yet.list

@@ -91,14 +91,15 @@ snd PUT /rooms/:room_id/send/:event_type/:txn_id deduplicates the same txn id
 get GET /rooms/:room_id/messages returns a message
 get GET /rooms/:room_id/messages lazy loads members correctly 
 typ PUT /rooms/:room_id/typing/:user_id sets typing notification 
+typ Typing notifications don't leak (3 subtests)
 rst GET /rooms/:room_id/state/m.room.power_levels can fetch levels
 rst PUT /rooms/:room_id/state/m.room.power_levels can set levels
 rst PUT power_levels should not explode if the old power levels were empty
 rst Both GET and PUT work
 rct POST /rooms/:room_id/receipt can create receipts 
 red POST /rooms/:room_id/read_markers can create read marker
-med POST /media/v1/upload can create an upload
+med POST /media/r0/upload can create an upload 
-med GET /media/v1/download can fetch the value again
+med GET /media/r0/download can fetch the value again 
 cap GET /capabilities is present and well formed for registered user 
 cap GET /r0/capabilities is not public
 reg Register with a recaptcha 
@@ -296,7 +297,7 @@ fgt Forgotten room messages cannot be paginated
 fgt Forgetting room does not show up in v2 /sync 
 fgt Can forget room you've been kicked from 
 fgt Can't forget room you're still in
-mem Can re-join room if re-invited
+fgt Can re-join room if re-invited
 ath Only original members of the room can see messages from erased users 
 mem /joined_rooms returns only joined rooms
 mem /joined_members return joined members 
@@ -455,6 +456,19 @@ rmv User can invite remote user to room with version 5
 rmv Remote user can backfill in a room with version 5 
 rmv Can reject invites over federation for rooms with version 5 
 rmv Can receive redactions from regular users over federation in room version 5 
+rmv User can create and send/receive messages in a room with version 6 
+rmv User can create and send/receive messages in a room with version 6 (2 subtests)
+rmv local user can join room with version 6 
+rmv User can invite local user to room with version 6 
+rmv remote user can join room with version 6 
+rmv User can invite remote user to room with version 6 
+rmv Remote user can backfill in a room with version 6 
+rmv Can reject invites over federation for rooms with version 6 
+rmv Can receive redactions from regular users over federation in room version 6 
+rmv Inbound federation rejects invites which include invalid JSON for room version 6
+rmv Outbound federation rejects invite response which include invalid JSON for room version 6
+rmv Inbound federation rejects invite rejections which include invalid JSON for room version 6
+rmv Server rejects invalid JSON in a version 6 room
 pre Presence changes are reported to local room members 
 f,pre Presence changes are also reported to remote room members 
 pre Presence changes to UNAVAILABLE are reported to local room members 
@@ -482,24 +496,24 @@ f,dvk If remote user leaves room, changes device and rejoins we see update in /k
 dvk Get left notifs in sync and /keys/changes when other user leaves 
 dvk Get left notifs for other users in sync and /keys/changes when user leaves 
 f,dvk If user leaves room, remote user changes device and rejoins we see update in /sync and /keys/changes 
-dvk Can create backup version
+dkb Can create backup version 
-dvk Can update backup version
+dkb Can update backup version 
-dvk Responds correctly when backup is empty
+dkb Responds correctly when backup is empty 
-dvk Can backup keys
+dkb Can backup keys 
-dvk Can update keys with better versions
+dkb Can update keys with better versions 
-dvk Will not update keys with worse versions
+dkb Will not update keys with worse versions 
-dvk Will not back up to an old backup version
+dkb Will not back up to an old backup version 
-dvk Can delete backup
+dkb Can delete backup 
-dvk Deleted & recreated backups are empty
+dkb Deleted & recreated backups are empty 
-dvk Can create more than 10 backup versions
+dkb Can create more than 10 backup versions 
-dvk Can upload self-signing keys
+xsk Can upload self-signing keys 
-dvk Fails to upload self-signing keys with no auth
+xsk Fails to upload self-signing keys with no auth 
-dvk Fails to upload self-signing key without master key
+xsk Fails to upload self-signing key without master key 
-dvk Changing master key notifies local users
+xsk Changing master key notifies local users 
-dvk Changing user-signing key notifies local users
+xsk Changing user-signing key notifies local users 
-f,dvk can fetch self-signing keys over federation
+f,xsk can fetch self-signing keys over federation 
-f,dvk uploading self-signing key notifies over federation
+f,xsk uploading self-signing key notifies over federation 
-f,dvk uploading signed devices gets propagated over federation
+f,xsk uploading signed devices gets propagated over federation 
 tag Can add tag
 tag Can remove tag
 tag Can list tags for a room
@@ -536,11 +550,11 @@ std Can recv device messages until they are acknowledged
 std Device messages with the same txn_id are deduplicated 
 std Device messages wake up /sync 
 std Can recv device messages over federation 
-std Device messages over federation wake up /sync
+fsd Device messages over federation wake up /sync 
 std Can send messages with a wildcard device id 
 std Can send messages with a wildcard device id to two devices 
 std Wildcard device messages wake up /sync 
-std Wildcard device messages over federation wake up /sync
+fsd Wildcard device messages over federation wake up /sync 
 adm /whois 
 nsp /purge_history 
 nsp /purge_history by ts 
@@ -578,6 +592,7 @@ frv A pair of servers can establish a join in a v2 room
 fsj Outbound federation rejects send_join responses with no m.room.create event 
 frv Outbound federation rejects m.room.create events with an unknown room version 
 fsj Event with an invalid signature in the send_join response should not cause room join to fail 
+fsj Inbound: send_join rejects invalid JSON for room version 6
 fed Outbound federation can send events
 fed Inbound federation can receive events 
 fed Inbound federation can receive redacted events 
@@ -636,6 +651,7 @@ fst Name/topic keys are correct
 fau Remote servers cannot set power levels in rooms without existing powerlevels 
 fau Remote servers should reject attempts by non-creators to set the power levels 
 fau Inbound federation rejects typing notifications from wrong remote 
+fau Users cannot set notifications powerlevel higher than their own
 fed Forward extremities remain so even after the next events are populated as outliers 
 fau Banned servers cannot send events 
 fau Banned servers cannot /make_join 
@@ -815,6 +831,7 @@ psh Trying to get push rules with unknown scope fails with 400
 psh Trying to get push rules with unknown template fails with 400 
 psh Trying to get push rules with unknown attribute fails with 400 
 psh Trying to get push rules with unknown rule_id fails with 404
+psh Rooms with names are correctly named in pushes
 v1s GET /initialSync with non-numeric 'limit' 
 v1s GET /events with non-numeric 'limit' 
 v1s GET /events with negative 'limit' 
@@ -823,7 +840,7 @@ ath Event size limits
 syn Check creating invalid filters returns 4xx 
 f,pre New federated private chats get full presence information (SYN-115) 
 pre Left room members do not cause problems for presence 
-crm Rooms can be created with an initial invite list (SYN-205)
+crm Rooms can be created with an initial invite list (SYN-205) (1 subtests)
 typ Typing notifications don't leak 
 ban Non-present room members cannot ban others 
 psh Getting push rules doesn't corrupt the cache SYN-390 
@@ -834,3 +851,16 @@ gst Real user can call /events on another world_readable room (SYN-606)
 gst Events come down the correct room
 pub Asking for a remote rooms list, but supplying the local server's name, returns the local rooms list
 std Can send a to-device message to two users which both receive it using /sync
+fme Outbound federation will ignore a missing event with bad JSON for room version 6
+fbk Outbound federation rejects backfill containing invalid JSON for events in room version 6
+jso Invalid JSON integers
+jso Invalid JSON floats
+jso Invalid JSON special values
+inv Can invite users to invite-only rooms (2 subtests)
+plv setting 'm.room.name' respects room powerlevel (2 subtests)
+psh Messages that notify from another user increment notification_count
+psh Messages that org.matrix.msc2625.mark_unread from another user increment org.matrix.msc2625.unread_count
+dvk Can claim one time key using POST (2 subtests)
+fdk Can query remote device keys using POST (1 subtests)
+fdk Can claim remote one time key using POST (2 subtests)
+fmj Inbound /make_join rejects attempts to join rooms where all users have left

tests/sytest/are-we-synapse-yet.py

@@ -33,6 +33,8 @@ import sys
 
 test_mappings = {
     "nsp": "Non-Spec API",
+    "unk": "Unknown API (no group specified)",
+    "app": "Application Services API",
     "f": "Federation", # flag to mark test involves federation
 
     "federation_apis": {
@@ -50,6 +52,7 @@ test_mappings = {
         "fpb": "Public Room API",
         "fdk": "Device Key APIs",
         "fed": "Federation API",
+		"fsd": "Send-to-Device APIs",
     },
 
     "client_apis": {
@@ -61,6 +64,8 @@ test_mappings = {
         "pro": "Profile",
         "dev": "Devices",
         "dvk": "Device Keys",
+        "dkb": "Device Key Backup",
+        "xsk": "Cross-signing Keys",
         "pre": "Presence",
         "crm": "Create Room",
         "syn": "Sync API",
@@ -98,7 +103,7 @@ test_mappings = {
         "adm": "Server Admin API",
         "ign": "Ignore Users",
         "udr": "User Directory APIs",
-        "app": "Application Services API",
+		"jso": "Enforced canonical JSON",
     },
 }
 
@@ -156,6 +161,8 @@ def print_stats(header_name, gid_to_tests, gid_to_name, verbose):
     total_tests = 0
     for gid, tests in gid_to_tests.items():
         group_total = len(tests)
+        if group_total == 0:
+            continue
         group_passing = 0
         test_names_and_marks = []
         for name, passing in tests.items():
@@ -186,7 +193,6 @@ def main(results_tap_path, verbose):
     test_name_to_group_id = {}
     fed_tests = set()
     client_tests = set()
-    groupless_tests = set()
     with open("./are-we-synapse-yet.list", "r") as f:
         for line in f.readlines():
             test_name = " ".join(line.split(" ")[1:]).strip()
@@ -212,8 +218,12 @@ def main(results_tap_path, verbose):
             #   test_name: OK
             # }
         },
+        "appservice": {
+            "app": {},
+        },
         "nonspec": {
-            "nsp": {}
+            "nsp": {},
+            "unk": {}
         },
     }
     with open(results_tap_path, "r") as f:
@@ -224,10 +234,11 @@ def main(results_tap_path, verbose):
             name = test_result["name"]
             group_id = test_name_to_group_id.get(name)
             if not group_id:
-                groupless_tests.add(name)
+                summary["nonspec"]["unk"][name] = test_result["ok"]
-                # raise Exception("The test '%s' doesn't have a group" % (name,))
             if group_id == "nsp":
                 summary["nonspec"]["nsp"][name] = test_result["ok"]
+            elif group_id == "app":
+                summary["appservice"]["app"][name] = test_result["ok"]
             elif group_id in test_mappings["federation_apis"]:
                 group = summary["federation"].get(group_id, {})
                 group[name] = test_result["ok"]
@@ -243,12 +254,7 @@ def main(results_tap_path, verbose):
     print_stats("Non-Spec APIs", summary["nonspec"], test_mappings, verbose)
     print_stats("Client-Server APIs", summary["client"], test_mappings["client_apis"], verbose)
     print_stats("Federation APIs", summary["federation"], test_mappings["federation_apis"], verbose)
-    if verbose:
+    print_stats("Application Services APIs", summary["appservice"], test_mappings, verbose)
-        print("The following tests don't have a group:")
-        for name in groupless_tests:
-            print("  %s" % (name,))
-    else:
-        print("%d tests don't have a group" % len(groupless_tests))
 
 
 

tests/sytest/sytest-whitelist

@@ -1,71 +1,335 @@
+/event/ does not allow access to events before the user joined
+/event/ on joined room works
+/event/ on non world readable room does not work
 /joined_members return joined members
 /joined_rooms returns only joined rooms
+/whois
 3pid invite join valid signature but revoked keys are rejected
 3pid invite join valid signature but unreachable ID server are rejected
 3pid invite join with wrong but valid signature are rejected
+A change to displayname should appear in incremental /sync
+A full_state incremental update returns all state
+A full_state incremental update returns only recent timeline
+A message sent after an initial sync appears in the timeline of an incremental sync.
+A next_batch token can be used in the v1 messages API
+A pair of events which redact each other should be ignored
+A pair of servers can establish a join in a v2 room
+A prev_batch token can be used in the v1 messages API
+AS can create a user
+AS can create a user with an underscore
+AS can create a user with inhibit_login
+AS can set avatar for ghosted users
+AS can set displayname for ghosted users
+AS can't set displayname for random users
 AS cannot create users outside its own namespace
+AS user (not ghost) can join room without registering
+AS user (not ghost) can join room without registering, with user_id query param
+After changing password, a different session no longer works by default
+After changing password, can log in with new password
+After changing password, can't log in with old password
+After changing password, different sessions can optionally be kept
+After changing password, existing session still works
 After deactivating account, can't log in with an email
+After deactivating account, can't log in with password
 Alias creators can delete alias with no ops
 Alias creators can delete canonical alias with no ops
 Alternative server names do not cause a routing loop
+An event which redacts an event in a different room should be ignored
+An event which redacts itself should be ignored
+Asking for a remote rooms list, but supplying the local server's name, returns the local rooms list
+Backfill checks the events requested belong to the room
+Backfill works correctly with history visibility set to joined
+Backfilled events whose prev_events are in a different room do not allow cross-room back-pagination
+Banned servers cannot /event_auth
+Banned servers cannot /invite
+Banned servers cannot /make_join
+Banned servers cannot /make_leave
+Banned servers cannot /send_join
+Banned servers cannot /send_leave
+Banned servers cannot backfill
+Banned servers cannot get missing events
+Banned servers cannot get room state
+Banned servers cannot get room state ids
+Banned servers cannot send events
+Banned user is kicked and may not rejoin until unbanned
 Both GET and PUT work
+Can /sync newly created room
 Can add account data
+Can add account data to room
 Can add tag
+Can claim one time key using POST
+Can claim remote one time key using POST
 Can create filter
+Can deactivate account
 Can delete canonical alias
+Can download file 'ascii'
+Can download file 'name with spaces'
+Can download file 'name;with;semicolons'
+Can download filter
+Can download specifying a different ASCII file name
+Can download specifying a different Unicode file name
+Can download with Unicode file name locally
+Can download with Unicode file name over federation
+Can download without a file name locally
+Can download without a file name over federation
+Can forget room you've been kicked from
+Can get 'm.room.name' state for a departed room (SPEC-216)
+Can get account data without syncing
+Can get remote public room list
+Can get room account data without syncing
+Can get rooms/{roomId}/members
+Can get rooms/{roomId}/members for a departed room (SPEC-216)
+Can get rooms/{roomId}/state for a departed room (SPEC-216)
 Can invite users to invite-only rooms
 Can list tags for a room
 Can logout all devices
 Can logout current device
+Can paginate public room list
+Can pass a JSON filter as a query parameter
+Can query device keys using POST
+Can query remote device keys using POST
+Can query specific device keys using POST
 Can re-join room if re-invited
 Can read configuration endpoint
+Can receive redactions from regular users over federation in room version 1
+Can receive redactions from regular users over federation in room version 2
+Can receive redactions from regular users over federation in room version 3
+Can receive redactions from regular users over federation in room version 4
+Can receive redactions from regular users over federation in room version 5
+Can receive redactions from regular users over federation in room version 6
 Can recv a device message using /sync
+Can recv a device message using /sync 
+Can recv device messages over federation 
 Can recv device messages until they are acknowledged
+Can recv device messages until they are acknowledged 
+Can reject invites over federation for rooms with version 1
+Can reject invites over federation for rooms with version 2
+Can reject invites over federation for rooms with version 3
+Can reject invites over federation for rooms with version 4
+Can reject invites over federation for rooms with version 5
+Can reject invites over federation for rooms with version 6
 Can remove tag
+Can search public room list
+Can send a message directly to a device using PUT /sendToDevice
 Can send a message directly to a device using PUT /sendToDevice 
 Can send a to-device message to two users which both receive it using /sync
+Can send image in room message
+Can send messages with a wildcard device id
 Can send messages with a wildcard device id 
 Can send messages with a wildcard device id to two devices
+Can send messages with a wildcard device id to two devices 
 Can sync
+Can sync a joined room
+Can sync a room with a message with a transaction id
+Can sync a room with a single message
+Can upload device keys
 Can upload with ASCII file name
 Can upload with Unicode file name
 Can upload without a file name
+Can't deactivate account with wrong password
+Can't forget room you're still in
+Changes to state are included in an gapped incremental sync
+Changes to state are included in an incremental sync
 Changing the actions of an unknown default rule fails with 404
 Changing the actions of an unknown rule fails with 404
 Checking local federation server
+Creators can delete alias
 Current state appears in timeline in private history
 Current state appears in timeline in private history with many messages before
+DELETE /device/{deviceId}
+DELETE /device/{deviceId} requires UI auth user to match device owner
+DELETE /device/{deviceId} with no body gives a 401
 Deleted tags appear in an incremental v2 /sync
 Deleting a non-existent alias should return a 404
+Device list doesn't change if remote server is down
+Device messages over federation wake up /sync 
+Device messages wake up /sync
 Device messages wake up /sync 
 Device messages with the same txn_id are deduplicated
+Device messages with the same txn_id are deduplicated 
+Enabling an unknown default rule fails with 404
+Event size limits
+Event with an invalid signature in the send_join response should not cause room join to fail
 Events come down the correct room
+Events whose auth_events are in the wrong room do not mess up the room state
+Existing members see new members' join events
+Federation key API allows unsigned requests for keys
+Federation key API can act as a notary server via a GET request
+Federation key API can act as a notary server via a POST request
+Federation rejects inbound events where the prev_events cannot be found
+Fetching eventstream a second time doesn't yield the message again
+Forgetting room does not show up in v2 /sync
+Full state sync includes joined rooms
+GET /capabilities is present and well formed for registered user 
 GET /device/{deviceId}
 GET /device/{deviceId} gives a 404 for unknown devices
 GET /devices
+GET /directory/room/:room_alias yields room ID
+GET /events initially
 GET /events with negative 'limit'
 GET /events with non-numeric 'limit'
 GET /events with non-numeric 'timeout'
+GET /initialSync initially
 GET /joined_rooms lists newly-created room
 GET /login yields a set of flows
 GET /media/r0/download can fetch the value again
 GET /profile/:user_id/avatar_url publicly accessible
 GET /profile/:user_id/displayname publicly accessible
+GET /publicRooms includes avatar URLs
 GET /publicRooms lists newly-created room
+GET /publicRooms lists rooms
+GET /r0/capabilities is not public
 GET /register yields a set of flows
+GET /rooms/:room_id/joined_members fetches my membership
+GET /rooms/:room_id/messages returns a message
 GET /rooms/:room_id/state fetches entire room state
 GET /rooms/:room_id/state/m.room.member/:user_id fetches my membership
+GET /rooms/:room_id/state/m.room.member/:user_id?format=event fetches my membership event
+GET /rooms/:room_id/state/m.room.name gets name
+GET /rooms/:room_id/state/m.room.power_levels can fetch levels
+GET /rooms/:room_id/state/m.room.power_levels fetches powerlevels
+GET /rooms/:room_id/state/m.room.topic gets topic
+Get left notifs for other users in sync and /keys/changes when user leaves
+Getting messages going forward is limited for a departed room (SPEC-216)
 Getting push rules doesn't corrupt the cache SYN-390
+Getting state IDs checks the events requested belong to the room
+Getting state checks the events requested belong to the room
+Ghost user must register before joining room
+Guest non-joined user cannot call /events on default room
+Guest non-joined user cannot call /events on invited room
+Guest non-joined user cannot call /events on joined room
+Guest non-joined user cannot call /events on shared room
+Guest non-joined users can get individual state for world_readable rooms
+Guest non-joined users can get individual state for world_readable rooms after leaving
+Guest non-joined users can get state for world_readable rooms
+Guest non-joined users cannot room initalSync for non-world_readable rooms
+Guest non-joined users cannot send messages to guest_access rooms if not joined
+Guest user can set display names
+Guest user cannot call /events globally
+Guest user cannot upgrade other users
+Guest users can accept invites to private rooms over federation
+Guest users can join guest_access rooms
+Guest users can send messages to guest_access rooms if joined
+If a device list update goes missing, the server resyncs on the next one
+If remote user leaves room we no longer receive device updates
+If remote user leaves room, changes device and rejoins we see update in /keys/changes
+If remote user leaves room, changes device and rejoins we see update in sync
+Inbound /make_join rejects attempts to join rooms where all users have left
+Inbound /v1/make_join rejects remote attempts to join local users to rooms
+Inbound /v1/send_join rejects incorrectly-signed joins
+Inbound /v1/send_join rejects joins from other servers
+Inbound /v1/send_leave rejects leaves from other servers
+Inbound federation accepts a second soft-failed event
+Inbound federation accepts attempts to join v2 rooms from servers with support
+Inbound federation can backfill events
+Inbound federation can get public room list
+Inbound federation can get state for a room
+Inbound federation can get state_ids for a room
+Inbound federation can query profile data
+Inbound federation can query room alias directory
+Inbound federation can receive events
+Inbound federation can receive invites via v1 API
+Inbound federation can receive invites via v2 API
+Inbound federation can receive redacted events
+Inbound federation can receive v1 /send_join
+Inbound federation can receive v2 /send_join
+Inbound federation can return events
+Inbound federation can return missing events for invite visibility
+Inbound federation can return missing events for world_readable visibility
+Inbound federation correctly soft fails events
+Inbound federation of state requires event_id as a mandatory paramater
+Inbound federation of state_ids requires event_id as a mandatory paramater
+Inbound federation rejects attempts to join v1 rooms from servers without v1 support
+Inbound federation rejects attempts to join v2 rooms from servers lacking version support
+Inbound federation rejects attempts to join v2 rooms from servers only supporting v1
+Inbound federation rejects invite rejections which include invalid JSON for room version 6
+Inbound federation rejects invites which include invalid JSON for room version 6
+Inbound federation rejects receipts from wrong remote
+Inbound federation rejects remote attempts to join local users to rooms
+Inbound federation rejects remote attempts to kick local users to rooms
+Inbound federation rejects typing notifications from wrong remote
+Inbound: send_join rejects invalid JSON for room version 6
+Invalid JSON floats
+Invalid JSON integers
+Invalid JSON special values
+Invited user can reject invite
+Invited user can reject invite over federation
+Invited user can reject invite over federation for empty room
+Invited user can reject invite over federation several times
+Invited user can see room metadata
+Inviting an AS-hosted user asks the AS server
+Lazy loading parameters in the filter are strictly boolean
+Left rooms appear in the leave section of full state sync
+Local delete device changes appear in v2 /sync
+Local device key changes appear in /keys/changes
+Local device key changes appear in v2 /sync
+Local device key changes get to remote servers
+Local new device changes appear in v2 /sync
+Local non-members don't see posted message events
+Local room members can get room messages
+Local room members see posted message events
+Local update device changes appear in v2 /sync
+Local users can peek by room alias
+Local users can peek into world_readable rooms by room ID
+Message history can be paginated
+Message history can be paginated over federation
+Name/topic keys are correct
+New account data appears in incremental v2 /sync
+New read receipts appear in incremental v2 /sync
+New room members see their own join event
+New users appear in /keys/changes
+Newly banned rooms appear in the leave section of incremental sync
+Newly joined room is included in an incremental sync
+Newly joined room is included in an incremental sync after invite
+Newly left rooms appear in the leave section of gapped sync
+Newly left rooms appear in the leave section of incremental sync
 Newly updated tags appear in an incremental v2 /sync
+Non-numeric ports in server names are rejected
+Outbound federation can backfill events
+Outbound federation can query profile data
+Outbound federation can query room alias directory
+Outbound federation can query v1 /send_join
+Outbound federation can query v2 /send_join
+Outbound federation can request missing events
+Outbound federation can send events
+Outbound federation can send invites via v1 API
+Outbound federation can send invites via v2 API
+Outbound federation can send room-join requests
+Outbound federation correctly handles unsupported room versions
+Outbound federation passes make_join failures through to the client
+Outbound federation rejects backfill containing invalid JSON for events in room version 6
+Outbound federation rejects m.room.create events with an unknown room version
+Outbound federation rejects send_join responses with no m.room.create event
+Outbound federation sends receipts
+Outbound federation will ignore a missing event with bad JSON for room version 6
+POST /createRoom creates a room with the given version
+POST /createRoom ignores attempts to set the room version via creation_content
 POST /createRoom makes a private room
 POST /createRoom makes a private room with invites
+POST /createRoom makes a public room
+POST /createRoom makes a room with a name
+POST /createRoom makes a room with a topic
+POST /createRoom rejects attempts to create rooms with numeric versions
+POST /createRoom rejects attempts to create rooms with unknown versions
+POST /createRoom with creation content
+POST /join/:room_alias can join a room
+POST /join/:room_alias can join a room with custom content
 POST /join/:room_id can join a room
+POST /join/:room_id can join a room with custom content
 POST /login as non-existing user is rejected
 POST /login can log in as a user
 POST /login can log in as a user with just the local part of the id
 POST /login returns the same device_id as that in the request
 POST /login wrong password is rejected
 POST /media/r0/upload can create an upload
+POST /redact disallows redaction of event in different room
+POST /register allows registration of usernames with '-'
+POST /register allows registration of usernames with '.'
+POST /register allows registration of usernames with '/'
+POST /register allows registration of usernames with '3'
+POST /register allows registration of usernames with '='
+POST /register allows registration of usernames with '_'
+POST /register allows registration of usernames with 'q'
 POST /register can create a user
 POST /register downcases capitals in usernames
 POST /register rejects registration of usernames with '!'
@@ -88,41 +352,161 @@ POST /rooms/:room_id/ban can ban a user
 POST /rooms/:room_id/invite can send an invite
 POST /rooms/:room_id/join can join a room
 POST /rooms/:room_id/leave can leave a room
+POST /rooms/:room_id/read_markers can create read marker
+POST /rooms/:room_id/receipt can create receipts
+POST /rooms/:room_id/redact/:event_id as original message sender redacts message
+POST /rooms/:room_id/redact/:event_id as power user redacts message
+POST /rooms/:room_id/redact/:event_id as random user does not redact message
+POST /rooms/:room_id/send/:event_type sends a message
 POST /rooms/:room_id/state/m.room.name sets name
 POST /rooms/:room_id/state/m.room.topic sets topic
 POST /rooms/:room_id/upgrade can upgrade a room version
+POST rejects invalid utf-8 in JSON
 POSTed media can be thumbnailed
 PUT /device/{deviceId} gives a 404 for unknown devices
 PUT /device/{deviceId} updates device fields
 PUT /directory/room/:room_alias creates alias
 PUT /profile/:user_id/avatar_url sets my avatar
 PUT /profile/:user_id/displayname sets my name
+PUT /rooms/:room_id/send/:event_type/:txn_id deduplicates the same txn id
+PUT /rooms/:room_id/send/:event_type/:txn_id sends a message
 PUT /rooms/:room_id/state/m.room.power_levels can set levels
+PUT /rooms/:room_id/typing/:user_id sets typing notification
 PUT power_levels should not explode if the old power levels were empty
+Peeked rooms only turn up in the sync for the device who peeked them
+Previously left rooms don't appear in the leave section of sync
 Push rules come down in an initial /sync
 Read markers appear in incremental v2 /sync
 Read markers appear in initial v2 /sync
 Read markers can be updated
+Read receipts appear in initial v2 /sync
+Real non-joined user cannot call /events on default room
+Real non-joined user cannot call /events on invited room
+Real non-joined user cannot call /events on joined room
+Real non-joined user cannot call /events on shared room
+Real non-joined users can get individual state for world_readable rooms
+Real non-joined users can get individual state for world_readable rooms after leaving
+Real non-joined users can get state for world_readable rooms
+Real non-joined users cannot room initalSync for non-world_readable rooms
+Real non-joined users cannot send messages to guest_access rooms if not joined
+Receipts must be m.read
+Redaction of a redaction redacts the redaction reason
 Regular users can add and delete aliases in the default room configuration
+Regular users can add and delete aliases when m.room.aliases is restricted
+Regular users cannot create room aliases within the AS namespace
+Regular users cannot register within the AS namespace
+Remote media can be thumbnailed
+Remote room alias queries can handle Unicode
+Remote room members also see posted message events
+Remote room members can get room messages
+Remote user can backfill in a room with version 1
+Remote user can backfill in a room with version 2
+Remote user can backfill in a room with version 3
+Remote user can backfill in a room with version 4
+Remote user can backfill in a room with version 5
+Remote user can backfill in a room with version 6
+Remote users can join room by alias
+Remote users may not join unfederated rooms
+Request to logout with invalid an access token is rejected
+Request to logout without an access token is rejected
+Room aliases can contain Unicode
 Room creation reports m.room.create to myself
 Room creation reports m.room.member to myself
+Room members can join a room with an overridden displayname
+Room members can override their displayname on a room-specific basis
+Room state at a rejected message event is the same as its predecessor
+Room state at a rejected state event is the same as its predecessor
 Rooms a user is invited to appear in an incremental sync
 Rooms a user is invited to appear in an initial sync
+Rooms can be created with an initial invite list (SYN-205)
+Server correctly handles incoming m.device_list_update
+Server correctly handles transactions that break edu limits
+Server correctly resyncs when client query keys and there is no remote cache
+Server correctly resyncs when server leaves and rejoins a room
+Server rejects invalid JSON in a version 6 room
 Setting room topic reports m.room.topic to myself
+Should not be able to take over the room by pretending there is no PL event
 Should reject keys claiming to belong to a different user
+State from remote users is included in the state in the initial sync
+State from remote users is included in the timeline in an incremental sync
+State is included in the timeline in the initial sync
+Sync can be polled for updates
+Sync is woken up for leaves
+Syncing a new room with a large timeline limit isn't limited
 Tags appear in an initial v2 /sync
 Trying to get push rules with unknown rule_id fails with 404
+Typing can be explicitly stopped
 Typing events appear in gapped sync
 Typing events appear in incremental sync
 Typing events appear in initial sync
+Typing notification sent to local room members
+Typing notifications also sent to remote room members
+Typing notifications don't leak
 Uninvited users cannot join the room
+Unprivileged users can set m.room.topic if it only needs level 0
 User appears in user directory
+User can create and send/receive messages in a room with version 1
+User can create and send/receive messages in a room with version 2
+User can create and send/receive messages in a room with version 3
+User can create and send/receive messages in a room with version 4
+User can create and send/receive messages in a room with version 5
+User can create and send/receive messages in a room with version 6
+User can invite local user to room with version 1
+User can invite local user to room with version 2
+User can invite local user to room with version 3
+User can invite local user to room with version 4
+User can invite local user to room with version 5
+User can invite local user to room with version 6
+User can invite remote user to room with version 1
+User can invite remote user to room with version 2
+User can invite remote user to room with version 3
+User can invite remote user to room with version 4
+User can invite remote user to room with version 5
+User can invite remote user to room with version 6
 User directory correctly update on display name change
 User in dir while user still shares private rooms
 User in shared private room does appear in user directory
 User is offline if they set_presence=offline in their sync
+User signups are forbidden from starting with '_'
+Users can't delete other's aliases
+Users cannot invite a user that is already in the room
+Users cannot invite themselves to a room
+Users cannot kick users from a room they are not in
+Users cannot kick users who have already left a room
+Users cannot set ban powerlevel higher than their own
+Users cannot set kick powerlevel higher than their own
+Users cannot set notifications powerlevel higher than their own
+Users cannot set redact powerlevel higher than their own
+Users receive device_list updates for their own devices
 Users with sufficient power-level can delete other's aliases
 Version responds 200 OK with valid structure
+We can't peek into rooms with invited history_visibility
+We can't peek into rooms with joined history_visibility
+We can't peek into rooms with shared history_visibility
+We don't send redundant membership state across incremental syncs by default
 We should see our own leave event when rejecting an invite, even if history_visibility is restricted (riot-web/3462)
+We should see our own leave event, even if history_visibility is restricted (SYN-662)
+Wildcard device messages over federation wake up /sync 
 Wildcard device messages wake up /sync
+Wildcard device messages wake up /sync 
+avatar_url updates affect room member events
+displayname updates affect room member events
+local user can join room with version 1
+local user can join room with version 2
+local user can join room with version 3
+local user can join room with version 4
+local user can join room with version 5
+local user can join room with version 6
+m.room.history_visibility == "joined" allows/forbids appropriately for Guest users
+m.room.history_visibility == "joined" allows/forbids appropriately for Real users
+m.room.history_visibility == "world_readable" allows/forbids appropriately for Guest users
+m.room.history_visibility == "world_readable" allows/forbids appropriately for Real users
 query for user with no keys returns empty key dict
+remote user can join room with version 1
+remote user can join room with version 2
+remote user can join room with version 3
+remote user can join room with version 4
+remote user can join room with version 5
+remote user can join room with version 6
+setting 'm.room.name' respects room powerlevel
+setting 'm.room.power_levels' respects room powerlevel