update libraries

Resolves #33

Reviewed-on: lavina/lavina#51

.gitea/workflows/test-pr.yml

@@ -12,7 +12,7 @@ jobs:
       uses: https://github.com/actions-rs/cargo@v1
       with:
         command: fmt
-        args: "--check -p mgmt-api -p lavina-core -p projection-irc -p projection-xmpp -p sasl"
+        args: "--check --all"
     - name: cargo check
       uses: https://github.com/actions-rs/cargo@v1
       with:

.pre-commit-config.yaml

@@ -0,0 +1,21 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-toml
+      - id: end-of-file-fixer
+      - id: fix-byte-order-marker
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+
+  - repo: local
+    hooks:
+      - id: fmt
+        name: fmt
+        description: Format
+        entry: cargo fmt
+        language: system
+        args:
+          - --all
+        types: [ rust ]
+        pass_filenames: false

.run/Run lavina.run.xml

@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run lavina" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="run --package lavina --bin lavina -- --config config.toml" />
+    <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <envs>
+      <env name="RUST_LOG" value="debug" />
+    </envs>
+    <option name="emulateTerminal" value="true" />
+    <option name="channel" value="DEFAULT" />
+    <option name="requiredFeatures" value="true" />
+    <option name="allFeatures" value="false" />
+    <option name="withSudo" value="false" />
+    <option name="buildTarget" value="REMOTE" />
+    <option name="backtrace" value="FULL" />
+    <option name="isRedirectInput" value="false" />
+    <option name="redirectInputPath" value="" />
+    <method v="2">
+      <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
+    </method>
+  </configuration>
+</component>

Cargo.toml

@@ -18,8 +18,8 @@ assert_matches = "1.5.0"
 tokio = { version = "1.24.1", features = ["full"] } # async runtime
 futures-util = "0.3.25"
 anyhow = "1.0.68" # error utils
-nonempty = "0.8.1"
-quick-xml = { version = "0.30.0", features = ["async-tokio"] }
+nonempty = "0.10.0"
+quick-xml = { version = "0.31.0", features = ["async-tokio"] }
 lazy_static = "1.4.0"
 regex = "1.7.1"
 derive_more = "0.99.17"
@@ -27,7 +27,7 @@ clap = { version = "4.4.4", features = ["derive"] }
 serde = { version = "1.0.152", features = ["rc", "serde_derive"] }
 tracing = "0.1.37" # logging & tracing api
 prometheus = { version = "0.13.3", default-features = false }
-base64 = "0.21.3"
+base64 = "0.22.0"
 lavina-core = { path = "crates/lavina-core" }
 tracing-subscriber = "0.3.16"
 sasl = { path = "crates/sasl" }
@@ -62,4 +62,4 @@ clap.workspace = true
 [dev-dependencies]
 assert_matches.workspace = true
 regex = "1.7.1"
-reqwest = { version = "0.11", default-features = false }
+reqwest = { version = "0.12.0", default-features = false }

config.toml

@@ -9,6 +9,7 @@ server_name = "irc.localhost"
 listen_on = "127.0.0.1:5222"
 cert = "./certs/xmpp.pem"
 key = "./certs/xmpp.key"
+hostname = "localhost"
 
 [storage]
 db_path = "db.sqlite"

crates/lavina-core/Cargo.toml

@@ -5,8 +5,9 @@ version.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-sqlx = { version = "0.7.0-alpha.2", features = ["sqlite", "migrate"] }
+sqlx = { version = "0.7.4", features = ["sqlite", "migrate"] }
 serde.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 prometheus.workspace = true
+chrono = "0.4.37"

crates/lavina-core/migrations/2_created_at_for_messages.sql

@@ -0,0 +1 @@
+alter table messages add column created_at text;

crates/lavina-core/src/player.rs

@@ -7,19 +7,16 @@
 //!
 //! A player actor is a serial handler of commands from a single player. It is preferable to run all per-player validations in the player actor,
 //! so that they don't overload the room actor.
-use std::{
-    collections::{HashMap, HashSet},
-    sync::{Arc, RwLock},
-};
+use std::collections::{HashMap, HashSet};
+use std::sync::Arc;
 
 use prometheus::{IntGauge, Registry as MetricsRegistry};
 use serde::Serialize;
-use tokio::{
-    sync::mpsc::{channel, Receiver, Sender},
-    task::JoinHandle,
-};
+use tokio::sync::mpsc::{channel, Receiver, Sender};
+use tokio::sync::RwLock;
 
 use crate::prelude::*;
+use crate::repo::Storage;
 use crate::room::{RoomHandle, RoomId, RoomInfo, RoomRegistry};
 use crate::table::{AnonTable, Key as AnonKey};
 
@@ -45,58 +42,65 @@ impl PlayerId {
     }
 }
 
+/// Node-local identifier of a connection. It is used to address a connection within a player actor.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ConnectionId(pub AnonKey);
 
