X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresessioneventprocessor.cpp;h=0e9bb0197314ca6c8e9da7021c0364f83b27cff4;hb=e212eabe53878a8fa6ecb15909a325ed7dd63283;hp=cd3f808ef5da4218376c760111a4e9e8914978d3;hpb=b4aa5e13d1dd15dca327add244ddeb7e9eb4c5a8;p=quassel.git diff --git a/src/core/coresessioneventprocessor.cpp b/src/core/coresessioneventprocessor.cpp index cd3f808e..0e9bb019 100644 --- a/src/core/coresessioneventprocessor.cpp +++ b/src/core/coresessioneventprocessor.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -218,17 +218,33 @@ void CoreSessionEventProcessor::processIrcEventCap(IrcEvent *e) } // Server: CAP * ACK :multi-prefix sasl - // Got the capability we want, handle as needed. - // As only one capability is requested at a time, no need to split - QString acceptedCap = e->params().at(2).trimmed().toLower(); - - // Mark this cap as accepted - coreNet->acknowledgeCap(acceptedCap); + // Got the capabilities we want, handle as needed. + QStringList acceptedCaps; + acceptedCaps = e->params().at(2).split(' '); + + // Store what capability was acknowledged + QString acceptedCap; + + // Keep track of whether or not a capability requires further configuration. Due to queuing + // logic in CoreNetwork::queueCap(), this shouldn't ever happen when more than one + // capability is requested, but it's better to handle edge cases or faulty servers. + bool capsRequireConfiguration = false; + + for (int i = 0; i < acceptedCaps.count(); ++i) { + acceptedCap = acceptedCaps[i].trimmed().toLower(); + // Mark this cap as accepted + coreNet->acknowledgeCap(acceptedCap); + if (!capsRequireConfiguration && + coreNet->capsRequiringConfiguration.contains(acceptedCap)) { + capsRequireConfiguration = true; + // Some capabilities (e.g. SASL) require further messages to finish. If so, do NOT + // send the next capability; it will be handled elsewhere in CoreNetwork. + // Otherwise, allow moving on to the next capability. + } + } - if (!coreNet->capsRequiringConfiguration.contains(acceptedCap)) { - // Some capabilities (e.g. SASL) require further messages to finish. If so, do NOT - // send the next capability; it will be handled elsewhere in CoreNetwork. - // Otherwise, move on to the next capability + if (!capsRequireConfiguration) { + // No additional configuration required, move on to the next capability coreNet->sendNextCap(); } } else if (capCommand == "NAK" || capCommand == "DEL") { @@ -242,7 +258,7 @@ void CoreSessionEventProcessor::processIrcEventCap(IrcEvent *e) return; } - // Either something went wrong with this capability, or it is no longer supported + // Either something went wrong with the capabilities, or they are no longer supported // > For CAP NAK // Server: CAP * NAK :multi-prefix sasl // > For CAP DEL @@ -252,17 +268,29 @@ void CoreSessionEventProcessor::processIrcEventCap(IrcEvent *e) QStringList removedCaps; removedCaps = e->params().at(2).split(' '); - // Store what capability was denied or removed + // Store the capabilities that were denied or removed QString removedCap; for (int i = 0; i < removedCaps.count(); ++i) { removedCap = removedCaps[i].trimmed().toLower(); - // Mark this cap as removed + // Mark this cap as removed. + // For CAP DEL, removes it from use. + // For CAP NAK when received before negotiation enabled these capabilities, removeCap() + // should do nothing. This merely guards against non-spec servers sending an + // unsolicited CAP ACK then later removing that capability. coreNet->removeCap(removedCap); } if (capCommand == "NAK") { - // Continue negotiation only if this is the result of a denied cap, not a removed - // cap + // Continue negotiation only if this is the result of denied caps, not removed caps + if (removedCaps.count() > 1) { + // We've received a CAP NAK reply to multiple capabilities at once. Unfortunately, + // we don't know which capability failed and which ones are valid to re-request, so + // individually retry each capability from the failed bundle. + // See CoreNetwork::retryCapsIndividually() for more details. + coreNet->retryCapsIndividually(); + // Still need to call sendNextCap() to carry on. + } + // Carry on with negotiation coreNet->sendNextCap(); } } @@ -387,6 +415,8 @@ void CoreSessionEventProcessor::processIrcEventJoin(IrcEvent *e) if (net->isMe(ircuser)) { net->setChannelJoined(channel); + // Mark the message as Self + e->setFlag(EventManager::Self); // FIXME use event net->putRawLine(net->serverEncode("MODE " + channel)); // we want to know the modes of the channel we just joined, so we ask politely } @@ -512,12 +542,33 @@ void CoreSessionEventProcessor::processIrcEventMode(IrcEvent *e) ircUser->removeUserModes(removeModes); if (e->network()->isMe(ircUser)) { + // Mark the message as Self + e->setFlag(EventManager::Self); coreNetwork(e)->updatePersistentModes(addModes, removeModes); } } } +void CoreSessionEventProcessor::processIrcEventNick(IrcEvent *e) +{ + if (checkParamCount(e, 1)) { + IrcUser *ircuser = e->network()->updateNickFromMask(e->prefix()); + if (!ircuser) { + qWarning() << Q_FUNC_INFO << "Unknown IrcUser!"; + return; + } + + if (e->network()->isMe(ircuser)) { + // Mark the message as Self + e->setFlag(EventManager::Self); + } + + // Actual processing is handled in lateProcessIrcEventNick(), this just sets the event flag + } +} + + void CoreSessionEventProcessor::lateProcessIrcEventNick(IrcEvent *e) { if (checkParamCount(e, 1)) { @@ -538,6 +589,25 @@ void CoreSessionEventProcessor::lateProcessIrcEventNick(IrcEvent *e) } +void CoreSessionEventProcessor::processIrcEventPart(IrcEvent *e) +{ + if (checkParamCount(e, 1)) { + IrcUser *ircuser = e->network()->updateNickFromMask(e->prefix()); + if (!ircuser) { + qWarning() << Q_FUNC_INFO<< "Unknown IrcUser!"; + return; + } + + if (e->network()->isMe(ircuser)) { + // Mark the message as Self + e->setFlag(EventManager::Self); + } + + // Actual processing is handled in lateProcessIrcEventNick(), this just sets the event flag + } +} + + void CoreSessionEventProcessor::lateProcessIrcEventPart(IrcEvent *e) { if (checkParamCount(e, 1)) { @@ -548,8 +618,9 @@ void CoreSessionEventProcessor::lateProcessIrcEventPart(IrcEvent *e) } QString channel = e->params().at(0); ircuser->partChannel(channel); - if (e->network()->isMe(ircuser)) + if (e->network()->isMe(ircuser)) { qobject_cast(e->network())->setChannelParted(channel); + } } } @@ -582,6 +653,11 @@ void CoreSessionEventProcessor::processIrcEventQuit(IrcEvent *e) if (!ircuser) return; + if (e->network()->isMe(ircuser)) { + // Mark the message as Self + e->setFlag(EventManager::Self); + } + QString msg; if (e->params().count() > 0) msg = e->params()[0]; @@ -627,13 +703,34 @@ void CoreSessionEventProcessor::lateProcessIrcEventQuit(IrcEvent *e) void CoreSessionEventProcessor::processIrcEventTopic(IrcEvent *e) { if (checkParamCount(e, 2)) { - e->network()->updateNickFromMask(e->prefix()); + IrcUser *ircuser = e->network()->updateNickFromMask(e->prefix()); + + if (e->network()->isMe(ircuser)) { + // Mark the message as Self + e->setFlag(EventManager::Self); + } + IrcChannel *channel = e->network()->ircChannel(e->params().at(0)); if (channel) channel->setTopic(e->params().at(1)); } } +/* ERROR - "ERROR :reason" +Example: ERROR :Closing Link: nickname[xxx.xxx.xxx.xxx] (Large base64 image paste.) +See https://tools.ietf.org/html/rfc2812#section-3.7.4 */ +void CoreSessionEventProcessor::processIrcEventError(IrcEvent *e) +{ + if (!checkParamCount(e, 1)) + return; + + if (coreNetwork(e)->disconnectExpected()) { + // During QUIT, the server should send an error (often, but not always, "Closing Link"). As + // we're expecting it, don't show this to the user. + e->setFlag(EventManager::Silent); + } +} + #ifdef HAVE_QCA2 void CoreSessionEventProcessor::processKeyEvent(KeyEvent *e) @@ -749,7 +846,9 @@ void CoreSessionEventProcessor::processIrcEvent301(IrcEvent *e) if (ircuser) { ircuser->setAway(true); ircuser->setAwayMessage(e->params().at(1)); - //ircuser->setLastAwayMessage(now); + // lastAwayMessageTime is set in EventStringifier::processIrcEvent301(), no need to set it + // here too + //ircuser->setLastAwayMessageTime(now); } } @@ -862,8 +961,18 @@ void CoreSessionEventProcessor::processIrcEvent317(IrcEvent *e) int idleSecs = e->params()[1].toInt(); if (e->params().count() > 3) { // if we have more then 3 params we have the above mentioned "real life" situation - int logintime = e->params()[2].toInt(); - loginTime = QDateTime::fromTime_t(logintime); + // Allow for 64-bit time + qint64 logintime = e->params()[2].toLongLong(); + // Time in IRC protocol is defined as seconds. Convert from seconds instead. + // See https://doc.qt.io/qt-5/qdatetime.html#fromSecsSinceEpoch +#if QT_VERSION >= 0x050800 + loginTime = QDateTime::fromSecsSinceEpoch(logintime); +#else + // fromSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for + // now. + // See https://doc.qt.io/qt-5/qdatetime.html#fromMSecsSinceEpoch + loginTime = QDateTime::fromMSecsSinceEpoch((qint64)(logintime * 1000)); +#endif } IrcUser *ircuser = e->network()->ircUser(e->params()[0]); @@ -888,10 +997,13 @@ void CoreSessionEventProcessor::processIrcEvent322(IrcEvent *e) switch (e->params().count()) { case 3: topic = e->params()[2]; + [[clang::fallthrough]]; case 2: userCount = e->params()[1].toUInt(); + [[clang::fallthrough]]; case 1: channelName = e->params()[0]; + [[clang::fallthrough]]; default: break; } @@ -965,16 +1077,24 @@ void CoreSessionEventProcessor::processIrcEvent352(IrcEvent *e) return; QString channel = e->params()[0]; - IrcUser *ircuser = e->network()->ircUser(e->params()[4]); + // Store the nick separate from ircuser for AutoWho check below + QString nick = e->params()[4]; + IrcUser *ircuser = e->network()->ircUser(nick); if (ircuser) { + // Only process the WHO information if an IRC user exists. Don't create an IRC user here; + // there's no way to track when the user quits, which would leave a phantom IrcUser lying + // around. + // NOTE: Whenever MONITOR support is introduced, the IrcUser will be created by an + // RPL_MONONLINE numeric before any WHO commands are run. processWhoInformation(e->network(), channel, ircuser, e->params()[3], e->params()[1], e->params()[2], e->params()[5], e->params().last().section(" ", 1)); } // Check if channel name has a who in progress. - // If not, then check if user nick exists and has a who in progress. + // If not, then check if user nickname has a who in progress. Use nick directly; don't use + // ircuser as that may be deleted (e.g. nick joins channel, leaves before WHO reply received). if (coreNetwork(e)->isAutoWhoInProgress(channel) || - (ircuser && coreNetwork(e)->isAutoWhoInProgress(ircuser->nick()))) { + (coreNetwork(e)->isAutoWhoInProgress(nick))) { e->setFlag(EventManager::Silent); } } @@ -1061,8 +1181,14 @@ void CoreSessionEventProcessor::processIrcEvent354(IrcEvent *e) return; QString channel = e->params()[1]; - IrcUser *ircuser = e->network()->ircUser(e->params()[5]); + QString nick = e->params()[5]; + IrcUser *ircuser = e->network()->ircUser(nick); if (ircuser) { + // Only process the WHO information if an IRC user exists. Don't create an IRC user here; + // there's no way to track when the user quits, which would leave a phantom IrcUser lying + // around. + // NOTE: Whenever MONITOR support is introduced, the IrcUser will be created by an + // RPL_MONONLINE numeric before any WHO commands are run. processWhoInformation(e->network(), channel, ircuser, e->params()[4], e->params()[2], e->params()[3], e->params()[6], e->params().last()); // Don't use .section(" ", 1) with WHOX replies, for there's no hopcount to trim out @@ -1080,9 +1206,10 @@ void CoreSessionEventProcessor::processIrcEvent354(IrcEvent *e) } // Check if channel name has a who in progress. - // If not, then check if user nick exists and has a who in progress. + // If not, then check if user nickname has a who in progress. Use nick directly; don't use + // ircuser as that may be deleted (e.g. nick joins channel, leaves before WHO reply received). if (coreNetwork(e)->isAutoWhoInProgress(channel) || - (ircuser && coreNetwork(e)->isAutoWhoInProgress(ircuser->nick()))) { + (coreNetwork(e)->isAutoWhoInProgress(nick))) { e->setFlag(EventManager::Silent); } } @@ -1429,12 +1556,27 @@ void CoreSessionEventProcessor::handleCtcpPing(CtcpEvent *e) void CoreSessionEventProcessor::handleCtcpTime(CtcpEvent *e) { - e->setReply(QDateTime::currentDateTime().toString()); + // Explicitly specify the Qt default DateTime format string to allow for modification + // Qt::TextDate default roughly corresponds to... + // > ddd MMM d yyyy HH:mm:ss + // + // See https://doc.qt.io/qt-5/qdatetime.html#toString + // And https://doc.qt.io/qt-5/qt.html#DateFormat-enum +#if QT_VERSION > 0x050000 + // Append the timezone identifier "t", so other other IRC users have a frame of reference for + // the current timezone. This could be figured out before by manually comparing to UTC, so this + // is just convenience. + + // Alas, "t" was only added in Qt 5 + e->setReply(QDateTime::currentDateTime().toString("ddd MMM d yyyy HH:mm:ss t")); +#else + e->setReply(QDateTime::currentDateTime().toString("ddd MMM d yyyy HH:mm:ss")); +#endif } void CoreSessionEventProcessor::handleCtcpVersion(CtcpEvent *e) { - e->setReply(QString("Quassel IRC %1 (built on %2) -- http://www.quassel-irc.org") + e->setReply(QString("Quassel IRC %1 (built on %2) -- https://www.quassel-irc.org") .arg(Quassel::buildInfo().plainVersionString).arg(Quassel::buildInfo().commitDate)); }