Clean-up and refactor the blowfish encryption stuff

[quassel.git] / src / core / ircserverhandler.cpp

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index ea59836..b9a2f6c 100644 (file)
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -32,6 +32,10 @@
 
 #include <QDebug>
 
+#ifdef HAVE_QCA2
+#  include "cipher.h"
+#endif
+
 IrcServerHandler::IrcServerHandler(CoreNetwork *parent)
   : CoreBasicHandler(parent),
     _whois(false)
@@ -494,6 +498,9 @@ void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList<QByteArr
       ? *targetIter
       : senderNick;
 
+#ifdef HAVE_QCA2
+    msg = decrypt(target, msg);
+#endif
     // it's possible to pack multiple privmsgs into one param using ctcp
     // - > we let the ctcpHandler do the work
     network()->ctcpHandler()->parse(Message::Plain, prefix, target, msg);
@@ -549,8 +556,13 @@ void IrcServerHandler::handleTopic(const QString &prefix, const QList<QByteArray
     return;
 
   QString topic;
-  if(params.count() > 1)
-    topic = channelDecode(channel->name(), params[1]);
+  if(params.count() > 1) {
+    QByteArray rawTopic = params[1];
+#ifdef HAVE_QCA2
+    rawTopic = decrypt(channel->name(), rawTopic, true);
+#endif
+    topic = channelDecode(channel->name(), rawTopic);
+  }
 
   channel->setTopic(topic);
 
@@ -988,7 +1000,12 @@ void IrcServerHandler::handle332(const QString &prefix, const QList<QByteArray>
     return;
 
   QString channel = serverDecode(params[0]);
-  QString topic = channelDecode(channel, params[1]);
+  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);
@@ -1230,6 +1247,27 @@ void IrcServerHandler::destroyNetsplits() {
   _netsplits.clear();
 }
 
-/***********************************************************************************/
+#ifdef HAVE_QCA2
+QByteArray IrcServerHandler::decrypt(const QString &bufferName, const QByteArray &message_, bool isTopic) {
+  if(bufferName.isEmpty() || message_.isEmpty())
+    return message_;
+
+  const QByteArray key = network()->cipherKey(bufferName);
+  if(key.isEmpty())
+    return message_;
 
+  QByteArray message = message_;
 
+  CoreIrcChannel *channel = qobject_cast<CoreIrcChannel *>(network()->ircChannel(bufferName));
+  if(channel) {
+    if(channel->cipher()->setKey(key))
+      message = isTopic? channel->cipher()->decryptTopic(message) : channel->cipher()->decrypt(message);
+  } else {
+    CoreIrcUser *user = qobject_cast<CoreIrcUser *>(network()->ircUser(bufferName));
+    if(user && user->cipher()->setKey(key))
+      message = user->cipher()->decrypt(message);
+  }
+
+  return message;
+}
+#endif