summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2017-04-04 21:38:53 +0200
committerlouiz’ <louiz@louiz.org>2017-04-04 21:38:53 +0200
commit0878a0342c5a2ae6abcfaecc2d9f0c9d3fd0dbad (patch)
tree65d2e38c8652ea6054a23457994aa46777a8c6e7 /src
parente4cc69607c91db43cf154326aaba8afbe97a4c81 (diff)
downloadbiboumi-0878a0342c5a2ae6abcfaecc2d9f0c9d3fd0dbad.tar.gz
biboumi-0878a0342c5a2ae6abcfaecc2d9f0c9d3fd0dbad.tar.bz2
biboumi-0878a0342c5a2ae6abcfaecc2d9f0c9d3fd0dbad.tar.xz
biboumi-0878a0342c5a2ae6abcfaecc2d9f0c9d3fd0dbad.zip
Do not allow pings from resources that aren’t in the channel
fix #3252
Diffstat (limited to 'src')
-rw-r--r--src/bridge/bridge.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 2da1d96..4966b0d 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -744,9 +744,10 @@ void Bridge::send_irc_participant_ping_request(const Iid& iid, const std::string
const std::string& iq_id, const std::string& to_jid,
const std::string& from_jid)
{
+ Jid from(to_jid);
IrcClient* irc = this->get_irc_client(iid.get_server());
IrcChannel* chan = irc->get_channel(iid.get_local());
- if (!chan->joined)
+ 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",
"", true);