forked from lavina/lavina
Compare commits
3 Commits
f3fd15b781
...
775f43a1f3
Author | SHA1 | Date |
---|---|---|
Mikhail | 775f43a1f3 | |
Mikhail | 660794c1dd | |
Mikhail | 04c2ef68a3 |
|
@ -15,10 +15,6 @@ impl Storage {
|
||||||
memberships
|
memberships
|
||||||
where
|
where
|
||||||
user_id = ? and room_id = ?;
|
user_id = ? and room_id = ?;
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 775f43a (Fix query)
|
|
||||||
",
|
",
|
||||||
)
|
)
|
||||||
.bind(player_id)
|
.bind(player_id)
|
||||||
|
|
|
@ -159,8 +159,6 @@ impl RoomHandle {
|
||||||
let room_storage_id = lock.storage_id;
|
let room_storage_id = lock.storage_id;
|
||||||
if !lock.storage.is_room_member(room_storage_id, player_storage_id).await.unwrap() {
|
if !lock.storage.is_room_member(room_storage_id, player_storage_id).await.unwrap() {
|
||||||
lock.storage.add_room_member(room_storage_id, player_storage_id).await.unwrap();
|
lock.storage.add_room_member(room_storage_id, player_storage_id).await.unwrap();
|
||||||
} else {
|
|
||||||
tracing::warn!("User {} has already been added to the room.", player_id);
|
|
||||||
}
|
}
|
||||||
lock.members.insert(player_id.clone());
|
lock.members.insert(player_id.clone());
|
||||||
let update = Updates::RoomJoined {
|
let update = Updates::RoomJoined {
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
use quick_xml::events::Event;
|
use quick_xml::events::Event;
|
||||||
|
|
||||||
use lavina_core::room::{RoomId, RoomRegistry};
|
use lavina_core::room::{RoomId, RoomRegistry};
|
||||||
use proto_xmpp::bind::{BindRequest, BindResponse, Jid, Name, Server};
|
use proto_xmpp::bind::{BindResponse, Jid, Name, Server};
|
||||||
use proto_xmpp::client::{Iq, IqError, IqErrorType, IqType};
|
use proto_xmpp::client::{Iq, IqError, IqErrorType, IqType, Message, MessageType};
|
||||||
use proto_xmpp::disco::{Feature, Identity, InfoQuery, Item, ItemQuery};
|
use proto_xmpp::disco::{Feature, Identity, InfoQuery, Item, ItemQuery};
|
||||||
use proto_xmpp::mam::{Fin, Set};
|
use proto_xmpp::mam::{Fin, Set};
|
||||||
use proto_xmpp::roster::RosterQuery;
|
use proto_xmpp::roster::RosterQuery;
|
||||||
|
@ -17,13 +17,17 @@ use crate::XmppConnection;
|
||||||
impl<'a> XmppConnection<'a> {
|
impl<'a> XmppConnection<'a> {
|
||||||
pub async fn handle_iq(&self, output: &mut Vec<Event<'static>>, iq: Iq<IqClientBody>) {
|
pub async fn handle_iq(&self, output: &mut Vec<Event<'static>>, iq: Iq<IqClientBody>) {
|
||||||
match iq.body {
|
match iq.body {
|
||||||
IqClientBody::Bind(req) => {
|
IqClientBody::Bind(_) => {
|
||||||
let req = Iq {
|
let req = Iq {
|
||||||
from: None,
|
from: None,
|
||||||
id: iq.id,
|
id: iq.id,
|
||||||
to: None,
|
to: None,
|
||||||
r#type: IqType::Result,
|
r#type: IqType::Result,
|
||||||
body: self.bind(&req).await,
|
body: BindResponse(Jid {
|
||||||
|
name: Some(self.user.xmpp_name.clone()),
|
||||||
|
server: Server(self.hostname.clone()),
|
||||||
|
resource: Some(self.user.xmpp_resource.clone()),
|
||||||
|
}),
|
||||||
};
|
};
|
||||||
req.serialize(output);
|
req.serialize(output);
|
||||||
}
|
}
|
||||||
|
@ -110,14 +114,6 @@ impl<'a> XmppConnection<'a> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn bind(&self, req: &BindRequest) -> BindResponse {
|
|
||||||
BindResponse(Jid {
|
|
||||||
name: Some(self.user.xmpp_name.clone()),
|
|
||||||
server: Server(self.hostname.clone()),
|
|
||||||
resource: Some(self.user.xmpp_resource.clone()),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn disco_info(&self, to: Option<&Jid>, req: &InfoQuery) -> Result<InfoQuery, IqError> {
|
async fn disco_info(&self, to: Option<&Jid>, req: &InfoQuery) -> Result<InfoQuery, IqError> {
|
||||||
let identity;
|
let identity;
|
||||||
let feature;
|
let feature;
|
||||||
|
|
|
@ -41,9 +41,6 @@ mod message;
|
||||||
mod presence;
|
mod presence;
|
||||||
mod updates;
|
mod updates;
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod testkit;
|
|
||||||
|
|
||||||
#[derive(Deserialize, Debug, Clone)]
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
pub struct ServerConfig {
|
pub struct ServerConfig {
|
||||||
pub listen_on: SocketAddr,
|
pub listen_on: SocketAddr,
|
||||||
|
|
|
@ -22,8 +22,7 @@ impl<'a> XmppConnection<'a> {
|
||||||
// resources in MUCs are members' personas – not implemented (yet?)
|
// resources in MUCs are members' personas – not implemented (yet?)
|
||||||
resource: Some(_),
|
resource: Some(_),
|
||||||
}) if server.0 == self.hostname_rooms => {
|
}) if server.0 == self.hostname_rooms => {
|
||||||
let response = self.muc_presence(&name).await?;
|
self.muc_presence(name, output).await?;
|
||||||
response.serialize(output);
|
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
// TODO other presence cases
|
// TODO other presence cases
|
||||||
|
@ -59,8 +58,7 @@ impl<'a> XmppConnection<'a> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// todo: return Presence and serialize on the outside.
|
async fn muc_presence(&mut self, name: Name, output: &mut Vec<Event<'static>>) -> Result<()> {
|
||||||
async fn muc_presence(&mut self, name: &Name) -> Result<(Presence<()>)> {
|
|
||||||
let a = self.user_handle.join_room(RoomId::from(name.0.clone())?).await?;
|
let a = self.user_handle.join_room(RoomId::from(name.0.clone())?).await?;
|
||||||
// TODO handle bans
|
// TODO handle bans
|
||||||
let response = Presence::<()> {
|
let response = Presence::<()> {
|
||||||
|
@ -76,101 +74,7 @@ impl<'a> XmppConnection<'a> {
|
||||||
}),
|
}),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
Ok(response)
|
response.serialize(output);
|
||||||
}
|
Ok(())
|
||||||
}
|
|
||||||
|
|
||||||
// todo: set up so that the user has been previously joined.
|
|
||||||
// todo: first call to muc_presence is OK, next one is OK too.
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use crate::testkit::{expect_user_authenticated, TestServer};
|
|
||||||
use crate::{Authenticated, XmppConnection};
|
|
||||||
use lavina_core::player::PlayerId;
|
|
||||||
use proto_xmpp::bind::{BindRequest, BindResponse, Jid, Name, Resource, Server};
|
|
||||||
use proto_xmpp::client::Presence;
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn test_muc_joining() {
|
|
||||||
let server = TestServer::start().await.unwrap();
|
|
||||||
|
|
||||||
server.storage.create_user("tester").await.unwrap();
|
|
||||||
|
|
||||||
let player_id = PlayerId::from("tester").unwrap();
|
|
||||||
let user = Authenticated {
|
|
||||||
player_id,
|
|
||||||
xmpp_name: Name("tester".into()),
|
|
||||||
xmpp_resource: Resource("tester".into()),
|
|
||||||
xmpp_muc_name: Resource("tester".into()),
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut player_conn = server.core.players.connect_to_player(&user.player_id).await;
|
|
||||||
let mut conn = expect_user_authenticated(&server, &user, &mut player_conn).await.unwrap();
|
|
||||||
|
|
||||||
let response = conn.muc_presence(&user.xmpp_name).await.unwrap();
|
|
||||||
let expected = Presence::<()> {
|
|
||||||
to: Some(Jid {
|
|
||||||
name: Some(conn.user.xmpp_name.clone()),
|
|
||||||
server: Server(conn.hostname.clone()),
|
|
||||||
resource: Some(conn.user.xmpp_resource.clone()),
|
|
||||||
}),
|
|
||||||
from: Some(Jid {
|
|
||||||
name: Some(user.xmpp_name.clone()),
|
|
||||||
server: Server(conn.hostname_rooms.clone()),
|
|
||||||
resource: Some(conn.user.xmpp_muc_name.clone()),
|
|
||||||
}),
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
assert_eq!(expected, response);
|
|
||||||
|
|
||||||
server.shutdown().await.unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test that joining a room second time after a server restart,
|
|
||||||
// i.e. in-memory cache of memberships is cleaned, does not cause any issues.
|
|
||||||
#[tokio::test]
|
|
||||||
async fn test_muc_joining_twice() {
|
|
||||||
let server = TestServer::start().await.unwrap();
|
|
||||||
|
|
||||||
server.storage.create_user("tester").await.unwrap();
|
|
||||||
|
|
||||||
let player_id = PlayerId::from("tester").unwrap();
|
|
||||||
let user = Authenticated {
|
|
||||||
player_id,
|
|
||||||
xmpp_name: Name("tester".into()),
|
|
||||||
xmpp_resource: Resource("tester".into()),
|
|
||||||
xmpp_muc_name: Resource("tester".into()),
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut player_conn = server.core.players.connect_to_player(&user.player_id).await;
|
|
||||||
let mut conn = expect_user_authenticated(&server, &user, &mut player_conn).await.unwrap();
|
|
||||||
|
|
||||||
let response = conn.muc_presence(&user.xmpp_name).await.unwrap();
|
|
||||||
let expected = Presence::<()> {
|
|
||||||
to: Some(Jid {
|
|
||||||
name: Some(conn.user.xmpp_name.clone()),
|
|
||||||
server: Server(conn.hostname.clone()),
|
|
||||||
resource: Some(conn.user.xmpp_resource.clone()),
|
|
||||||
}),
|
|
||||||
from: Some(Jid {
|
|
||||||
name: Some(user.xmpp_name.clone()),
|
|
||||||
server: Server(conn.hostname_rooms.clone()),
|
|
||||||
resource: Some(conn.user.xmpp_muc_name.clone()),
|
|
||||||
}),
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
assert_eq!(expected, response);
|
|
||||||
|
|
||||||
drop(conn);
|
|
||||||
let server = server.reboot().await.unwrap();
|
|
||||||
|
|
||||||
let mut player_conn = server.core.players.connect_to_player(&user.player_id).await;
|
|
||||||
let mut conn = expect_user_authenticated(&server, &user, &mut player_conn).await.unwrap();
|
|
||||||
|
|
||||||
let response = conn.muc_presence(&user.xmpp_name).await.unwrap();
|
|
||||||
assert_eq!(expected, response);
|
|
||||||
|
|
||||||
server.shutdown().await.unwrap();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,66 +0,0 @@
|
||||||
use crate::{Authenticated, XmppConnection};
|
|
||||||
use lavina_core::player::{PlayerConnection, PlayerId};
|
|
||||||
use lavina_core::repo::{Storage, StorageConfig};
|
|
||||||
use lavina_core::LavinaCore;
|
|
||||||
use prometheus::Registry as MetricsRegistry;
|
|
||||||
use proto_xmpp::bind::{BindRequest, BindResponse, Jid, Name, Resource, Server};
|
|
||||||
|
|
||||||
pub(crate) struct TestServer {
|
|
||||||
pub metrics: MetricsRegistry,
|
|
||||||
pub storage: Storage,
|
|
||||||
pub core: LavinaCore,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TestServer {
|
|
||||||
pub async fn start() -> anyhow::Result<TestServer> {
|
|
||||||
let _ = tracing_subscriber::fmt::try_init();
|
|
||||||
let metrics = MetricsRegistry::new();
|
|
||||||
let storage = Storage::open(StorageConfig {
|
|
||||||
db_path: ":memory:".into(),
|
|
||||||
})
|
|
||||||
.await?;
|
|
||||||
let core = LavinaCore::new(metrics.clone(), storage.clone()).await?;
|
|
||||||
Ok(TestServer { metrics, storage, core })
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn reboot(self) -> anyhow::Result<TestServer> {
|
|
||||||
self.core.shutdown().await?;
|
|
||||||
|
|
||||||
let metrics = MetricsRegistry::new();
|
|
||||||
let core = LavinaCore::new(metrics.clone(), self.storage.clone()).await?;
|
|
||||||
|
|
||||||
Ok(TestServer {
|
|
||||||
metrics,
|
|
||||||
storage: self.storage.clone(),
|
|
||||||
core,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn shutdown(self) -> anyhow::Result<()> {
|
|
||||||
self.core.shutdown().await?;
|
|
||||||
self.storage.close().await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn expect_user_authenticated<'a>(
|
|
||||||
server: &'a TestServer,
|
|
||||||
user: &'a Authenticated,
|
|
||||||
conn: &'a mut PlayerConnection,
|
|
||||||
) -> anyhow::Result<XmppConnection<'a>> {
|
|
||||||
let conn = XmppConnection {
|
|
||||||
user: &user,
|
|
||||||
user_handle: conn,
|
|
||||||
rooms: &server.core.rooms,
|
|
||||||
hostname: "localhost".into(),
|
|
||||||
hostname_rooms: "rooms.localhost".into(),
|
|
||||||
};
|
|
||||||
let result = conn.bind(&BindRequest(Resource("whatever".into()))).await;
|
|
||||||
let expected = BindResponse(Jid {
|
|
||||||
name: Some(Name("tester".into())),
|
|
||||||
server: Server("localhost".into()),
|
|
||||||
resource: Some(Resource("tester".into())),
|
|
||||||
});
|
|
||||||
assert_eq!(expected, result);
|
|
||||||
Ok(conn)
|
|
||||||
}
|
|
|
@ -127,16 +127,12 @@ impl FromXml for BindRequest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(PartialEq, Eq, Debug)]
|
|
||||||
pub struct BindResponse(pub Jid);
|
pub struct BindResponse(pub Jid);
|
||||||
|
|
||||||
impl ToXml for BindResponse {
|
impl ToXml for BindResponse {
|
||||||
fn serialize(&self, events: &mut Vec<Event<'static>>) {
|
fn serialize(&self, events: &mut Vec<Event<'static>>) {
|
||||||
events.extend_from_slice(&[
|
events.extend_from_slice(&[
|
||||||
Event::Start(BytesStart::from_content(
|
Event::Start(BytesStart::new(r#"bind xmlns="urn:ietf:params:xml:ns:xmpp-bind""#)),
|
||||||
r#"bind xmlns="urn:ietf:params:xml:ns:xmpp-bind""#,
|
|
||||||
4,
|
|
||||||
)),
|
|
||||||
Event::Start(BytesStart::new(r#"jid"#)),
|
Event::Start(BytesStart::new(r#"jid"#)),
|
||||||
Event::Text(BytesText::new(self.0.to_string().as_str()).into_owned()),
|
Event::Text(BytesText::new(self.0.to_string().as_str()).into_owned()),
|
||||||
Event::End(BytesEnd::new("jid")),
|
Event::End(BytesEnd::new("jid")),
|
||||||
|
|
Loading…
Reference in New Issue