summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schäfer <j.wielicki@sotecware.net>2019-08-20 20:11:10 +0200
committerJonas Schäfer <j.wielicki@sotecware.net>2019-08-20 21:42:43 +0200
commita8ce138dd2367f39e3a90857869245a197bb9f8c (patch)
treefb385897672755bf179abe58c29f7e265750ef30
parentb68f36056dab9f7cd8f6b9fcda4db445df1b5ada (diff)
downloadbiboumi-a8ce138dd2367f39e3a90857869245a197bb9f8c.tar.gz
biboumi-a8ce138dd2367f39e3a90857869245a197bb9f8c.tar.bz2
biboumi-a8ce138dd2367f39e3a90857869245a197bb9f8c.tar.xz
biboumi-a8ce138dd2367f39e3a90857869245a197bb9f8c.zip
XEP-0410: set not-in-the-room error condition to not-acceptable
XEP-0410 demands that. This changes the error condition for all pings to the room, even those which aren’t self-pings, if the sender is not joined. The conditions of XEP-0410 were based on observing existing implementations.
-rw-r--r--src/bridge/bridge.cpp2
-rw-r--r--tests/end_to_end/__main__.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index f065930..4d4e9de 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -743,7 +743,7 @@ void Bridge::send_irc_participant_ping_request(const Iid& iid, const std::string
IrcChannel* chan = irc->get_channel(iid.get_local());
if (!chan->joined || !this->is_resource_in_chan(iid.to_tuple(), from.resource))
{
- this->xmpp.send_stanza_error("iq", to_jid, from_jid, iq_id, "cancel", "not-allowed",
+ this->xmpp.send_stanza_error("iq", to_jid, from_jid, iq_id, "cancel", "not-acceptable",
"", true);
return;
}
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index 67dffc9..f6cf38b 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -1543,14 +1543,14 @@ if __name__ == '__main__':
"<iq type='get' from='{jid_one}/{resource_one}' id='first_ping' to='#nil%{irc_server_one}/{nick_one}'><ping xmlns='urn:xmpp:ping' /></iq>"),
# Immediately receive an error
partial(expect_stanza,
- "/iq[@from='#nil%{irc_server_one}/{nick_one}'][@type='error'][@to='{jid_one}/{resource_one}'][@id='first_ping']/error/stanza:not-allowed"),
+ "/iq[@from='#nil%{irc_server_one}/{nick_one}'][@type='error'][@to='{jid_one}/{resource_one}'][@id='first_ping']/error/stanza:not-acceptable"),
# Send a ping to ourself, in a muc where we are, but not this resource
partial(send_stanza,
"<iq type='get' from='{jid_one}/{resource_two}' id='first_ping' to='#foo%{irc_server_one}/{nick_one}'><ping xmlns='urn:xmpp:ping' /></iq>"),
# Immediately receive an error
partial(expect_stanza,
- "/iq[@from='#foo%{irc_server_one}/{nick_one}'][@type='error'][@to='{jid_one}/{resource_two}'][@id='first_ping']/error/stanza:not-allowed"),
+ "/iq[@from='#foo%{irc_server_one}/{nick_one}'][@type='error'][@to='{jid_one}/{resource_two}'][@id='first_ping']/error/stanza:not-acceptable"),
]),
Scenario("self_ping_on_real_channel",
[