/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include <QMetaObject>
#include <QMetaMethod>
-#include <QMutexLocker>
#include <QCoreApplication>
#include "core.h"
#include "coresession.h"
#include "coresettings.h"
+#include "quassel.h"
#include "signalproxy.h"
#include "sqlitestorage.h"
#include "network.h"
+#include "logger.h"
+
+#include "util.h"
Core *Core::instanceptr = 0;
-QMutex Core::mutex;
Core *Core::instance() {
if(instanceptr) return instanceptr;
instanceptr = 0;
}
-Core::Core()
- : storage(0)
-{
- startTime = QDateTime::currentDateTime(); // for uptime :)
-}
-
-void Core::init() {
- configured = false;
+Core::Core() : storage(0) {
+ _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :)
- CoreSettings cs;
- if(!(configured = initStorage(cs.databaseSettings().toMap()))) {
- qWarning("Core is currently not configured!");
- }
+ loadTranslation(QLocale::system());
- connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
- startListening(cs.port());
- guiUser = 0;
+ // Register storage backends here!
+ registerStorageBackend(new SqliteStorage(this));
+ if(!_storageBackends.count()) {
+ qWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting..."));
+ qWarning() << qPrintable(tr("Currently, Quassel only supports SQLite3. You need to build your\n"
+ "Qt library with the sqlite plugin enabled in order for quasselcore\n"
+ "to work."));
+ exit(1); // TODO make this less brutal (especially for mono client -> popup)
+ }
+ connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage()));
+ _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes
}
-bool Core::initStorage(QVariantMap dbSettings, bool setup) {
- QString engine = dbSettings["Type"].toString().toLower();
-
- if(storage) {
- qDebug() << "Deleting old storage object.";
- storage->deleteLater();
- storage = 0;
- }
+void Core::init() {
+ configured = false;
- // FIXME register new storageProviders here
- if(engine == "sqlite" && SqliteStorage::isAvailable()) {
- storage = new SqliteStorage(this);
- connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)));
- } else {
- qWarning() << "Selected StorageBackend is not available:" << dbSettings["Type"].toString();
- return configured = false;
- }
+ CoreSettings cs;
- if(setup && !storage->setup(dbSettings)) {
- return configured = false;
+ if(!(configured = initStorage(cs.storageSettings().toMap()))) {
+ 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();
+ if(old.count() && old["Type"].toString().toUpper() == "SQLITE") {
+ QVariantMap newSettings;
+ newSettings["Backend"] = "SQLite";
+ if((configured = initStorage(newSettings))) {
+ qWarning() << "...but thankfully I found some old settings to migrate!";
+ cs.setStorageSettings(newSettings);
+ }
+ }
}
- return configured = storage->init(dbSettings);
+ connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
+ connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
+ if(!startListening()) exit(1); // TODO make this less brutal
}
Core::~Core() {
- // FIXME properly shutdown the sessions
+ foreach(QTcpSocket *socket, blocksizes.keys()) {
+ socket->disconnectFromHost(); // disconnect non authed clients
+ }
qDeleteAll(sessions);
+ qDeleteAll(_storageBackends);
+}
+
+/*** Session Restore ***/
+
+void Core::saveState() {
+ CoreSettings s;
+ QVariantMap state;
+ QVariantList activeSessions;
+ foreach(UserId user, instance()->sessions.keys()) activeSessions << QVariant::fromValue<UserId>(user);
+ state["CoreStateVersion"] = 1;
+ state["ActiveSessions"] = activeSessions;
+ s.setCoreState(state);
}
void Core::restoreState() {
+ if(!instance()->configured) {
+ // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!"));
+ return;
+ }
if(instance()->sessions.count()) {
qWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!"));
return;
}
CoreSettings s;
- uint build = s.coreState().toMap()["CoreBuild"].toUInt();
- if(build < 362) {
+ /* We don't check, since we are at the first version since switching to Git
+ uint statever = s.coreState().toMap()["CoreStateVersion"].toUInt();
+ if(statever < 1) {
qWarning() << qPrintable(tr("Core state too old, ignoring..."));
return;
}
+ */
QVariantList activeSessions = s.coreState().toMap()["ActiveSessions"].toList();
if(activeSessions.count() > 0) {
- qDebug() << "Restoring previous core state...";
+ quInfo() << "Restoring previous core state...";
foreach(QVariant v, activeSessions) {
UserId user = v.value<UserId>();
instance()->createSession(user, true);
}
- qDebug() << "...done.";
}
}
-void Core::saveState() {
+/*** Core Setup ***/
+QString Core::setupCoreForInternalUsage() {
+ Q_ASSERT(!_storageBackends.isEmpty());
+ QVariantMap setupData;
+ qsrand(QDateTime::currentDateTime().toTime_t());
+ int pass = 0;
+ for(int i = 0; i < 10; i++) {
+ pass *= 10;
+ pass += qrand() % 10;
+ }
+ setupData["AdminUser"] = "AdminUser";
+ setupData["AdminPasswd"] = QString::number(pass);
+ setupData["Backend"] = _storageBackends[_storageBackends.keys().first()]->displayName();
+ return setupCore(setupData);
+}
+
+QString Core::setupCore(QVariantMap setupData) {
+ QString user = setupData.take("AdminUser").toString();
+ QString password = setupData.take("AdminPasswd").toString();
+ if(user.isEmpty() || password.isEmpty()) {
+ return tr("Admin user or password not set.");
+ }
+ if(!initStorage(setupData, true)) {
+ return tr("Could not setup storage!");
+ }
CoreSettings s;
- QVariantMap state;
- QVariantList activeSessions;
- foreach(UserId user, instance()->sessions.keys()) activeSessions << QVariant::fromValue<UserId>(user);
- state["CoreBuild"] = Global::quasselBuild;
- state["ActiveSessions"] = activeSessions;
- s.setCoreState(state);
+ s.setStorageSettings(setupData);
+ quInfo() << qPrintable(tr("Creating admin user..."));
+ storage->addUser(user, password);
+ startListening(); // TODO check when we need this
+ return QString();
}
-/*** Storage Access ***/
-bool Core::createNetworkId(UserId user, NetworkInfo &info) {
- QMutexLocker locker(&mutex);
- NetworkId networkId = instance()->storage->createNetworkId(user, info);
- if(!networkId.isValid())
+/*** Storage Handling ***/
+
+bool Core::registerStorageBackend(Storage *backend) {
+ if(backend->isAvailable()) {
+ _storageBackends[backend->displayName()] = backend;
+ return true;
+ } else {
+ backend->deleteLater();
return false;
-
- info.networkId = networkId;
- return true;
+ }
}
-NetworkId Core::networkId(UserId user, const QString &network) {
- QMutexLocker locker(&mutex);
- return instance()->storage->getNetworkId(user, network);
+void Core::unregisterStorageBackend(Storage *backend) {
+ _storageBackends.remove(backend->displayName());
+ backend->deleteLater();
}
-BufferInfo Core::bufferInfo(UserId user, const NetworkId &networkId, const QString &buffer) {
- //QMutexLocker locker(&mutex);
- return instance()->storage->getBufferInfo(user, networkId, buffer);
-}
+// old db settings:
+// "Type" => "sqlite"
+bool Core::initStorage(QVariantMap dbSettings, bool setup) {
+ QString backend = dbSettings["Backend"].toString();
+ if(backend.isEmpty()) {
+ //qWarning() << "No storage backend selected!";
+ return configured = false;
+ }
-MsgId Core::storeMessage(const Message &message) {
- QMutexLocker locker(&mutex);
- return instance()->storage->logMessage(message);
-}
+ if(_storageBackends.contains(backend)) {
+ storage = _storageBackends[backend];
+ } else {
+ qCritical() << "Selected storage backend is not available:" << backend;
+ return configured = false;
+ }
+ if(!storage->init(dbSettings)) {
+ if(!setup || !(storage->setup(dbSettings) && storage->init(dbSettings))) {
+ qCritical() << "Could not init storage!";
+ storage = 0;
+ return configured = false;
+ }
+ }
+ // delete all other backends
+ foreach(Storage *s, _storageBackends.values()) {
+ if(s != storage) s->deleteLater();
+ }
+ _storageBackends.clear();
-QList<Message> Core::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) {
- QMutexLocker locker(&mutex);
- return instance()->storage->requestMsgs(buffer, lastmsgs, offset);
+ connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)));
+ return configured = true;
}
-QList<Message> Core::requestMsgs(BufferInfo buffer, QDateTime since, int offset) {
- QMutexLocker locker(&mutex);
- return instance()->storage->requestMsgs(buffer, since, offset);
+void Core::syncStorage() {
+ if(storage) storage->sync();
}
-QList<Message> Core::requestMsgRange(BufferInfo buffer, int first, int last) {
- QMutexLocker locker(&mutex);
- return instance()->storage->requestMsgRange(buffer, first, last);
-}
+/*** Storage Access ***/
+bool Core::createNetwork(UserId user, NetworkInfo &info) {
+ NetworkId networkId = instance()->storage->createNetwork(user, info);
+ if(!networkId.isValid())
+ return false;
-QList<BufferInfo> Core::requestBuffers(UserId user, QDateTime since) {
- QMutexLocker locker(&mutex);
- return instance()->storage->requestBuffers(user, since);
+ info.networkId = networkId;
+ return true;
}
/*** Network Management ***/
-bool Core::startListening(uint port) {
- if(!server.listen(QHostAddress::Any, port)) {
- qWarning(QString(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())).toAscii());
- return false;
+bool Core::startListening() {
+ // in mono mode we only start a local port if a port is specified in the cli call
+ if(Quassel::runMode() == Quassel::Monolithic && !Quassel::isOptionSet("port"))
+ return true;
+
+ bool success = false;
+ uint port = Quassel::optionValue("port").toUInt();
+
+ const QString listen = Quassel::optionValue("listen");
+ const QStringList listen_list = listen.split(",", QString::SkipEmptyParts);
+ if(listen_list.size() > 0) {
+ foreach (const QString listen_term, listen_list) { // TODO: handle multiple interfaces for same TCP version gracefully
+ QHostAddress addr;
+ if(!addr.setAddress(listen_term)) {
+ qCritical() << qPrintable(
+ tr("Invalid listen address %1")
+ .arg(listen_term)
+ );
+ } else {
+ switch(addr.protocol()) {
+ case QAbstractSocket::IPv4Protocol:
+ if(_server.listen(addr, port)) {
+ quInfo() << qPrintable(
+ tr("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3")
+ .arg(addr.toString())
+ .arg(_server.serverPort())
+ .arg(Quassel::buildInfo().protocolVersion)
+ );
+ success = true;
+ } else
+ quWarning() << qPrintable(
+ tr("Could not open IPv4 interface %1:%2: %3")
+ .arg(addr.toString())
+ .arg(port)
+ .arg(_server.errorString()));
+ break;
+ case QAbstractSocket::IPv6Protocol:
+ if(_v6server.listen(addr, port)) {
+ quInfo() << qPrintable(
+ tr("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3")
+ .arg(addr.toString())
+ .arg(_v6server.serverPort())
+ .arg(Quassel::buildInfo().protocolVersion)
+ );
+ success = true;
+ } else {
+ // if v4 succeeded on Any, the port will be already in use - don't display the error then
+ // FIXME: handle this more sanely, make sure we can listen to both v4 and v6 by default!
+ if(!success || _v6server.serverError() != QAbstractSocket::AddressInUseError)
+ quWarning() << qPrintable(
+ tr("Could not open IPv6 interface %1:%2: %3")
+ .arg(addr.toString())
+ .arg(port)
+ .arg(_v6server.errorString()));
+ }
+ break;
+ default:
+ qCritical() << qPrintable(
+ tr("Invalid listen address %1, unknown network protocol")
+ .arg(listen_term)
+ );
+ break;
+ }
+ }
+ }
}
- qDebug() << "Listening for GUI clients on port" << server.serverPort();
- return true;
+ if(!success)
+ quError() << qPrintable(tr("Could not open any network interfaces to listen on!"));
+
+ return success;
}
-void Core::stopListening() {
- server.close();
- qDebug() << "No longer listening for GUI clients.";
+void Core::stopListening(const QString &reason) {
+ bool wasListening = false;
+ if(_server.isListening()) {
+ wasListening = true;
+ _server.close();
+ }
+ if(_v6server.isListening()) {
+ wasListening = true;
+ _v6server.close();
+ }
+ if(wasListening) {
+ if(reason.isEmpty())
+ quInfo() << "No longer listening for GUI clients.";
+ else
+ quInfo() << qPrintable(reason);
+ }
}
void Core::incomingConnection() {
- // TODO implement SSL
- while (server.hasPendingConnections()) {
- QTcpSocket *socket = server.nextPendingConnection();
+ QTcpServer *server = qobject_cast<QTcpServer *>(sender());
+ Q_ASSERT(server);
+ while(server->hasPendingConnections()) {
+ 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());
+ quInfo() << qPrintable(tr("Client connected from")) << qPrintable(socket->peerAddress().toString());
- if (!configured) {
- server.close();
- qDebug() << "Closing server for basic setup.";
+ if(!configured) {
+ stopListening(tr("Closing server for basic setup."));
}
}
}
QVariant item;
while(SignalProxy::readDataFromDevice(socket, blocksizes[socket], item)) {
QVariantMap msg = item.toMap();
- if(!msg.contains("MsgType")) {
- // Client is way too old, does not even use the current init format
- qWarning() << qPrintable(tr("Antique client trying to connect... refusing."));
- socket->close();
- return;
+ processClientMessage(socket, msg);
+ if(!blocksizes.contains(socket)) break; // this socket is no longer ours to handle!
+ }
+}
+
+void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
+ if(!msg.contains("MsgType")) {
+ // Client is way too old, does not even use the current init format
+ qWarning() << qPrintable(tr("Antique client trying to connect... refusing."));
+ socket->close();
+ return;
+ }
+ // OK, so we have at least an init message format we can understand
+ if(msg["MsgType"] == "ClientInit") {
+ QVariantMap reply;
+
+ // Just version information -- check it!
+ uint ver = msg["ProtocolVersion"].toUInt();
+ if(ver < Quassel::buildInfo().coreNeedsProtocol) {
+ reply["MsgType"] = "ClientInitReject";
+ reply["Error"] = tr("<b>Your Quassel Client is too old!</b><br>"
+ "This core needs at least client/core protocol version %1.<br>"
+ "Please consider upgrading your client.").arg(Quassel::buildInfo().coreNeedsProtocol);
+ SignalProxy::writeDataToDevice(socket, reply);
+ qWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("too old, rejecting."));
+ socket->close(); return;
}
- // OK, so we have at least an init message format we can understand
- if(msg["MsgType"] == "ClientInit") {
+
+ reply["CoreVersion"] = Quassel::buildInfo().fancyVersionString;
+ reply["CoreDate"] = Quassel::buildInfo().buildDate;
+ reply["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
+ // TODO: Make the core info configurable
+ int uptime = startTime().secsTo(QDateTime::currentDateTime().toUTC());
+ int updays = uptime / 86400; uptime %= 86400;
+ int uphours = uptime / 3600; uptime %= 3600;
+ int upmins = uptime / 60;
+ reply["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(startTime().toString(Qt::TextDate));
+
+#ifdef HAVE_SSL
+ SslServer *sslServer = qobject_cast<SslServer *>(&_server);
+ QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
+ bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->isCertValid();
+#else
+ bool supportSsl = false;
+#endif
+
+#ifndef QT_NO_COMPRESS
+ bool supportsCompression = true;
+#else
+ bool supportsCompression = false;
+#endif
+
+ reply["SupportSsl"] = supportSsl;
+ reply["SupportsCompression"] = supportsCompression;
+ // switch to ssl/compression after client has been informed about our capabilities (see below)
+
+ reply["LoginEnabled"] = true;
+
+ // check if we are configured, start wizard otherwise
+ if(!configured) {
+ reply["Configured"] = false;
+ QList<QVariant> backends;
+ foreach(Storage *backend, _storageBackends.values()) {
+ QVariantMap v;
+ v["DisplayName"] = backend->displayName();
+ v["Description"] = backend->description();
+ backends.append(v);
+ }
+ reply["StorageBackends"] = backends;
+ reply["LoginEnabled"] = false;
+ } else {
+ reply["Configured"] = true;
+ }
+ clientInfo[socket] = msg; // store for future reference
+ reply["MsgType"] = "ClientInitAck";
+ SignalProxy::writeDataToDevice(socket, reply);
+
+#ifdef HAVE_SSL
+ // after we told the client that we are ssl capable we switch to ssl mode
+ if(supportSsl && msg["UseSsl"].toBool()) {
+ qDebug() << qPrintable(tr("Starting TLS for Client:")) << qPrintable(socket->peerAddress().toString());
+ connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+ sslSocket->startServerEncryption();
+ }
+#endif
+
+#ifndef QT_NO_COMPRESS
+ if(supportsCompression && msg["UseCompression"].toBool()) {
+ socket->setProperty("UseCompression", true);
+ qDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString());
+ }
+#endif
+
+ } else {
+ // for the rest, we need an initialized connection
+ if(!clientInfo.contains(socket)) {
QVariantMap reply;
- reply["CoreVersion"] = Global::quasselVersion;
- reply["CoreDate"] = Global::quasselDate;
- reply["CoreBuild"] = Global::quasselBuild;
- // TODO: Make the core info configurable
- int uptime = startTime.secsTo(QDateTime::currentDateTime());
- 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>"
- "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;
- reply["LoginEnabled"] = true;
- // TODO: check if we are configured, start wizard otherwise
-
- // Just version information -- check it!
- if(msg["ClientBuild"].toUInt() < Global::clientBuildNeeded) {
- reply["MsgType"] = "ClientInitReject";
- reply["Error"] = tr("<b>Your Quassel Client is too old!</b><br>"
- "This core needs at least client version %1 (Build >= %2).<br>"
- "Please consider upgrading your client.").arg(Global::quasselVersion).arg(Global::quasselBuild);
- SignalProxy::writeDataToDevice(socket, reply);
- qWarning() << qPrintable(tr("Client %1 too old, rejecting.").arg(socket->peerAddress().toString()));
- socket->close(); return;
+ reply["MsgType"] = "ClientLoginReject";
+ reply["Error"] = tr("<b>Client not initialized!</b><br>You need to send an init message before trying to login.");
+ SignalProxy::writeDataToDevice(socket, reply);
+ qWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("did not send an init message before trying to login, rejecting."));
+ socket->close(); return;
+ }
+ if(msg["MsgType"] == "CoreSetupData") {
+ QVariantMap reply;
+ QString result = setupCore(msg["SetupData"].toMap());
+ if(!result.isEmpty()) {
+ reply["MsgType"] = "CoreSetupReject";
+ reply["Error"] = result;
+ } else {
+ reply["MsgType"] = "CoreSetupAck";
}
- clientInfo[socket] = msg; // store for future reference
- reply["MsgType"] = "ClientInitAck";
SignalProxy::writeDataToDevice(socket, reply);
} else if(msg["MsgType"] == "ClientLogin") {
QVariantMap reply;
- if(!clientInfo.contains(socket)) {
- reply["MsgType"] = "ClientLoginReject";
- reply["Error"] = tr("<b>Client not initialized!</b><br>You need to send an init message before trying to login.");
- SignalProxy::writeDataToDevice(socket, reply);
- qWarning() << qPrintable(tr("Client %1 did not send an init message before trying to login, rejecting.").arg(socket->peerAddress().toString()));
- socket->close(); return;
- }
- mutex.lock();
UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString());
- mutex.unlock();
if(uid == 0) {
reply["MsgType"] = "ClientLoginReject";
reply["Error"] = tr("<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database.");
SignalProxy::writeDataToDevice(socket, reply);
- continue;
+ return;
}
reply["MsgType"] = "ClientLoginAck";
SignalProxy::writeDataToDevice(socket, reply);
- qDebug() << qPrintable(tr("Client %1 initialized and authentificated successfully as \"%2\".").arg(socket->peerAddress().toString(), msg["User"].toString()));
+ quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("initialized and authenticated successfully as \"%1\" (UserId: %2).").arg(msg["User"].toString()).arg(uid.toInt()));
setupClientSession(socket, uid);
}
- //socket->close(); return;
- /*
- // we need to auth the client
- try {
- QVariantMap msg = item.toMap();
- if (msg["GuiProtocol"].toUInt() != GUI_PROTOCOL) {
- throw Exception("GUI client version mismatch");
- }
- if (configured) {
- processClientInit(socket, msg);
- } else {
- processCoreSetup(socket, msg);
- }
- } catch(Storage::AuthError) {
- qWarning() << "Authentification error!"; // FIXME: send auth error to client
- socket->close();
- return;
- } catch(Exception e) {
- qWarning() << "Client init error:" << e.msg();
- socket->close();
- return;
- } */
}
}
// Potentially called during the initialization phase (before handing the connection off to the session)
void Core::clientDisconnected() {
- QTcpSocket *socket = dynamic_cast<QTcpSocket*>(sender());
- blocksizes.remove(socket);
- clientInfo.remove(socket);
- qDebug() << qPrintable(tr("Client %1 disconnected.").arg(socket->peerAddress().toString()));
- socket->deleteLater();
- socket = 0;
+ QTcpSocket *socket = qobject_cast<QTcpSocket *>(sender());
+ if(socket) {
+ // here it's safe to call methods on socket!
+ quInfo() << qPrintable(tr("Non-authed client disconnected.")) << qPrintable(socket->peerAddress().toString());
+ blocksizes.remove(socket);
+ clientInfo.remove(socket);
+ socket->deleteLater();
+ } else {
+ // we have to crawl through the hashes and see if we find a victim to remove
+ qDebug() << qPrintable(tr("Non-authed client disconnected. (socket allready destroyed)"));
+
+ // DO NOT CALL ANY METHODS ON socket!!
+ socket = static_cast<QTcpSocket *>(sender());
+
+ QHash<QTcpSocket *, quint32>::iterator blockSizeIter = blocksizes.begin();
+ while(blockSizeIter != blocksizes.end()) {
+ if(blockSizeIter.key() == socket) {
+ blockSizeIter = blocksizes.erase(blockSizeIter);
+ } else {
+ blockSizeIter++;
+ }
+ }
+
+ QHash<QTcpSocket *, QVariantMap>::iterator clientInfoIter = clientInfo.begin();
+ while(clientInfoIter != clientInfo.end()) {
+ if(clientInfoIter.key() == socket) {
+ clientInfoIter = clientInfo.erase(clientInfoIter);
+ } else {
+ clientInfoIter++;
+ }
+ }
+ }
+
- // make server listen again if still not configured FIXME
+ // make server listen again if still not configured
if (!configured) {
startListening();
}
// Suggestion: kill sessions if they are not connected to any network and client.
}
-void Core::processCoreSetup(QTcpSocket *socket, QVariantMap &msg) {
- if(msg["HasSettings"].toBool()) {
- QVariantMap auth;
- auth["User"] = msg["User"];
- auth["Password"] = msg["Password"];
- msg.remove("User");
- msg.remove("Password");
- qDebug() << "Initializing storage provider" << msg["Type"].toString();
-
- if(!initStorage(msg, true)) {
- // notify client to start wizard again
- qWarning("Core is currently not configured!");
- QVariantMap reply;
- reply["StartWizard"] = true;
- reply["StorageProviders"] = availableStorageProviders();
- SignalProxy::writeDataToDevice(socket, reply);
- } else {
- // write coresettings
- CoreSettings s;
- s.setDatabaseSettings(msg);
- // write admin user to database & make the core listen again to connections
- storage->addUser(auth["User"].toString(), auth["Password"].toString());
- startListening();
- // continue the normal procedure
- //processClientInit(socket, auth);
- }
- } else {
- // notify client to start wizard
- QVariantMap reply;
- reply["StartWizard"] = true;
- reply["StorageProviders"] = availableStorageProviders();
- SignalProxy::writeDataToDevice(socket, reply);
- }
-}
-
void Core::setupClientSession(QTcpSocket *socket, UserId uid) {
// Find or create session for validated user
SessionThread *sess;
else sess = createSession(uid);
// Hand over socket, session then sends state itself
disconnect(socket, 0, this, 0);
+ blocksizes.remove(socket);
+ clientInfo.remove(socket);
if(!sess) {
- qWarning() << qPrintable(tr("Could not initialize session for client %1!").arg(socket->peerAddress().toString()));
+ qWarning() << qPrintable(tr("Could not initialize session for client:")) << qPrintable(socket->peerAddress().toString());
socket->close();
}
sess->addClient(socket);
}
+void Core::setupInternalClientSession(SignalProxy *proxy) {
+ if(!configured) {
+ stopListening();
+ setupCoreForInternalUsage();
+ }
+
+ UserId uid = storage->internalUser();
+
+ // Find or create session for validated user
+ SessionThread *sess;
+ if(sessions.contains(uid))
+ sess = sessions[uid];
+ else
+ sess = createSession(uid);
+ sess->addClient(proxy);
+}
+
SessionThread *Core::createSession(UserId uid, bool restore) {
if(sessions.contains(uid)) {
qWarning() << "Calling createSession() when a session for the user already exists!";
return sess;
}
-QStringList Core::availableStorageProviders() {
- QStringList storageProviders;
- if (SqliteStorage::isAvailable()) {
- storageProviders.append(SqliteStorage::displayName());
- }
- // TODO: temporary
- // storageProviders.append("MySQL");
-
- return storageProviders;
+#ifdef HAVE_SSL
+void Core::sslErrors(const QList<QSslError> &errors) {
+ Q_UNUSED(errors);
+ QSslSocket *socket = qobject_cast<QSslSocket *>(sender());
+ if(socket)
+ socket->ignoreSslErrors();
+}
+#endif
+
+void Core::socketError(QAbstractSocket::SocketError err) {
+ QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(sender());
+ if(socket && err != QAbstractSocket::RemoteHostClosedError)
+ qWarning() << "Core::socketError()" << socket << err << socket->errorString();
}
projects / quassel.git / blobdiff