/***************************************************************************
- * Copyright (C) 2012 by the Quassel Project *
+ * Copyright (C) 2005-2018 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 <QString>
+
+#include "corenetwork.h"
#include "oidentdconfiggenerator.h"
OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
- QObject(parent),
- _initialized(false)
+ QObject(parent),
+ _initialized(false)
+{
+ if (!_initialized)
+ init();
+}
+
+
+OidentdConfigGenerator::~OidentdConfigGenerator()
{
- qDebug() << "OidentdConfigGenerator() checking for being initialized";
- if (!_initialized)
- init();
+ _quasselConfig.clear();
+ writeConfig();
+ _configFile->deleteLater();
}
-bool OidentdConfigGenerator::init() {
- configDir = QDir::homePath();
- configFileName = ".oidentd.conf";
- configTag = " stanza created by Quassel";
- _configFile = new QFile(configDir.absoluteFilePath(configFileName));
- qDebug() << "1: _configFile" << _configFile->fileName();
+bool OidentdConfigGenerator::init()
+{
+ _configDir = QDir::homePath();
+ _configFileName = ".oidentd.conf";
+
+ if (Quassel::isOptionSet("oidentd-conffile"))
+ _configPath = Quassel::optionValue("oidentd-conffile");
+ else
+ _configPath = _configDir.absoluteFilePath(_configFileName);
+
+ _configTag = " stanza created by Quassel";
+
+ _configFile = new QFile(_configPath);
- quasselStanza = QRegExp(QString("^lport .* { .* } #%1$").arg(configTag));
+ // Rx has to match Template in order for cleanup to work.
+ // Template should be enhanced with the "from" parameter as soon as Quassel gains
+ // the ability to bind to an IP on client sockets.
- if (update())
- _initialized = true;
+ _quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
+ _quasselStanzaRx = QRegExp(QString("^lport .* \\{ .* \\} #%1\\r?\\n").arg(_configTag));
- qDebug() << "konichi wa °-°";
+ // initially remove all Quassel stanzas that might be present
+ if (parseConfig(false) && writeConfig())
+ _initialized = true;
- return _initialized;
+ return _initialized;
}
-bool OidentdConfigGenerator::update() {
- if (parseConfig())
- qDebug() << "oidentd config parsed successfully";
- else
- qDebug() << QString("parsing oidentd config failed (%1 [%2])").arg(_configFile->errorString()).arg(_configFile->error());
- return writeConfig();
+QString OidentdConfigGenerator::sysIdentForIdentity(const CoreIdentity *identity) const {
+ // Make sure the identity's ident complies with strict mode if enabled
+ const CoreNetwork *network = qobject_cast<CoreNetwork *>(sender());
+ return network->coreSession()->strictCompliantIdent(identity);
}
-bool OidentdConfigGenerator::parseConfig() {
- qDebug() << "_configFile name" << _configFile->fileName();
- qDebug() << "open?" << _configFile->isOpen();
- if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite))
- return false;
- QByteArray parsedConfig;
- while (!_configFile->atEnd()) {
- QByteArray line = _configFile->readLine();
+bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity,
+ const QHostAddress &localAddress, quint16 localPort,
+ const QHostAddress &peerAddress, quint16 peerPort,
+ qint64 socketId)
+{
+ Q_UNUSED(localAddress)
+ Q_UNUSED(peerAddress)
+ Q_UNUSED(peerPort)
+ Q_UNUSED(socketId)
+
+ const QString ident = sysIdentForIdentity(identity);
- if (checkLine(line))
- parsedConfig.append(line);
- }
+ _quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toLatin1());
- _config = parsedConfig;
+ bool ret = writeConfig();
- return true;
+ return ret;
}
-bool OidentdConfigGenerator::writeConfig() {
- return true;
+
+//! not yet implemented
+bool OidentdConfigGenerator::removeSocket(const CoreIdentity *identity,
+ const QHostAddress &localAddress, quint16 localPort,
+ const QHostAddress &peerAddress, quint16 peerPort,
+ qint64 socketId)
+{
+ Q_UNUSED(identity)
+ Q_UNUSED(localAddress)
+ Q_UNUSED(localPort)
+ Q_UNUSED(peerAddress)
+ Q_UNUSED(peerPort)
+ Q_UNUSED(socketId)
+
+ return true;
+}
+
+
+bool OidentdConfigGenerator::parseConfig(bool readQuasselStanzas)
+{
+ if (!_configFile->exists())
+ return true;
+
+ if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadOnly))
+ return false;
+ _mutex.lock();
+
+ _parsedConfig.clear();
+ _configFile->seek(0);
+ while (!_configFile->atEnd()) {
+ QByteArray line = _configFile->readLine();
+
+ if (!lineByUs(line))
+ _parsedConfig.append(line);
+ else if (readQuasselStanzas)
+ _quasselConfig.append(line);
+ }
+
+ _configFile->close();
+ _mutex.unlock();
+ return true;
}
-bool OidentdConfigGenerator::checkLine(const QByteArray &line) {
- return !quasselStanza.exactMatch(line);
+
+bool OidentdConfigGenerator::writeConfig()
+{
+#ifdef HAVE_UMASK
+ mode_t prev_umask = umask(S_IXUSR | S_IWGRP | S_IXGRP | S_IWOTH | S_IXOTH); // == 0133, rw-r--r--
+#endif
+ bool not_open = (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite | QIODevice::Text));
+#ifdef HAVE_UMASK
+ umask(prev_umask);
+#endif
+
+ if (not_open)
+ return false;
+
+ _mutex.lock();
+
+ _configFile->seek(0);
+ _configFile->resize(0);
+ _configFile->write(_parsedConfig);
+ _configFile->write(_quasselConfig);
+
+ _configFile->close();
+ _mutex.unlock();
+ return true;
+}
+
+
+bool OidentdConfigGenerator::lineByUs(const QByteArray &line)
+{
+ return _quasselStanzaRx.exactMatch(line);
}