summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-05-18 22:53:17 +0200
committerlouiz’ <louiz@louiz.org>2016-06-08 01:42:43 +0200
commit367de4826c3c7298a88e80c92e325081a3c3d794 (patch)
tree260ab1b2b70837270a22554e2f2bd09abc866f69
parent0a2123f8a2db3f94aa5758868e999cb3224235c2 (diff)
downloadbiboumi-367de4826c3c7298a88e80c92e325081a3c3d794.tar.gz
biboumi-367de4826c3c7298a88e80c92e325081a3c3d794.tar.bz2
biboumi-367de4826c3c7298a88e80c92e325081a3c3d794.tar.xz
biboumi-367de4826c3c7298a88e80c92e325081a3c3d794.zip
Associate a bridge with a bare JID instead of a full JID
ref #2556
-rw-r--r--src/xmpp/biboumi_component.cpp10
-rw-r--r--src/xmpp/biboumi_component.hpp2
-rw-r--r--tests/end_to_end/__main__.py26
3 files changed, 33 insertions, 5 deletions
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index 5b1d0e0..94d85c6 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -507,22 +507,24 @@ void BiboumiComponent::handle_iq(const Stanza& stanza)
Bridge* BiboumiComponent::get_user_bridge(const std::string& user_jid)
{
+ auto bare_jid = Jid{user_jid}.bare();
try
{
- return this->bridges.at(user_jid).get();
+ return this->bridges.at(bare_jid).get();
}
catch (const std::out_of_range& exception)
{
- this->bridges.emplace(user_jid, std::make_unique<Bridge>(user_jid, *this, this->poller));
- return this->bridges.at(user_jid).get();
+ this->bridges.emplace(bare_jid, std::make_unique<Bridge>(bare_jid, *this, this->poller));
+ return this->bridges.at(bare_jid).get();
}
}
Bridge* BiboumiComponent::find_user_bridge(const std::string& user_jid)
{
+ auto bare_jid = Jid{user_jid}.bare();
try
{
- return this->bridges.at(user_jid).get();
+ return this->bridges.at(bare_jid).get();
}
catch (const std::out_of_range& exception)
{
diff --git a/src/xmpp/biboumi_component.hpp b/src/xmpp/biboumi_component.hpp
index f1817e2..4d5995e 100644
--- a/src/xmpp/biboumi_component.hpp
+++ b/src/xmpp/biboumi_component.hpp
@@ -83,7 +83,7 @@ public:
private:
/**
- * Return the bridge associated with the given full JID. Create a new one
+ * Return the bridge associated with the bare JID. Create a new one
* if none already exist.
*/
Bridge* get_user_bridge(const std::string& user_jid);
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index 706d177..630f59a 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -296,6 +296,7 @@ common_replacements = {
'irc_host_one': 'irc.localhost',
'biboumi_host': 'biboumi.localhost',
'resource_one': 'resource1',
+ 'resource_two': 'resource2',
'nick_one': 'Nick',
'jid_one': 'first@example.com',
'jid_two': 'second@example.com',
@@ -579,6 +580,31 @@ if __name__ == '__main__':
partial(send_stanza, "<iq type='set' id='hello-command2' from='{jid_one}/{resource_one}' to='{biboumi_host}'><command xmlns='http://jabber.org/protocol/commands' node='hello' sessionid='{sessionid}' action='next'><x xmlns='jabber:x:data' type='submit'><field var='name'><value>COUCOU</value></field></x></command></iq>"),
partial(expect_stanza, "/iq[@type='result']/commands:command[@node='hello'][@status='completed']/commands:note[@type='info'][text()='Hello COUCOU!']")
]),
+ Scenario("simple_multisessionnick",
+ [
+ handshake_sequence(),
+ partial(send_stanza,
+ "<presence from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}/{nick_one}' />"),
+ connection_sequence("irc.localhost", '{jid_one}/{resource_one}'),
+ partial(expect_stanza,
+ "/message/body[text()='Mode #foo [+nt] by {irc_host_one}']"),
+ partial(expect_stanza,
+ ("/presence[@to='{jid_one}/{resource_one}'][@from='#foo%{irc_server_one}/{nick_one}']/muc_user:x/muc_user:item[@affiliation='admin'][@role='moderator']",
+ "/presence/muc_user:x/muc_user:status[@code='110']")
+ ),
+ partial(expect_stanza, "/message[@from='#foo%{irc_server_one}'][@type='groupchat']/subject[not(text())]"),
+
+ # The other resources joins the same room, with the same nick
+ partial(send_stanza,
+ "<presence from='{jid_one}/{resource_two}' to='#foo%{irc_server_one}/{nick_one}' />"),
+ # We receive our own join
+ partial(expect_stanza,
+ ("/presence[@to='{jid_one}/{resource_two}'][@from='#foo%{irc_server_one}/{nick_one}']/muc_user:x/muc_user:item[@affiliation='admin'][@role='moderator']",
+ "/presence/muc_user:x/muc_user:status[@code='110']")
+ ),
+ partial(expect_stanza, "/message[@from='#foo%{irc_server_one}'][@type='groupchat']/subject[not(text())]"),
+ ]),
+
)
failures = 0