/***************************************************************************
- * Copyright (C) 2012 by the Quassel Project *
+ * Copyright (C) 2005-2019 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. *
***************************************************************************/
+#ifdef HAVE_UMASK
+# include <sys/stat.h>
+# include <sys/types.h>
+#endif /* HAVE_UMASK */
+
+#include <QString>
+
+#include "corenetwork.h"
#include "oidentdconfiggenerator.h"
-OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
- QObject(parent),
- _initialized(false)
+OidentdConfigGenerator::OidentdConfigGenerator(QObject* parent)
+ : QObject(parent)
{
- qDebug() << "OidentdConfigGenerator() checking for being initialized";
- if (!_initialized)
- init();
+ if (!_initialized)
+ init();
}
-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);
- qDebug() << "1: _configFile" << _configFile->fileName();
-
- quasselStanza = QRegExp(QString("^lport .* \\{ .* \\} #%1\\n").arg(configTag));
+OidentdConfigGenerator::~OidentdConfigGenerator()
+{
+ _quasselConfig.clear();
+ writeConfig();
+ _configFile->deleteLater();
+}
- _mutex.lock();
- if (parseConfig(false) && writeConfig())
- _initialized = true;
- _mutex.unlock();
+bool OidentdConfigGenerator::init()
+{
+ _configDir.setPath(QDir::homePath());
+ _configFileName = ".oidentd.conf";
- qDebug() << "OidentdConfigGenerator" << (!_initialized ? "not" : "") << "initialized";
+ if (Quassel::isOptionSet("oidentd-conffile"))
+ _configPath = Quassel::optionValue("oidentd-conffile");
+ else
+ _configPath = _configDir.absoluteFilePath(_configFileName);
- return _initialized;
-}
+ _configTag = " stanza created by Quassel";
-bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort) {
- qDebug() << "localAddress" << localAddress;
- qDebug() << "localPort" << localPort;
- qDebug() << "peerAddress" << peerAddress;
- qDebug() << "peerPort" << peerPort;
- qDebug() << "ident" << identity->ident();
+ _configFile = new QFile(_configPath);
- QString ident = identity->ident();
+ // 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.
- _config.append(QString("lport %1 { reply \"%2\" } #%3\n").arg(localPort).arg(ident).arg(configTag));
+ _quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
+ _quasselStanzaRx = QRegExp(QString(R"(^lport .* \{ .* \} #%1\r?\n)").arg(_configTag));
- _mutex.lock();
- bool ret = writeConfig();
- _mutex.unlock();
- qDebug() << "config written" << ret;
+ // initially remove all Quassel stanzas that might be present
+ if (parseConfig(false) && writeConfig())
+ _initialized = true;
- return ret;
+ return _initialized;
}
-// not yet implemented
-bool OidentdConfigGenerator::removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort) {
- Q_UNUSED(identity) Q_UNUSED(localAddress) Q_UNUSED(localPort) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
- return true;
+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(bool keepQuasselStanzas) {
- qDebug() << "_configFile name" << _configFile->fileName();
- qDebug() << "open?" << _configFile->isOpen();
- qDebug() << "keeping our stanzas?" << keepQuasselStanzas;
- if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite))
- return false;
+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)
- QByteArray parsedConfig;
- while (!_configFile->atEnd()) {
- QByteArray line = _configFile->readLine();
+ const QString ident = sysIdentForIdentity(identity);
- qDebug() << "line" << line;
- qDebug() << "line by us?" << lineByUs(line);
- if (keepQuasselStanzas || !lineByUs(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() {
- if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite | QIODevice::Text | QFile::Truncate))
- return false;
+//! 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;
+}
- _configFile->seek(0);
- _configFile->resize(0);
- _configFile->write(_config);
+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;
+}
- return _configFile->flush();
+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 quasselStanza.exactMatch(line);
+bool OidentdConfigGenerator::lineByUs(const QByteArray& line)
+{
+ return _quasselStanzaRx.exactMatch(line);
}
projects / quassel.git / blobdiff