From: Johannes Huber Date: Fri, 18 Mar 2011 14:06:32 +0000 (+0100) Subject: added new user input command 'showkey" X-Git-Tag: 0.8-beta1~56 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d54b44bc5b6e1ff4308f9d143babf29028ae47cd;ds=sidebyside added new user input command 'showkey" displays the crypt key for if exists, closes #1069 --- diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp index f1654a4d..b9565dcf 100644 --- a/src/core/coreuserinputhandler.cpp +++ b/src/core/coreuserinputhandler.cpp @@ -491,6 +491,44 @@ void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QStr #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; diff --git a/src/core/coreuserinputhandler.h b/src/core/coreuserinputhandler.h index 7c4e9302..177c35b0 100644 --- a/src/core/coreuserinputhandler.h +++ b/src/core/coreuserinputhandler.h @@ -63,6 +63,7 @@ public slots: void handleQuote(const BufferInfo &bufferInfo, const QString &text); void handleSay(const BufferInfo &bufferInfo, const QString &text); void handleSetkey(const BufferInfo &bufferInfo, const QString &text); + void handleShowkey(const BufferInfo &bufferInfo, const QString &text); void handleTopic(const BufferInfo &bufferInfo, const QString &text); void handleVoice(const BufferInfo &bufferInfo, const QString &text); void handleWait(const BufferInfo &bufferInfo, const QString &text);