X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fctcphandler.cpp;h=56f8b3329120386b479a95f8c2ca7f3a65f0b4a5;hp=a944c02220aca5a93962f8d403a197ee24b9d79d;hb=36ea1791352d34e34b6c6cdef02455a4c43acc17;hpb=5c6804f291a63f978e328aeddcc8448e3443b45e diff --git a/src/core/ctcphandler.cpp b/src/core/ctcphandler.cpp index a944c022..56f8b332 100644 --- a/src/core/ctcphandler.cpp +++ b/src/core/ctcphandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-10 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,16 +23,18 @@ #include "network.h" #include "quassel.h" #include "util.h" +#include "coreignorelistmanager.h" -CtcpHandler::CtcpHandler(NetworkConnection *parent) - : BasicHandler(parent), - XDELIM("\001") +CtcpHandler::CtcpHandler(CoreNetwork *parent) + : CoreBasicHandler(parent), + XDELIM("\001"), + _ignoreListManager(parent->ignoreListManager()) { QByteArray MQUOTE = QByteArray("\020"); - ctcpMDequoteHash[MQUOTE + '0'] = QByteArray("\000"); - ctcpMDequoteHash[MQUOTE + 'n'] = QByteArray("\n"); - ctcpMDequoteHash[MQUOTE + 'r'] = QByteArray("\r"); + ctcpMDequoteHash[MQUOTE + '0'] = QByteArray(1, '\000'); + ctcpMDequoteHash[MQUOTE + 'n'] = QByteArray(1, '\n'); + ctcpMDequoteHash[MQUOTE + 'r'] = QByteArray(1, '\r'); ctcpMDequoteHash[MQUOTE + MQUOTE] = MQUOTE; QByteArray XQUOTE = QByteArray("\134"); @@ -40,7 +42,23 @@ CtcpHandler::CtcpHandler(NetworkConnection *parent) ctcpXDelimDequoteHash[XQUOTE + QByteArray("a")] = XDELIM; } -QByteArray CtcpHandler::dequote(const QByteArray &message) { +QByteArray CtcpHandler::lowLevelQuote(const QByteArray &message) { + QByteArray quotedMessage = message; + + QHash quoteHash = ctcpMDequoteHash; + QByteArray MQUOTE = QByteArray("\020"); + quoteHash.remove(MQUOTE + MQUOTE); + quotedMessage.replace(MQUOTE, MQUOTE + MQUOTE); + + QHash::const_iterator quoteIter = quoteHash.constBegin(); + while(quoteIter != quoteHash.constEnd()) { + quotedMessage.replace(quoteIter.value(), quoteIter.key()); + quoteIter++; + } + return quotedMessage; +} + +QByteArray CtcpHandler::lowLevelDequote(const QByteArray &message) { QByteArray dequotedMessage; QByteArray messagepart; QHash::iterator ctcpquote; @@ -62,6 +80,15 @@ QByteArray CtcpHandler::dequote(const QByteArray &message) { return dequotedMessage; } +QByteArray CtcpHandler::xdelimQuote(const QByteArray &message) { + QByteArray quotedMessage = message; + QHash::const_iterator quoteIter = ctcpXDelimDequoteHash.constBegin(); + while(quoteIter != ctcpXDelimDequoteHash.constEnd()) { + quotedMessage.replace(quoteIter.value(), quoteIter.key()); + quoteIter++; + } + return quotedMessage; +} QByteArray CtcpHandler::xdelimDequote(const QByteArray &message) { QByteArray dequotedMessage; @@ -88,7 +115,7 @@ void CtcpHandler::parse(Message::Type messageType, const QString &prefix, const QByteArray ctcp; //lowlevel message dequote - QByteArray dequotedMessage = dequote(message); + QByteArray dequotedMessage = lowLevelDequote(message); CtcpType ctcptype = messageType == Message::Notice ? CtcpReply @@ -102,6 +129,7 @@ void CtcpHandler::parse(Message::Type messageType, const QString &prefix, const int xdelimPos = -1; int xdelimEndPos = -1; int spacePos = -1; + QList replies; while((xdelimPos = dequotedMessage.indexOf(XDELIM)) != -1) { if(xdelimPos > 0) displayMsg(messageType, target, userDecode(target, dequotedMessage.left(xdelimPos)), prefix, flags); @@ -127,7 +155,16 @@ void CtcpHandler::parse(Message::Type messageType, const QString &prefix, const ctcpparam = QString(); } - handle(ctcpcmd, Q_ARG(CtcpType, ctcptype), Q_ARG(QString, prefix), Q_ARG(QString, target), Q_ARG(QString, ctcpparam)); + if(!_ignoreListManager->ctcpMatch(prefix, network()->networkName(), ctcpcmd.toUpper())) { + QString reply_; + handle(ctcpcmd, Q_ARG(CtcpType, ctcptype), Q_ARG(QString, prefix), Q_ARG(QString, target), Q_ARG(QString, ctcpparam), Q_ARG(QString, reply_)); + if(ctcptype == CtcpQuery && !reply_.isNull()) { + replies << lowLevelQuote(pack(serverEncode(ctcpcmd), userEncode(nickFromMask(prefix), reply_))); + } + } + } + if(ctcptype == CtcpQuery && !replies.isEmpty()) { + packedReply(nickFromMask(prefix), replies); } if(!dequotedMessage.isEmpty()) @@ -135,60 +172,113 @@ void CtcpHandler::parse(Message::Type messageType, const QString &prefix, const } QByteArray CtcpHandler::pack(const QByteArray &ctcpTag, const QByteArray &message) { - return XDELIM + ctcpTag + ' ' + message + XDELIM; + if(message.isEmpty()) + return XDELIM + ctcpTag + XDELIM; + + return XDELIM + ctcpTag + ' ' + xdelimQuote(message) + XDELIM; } -// TODO handle encodings correctly! void CtcpHandler::query(const QString &bufname, const QString &ctcpTag, const QString &message) { QList params; - params << serverEncode(bufname) << pack(serverEncode(ctcpTag), userEncode(bufname, message)); + params << serverEncode(bufname) << lowLevelQuote(pack(serverEncode(ctcpTag), userEncode(bufname, message))); emit putCmd("PRIVMSG", params); } void CtcpHandler::reply(const QString &bufname, const QString &ctcpTag, const QString &message) { QList params; - params << serverEncode(bufname) << pack(serverEncode(ctcpTag), userEncode(bufname, message)); + params << serverEncode(bufname) << lowLevelQuote(pack(serverEncode(ctcpTag), userEncode(bufname, message))); + emit putCmd("NOTICE", params); +} + +void CtcpHandler::packedReply(const QString &bufname, const QList &replies) { + QList params; + + int answerSize = 0; + for(int i = 0; i < replies.count(); i++) { + answerSize += replies.at(i).size(); + } + + QByteArray quotedReply(answerSize, 0); + int nextPos = 0; + QByteArray &reply = quotedReply; + for(int i = 0; i < replies.count(); i++) { + reply = replies.at(i); + quotedReply.replace(nextPos, reply.size(), reply); + nextPos += reply.size(); + } + + params << serverEncode(bufname) << quotedReply; emit putCmd("NOTICE", params); } //******************************/ // CTCP HANDLER //******************************/ -void CtcpHandler::handleAction(CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m) { +void CtcpHandler::handleAction(CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m, QString &/*reply*/) { Q_UNUSED(ctcptype) emit displayMsg(Message::Action, typeByTarget(target), target, param, prefix); } -void CtcpHandler::handlePing(CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m) { +void CtcpHandler::handleClientinfo(CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m, QString &reply) { Q_UNUSED(target) if(ctcptype == CtcpQuery) { - reply(nickFromMask(prefix), "PING", param); + QStringList supportedHandlers; + foreach(QString handler, providesHandlers()) { + supportedHandlers << handler.toUpper(); + } + reply = supportedHandlers.join(" "); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP CLIENTINFO request from %1").arg(prefix)); + } else { + // display clientinfo answer + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP CLIENTINFO answer from %1: %2") + .arg(nickFromMask(prefix)).arg(param)); + } +} + +void CtcpHandler::handlePing(CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m, QString &reply) { + Q_UNUSED(target) + if(ctcptype == CtcpQuery) { + reply = param; emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP PING request from %1").arg(prefix)); } else { // display ping answer uint now = QDateTime::currentDateTime().toTime_t(); uint then = QDateTime().fromTime_t(param.toInt()).toTime_t(); - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP PING answer from %1 with %2 seconds round trip time").arg(prefix).arg(now-then)); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP PING answer from %1 with %2 seconds round trip time") + .arg(nickFromMask(prefix)).arg(now-then)); } } -void CtcpHandler::handleVersion(CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m) { +void CtcpHandler::handleVersion(CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m, QString &reply) { Q_UNUSED(target) if(ctcptype == CtcpQuery) { - reply(nickFromMask(prefix), "VERSION", QString("Quassel IRC %1 (built on %2) -- http://www.quassel-irc.org") - .arg(Global::quasselVersion).arg(Global::quasselBuildDate)); + reply = QString("Quassel IRC %1 (built on %2) -- http://www.quassel-irc.org").arg(Quassel::buildInfo().plainVersionString).arg(Quassel::buildInfo().buildDate); emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP VERSION request by %1").arg(prefix)); } else { // display Version answer - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP VERSION answer from %1: %2").arg(prefix).arg(param)); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP VERSION answer from %1: %2") + .arg(nickFromMask(prefix)).arg(param)); + } +} + +void CtcpHandler::handleTime(CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m, QString &reply) { + Q_UNUSED(target) + if(ctcptype == CtcpQuery) { + reply = QDateTime::currentDateTime().toString(); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP TIME request by %1").arg(prefix)); + } else { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP TIME answer from %1: %2") + .arg(nickFromMask(prefix)).arg(param)); } } -void CtcpHandler::defaultHandler(const QString &cmd, CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m) { +void CtcpHandler::defaultHandler(const QString &cmd, CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m, QString &reply) { Q_UNUSED(ctcptype); Q_UNUSED(target); - Q_UNUSED(param); - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix)); + Q_UNUSED(reply); + QString str = tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix); + if(!param.isEmpty()) + str.append(tr(" with arguments: %1").arg(param)); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", str); } -