From: Johannes Huber <johu@gmx.de>
Date: Thu, 25 Feb 2010 18:43:48 +0000 (+0100)
Subject: message + topic encryption
X-Git-Tag: 0.7-beta1~28
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=82a12eca7978598dafc059df6a2156e8899ef942;ds=sidebyside

message + topic encryption
---

diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
index 101ccab3..95605bdb 100644
--- a/src/core/coreuserinputhandler.cpp
+++ b/src/core/coreuserinputhandler.cpp
@@ -355,7 +355,7 @@ void CoreUserInputHandler::handleMsg(const BufferInfo &bufferInfo, const QString
     return;
 
   QByteArray target = serverEncode(msg.section(' ', 0, 0));
-  putPrivmsg(target, userEncode(target, msg.section(' ', 1)));
+  putPrivmsg(target, userEncode(target, msg.section(' ', 1)), false);
 }
 
 void CoreUserInputHandler::handleNick(const BufferInfo &bufferInfo, const QString &msg) {
@@ -445,7 +445,7 @@ 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));
+  putPrivmsg(serverEncode(bufferInfo.bufferName()), channelEncode(bufferInfo.bufferName(), msg), false);
   emit displayMsg(Message::Plain, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self);
 }
 
@@ -491,8 +491,16 @@ void CoreUserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QStri
   if(bufferInfo.bufferName().isEmpty()) return;
   QList<QByteArray> params;
   params << serverEncode(bufferInfo.bufferName());
-  if(!msg.isEmpty())
+  if(!msg.isEmpty()) {
+    #ifdef HAVE_QCA2
+    const QByteArray bufferName =  bufferInfo.bufferName().toAscii();
+    QByteArray message = channelEncode(bufferInfo.bufferName(), msg);
+    params << encrypt(bufferName, message);
+    #else
     params << channelEncode(bufferInfo.bufferName(), msg);
+    #endif
+  }
+  
   emit putCmd("TOPIC", params);
 }
 
@@ -543,24 +551,34 @@ 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, bool encrypted) {
+
+  QByteArray temp = message;
+  
+  #ifdef HAVE_QCA2
+  if(!encrypted) {
+    temp = encrypt(target, temp);
+    encrypted = true;
+  }
+  #endif
+
   static const char *cmd = "PRIVMSG";
-  int overrun = lastParamOverrun(cmd, QList<QByteArray>() << target << message);
+  int overrun = lastParamOverrun(cmd, QList<QByteArray>() << target << temp);
   if(overrun) {
     static const char *splitter = " .,-";
-    int maxSplitPos = message.count() - overrun;
+    int maxSplitPos = temp.count() - overrun;
     int splitPos = -1;
     for(const char *splitChar = splitter; *splitChar != 0; splitChar++) {
-      splitPos = qMax(splitPos, message.lastIndexOf(*splitChar, maxSplitPos));
+      splitPos = qMax(splitPos, temp.lastIndexOf(*splitChar, maxSplitPos));
     }
     if(splitPos <= 0) {
       splitPos = maxSplitPos;
     }
-    putCmd(cmd, QList<QByteArray>() << target << message.left(splitPos));
-    putPrivmsg(target, message.mid(splitPos));
+    putCmd(cmd, QList<QByteArray>() << target << temp.left(splitPos));
+    putPrivmsg(target, temp.mid(splitPos), encrypted);
     return;
   } else {
-    putCmd(cmd, QList<QByteArray>() << target << message);
+    putCmd(cmd, QList<QByteArray>() << target << temp);
   }
 }
 
@@ -593,6 +611,30 @@ int CoreUserInputHandler::lastParamOverrun(const QString &cmd, const QList<QByte
   }
 }
 
+#ifdef HAVE_QCA2
+QByteArray CoreUserInputHandler::encrypt(const QByteArray &target, QByteArray &message) {
+  if(target.isEmpty())
+    return message;
+
+  if(message.isEmpty())
+    return message;
+
+  QByteArray key = network()->bufferKey(target);
+  if(key.isEmpty())
+    return message;
+  
+  IrcChannel *channel = network()->ircChannel(target);
+  IrcUser *user = network()->ircUser(target);
+
+  if(channel && channel->cipher()->setKey(key))
+    channel->cipher()->encrypt(message);
+  else if(user && user->cipher()->setKey(key))
+    user->cipher()->encrypt(message);
+
+  return message;
+}
+#endif
+
 void CoreUserInputHandler::timerEvent(QTimerEvent *event) {
   if(!_delayedCommands.contains(event->timerId())) {
     QObject::timerEvent(event);
diff --git a/src/core/coreuserinputhandler.h b/src/core/coreuserinputhandler.h
index f2c3c6d8..4cb2eb84 100644
--- a/src/core/coreuserinputhandler.h
+++ b/src/core/coreuserinputhandler.h
@@ -77,9 +77,13 @@ protected:
 
 private:
   void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);
-  void putPrivmsg(const QByteArray &target, const QByteArray &message);
+  void putPrivmsg(const QByteArray &target, const QByteArray &message, bool encrypted);
   int lastParamOverrun(const QString &cmd, const QList<QByteArray> &params);
 
+  #ifdef HAVE_QCA2
+  QByteArray encrypt(const QByteArray &target, QByteArray &message);
+  #endif
+  
   struct Command {
     BufferInfo bufferInfo;
     QString command;