Merge pull request #89 from mamarley/ssloidentdfix

Improve the odds of winning the oidentd race when using SSL for IRC

diff --git a/README b/README
index 49b53c0..1877b62 100644 (file)
--- a/README
+++ b/README
@@ -5,11 +5,11 @@ Please find the current release notes at <http://quassel-irc.org>.
 
 On first run of the Quassel core, it will wait for a client to connect
 and present a first-run wizard that will allow you to create the database
-and one admin user for the core-side storage.  Note that Quassel does not
-support the administration of user accounts yet, this includes adding
-more users, changing passwords and so on.
-However, you can add more users, or change passwords of existing ones,
-using manageusers.py to be found in the scripts/ directory.
+and one admin user for the core-side storage.
+
+To add more users, run: `quasselcore --add-user`
+To change the password of an existing user: `quasselcore --change-userpass=username`
+The manageusers.py script is deprecated.
 
 IRC is the preferred means of getting in touch with the developers.
 The Quassel IRC Team can be contacted on Freenode/#quassel (or

diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp
index 2a323ed..2f89081 100644 (file)
--- a/src/client/clientuserinputhandler.cpp
+++ b/src/client/clientuserinputhandler.cpp
@@ -129,7 +129,7 @@ void ClientUserInputHandler::switchBuffer(const NetworkId &networkId, const QStr
         QList<ClientBufferViewConfig *> bufferViewConfigList = clientBufferViewManager->clientBufferViewConfigs();
         foreach(ClientBufferViewConfig *bufferViewConfig, bufferViewConfigList) {
             if (bufferViewConfig->temporarilyRemovedBuffers().contains(newBufId)) {
-                bufferViewConfig->addBuffer(newBufId, bufferViewConfig->bufferList().length());
+                bufferViewConfig->requestAddBuffer(newBufId, bufferViewConfig->bufferList().length());
                 //if (bufferViewConfig->sortAlphabetically()) {
                 // TODO we need to trigger a sort here, but can't reach the model required
                 // to get a bufferviewfilter, as the bufferviewmanager only managers configs

diff --git a/src/common/protocol.h b/src/common/protocol.h
index 053ab29..b219e01 100644 (file)
--- a/src/common/protocol.h
+++ b/src/common/protocol.h
@@ -80,12 +80,12 @@ struct ClientDenied : public HandshakeMessage
 
 struct ClientRegistered : public HandshakeMessage
 {
-    inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported, const QDateTime &coreStartTime)
+    inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported, const QString &coreInfo)
     : coreFeatures(coreFeatures)
     , coreConfigured(coreConfigured)
     , backendInfo(backendInfo)
     , sslSupported(sslSupported)
-    , coreStartTime(coreStartTime)
+    , coreInfo(coreInfo)
     {}
 
     quint32 coreFeatures;
@@ -94,7 +94,7 @@ struct ClientRegistered : public HandshakeMessage
 
     // this is only used by the LegacyProtocol in compat mode
     bool sslSupported;
-    QDateTime coreStartTime;
+    QString coreInfo;
 };
 
 

diff --git a/src/common/protocols/datastream/datastreampeer.cpp b/src/common/protocols/datastream/datastreampeer.cpp
index 7c45b46..393d0e2 100644 (file)
--- a/src/common/protocols/datastream/datastreampeer.cpp
+++ b/src/common/protocols/datastream/datastreampeer.cpp
@@ -124,7 +124,7 @@ void DataStreamPeer::handleHandshakeMessage(const QVariantList &mapData)
     }
 
     else if (msgType == "ClientInitAck") {
-        handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false, QDateTime())); // SupportsSsl and coreStartTime obsolete
+        handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false, QString())); // SupportsSsl and coreInfo obsolete
     }
 
     else if (msgType == "CoreSetupData") {

diff --git a/src/common/protocols/legacy/legacypeer.cpp b/src/common/protocols/legacy/legacypeer.cpp
index 982ffd7..98a7afa 100644 (file)
--- a/src/common/protocols/legacy/legacypeer.cpp
+++ b/src/common/protocols/legacy/legacypeer.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 
 #include <QHostAddress>
+#include <QDataStream>
 #include <QTcpSocket>
 
 #include "legacypeer.h"
-#include "quassel.h"
 
 /* version.inc is no longer used for this */
 const uint protocolVersion = 10;
@@ -170,7 +170,7 @@ void LegacyPeer::handleHandshakeMessage(const QVariant &msg)
             socket()->setProperty("UseCompression", true);
 #endif
 
-        handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), m["SupportSsl"].toBool(), QDateTime()));
+        handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), m["SupportSsl"].toBool(), QString()));
     }
 
     else if (msgType == "CoreSetupData") {
@@ -249,15 +249,7 @@ void LegacyPeer::dispatch(const ClientRegistered &msg) {
     m["SupportsCompression"] = socket()->property("UseCompression").toBool(); // this property gets already set in the ClientInit handler
 
     // This is only used for old v10 clients (pre-0.5)
-    int uptime = msg.coreStartTime.secsTo(QDateTime::currentDateTime().toUTC());
-    int updays = uptime / 86400; uptime %= 86400;
-    int uphours = uptime / 3600; uptime %= 3600;
-    int upmins = uptime / 60;
-    m["CoreInfo"] = tr("<b>Quassel Core Version %1</b><br>"
-                       "Built: %2<br>"
-                       "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString)
-                       .arg(Quassel::buildInfo().buildDate)
-                       .arg(updays).arg(uphours, 2, 10, QChar('0')).arg(upmins, 2, 10, QChar('0')).arg(msg.coreStartTime.toString(Qt::TextDate));
+    m["CoreInfo"] = msg.coreInfo;
 
     m["LoginEnabled"] = m["Configured"] = msg.coreConfigured;
 

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index 9ef67fa..d52a50b 100644 (file)
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -169,8 +169,18 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
     if (!configured)
         backends = Core::backendInfo();
 
-    // useSsl and startTime are only used for the legacy protocol
-    _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, Core::instance()->startTime()));
+    int uptime = Core::instance()->startTime().secsTo(QDateTime::currentDateTime().toUTC());
+    int updays = uptime / 86400; uptime %= 86400;
+    int uphours = uptime / 3600; uptime %= 3600;
+    int upmins = uptime / 60;
+    QString coreInfo = tr("<b>Quassel Core Version %1</b><br>"
+                          "Built: %2<br>"
+                          "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString)
+                          .arg(Quassel::buildInfo().buildDate)
+                          .arg(updays).arg(uphours, 2, 10, QChar('0')).arg(upmins, 2, 10, QChar('0')).arg(Core::instance()->startTime().toString(Qt::TextDate));
+
+    // useSsl and coreInfo are only used for the legacy protocol
+    _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, coreInfo));
 
     if (_legacy && useSsl)
         startSsl();

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 56aaf54..bb58da1 100644 (file)
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1516,7 +1516,7 @@ QList<Message> PostgreSqlStorage::requestMsgs(UserId user, BufferId bufferId, Ms
     if (limit != -1)
         params << limit;
     else
-        params << "ALL";
+        params << QVariant(QVariant::Int);
 
     QSqlQuery query = executePreparedQuery(queryName, params, db);
 

diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp
index 8f10023..b76f899 100644 (file)
--- a/src/qtui/aboutdlg.cpp
+++ b/src/qtui/aboutdlg.cpp
@@ -89,6 +89,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Terje \"tan\" Andersen</b></dt><dd>Norwegian translation, documentation</dd>"
                               "<dt><b>Jens \"amiconn\" Arnold</b></dt><dd>Postgres migration fixes</dd>"
                               "<dt><b>Adolfo Jayme Barrientos</b></dt><dd>Spanish translation</dd>"
+                              "<dt><b>Mattia Basaglia</b></dt><dd>Fixes</dd>"
                               "<dt><b>Pete \"elbeardmorez\" Beardmore</b></dt><dd>Linewrap for input line</dd>"
                               "<dt><b>Rafael \"EagleScreen\" Belmonte</b></dt><dd>Spanish translation</dd>"
                               "<dt><b>Sergiu Bivol</b></dt><dd>Romanian translation</dd>"
@@ -129,6 +130,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Johannes \"j0hu\" Huber</b></dt><dd>Many fixes and features, bug triaging</dd>"
                               "<dt><b>Theofilos Intzoglou</b></dt><dd>Greek translation</dd>"
                               "<dt><b>Jovan Jojkić</b></dt><dd>Serbian translation</dd>"
+                              "<dt><b>Allan Jude</b></dt><dd>Documentation improvements</dd>"
                               "<dt><b>Michael \"ycros\" Kedzierski</b></dt><dd>Mac fixes</dd>"
                               "<dt><b>Scott \"ScottK\" Kitterman<b></dt><dd>Kubuntu nightly packager, (packaging/build system) bughunter</dd>"
                               "<dt><b>Paul \"Haudrauf\" Klumpp</b></dt><dd>Initial design and mainwindow layout</dd>"
@@ -144,6 +146,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Michael \"mamarley\" Marley</b></dt><dd>Various fixes and improvements</dd>"
                               "<dt><b>Martin \"m4yer\" Mayer</b></dt><dd>German translation</dd>"
                               "<dt><b>Daniel \"hydrogen\" Meltzer</b></dt><dd>Various fixes and improvements</dd>"
+                              "<dt><b>Sebastian Meyer</b></dt><dd>Fixes</dd>"
                               "<dt><b>Daniel E. Moctezuma</b></dt><dd>Japanese translation</dd>"
                               "<dt><b>Chris \"kode54\" Moeller</b></dt><dd>Various fixes and improvements</dd>"
                               "<dt><b>Thomas Müller</b></dt><dd>Fixes, Debian packaging</dd>"
@@ -167,6 +170,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Dirk \"MarcLandis\" Rettschlag</b></dt><dd>Various fixes and new features</dd>"
                               "<dt><b>Miguel Revilla</b></dt><dd>Spanish translation</dd>"
                               "<dt><b>Jaak Ristioja</b></dt><dd>Fixes</dd>"
+                              "<dt><b>David \"Bombe\" Roden</b></dt><dd>Fixes</dd>"
                               "<dt><b>Henning \"honk\" Rohlfs</b></dt><dd>Various fixes</dd>"
                               "<dt><b>Stella \"differentreality\" Rouzi</b></dt><dd>Greek translation</dd>"
                               "<dt><b>\"salnx\"</b></dt><dd>Highlight configuration improvements</dd>"
@@ -177,6 +181,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Tim \"xAFFE\" Schumacher</b></dt><dd>Fixes and feedback</dd>"
                               "<dt><b>\"sfionov\"</b></dt><dd>Russian translation</dd>"
                               "<dt><b>Harald \"apachelogger\" Sitter</b></dt><dd>{ku|U}buntu packager, motivator, promoter</dd>"
+                              "<dt><b>Ramanathan Sivagurunathan</b></dt><dd>Fixes</dd>"
                               "<dt><b>Stefanos Sofroniou</b></dt><dd>Greek translation</dd>"
                               "<dt><b>Rüdiger \"ruediger\" Sonderfeld</b></dt><dd>Emacs keybindings</dd>"
                               "<dt><b>Alexander Stein</b></dt><dd>Tray icon fix</dd>"
@@ -186,6 +191,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>\"ToBeFree\"</b></dt><dd>German translation</dd>"
                               "<dt><b>Edward \"Aides\" Toroshchin</b></dt><dd>Russian translation</dd>"
                               "<dt><b>Adam \"adamt\" Tulinius</b></dt><dd>Early beta tester and bughunter, Danish translation</dd>"
+                              "<dt><b>Deniz Türkoglu</b></dt><dd>Mac fixes</dd>"
                               "<dt><b>Frederik M.J. \"freqmod\" Vestre</b></dt><dd>Norwegian translation</dd>"
                               "<dt><b>Atte Virtanen</b></dt><dd>Finnish translation</dd>"
                               "<dt><b>Pavel \"int\" Volkovitskiy</b></dt><dd>Early beta tester and bughunter</dd>"