X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=341dd003567b38c56231f42fb7db9d40131b1ea6;hp=655f68a8c7b654d1f85fed9110f22cf65a0a0e36;hb=bd6311ec1d07e4daf082b5f752ef6b46d7808430;hpb=428ac8d41b1bd6cefea861a2dacc58b2badd4ca4 diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 655f68a8..341dd003 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -33,7 +33,7 @@ #include #ifdef HAVE_QCA2 -#include "cipher.h" +# include "cipher.h" #endif IrcServerHandler::IrcServerHandler(CoreNetwork *parent) @@ -129,74 +129,30 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) { void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const QList &rawparams) { - // we assume that all this happens in server encoding - QStringList params = serverDecode(rawparams); - uint num = cmd.toUInt(); - if(num) { - // A lot of server messages don't really need their own handler because they don't do much. - // Catch and handle these here. - switch(num) { - // Welcome, status, info messages. Just display these. - case 2: case 3: case 4: case 5: case 251: case 252: case 253: case 254: case 255: case 372: case 375: - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", params.join(" "), prefix); - break; - // Server error messages without param, just display them - case 409: case 411: case 412: case 422: case 424: case 445: case 446: case 451: case 462: - case 463: case 464: case 465: case 466: case 472: case 481: case 483: case 485: case 491: case 501: case 502: - case 431: // ERR_NONICKNAMEGIVEN - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" "), prefix); - break; - // Server error messages, display them in red. First param will be appended. - case 401: { - QString target = params.takeFirst(); - emit displayMsg(Message::Error, target, params.join(" ") + " " + target, prefix, Message::Redirected); - break; - } - case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442: { - QString channelName = params.takeFirst(); - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" ") + " " + channelName, prefix); - break; - } - // Server error messages which will be displayed with a colon between the first param and the rest - case 413: case 414: case 423: case 441: case 444: case 461: // FIXME see below for the 47x codes - case 467: case 471: case 473: case 474: case 475: case 476: case 477: case 478: case 482: - case 436: // ERR_NICKCOLLISION - { - QString p = params.takeFirst(); - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", p + ": " + params.join(" ")); - break; - } - // Ignore these commands. - case 321: case 366: case 376: - break; - - case 903: case 904: case 905: case 906: case 907: - { - network()->putRawLine("CAP END"); - emit displayMsg(Message::Info, BufferInfo::StatusBuffer, "", "CAP: " + params.join("")); - } - // Everything else will be marked in red, so we can add them somewhere. - default: - if(_whois) { - // many nets define their own WHOIS fields. we fetch those not in need of special attention here: - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", "[Whois] " + params.join(" "), prefix); - } else { - if(coreSession()->ircListHelper()->requestInProgress(network()->networkId())) - coreSession()->ircListHelper()->reportError(params.join(" ")); - else - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix); - } - } - //qDebug() << prefix <<":"< ¶ms) { + if(!checkParamCount("IrcServerHandler::handleInvite()", params, 2)) + return; +// qDebug() << "IrcServerHandler::handleInvite()" << prefix << params; + + IrcUser *ircuser = network()->updateNickFromMask(prefix); + if(!ircuser) { + return; + } + + QString channel = serverDecode(params[1]); + + emit displayMsg(Message::Invite, BufferInfo::StatusBuffer, "", tr("%1 invited you to channel %2").arg(ircuser->nick()).arg(channel)); +} + void IrcServerHandler::handleJoin(const QString &prefix, const QList ¶ms) { if(!checkParamCount("IrcServerHandler::handleJoin()", params, 1)) return; @@ -498,9 +454,9 @@ void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList we let the ctcpHandler do the work network()->ctcpHandler()->parse(Message::Plain, prefix, target, msg); @@ -557,12 +513,13 @@ void IrcServerHandler::handleTopic(const QString &prefix, const QList 1) { - topic = params[1]; - #ifdef HAVE_QCA2 - topic = decryptTopic(channel->name(), topic); - #endif + QByteArray rawTopic = params[1]; +#ifdef HAVE_QCA2 + rawTopic = decrypt(channel->name(), rawTopic, true); +#endif + topic = channelDecode(channel->name(), rawTopic); } - + channel->setTopic(topic); emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel->name()).arg(topic)); @@ -634,6 +591,9 @@ void IrcServerHandler::handle005(const QString &prefix, const QList QString value = rawSupport.section("=", 1); network()->addSupport(key, value); } + + /* determine our prefixes here to get an accurate result */ + network()->determinePrefixes(); } /* RPL_UMODEIS - " []" */ @@ -782,7 +742,8 @@ void IrcServerHandler::handle311(const QString &prefix, const QList ircuser->setRealName(serverDecode(params.last())); emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is %2 (%3)") .arg(ircuser->nick()).arg(ircuser->hostmask()).arg(ircuser->realName())); } else { - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is %2 (%3)") .arg(serverDecode(params[1])).arg(serverDecode(params[2])).arg(serverDecode(params.last()))); + QString host = QString("%1!%2@%3").arg(serverDecode(params[0])).arg(serverDecode(params[1])).arg(serverDecode(params[2])); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is %2 (%3)") .arg(serverDecode(params[0])).arg(host).arg(serverDecode(params.last()))); } } @@ -853,10 +814,12 @@ void IrcServerHandler::handle317(const QString &prefix, const QList QString nick = serverDecode(params[0]); IrcUser *ircuser = network()->ircUser(nick); + + QDateTime now = QDateTime::currentDateTime(); + int idleSecs = serverDecode(params[1]).toInt(); + idleSecs *= -1; + if(ircuser) { - QDateTime now = QDateTime::currentDateTime(); - int idleSecs = serverDecode(params[1]).toInt(); - idleSecs *= -1; ircuser->setIdleTime(now.addSecs(idleSecs)); if(params.size() > 3) { // if we have more then 3 params we have the above mentioned "real life" situation int loginTime = serverDecode(params[2]).toInt(); @@ -864,9 +827,14 @@ void IrcServerHandler::handle317(const QString &prefix, const QList emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is logged in since %2").arg(ircuser->nick()).arg(ircuser->loginTime().toString())); } emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is idling for %2 (%3)").arg(ircuser->nick()).arg(secondsToString(ircuser->idleTime().secsTo(now))).arg(ircuser->idleTime().toString())); - } else { - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] idle message: %1").arg(userDecode(nick, params).join(" "))); + QDateTime idleSince = now.addSecs(idleSecs); + if (params.size() > 3) { // we have a signon time + int loginTime = serverDecode(params[2]).toInt(); + QDateTime datetime = QDateTime::fromTime_t(loginTime); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is logged in since %2").arg(nick).arg(datetime.toString())); + } + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is idling for %2 (%3)").arg(nick).arg(secondsToString(idleSince.secsTo(now))).arg(idleSince.toString())); } } @@ -978,6 +946,18 @@ void IrcServerHandler::handle329(const QString &prefix, const QList emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Channel %1 created on %2").arg(channel, time.toString())); } +/* RPL_WHOISACCOUNT: " :is authed as */ +void IrcServerHandler::handle330(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + if(!checkParamCount("IrcServerHandler::handle330()", params, 3)) + return; + + QString nick = serverDecode(params[0]); + QString account = serverDecode(params[1]); + + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is authed as %2").arg(nick).arg(account)); +} + /* RPL_NOTOPIC */ void IrcServerHandler::handle331(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); @@ -999,12 +979,12 @@ void IrcServerHandler::handle332(const QString &prefix, const QList return; QString channel = serverDecode(params[0]); - QString topic = channelDecode(channel, params[1]); - - #ifdef HAVE_QCA2 - topic = decryptTopic(channel, topic); - #endif - + QByteArray rawTopic = params[1]; +#ifdef HAVE_QCA2 + rawTopic = decrypt(channel, rawTopic, true); +#endif + QString topic = channelDecode(channel, rawTopic); + IrcChannel *chan = network()->ircChannel(channel); if(chan) chan->setTopic(topic); @@ -1023,6 +1003,23 @@ void IrcServerHandler::handle333(const QString &prefix, const QList tr("Topic set by %1 on %2") .arg(serverDecode(params[1]), QDateTime::fromTime_t(channelDecode(channel, params[2]).toUInt()).toString())); } +/* RPL_INVITING - " */ +void IrcServerHandler::handle341(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + if(!checkParamCount("IrcServerHandler::handle341()", params, 2)) + return; + + QString nick = serverDecode(params[0]); + + IrcChannel *channel = network()->ircChannel(serverDecode(params[1])); + if(!channel) { + qWarning() << "IrcServerHandler::handle341(): unknown channel:" << params[1]; + return; + } + + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has been invited to %2").arg(nick).arg(channel->name())); +} + /* RPL_WHOREPLY: " ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] : " */ void IrcServerHandler::handle352(const QString &prefix, const QList ¶ms) { @@ -1247,71 +1244,16 @@ void IrcServerHandler::destroyNetsplits() { } #ifdef HAVE_QCA2 -QByteArray IrcServerHandler::decrypt(const QString &bufferName, QByteArray &message) { - if(bufferName.isEmpty()) - return message; +QByteArray IrcServerHandler::decrypt(const QString &bufferName, const QByteArray &message_, bool isTopic) { + if(message_.isEmpty()) + return message_; - if(message.isEmpty()) - return message; + Cipher *cipher = network()->cipher(bufferName); + if(!cipher) + return message_; - const QByteArray key = network()->bufferKey(bufferName); - if(key.isEmpty()) - return message; - - IrcChannel *channel = network()->ircChannel(bufferName); - IrcUser *user = network()->ircUser(bufferName); - - //only send encrypted text to decrypter - int index = message.indexOf(":",message.indexOf(":")+1); - - /* if(this->identifyMsgEnabled()) // Workaround braindead Freenode prefixing messages with + - ++index;*/ - - QByteArray backup = message.mid(0,index+1); - - if (channel && channel->cipher()->setKey(key)) - message = channel->cipher()->decrypt(message.mid(index+1)); - else if (user && user->cipher()->setKey(key)) - message = user->cipher()->decrypt(message.mid(index+1)); - - message.prepend(backup); - - message = channelDecode(bufferName, message).toAscii(); - + QByteArray message = message_; + message = isTopic? cipher->decryptTopic(message) : cipher->decrypt(message); return message; } - -QString IrcServerHandler::decryptTopic(const QString &bufferName, QString &topic) { - if(bufferName.isEmpty()) - return topic; - - if(topic.isEmpty()) - return topic; - - const QByteArray key = network()->bufferKey(bufferName); - if(key.isEmpty()) - return topic; - - IrcChannel *channel = network()->ircChannel(bufferName); - IrcUser *user = network()->ircUser(bufferName); - - //only send encrypted text to decrypter - int index = topic.indexOf(":",topic.indexOf(":")+1); - - QString backup = topic.mid(0,index+1); - - if (channel && channel->cipher()->setKey(key)) - topic = channel->cipher()->decryptTopic(topic.mid(index+1).toAscii()); - else if (user && user->cipher()->setKey(key)) - topic = user->cipher()->decryptTopic(topic.mid(index+1).toAscii()); - - topic.prepend(backup); - topic = channelDecode(bufferName, topic.toAscii()); - - return topic; -} #endif - -/***********************************************************************************/ - -