X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.cpp;h=06ff272f0c99858399de00db86fc8481b24562fc;hp=072b15956b283b1f2dd68ab70a1b06568a8a24d0;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=2e80003ab40313767d0624e05533a62e2eee387b

diff --git a/src/core/oidentdconfiggenerator.cpp b/src/core/oidentdconfiggenerator.cpp
index 072b1595..06ff272f 100644
--- a/src/core/oidentdconfiggenerator.cpp
+++ b/src/core/oidentdconfiggenerator.cpp
@@ -21,94 +21,125 @@
 #include "oidentdconfiggenerator.h"
 
 OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
-  QObject(parent),
-  _initialized(false)
+    QObject(parent),
+    _initialized(false)
 {
-  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";
+OidentdConfigGenerator::~OidentdConfigGenerator()
+{
+    _quasselConfig.clear();
+    writeConfig();
+    _configFile->deleteLater();
+}
 
-  _configFile = new QFile(configPath);
-  qDebug() << "1: _configFile" << _configFile->fileName();
 
-  quasselStanza = QRegExp(QString("^lport .* { .* } #%1$").arg(configTag));
+bool OidentdConfigGenerator::init()
+{
+    _configDir = QDir::homePath();
+    _configFileName = ".oidentd.conf";
 
-  if (parseConfig(false) && writeConfig())
-    _initialized = true;
+    if (Quassel::isOptionSet("oidentd-conffile"))
+        _configPath = Quassel::optionValue("oidentd-conffile");
+    else
+        _configPath = _configDir.absoluteFilePath(_configFileName);
 
-  qDebug() << "OidentdConfigGenerator" << (!_initialized ? "not" : "") << "initialized";
+    _configTag = " stanza created by Quassel";
 
-  return _initialized;
-}
+    _configFile = new QFile(_configPath);
 
-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();
+    // 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.
 
-  QString ident = identity->ident();
+    _quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
+    _quasselStanzaRx = QRegExp(QString("^lport .* \\{ .* \\} #%1\\r?\\n").arg(_configTag));
 
-  _config.append(QString("lport %1 { reply \"%2\" } #%3\n").arg(localPort).arg(ident).arg(configTag));
+    // initially remove all Quassel stanzas that might be present
+    if (parseConfig(false) && writeConfig())
+        _initialized = true;
 
-  bool ret = writeConfig();
-  qDebug() << "config written" << ret;
-
-  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;
-}
 
-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)
+{
+    Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
+    QString ident = identity->ident();
 
-  QByteArray parsedConfig;
-  while (!_configFile->atEnd()) {
-    QByteArray line = _configFile->readLine();
+    _quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toAscii());
 
-    qDebug() << "line" << line;
-    qDebug() << "line by us?" << lineByUs(line);
-    if (keepQuasselStanzas || !lineByUs(line))
-      parsedConfig.append(line);
-  }
+    bool ret = writeConfig();
 
-  _config = parsedConfig;
+    return ret;
+}
 
-  return true;
+
+//! 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;
 }
 
-bool OidentdConfigGenerator::writeConfig() {
-  if (!_configFile->isOpen() && !_configFile->open(QFile::WriteOnly | QFile::Truncate))
-    return false;
 
-  //FIXME: thread safety
-  QTextStream out(_configFile);
-  out << _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);
 }