#include "util.h"
-#include "ctcphandler.h"
+#include "ctcpparser.h"
#include <QRegExp>
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());
}
if(!bufferInfo.isValid())
return;
+ if(!Cipher::neededFeaturesAvailable())
+ return;
+
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
if(parms.isEmpty() && !bufferInfo.bufferName().isEmpty())
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);
}
QByteArray encMsg = userEncode(target, msg.section(' ', 1));
#ifdef HAVE_QCA2
- encMsg = encrypt(target, encMsg);
+ putPrivmsg(serverEncode(target), encMsg, network()->cipher(target));
+#else
+ putPrivmsg(serverEncode(target), encMsg);
#endif
-
- putPrivmsg(serverEncode(target), encMsg, false);
}
void CoreUserInputHandler::handleNick(const BufferInfo &bufferInfo, const QString &msg) {
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);
QByteArray encMsg = channelEncode(bufferInfo.bufferName(), msg);
#ifdef HAVE_QCA2
- encMsg = encrypt(bufferInfo.bufferName(), encMsg);
+ putPrivmsg(serverEncode(bufferInfo.bufferName()), encMsg, network()->cipher(bufferInfo.bufferName()));
+#else
+ putPrivmsg(serverEncode(bufferInfo.bufferName()), encMsg);
#endif
-
- putPrivmsg(serverEncode(bufferInfo.bufferName()), encMsg, false);
emit displayMsg(Message::Plain, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self);
}
if(!bufferInfo.isValid())
return;
+ if(!Cipher::neededFeaturesAvailable())
+ return;
+
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
if(parms.count() == 1 && !bufferInfo.bufferName().isEmpty())
#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 <nick|channel> 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;
emit putCmd(serverEncode(cmd.toUpper()), serverEncode(msg.split(" ")));
}
-// TODO: handle cutoff of encrypted messages
-void CoreUserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message, bool encrypted) {
-
- QByteArray temp = 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<QByteArray>() << target << temp);
- if(overrun) {
- static const char *splitter = " .,-";
- int maxSplitPos = temp.count() - overrun;
- int splitPos = -1;
- for(const char *splitChar = splitter; *splitChar != 0; splitChar++) {
- splitPos = qMax(splitPos, temp.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<QByteArray>() << 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<QByteArray>() << target << temp.left(splitPos));
- putPrivmsg(target, temp.mid(splitPos), encrypted);
+
+ // now we have found a valid splitpos (or didn't need to split to begin with)
+ putCmd(cmd, QList<QByteArray>() << target << crypted);
+ if(splitPos < message.count())
+ putPrivmsg(target, message.mid(splitPos), cipher);
+
return;
- } else {
- putCmd(cmd, QList<QByteArray>() << target << temp);
}
}
}
#ifdef HAVE_QCA2
-QByteArray CoreUserInputHandler::encrypt(const QString &target, const QByteArray &message_) const {
+QByteArray CoreUserInputHandler::encrypt(const QString &target, const QByteArray &message_, bool *didEncrypt) const {
+ if(didEncrypt)
+ *didEncrypt = false;
+
if(message_.isEmpty())
return message_;
+ if(!Cipher::neededFeaturesAvailable())
+ return message_;
+
Cipher *cipher = network()->cipher(target);
if(!cipher)
return message_;
QByteArray message = message_;
- cipher->encrypt(message);
+ bool result = cipher->encrypt(message);
+ if(didEncrypt)
+ *didEncrypt = result;
+
return message;
}
#endif
projects / quassel.git / blobdiff