X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreuserinputhandler.cpp;h=0f0be89a60dae4bfa10aa6018f9e336b718cd416;hp=101ccab3f3d95b87e5879b4799bc7e61519d4eb4;hb=c351c94e52a01571c34a18ddb5947b9e1f771d8c;hpb=d81414703facf1199127394ec9d1d72faf77ded0 diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp index 101ccab3..0f0be89a 100644 --- a/src/core/coreuserinputhandler.cpp +++ b/src/core/coreuserinputhandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-10 by the Quassel Project * + * Copyright (C) 2005-2012 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,15 +21,12 @@ #include "util.h" -#include "ctcphandler.h" -#include "coreidentity.h" -#include "ircuser.h" +#include "ctcpparser.h" -#include #include #ifdef HAVE_QCA2 -#include "cipher.h" +# include "cipher.h" #endif CoreUserInputHandler::CoreUserInputHandler(CoreNetwork *parent) @@ -81,7 +78,7 @@ void CoreUserInputHandler::issueAway(const QString &msg, bool autoCheck) { awayMsg = identity->awayReason(); } if(awayMsg.isEmpty()) { - awayMsg = tr("away"); + awayMsg = tr("away"); } } } @@ -157,62 +154,55 @@ void CoreUserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QStrin message = QString::number(now); } - network()->ctcpHandler()->query(nick, ctcpTag, message); + // FIXME make this a proper event + coreNetwork()->coreSession()->ctcpParser()->query(coreNetwork(), nick, ctcpTag, message); emit displayMsg(Message::Action, BufferInfo::StatusBuffer, "", verboseMessage, network()->myNick()); } void CoreUserInputHandler::handleDelkey(const BufferInfo &bufferInfo, const QString &msg) { - #ifdef HAVE_QCA2 - if (!bufferInfo.isValid()) +#ifdef HAVE_QCA2 + if(!bufferInfo.isValid()) + return; + + if(!Cipher::neededFeaturesAvailable()) return; - + QStringList parms = msg.split(' ', QString::SkipEmptyParts); - + if(parms.isEmpty() && !bufferInfo.bufferName().isEmpty()) parms.prepend(bufferInfo.bufferName()); if(parms.isEmpty()) { - QString message = tr("[usage] /delkey deletes the encryption key for nick or channel or just /delkey when in a channel or query."); - - if(bufferInfo.bufferName().isEmpty()) - emit displayMsg(Message::Info, BufferInfo::StatusBuffer, "", message); - else - emit displayMsg(Message::Info, bufferInfo.bufferName(), message); + emit displayMsg(Message::Info, bufferInfo.bufferName(), "", + tr("[usage] /delkey deletes the encryption key for nick or channel or just /delkey when in a channel or query.")); return; } - if(network()->bufferKey(parms[0]).isEmpty()) { - QString message = tr("No key has been set for %1.").arg(parms[0]); + QString target = parms.at(0); - if(bufferInfo.bufferName().isEmpty()) - emit displayMsg(Message::Info, BufferInfo::StatusBuffer, "", message); - else - emit displayMsg(Message::Info, bufferInfo.bufferName(), message); + if(network()->cipherKey(target).isEmpty()) { + emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("No key has been set for %1.").arg(target)); return; } - network()->setBufferKey(parms[0], ""); + network()->setCipherKey(target, QByteArray()); - if(network()->isChannelName(parms[0]) && network()->channels().contains(parms[0])) { - network()->ircChannel(parms[0])->setEncrypted(false); + if(network()->isChannelName(target) && network()->channels().contains(target)) { + qobject_cast(network()->ircChannel(target))->setEncrypted(false); } - else if(network()->nicks().contains(parms[0])) { - network()->ircUser(parms[0])->setEncrypted(false); + else if(network()->nicks().contains(target)) { + qobject_cast(network()->ircUser(target))->setEncrypted(false); } - QString message = tr("The key for %1 has been deleted.").arg(parms[0]); - - if(bufferInfo.bufferName().isEmpty()) - emit displayMsg(Message::Info, BufferInfo::StatusBuffer, "", message); - else - emit displayMsg(Message::Info, bufferInfo.bufferName(), message); - - #else - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Error: Setting an encryption key requires Quassel to have been built " - "with support for the Qt Cryptographic Architecture (QCA) library. " - "Contact your distributor about a Quassel package with QCA " - "support, or rebuild Quassel with QCA present.")); - #endif + emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 has been deleted.").arg(target)); + +#else + Q_UNUSED(msg) + emit displayMsg(Message::Error, bufferInfo.bufferName(), "", tr("Error: Setting an encryption key requires Quassel to have been built " + "with support for the Qt Cryptographic Architecture (QCA2) library. " + "Contact your distributor about a Quassel package with QCA2 " + "support, or rebuild Quassel with QCA2 present.")); +#endif } void CoreUserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QString &msg) { @@ -223,6 +213,14 @@ void CoreUserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QStrin emit putCmd("MODE", serverEncode(params)); } +void CoreUserInputHandler::handleDehalfop(const BufferInfo &bufferInfo, const QString &msg) { + QStringList nicks = msg.split(' ', QString::SkipEmptyParts); + QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'h'; + QStringList params; + params << bufferInfo.bufferName() << m << nicks; + emit putCmd("MODE", serverEncode(params)); +} + void CoreUserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &msg) { QStringList nicks = msg.split(' ', QString::SkipEmptyParts); QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'v'; @@ -323,7 +321,8 @@ void CoreUserInputHandler::handleList(const BufferInfo &bufferInfo, const QStrin void CoreUserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg) { if(bufferInfo.bufferName().isEmpty()) return; // server buffer - network()->ctcpHandler()->query(bufferInfo.bufferName(), "ACTION", msg); + // FIXME make this a proper event + coreNetwork()->coreSession()->ctcpParser()->query(coreNetwork(), bufferInfo.bufferName(), "ACTION", msg); emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self); } @@ -354,8 +353,14 @@ void CoreUserInputHandler::handleMsg(const BufferInfo &bufferInfo, const QString if(!msg.contains(' ')) return; - QByteArray target = serverEncode(msg.section(' ', 0, 0)); - putPrivmsg(target, userEncode(target, msg.section(' ', 1))); + QString target = msg.section(' ', 0, 0); + QByteArray encMsg = userEncode(target, msg.section(' ', 1)); + +#ifdef HAVE_QCA2 + putPrivmsg(serverEncode(target), encMsg, network()->cipher(target)); +#else + putPrivmsg(serverEncode(target), encMsg); +#endif } void CoreUserInputHandler::handleNick(const BufferInfo &bufferInfo, const QString &msg) { @@ -373,6 +378,14 @@ void CoreUserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QStr emit displayMsg(Message::Notice, bufferName, payload, network()->myNick(), Message::Self); } +void CoreUserInputHandler::handleHalfop(const BufferInfo &bufferInfo, const QString &msg) { + QStringList nicks = msg.split(' ', QString::SkipEmptyParts); + QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'h'; + QStringList params; + params << bufferInfo.bufferName() << m << nicks; + emit putCmd("MODE", serverEncode(params)); +} + void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg) { QStringList nicks = msg.split(' ', QString::SkipEmptyParts); QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'o'; @@ -422,7 +435,7 @@ void CoreUserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QStri QString target = msg.section(' ', 0, 0); QString message = msg.section(' ', 1); if(message.isEmpty()) - emit displayMsg(Message::Server, BufferInfo::QueryBuffer, target, "Starting query with " + target, network()->myNick(), Message::Self); + emit displayMsg(Message::Server, BufferInfo::QueryBuffer, target, tr("Starting query with %1").arg(target), network()->myNick(), Message::Self); else emit displayMsg(Message::Plain, BufferInfo::QueryBuffer, target, message, network()->myNick(), Message::Self); handleMsg(bufferInfo, msg); @@ -445,54 +458,108 @@ void CoreUserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QStri void CoreUserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString &msg) { if(bufferInfo.bufferName().isEmpty()) return; // server buffer - putPrivmsg(serverEncode(bufferInfo.bufferName()), channelEncode(bufferInfo.bufferName(), msg)); + + QByteArray encMsg = channelEncode(bufferInfo.bufferName(), msg); +#ifdef HAVE_QCA2 + putPrivmsg(serverEncode(bufferInfo.bufferName()), encMsg, network()->cipher(bufferInfo.bufferName())); +#else + putPrivmsg(serverEncode(bufferInfo.bufferName()), encMsg); +#endif emit displayMsg(Message::Plain, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self); } void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QString &msg) { - #ifdef HAVE_QCA2 +#ifdef HAVE_QCA2 if(!bufferInfo.isValid()) return; - + + if(!Cipher::neededFeaturesAvailable()) + return; + QStringList parms = msg.split(' ', QString::SkipEmptyParts); - + if(parms.count() == 1 && !bufferInfo.bufferName().isEmpty()) parms.prepend(bufferInfo.bufferName()); else if(parms.count() != 2) { - QString message =tr("[usage] /setkey sets the encryption key for nick or channel. /setkey when in a channel or query buffer sets the key for it."); - - if(bufferInfo.bufferName().isEmpty()) - emit displayMsg(Message::Info, BufferInfo::StatusBuffer, "", message); - else - emit displayMsg(Message::Info, bufferInfo.bufferName(), message); + emit displayMsg(Message::Info, bufferInfo.bufferName(), + tr("[usage] /setkey sets the encryption key for nick or channel. " + "/setkey when in a channel or query buffer sets the key for it.")); return; } - network()->setBufferKey(parms[0], parms[1].toLocal8Bit()); - - if(network()->isChannelName(parms[0]) && network()->channels().contains(parms[0])) - network()->ircChannel(parms[0])->setEncrypted(true); - else if(network()->nicks().contains(parms[0])) - network()->ircUser(parms[0])->setEncrypted(true); - - QString message = tr("The key for %1 has been set.").arg(parms[0]); - if (bufferInfo.bufferName().isEmpty()) - emit displayMsg(Message::Info, BufferInfo::StatusBuffer, "", message); - else - emit displayMsg(Message::Info, bufferInfo.bufferName(), message); - #else - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Error: Setting an encryption key requires Quassel to have been built " - "with support for the Qt Cryptographic Architecture (QCA) library. " - "Contact your distributor about a Quassel package with QCA " - "support, or rebuild Quassel with QCA present.")); - #endif + + QString target = parms.at(0); + QByteArray key = parms.at(1).toLocal8Bit(); + + network()->setCipherKey(target, key); + + if(network()->isChannelName(target) && network()->channels().contains(target)) + qobject_cast(network()->ircChannel(target))->setEncrypted(true); + else if(network()->nicks().contains(target)) + qobject_cast(network()->ircUser(target))->setEncrypted(true); + + emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 has been set.").arg(target)); +#else + Q_UNUSED(msg) + emit displayMsg(Message::Error, bufferInfo.bufferName(), tr("Error: Setting an encryption key requires Quassel to have been built " + "with support for the Qt Cryptographic Architecture (QCA) library. " + "Contact your distributor about a Quassel package with QCA " + "support, or rebuild Quassel with QCA present.")); +#endif +} + +void CoreUserInputHandler::handleShowkey(const BufferInfo &bufferInfo, const QString &msg) { +#ifdef HAVE_QCA2 + if(!bufferInfo.isValid()) + return; + + if(!Cipher::neededFeaturesAvailable()) + return; + + QStringList parms = msg.split(' ', QString::SkipEmptyParts); + + if(parms.isEmpty() && !bufferInfo.bufferName().isEmpty()) + parms.prepend(bufferInfo.bufferName()); + + if(parms.isEmpty()) { + emit displayMsg(Message::Info, bufferInfo.bufferName(), "", + tr("[usage] /showkey shows the encryption key for nick or channel or just /showkey when in a channel or query.")); + return; + } + + QString target = parms.at(0); + QByteArray key = network()->cipherKey(target); + + if(key.isEmpty()) { + emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("No key has been set for %1.").arg(target)); + return; + } + + emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 is %2").arg(target).arg(QString(key))); + +#else + Q_UNUSED(msg) + emit displayMsg(Message::Error, bufferInfo.bufferName(), "", tr("Error: Setting an encryption key requires Quassel to have been built " + "with support for the Qt Cryptographic Architecture (QCA2) library. " + "Contact your distributor about a Quassel package with QCA2 " + "support, or rebuild Quassel with QCA2 present.")); +#endif } void CoreUserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString &msg) { - if(bufferInfo.bufferName().isEmpty()) return; + if(bufferInfo.bufferName().isEmpty()) + return; + QList params; params << serverEncode(bufferInfo.bufferName()); - if(!msg.isEmpty()) - params << channelEncode(bufferInfo.bufferName(), msg); + + if(!msg.isEmpty()) { +# ifdef HAVE_QCA2 + params << encrypt(bufferInfo.bufferName(), channelEncode(bufferInfo.bufferName(), msg)); +# else + params << channelEncode(bufferInfo.bufferName(), msg); +# endif + } + emit putCmd("TOPIC", params); } @@ -543,24 +610,54 @@ void CoreUserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferI emit putCmd(serverEncode(cmd.toUpper()), serverEncode(msg.split(" "))); } -void CoreUserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message) { +void CoreUserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message, Cipher *cipher) { + // Encrypted messages need special care. There's no clear relation between cleartext and encrypted message length, + // so we can't just compute the maxSplitPos. Instead, we need to loop through the splitpoints until the crypted + // version is short enough... + // TODO: check out how the various possible encryption methods behave length-wise and make + // this clean by predicting the length of the crypted msg. + // For example, blowfish-ebc seems to create 8-char chunks. + static const char *cmd = "PRIVMSG"; - int overrun = lastParamOverrun(cmd, QList() << target << message); - if(overrun) { - static const char *splitter = " .,-"; - int maxSplitPos = message.count() - overrun; - int splitPos = -1; - for(const char *splitChar = splitter; *splitChar != 0; splitChar++) { - splitPos = qMax(splitPos, message.lastIndexOf(*splitChar, maxSplitPos)); + static const char *splitter = " .,-"; + + int maxSplitPos = message.count(); + int splitPos = maxSplitPos; + forever { + QByteArray crypted = message.left(splitPos); + bool isEncrypted = false; +#ifdef HAVE_QCA2 + if(cipher && !message.isEmpty()) { + isEncrypted = cipher->encrypt(crypted); } - if(splitPos <= 0) { - splitPos = maxSplitPos; +#endif + int overrun = lastParamOverrun(cmd, QList() << target << crypted); + if(overrun) { + // In case this is not an encrypted msg, we can just cut off at the end + if(!isEncrypted) + maxSplitPos = message.count() - overrun; + + splitPos = -1; + for(const char *splitChar = splitter; *splitChar != 0; splitChar++) { + splitPos = qMax(splitPos, message.lastIndexOf(*splitChar, maxSplitPos) + 1); // keep split char on old line + } + if(splitPos <= 0 || splitPos > maxSplitPos) + splitPos = maxSplitPos; + + maxSplitPos = splitPos - 1; + if(maxSplitPos <= 0) { // this should never happen, but who knows... + qWarning() << tr("[Error] Could not encrypt your message: %1").arg(message.data()); + return; + } + continue; // we never come back here for !encrypted! } - putCmd(cmd, QList() << target << message.left(splitPos)); - putPrivmsg(target, message.mid(splitPos)); + + // now we have found a valid splitpos (or didn't need to split to begin with) + putCmd(cmd, QList() << target << crypted); + if(splitPos < message.count()) + putPrivmsg(target, message.mid(splitPos), cipher); + return; - } else { - putCmd(cmd, QList() << target << message); } } @@ -593,6 +690,30 @@ int CoreUserInputHandler::lastParamOverrun(const QString &cmd, const QListcipher(target); + if(!cipher) + return message_; + + QByteArray message = message_; + bool result = cipher->encrypt(message); + if(didEncrypt) + *didEncrypt = result; + + return message; +} +#endif + void CoreUserInputHandler::timerEvent(QTimerEvent *event) { if(!_delayedCommands.contains(event->timerId())) { QObject::timerEvent(event);