X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=50bfa739e35e1042bd38a947d9b793f52ce8e30b;hp=98a4a8371750b2d449a33626fa46bbaa67220b26;hb=b79832bf9c4c21b05629cfd2fdbd008ad690572f;hpb=ef1ee865c342a16daab514a99110f56150ea95e7

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 98a4a837..50bfa739 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -30,6 +30,8 @@
 #include "sqlitestorage.h"
 #include "network.h"
 
+#include "util.h"
+
 Core *Core::instanceptr = 0;
 QMutex Core::mutex;
 
@@ -65,7 +67,7 @@ void Core::init() {
   CoreSettings cs;
 
   if(!(configured = initStorage(cs.storageSettings().toMap()))) {
-    qWarning("Core is currently not configured!");
+    qWarning("Core is currently not configured! Please connect with a Quassel Client for basic setup.");
 
     // try to migrate old settings
     QVariantMap old = cs.oldDbSettings().toMap();
@@ -105,7 +107,7 @@ void Core::saveState() {
 
 void Core::restoreState() {
   if(!instance()->configured) {
-    qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!"));
+    // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!"));
     return;
   }
   if(instance()->sessions.count()) {
@@ -275,19 +277,19 @@ MsgId Core::storeMessage(const Message &message) {
   return instance()->storage->logMessage(message);
 }
 
-QList<Message> Core::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) {
+QList<Message> Core::requestMsgs(UserId user, BufferId buffer, int lastmsgs, int offset) {
   QMutexLocker locker(&mutex);
-  return instance()->storage->requestMsgs(buffer, lastmsgs, offset);
+  return instance()->storage->requestMsgs(user, buffer, lastmsgs, offset);
 }
 
-QList<Message> Core::requestMsgs(BufferInfo buffer, QDateTime since, int offset) {
+QList<Message> Core::requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset) {
   QMutexLocker locker(&mutex);
-  return instance()->storage->requestMsgs(buffer, since, offset);
+  return instance()->storage->requestMsgs(user, buffer, since, offset);
 }
 
-QList<Message> Core::requestMsgRange(BufferInfo buffer, int first, int last) {
+QList<Message> Core::requestMsgRange(UserId user, BufferId buffer, int first, int last) {
   QMutexLocker locker(&mutex);
-  return instance()->storage->requestMsgRange(buffer, first, last);
+  return instance()->storage->requestMsgRange(user, buffer, first, last);
 }
 
 QList<BufferInfo> Core::requestBuffers(UserId user, QDateTime since) {
@@ -305,14 +307,14 @@ BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, cons
   return instance()->storage->renameBuffer(user, networkId, newName, oldName);
 }
 
-void Core::setBufferLastSeen(UserId user, const BufferId &bufferId, const QDateTime &seenDate) {
+void Core::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) {
   QMutexLocker locker(&mutex);
-  return instance()->storage->setBufferLastSeen(user, bufferId, seenDate);
+  return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId);
 }
 
-QHash<BufferId, QDateTime> Core::bufferLastSeenDates(UserId user) {
+QHash<BufferId, MsgId> Core::bufferLastSeenMsgIds(UserId user) {
   QMutexLocker locker(&mutex);
-  return instance()->storage->bufferLastSeenDates(user);
+  return instance()->storage->bufferLastSeenMsgIds(user);
 }
 
 /*** Network Management ***/
@@ -337,6 +339,8 @@ void Core::incomingConnection() {
     QTcpSocket *socket = server.nextPendingConnection();
     connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
     connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData()));
+    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError)));
+    
     QVariantMap clientInfo;
     blocksizes.insert(socket, (quint32)0);
     qDebug() << "Client connected from"  << qPrintable(socket->peerAddress().toString());
@@ -377,11 +381,16 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
     int updays = uptime / 86400; uptime %= 86400;
     int uphours = uptime / 3600; uptime %= 3600;
     int upmins = uptime / 60;
-    reply["CoreInfo"] = tr("<b>Quassel Core Version %1 (Build >= %2)</b><br>"
+    reply["CoreInfo"] = tr("<b>Quassel Core Version %1 (Build &ge; %2)</b><br>"
                             "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuild)
                             .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate));
 
-    reply["SupportSsl"] = false;
+    SslServer *sslServer = qobject_cast<SslServer *>(&server);
+    QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
+    bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid();
+    reply["SupportSsl"] = supportSsl;
+    // switch to ssl after client has been informed about our capabilities (see below)
+
     reply["LoginEnabled"] = true;
 
     // Just version information -- check it!
@@ -412,6 +421,15 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
     clientInfo[socket] = msg; // store for future reference
     reply["MsgType"] = "ClientInitAck";
     SignalProxy::writeDataToDevice(socket, reply);
+
+    // after we told the client that we are ssl capable we switch to ssl mode
+    if(supportSsl && msg["UseSsl"].toBool()) {
+      qDebug() << "Starting TLS for Client:"  << qPrintable(socket->peerAddress().toString());
+      connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+      sslSocket->startServerEncryption();
+    }
+    
+
   } else {
     // for the rest, we need an initialized connection
     if(!clientInfo.contains(socket)) {
@@ -496,3 +514,16 @@ SessionThread *Core::createSession(UserId uid, bool restore) {
   sess->start();
   return sess;
 }
+
+void Core::sslErrors(const QList<QSslError> &errors) {
+  Q_UNUSED(errors);
+  QSslSocket *socket = qobject_cast<QSslSocket *>(sender());
+  if(socket)
+    socket->ignoreSslErrors();
+}
+
+void Core::socketError(QAbstractSocket::SocketError err) {
+  QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(sender());
+  if(socket && err != QAbstractSocket::RemoteHostClosedError)
+    qDebug() << "Core::socketError()" << socket << err << socket->errorString();
+}