/***************************************************************************
- * Copyright (C) 2005-2012 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 *
* 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"
+
#include "corenetwork.h"
-INIT_SYNCABLE_OBJECT(CoreIrcChannel)
-CoreIrcChannel::CoreIrcChannel(const QString &channelname, Network *network)
- : IrcChannel(channelname, network),
- _receivedWelcomeMsg(false)
+CoreIrcChannel::CoreIrcChannel(const QString& channelname, Network* network)
+ : IrcChannel(channelname, network)
+ , _receivedWelcomeMsg(false)
{
#ifdef HAVE_QCA2
- _cipher = 0;
+ _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
+Cipher* CoreIrcChannel::cipher() const
{
if (!_cipher)
_cipher = new Cipher();
return _cipher;
}
-
void CoreIrcChannel::setEncrypted(bool e)
{
+ IrcChannel::setEncrypted(e);
+
if (!Cipher::neededFeaturesAvailable())
return;
if (topic().isEmpty())
return;
- QByteArray key = qobject_cast<CoreNetwork *>(network())->cipherKey(name());
- if (key.isEmpty())
- return;
-
- if (!cipher()->setKey(key))
- return;
-
- QByteArray decrypted = cipher()->decryptTopic(topic().toAscii());
+ QByteArray decrypted = cipher()->decryptTopic(topic().toLatin1());
setTopic(decodeString(decrypted));
}
}
-
#endif