/***************************************************************************
- * Copyright (C) 2005-2012 by the Quassel Project *
+ * Copyright (C) 2005-2022 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "ctcpparser.h"
+#include "corenetworkconfig.h"
#include "coresession.h"
+#include "coreuserinputhandler.h"
#include "ctcpevent.h"
+#include "irctags.h"
#include "messageevent.h"
const QByteArray XDELIM = "\001";
-CtcpParser::CtcpParser(CoreSession *coreSession, QObject *parent)
- : QObject(parent),
- _coreSession(coreSession)
+CtcpParser::CtcpParser(CoreSession* coreSession, QObject* parent)
+ : QObject(parent)
+ , _coreSession(coreSession)
{
QByteArray MQUOTE = QByteArray("\020");
_ctcpMDequoteHash[MQUOTE + '0'] = QByteArray(1, '\000');
_ctcpMDequoteHash[MQUOTE + 'r'] = QByteArray(1, '\r');
_ctcpMDequoteHash[MQUOTE + MQUOTE] = MQUOTE;
- QByteArray XQUOTE = QByteArray("\134");
- _ctcpXDelimDequoteHash[XQUOTE + XQUOTE] = XQUOTE;
- _ctcpXDelimDequoteHash[XQUOTE + QByteArray("a")] = XDELIM;
+ setStandardCtcp(_coreSession->networkConfig()->standardCtcp());
- connect(this, SIGNAL(newEvent(Event *)), _coreSession->eventManager(), SLOT(postEvent(Event *)));
+ connect(_coreSession->networkConfig(), &NetworkConfig::standardCtcpSet, this, &CtcpParser::setStandardCtcp);
+ connect(this, &CtcpParser::newEvent, _coreSession->eventManager(), &EventManager::postEvent);
}
+void CtcpParser::setStandardCtcp(bool enabled)
+{
+ QByteArray XQUOTE = QByteArray(R"(\)");
+ if (enabled)
+ _ctcpXDelimDequoteHash[XQUOTE + XQUOTE] = XQUOTE;
+ else
+ _ctcpXDelimDequoteHash.remove(XQUOTE + XQUOTE);
+ _ctcpXDelimDequoteHash[XQUOTE + QByteArray("a")] = XDELIM;
+}
-void CtcpParser::displayMsg(NetworkEvent *event, Message::Type msgType, const QString &msg, const QString &sender,
- const QString &target, Message::Flags msgFlags)
+void CtcpParser::displayMsg(NetworkEvent* event,
+ Message::Type msgType,
+ QString msg,
+ QString sender,
+ QString target,
+ Message::Flags msgFlags)
{
if (event->testFlag(EventManager::Silent))
return;
- MessageEvent *msgEvent = new MessageEvent(msgType, event->network(), msg, sender, target, msgFlags);
- msgEvent->setTimestamp(event->timestamp());
-
+ MessageEvent* msgEvent = new MessageEvent(msgType, event->network(), std::move(msg), std::move(sender), std::move(target), msgFlags, event->timestamp());
+ if (event->testFlag(EventManager::Self)) {
+ msgEvent->setFlag(EventManager::Self);
+ }
emit newEvent(msgEvent);
}
-
-QByteArray CtcpParser::lowLevelQuote(const QByteArray &message)
+QByteArray CtcpParser::lowLevelQuote(const QByteArray& message)
{
QByteArray quotedMessage = message;
QHash<QByteArray, QByteArray>::const_iterator quoteIter = quoteHash.constBegin();
while (quoteIter != quoteHash.constEnd()) {
quotedMessage.replace(quoteIter.value(), quoteIter.key());
- quoteIter++;
+ ++quoteIter;
}
return quotedMessage;
}
-
-QByteArray CtcpParser::lowLevelDequote(const QByteArray &message)
+QByteArray CtcpParser::lowLevelDequote(const QByteArray& message)
{
QByteArray dequotedMessage;
QByteArray messagepart;
// copy dequote Message
for (int i = 0; i < message.size(); i++) {
messagepart = message.mid(i, 1);
- if (i+1 < message.size()) {
+ if (i + 1 < message.size()) {
for (ctcpquote = _ctcpMDequoteHash.begin(); ctcpquote != _ctcpMDequoteHash.end(); ++ctcpquote) {
if (message.mid(i, 2) == ctcpquote.key()) {
messagepart = ctcpquote.value();
return dequotedMessage;
}
-
-QByteArray CtcpParser::xdelimQuote(const QByteArray &message)
+QByteArray CtcpParser::xdelimQuote(const QByteArray& message)
{
QByteArray quotedMessage = message;
QHash<QByteArray, QByteArray>::const_iterator quoteIter = _ctcpXDelimDequoteHash.constBegin();
while (quoteIter != _ctcpXDelimDequoteHash.constEnd()) {
quotedMessage.replace(quoteIter.value(), quoteIter.key());
- quoteIter++;
+ ++quoteIter;
}
return quotedMessage;
}
-
-QByteArray CtcpParser::xdelimDequote(const QByteArray &message)
+QByteArray CtcpParser::xdelimDequote(const QByteArray& message)
{
QByteArray dequotedMessage;
QByteArray messagepart;
for (int i = 0; i < message.size(); i++) {
messagepart = message.mid(i, 1);
- if (i+1 < message.size()) {
+ if (i + 1 < message.size()) {
for (xdelimquote = _ctcpXDelimDequoteHash.begin(); xdelimquote != _ctcpXDelimDequoteHash.end(); ++xdelimquote) {
if (message.mid(i, 2) == xdelimquote.key()) {
messagepart = xdelimquote.value();
return dequotedMessage;
}
-
-void CtcpParser::processIrcEventRawNotice(IrcEventRawMessage *event)
+void CtcpParser::processIrcEventRawNotice(IrcEventRawMessage* event)
{
parse(event, Message::Notice);
}
-
-void CtcpParser::processIrcEventRawPrivmsg(IrcEventRawMessage *event)
+void CtcpParser::processIrcEventRawPrivmsg(IrcEventRawMessage* event)
{
parse(event, Message::Plain);
}
+void CtcpParser::parse(IrcEventRawMessage* e, Message::Type messagetype)
+{
+ // lowlevel message dequote
+ QByteArray dequotedMessage = lowLevelDequote(e->rawMessage());
+
+ CtcpEvent::CtcpType ctcptype = e->type() == EventManager::IrcEventRawNotice ? CtcpEvent::Reply : CtcpEvent::Query;
-void CtcpParser::parse(IrcEventRawMessage *e, Message::Type messagetype)
+ Message::Flags flags = (ctcptype == CtcpEvent::Reply && !e->network()->isChannelName(e->target())) ? Message::Redirected : Message::None;
+
+ bool isStatusMsg = false;
+
+ // First remove all statusmsg prefix characters that are not also channel prefix characters.
+ while (e->network()->isStatusMsg(e->target()) && !e->network()->isChannelName(e->target())) {
+ isStatusMsg = true;
+ e->setTarget(e->target().remove(0, 1));
+ }
+
+ // Then continue removing statusmsg characters as long as removing the character will still result in a
+ // valid channel name. This prevents removing the channel prefix character if said character is in the
+ // overlap between the statusmsg characters and the channel prefix characters.
+ while (e->network()->isStatusMsg(e->target()) && e->network()->isChannelName(e->target().remove(0, 1))) {
+ isStatusMsg = true;
+ e->setTarget(e->target().remove(0, 1));
+ }
+
+ // If any statusmsg characters were removed, Flag the message as a StatusMsg.
+ if (isStatusMsg) {
+ flags |= Message::StatusMsg;
+ }
+
+ // For self-messages, pass the flag on to the message, too
+ if (e->testFlag(EventManager::Self)) {
+ flags |= Message::Self;
+ }
+
+ if (coreSession()->networkConfig()->standardCtcp())
+ parseStandard(e, messagetype, dequotedMessage, ctcptype, flags);
+ else
+ parseSimple(e, messagetype, dequotedMessage, ctcptype, flags);
+}
+
+// only accept CTCPs in their simplest form, i.e. one ctcp, from start to
+// end, no text around it; not as per the 'specs', but makes people happier
+void CtcpParser::parseSimple(IrcEventRawMessage* e,
+ Message::Type messagetype,
+ const QByteArray& dequotedMessage,
+ CtcpEvent::CtcpType ctcptype,
+ Message::Flags flags)
{
- QByteArray ctcp;
+ if (dequotedMessage.count(XDELIM) != 2 || dequotedMessage[0] != '\001' || dequotedMessage[dequotedMessage.count() - 1] != '\001') {
+ displayMsg(e, messagetype, targetDecode(e, dequotedMessage), e->prefix(), e->target(), flags);
+ }
+ else {
+ int spacePos;
+ QString ctcpcmd, ctcpparam;
- //lowlevel message dequote
- QByteArray dequotedMessage = lowLevelDequote(e->rawMessage());
+ QByteArray ctcp = xdelimDequote(dequotedMessage.mid(1, dequotedMessage.count() - 2));
+ spacePos = ctcp.indexOf(' ');
+ if (spacePos != -1) {
+ ctcpcmd = targetDecode(e, ctcp.left(spacePos));
+ ctcpparam = targetDecode(e, ctcp.mid(spacePos + 1));
+ }
+ else {
+ ctcpcmd = targetDecode(e, ctcp);
+ ctcpparam = QString();
+ }
+ ctcpcmd = ctcpcmd.toUpper();
- CtcpEvent::CtcpType ctcptype = e->type() == EventManager::IrcEventRawNotice
- ? CtcpEvent::Reply
- : CtcpEvent::Query;
+ bool isAction = ctcpcmd == QLatin1String("ACTION");
+ // we don't want to block /me messages by the CTCP ignore list
+ if (isAction
+ || !coreSession()->ignoreListManager()->ctcpMatch(e->prefix(), e->network()->networkName(), ctcpcmd)) {
+ QUuid uuid = QUuid::createUuid();
+ _replies.insert(uuid, CtcpReply(coreNetwork(e), nickFromMask(e->prefix())));
+ CtcpEvent* event = new CtcpEvent(EventManager::CtcpEvent,
+ e->network(),
+ isAction ? QHash<IrcTagKey, QString>() : e->tags(),
+ e->prefix(),
+ e->target(),
+ ctcptype,
+ ctcpcmd,
+ ctcpparam,
+ e->timestamp(),
+ uuid);
+ if (e->testFlag(EventManager::Self)) {
+ event->setFlag(EventManager::Self);
+ }
+ emit newEvent(event);
+ CtcpEvent* flushEvent = new CtcpEvent(EventManager::CtcpEventFlush,
+ e->network(),
+ {},
+ e->prefix(),
+ e->target(),
+ ctcptype,
+ "INVALID",
+ QString(),
+ e->timestamp(),
+ uuid);
+ emit newEvent(flushEvent);
+ }
+ }
+}
- Message::Flags flags = (ctcptype == CtcpEvent::Reply && !e->network()->isChannelName(e->target()))
- ? Message::Redirected
- : Message::None;
+void CtcpParser::parseStandard(IrcEventRawMessage* e,
+ Message::Type messagetype,
+ const QByteArray& dequotedMessage_,
+ CtcpEvent::CtcpType ctcptype,
+ Message::Flags flags)
+{
+ auto dequotedMessage = dequotedMessage_;
+ QByteArray ctcp;
- QList<CtcpEvent *> ctcpEvents;
- QUuid uuid; // needed to group all replies together
+ QList<CtcpEvent*> ctcpEvents;
+ QUuid uuid; // needed to group all replies together
// extract tagged / extended data
int xdelimPos = -1;
ctcp = xdelimDequote(dequotedMessage.mid(xdelimPos + 1, xdelimEndPos - xdelimPos - 1));
dequotedMessage = dequotedMessage.mid(xdelimEndPos + 1);
- //dispatch the ctcp command
+ // dispatch the ctcp command
QString ctcpcmd = targetDecode(e, ctcp.left(spacePos));
QString ctcpparam = targetDecode(e, ctcp.mid(spacePos + 1));
ctcpcmd = ctcpcmd.toUpper();
+ bool isAction = ctcpcmd == QLatin1String("ACTION");
// we don't want to block /me messages by the CTCP ignore list
- if (ctcpcmd == QLatin1String("ACTION") || !coreSession()->ignoreListManager()->ctcpMatch(e->prefix(), e->network()->networkName(), ctcpcmd)) {
+ if (isAction
+ || !coreSession()->ignoreListManager()->ctcpMatch(e->prefix(), e->network()->networkName(), ctcpcmd)) {
if (uuid.isNull())
uuid = QUuid::createUuid();
- CtcpEvent *event = new CtcpEvent(EventManager::CtcpEvent, e->network(), e->prefix(), e->target(),
- ctcptype, ctcpcmd, ctcpparam, e->timestamp(), uuid);
+ CtcpEvent* event = new CtcpEvent(EventManager::CtcpEvent,
+ e->network(),
+ isAction ? QHash<IrcTagKey, QString>() : e->tags(),
+ e->prefix(),
+ e->target(),
+ ctcptype,
+ ctcpcmd,
+ ctcpparam,
+ e->timestamp(),
+ uuid);
+ if (e->testFlag(EventManager::Self)) {
+ event->setFlag(EventManager::Self);
+ }
ctcpEvents << event;
}
}
if (!ctcpEvents.isEmpty()) {
_replies.insert(uuid, CtcpReply(coreNetwork(e), nickFromMask(e->prefix())));
- CtcpEvent *flushEvent = new CtcpEvent(EventManager::CtcpEventFlush, e->network(), e->prefix(), e->target(),
- ctcptype, "INVALID", QString(), e->timestamp(), uuid);
+ CtcpEvent* flushEvent = new CtcpEvent(EventManager::CtcpEventFlush,
+ e->network(),
+ {},
+ e->prefix(),
+ e->target(),
+ ctcptype,
+ "INVALID",
+ QString(),
+ e->timestamp(),
+ uuid);
ctcpEvents << flushEvent;
- foreach(CtcpEvent *event, ctcpEvents) {
+ for (CtcpEvent* event : ctcpEvents) {
emit newEvent(event);
}
}
displayMsg(e, messagetype, targetDecode(e, dequotedMessage), e->prefix(), e->target(), flags);
}
-
-void CtcpParser::sendCtcpEvent(CtcpEvent *e)
+void CtcpParser::sendCtcpEvent(CtcpEvent* e)
{
- CoreNetwork *net = coreNetwork(e);
+ CoreNetwork* net = coreNetwork(e);
if (e->type() == EventManager::CtcpEvent) {
QByteArray quotedReply;
QString bufname = nickFromMask(e->prefix());
if (e->ctcpType() == CtcpEvent::Query && !e->reply().isNull()) {
if (_replies.contains(e->uuid()))
- _replies[e->uuid()].replies << lowLevelQuote(pack(net->serverEncode(e->ctcpCmd()),
- net->userEncode(bufname, e->reply())));
+ _replies[e->uuid()].replies << lowLevelQuote(pack(net->serverEncode(e->ctcpCmd()), net->userEncode(bufname, e->reply())));
else
// reply not caused by a request processed in here, so send it off immediately
reply(net, bufname, e->ctcpCmd(), e->reply());
}
}
-
-QByteArray CtcpParser::pack(const QByteArray &ctcpTag, const QByteArray &message)
+QByteArray CtcpParser::pack(const QByteArray& ctcpTag, const QByteArray& message)
{
if (message.isEmpty())
return XDELIM + ctcpTag + XDELIM;
return XDELIM + ctcpTag + ' ' + xdelimQuote(message) + XDELIM;
}
-
-void CtcpParser::query(CoreNetwork *net, const QString &bufname, const QString &ctcpTag, const QString &message)
+void CtcpParser::query(CoreNetwork* net, const QString& bufname, const QString& ctcpTag, const QString& message)
{
- QList<QByteArray> params;
- params << net->serverEncode(bufname) << lowLevelQuote(pack(net->serverEncode(ctcpTag), net->userEncode(bufname, message)));
- net->putCmd("PRIVMSG", params);
-}
+ QString cmd("PRIVMSG");
+ std::function<QList<QByteArray>(QString&)> cmdGenerator = [&](QString& splitMsg) -> QList<QByteArray> {
+ return QList<QByteArray>() << net->serverEncode(bufname)
+ << lowLevelQuote(pack(net->serverEncode(ctcpTag), net->userEncode(bufname, splitMsg)));
+ };
-void CtcpParser::reply(CoreNetwork *net, const QString &bufname, const QString &ctcpTag, const QString &message)
+ net->putCmd(cmd, net->splitMessage(cmd, message, cmdGenerator));
+}
+
+void CtcpParser::reply(CoreNetwork* net, const QString& bufname, const QString& ctcpTag, const QString& message)
{
QList<QByteArray> params;
params << net->serverEncode(bufname) << lowLevelQuote(pack(net->serverEncode(ctcpTag), net->userEncode(bufname, message)));
net->putCmd("NOTICE", params);
}
-
-void CtcpParser::packedReply(CoreNetwork *net, const QString &bufname, const QList<QByteArray> &replies)
+void CtcpParser::packedReply(CoreNetwork* net, const QString& bufname, const QList<QByteArray>& replies)
{
QList<QByteArray> params;
projects / quassel.git / blobdiff