X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.cpp;h=bd4350dac215ba6da4fef84c92ca0be894c311d9;hp=877981cb163584e9e8b4fd559191bf9a726b1214;hb=092e6b212637ffbf68800584b7c1f32d1931b602;hpb=160492494676f09b7836badc165727a538f03ece

diff --git a/src/core/oidentdconfiggenerator.cpp b/src/core/oidentdconfiggenerator.cpp
index 877981cb..bd4350da 100644
--- a/src/core/oidentdconfiggenerator.cpp
+++ b/src/core/oidentdconfiggenerator.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   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  *
@@ -15,95 +15,144 @@
  *   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)
+OidentdConfigGenerator::OidentdConfigGenerator(bool strict, QObject *parent) :
+    QObject(parent),
+    _initialized(false),
+    _strict(strict)
 {
-  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);
+OidentdConfigGenerator::~OidentdConfigGenerator()
+{
+    _quasselConfig.clear();
+    writeConfig();
+    _configFile->deleteLater();
+}
 
-  configTag = " stanza created by Quassel";
 
-  _configFile = new QFile(configPath);
+bool OidentdConfigGenerator::init()
+{
+    _configDir = QDir::homePath();
+    _configFileName = ".oidentd.conf";
 
-  // 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 (Quassel::isOptionSet("oidentd-conffile"))
+        _configPath = Quassel::optionValue("oidentd-conffile");
+    else
+        _configPath = _configDir.absoluteFilePath(_configFileName);
 
-  quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
-  quasselStanzaRx = QRegExp(QString("^lport .* \\{ .* \\} #%1\\r?\\n").arg(configTag));
+    _configTag = " stanza created by Quassel";
 
-  _mutex.lock();
-  // initially remove all Quassel stanzas that might be present
-  if (parseConfig(false) && writeConfig())
-    _initialized = true;
-  _mutex.unlock();
+    _configFile = new QFile(_configPath);
 
-  return _initialized;
-}
+    // 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.
 
-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();
+    _quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
+    _quasselStanzaRx = QRegExp(QString("^lport .* \\{ .* \\} #%1\\r?\\n").arg(_configTag));
 
-  _config.append(quasselStanzaTemplate.arg(localPort).arg(ident).arg(configTag));
+    // initially remove all Quassel stanzas that might be present
+    if (parseConfig(false) && writeConfig())
+        _initialized = true;
 
-  _mutex.lock();
-  bool ret = writeConfig();
-  _mutex.unlock();
-
-  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 {
+    if (!_strict) {
+        return identity->ident();
+    }
+    const CoreNetwork *network = qobject_cast<CoreNetwork *>(sender());
+    return network->coreSession()->strictSysident();
 }
 
-bool OidentdConfigGenerator::parseConfig(bool keepQuasselStanzas) {
-  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)
+{
+    Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
+    const QString ident = sysIdentForIdentity(identity);
+
+    _quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toLatin1());
+
+    bool ret = writeConfig();
 
-    if (keepQuasselStanzas || !lineByUs(line))
-      parsedConfig.append(line);
-  }
+    return ret;
+}
 
-  _config = parsedConfig;
 
-  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(QIODevice::ReadWrite | QIODevice::Text))
-    return false;
 
-  _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 quasselStanzaRx.exactMatch(line);
+
+bool OidentdConfigGenerator::lineByUs(const QByteArray &line)
+{
+    return _quasselStanzaRx.exactMatch(line);
 }