From f8da92a8bed4fccff5e1999460b6ad3723d247f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= Date: Thu, 10 Oct 2019 21:15:09 +0200 Subject: =?UTF-8?q?Always=20send=20direct=20messages=20to=20the=20user?= =?UTF-8?q?=E2=80=99s=20bare=20JID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This has the following advantages: - Works while all resources are offline (persistent channels) - Helps with combating duplicate messages when sent to different resources, resources going offline, carbon-copying etc. etc. As a side effect, this also makes the MUC PMs not be MUC PMs and always be emitted from the server-wide JID of the sending user. Fixes #3313. --- src/bridge/bridge.cpp | 19 ++++--------------- tests/end_to_end/scenarios/channel_messages.py | 16 ++++++++-------- tests/end_to_end/scenarios/multisessionnick.py | 24 +++++++----------------- 3 files changed, 19 insertions(+), 40 deletions(-) diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp index 424c72a..ae459fd 100644 --- a/src/bridge/bridge.cpp +++ b/src/bridge/bridge.cpp @@ -872,21 +872,10 @@ void Bridge::send_message(const Iid& iid, const std::string& nick, const std::st } else { - const auto it = this->preferred_user_from.find(iid.get_local()); - if (it != this->preferred_user_from.end()) - { - const auto chan_name = Iid(Jid(it->second).local, {}).get_local(); - for (const auto& resource: this->resources_in_chan[ChannelKey{chan_name, iid.get_server()}]) - this->xmpp.send_message(it->second, this->make_xmpp_body(body, encoding), - this->user_jid + "/" - + resource, "chat", true, true, true); - } - else - { - for (const auto& resource: this->resources_in_server[iid.get_server()]) - this->xmpp.send_message(std::to_string(iid), this->make_xmpp_body(body, encoding), - this->user_jid + "/" + resource, "chat", false, true); - } + this->xmpp.send_message(std::to_string(iid), + this->make_xmpp_body(body, encoding), + this->user_jid, + "chat", false, true); } } diff --git a/tests/end_to_end/scenarios/channel_messages.py b/tests/end_to_end/scenarios/channel_messages.py index 09ac1ae..ef45300 100644 --- a/tests/end_to_end/scenarios/channel_messages.py +++ b/tests/end_to_end/scenarios/channel_messages.py @@ -37,12 +37,12 @@ scenario = ( # Send a private message, to a in-room JID send_stanza("coucou in private"), # Message is received with a server-wide JID - expect_stanza("/message[@from='{lower_nick_one}%{irc_server_one}'][@to='{jid_two}/{resource_one}'][@type='chat']/body[text()='coucou in private']"), + expect_stanza("/message[@from='{lower_nick_one}%{irc_server_one}'][@to='{jid_two}'][@type='chat']/body[text()='coucou in private']"), # Respond to the message, to the server-wide JID send_stanza("yes"), - # The response is received from the in-room JID - expect_stanza("/message[@from='#foo%{irc_server_one}/{nick_two}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='yes']", - "/message/muc_user:x"), + # The response is received from the server-wide JID without MUC PM marker + expect_stanza("/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}'][@type='chat']/body[text()='yes']", + "!/message/muc_user:x"), # Do the exact same thing, from a different chan, # to check if the response comes from the right JID send_stanza(""), @@ -52,12 +52,12 @@ scenario = ( send_stanza("re in private"), # Message is received with a server-wide JID - expect_stanza("/message[@from='{lower_nick_one}%{irc_server_one}'][@to='{jid_two}/{resource_one}'][@type='chat']/body[text()='re in private']"), + expect_stanza("/message[@from='{lower_nick_one}%{irc_server_one}'][@to='{jid_two}'][@type='chat']/body[text()='re in private']"), # Respond to the message, to the server-wide JID send_stanza("re"), - # The response is received from the in-room JID - expect_stanza("/message[@from='#dummy%{irc_server_one}/{nick_two}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='re']"), + # The response is received from the server-wide JID + expect_stanza("/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}'][@type='chat']/body[text()='re']"), # Now we leave the room, to check if the subsequent private messages are still received properly send_stanza(""), @@ -65,5 +65,5 @@ scenario = ( # The private messages from this nick should now come (again) from the server-wide JID send_stanza("hihihoho"), - expect_stanza("/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}']"), + expect_stanza("/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}']"), ) diff --git a/tests/end_to_end/scenarios/multisessionnick.py b/tests/end_to_end/scenarios/multisessionnick.py index 2fd84f9..1377a94 100644 --- a/tests/end_to_end/scenarios/multisessionnick.py +++ b/tests/end_to_end/scenarios/multisessionnick.py @@ -51,20 +51,10 @@ scenario = ( # That second user sends a private message to the first one send_stanza("RELLO"), - # Message is received with a server-wide JID, by the two resources behind nick_one - expect_unordered( - [ - "/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='RELLO']", - "/message/hints:no-copy", - "/message/carbon:private", - "!/message/muc_user:x", - ], - [ - "/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_two}'][@type='chat']/body[text()='RELLO']", - "/message/hints:no-copy", - "/message/carbon:private", - "!/message/muc_user:x", - ] + # Message is received with a server-wide JID to the bare JID as non-MUC-PM + expect_stanza( + "/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}'][@type='chat']/body[text()='RELLO']", + "!/message/muc_user:x", ), # First occupant (with the two resources) changes her/his nick to a conflicting one @@ -117,9 +107,9 @@ scenario = ( send_stanza("first"), send_stanza("second"), - # The first user receives the two messages, on the connected resource, once each + # The first user receives the two messages to the bare JID expect_unordered( - ["/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='first']"], - ["/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='second']"] + ["/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}'][@type='chat']/body[text()='first']"], + ["/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}'][@type='chat']/body[text()='second']"] ), ) -- cgit v1.2.3