+/// Representation of an authenticated client connection.
+/// The public API available to projections through which all client actions are executed.
+///
+/// The connection is used to send commands to the player actor and to receive updates that might be sent to the client.
 pub struct PlayerConnection {
     pub connection_id: ConnectionId,
     pub receiver: Receiver<Updates>,
     player_handle: PlayerHandle,
 }
 impl PlayerConnection {
+    /// Handled in [Player::send_message].
     pub async fn send_message(&mut self, room_id: RoomId, body: Str) -> Result<()> {
-        self.player_handle
-            .send_message(room_id, self.connection_id.clone(), body)
-            .await
+        let (promise, deferred) = oneshot();
+        let cmd = ClientCommand::SendMessage { room_id, body, promise };
+        self.player_handle.send(ActorCommand::ClientCommand(cmd, self.connection_id.clone())).await;
+        Ok(deferred.await?)
     }
 
+    /// Handled in [Player::join_room].
     pub async fn join_room(&mut self, room_id: RoomId) -> Result<JoinResult> {
-        self.player_handle.join_room(room_id, self.connection_id.clone()).await
+        let (promise, deferred) = oneshot();
+        let cmd = ClientCommand::JoinRoom { room_id, promise };
+        self.player_handle.send(ActorCommand::ClientCommand(cmd, self.connection_id.clone())).await;
+        Ok(deferred.await?)
     }
 
+    /// Handled in [Player::change_topic].
     pub async fn change_topic(&mut self, room_id: RoomId, new_topic: Str) -> Result<()> {
         let (promise, deferred) = oneshot();
-        let cmd = Cmd::ChangeTopic {
+        let cmd = ClientCommand::ChangeTopic {
             room_id,
             new_topic,
             promise,
         };
-        self.player_handle
-            .send(PlayerCommand::Cmd(cmd, self.connection_id.clone()))
-            .await;
+        self.player_handle.send(ActorCommand::ClientCommand(cmd, self.connection_id.clone())).await;
         Ok(deferred.await?)
     }
 
+    /// Handled in [Player::leave_room].
     pub async fn leave_room(&mut self, room_id: RoomId) -> Result<()> {
         let (promise, deferred) = oneshot();
-        self.player_handle
-            .send(PlayerCommand::Cmd(
-                Cmd::LeaveRoom { room_id, promise },
-                self.connection_id.clone(),
-            ))
-            .await;
+        let cmd = ClientCommand::LeaveRoom { room_id, promise };
+        self.player_handle.send(ActorCommand::ClientCommand(cmd, self.connection_id.clone())).await;
         Ok(deferred.await?)
     }
 
     pub async fn terminate(self) {
-        self.player_handle
-            .send(PlayerCommand::TerminateConnection(self.connection_id))
-            .await;
+        self.player_handle.send(ActorCommand::TerminateConnection(self.connection_id)).await;
     }
 
+    /// Handled in [Player::get_rooms].
     pub async fn get_rooms(&self) -> Result<Vec<RoomInfo>> {
         let (promise, deferred) = oneshot();
-        self.player_handle.send(PlayerCommand::GetRooms(promise)).await;
+        let cmd = ClientCommand::GetRooms { promise };
+        self.player_handle.send(ActorCommand::ClientCommand(cmd, self.connection_id.clone())).await;
         Ok(deferred.await?)
     }
 }
@@ -104,13 +108,13 @@ impl PlayerConnection {
 /// Handle to a player actor.
 #[derive(Clone)]
 pub struct PlayerHandle {
-    tx: Sender<PlayerCommand>,
+    tx: Sender<ActorCommand>,
 }
 impl PlayerHandle {
     pub async fn subscribe(&self) -> PlayerConnection {
         let (sender, receiver) = channel(32);
         let (promise, deferred) = oneshot();
-        let cmd = PlayerCommand::AddConnection { sender, promise };
+        let cmd = ActorCommand::AddConnection { sender, promise };
         let _ = self.tx.send(cmd).await;
         let connection_id = deferred.await.unwrap();
         PlayerConnection {
@@ -120,45 +124,34 @@ impl PlayerHandle {
         }
     }
 
-    pub async fn send_message(&self, room_id: RoomId, connection_id: ConnectionId, body: Str) -> Result<()> {
-        let (promise, deferred) = oneshot();
-        let cmd = Cmd::SendMessage { room_id, body, promise };
-        let _ = self.tx.send(PlayerCommand::Cmd(cmd, connection_id)).await;
-        Ok(deferred.await?)
-    }
-
-    pub async fn join_room(&self, room_id: RoomId, connection_id: ConnectionId) -> Result<JoinResult> {
-        let (promise, deferred) = oneshot();
-        let cmd = Cmd::JoinRoom { room_id, promise };
-        let _ = self.tx.send(PlayerCommand::Cmd(cmd, connection_id)).await;
-        Ok(deferred.await?)
-    }
-
-    async fn send(&self, command: PlayerCommand) {
+    async fn send(&self, command: ActorCommand) {
+        // TODO either handle the error or doc why it is safe to ignore
         let _ = self.tx.send(command).await;
     }
 
     pub async fn update(&self, update: Updates) {
-        self.send(PlayerCommand::Update(update)).await;
+        self.send(ActorCommand::Update(update)).await;
     }
 }
 
-enum PlayerCommand {
-    /** Commands from connections */
+/// Messages sent to the player actor.
+enum ActorCommand {
+    /// Establish a new connection.
     AddConnection {
         sender: Sender<Updates>,
         promise: Promise<ConnectionId>,
     },
+    /// Terminate an existing connection.
     TerminateConnection(ConnectionId),
-    Cmd(Cmd, ConnectionId),
-    /// Query - responds with a list of rooms the player is a member of.
-    GetRooms(Promise<Vec<RoomInfo>>),
-    /** Events from rooms */
+    /// Player-issued command.
+    ClientCommand(ClientCommand, ConnectionId),
+    /// Update which is sent from a room the player is member of.
     Update(Updates),
     Stop,
 }
 
-pub enum Cmd {
+/// Client-issued command sent to the player actor. The actor will respond with by fulfilling the promise.
+pub enum ClientCommand {
     JoinRoom {
         room_id: RoomId,
         promise: Promise<JoinResult>,
@@ -177,6 +170,9 @@ pub enum Cmd {
         new_topic: Str,
         promise: Promise<()>,
     },
+    GetRooms {
+        promise: Promise<Vec<RoomInfo>>,
+    },
 }
 
 pub enum JoinResult {
@@ -212,38 +208,43 @@ pub enum Updates {
 #[derive(Clone)]
 pub struct PlayerRegistry(Arc<RwLock<PlayerRegistryInner>>);
 impl PlayerRegistry {
-    pub fn empty(room_registry: RoomRegistry, metrics: &mut MetricsRegistry) -> Result<PlayerRegistry> {
+    pub fn empty(
+        room_registry: RoomRegistry,
+        storage: Storage,
+        metrics: &mut MetricsRegistry,
+    ) -> Result<PlayerRegistry> {
         let metric_active_players = IntGauge::new("chat_players_active", "Number of alive player actors")?;
         metrics.register(Box::new(metric_active_players.clone()))?;
         let inner = PlayerRegistryInner {
             room_registry,
+            storage,
             players: HashMap::new(),
             metric_active_players,
         };
         Ok(PlayerRegistry(Arc::new(RwLock::new(inner))))
     }
 
-    pub async fn get_or_create_player(&mut self, id: PlayerId) -> PlayerHandle {
-        let mut inner = self.0.write().unwrap();
-        if let Some((handle, _)) = inner.players.get(&id) {
+    pub async fn get_or_launch_player(&mut self, id: &PlayerId) -> PlayerHandle {
+        let mut inner = self.0.write().await;
+        if let Some((handle, _)) = inner.players.get(id) {
             handle.clone()
         } else {
-            let (handle, fiber) = Player::launch(id.clone(), inner.room_registry.clone());
-            inner.players.insert(id, (handle.clone(), fiber));
+            let (handle, fiber) = Player::launch(id.clone(), inner.room_registry.clone(), inner.storage.clone()).await;
+            inner.players.insert(id.clone(), (handle.clone(), fiber));
             inner.metric_active_players.inc();
             handle
         }
     }
 
-    pub async fn connect_to_player(&mut self, id: PlayerId) -> PlayerConnection {
-        let player_handle = self.get_or_create_player(id).await;
+    pub async fn connect_to_player(&mut self, id: &PlayerId) -> PlayerConnection {
+        let player_handle = self.get_or_launch_player(id).await;
         player_handle.subscribe().await
     }
 
     pub async fn shutdown_all(&mut self) -> Result<()> {
-        let mut inner = self.0.write().unwrap();
+        let mut inner = self.0.write().await;
         for (i, (k, j)) in inner.players.drain() {
-            k.send(PlayerCommand::Stop).await;
+            k.send(ActorCommand::Stop).await;
             drop(k);
             j.await?;
             log::debug!("Player stopped #{i:?}")
@@ -256,6 +257,8 @@ impl PlayerRegistry {
 /// The player registry state representation.
 struct PlayerRegistryInner {
     room_registry: RoomRegistry,
+    storage: Storage,
+    /// Active player actors.
     players: HashMap<PlayerId, (PlayerHandle, JoinHandle<Player>)>,
     metric_active_players: IntGauge,
 }
@@ -263,152 +266,197 @@ struct PlayerRegistryInner {
 /// Player actor inner state representation.
 struct Player {
     player_id: PlayerId,
+    storage_id: u32,
     connections: AnonTable<Sender<Updates>>,
     my_rooms: HashMap<RoomId, RoomHandle>,
     banned_from: HashSet<RoomId>,
-    rx: Receiver<PlayerCommand>,
+    rx: Receiver<ActorCommand>,
     handle: PlayerHandle,
     rooms: RoomRegistry,
+    storage: Storage,
 }
 impl Player {
-    fn launch(player_id: PlayerId, rooms: RoomRegistry) -> (PlayerHandle, JoinHandle<Player>) {
+    async fn launch(player_id: PlayerId, rooms: RoomRegistry, storage: Storage) -> (PlayerHandle, JoinHandle<Player>) {
         let (tx, rx) = channel(32);
         let handle = PlayerHandle { tx };
         let handle_clone = handle.clone();
+        let storage_id = storage.retrieve_user_id_by_name(player_id.as_inner()).await.unwrap().unwrap();
         let player = Player {
             player_id,
+            storage_id,
+            // connections are empty when the actor is just started
             connections: AnonTable::new(),
+            // room handlers will be loaded later in the started task
             my_rooms: HashMap::new(),
-            banned_from: HashSet::from([RoomId::from("Empty").unwrap()]),
+            // TODO implement and load bans
+            banned_from: HashSet::new(),
             rx,
             handle,
             rooms,
+            storage,
         };
         let fiber = tokio::task::spawn(player.main_loop());
         (handle_clone, fiber)
     }
 
     async fn main_loop(mut self) -> Self {
+        let rooms = self.storage.get_rooms_of_a_user(self.storage_id).await.unwrap();
+        for room_id in rooms {
+            let room = self.rooms.get_room(&room_id).await;
+            if let Some(room) = room {
+                self.my_rooms.insert(room_id, room);
+            } else {
+                tracing::error!("Room #{room_id:?} not found");
+            }
+        }
         while let Some(cmd) = self.rx.recv().await {
             match cmd {
-                PlayerCommand::AddConnection { sender, promise } => {
+                ActorCommand::AddConnection { sender, promise } => {
                     let connection_id = self.connections.insert(sender);
                     if let Err(connection_id) = promise.send(ConnectionId(connection_id)) {
                         log::warn!("Connection {connection_id:?} terminated before finalization");
                         self.terminate_connection(connection_id);
                     }
                 }
-                PlayerCommand::TerminateConnection(connection_id) => {
+                ActorCommand::TerminateConnection(connection_id) => {
                     self.terminate_connection(connection_id);
                 }
-                PlayerCommand::GetRooms(promise) => {
-                    let mut response = vec![];
-                    for (_, handle) in &self.my_rooms {
-                        response.push(handle.get_room_info().await);
-                    }
-                    let _ = promise.send(response);
-                }
-                PlayerCommand::Update(update) => {
-                    log::info!(
-                        "Player received an update, broadcasting to {} connections",
-                        self.connections.len()
-                    );
-                    match update {
-                        Updates::BannedFrom(ref room_id) => {
-                            self.banned_from.insert(room_id.clone());
-                            self.my_rooms.remove(room_id);
-                        }
-                        _ => {}
-                    }
-                    for (_, connection) in &self.connections {
-                        let _ = connection.send(update.clone()).await;
-                    }
-                }
-                PlayerCommand::Cmd(cmd, connection_id) => self.handle_cmd(cmd, connection_id).await,
-                PlayerCommand::Stop => break,
+                ActorCommand::Update(update) => self.handle_update(update).await,
+                ActorCommand::ClientCommand(cmd, connection_id) => self.handle_cmd(cmd, connection_id).await,
+                ActorCommand::Stop => break,
             }
         }
         log::debug!("Shutting down player actor #{:?}", self.player_id);
         self
     }
 
+    /// Handle an incoming update by changing the internal state and broadcasting it to all connections if necessary.
+    async fn handle_update(&mut self, update: Updates) {
+        log::info!(
+            "Player received an update, broadcasting to {} connections",
+            self.connections.len()
+        );
+        match update {
+            Updates::BannedFrom(ref room_id) => {
+                self.banned_from.insert(room_id.clone());
+                self.my_rooms.remove(room_id);
+            }
+            _ => {}
+        }
+        for (_, connection) in &self.connections {
+            let _ = connection.send(update.clone()).await;
+        }
+    }
+
     fn terminate_connection(&mut self, connection_id: ConnectionId) {
         if let None = self.connections.pop(connection_id.0) {
             log::warn!("Connection {connection_id:?} already terminated");
         }
     }
 
-    async fn handle_cmd(&mut self, cmd: Cmd, connection_id: ConnectionId) {
+    /// Dispatches a client command to the appropriate handler.
+    async fn handle_cmd(&mut self, cmd: ClientCommand, connection_id: ConnectionId) {
         match cmd {
-            Cmd::JoinRoom { room_id, promise } => {
-                if self.banned_from.contains(&room_id) {
-                    let _ = promise.send(JoinResult::Banned);
-                    return;
-                }
-
-                let room = match self.rooms.get_or_create_room(room_id.clone()).await {
-                    Ok(room) => room,
-                    Err(e) => {
-                        log::error!("Failed to get or create room: {e}");
-                        return;
-                    }
-                };
-                room.subscribe(self.player_id.clone(), self.handle.clone()).await;
-                self.my_rooms.insert(room_id.clone(), room.clone());
-                let room_info = room.get_room_info().await;
-                let _ = promise.send(JoinResult::Success(room_info));
-                let update = Updates::RoomJoined {
-                    room_id,
-                    new_member_id: self.player_id.clone(),
-                };
-                self.broadcast_update(update, connection_id).await;
+            ClientCommand::JoinRoom { room_id, promise } => {
+                let result = self.join_room(connection_id, room_id).await;
+                let _ = promise.send(result);
             }
-            Cmd::LeaveRoom { room_id, promise } => {
-                let room = self.my_rooms.remove(&room_id);
-                if let Some(room) = room {
-                    room.unsubscribe(&self.player_id).await;
-                    let room_info = room.get_room_info().await;
-                }
+            ClientCommand::LeaveRoom { room_id, promise } => {
+                self.leave_room(connection_id, room_id).await;
                 let _ = promise.send(());
-                let update = Updates::RoomLeft {
-                    room_id,
-                    former_member_id: self.player_id.clone(),
-                };
-                self.broadcast_update(update, connection_id).await;
             }
-            Cmd::SendMessage { room_id, body, promise } => {
-                let room = self.rooms.get_room(&room_id).await;
-                if let Some(room) = room {
-                    room.send_message(self.player_id.clone(), body.clone()).await;
-                } else {
-                    tracing::info!("no room found");
-                }
+            ClientCommand::SendMessage { room_id, body, promise } => {
+                self.send_message(connection_id, room_id, body).await;
                 let _ = promise.send(());
-                let update = Updates::NewMessage {
-                    room_id,
-                    author_id: self.player_id.clone(),
-                    body,
-                };
-                self.broadcast_update(update, connection_id).await;
             }
-            Cmd::ChangeTopic {
+            ClientCommand::ChangeTopic {
                 room_id,
                 new_topic,
                 promise,
             } => {
-                let room = self.rooms.get_room(&room_id).await;
-                if let Some(mut room) = room {
-                    room.set_topic(self.player_id.clone(), new_topic.clone()).await;
-                } else {
-                    tracing::info!("no room found");
-                }
+                self.change_topic(connection_id, room_id, new_topic).await;
                 let _ = promise.send(());
-                let update = Updates::RoomTopicChanged { room_id, new_topic };
-                self.broadcast_update(update, connection_id).await;
+            }
+            ClientCommand::GetRooms { promise } => {
+                let result = self.get_rooms().await;
+                let _ = promise.send(result);
             }
         }
     }
 
+    async fn join_room(&mut self, connection_id: ConnectionId, room_id: RoomId) -> JoinResult {
+        if self.banned_from.contains(&room_id) {
+            return JoinResult::Banned;
+        }
+
+        let room = match self.rooms.get_or_create_room(room_id.clone()).await {
+            Ok(room) => room,
+            Err(e) => {
+                log::error!("Failed to get or create room: {e}");
+                todo!();
+            }
+        };
+        room.add_member(&self.player_id, self.storage_id).await;
+        room.subscribe(&self.player_id, self.handle.clone()).await;
+        self.my_rooms.insert(room_id.clone(), room.clone());
+        let room_info = room.get_room_info().await;
+        let update = Updates::RoomJoined {
+            room_id,
+            new_member_id: self.player_id.clone(),
+        };
+        self.broadcast_update(update, connection_id).await;
+        JoinResult::Success(room_info)
+    }
+
+    async fn leave_room(&mut self, connection_id: ConnectionId, room_id: RoomId) {
+        let room = self.my_rooms.remove(&room_id);
+        if let Some(room) = room {
+            room.unsubscribe(&self.player_id).await;
+            room.remove_member(&self.player_id, self.storage_id).await;
+        }
+        let update = Updates::RoomLeft {
+            room_id,
+            former_member_id: self.player_id.clone(),
+        };
+        self.broadcast_update(update, connection_id).await;
+    }
+
+    async fn send_message(&mut self, connection_id: ConnectionId, room_id: RoomId, body: Str) {
+        let Some(room) = self.my_rooms.get(&room_id) else {
+            tracing::info!("no room found");
+            return;
+        };
+        room.send_message(&self.player_id, body.clone()).await;
+        let update = Updates::NewMessage {
+            room_id,
+            author_id: self.player_id.clone(),
+            body,
+        };
+        self.broadcast_update(update, connection_id).await;
+    }
+
+    async fn change_topic(&mut self, connection_id: ConnectionId, room_id: RoomId, new_topic: Str) {
+        let Some(room) = self.my_rooms.get(&room_id) else {
+            tracing::info!("no room found");
+            return;
+        };
+        room.set_topic(&self.player_id, new_topic.clone()).await;
+        let update = Updates::RoomTopicChanged { room_id, new_topic };
+        self.broadcast_update(update, connection_id).await;
+    }
+
+    async fn get_rooms(&self) -> Vec<RoomInfo> {
+        let mut response = vec![];
+        for (_, handle) in &self.my_rooms {
+            response.push(handle.get_room_info().await);
+        }
+        response
+    }
+
+    /// Broadcasts an update to all connections except the one with the given id.
+    ///
+    /// This is called after handling a client command.
+    /// Sending the update to the connection which sent the command is handled by the connection itself.
     async fn broadcast_update(&self, update: Updates, except: ConnectionId) {
         for (a, b) in &self.connections {
             if ConnectionId(a) == except {

crates/lavina-core/src/repo/mod.rs

@@ -11,6 +11,9 @@ use tokio::sync::Mutex;
 
 use crate::prelude::*;
 
+mod room;
+mod user;
+
 #[derive(Deserialize, Debug, Clone)]
 pub struct StorageConfig {
     pub db_path: String,
@@ -48,7 +51,7 @@ impl Storage {
         Ok(res)
     }
 
-    pub async fn retrieve_room_by_name(&mut self, name: &str) -> Result<Option<StoredRoom>> {
+    pub async fn retrieve_room_by_name(&self, name: &str) -> Result<Option<StoredRoom>> {
         let mut executor = self.conn.lock().await;
         let res = sqlx::query_as(
             "select id, name, topic, message_count
@@ -87,14 +90,15 @@ impl Storage {
             return Err(anyhow!("No such user"));
         };
         sqlx::query(
-            "insert into messages(room_id, id, content, author_id)
-            values (?, ?, ?, ?);
+            "insert into messages(room_id, id, content, author_id, created_at)
+            values (?, ?, ?, ?, ?);
             update rooms set message_count = message_count + 1 where id = ?;",
         )
         .bind(room_id)
         .bind(id)
         .bind(content)
         .bind(author_id)
+        .bind(chrono::Utc::now().to_string())
         .bind(room_id)
         .execute(&mut *executor)
         .await?;

crates/lavina-core/src/repo/room.rs

@@ -0,0 +1,48 @@
+use anyhow::Result;
+
+use crate::repo::Storage;
+
+impl Storage {
+    pub async fn add_room_member(&self, room_id: u32, player_id: u32) -> Result<()> {
+        let mut executor = self.conn.lock().await;
+        sqlx::query(
+            "insert into memberships(user_id, room_id, status)
+            values (?, ?, 1);",
+        )
+        .bind(player_id)
+        .bind(room_id)
+        .execute(&mut *executor)
+        .await?;
+
+        Ok(())
+    }
+
+    pub async fn remove_room_member(&self, room_id: u32, player_id: u32) -> Result<()> {
+        let mut executor = self.conn.lock().await;
+        sqlx::query(
+            "delete from memberships
+            where user_id = ? and room_id = ?;",
+        )
+        .bind(player_id)
+        .bind(room_id)
+        .execute(&mut *executor)
+        .await?;
+
+        Ok(())
+    }
+
+    pub async fn set_room_topic(&mut self, id: u32, topic: &str) -> Result<()> {
+        let mut executor = self.conn.lock().await;
+        sqlx::query(
+            "update rooms
+            set topic = ?
+            where id = ?;",
+        )
+        .bind(topic)
+        .bind(id)
+        .fetch_optional(&mut *executor)
+        .await?;
+
+        Ok(())
+    }
+}

crates/lavina-core/src/repo/user.rs

@@ -0,0 +1,30 @@
+use anyhow::Result;
+
+use crate::repo::Storage;
+use crate::room::RoomId;
+
+impl Storage {
+    pub async fn retrieve_user_id_by_name(&self, name: &str) -> Result<Option<u32>> {
+        let mut executor = self.conn.lock().await;
+        let res: Option<(u32,)> = sqlx::query_as("select u.id from users u where u.name = ?;")
+            .bind(name)
+            .fetch_optional(&mut *executor)
+            .await?;
+
+        Ok(res.map(|(id,)| id))
+    }
+
+    pub async fn get_rooms_of_a_user(&self, user_id: u32) -> Result<Vec<RoomId>> {
+        let mut executor = self.conn.lock().await;
+        let res: Vec<(String,)> = sqlx::query_as(
+            "select r.name
+            from memberships m inner join rooms r on m.room_id = r.id
+            where m.user_id = ?;",
+        )
+        .bind(user_id)
+        .fetch_all(&mut *executor)
+        .await?;
+
+        res.into_iter().map(|(room_id,)| RoomId::from(room_id)).collect()
+    }
+}

crates/lavina-core/src/room.rs

@@ -1,4 +1,5 @@
 //! Domain of rooms — chats with multiple participants.
+use std::collections::HashSet;
 use std::{collections::HashMap, hash::Hash, sync::Arc};
 
 use prometheus::{IntGauge, Registry as MetricRegistry};
@@ -31,7 +32,7 @@ impl RoomId {
     }
 }
 
-/// Shared datastructure for storing metadata about rooms.
+/// Shared data structure for storing metadata about rooms.
 #[derive(Clone)]
 pub struct RoomRegistry(Arc<AsyncRwLock<RoomRegistryInner>>);
 impl RoomRegistry {
@@ -48,27 +49,9 @@ impl RoomRegistry {
 
     pub async fn get_or_create_room(&mut self, room_id: RoomId) -> Result<RoomHandle> {
         let mut inner = self.0.write().await;
-        if let Some(room_handle) = inner.rooms.get(&room_id) {
-            // room was already loaded into memory
-            log::debug!("Room {} was loaded already", &room_id.0);
+        if let Some(room_handle) = inner.get_or_load_room(&room_id).await? {
             Ok(room_handle.clone())
-        } else if let Some(stored_room) = inner.storage.retrieve_room_by_name(&*room_id.0).await? {
-            // room exists, but was not loaded
-            log::debug!("Loading room {}...", &room_id.0);
-            let room = Room {
-                storage_id: stored_room.id,
-                room_id: room_id.clone(),
-                subscriptions: HashMap::new(), // TODO figure out how to populate subscriptions
-                topic: stored_room.topic.into(),
-                message_count: stored_room.message_count,
-                storage: inner.storage.clone(),
-            };
-            let room_handle = RoomHandle(Arc::new(AsyncRwLock::new(room)));
-            inner.rooms.insert(room_id, room_handle.clone());
-            inner.metric_active_rooms.inc();
-            Ok(room_handle)
         } else {
-            // room does not exist, create it and load
             log::debug!("Creating room {}...", &room_id.0);
             let topic = "New room";
             let id = inner.storage.create_new_room(&*room_id.0, &*topic).await?;
@@ -76,6 +59,7 @@ impl RoomRegistry {
                 storage_id: id,
                 room_id: room_id.clone(),
                 subscriptions: HashMap::new(),
+                members: HashSet::new(),
                 topic: topic.into(),
                 message_count: 0,
                 storage: inner.storage.clone(),
@@ -88,9 +72,8 @@ impl RoomRegistry {
     }
 
     pub async fn get_room(&self, room_id: &RoomId) -> Option<RoomHandle> {
-        let inner = self.0.read().await;
-        let res = inner.rooms.get(room_id);
-        res.map(|r| r.clone())
+        let mut inner = self.0.write().await;
+        inner.get_or_load_room(room_id).await.unwrap()
     }
 
     pub async fn get_all_rooms(&self) -> Vec<RoomInfo> {
@@ -113,17 +96,66 @@ struct RoomRegistryInner {
     storage: Storage,
 }
 
+impl RoomRegistryInner {
+    async fn get_or_load_room(&mut self, room_id: &RoomId) -> Result<Option<RoomHandle>> {
+        if let Some(room_handle) = self.rooms.get(room_id) {
+            log::debug!("Room {} was loaded already", &room_id.0);
+            Ok(Some(room_handle.clone()))
+        } else if let Some(stored_room) = self.storage.retrieve_room_by_name(&*room_id.0).await? {
+            log::debug!("Loading room {}...", &room_id.0);
+            let room = Room {
+                storage_id: stored_room.id,
+                room_id: room_id.clone(),
+                subscriptions: HashMap::new(),
+                members: HashSet::new(), // TODO load members from storage
+                topic: stored_room.topic.into(),
+                message_count: stored_room.message_count,
+                storage: self.storage.clone(),
+            };
+            let room_handle = RoomHandle(Arc::new(AsyncRwLock::new(room)));
+            self.rooms.insert(room_id.clone(), room_handle.clone());
+            self.metric_active_rooms.inc();
+            Ok(Some(room_handle))
+        } else {
+            tracing::debug!("Room {} does not exist", &room_id.0);
+            Ok(None)
+        }
+    }
+}
+
 #[derive(Clone)]
 pub struct RoomHandle(Arc<AsyncRwLock<Room>>);
 impl RoomHandle {
-    pub async fn subscribe(&self, player_id: PlayerId, player_handle: PlayerHandle) {
+    pub async fn subscribe(&self, player_id: &PlayerId, player_handle: PlayerHandle) {
         let mut lock = self.0.write().await;
-        lock.add_subscriber(player_id, player_handle).await;
+        tracing::info!("Adding a subscriber to a room");
+        lock.subscriptions.insert(player_id.clone(), player_handle);
+    }
+
+    pub async fn add_member(&self, player_id: &PlayerId, player_storage_id: u32) {
+        let mut lock = self.0.write().await;
+        tracing::info!("Adding a new member to a room");
+        let room_storage_id = lock.storage_id;
+        lock.storage.add_room_member(room_storage_id, player_storage_id).await.unwrap();
+        lock.members.insert(player_id.clone());
+        let update = Updates::RoomJoined {
+            room_id: lock.room_id.clone(),
+            new_member_id: player_id.clone(),
+        };
+        lock.broadcast_update(update, player_id).await;
     }
 
     pub async fn unsubscribe(&self, player_id: &PlayerId) {
         let mut lock = self.0.write().await;
         lock.subscriptions.remove(player_id);
+    }
+
+    pub async fn remove_member(&self, player_id: &PlayerId, player_storage_id: u32) {
+        let mut lock = self.0.write().await;
+        tracing::info!("Removing a member from a room");
+        let room_storage_id = lock.storage_id;
+        lock.storage.remove_room_member(room_storage_id, player_storage_id).await.unwrap();
+        lock.members.remove(player_id);
         let update = Updates::RoomLeft {
             room_id: lock.room_id.clone(),
             former_member_id: player_id.clone(),
@@ -131,7 +163,7 @@ impl RoomHandle {
         lock.broadcast_update(update, player_id).await;
     }
 
-    pub async fn send_message(&self, player_id: PlayerId, body: Str) {
+    pub async fn send_message(&self, player_id: &PlayerId, body: Str) {
         let mut lock = self.0.write().await;
         let res = lock.send_message(player_id, body).await;
         if let Err(err) = res {
@@ -148,51 +180,51 @@ impl RoomHandle {
         }
     }
 
-    pub async fn set_topic(&mut self, changer_id: PlayerId, new_topic: Str) {
+    pub async fn set_topic(&self, changer_id: &PlayerId, new_topic: Str) {
         let mut lock = self.0.write().await;
+        let storage_id = lock.storage_id;
         lock.topic = new_topic.clone();
+        lock.storage.set_room_topic(storage_id, &new_topic).await.unwrap();
         let update = Updates::RoomTopicChanged {
             room_id: lock.room_id.clone(),
             new_topic: new_topic.clone(),
         };
-        lock.broadcast_update(update, &changer_id).await;
+        lock.broadcast_update(update, changer_id).await;
     }
 }
 
 struct Room {
+    /// The numeric node-local id of the room as it is stored in the database.
     storage_id: u32,
+    /// The cluster-global id of the room.
     room_id: RoomId,
+    /// Player actors on the local node which are subscribed to this room's updates.
     subscriptions: HashMap<PlayerId, PlayerHandle>,
+    /// Members of the room.
+    members: HashSet<PlayerId>,
+    /// The total number of messages. Used to calculate the id of the new message.
     message_count: u32,
     topic: Str,
     storage: Storage,
 }
 impl Room {
-    async fn add_subscriber(&mut self, player_id: PlayerId, player_handle: PlayerHandle) {
-        tracing::info!("Adding a subscriber to room");
-        self.subscriptions.insert(player_id.clone(), player_handle);
-        let update = Updates::RoomJoined {
-            room_id: self.room_id.clone(),
-            new_member_id: player_id.clone(),
-        };
-        self.broadcast_update(update, &player_id).await;
-    }
-
-    async fn send_message(&mut self, author_id: PlayerId, body: Str) -> Result<()> {
+    async fn send_message(&mut self, author_id: &PlayerId, body: Str) -> Result<()> {
         tracing::info!("Adding a message to room");
-        self.storage
-            .insert_message(self.storage_id, self.message_count, &body, &*author_id.as_inner())
-            .await?;
+        self.storage.insert_message(self.storage_id, self.message_count, &body, &*author_id.as_inner()).await?;
         self.message_count += 1;
         let update = Updates::NewMessage {
             room_id: self.room_id.clone(),
             author_id: author_id.clone(),
             body,
         };
-        self.broadcast_update(update, &author_id).await;
+        self.broadcast_update(update, author_id).await;
         Ok(())
     }
 
+    /// Broadcasts an update to all players except the one who caused the update.
+    ///
+    /// This is called after handling a client command.
+    /// Sending the update to the player who sent the command is handled by the player actor.
     async fn broadcast_update(&self, update: Updates, except: &PlayerId) {
         tracing::debug!("Broadcasting an update to {} subs", self.subscriptions.len());
         for (player_id, sub) in &self.subscriptions {

crates/projection-irc/rustfmt.toml

@@ -1,2 +0,0 @@
-max_width = 120
-chain_width = 120

crates/projection-irc/src/lib.rs

@@ -30,6 +30,8 @@ mod cap;
 
 use crate::cap::Capabilities;
 
+pub const APP_VERSION: &str = concat!("lavina", "_", env!("CARGO_PKG_VERSION"));
+
 #[derive(Deserialize, Debug, Clone)]
 pub struct ServerConfig {
     pub listen_on: SocketAddr,
@@ -42,7 +44,7 @@ struct RegisteredUser {
     /**
      * Username is mostly unused in modern IRC.
      *
-     * [https://stackoverflow.com/questions/31666247/what-is-the-difference-between-the-nick-username-and-real-name-in-irc-and-wha]
+     * <https://stackoverflow.com/questions/31666247/what-is-the-difference-between-the-nick-username-and-real-name-in-irc-and-wha>
      */
     username: Str,
     realname: Str,
@@ -62,21 +64,269 @@ async fn handle_socket(
     let mut reader: BufReader<ReadHalf> = BufReader::new(reader);
     let mut writer = BufWriter::new(writer);
 
-    let registered_user: Result<RegisteredUser> =
-        handle_registration(&mut reader, &mut writer, &mut storage, &config).await;
+    pin!(termination);
+    select! {
+        biased;
+        _ = &mut termination =>{
+            log::info!("Socket handling was terminated");
+            return Ok(())
+        },
+        registered_user = handle_registration(&mut reader, &mut writer, &mut storage, &config) =>
+            match registered_user {
+                Ok(user) => {
+                    log::debug!("User registered");
+                    handle_registered_socket(config, players, rooms, &mut reader, &mut writer, user).await?;
+                }
+                Err(err) => {
+                    log::debug!("Registration failed: {err}");
+                }
+            }
+    }
+    stream.shutdown().await?;
+    Ok(())
+}
 
-    match registered_user {
-        Ok(user) => {
-            log::debug!("User registered");
-            handle_registered_socket(config, players, rooms, &mut reader, &mut writer, user).await?;
-        }
-        Err(err) => {
-            log::debug!("Registration failed: {err}");
+struct RegistrationState {
+    /// The last received `NICK` message.
+    future_nickname: Option<Str>,
+    /// The last received `USER` message.
+    future_username: Option<(Str, Str)>,
+    enabled_capabilities: Capabilities,
+    /// `CAP LS` or `CAP REQ` was received, but not `CAP END`.
+    cap_negotiation_in_progress: bool,
+    /// The last received `PASS` message.
+    pass: Option<Str>,
+    authentication_started: bool,
+    validated_user: Option<Str>,
+}
+
+impl RegistrationState {
+    fn new() -> RegistrationState {
+        RegistrationState {
+            future_nickname: None,
+            future_username: None,
+            enabled_capabilities: Capabilities::None,
+            cap_negotiation_in_progress: false,
+            pass: None,
+            authentication_started: false,
+            validated_user: None,
         }
     }
 
-    stream.shutdown().await?;
-    Ok(())
+    /// Handle an incoming message from the client during the registration process.
+    ///
+    /// Returns `Some` if the user is fully registered, `None` if the registration is still in progress.
+    async fn handle_msg(
+        &mut self,
+        msg: ClientMessage,
+        writer: &mut BufWriter<WriteHalf<'_>>,
+        storage: &mut Storage,
+        config: &ServerConfig,
+    ) -> Result<Option<RegisteredUser>> {
+        match msg {
+            ClientMessage::Pass { password } => {
+                self.pass = Some(password);
+                Ok(None)
+            }
+            ClientMessage::Capability { subcommand } => match subcommand {
+                CapabilitySubcommand::List { code: _ } => {
+                    self.cap_negotiation_in_progress = true;
+                    ServerMessage {
+                        tags: vec![],
+                        sender: Some(config.server_name.clone().into()),
+                        body: ServerMessageBody::Cap {
+                            target: self.future_nickname.clone().unwrap_or_else(|| "*".into()),
+                            subcmd: CapSubBody::Ls("sasl=PLAIN".into()),
+                        },
+                    }
+                    .write_async(writer)
+                    .await?;
+                    writer.flush().await?;
+                    Ok(None)
+                }
+                CapabilitySubcommand::Req(caps) => {
+                    self.cap_negotiation_in_progress = true;
+                    let mut acked = vec![];
+                    let mut naked = vec![];
+                    for cap in caps {
+                        if &*cap.name == "sasl" {
+                            if cap.to_disable {
+                                self.enabled_capabilities &= !Capabilities::Sasl;
+                            } else {
+                                self.enabled_capabilities |= Capabilities::Sasl;
+                            }
+                            acked.push(cap);
+                        } else {
+                            naked.push(cap);
+                        }
+                    }
+                    let mut ack_body = String::new();
+                    for cap in acked {
+                        if cap.to_disable {
+                            ack_body.push('-');
+                        }
+                        ack_body += &*cap.name;
+                    }
+                    ServerMessage {
+                        tags: vec![],
+                        sender: Some(config.server_name.clone().into()),
+                        body: ServerMessageBody::Cap {
+                            target: self.future_nickname.clone().unwrap_or_else(|| "*".into()),
+                            subcmd: CapSubBody::Ack(ack_body.into()),
+                        },
+                    }
+                    .write_async(writer)
+                    .await?;
+                    writer.flush().await?;
+                    Ok(None)
+                }
+                CapabilitySubcommand::End => {
+                    let Some((ref username, ref realname)) = self.future_username else {
+                        self.cap_negotiation_in_progress = false;
+                        return Ok(None);
+                    };
+                    let Some(nickname) = self.future_nickname.clone() else {
+                        self.cap_negotiation_in_progress = false;
+                        return Ok(None);
+                    };
+                    let username = username.clone();
+                    let realname = realname.clone();
+                    let candidate_user = RegisteredUser {
+                        nickname: nickname.clone(),
+                        username,
+                        realname,
+                    };
+                    self.finalize_auth(candidate_user, writer, storage, config).await
+                }
+            },
+            ClientMessage::Nick { nickname } => {
+                if self.cap_negotiation_in_progress {
+                    self.future_nickname = Some(nickname);
+                    Ok(None)
+                } else if let Some((username, realname)) = &self.future_username.clone() {
+                    let candidate_user = RegisteredUser {
+                        nickname: nickname.clone(),
+                        username: username.clone(),
+                        realname: realname.clone(),
+                    };
+                    self.finalize_auth(candidate_user, writer, storage, config).await
+                } else {
+                    self.future_nickname = Some(nickname);
+                    Ok(None)
+                }
+            }
+            ClientMessage::User { username, realname } => {
+                if self.cap_negotiation_in_progress {
+                    self.future_username = Some((username, realname));
+                    Ok(None)
+                } else if let Some(nickname) = self.future_nickname.clone() {
+                    let candidate_user = RegisteredUser {
+                        nickname: nickname.clone(),
+                        username,
+                        realname,
+                    };
+                    self.finalize_auth(candidate_user, writer, storage, config).await
+                } else {
+                    self.future_username = Some((username, realname));
+                    Ok(None)
+                }
+            }
+            ClientMessage::Authenticate(body) => {
+                if !self.authentication_started {
+                    tracing::debug!("Received authentication request");
+                    if &*body == "PLAIN" {
+                        tracing::debug!("Authentication request with method PLAIN");
+                        self.authentication_started = true;
+                        ServerMessage {
+                            tags: vec![],
+                            sender: Some(config.server_name.clone().into()),
+                            body: ServerMessageBody::Authenticate("+".into()),
+                        }
+                        .write_async(writer)
+                        .await?;
+                        writer.flush().await?;
+                        Ok(None)
+                    } else {
+                        let target = self.future_nickname.clone().unwrap_or_else(|| "*".into());
+                        sasl_fail_message(config.server_name.clone(), target, "Unsupported mechanism".into())
+                            .write_async(writer)
+                            .await?;
+                        writer.flush().await?;
+                        Ok(None)
+                    }
+                } else {
+                    let body = AuthBody::from_str(body.as_bytes())?;
+                    if let Err(e) = auth_user(storage, &body.login, &body.password).await {
+                        tracing::warn!("Authentication failed: {:?}", e);
+                        let target = self.future_nickname.clone().unwrap_or_else(|| "*".into());
+                        sasl_fail_message(config.server_name.clone(), target, "Bad credentials".into())
+                            .write_async(writer)
+                            .await?;
+                        writer.flush().await?;
+                        Ok(None)
+                    } else {
+                        let login: Str = body.login.into();
+                        self.validated_user = Some(login.clone());
+                        ServerMessage {
+                            tags: vec![],
+                            sender: Some(config.server_name.clone().into()),
+                            body: ServerMessageBody::N900LoggedIn {
+                                nick: login.clone(),
+                                address: login.clone(),
+                                account: login.clone(),
+                                message: format!("You are now logged in as {}", login).into(),
+                            },
+                        }
+                        .write_async(writer)
+                        .await?;
+                        ServerMessage {
+                            tags: vec![],
+                            sender: Some(config.server_name.clone().into()),
+                            body: ServerMessageBody::N903SaslSuccess {
+                                nick: login.clone(),
+                                message: "SASL authentication successful".into(),
+                            },
+                        }
+                        .write_async(writer)
+                        .await?;
+                        writer.flush().await?;
+                        Ok(None)
+                    }
+                }
+
+                // TODO handle abortion of authentication
+            }
+            _ => Ok(None),
+        }
+    }
+
+    async fn finalize_auth(
+        &mut self,
+        candidate_user: RegisteredUser,
+        writer: &mut BufWriter<WriteHalf<'_>>,
+        storage: &mut Storage,
+        config: &ServerConfig,
+    ) -> Result<Option<RegisteredUser>> {
+        if self.enabled_capabilities.contains(Capabilities::Sasl)
+            && self.validated_user.as_ref() == Some(&candidate_user.nickname)
+        {
+            Ok(Some(candidate_user))
+        } else {
+            let Some(candidate_password) = &self.pass else {
+                sasl_fail_message(
+                    config.server_name.clone(),
+                    candidate_user.nickname.clone(),
+                    "User credentials was not provided".into(),
+                )
+                .write_async(writer)
+                .await?;
+                writer.flush().await?;
+                return Ok(None);
+            };
+            auth_user(storage, &*candidate_user.nickname, &*candidate_password).await?;
+            Ok(Some(candidate_user))
+        }
+    }
 }
 
 async fn handle_registration<'a>(
@@ -87,14 +337,7 @@ async fn handle_registration<'a>(
 ) -> Result<RegisteredUser> {
     let mut buffer = vec![];
 
-    let mut future_nickname: Option<Str> = None;
-    let mut future_username: Option<(Str, Str)> = None;
-    let mut enabled_capabilities = Capabilities::None;
-    let mut cap_negotiation_in_progress = false; // if true, expect `CAP END` to complete registration
-
-    let mut pass: Option<Str> = None;
-    let mut authentication_started = false;
-    let mut validated_user = None;
+    let mut state = RegistrationState::new();
 
     let user = loop {
         let res = read_irc_message(reader, &mut buffer).await;
@@ -125,171 +368,8 @@ async fn handle_registration<'a>(
             }
         };
         tracing::debug!("Incoming IRC message: {msg:?}");
-        match msg {
-            ClientMessage::Pass { password } => {
-                pass = Some(password);
-            }
-            ClientMessage::Capability { subcommand } => match subcommand {
-                CapabilitySubcommand::List { code: _ } => {
-                    cap_negotiation_in_progress = true;
-                    ServerMessage {
-                        tags: vec![],
-                        sender: Some(config.server_name.clone().into()),
-                        body: ServerMessageBody::Cap {
-                            target: future_nickname.clone().unwrap_or_else(|| "*".into()),
-                            subcmd: CapSubBody::Ls("sasl=PLAIN".into()),
-                        },
-                    }
-                    .write_async(writer)
-                    .await?;
-                    writer.flush().await?;
-                }
-                CapabilitySubcommand::Req(caps) => {
-                    cap_negotiation_in_progress = true;
-                    let mut acked = vec![];
-                    let mut naked = vec![];
-                    for cap in caps {
-                        if &*cap.name == "sasl" {
-                            if cap.to_disable {
-                                enabled_capabilities &= !Capabilities::Sasl;
-                            } else {
-                                enabled_capabilities |= Capabilities::Sasl;
-                            }
-                            acked.push(cap);
-                        } else {
-                            naked.push(cap);
-                        }
-                    }
-                    let mut ack_body = String::new();
-                    for cap in acked {
-                        if cap.to_disable {
-                            ack_body.push('-');
-                        }
-                        ack_body += &*cap.name;
-                    }
-                    ServerMessage {
-                        tags: vec![],
-                        sender: Some(config.server_name.clone().into()),
-                        body: ServerMessageBody::Cap {
-                            target: future_nickname.clone().unwrap_or_else(|| "*".into()),
-                            subcmd: CapSubBody::Ack(ack_body.into()),
-                        },
-                    }
-                    .write_async(writer)
-                    .await?;
-                    writer.flush().await?;
-                }
-                CapabilitySubcommand::End => {
-                    let Some((username, realname)) = future_username else {
-                        todo!()
-                    };
-                    let Some(nickname) = future_nickname.clone() else {
-                        todo!()
-                    };
-                    let candidate_user = RegisteredUser {
-                        nickname,
-                        username,
-                        realname,
-                    };
-                    if enabled_capabilities.contains(Capabilities::Sasl)
-                        && validated_user.as_ref() == Some(&candidate_user.nickname)
-                    {
-                        break Ok(candidate_user);
-                    } else {
-                        let Some(candidate_password) = pass else {
-                            todo!();
-                        };
-                        auth_user(storage, &*candidate_user.nickname, &*candidate_password).await?;
-                        break Ok(candidate_user);
-                    }
-                }
-            },
-            ClientMessage::Nick { nickname } => {
-                if cap_negotiation_in_progress {
-                    future_nickname = Some(nickname);
-                } else if let Some((username, realname)) = future_username.clone() {
-                    let candidate_user = RegisteredUser {
-                        nickname,
-                        username,
-                        realname,
-                    };
-                    let Some(candidate_password) = pass else {
-                        todo!();
-                    };
-                    auth_user(storage, &*candidate_user.nickname, &*candidate_password).await?;
-                    break Ok(candidate_user);
-                } else {
-                    future_nickname = Some(nickname);
-                }
-            }
-            ClientMessage::User { username, realname } => {
-                if cap_negotiation_in_progress {
-                    future_username = Some((username, realname));
-                } else if let Some(nickname) = future_nickname.clone() {
-                    let candidate_user = RegisteredUser {
-                        nickname,
-                        username,
-                        realname,
-                    };
-                    let Some(candidate_password) = pass else {
-                        todo!();
-                    };
-                    auth_user(storage, &*candidate_user.nickname, &*candidate_password).await?;
-                    break Ok(candidate_user);
-                } else {
-                    future_username = Some((username, realname));
-                }
-            }
-            ClientMessage::Authenticate(body) => {
-                if !authentication_started {
-                    tracing::debug!("Received authentication request");
-                    if &*body == "PLAIN" {
-                        tracing::debug!("Authentication request with method PLAIN");
-                        authentication_started = true;
-                        ServerMessage {
-                            tags: vec![],
-                            sender: Some(config.server_name.clone().into()),
-                            body: ServerMessageBody::Authenticate("+".into()),
-                        }
-                        .write_async(writer)
-                        .await?;
-                        writer.flush().await?;
-                    } else {
-                        // TODO respond with 904
-                        todo!();
-                    }
-                } else {
-                    let body = AuthBody::from_str(body.as_bytes())?;
-                    auth_user(storage, &body.login, &body.password).await?;
-                    let login: Str = body.login.into();
-                    validated_user = Some(login.clone());
-                    ServerMessage {
-                        tags: vec![],
-                        sender: Some(config.server_name.clone().into()),
-                        body: ServerMessageBody::N900LoggedIn {
-                            nick: login.clone(),
-                            address: login.clone(),
-                            account: login.clone(),
-                            message: format!("You are now logged in as {}", login).into(),
-                        },
-                    }
-                    .write_async(writer)
-                    .await?;
-                    ServerMessage {
-                        tags: vec![],
-                        sender: Some(config.server_name.clone().into()),
-                        body: ServerMessageBody::N903SaslSuccess {
-                            nick: login.clone(),
-                            message: "SASL authentication successful".into(),
-                        },
-                    }
-                    .write_async(writer)
-                    .await?;
-                    writer.flush().await?;
-                }
-                // TODO handle abortion of authentication
-            }
-            _ => {}
+        if let Some(user) = state.handle_msg(msg, writer, storage, config).await? {
+            break Ok(user);
         }
         buffer.clear();
     }?;
@@ -297,6 +377,14 @@ async fn handle_registration<'a>(
     Ok(user)
 }
 
+fn sasl_fail_message(sender: Str, nick: Str, text: Str) -> ServerMessage {
+    ServerMessage {
+        tags: vec![],
+        sender: Some(sender),
+        body: ServerMessageBody::N904SaslFail { nick, text },
+    }
+}
+
 async fn auth_user(storage: &mut Storage, login: &str, plain_password: &str) -> Result<()> {
     let stored_user = storage.retrieve_user_by_name(login).await?;
 
@@ -330,14 +418,15 @@ async fn handle_registered_socket<'a>(
     log::info!("Handling registered user: {user:?}");
 
     let player_id = PlayerId::from(user.nickname.clone())?;
-    let mut connection = players.connect_to_player(player_id.clone()).await;
+    let mut connection = players.connect_to_player(&player_id).await;
+    let text: Str = format!("Welcome to {} Server", &config.server_name).into();
 
     ServerMessage {
         tags: vec![],
         sender: Some(config.server_name.clone()),
         body: ServerMessageBody::N001Welcome {
             client: user.nickname.clone(),
-            text: "Welcome to Kek Server".into(),
+            text: text.clone(),
         },
     }
     .write_async(writer)
@@ -347,7 +436,7 @@ async fn handle_registered_socket<'a>(
         sender: Some(config.server_name.clone()),
         body: ServerMessageBody::N002YourHost {
             client: user.nickname.clone(),
-            text: "Welcome to Kek Server".into(),
+            text: text.clone(),
         },
     }
     .write_async(writer)
@@ -357,7 +446,7 @@ async fn handle_registered_socket<'a>(
         sender: Some(config.server_name.clone()),
         body: ServerMessageBody::N003Created {
             client: user.nickname.clone(),
-            text: "Welcome to Kek Server".into(),
+            text: text.clone(),
         },
     }
     .write_async(writer)
@@ -368,7 +457,7 @@ async fn handle_registered_socket<'a>(
         body: ServerMessageBody::N004MyInfo {
             client: user.nickname.clone(),
             hostname: config.server_name.clone(),
-            softname: "kek-0.1.alpha.3".into(),
+            softname: APP_VERSION.into(),
         },
     }
     .write_async(writer)

crates/projection-irc/tests/lib.rs

@@ -1,3 +1,5 @@
+use std::io::ErrorKind;
+use std::net::SocketAddr;
 use std::time::Duration;
 
 use anyhow::{anyhow, Result};
@@ -8,8 +10,8 @@ use tokio::net::TcpStream;
 
 use lavina_core::repo::{Storage, StorageConfig};
 use lavina_core::{player::PlayerRegistry, room::RoomRegistry};
+use projection_irc::APP_VERSION;
 use projection_irc::{launch, read_irc_message, RunningServer, ServerConfig};
-
 struct TestScope<'a> {
     reader: BufReader<ReadHalf<'a>>,
     writer: WriteHalf<'a>,
@@ -46,6 +48,31 @@ impl<'a> TestScope<'a> {
         Ok(())
     }
 
+    async fn expect_that(&mut self, validate: impl FnOnce(&str) -> bool) -> Result<()> {
+        let len = tokio::time::timeout(self.timeout, read_irc_message(&mut self.reader, &mut self.buffer)).await??;
+        let msg = std::str::from_utf8(&self.buffer[..len - 2])?;
+        if !validate(msg) {
+            return Err(anyhow!("unexpected message: {:?}", msg));
+        }
+        self.buffer.clear();
+        Ok(())
+    }
+
+    async fn expect_server_introduction(&mut self, nick: &str) -> Result<()> {
+        self.expect(&format!(":testserver 001 {nick} :Welcome to testserver Server")).await?;
+        self.expect(&format!(":testserver 002 {nick} :Welcome to testserver Server")).await?;
+        self.expect(&format!(":testserver 003 {nick} :Welcome to testserver Server")).await?;
+        self.expect(&format!(
+            ":testserver 004 {nick} testserver {APP_VERSION} r CFILPQbcefgijklmnopqrstvz"
+        ))
+        .await?;
+        self.expect(&format!(
+            ":testserver 005 {nick} CHANTYPES=# :are supported by this server"
+        ))
+        .await?;
+        Ok(())
+    }
+
     async fn expect_eof(&mut self) -> Result<()> {
         let mut buf = [0; 1];
         let len = tokio::time::timeout(self.timeout, self.reader.read(&mut buf)).await??;
@@ -84,7 +111,36 @@ impl TestServer {
         })
         .await?;
         let rooms = RoomRegistry::new(&mut metrics, storage.clone()).unwrap();
-        let players = PlayerRegistry::empty(rooms.clone(), &mut metrics).unwrap();
+        let players = PlayerRegistry::empty(rooms.clone(), storage.clone(), &mut metrics).unwrap();
+        let server = launch(config, players.clone(), rooms.clone(), metrics.clone(), storage.clone()).await.unwrap();
+        Ok(TestServer {
+            metrics,
+            storage,
+            rooms,
+            players,
+            server,
+        })
+    }
+
+    async fn reboot(mut self) -> Result<TestServer> {
+        let config = ServerConfig {
+            listen_on: "127.0.0.1:0".parse().unwrap(),
+            server_name: "testserver".into(),
+        };
+        let TestServer {
+            mut metrics,
+            mut storage,
+            rooms,
+            mut players,
+            server,
+        } = self;
+        server.terminate().await?;
+        players.shutdown_all().await.unwrap();
+        drop(players);
+        drop(rooms);
+        let mut metrics = MetricsRegistry::new();
+        let rooms = RoomRegistry::new(&mut metrics, storage.clone()).unwrap();
+        let players = PlayerRegistry::empty(rooms.clone(), storage.clone(), &mut metrics).unwrap();
         let server = launch(config, players.clone(), rooms.clone(), metrics.clone(), storage.clone()).await.unwrap();
         Ok(TestServer {
             metrics,
@@ -111,11 +167,7 @@ async fn scenario_basic() -> Result<()> {
     s.send("PASS password").await?;
     s.send("NICK tester").await?;
     s.send("USER UserName 0 * :Real Name").await?;
-    s.expect(":testserver 001 tester :Welcome to Kek Server").await?;
-    s.expect(":testserver 002 tester :Welcome to Kek Server").await?;
-    s.expect(":testserver 003 tester :Welcome to Kek Server").await?;
-    s.expect(":testserver 004 tester testserver kek-0.1.alpha.3 r CFILPQbcefgijklmnopqrstvz").await?;
-    s.expect(":testserver 005 tester CHANTYPES=# :are supported by this server").await?;
+    s.expect_server_introduction("tester").await?;
     s.expect_nothing().await?;
     s.send("QUIT :Leaving").await?;
     s.expect(":testserver ERROR :Leaving the server").await?;
@@ -129,6 +181,202 @@ async fn scenario_basic() -> Result<()> {
     Ok(())
 }
 
+#[tokio::test]
+async fn scenario_join_and_reboot() -> Result<()> {
+    let mut server = TestServer::start().await?;
+
+    // test scenario
+
+    server.storage.create_user("tester").await?;
+    server.storage.set_password("tester", "password").await?;
+
+    let mut stream = TcpStream::connect(server.server.addr).await?;
+    let mut s = TestScope::new(&mut stream);
+
+    // Open a connection and join a channel
+
+    s.send("PASS password").await?;
+    s.send("NICK tester").await?;
+    s.send("USER UserName 0 * :Real Name").await?;
+    s.expect_server_introduction("tester").await?;
+    s.expect_nothing().await?;
+    s.send("JOIN #test").await?;
+    s.expect(":tester JOIN #test").await?;
+    s.expect(":testserver 332 tester #test :New room").await?;
+    s.expect(":testserver 353 tester = #test :tester").await?;
+    s.expect(":testserver 366 tester #test :End of /NAMES list").await?;
+    s.send("PRIVMSG #test :Hello").await?;
+    s.send("QUIT :Leaving").await?;
+    s.expect(":testserver ERROR :Leaving the server").await?;
+    s.expect_eof().await?;
+    stream.shutdown().await?;
+
+    // Open a new connection and expect to be force-joined to the channel
+
+    let mut stream = TcpStream::connect(server.server.addr).await?;
+    let mut s = TestScope::new(&mut stream);
+
+    async fn test(s: &mut TestScope<'_>) -> Result<()> {
+        s.send("PASS password").await?;
+        s.send("NICK tester").await?;
+        s.send("USER UserName 0 * :Real Name").await?;
+        s.expect_server_introduction("tester").await?;
+        s.expect(":tester JOIN #test").await?;
+        s.expect(":testserver 332 tester #test :New room").await?;
+        s.expect(":testserver 353 tester = #test :tester").await?;
+        s.expect(":testserver 366 tester #test :End of /NAMES list").await?;
+        s.send("QUIT :Leaving").await?;
+        s.expect(":testserver ERROR :Leaving the server").await?;
+        s.expect_eof().await?;
+        Ok(())
+    }
+    test(&mut s).await?;
+    stream.shutdown().await?;
+
+    // Reboot the server
+
+    let server = server.reboot().await?;
+
+    // Open a new connection and expect to be force-joined to the channel
+
+    let mut stream = TcpStream::connect(server.server.addr).await?;
+    let mut s = TestScope::new(&mut stream);
+
+    test(&mut s).await?;
+    stream.shutdown().await?;
+
+    // wrap up
+
+    server.server.terminate().await?;
+    Ok(())
+}
+
+#[tokio::test]
+async fn scenario_force_join_msg() -> Result<()> {
+    let mut server = TestServer::start().await?;
+
+    // test scenario
+
+    server.storage.create_user("tester").await?;
+    server.storage.set_password("tester", "password").await?;
+
+    let mut stream1 = TcpStream::connect(server.server.addr).await?;
+    let mut s1 = TestScope::new(&mut stream1);
+    let mut stream2 = TcpStream::connect(server.server.addr).await?;
+    let mut s2 = TestScope::new(&mut stream2);
+
+    s1.send("PASS password").await?;
+    s1.send("NICK tester").await?;
+    s1.send("USER UserName 0 * :Real Name").await?;
+    s1.expect_server_introduction("tester").await?;
+    s1.expect_nothing().await?;
+
+    s2.send("PASS password").await?;
+    s2.send("NICK tester").await?;
+    s2.send("USER UserName 0 * :Real Name").await?;
+    s2.expect_server_introduction("tester").await?;
+    s2.expect_nothing().await?;
+
+    // We join the channel from the first connection
+    s1.send("JOIN #test").await?;
+    s1.expect(":tester JOIN #test").await?;
+    s1.expect(":testserver 332 tester #test :New room").await?;
+    s1.expect(":testserver 353 tester = #test :tester").await?;
+    s1.expect(":testserver 366 tester #test :End of /NAMES list").await?;
+
+    // And the second connection should receive the JOIN message (forced JOIN)
+    s2.expect(":tester JOIN #test").await?;
+    s2.expect(":testserver 332 tester #test :New room").await?;
+    s2.expect(":testserver 353 tester = #test :tester").await?;
+    s2.expect(":testserver 366 tester #test :End of /NAMES list").await?;
+
+    // We send a message to the channel from the second connection
+    s2.send("PRIVMSG #test :Hello").await?;
+    // We should not receive an acknowledgement from the server
+    s2.expect_nothing().await?;
+    // But we should receive this message from the first connection
+    s1.expect(":tester PRIVMSG #test :Hello").await?;
+
+    s1.send("QUIT :Leaving").await?;
+    s1.expect(":testserver ERROR :Leaving the server").await?;
+    s1.expect_eof().await?;
+
+    // Closing a connection does not kick you from the channel on a different connection
+    s2.expect_nothing().await?;
+
+    s2.send("QUIT :Leaving").await?;
+    s2.expect(":testserver ERROR :Leaving the server").await?;
+    s2.expect_eof().await?;
+
+    stream1.shutdown().await?;
+    stream2.shutdown().await?;
+
+    // wrap up
+
+    server.server.terminate().await?;
+    Ok(())
+}
+
+#[tokio::test]
+async fn scenario_two_users() -> Result<()> {
+    let mut server = TestServer::start().await?;
+
+    // test scenario
+
+    server.storage.create_user("tester1").await?;
+    server.storage.set_password("tester1", "password").await?;
+    server.storage.create_user("tester2").await?;
+    server.storage.set_password("tester2", "password").await?;
+
+    let mut stream1 = TcpStream::connect(server.server.addr).await?;
+    let mut s1 = TestScope::new(&mut stream1);
+    let mut stream2 = TcpStream::connect(server.server.addr).await?;
+    let mut s2 = TestScope::new(&mut stream2);
+
+    s1.send("PASS password").await?;
+    s1.send("NICK tester1").await?;
+    s1.send("USER UserName 0 * :Real Name").await?;
+    s1.expect_server_introduction("tester1").await?;
+    s1.expect_nothing().await?;
+
+    s2.send("PASS password").await?;
+    s2.send("NICK tester2").await?;
+    s2.send("USER UserName 0 * :Real Name").await?;
+    s2.expect_server_introduction("tester2").await?;
+    s2.expect_nothing().await?;
+
+    // Join the channel from the first user
+    s1.send("JOIN #test").await?;
+    s1.expect(":tester1 JOIN #test").await?;
+    s1.expect(":testserver 332 tester1 #test :New room").await?;
+    s1.expect(":testserver 353 tester1 = #test :tester1").await?;
+    s1.expect(":testserver 366 tester1 #test :End of /NAMES list").await?;
+    // Then join the channel from the second user
+    s2.send("JOIN #test").await?;
+    s2.expect(":tester2 JOIN #test").await?;
+    s2.expect(":testserver 332 tester2 #test :New room").await?;
+    s2.expect_that(|msg| {
+        msg == ":testserver 353 tester2 = #test :tester1 tester2"
+            || msg == ":testserver 353 tester2 = #test :tester2 tester1"
+    })
+    .await?;
+    s2.expect(":testserver 366 tester2 #test :End of /NAMES list").await?;
+    // The first user should receive the JOIN message from the second user
+    s1.expect(":tester2 JOIN #test").await?;
+    s1.expect_nothing().await?;
+    s2.expect_nothing().await?;
+    // Send a message from the second user
+    s2.send("PRIVMSG #test :Hello").await?;
+    // The first user should receive the message
+    s1.expect(":tester2 PRIVMSG #test :Hello").await?;
+    // Leave the channel from the first user
+    s1.send("PART #test").await?;
+    s1.expect(":tester1 PART #test").await?;
+    // The second user should receive the PART message
+    s2.expect(":tester1 PART #test").await?;
+    Ok(())
+}
+
 /*
 IRC SASL doc: https://ircv3.net/specs/extensions/sasl-3.1.html
 AUTHENTICATE doc: https://modern.ircdocs.horse/#authenticate-message
@@ -159,11 +407,46 @@ async fn scenario_cap_full_negotiation() -> Result<()> {
 
     s.send("CAP END").await?;
 
-    s.expect(":testserver 001 tester :Welcome to Kek Server").await?;
-    s.expect(":testserver 002 tester :Welcome to Kek Server").await?;
-    s.expect(":testserver 003 tester :Welcome to Kek Server").await?;
-    s.expect(":testserver 004 tester testserver kek-0.1.alpha.3 r CFILPQbcefgijklmnopqrstvz").await?;
-    s.expect(":testserver 005 tester CHANTYPES=# :are supported by this server").await?;
+    s.expect_server_introduction("tester").await?;
+    s.expect_nothing().await?;
+    s.send("QUIT :Leaving").await?;
+    s.expect(":testserver ERROR :Leaving the server").await?;
+    s.expect_eof().await?;
+
+    stream.shutdown().await?;
+
+    // wrap up
+
+    server.server.terminate().await?;
+    Ok(())
+}
+
+#[tokio::test]
+async fn scenario_cap_full_negotiation_nick_last() -> Result<()> {
+    let mut server = TestServer::start().await?;
+
+    // test scenario
+
+    server.storage.create_user("tester").await?;
+    server.storage.set_password("tester", "password").await?;
+
+    let mut stream = TcpStream::connect(server.server.addr).await?;
+    let mut s = TestScope::new(&mut stream);
+
+    s.send("CAP LS 302").await?;
+    s.expect(":testserver CAP * LS :sasl=PLAIN").await?;
+    s.send("CAP REQ :sasl").await?;
+    s.expect(":testserver CAP * ACK :sasl").await?;
+    s.send("AUTHENTICATE PLAIN").await?;
+    s.expect(":testserver AUTHENTICATE +").await?;
+    s.send("AUTHENTICATE dGVzdGVyAHRlc3RlcgBwYXNzd29yZA==").await?; // base64-encoded 'tester\x00tester\x00password'
+    s.expect(":testserver 900 tester tester tester :You are now logged in as tester").await?;
+    s.expect(":testserver 903 tester :SASL authentication successful").await?;
+    s.send("CAP END").await?;
+    s.send("USER UserName 0 * :Real Name").await?;
+    s.send("NICK tester").await?;
+
+    s.expect_server_introduction("tester").await?;
     s.expect_nothing().await?;
     s.send("QUIT :Leaving").await?;
     s.expect(":testserver ERROR :Leaving the server").await?;
@@ -201,11 +484,7 @@ async fn scenario_cap_short_negotiation() -> Result<()> {
 
     s.send("CAP END").await?;
 
-    s.expect(":testserver 001 tester :Welcome to Kek Server").await?;
-    s.expect(":testserver 002 tester :Welcome to Kek Server").await?;
-    s.expect(":testserver 003 tester :Welcome to Kek Server").await?;
-    s.expect(":testserver 004 tester testserver kek-0.1.alpha.3 r CFILPQbcefgijklmnopqrstvz").await?;
-    s.expect(":testserver 005 tester CHANTYPES=# :are supported by this server").await?;
+    s.expect_server_introduction("tester").await?;
     s.expect_nothing().await?;
     s.send("QUIT :Leaving").await?;
     s.expect(":testserver ERROR :Leaving the server").await?;
@@ -218,3 +497,72 @@ async fn scenario_cap_short_negotiation() -> Result<()> {
     server.server.terminate().await?;
     Ok(())
 }
+
+#[tokio::test]
+async fn scenario_cap_sasl_fail() -> Result<()> {
+    let mut server = TestServer::start().await?;
+
+    // test scenario
+
+    server.storage.create_user("tester").await?;
+    server.storage.set_password("tester", "password").await?;
+
+    let mut stream = TcpStream::connect(server.server.addr).await?;
+    let mut s = TestScope::new(&mut stream);
+
+    s.send("CAP LS 302").await?;
+    s.send("NICK tester").await?;
+    s.send("USER UserName 0 * :Real Name").await?;
+    s.expect(":testserver CAP * LS :sasl=PLAIN").await?;
+    s.send("CAP REQ :sasl").await?;
+    s.expect(":testserver CAP tester ACK :sasl").await?;
+    s.send("AUTHENTICATE SHA256").await?;
+    s.expect(":testserver 904 tester :Unsupported mechanism").await?;
+    s.send("AUTHENTICATE PLAIN").await?;
+    s.expect(":testserver AUTHENTICATE +").await?;
+    s.send("AUTHENTICATE dGVzdGVyAHRlc3RlcgBwYXNzd29yZDE=").await?;
+    s.expect(":testserver 904 tester :Bad credentials").await?;
+    s.send("AUTHENTICATE dGVzdGVyAHRlc3RlcgBwYXNzd29yZA==").await?; // base64-encoded 'tester\x00tester\x00password'
+    s.expect(":testserver 900 tester tester tester :You are now logged in as tester").await?;
+    s.expect(":testserver 903 tester :SASL authentication successful").await?;
+
+    s.send("CAP END").await?;
+
+    s.expect_server_introduction("tester").await?;
+    s.expect_nothing().await?;
+    s.send("QUIT :Leaving").await?;
+    s.expect(":testserver ERROR :Leaving the server").await?;
+    s.expect_eof().await?;
+
+    stream.shutdown().await?;
+
+    // wrap up
+
+    server.server.terminate().await?;
+    Ok(())
+}
+
+#[tokio::test]
+async fn terminate_socket_scenario() -> Result<()> {
+    let mut server = TestServer::start().await?;
+
+    // test scenario
+
+    server.storage.create_user("tester").await?;
+    server.storage.set_password("tester", "password").await?;
+
+    let mut stream = TcpStream::connect(server.server.addr).await?;
+    let mut s = TestScope::new(&mut stream);
+
+    s.send("NICK tester").await?;
+    s.send("CAP REQ :sasl").await?;
+    s.send("USER UserName 0 * :Real Name").await?;
+    s.expect(":testserver CAP tester ACK :sasl").await?;
+    s.send("AUTHENTICATE PLAIN").await?;
+    s.expect(":testserver AUTHENTICATE +").await?;
+
+    server.server.terminate().await?;
+    assert_eq!(stream.read_u8().await.unwrap_err().kind(), ErrorKind::UnexpectedEof);
+
+    Ok(())
+}

crates/projection-xmpp/rustfmt.toml

@@ -1,2 +0,0 @@
-max_width = 120
-chain_width = 120

crates/projection-xmpp/src/iq.rs

@@ -2,9 +2,9 @@
 
 use quick_xml::events::Event;
 
-use lavina_core::room::RoomRegistry;
-use proto_xmpp::bind::{BindResponse, Jid, Name, Resource, Server};
-use proto_xmpp::client::{Iq, IqType};
+use lavina_core::room::{RoomId, RoomRegistry};
+use proto_xmpp::bind::{BindResponse, Jid, Name, Server};
+use proto_xmpp::client::{Iq, IqError, IqErrorType, IqType};
 use proto_xmpp::disco::{Feature, Identity, InfoQuery, Item, ItemQuery};
 use proto_xmpp::roster::RosterQuery;
 use proto_xmpp::session::Session;
@@ -17,16 +17,16 @@ use proto_xmpp::xml::ToXml;
 impl<'a> XmppConnection<'a> {
     pub async fn handle_iq(&self, output: &mut Vec<Event<'static>>, iq: Iq<IqClientBody>) {
         match iq.body {
-            IqClientBody::Bind(b) => {
+            IqClientBody::Bind(_) => {
                 let req = Iq {
                     from: None,
                     id: iq.id,
                     to: None,
                     r#type: IqType::Result,
                     body: BindResponse(Jid {
-                        name: Some(Name("darova".into())),
-                        server: Server("localhost".into()),
-                        resource: Some(Resource("kek".into())),
+                        name: Some(self.user.xmpp_name.clone()),
+                        server: Server(self.hostname.clone()),
+                        resource: Some(self.user.xmpp_resource.clone()),
                     }),
                 };
                 req.serialize(output);
@@ -52,18 +52,32 @@ impl<'a> XmppConnection<'a> {
                 req.serialize(output);
             }
             IqClientBody::DiscoInfo(info) => {
-                let response = disco_info(iq.to.as_deref(), &info);
-                let req = Iq {
-                    from: iq.to,
-                    id: iq.id,
-                    to: None,
-                    r#type: IqType::Result,
-                    body: response,
-                };
-                req.serialize(output);
+                let response = self.disco_info(iq.to.as_ref(), &info).await;
+                match response {
+                    Ok(response) => {
+                        let req = Iq {
+                            from: iq.to,
+                            id: iq.id,
+                            to: None,
+                            r#type: IqType::Result,
+                            body: response,
+                        };
+                        req.serialize(output);
+                    }
+                    Err(response) => {
+                        let req = Iq {
+                            from: iq.to,
+                            id: iq.id,
+                            to: None,
+                            r#type: IqType::Error,
+                            body: response,
+                        };
+                        req.serialize(output);
+                    }
+                }
             }
             IqClientBody::DiscoItem(item) => {
-                let response = disco_items(iq.to.as_deref(), &item, self.rooms).await;
+                let response = self.disco_items(iq.to.as_ref(), &item, self.rooms).await;
                 let req = Iq {
                     from: iq.to,
                     id: iq.id,
@@ -79,84 +93,131 @@ impl<'a> XmppConnection<'a> {
                     id: iq.id,
                     to: None,
                     r#type: IqType::Error,
-                    body: (),
+                    body: IqError {
+                        r#type: IqErrorType::Cancel,
+                    },
                 };
                 req.serialize(output);
             }
         }
     }
-}
 
-fn disco_info(to: Option<&str>, req: &InfoQuery) -> InfoQuery {
-    let identity;
-    let feature;
-    match to {
-        Some("localhost") => {
-            identity = vec![Identity {
-                category: "server".into(),
+    async fn disco_info(&self, to: Option<&Jid>, req: &InfoQuery) -> Result<InfoQuery, IqError> {
+        let identity;
+        let feature;
+
+        match to {
+            Some(Jid {
                 name: None,
-                r#type: "im".into(),
-            }];
-            feature = vec![
-                Feature::new("http://jabber.org/protocol/disco#info"),
-                Feature::new("http://jabber.org/protocol/disco#items"),
-                Feature::new("iq"),
-                Feature::new("presence"),
-            ]
-        }
-        Some("rooms.localhost") => {
-            identity = vec![Identity {
-                category: "conference".into(),
-                name: Some("Chat rooms".into()),
-                r#type: "text".into(),
-            }];
-            feature = vec![
-                Feature::new("http://jabber.org/protocol/disco#info"),
-                Feature::new("http://jabber.org/protocol/disco#items"),
-                Feature::new("http://jabber.org/protocol/muc"),
-            ]
-        }
-        _ => {
-            identity = vec![];
-            feature = vec![];
-        }
-    };
-    InfoQuery {
-        node: None,
-        identity,
-        feature,
-    }
-}
-
-async fn disco_items(to: Option<&str>, req: &ItemQuery, rooms: &RoomRegistry) -> ItemQuery {
-    let item = match to {
-        Some("localhost") => {
-            vec![Item {
-                jid: Jid {
+                server,
+                resource: None,
+            }) if server.0 == self.hostname => {
+                identity = vec![Identity {
+                    category: "server".into(),
                     name: None,
-                    server: Server("rooms.localhost".into()),
-                    resource: None,
-                },
+                    r#type: "im".into(),
+                }];
+                feature = vec![
+                    Feature::new("http://jabber.org/protocol/disco#info"),
+                    Feature::new("http://jabber.org/protocol/disco#items"),
+                    Feature::new("iq"),
+                    Feature::new("presence"),
+                ]
+            }
+            Some(Jid {
                 name: None,
-                node: None,
-            }]
-        }
-        Some("rooms.localhost") => {
-            let room_list = rooms.get_all_rooms().await;
-            room_list
-                .into_iter()
-                .map(|room_info| Item {
+                server,
+                resource: None,
+            }) if server.0 == self.hostname_rooms => {
+                identity = vec![Identity {
+                    category: "conference".into(),
+                    name: Some("Chat rooms".into()),
+                    r#type: "text".into(),
+                }];
+                feature = vec![
+                    Feature::new("http://jabber.org/protocol/disco#info"),
+                    Feature::new("http://jabber.org/protocol/disco#items"),
+                    Feature::new("http://jabber.org/protocol/muc"),
+                ]
+            }
+            Some(Jid {
+                name: Some(room_name),
+                server,
+                resource: None,
+            }) if server.0 == self.hostname_rooms => {
+                let room_id = RoomId::from(room_name.0.clone()).unwrap();
+                let Some(_) = self.rooms.get_room(&room_id).await else {
+                    // TODO should return item-not-found
+                    // example:
+                    // <error type="cancel">
+                    // <item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/>
+                    // <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" xml:lang="en">Conference room does not exist</text>
+                    // </error>
+                    return Err(IqError {
+                        r#type: IqErrorType::Cancel,
+                    });
+                };
+                identity = vec![Identity {
+                    category: "conference".into(),
+                    name: Some(room_id.into_inner().to_string()),
+                    r#type: "text".into(),
+                }];
+                feature = vec![
+                    Feature::new("http://jabber.org/protocol/disco#info"),
+                    Feature::new("http://jabber.org/protocol/disco#items"),
+                    Feature::new("http://jabber.org/protocol/muc"),
+                ]
+            }
+            _ => {
+                identity = vec![];
+                feature = vec![];
+            }
+        };
+        Ok(InfoQuery {
+            node: None,
+            identity,
+            feature,
+        })
+    }
+
+    async fn disco_items(&self, to: Option<&Jid>, req: &ItemQuery, rooms: &RoomRegistry) -> ItemQuery {
+        let item = match to {
+            Some(Jid {
+                name: None,
+                server,
+                resource: None,
+            }) if server.0 == self.hostname => {
+                vec![Item {
                     jid: Jid {
-                        name: Some(Name(room_info.id.into_inner())),
-                        server: Server("rooms.localhost".into()),
+                        name: None,
+                        server: Server(self.hostname_rooms.clone()),
                         resource: None,
                     },
                     name: None,
                     node: None,
-                })
-                .collect()
-        }
-        _ => vec![],
-    };
-    ItemQuery { item }
+                }]
+            }
+            Some(Jid {
+                name: None,
+                server,
+                resource: None,
+            }) if server.0 == self.hostname_rooms => {
+                let room_list = rooms.get_all_rooms().await;
+                room_list
+                    .into_iter()
+                    .map(|room_info| Item {
+                        jid: Jid {
+                            name: Some(Name(room_info.id.into_inner())),
+                            server: Server(self.hostname_rooms.clone()),
+                            resource: None,
+                        },
+                        name: None,
+                        node: None,
+                    })
+                    .collect()
+            }
+            _ => vec![],
+        };
+        ItemQuery { item }
+    }
 }

crates/projection-xmpp/src/lib.rs

@@ -9,7 +9,6 @@ use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use anyhow::anyhow;
 use futures_util::future::join_all;
 use prometheus::Registry as MetricsRegistry;
 use quick_xml::events::{BytesDecl, Event};
@@ -44,6 +43,7 @@ pub struct ServerConfig {
     pub listen_on: SocketAddr,
     pub cert: PathBuf,
     pub key: PathBuf,
+    pub hostname: Str,
 }
 
 struct LoadedConfig {
@@ -52,9 +52,17 @@ struct LoadedConfig {
 }
 
 struct Authenticated {
+    /// Identifier of the authenticated player.
+    ///
+    /// Used when communicating with lavina-core on behalf of the player.
     player_id: PlayerId,
+    /// The user's XMPP name.
+    ///
+    /// Used in `to` and `from` fields of XMPP messages.
     xmpp_name: Name,
+    /// The resource given to this user by the server.
     xmpp_resource: Resource,
+    /// The resource used by this user when joining MUCs.
     xmpp_muc_name: Resource,
 }
 
@@ -117,11 +125,12 @@ pub async fn launch(
                             let players = players.clone();
                             let rooms = rooms.clone();
                             let storage = storage.clone();
+                            let hostname = config.hostname.clone();
                             let terminator = Terminator::spawn(|termination| {
                                 let stopped_tx = stopped_tx.clone();
                                 let loaded_config = loaded_config.clone();
                                 async move {
-                                    match handle_socket(loaded_config, stream, &socket_addr, players, rooms, storage, termination).await {
+                                    match handle_socket(loaded_config, stream, &socket_addr, players, rooms, storage, hostname, termination).await {
                                         Ok(_) => log::info!("Connection terminated"),
                                         Err(err) => log::warn!("Connection failed: {err}"),
                                     }
@@ -156,12 +165,13 @@ pub async fn launch(
 }
 
 async fn handle_socket(
-    config: Arc<LoadedConfig>,
+    cert_config: Arc<LoadedConfig>,
     mut stream: TcpStream,
     socket_addr: &SocketAddr,
     mut players: PlayerRegistry,
     rooms: RoomRegistry,
     mut storage: Storage,
+    hostname: Str,
     termination: Deferred<()>, // TODO use it to stop the connection gracefully
 ) -> Result<()> {
     log::info!("Received an XMPP connection from {socket_addr}");
@@ -170,12 +180,12 @@ async fn handle_socket(
     let mut buf_reader = BufReader::new(reader);
     let mut buf_writer = BufWriter::new(writer);
 
-    socket_force_tls(&mut buf_reader, &mut buf_writer, &mut reader_buf).await?;
+    socket_force_tls(&mut buf_reader, &mut buf_writer, &mut reader_buf, &hostname).await?;
 
     let mut config = tokio_rustls::rustls::ServerConfig::builder()
         .with_safe_defaults()
         .with_no_client_auth()
-        .with_single_cert(vec![config.cert.clone()], config.key.clone())?;
+        .with_single_cert(vec![cert_config.cert.clone()], cert_config.key.clone())?;
     config.key_log = Arc::new(tokio_rustls::rustls::KeyLogFile::new());
 
     log::debug!("Accepting TLS connection...");
@@ -185,23 +195,39 @@ async fn handle_socket(
 
     let (a, b) = tokio::io::split(new_stream);
     let mut xml_reader = NsReader::from_reader(BufReader::new(a));
-    let mut xml_writer = Writer::new(b);
+    let mut xml_writer = Writer::new(BufWriter::new(b));
 
-    let authenticated = socket_auth(&mut xml_reader, &mut xml_writer, &mut reader_buf, &mut storage).await?;
-    log::debug!("User authenticated");
-    let mut connection = players.connect_to_player(authenticated.player_id.clone()).await;
-    socket_final(
-        &mut xml_reader,
-        &mut xml_writer,
-        &mut reader_buf,
-        &authenticated,
-        &mut connection,
-        &rooms,
-    )
-    .await?;
+    pin!(termination);
+    select! {
+        biased;
+        _ = &mut termination =>{
+            log::info!("Socket handling was terminated");
+            return Ok(())
+        },
+        authenticated = socket_auth(&mut xml_reader, &mut xml_writer, &mut reader_buf, &mut storage, &hostname) => {
+            match authenticated {
+                Ok(authenticated) => {
+                    let mut connection = players.connect_to_player(&authenticated.player_id).await;
+                    socket_final(
+                        &mut xml_reader,
+                        &mut xml_writer,
+                        &mut reader_buf,
+                        &authenticated,
+                        &mut connection,
+                        &rooms,
+                        &hostname,
+                    )
+                    .await?;
+                },
+                Err(err) => {
+                    log::error!("Authentication error: {:?}", err);
+                }
+            }
+        },
+    }
 
     let a = xml_reader.into_inner().into_inner();
-    let b = xml_writer.into_inner();
+    let b = xml_writer.into_inner().into_inner();
     a.unsplit(b).shutdown().await?;
     Ok(())
 }
@@ -210,17 +236,18 @@ async fn socket_force_tls(
     reader: &mut (impl AsyncBufRead + Unpin),
     writer: &mut (impl AsyncWrite + Unpin),
     reader_buf: &mut Vec<u8>,
+    hostname: &Str,
 ) -> Result<()> {
     use proto_xmpp::tls::*;
     let xml_reader = &mut NsReader::from_reader(reader);
     let xml_writer = &mut Writer::new(writer);
-    read_xml_header(xml_reader, reader_buf).await?;
+    // TODO validate the server hostname received in the stream start
     let _ = ClientStreamStart::parse(xml_reader, reader_buf).await?;
 
     let event = Event::Decl(BytesDecl::new("1.0", None, None));
     xml_writer.write_event_async(event).await?;
     let msg = ServerStreamStart {
-        from: "localhost".into(),
+        from: hostname.to_string(),
         lang: "en".into(),
         id: uuid::Uuid::new_v4().to_string(),
         version: "1.0".into(),
@@ -245,13 +272,14 @@ async fn socket_auth(
     xml_writer: &mut Writer<(impl AsyncWrite + Unpin)>,
     reader_buf: &mut Vec<u8>,
     storage: &mut Storage,
+    hostname: &Str,
 ) -> Result<Authenticated> {
-    read_xml_header(xml_reader, reader_buf).await?;
+    // TODO validate the server hostname received in the stream start
     let _ = ClientStreamStart::parse(xml_reader, reader_buf).await?;
 
     xml_writer.write_event_async(Event::Decl(BytesDecl::new("1.0", None, None))).await?;
     ServerStreamStart {
-        from: "localhost".into(),
+        from: hostname.to_string(),
         lang: "en".into(),
         id: uuid::Uuid::new_v4().to_string(),
         version: "1.0".into(),
@@ -269,6 +297,7 @@ async fn socket_auth(
 
     let auth: proto_xmpp::sasl::Auth = proto_xmpp::sasl::Auth::parse(xml_reader, reader_buf).await?;
     proto_xmpp::sasl::Success.write_xml(xml_writer).await?;
+    xml_writer.get_mut().flush().await?;
 
     match AuthBody::from_str(&auth.body) {
         Ok(logopass) => {
@@ -293,11 +322,13 @@ async fn socket_auth(
                 return Err(fail("passwords do not match"));
             }
 
+            let name: Str = name.as_str().into();
+
             Ok(Authenticated {
-                player_id: PlayerId::from(name.as_str())?,
-                xmpp_name: Name(name.to_string().into()),
-                xmpp_resource: Resource(name.to_string().into()),
-                xmpp_muc_name: Resource(name.to_string().into()),
+                player_id: PlayerId::from(name.clone())?,
+                xmpp_name: Name(name.clone()),
+                xmpp_resource: Resource(name.clone()),
+                xmpp_muc_name: Resource(name.clone()),
             })
         }
         Err(e) => return Err(e),
@@ -311,13 +342,14 @@ async fn socket_final(
     authenticated: &Authenticated,
     user_handle: &mut PlayerConnection,
     rooms: &RoomRegistry,
+    hostname: &Str,
 ) -> Result<()> {
-    read_xml_header(xml_reader, reader_buf).await?;
+    // TODO validate the server hostname received in the stream start
     let _ = ClientStreamStart::parse(xml_reader, reader_buf).await?;
 
     xml_writer.write_event_async(Event::Decl(BytesDecl::new("1.0", None, None))).await?;
     ServerStreamStart {
-        from: "localhost".into(),
+        from: hostname.to_string(),
         lang: "en".into(),
         id: uuid::Uuid::new_v4().to_string(),
         version: "1.0".into(),
@@ -343,13 +375,15 @@ async fn socket_final(
             user: authenticated,
             user_handle,
             rooms,
+            hostname: hostname.clone(),
+            hostname_rooms: format!("rooms.{}", hostname).into(),
         };
         let should_recreate_xml_future = select! {
             biased;
             res = &mut next_xml_event => 's: {
                 let (ns, event) = res?;
                 if let Event::Text(ref e) = event {
-                    if e.iter().all(|x| *x == 0xA) {
+                    if e.iter().all(|x| *x == b'\n' || *x == b' ') {
                         break 's true;
                     }
                 }
@@ -399,12 +433,14 @@ struct XmppConnection<'a> {
     user: &'a Authenticated,
     user_handle: &'a mut PlayerConnection,
     rooms: &'a RoomRegistry,
+    hostname: Str,
+    hostname_rooms: Str,
 }
 
 impl<'a> XmppConnection<'a> {
     async fn handle_packet(&mut self, output: &mut Vec<Event<'static>>, packet: ClientPacket) -> Result<bool> {
         let res = match packet {
-            proto::ClientPacket::Iq(iq) => {
+            ClientPacket::Iq(iq) => {
                 self.handle_iq(output, iq).await;
                 false
             }
@@ -412,11 +448,11 @@ impl<'a> XmppConnection<'a> {
                 self.handle_message(output, m).await?;
                 false
             }
-            proto::ClientPacket::Presence(p) => {
+            ClientPacket::Presence(p) => {
                 self.handle_presence(output, p).await?;
                 false
             }
-            proto::ClientPacket::StreamEnd => {
+            ClientPacket::StreamEnd => {
                 ServerStreamEnd.serialize(output);
                 true
             }
@@ -424,25 +460,3 @@ impl<'a> XmppConnection<'a> {
         Ok(res)
     }
 }
-
-async fn read_xml_header(
-    xml_reader: &mut NsReader<(impl AsyncBufRead + Unpin)>,
-    reader_buf: &mut Vec<u8>,
-) -> Result<()> {
-    if let Event::Decl(bytes) = xml_reader.read_event_into_async(reader_buf).await? {
-        // this is <?xml ...> header
-        if let Some(encoding) = bytes.encoding() {
-            let encoding = encoding?;
-            if &*encoding == b"UTF-8" {
-                Ok(())
-            } else {
-                Err(anyhow!("Unsupported encoding: {encoding:?}"))
-            }
-        } else {
-            // Err(fail("No XML encoding provided"))
-            Ok(())
-        }
-    } else {
-        Err(anyhow!("Expected XML header"))
-    }
-}

crates/projection-xmpp/src/message.rs

@@ -18,17 +18,17 @@ impl<'a> XmppConnection<'a> {
             resource: _,
         }) = m.to
         {
-            if server.0.as_ref() == "rooms.localhost" && m.r#type == MessageType::Groupchat {
+            if server.0.as_ref() == &*self.hostname_rooms && m.r#type == MessageType::Groupchat {
                 self.user_handle.send_message(RoomId::from(name.0.clone())?, m.body.clone().into()).await?;
                 Message::<()> {
                     to: Some(Jid {
                         name: Some(self.user.xmpp_name.clone()),
-                        server: Server("localhost".into()),
+                        server: Server(self.hostname.clone()),
                         resource: Some(self.user.xmpp_resource.clone()),
                     }),
                     from: Some(Jid {
                         name: Some(name),
-                        server: Server("rooms.localhost".into()),
+                        server: Server(self.hostname_rooms.clone()),
                         resource: Some(self.user.xmpp_muc_name.clone()),
                     }),
                     id: m.id,

crates/projection-xmpp/src/presence.rs

@@ -4,7 +4,7 @@ use quick_xml::events::Event;
 
 use lavina_core::prelude::*;
 use lavina_core::room::RoomId;
-use proto_xmpp::bind::{Jid, Server};
+use proto_xmpp::bind::{Jid, Name, Server};
 use proto_xmpp::client::Presence;
 use proto_xmpp::xml::{Ignore, ToXml};
 
@@ -12,42 +12,59 @@ use crate::XmppConnection;
 
 impl<'a> XmppConnection<'a> {
     pub async fn handle_presence(&mut self, output: &mut Vec<Event<'static>>, p: Presence<Ignore>) -> Result<()> {
-        let response = if p.to.is_none() {
-            Presence::<()> {
-                to: Some(Jid {
-                    name: Some(self.user.xmpp_name.clone()),
-                    server: Server("localhost".into()),
-                    resource: Some(self.user.xmpp_resource.clone()),
-                }),
-                from: Some(Jid {
-                    name: Some(self.user.xmpp_name.clone()),
-                    server: Server("localhost".into()),
-                    resource: Some(self.user.xmpp_resource.clone()),
-                }),
-                ..Default::default()
+        match p.to {
+            None => {
+                self.self_presence(output).await;
             }
-        } else if let Some(Jid {
-            name: Some(name),
-            server,
-            resource: Some(resource),
-        }) = p.to
-        {
-            let a = self.user_handle.join_room(RoomId::from(name.0.clone())?).await?;
-            Presence::<()> {
-                to: Some(Jid {
-                    name: Some(self.user.xmpp_name.clone()),
-                    server: Server("localhost".into()),
-                    resource: Some(self.user.xmpp_resource.clone()),
-                }),
-                from: Some(Jid {
-                    name: Some(name.clone()),
-                    server: Server("rooms.localhost".into()),
-                    resource: Some(self.user.xmpp_muc_name.clone()),
-                }),
-                ..Default::default()
+            Some(Jid {
+                name: Some(name),
+                server,
+                // resources in MUCs are members' personas – not implemented (yet?)
+                resource: Some(_),
+            }) if server.0 == self.hostname_rooms => {
+                self.muc_presence(name, output).await?;
             }
-        } else {
-            Presence::<()>::default()
+            _ => {
+                // TODO other presence cases
+                let response = Presence::<()>::default();
+                response.serialize(output);
+            }
+        }
+        Ok(())
+    }
+
+    async fn self_presence(&mut self, output: &mut Vec<Event<'static>>) {
+        let response = Presence::<()> {
+            to: Some(Jid {
+                name: Some(self.user.xmpp_name.clone()),
+                server: Server(self.hostname.clone()),
+                resource: Some(self.user.xmpp_resource.clone()),
+            }),
+            from: Some(Jid {
+                name: Some(self.user.xmpp_name.clone()),
+                server: Server(self.hostname.clone()),
+                resource: Some(self.user.xmpp_resource.clone()),
+            }),
+            ..Default::default()
+        };
+        response.serialize(output);
+    }
+
+    async fn muc_presence(&mut self, name: Name, output: &mut Vec<Event<'static>>) -> Result<()> {
+        let a = self.user_handle.join_room(RoomId::from(name.0.clone())?).await?;
+        // TODO handle bans
+        let response = Presence::<()> {
+            to: Some(Jid {
+                name: Some(self.user.xmpp_name.clone()),
+                server: Server(self.hostname.clone()),
+                resource: Some(self.user.xmpp_resource.clone()),
+            }),
+            from: Some(Jid {
+                name: Some(name.clone()),
+                server: Server(self.hostname_rooms.clone()),
+                resource: Some(self.user.xmpp_muc_name.clone()),
+            }),
+            ..Default::default()
         };
         response.serialize(output);
         Ok(())

crates/projection-xmpp/src/updates.rs

@@ -21,12 +21,12 @@ impl<'a> XmppConnection<'a> {
                 Message::<()> {
                     to: Some(Jid {
                         name: Some(self.user.xmpp_name.clone()),
-                        server: Server("localhost".into()),
+                        server: Server(self.hostname.clone()),
                         resource: Some(self.user.xmpp_resource.clone()),
                     }),
                     from: Some(Jid {
                         name: Some(Name(room_id.into_inner().into())),
-                        server: Server("rooms.localhost".into()),
+                        server: Server(self.hostname_rooms.clone()),
                         resource: Some(Resource(author_id.into_inner().into())),
                     }),
                     id: None,

crates/projection-xmpp/tests/lib.rs

@@ -1,3 +1,4 @@
+use std::io::ErrorKind;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -6,7 +7,7 @@ use assert_matches::*;
 use prometheus::Registry as MetricsRegistry;
 use quick_xml::events::Event;
 use quick_xml::NsReader;
-use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
+use tokio::io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader};
 use tokio::io::{ReadHalf as GenericReadHalf, WriteHalf as GenericWriteHalf};
 use tokio::net::tcp::{ReadHalf, WriteHalf};
 use tokio::net::TcpStream;
@@ -18,7 +19,7 @@ use tokio_rustls::TlsConnector;
 use lavina_core::player::PlayerRegistry;
 use lavina_core::repo::{Storage, StorageConfig};
 use lavina_core::room::RoomRegistry;
-use projection_xmpp::{launch, ServerConfig};
+use projection_xmpp::{launch, RunningServer, ServerConfig};
 use proto_xmpp::xml::{Continuation, FromXml, Parser};
 
 pub async fn read_irc_message(reader: &mut BufReader<ReadHalf<'_>>, buf: &mut Vec<u8>) -> Result<usize> {
@@ -120,29 +121,50 @@ impl ServerCertVerifier for IgnoreCertVerification {
     }
 }
 
+struct TestServer {
+    metrics: MetricsRegistry,
+    storage: Storage,
+    rooms: RoomRegistry,
+    players: PlayerRegistry,
+    server: RunningServer,
+}
+impl TestServer {
+    async fn start() -> Result<TestServer> {
+        let _ = tracing_subscriber::fmt::try_init();
+        let config = ServerConfig {
+            listen_on: "127.0.0.1:0".parse().unwrap(),
+            cert: "tests/certs/xmpp.pem".parse().unwrap(),
+            key: "tests/certs/xmpp.key".parse().unwrap(),
+            hostname: "localhost".into(),
+        };
+        let mut metrics = MetricsRegistry::new();
+        let mut storage = Storage::open(StorageConfig {
+            db_path: ":memory:".into(),
+        })
+        .await?;
+        let rooms = RoomRegistry::new(&mut metrics, storage.clone()).unwrap();
+        let players = PlayerRegistry::empty(rooms.clone(), storage.clone(), &mut metrics).unwrap();
+        let server = launch(config, players.clone(), rooms.clone(), metrics.clone(), storage.clone()).await.unwrap();
+        Ok(TestServer {
+            metrics,
+            storage,
+            rooms,
+            players,
+            server,
+        })
+    }
+}
+
 #[tokio::test]
 async fn scenario_basic() -> Result<()> {
-    tracing_subscriber::fmt::init();
-    let config = ServerConfig {
-        listen_on: "127.0.0.1:0".parse().unwrap(),
-        cert: "tests/certs/xmpp.pem".parse().unwrap(),
-        key: "tests/certs/xmpp.key".parse().unwrap(),
-    };
-    let mut metrics = MetricsRegistry::new();
-    let mut storage = Storage::open(StorageConfig {
-        db_path: ":memory:".into(),
-    })
-    .await?;
-    let rooms = RoomRegistry::new(&mut metrics, storage.clone()).unwrap();
-    let players = PlayerRegistry::empty(rooms.clone(), &mut metrics).unwrap();
-    let server = launch(config, players, rooms, metrics, storage.clone()).await.unwrap();
+    let mut server = TestServer::start().await?;
 
     // test scenario
 
-    storage.create_user("tester").await?;
-    storage.set_password("tester", "password").await?;
+    server.storage.create_user("tester").await?;
+    server.storage.set_password("tester", "password").await?;
 
-    let mut stream = TcpStream::connect(server.addr).await?;
+    let mut stream = TcpStream::connect(server.server.addr).await?;
     let mut s = TestScope::new(&mut stream);
     tracing::info!("TCP connection established");
 
@@ -167,7 +189,7 @@ async fn scenario_basic() -> Result<()> {
             .with_no_client_auth(),
     ));
     tracing::info!("Initiating TLS connection...");
-    let mut stream = connector.connect(ServerName::IpAddress(server.addr.ip()), stream).await?;
+    let mut stream = connector.connect(ServerName::IpAddress(server.server.addr.ip()), stream).await?;
     tracing::info!("TLS connection established");
 
     let mut s = TestScopeTls::new(&mut stream, buffer);
@@ -181,6 +203,100 @@ async fn scenario_basic() -> Result<()> {
 
     // wrap up
 
-    server.terminate().await?;
+    server.server.terminate().await?;
+    Ok(())
+}
+
+#[tokio::test]
+async fn scenario_basic_without_headers() -> Result<()> {
+    let mut server = TestServer::start().await?;
+
+    // test scenario
+
+    server.storage.create_user("tester").await?;
+    server.storage.set_password("tester", "password").await?;
+
+    let mut stream = TcpStream::connect(server.server.addr).await?;
+    let mut s = TestScope::new(&mut stream);
+    tracing::info!("TCP connection established");
+
+    s.send(r#"<stream:stream xmlns:stream="http://etherx.jabber.org/streams" to="127.0.0.1" xml:lang="en" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns="jabber:client" version="1.0">"#).await?;
+    assert_matches!(s.next_xml_event().await?, Event::Decl(_) => {});
+    assert_matches!(s.next_xml_event().await?, Event::Start(b) => assert_eq!(b.local_name().into_inner(), b"stream"));
+    assert_matches!(s.next_xml_event().await?, Event::Start(b) => assert_eq!(b.local_name().into_inner(), b"features"));
+    assert_matches!(s.next_xml_event().await?, Event::Start(b) => assert_eq!(b.local_name().into_inner(), b"starttls"));
+    assert_matches!(s.next_xml_event().await?, Event::Empty(b) => assert_eq!(b.local_name().into_inner(), b"required"));
+    assert_matches!(s.next_xml_event().await?, Event::End(b) => assert_eq!(b.local_name().into_inner(), b"starttls"));
+    assert_matches!(s.next_xml_event().await?, Event::End(b) => assert_eq!(b.local_name().into_inner(), b"features"));
+    s.send(r#"<starttls/>"#).await?;
+    assert_matches!(s.next_xml_event().await?, Event::Empty(b) => assert_eq!(b.local_name().into_inner(), b"proceed"));
+    let buffer = s.buffer;
+    tracing::info!("TLS feature negotiation complete");
+
+    let connector = TlsConnector::from(Arc::new(
+        ClientConfig::builder()
+            .with_safe_defaults()
+            .with_custom_certificate_verifier(Arc::new(IgnoreCertVerification))
+            .with_no_client_auth(),
+    ));
+    tracing::info!("Initiating TLS connection...");
+    let mut stream = connector.connect(ServerName::IpAddress(server.server.addr.ip()), stream).await?;
+    tracing::info!("TLS connection established");
+
+    let mut s = TestScopeTls::new(&mut stream, buffer);
+
+    s.send(r#"<stream:stream xmlns:stream="http://etherx.jabber.org/streams" to="127.0.0.1" xml:lang="en" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns="jabber:client" version="1.0">"#).await?;
+    assert_matches!(s.next_xml_event().await?, Event::Decl(_) => {});
+    assert_matches!(s.next_xml_event().await?, Event::Start(b) => assert_eq!(b.local_name().into_inner(), b"stream"));
+
+    stream.shutdown().await?;
+
+    // wrap up
+
+    server.server.terminate().await?;
+    Ok(())
+}
+
+#[tokio::test]
+async fn terminate_socket() -> Result<()> {
+    let mut server = TestServer::start().await?;
+
+    // test scenario
+
+    server.storage.create_user("tester").await?;
+    server.storage.set_password("tester", "password").await?;
+
+    let mut stream = TcpStream::connect(server.server.addr).await?;
+    let mut s = TestScope::new(&mut stream);
+    tracing::info!("TCP connection established");
+
+    s.send(r#"<?xml version="1.0"?>"#).await?;
+
+    s.send(r#"<stream:stream xmlns:stream="http://etherx.jabber.org/streams" to="127.0.0.1" xml:lang="en" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns="jabber:client" version="1.0">"#).await?;
+    assert_matches!(s.next_xml_event().await?, Event::Decl(_) => {});
+    assert_matches!(s.next_xml_event().await?, Event::Start(b) => assert_eq!(b.local_name().into_inner(), b"stream"));
+    assert_matches!(s.next_xml_event().await?, Event::Start(b) => assert_eq!(b.local_name().into_inner(), b"features"));
+    assert_matches!(s.next_xml_event().await?, Event::Start(b) => assert_eq!(b.local_name().into_inner(), b"starttls"));
+    assert_matches!(s.next_xml_event().await?, Event::Empty(b) => assert_eq!(b.local_name().into_inner(), b"required"));
+    assert_matches!(s.next_xml_event().await?, Event::End(b) => assert_eq!(b.local_name().into_inner(), b"starttls"));
+    assert_matches!(s.next_xml_event().await?, Event::End(b) => assert_eq!(b.local_name().into_inner(), b"features"));
+    s.send(r#"<starttls/>"#).await?;
+    assert_matches!(s.next_xml_event().await?, Event::Empty(b) => assert_eq!(b.local_name().into_inner(), b"proceed"));
+
+    let connector = TlsConnector::from(Arc::new(
+        ClientConfig::builder()
+            .with_safe_defaults()
+            .with_custom_certificate_verifier(Arc::new(IgnoreCertVerification))
+            .with_no_client_auth(),
+    ));
+
+    tracing::info!("Initiating TLS connection...");
+    let mut stream = connector.connect(ServerName::IpAddress(server.server.addr.ip()), stream).await?;
+    tracing::info!("TLS connection established");
+
+    server.server.terminate().await?;
+
+    assert_eq!(stream.read_u8().await.unwrap_err().kind(), ErrorKind::UnexpectedEof);
+
     Ok(())
 }

crates/proto-irc/src/client.rs

@@ -7,56 +7,56 @@ use nonempty::NonEmpty;
 /// Client-to-server command.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum ClientMessage {
-    /// CAP. Capability-related commands.
+    /// `CAP`. Capability-related commands.
     Capability {
         subcommand: CapabilitySubcommand,
     },
-    /// PING <token>
+    /// `PING <token>`
     Ping {
         token: Str,
     },
-    /// PONG <token>
+    /// `PONG <token>`
     Pong {
         token: Str,
     },
-    /// NICK <nickname>
+    /// `NICK <nickname>`
     Nick {
         nickname: Str,
     },
-    /// PASS <password>
+    /// `PASS <password>`
     Pass {
         password: Str,
     },
-    /// USER <username> 0 * :<realname>
+    /// `USER <username> 0 * :<realname>`
     User {
         username: Str,
         realname: Str,
     },
-    /// JOIN <chan>
+    /// `JOIN <chan>`
     Join(Chan),
-    /// MODE <target>
+    /// `MODE <target>`
     Mode {
         target: Recipient,
     },
-    /// WHO <target>
+    /// `WHO <target>`
     Who {
         target: Recipient, // aka mask
     },
-    /// TOPIC <chan> :<topic>
+    /// `TOPIC <chan> :<topic>`
     Topic {
         chan: Chan,
         topic: Str,
     },
     Part {
         chan: Chan,
-        message: Str,
+        message: Option<Str>,
     },
-    /// PRIVMSG <target> :<msg>
+    /// `PRIVMSG <target> :<msg>`
     PrivateMessage {
         recipient: Recipient,
         body: Str,
     },
-    /// QUIT :<reason>
+    /// `QUIT :<reason>`
     Quit {
         reason: Str,
     },
@@ -194,14 +194,20 @@ fn client_message_topic(input: &str) -> IResult<&str, ClientMessage> {
 fn client_message_part(input: &str) -> IResult<&str, ClientMessage> {
     let (input, _) = tag("PART ")(input)?;
     let (input, chan) = chan(input)?;
-    let (input, _) = tag(" ")(input)?;
+    let (input, t) = opt(tag(" "))(input)?;
+    match t {
+        Some(_) => (),
+        None => {
+            return Ok((input, ClientMessage::Part { chan, message: None }));
+        }
+    }
     let (input, r) = opt(tag(":"))(input)?;
     let (input, message) = match r {
         Some(_) => token(input)?,
         None => receiver(input)?,
     };
 
-    let message = message.into();
+    let message = Some(message.into());
     Ok((input, ClientMessage::Part { chan, message }))
 }
 
@@ -369,7 +375,18 @@ mod test {
         let input = "PART #chan :Pokasiki !!!";
         let expected = ClientMessage::Part {
             chan: Chan::Global("chan".into()),
-            message: "Pokasiki !!!".into(),
+            message: Some("Pokasiki !!!".into()),
+        };
+
+        let result = client_message(input);
+        assert_matches!(result, Ok(result) => assert_eq!(expected, result));
+    }
+    #[test]
+    fn test_client_message_part_empty() {
+        let input = "PART #chan";
+        let expected = ClientMessage::Part {
+            chan: Chan::Global("chan".into()),
+            message: None,
         };
 
         let result = client_message(input);

crates/proto-irc/src/lib.rs

@@ -30,11 +30,15 @@ fn token(input: &str) -> IResult<&str, &str> {
     take_while(|i| i != '\n' && i != '\r')(input)
 }
 
+fn params(input: &str) -> IResult<&str, &str> {
+    take_while(|i| i != '\n' && i != '\r' && i != ':')(input)
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Chan {
-    /// #<name> — network-global channel, available from any server in the network.
+    /// `#<name>` — network-global channel, available from any server in the network.
     Global(Str),
-    /// &<name> — server-local channel, available only to connections to the same server. Rarely used in practice.
+    /// `&<name>` — server-local channel, available only to connections to the same server. Rarely used in practice.
     Local(Str),
 }
 impl Chan {
@@ -114,9 +118,7 @@ mod test {
         assert_matches!(result, Ok((_, result)) => assert_eq!(expected, result));
 
         let mut bytes = vec![];
-        sync_future(expected.write_async(&mut bytes))
-            .unwrap()
-            .unwrap();
+        sync_future(expected.write_async(&mut bytes)).unwrap().unwrap();
 
         assert_eq!(bytes.as_slice(), input.as_bytes());
     }
@@ -130,9 +132,7 @@ mod test {
         assert_matches!(result, Ok((_, result)) => assert_eq!(expected, result));
 
         let mut bytes = vec![];
-        sync_future(expected.write_async(&mut bytes))
-            .unwrap()
-            .unwrap();
+        sync_future(expected.write_async(&mut bytes)).unwrap().unwrap();
 
         assert_eq!(bytes.as_slice(), input.as_bytes());
     }
@@ -146,9 +146,7 @@ mod test {
         assert_matches!(result, Ok((_, result)) => assert_eq!(expected, result));
 
         let mut bytes = vec![];
-        sync_future(expected.write_async(&mut bytes))
-            .unwrap()
-            .unwrap();
+        sync_future(expected.write_async(&mut bytes)).unwrap().unwrap();
 
         assert_eq!(bytes.as_slice(), input.as_bytes());
     }

crates/proto-irc/src/server.rs

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use nonempty::NonEmpty;
 use tokio::io::AsyncWrite;
 use tokio::io::AsyncWriteExt;
@@ -152,7 +154,11 @@ pub enum ServerMessageBody {
     N903SaslSuccess {
         nick: Str,
         message: Str,
-    }
+    },
+    N904SaslFail {
+        nick: Str,
+        text: Str,
+    },
 }
 
 impl ServerMessageBody {
@@ -267,11 +273,7 @@ impl ServerMessageBody {
                 writer.write_all(b" :").await?;
                 writer.write_all(msg.as_bytes()).await?;
             }
-            ServerMessageBody::N332Topic {
-                client,
-                chat,
-                topic,
-            } => {
+            ServerMessageBody::N332Topic { client, chat, topic } => {
                 writer.write_all(b"332 ").await?;
                 writer.write_all(client.as_bytes()).await?;
                 writer.write_all(b" ").await?;
@@ -309,22 +311,21 @@ impl ServerMessageBody {
                 writer.write_all(b" ").await?;
                 writer.write_all(realname.as_bytes()).await?;
             }
-            ServerMessageBody::N353NamesReply {
-                client,
-                chan,
-                members,
-            } => {
+            ServerMessageBody::N353NamesReply { client, chan, members } => {
                 writer.write_all(b"353 ").await?;
                 writer.write_all(client.as_bytes()).await?;
                 writer.write_all(b" = ").await?;
                 chan.write_async(writer).await?;
                 writer.write_all(b" :").await?;
-                for member in members {
-                    writer
-                        .write_all(member.prefix.to_string().as_bytes())
-                        .await?;
+                {
+                    let member = &members.head;
+                    writer.write_all(member.prefix.to_string().as_bytes()).await?;
                     writer.write_all(member.nick.as_bytes()).await?;
+                }
+                for member in &members.tail {
                     writer.write_all(b" ").await?;
+                    writer.write_all(member.prefix.to_string().as_bytes()).await?;
+                    writer.write_all(member.nick.as_bytes()).await?;
                 }
             }
             ServerMessageBody::N366NamesReplyEnd { client, chan } => {
@@ -334,11 +335,7 @@ impl ServerMessageBody {
                 chan.write_async(writer).await?;
                 writer.write_all(b" :End of /NAMES list").await?;
             }
-            ServerMessageBody::N474BannedFromChan {
-                client,
-                chan,
-                message,
-            } => {
+            ServerMessageBody::N474BannedFromChan { client, chan, message } => {
                 writer.write_all(b"474 ").await?;
                 writer.write_all(client.as_bytes()).await?;
                 writer.write_all(b" ").await?;
@@ -353,7 +350,12 @@ impl ServerMessageBody {
                 writer.write_all(b" :").await?;
                 writer.write_all(message.as_bytes()).await?;
             }
-            ServerMessageBody::N900LoggedIn { nick, address, account, message } => {
+            ServerMessageBody::N900LoggedIn {
+                nick,
+                address,
+                account,
+                message,
+            } => {
                 writer.write_all(b"900 ").await?;
                 writer.write_all(nick.as_bytes()).await?;
                 writer.write_all(b" ").await?;
@@ -369,6 +371,13 @@ impl ServerMessageBody {
                 writer.write_all(b" :").await?;
                 writer.write_all(message.as_bytes()).await?;
             }
+            ServerMessageBody::N904SaslFail { nick, text } => {
+                writer.write_all(b"904").await?;
+                writer.write_all(b" ").await?;
+                writer.write_all(nick.as_bytes()).await?;
+                writer.write_all(b" :").await?;
+                writer.write_all(text.as_bytes()).await?;
+            }
         }
         Ok(())
     }

crates/proto-xmpp/src/bind.rs

@@ -11,12 +11,15 @@ pub const XMLNS: &'static str = "urn:ietf:params:xml:ns:xmpp-bind";
 
 // TODO remove `pub` in newtypes, introduce validation
 
+/// Name (node identifier) of an XMPP entity. Placed before the `@` in a JID.
 #[derive(PartialEq, Eq, Debug, Clone)]
 pub struct Name(pub Str);
 
+/// Server name of an XMPP entity. Placed after the `@` and before the `/` in a JID.
 #[derive(PartialEq, Eq, Debug, Clone)]
 pub struct Server(pub Str);
 
+/// Resource of an XMPP entity. Placed after the `/` in a JID.
 #[derive(PartialEq, Eq, Debug, Clone)]
 pub struct Resource(pub Str);
 
@@ -42,27 +45,19 @@ impl Display for Jid {
 
 impl Jid {
     pub fn from_string(i: &str) -> Result<Jid> {
-        use regex::Regex;
         use lazy_static::lazy_static;
+        use regex::Regex;
         lazy_static! {
-            static ref RE: Regex = Regex::new(r"^(([a-zA-Z]+)@)?([a-zA-Z.]+)(/([a-zA-Z\-]+))?$").unwrap();
+            static ref RE: Regex = Regex::new(r"^(([a-zA-Z0-9]+)@)?([^@/]+)(/([a-zA-Z0-9\-]+))?$").unwrap();
         }
-        let m = RE
-            .captures(i)
-            .ok_or(anyhow!("Incorrectly format jid: {i}"))?;
+        let m = RE.captures(i).ok_or(anyhow!("Incorrectly format jid: {i}"))?;
 
         let name = m.get(2).map(|name| Name(name.as_str().into()));
         let server = m.get(3).unwrap();
         let server = Server(server.as_str().into());
-        let resource = m
-            .get(5)
-            .map(|resource| Resource(resource.as_str().into()));
+        let resource = m.get(5).map(|resource| Resource(resource.as_str().into()));
 
-        Ok(Jid {
-            name,
-            server,
-            resource,
-        })
+        Ok(Jid { name, server, resource })
     }
 }
 
@@ -137,9 +132,7 @@ pub struct BindResponse(pub Jid);
 impl ToXml for BindResponse {
     fn serialize(&self, events: &mut Vec<Event<'static>>) {
         events.extend_from_slice(&[
-            Event::Start(BytesStart::new(
-                r#"bind xmlns="urn:ietf:params:xml:ns:xmpp-bind""#,
-            )),
+            Event::Start(BytesStart::new(r#"bind xmlns="urn:ietf:params:xml:ns:xmpp-bind""#)),
             Event::Start(BytesStart::new(r#"jid"#)),
             Event::Text(BytesText::new(self.0.to_string().as_str()).into_owned()),
             Event::End(BytesEnd::new("jid")),
@@ -156,23 +149,16 @@ mod tests {
 
     #[tokio::test]
     async fn parse_message() {
-        let input =
-            r#"<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>mobile</resource></bind>"#;
+        let input = r#"<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>mobile</resource></bind>"#;
         let mut reader = NsReader::from_reader(input.as_bytes());
         let mut buf = vec![];
-        let (ns, event) = reader
-            .read_resolved_event_into_async(&mut buf)
-            .await
-            .unwrap();
+        let (ns, event) = reader.read_resolved_event_into_async(&mut buf).await.unwrap();
         let mut parser = BindRequest::parse().consume(ns, &event);
         let result = loop {
             match parser {
                 Continuation::Final(res) => break res,
                 Continuation::Continue(next) => {
-                    let (ns, event) = reader
-                        .read_resolved_event_into_async(&mut buf)
-                        .await
-                        .unwrap();
+                    let (ns, event) = reader.read_resolved_event_into_async(&mut buf).await.unwrap();
                     parser = next.consume(ns, &event);
                 }
             }

crates/proto-xmpp/src/client.rs

@@ -255,11 +255,49 @@ impl MessageType {
     }
 }
 
+/// Error response to an IQ request.
+///
+/// https://xmpp.org/rfcs/rfc6120.html#stanzas-error
+pub struct IqError {
+    pub r#type: IqErrorType,
+}
+
+pub enum IqErrorType {
+    /// Retry after providing credentials
+    Auth,
+    /// Do not retry (the error cannot be remedied)
+    Cancel,
+    /// Proceed (the condition was only a warning)
+    Continue,
+    /// Retry after changing the data sent
+    Modify,
+    /// Retry after waiting (the error is temporary)
+    Wait,
+}
+impl IqErrorType {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            IqErrorType::Auth => "auth",
+            IqErrorType::Cancel => "cancel",
+            IqErrorType::Continue => "continue",
+            IqErrorType::Modify => "modify",
+            IqErrorType::Wait => "wait",
+        }
+    }
+}
+
+impl ToXml for IqError {
+    fn serialize(&self, events: &mut Vec<Event<'static>>) {
+        let bytes = BytesStart::new(format!(r#"error xmlns="{}" type="{}""#, XMLNS, self.r#type.as_str()));
+        events.push(Event::Empty(bytes));
+    }
+}
+
 #[derive(PartialEq, Eq, Debug)]
 pub struct Iq<T> {
-    pub from: Option<String>,
+    pub from: Option<Jid>,
     pub id: String,
-    pub to: Option<String>,
+    pub to: Option<Jid>,
     pub r#type: IqType,
     pub body: T,
 }
@@ -285,9 +323,9 @@ enum IqParserInner<T: FromXml> {
     Final(IqParserState<T>),
 }
 struct IqParserState<T> {
-    pub from: Option<String>,
+    pub from: Option<Jid>,
     pub id: Option<String>,
-    pub to: Option<String>,
+    pub to: Option<Jid>,
     pub r#type: Option<IqType>,
     pub body: Option<T>,
 }
@@ -310,13 +348,15 @@ impl<T: FromXml> Parser for IqParser<T> {
                         let attr = fail_fast!(attr);
                         if attr.key.0 == b"from" {
                             let value = fail_fast!(std::str::from_utf8(&*attr.value));
-                            state.from = Some(value.to_string())
+                            let value = fail_fast!(Jid::from_string(value));
+                            state.from = Some(value)
                         } else if attr.key.0 == b"id" {
                             let value = fail_fast!(std::str::from_utf8(&*attr.value));
                             state.id = Some(value.to_string())
                         } else if attr.key.0 == b"to" {
                             let value = fail_fast!(std::str::from_utf8(&*attr.value));
-                            state.to = Some(value.to_string())
+                            let value = fail_fast!(Jid::from_string(value));
+                            state.to = Some(value)
                         } else if attr.key.0 == b"type" {
                             let value = fail_fast!(IqType::from_str(&*attr.value));
                             state.r#type = Some(value);
@@ -393,15 +433,17 @@ impl<T: ToXml> ToXml for Iq<T> {
         let mut start = BytesStart::new(start);
         let mut attrs = vec![];
         if let Some(ref from) = self.from {
+            let value = from.to_string().into_bytes();
             attrs.push(Attribute {
                 key: QName(b"from"),
-                value: from.as_bytes().into(),
+                value: value.into(),
             });
         };
         if let Some(ref to) = self.to {
+            let value = to.to_string().into_bytes();
             attrs.push(Attribute {
                 key: QName(b"to"),
-                value: to.as_bytes().into(),
+                value: value.into(),
             });
         }
         attrs.push(Attribute {

crates/proto-xmpp/src/disco.rs

@@ -2,8 +2,8 @@ use quick_xml::events::attributes::Attribute;
 use quick_xml::events::{BytesEnd, BytesStart, Event};
 use quick_xml::name::{QName, ResolveResult};
 
-use anyhow::{Result, anyhow as ffail};
 use crate::xml::*;
+use anyhow::{anyhow as ffail, Result};
 
 use super::bind::Jid;
 
@@ -174,11 +174,7 @@ impl FromXml for Identity {
             let Some(r#type) = r#type else {
                 return Err(ffail!("No type provided"));
             };
-            let item = Identity {
-                category,
-                name,
-                r#type,
-            };
+            let item = Identity { category, name, r#type };
             if end {
                 return Ok(item);
             }

crates/proto-xmpp/src/lib.rs

@@ -1,21 +1,16 @@
-#![feature(
-    coroutines,
-    coroutine_trait,
-    type_alias_impl_trait,
-    impl_trait_in_assoc_type
-)]
+#![feature(coroutines, coroutine_trait, type_alias_impl_trait, impl_trait_in_assoc_type)]
 
 pub mod bind;
 pub mod client;
 pub mod disco;
 pub mod muc;
+mod prelude;
 pub mod roster;
 pub mod sasl;
 pub mod session;
 pub mod stanzaerror;
 pub mod stream;
 pub mod tls;
-mod prelude;
 pub mod xml;
 
 // Implemented as a macro instead of a fn due to borrowck limitations

crates/proto-xmpp/src/roster.rs

@@ -1,47 +1,30 @@
 use quick_xml::events::{BytesStart, Event};
 
 use crate::xml::*;
-use anyhow::{anyhow as ffail, Result};
+use anyhow::{anyhow, Result};
+use quick_xml::name::ResolveResult;
 
 pub const XMLNS: &'static str = "jabber:iq:roster";
 
 #[derive(PartialEq, Eq, Debug)]
 pub struct RosterQuery;
 
-pub struct QueryParser(QueryParserInner);
-
-enum QueryParserInner {
-    Initial,
-    InQuery,
-}
-
-impl Parser for QueryParser {
-    type Output = Result<RosterQuery>;
-
-    fn consume<'a>(
-        self: Self,
-        namespace: quick_xml::name::ResolveResult,
-        event: &quick_xml::events::Event<'a>,
-    ) -> Continuation<Self, Self::Output> {
-        match self.0 {
-            QueryParserInner::Initial => match event {
-                Event::Start(_) => Continuation::Continue(QueryParser(QueryParserInner::InQuery)),
-                Event::Empty(_) => Continuation::Final(Ok(RosterQuery)),
-                _ => Continuation::Final(Err(ffail!("Unexpected XML event: {event:?}"))),
-            },
-            QueryParserInner::InQuery => match event {
-                Event::End(_) => Continuation::Final(Ok(RosterQuery)),
-                _ => Continuation::Final(Err(ffail!("Unexpected XML event: {event:?}"))),
-            },
-        }
-    }
-}
-
 impl FromXml for RosterQuery {
-    type P = QueryParser;
+    type P = impl Parser<Output = Result<Self>>;
 
     fn parse() -> Self::P {
-        QueryParser(QueryParserInner::Initial)
+        |(mut namespace, mut event): (ResolveResult<'static>, &'static Event<'static>)| -> Result<Self> {
+            match event {
+                Event::Start(_) => (),
+                Event::Empty(_) => return Ok(RosterQuery),
+                _ => return Err(anyhow!("Unexpected XML event: {event:?}")),
+            }
+            (namespace, event) = yield;
+            match event {
+                Event::End(_) => return Ok(RosterQuery),
+                _ => return Err(anyhow!("Unexpected XML event: {event:?}")),
+            }
+        }
     }
 }
 
@@ -52,9 +35,6 @@ impl FromXmlTag for RosterQuery {
 
 impl ToXml for RosterQuery {
     fn serialize(&self, events: &mut Vec<Event<'static>>) {
-        events.push(Event::Empty(BytesStart::new(format!(
-            r#"query xmlns="{}""#,
-            XMLNS
-        ))));
+        events.push(Event::Empty(BytesStart::new(format!(r#"query xmlns="{}""#, XMLNS))));
     }
 }

crates/proto-xmpp/src/session.rs

@@ -2,48 +2,29 @@ use quick_xml::events::{BytesStart, Event};
 
 use crate::xml::*;
 use anyhow::{anyhow, Result};
+use quick_xml::name::ResolveResult;
 
 pub const XMLNS: &'static str = "urn:ietf:params:xml:ns:xmpp-session";
 
 #[derive(PartialEq, Eq, Debug)]
 pub struct Session;
 
-pub struct SessionParser(SessionParserInner);
-
-enum SessionParserInner {
-    Initial,
-    InSession,
-}
-
-impl Parser for SessionParser {
-    type Output = Result<Session>;
-
-    fn consume<'a>(
-        self: Self,
-        namespace: quick_xml::name::ResolveResult,
-        event: &quick_xml::events::Event<'a>,
-    ) -> Continuation<Self, Self::Output> {
-        match self.0 {
-            SessionParserInner::Initial => match event {
-                Event::Start(_) => {
-                    Continuation::Continue(SessionParser(SessionParserInner::InSession))
-                }
-                Event::Empty(_) => Continuation::Final(Ok(Session)),
-                _ => Continuation::Final(Err(anyhow!("Unexpected XML event: {event:?}"))),
-            },
-            SessionParserInner::InSession => match event {
-                Event::End(_) => Continuation::Final(Ok(Session)),
-                _ => Continuation::Final(Err(anyhow!("Unexpected XML event: {event:?}"))),
-            },
-        }
-    }
-}
-
 impl FromXml for Session {
-    type P = SessionParser;
+    type P = impl Parser<Output = Result<Self>>;
 
     fn parse() -> Self::P {
-        SessionParser(SessionParserInner::Initial)
+        |(mut namespace, mut event): (ResolveResult<'static>, &'static Event<'static>)| -> Result<Self> {
+            match event {
+                Event::Start(_) => (),
+                Event::Empty(_) => return Ok(Session),
+                _ => return Err(anyhow!("Unexpected XML event: {event:?}")),
+            }
+            (namespace, event) = yield;
+            match event {
+                Event::End(_) => return Ok(Session),
+                _ => return Err(anyhow!("Unexpected XML event: {event:?}")),
+            }
+        }
     }
 }
 
@@ -54,9 +35,6 @@ impl FromXmlTag for Session {
 
 impl ToXml for Session {
     fn serialize(&self, events: &mut Vec<Event<'static>>) {
-        events.push(Event::Empty(BytesStart::new(format!(
-            r#"session xmlns="{}""#,
-            XMLNS
-        ))));
+        events.push(Event::Empty(BytesStart::new(format!(r#"session xmlns="{}""#, XMLNS))));
     }
 }

crates/proto-xmpp/src/stream.rs

@@ -6,8 +6,8 @@ use tokio::io::{AsyncBufRead, AsyncWrite};
 
 use super::skip_text;
 
-use anyhow::{anyhow, Result};
 use crate::xml::ToXml;
+use anyhow::{anyhow, Result};
 
 pub static XMLNS: &'static str = "http://etherx.jabber.org/streams";
 pub static PREFIX: &'static str = "stream";
@@ -24,7 +24,17 @@ impl ClientStreamStart {
         reader: &mut NsReader<impl AsyncBufRead + Unpin>,
         buf: &mut Vec<u8>,
     ) -> Result<ClientStreamStart> {
-        let incoming = skip_text!(reader, buf);
+        let mut incoming = skip_text!(reader, buf);
+        if let Event::Decl(bytes) = incoming {
+            // this is <?xml ...> header
+            if let Some(encoding) = bytes.encoding() {
+                let encoding = encoding?;
+                if &*encoding != b"UTF-8" {
+                    return Err(anyhow!("Unsupported encoding: {encoding:?}"));
+                }
+            }
+            incoming = skip_text!(reader, buf);
+        }
         if let Event::Start(e) = incoming {
             let (ns, local) = reader.resolve_element(e.name());
             if ns != ResolveResult::Bound(Namespace(XMLNS.as_bytes())) {
@@ -44,10 +54,7 @@ impl ClientStreamStart {
                         let value = attr.unescape_value()?;
                         to = Some(value.to_string());
                     }
-                    (
-                        ResolveResult::Bound(Namespace(b"http://www.w3.org/XML/1998/namespace")),
-                        b"lang",
-                    ) => {
+                    (ResolveResult::Bound(Namespace(b"http://www.w3.org/XML/1998/namespace")), b"lang") => {
                         let value = attr.unescape_value()?;
                         lang = Some(value.to_string());
                     }
@@ -124,21 +131,15 @@ pub struct Features {
 }
 impl Features {
     pub async fn write_xml(&self, writer: &mut Writer<impl AsyncWrite + Unpin>) -> Result<()> {
-        writer
-            .write_event_async(Event::Start(BytesStart::new("stream:features")))
-            .await?;
+        writer.write_event_async(Event::Start(BytesStart::new("stream:features"))).await?;
         if self.start_tls {
             writer
                 .write_event_async(Event::Start(BytesStart::new(
                     r#"starttls  xmlns="urn:ietf:params:xml:ns:xmpp-tls""#,
                 )))
                 .await?;
-            writer
-                .write_event_async(Event::Empty(BytesStart::new("required")))
-                .await?;
-            writer
-                .write_event_async(Event::End(BytesEnd::new("starttls")))
-                .await?;
+            writer.write_event_async(Event::Empty(BytesStart::new("required"))).await?;
+            writer.write_event_async(Event::End(BytesEnd::new("starttls"))).await?;
         }
         if self.mechanisms {
             writer
@@ -146,18 +147,10 @@ impl Features {
                     r#"mechanisms xmlns="urn:ietf:params:xml:ns:xmpp-sasl""#,
                 )))
                 .await?;
-            writer
-                .write_event_async(Event::Start(BytesStart::new(r#"mechanism"#)))
-                .await?;
-            writer
-                .write_event_async(Event::Text(BytesText::new("PLAIN")))
-                .await?;
-            writer
-                .write_event_async(Event::End(BytesEnd::new("mechanism")))
-                .await?;
-            writer
-                .write_event_async(Event::End(BytesEnd::new("mechanisms")))
-                .await?;
+            writer.write_event_async(Event::Start(BytesStart::new(r#"mechanism"#))).await?;
+            writer.write_event_async(Event::Text(BytesText::new("PLAIN"))).await?;
+            writer.write_event_async(Event::End(BytesEnd::new("mechanism"))).await?;
+            writer.write_event_async(Event::End(BytesEnd::new("mechanisms"))).await?;
         }
         if self.bind {
             writer
@@ -166,9 +159,7 @@ impl Features {
                 )))
                 .await?;
         }
-        writer
-            .write_event_async(Event::End(BytesEnd::new("stream:features")))
-            .await?;
+        writer.write_event_async(Event::End(BytesEnd::new("stream:features"))).await?;
         Ok(())
     }
 }
@@ -182,9 +173,7 @@ mod test {
         let input = r###"<stream:stream xmlns:stream="http://etherx.jabber.org/streams" to="vlnv.dev" version="1.0" xmlns="jabber:client" xml:lang="en" xmlns:xml="http://www.w3.org/XML/1998/namespace">"###;
         let mut reader = NsReader::from_reader(input.as_bytes());
         let mut buf = vec![];
-        let res = ClientStreamStart::parse(&mut reader, &mut buf)
-            .await
-            .unwrap();
+        let res = ClientStreamStart::parse(&mut reader, &mut buf).await.unwrap();
         assert_eq!(
             res,
             ClientStreamStart {

crates/proto-xmpp/src/tls.rs

@@ -12,10 +12,7 @@ pub static XMLNS: &'static str = "urn:ietf:params:xml:ns:xmpp-tls";
 
 pub struct StartTLS;
 impl StartTLS {
-    pub async fn parse(
-        reader: &mut NsReader<impl AsyncBufRead + Unpin>,
-        buf: &mut Vec<u8>,
-    ) -> Result<StartTLS> {
+    pub async fn parse(reader: &mut NsReader<impl AsyncBufRead + Unpin>, buf: &mut Vec<u8>) -> Result<StartTLS> {
         let incoming = skip_text!(reader, buf);
         if let Event::Empty(ref e) = incoming {
             if e.name().0 == b"starttls" {

crates/proto-xmpp/src/xml/ignore.rs

@@ -1,59 +1,35 @@
 use super::*;
-use derive_more::From;
 
 #[derive(Default, Debug, PartialEq, Eq)]
 pub struct Ignore;
 
-#[derive(From)]
-pub struct IgnoreParser(IgnoreParserInner);
-
-enum IgnoreParserInner {
-    Initial,
-    InTag { name: Vec<u8>, depth: u8 },
-}
-
-impl Parser for IgnoreParser {
-    type Output = Result<Ignore>;
-
-    fn consume<'a>(
-        self: Self,
-        _: ResolveResult,
-        event: &Event<'a>,
-    ) -> Continuation<Self, Self::Output> {
-        match self.0 {
-            IgnoreParserInner::Initial => match event {
-                Event::Start(bytes) => {
-                    let name = bytes.name().0.to_owned();
-                    Continuation::Continue(IgnoreParserInner::InTag { name, depth: 0 }.into())
-                }
-                Event::Empty(_) => Continuation::Final(Ok(Ignore)),
-                _ => Continuation::Final(Ok(Ignore)),
-            },
-            IgnoreParserInner::InTag { name, depth } => match event {
-                Event::End(bytes) if name == bytes.name().0 => {
-                    if depth == 0 {
-                        Continuation::Final(Ok(Ignore))
-                    } else {
-                        Continuation::Continue(
-                            IgnoreParserInner::InTag {
-                                name,
-                                depth: depth - 1,
-                            }
-                            .into(),
-                        )
-                    }
-                }
-                _ => Continuation::Continue(IgnoreParserInner::InTag { name, depth }.into()),
-            },
-        }
-    }
-}
-
 impl FromXml for Ignore {
-    type P = IgnoreParser;
+    type P = impl Parser<Output = Result<Self>>;
 
     fn parse() -> Self::P {
-        IgnoreParserInner::Initial.into()
+        |(mut namespace, mut event): (ResolveResult<'static>, &'static Event<'static>)| -> Result<Self> {
+            let mut depth = match event {
+                Event::Start(bytes) => 0,
+                Event::Empty(_) => return Ok(Ignore),
+                _ => return Ok(Ignore),
+            };
+            loop {
+                (namespace, event) = yield;
+                match event {
+                    Event::End(_) => {
+                        if depth == 0 {
+                            return Ok(Ignore);
+                        } else {
+                            depth -= 1;
+                        }
+                    }
+                    Event::Start(_) => {
+                        depth += 1;
+                    }
+                    _ => (),
+                }
+            }
+        }
     }
 }
 

crates/proto-xmpp/src/xml/mod.rs

@@ -1,9 +1,9 @@
 use std::ops::Coroutine;
 use std::pin::Pin;
 
-use quick_xml::NsReader;
 use quick_xml::events::Event;
 use quick_xml::name::ResolveResult;
+use quick_xml::NsReader;
 
 use anyhow::Result;
 
@@ -28,25 +28,16 @@ pub trait FromXmlTag: FromXml {
 pub trait Parser: Sized {
     type Output;
 
-    fn consume<'a>(
-        self: Self,
-        namespace: ResolveResult,
-        event: &Event<'a>,
-    ) -> Continuation<Self, Self::Output>;
+    fn consume<'a>(self: Self, namespace: ResolveResult, event: &Event<'a>) -> Continuation<Self, Self::Output>;
 }
 
 impl<T, Out> Parser for T
 where
-    T: Coroutine<(ResolveResult<'static>, &'static Event<'static>), Yield = (), Return = Out>
-        + Unpin,
+    T: Coroutine<(ResolveResult<'static>, &'static Event<'static>), Yield = (), Return = Out> + Unpin,
 {
     type Output = Out;
 
-    fn consume<'a>(
-        mut self: Self,
-        namespace: ResolveResult,
-        event: &Event<'a>,
-    ) -> Continuation<Self, Self::Output> {
+    fn consume<'a>(mut self: Self, namespace: ResolveResult, event: &Event<'a>) -> Continuation<Self, Self::Output> {
         let s = Pin::new(&mut self);
         // this is a very rude workaround fixing the fact that rust coroutines
         // 1. don't support higher-kinded lifetimes (i.e. no `impl for <'a> Coroutine<Event<'a>>)

docs/cheatsheet.md

@@ -8,11 +8,12 @@ Some useful commands for development and testing.
 
 Following commands require `OpenSSL` to be installed. It is provided as `openssl` package in Arch Linux.
 
-Generate self-signed TLS certificate:
+Generate self-signed TLS certificate. Mind the common name (CN) field, it should match the domain name of the server.
+Example for localhost:
 
     openssl req -x509 -newkey rsa:4096 -sha256 -days 365 -noenc \
     -keyout certs/xmpp.key -out certs/xmpp.pem \
-    -subj "/CN=example.com"
+    -subj "/CN=localhost"
 
 Print content of a TLS certificate:
 
@@ -35,4 +36,4 @@ Connecting:
 Password should be the same as in storage.
 Example:
 
-    /connect -nocap 127.0.0.1 6667 parolchik1 kek
+    /connect -nocap 127.0.0.1 6667 parolchik1 kek

docs/running.md

@@ -19,6 +19,7 @@ server_name = "irc.localhost"
 listen_on = "127.0.0.1:5222"
 cert = "./certs/xmpp.pem"
 key = "./certs/xmpp.key"
+hostname = "localhost"
 
 [storage]
 db_path = "db.sqlite"

rust-toolchain

@@ -1 +1 @@
-nightly-2023-12-07
+nightly-2024-04-19

rustfmt.toml

@@ -1 +1,2 @@
-max_width = 120
+max_width = 120
+chain_width = 120

src/main.rs

@@ -52,7 +52,7 @@ async fn main() -> Result<()> {
     let mut metrics = MetricsRegistry::new();
     let storage = Storage::open(storage_config).await?;
     let rooms = RoomRegistry::new(&mut metrics, storage.clone())?;
-    let mut players = PlayerRegistry::empty(rooms.clone(), &mut metrics)?;
+    let mut players = PlayerRegistry::empty(rooms.clone(), storage.clone(), &mut metrics)?;
     let telemetry_terminator = http::launch(telemetry_config, metrics.clone(), rooms.clone(), storage.clone()).await?;
     let irc = projection_irc::launch(
         irc_config,
@@ -62,7 +62,14 @@ async fn main() -> Result<()> {
         storage.clone(),
     )
     .await?;
-    let xmpp = projection_xmpp::launch(xmpp_config, players.clone(), rooms.clone(), metrics.clone(), storage.clone()).await?;
+    let xmpp = projection_xmpp::launch(
+        xmpp_config,
+        players.clone(),
+        rooms.clone(),
+        metrics.clone(),
+        storage.clone(),
+    )
+    .await?;
     tracing::info!("Started");
 
     sleep.await;