X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreircchannel.cpp;h=33c9efb1b241c1963e9b5970f7f4fe4164c1be87;hp=0d8de10d5cbb8ba9cbbf0bb63b960d40961dd107;hb=e14649614fbbf9b386505a5d782b88b1ac313c1f;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/core/coreircchannel.cpp b/src/core/coreircchannel.cpp
index 0d8de10d..33c9efb1 100644
--- a/src/core/coreircchannel.cpp
+++ b/src/core/coreircchannel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,13 +15,70 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreircchannel.h"
 
-CoreIrcChannel::CoreIrcChannel(const QString &channelname, Network *network)
-  : IrcChannel(channelname, network),
-    _receivedWelcomeMsg(false)
+#include "corenetwork.h"
+
+CoreIrcChannel::CoreIrcChannel(const QString& channelname, Network* network)
+    : IrcChannel(channelname, network)
+    , _receivedWelcomeMsg(false)
 {
+#ifdef HAVE_QCA2
+    _cipher = nullptr;
+
+    // Get the cipher key from CoreNetwork if present
+    auto* coreNetwork = qobject_cast<CoreNetwork*>(network);
+    if (coreNetwork) {
+        QByteArray key = coreNetwork->readChannelCipherKey(channelname);
+        if (!key.isEmpty()) {
+            setEncrypted(cipher()->setKey(key));
+        }
+    }
+#endif
 }
+
+CoreIrcChannel::~CoreIrcChannel()
+{
+#ifdef HAVE_QCA2
+    // Store the cipher key in CoreNetwork, including empty keys if a cipher
+    // exists. There is no need to store the empty key if no cipher exists; no
+    // key was present when instantiating and no key was set during the
+    // channel's lifetime.
+    auto* coreNetwork = qobject_cast<CoreNetwork*>(network());
+    if (coreNetwork && _cipher) {
+        coreNetwork->storeChannelCipherKey(name(), _cipher->key());
+    }
+
+    delete _cipher;
+#endif
+}
+
+#ifdef HAVE_QCA2
+Cipher* CoreIrcChannel::cipher() const
+{
+    if (!_cipher)
+        _cipher = new Cipher();
+
+    return _cipher;
+}
+
+void CoreIrcChannel::setEncrypted(bool e)
+{
+    IrcChannel::setEncrypted(e);
+
+    if (!Cipher::neededFeaturesAvailable())
+        return;
+
+    if (e) {
+        if (topic().isEmpty())
+            return;
+
+        QByteArray decrypted = cipher()->decryptTopic(topic().toLatin1());
+        setTopic(decodeString(decrypted));
+    }
+}
+
+#endif