diff options
| author | louiz’ <louiz@louiz.org> | 2018-05-15 19:58:03 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2018-05-15 19:58:03 +0200 |
| commit | 28d79a9eaa5a85f1f44d03a224517e1ccae294ba (patch) | |
| tree | a8f7212f26daaa3f94ccadcd028027c896887e0e | |
| parent | ba61d2034058818fe76cef6b23f311259d37b3fe (diff) | |
| parent | 1c4620d992d64e585c028659b0001b5f8ba94235 (diff) | |
| download | biboumi-28d79a9eaa5a85f1f44d03a224517e1ccae294ba.tar.gz biboumi-28d79a9eaa5a85f1f44d03a224517e1ccae294ba.tar.bz2 biboumi-28d79a9eaa5a85f1f44d03a224517e1ccae294ba.tar.xz biboumi-28d79a9eaa5a85f1f44d03a224517e1ccae294ba.zip | |
Merge branch 'v8'
| -rw-r--r-- | CHANGELOG.rst | 5 | ||||
| -rw-r--r-- | packaging/biboumi.spec.cmake | 3 | ||||
| -rw-r--r-- | src/irc/irc_client.cpp | 19 | ||||
| -rw-r--r-- | tests/end_to_end/__main__.py | 17 |
4 files changed, 43 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5f65bfc..4cba737 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,11 @@ Version 9.0 - SIGHUP is now caught and reloads the configuration like SIGUSR1 and 2. +Version 8.1 - 2018-05-14 +======================== + +- Fix a crash on a raw NAMES command + Version 8.0 - 2018-05-02 ======================== diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake index 7e20583..5ef34b6 100644 --- a/packaging/biboumi.spec.cmake +++ b/packaging/biboumi.spec.cmake @@ -66,6 +66,9 @@ make check %{?_smp_mflags} * ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1 - Build latest git revision +* Wed May 14 2018 Le Coz Florent <louiz@louiz.org> - 8.1-1 + Update to version 8.1 + * Wed May 2 2018 Le Coz Florent <louiz@louiz.org> - 8.0-1 Update to version 8.0 diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp index 8f77e0d..d0b2153 100644 --- a/src/irc/irc_client.cpp +++ b/src/irc/irc_client.cpp @@ -536,7 +536,9 @@ void IrcClient::send_ping_command() void IrcClient::forward_server_message(const IrcMessage& message) { const std::string from = message.prefix; - const std::string body = message.arguments[1]; + std::string body; + for (auto it = std::next(message.arguments.begin()); it != message.arguments.end(); ++it) + body += *it + ' '; this->bridge.send_xmpp_message(this->hostname, from, body); } @@ -639,6 +641,11 @@ void IrcClient::set_and_forward_user_list(const IrcMessage& message) { const std::string chan_name = utils::tolower(message.arguments[2]); IrcChannel* channel = this->get_channel(chan_name); + if (channel->joined) + { + this->forward_server_message(message); + return; + } std::vector<std::string> nicks = utils::split(message.arguments[3], ' '); for (const std::string& nick: nicks) { @@ -774,6 +781,16 @@ void IrcClient::on_channel_completely_joined(const IrcMessage& message) { const std::string chan_name = utils::tolower(message.arguments[1]); IrcChannel* channel = this->get_channel(chan_name); + if (chan_name == "*" || channel->joined) + { + this->forward_server_message(message); + return; + } + if (!channel->get_self()) + { + log_error("End of NAMES list but we never received our own nick."); + return; + } channel->joined = true; this->bridge.send_user_join(this->hostname, chan_name, channel->get_self(), channel->get_self()->get_most_significant_mode(this->sorted_user_modes), true); diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py index fe4587e..bef510c 100644 --- a/tests/end_to_end/__main__.py +++ b/tests/end_to_end/__main__.py @@ -608,6 +608,23 @@ if __name__ == '__main__': ), partial(expect_stanza, "/message[@from='#foo%{irc_server_one}'][@type='groupchat']/subject[not(text())]"), ]), + Scenario("raw_names_command", + [ + 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"), + partial(expect_stanza, + "/presence/muc_user:x/muc_user:status[@code='110']" + ), + partial(expect_stanza, "/message/subject[not(text())]"), + partial(send_stanza, + "<message type='chat' from='{jid_one}/{resource_one}' to='{irc_server_one}'><body>NAMES</body></message>"), + partial(expect_stanza, "/message/body[text()='irc.localhost: = #foo @{nick_one} ']"), + partial(expect_stanza, "/message/body[text()='irc.localhost: * End of /NAMES list. ']"), + ]), Scenario("quit", [ handshake_sequence(), |