From 28f1dd76548fc9a7de3920d938903f68cdfffe0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Mon, 3 Oct 2016 21:35:16 +0200
Subject: Make version requests work with global user JIDs as well

fix #3210
---
 src/bridge/bridge.cpp          |  2 +-
 src/xmpp/biboumi_component.cpp |  3 ++-
 tests/end_to_end/__main__.py   | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 65171a9..7724ba7 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -713,7 +713,7 @@ void Bridge::send_irc_version_request(const std::string& irc_hostname, const std
       if (irc_hostname != hostname)
         return false;
       IrcUser user(message.prefix);
-      if (message.command == "NOTICE" && user.nick == target &&
+      if (message.command == "NOTICE" && utils::tolower(user.nick) == utils::tolower(target) &&
           message.arguments.size() >= 2 && message.arguments[1].substr(0, 9) == "\01VERSION ")
         {
           // remove the "\01VERSION " and the "\01" parts from the string
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index f43b5e0..1e66b62 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -412,7 +412,8 @@ void BiboumiComponent::handle_iq(const Stanza& stanza)
       else if ((query = stanza.get_child("query", VERSION_NS)))
         {
           Iid iid(to.local, bridge);
-          if (iid.type != Iid::Type::Server && !to.resource.empty())
+          if ((iid.type == Iid::Type::Channel && !to.resource.empty()) ||
+              (iid.type == Iid::Type::User))
             {
               // Get the IRC user version
               std::string target;
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index f4decff..25cf29c 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -999,6 +999,36 @@ if __name__ == '__main__':
                      partial(expect_stanza,
                              "/iq[@from='#foo%{irc_server_one}/{nick_one}'][@type='result'][@to='{jid_one}/{resource_one}'][@id='second_version']"),
                  ]),
+                Scenario("version_on_global_nick",
+                [
+                    partial(log_message, "Joining the channel"),
+                    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())]"),
+
+                    partial(log_message, "Send a version request to ourself"),
+                     partial(send_stanza,
+                             "<iq type='get' from='{jid_one}/{resource_one}' id='first_version' to='{lower_nick_one}%{irc_server_one}'><query xmlns='jabber:iq:version' /></iq>"),
+
+                     partial(log_message, "Receive our own request"),
+                     partial(expect_stanza,
+                             "/iq[@from='{lower_nick_one}%{irc_server_one}'][@type='get'][@to='{jid_one}/{resource_one}']",
+                             after = partial(save_value, "id", partial(extract_attribute, "/iq", 'id'))),
+                     partial(log_message, "Respond to the request"),
+                     partial(send_stanza,
+                             "<iq type='result' to='{lower_nick_one}%{irc_server_one}' id='{id}' from='{jid_one}/{resource_one}'><query xmlns='jabber:iq:version'><name>e2e test</name><version>1.0</version><os>Fedora</os></query></iq>"),
+                     partial(expect_stanza,
+                             "/iq[@from='{lower_nick_one}%{irc_server_one}'][@type='result'][@to='{jid_one}/{resource_one}'][@id='first_version']/version:query/version:name[text()='e2e test (through the biboumi gateway) 1.0 Fedora']"),
+
+                ]),
                 Scenario("self_invite",
                 [
                     handshake_sequence(),
-- 
cgit v1.2.3