X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=aa1b7d4899827139099d8bc31d86cccf6c822fda;hp=1af89261d2ea4973dd846d16f95d5dff51fc0c57;hb=5080325e7f8c5cf95bbcddf0e2e0cfd2233a5795;hpb=32b5e6447458a8e6e8074c40988b2d06f327094f diff --git a/src/core/core.cpp b/src/core/core.cpp index 1af89261..aa1b7d48 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * 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 * @@ -18,22 +18,23 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include -#include -#include #include #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" +// migration related +#include + Core *Core::instanceptr = 0; -QMutex Core::mutex; Core *Core::instance() { if(instanceptr) return instanceptr; @@ -48,17 +49,97 @@ void Core::destroy() { } Core::Core() : storage(0) { - startTime = QDateTime::currentDateTime(); // for uptime :) + _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) + + Quassel::loadTranslation(QLocale::system()); + + // FIXME: MIGRATION 0.3 -> 0.4: Move database and core config to new location + // Move settings, note this does not delete the old files +#ifdef Q_WS_MAC + QSettings newSettings("quassel-irc.org", "quasselcore"); +#else + +# ifdef Q_WS_WIN + QSettings::Format format = QSettings::IniFormat; +# else + QSettings::Format format = QSettings::NativeFormat; +# endif + QString newFilePath = Quassel::configDirPath() + "quasselcore" + + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini")); + QSettings newSettings(newFilePath, format); +#endif /* Q_WS_MAC */ + + if(newSettings.value("Config/Version").toUInt() == 0) { +# ifdef Q_WS_MAC + QString org = "quassel-irc.org"; +# else + QString org = "Quassel Project"; +# endif + QSettings oldSettings(org, "Quassel Core"); + if(oldSettings.allKeys().count()) { + qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your core settings..."; + foreach(QString key, oldSettings.allKeys()) + newSettings.setValue(key, oldSettings.value(key)); + newSettings.setValue("Config/Version", 1); + qWarning() << "* Your core settings have been migrated to" << newSettings.fileName(); + +#ifndef Q_WS_MAC /* we don't need to move the db and cert for mac */ +#ifdef Q_OS_WIN32 + QString quasselDir = qgetenv("APPDATA") + "/quassel/"; +#elif defined Q_WS_MAC + QString quasselDir = QDir::homePath() + "/Library/Application Support/Quassel/"; +#else + QString quasselDir = QDir::homePath() + "/.quassel/"; +#endif + + QFileInfo info(Quassel::configDirPath() + "quassel-storage.sqlite"); + if(!info.exists()) { + // move database, if we found it + QFile oldDb(quasselDir + "quassel-storage.sqlite"); + if(oldDb.exists()) { + bool success = oldDb.rename(Quassel::configDirPath() + "quassel-storage.sqlite"); + if(success) + qWarning() << "* Your database has been moved to" << Quassel::configDirPath() + "quassel-storage.sqlite"; + else + qWarning() << "!!! Moving your database has failed. Please move it manually into" << Quassel::configDirPath(); + } + } + // move certificate + QFileInfo certInfo(quasselDir + "quasselCert.pem"); + if(certInfo.exists()) { + QFile cert(quasselDir + "quasselCert.pem"); + bool success = cert.rename(Quassel::configDirPath() + "quasselCert.pem"); + if(success) + qWarning() << "* Your certificate has been moved to" << Quassel::configDirPath() + "quasselCert.pem"; + else + qWarning() << "!!! Moving your certificate has failed. Please move it manually into" << Quassel::configDirPath(); + } +#endif /* !Q_WS_MAC */ + qWarning() << "*** Migration completed.\n\n"; + } + } + // MIGRATION end + + // check settings version + // so far, we only have 1 + CoreSettings s; + if(s.version() != 1) { + qCritical() << "Invalid core settings version, terminating!"; + exit(EXIT_FAILURE); + } // 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); // in msecs + _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes } void Core::init() { @@ -67,27 +148,18 @@ void Core::init() { CoreSettings cs; 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); - } - } + qWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; + } - connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); - if(!startListening(cs.port())) exit(1); // TODO make this less brutal + 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() { - foreach(QTcpSocket *socket, blocksizes.keys()) { qDebug() << "disconnecting" << socket << blocksizes.keys(); - socket->disconnectFromHost(); // disconnect local (i.e. non-authed) clients + foreach(QTcpSocket *socket, blocksizes.keys()) { + socket->disconnectFromHost(); // disconnect non authed clients } qDeleteAll(sessions); qDeleteAll(_storageBackends); @@ -100,7 +172,7 @@ void Core::saveState() { QVariantMap state; QVariantList activeSessions; foreach(UserId user, instance()->sessions.keys()) activeSessions << QVariant::fromValue(user); - state["CoreBuild"] = Global::quasselBuild; + state["CoreStateVersion"] = 1; state["ActiveSessions"] = activeSessions; s.setCoreState(state); } @@ -115,14 +187,16 @@ void Core::restoreState() { 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(); instance()->createSession(user, true); @@ -131,9 +205,22 @@ void Core::restoreState() { } /*** 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(const QVariant &setupData_) { - QVariantMap setupData = setupData_.toMap(); +QString Core::setupCore(QVariantMap setupData) { QString user = setupData.take("AdminUser").toString(); QString password = setupData.take("AdminPasswd").toString(); if(user.isEmpty() || password.isEmpty()) { @@ -144,10 +231,8 @@ QString Core::setupCore(const QVariant &setupData_) { } CoreSettings s; s.setStorageSettings(setupData); - qDebug() << qPrintable(tr("Creating admin user...")); - mutex.lock(); + quInfo() << qPrintable(tr("Creating admin user...")); storage->addUser(user, password); - mutex.unlock(); startListening(); // TODO check when we need this return QString(); } @@ -181,12 +266,12 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { if(_storageBackends.contains(backend)) { storage = _storageBackends[backend]; } else { - qWarning() << "Selected storage backend is not available:" << backend; + qCritical() << "Selected storage backend is not available:" << backend; return configured = false; } if(!storage->init(dbSettings)) { if(!setup || !(storage->setup(dbSettings) && storage->init(dbSettings))) { - qWarning() << "Could not init storage!"; + qCritical() << "Could not init storage!"; storage = 0; return configured = false; } @@ -202,23 +287,11 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { } void Core::syncStorage() { - QMutexLocker locker(&mutex); if(storage) storage->sync(); } /*** Storage Access ***/ -void Core::setUserSetting(UserId userId, const QString &settingName, const QVariant &data) { - QMutexLocker locker(&mutex); - instance()->storage->setUserSetting(userId, settingName, data); -} - -QVariant Core::getUserSetting(UserId userId, const QString &settingName, const QVariant &data) { - QMutexLocker locker(&mutex); - return instance()->storage->getUserSetting(userId, settingName, data); -} - bool Core::createNetwork(UserId user, NetworkInfo &info) { - QMutexLocker locker(&mutex); NetworkId networkId = instance()->storage->createNetwork(user, info); if(!networkId.isValid()) return false; @@ -227,136 +300,113 @@ bool Core::createNetwork(UserId user, NetworkInfo &info) { return true; } -bool Core::updateNetwork(UserId user, const NetworkInfo &info) { - QMutexLocker locker(&mutex); - return instance()->storage->updateNetwork(user, info); -} - -bool Core::removeNetwork(UserId user, const NetworkId &networkId) { - QMutexLocker locker(&mutex); - return instance()->storage->removeNetwork(user, networkId); -} - -QList Core::networks(UserId user) { - QMutexLocker locker(&mutex); - return instance()->storage->networks(user); -} - -NetworkId Core::networkId(UserId user, const QString &network) { - QMutexLocker locker(&mutex); - return instance()->storage->getNetworkId(user, network); -} - -QList Core::connectedNetworks(UserId user) { - QMutexLocker locker(&mutex); - return instance()->storage->connectedNetworks(user); -} - -void Core::setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) { - QMutexLocker locker(&mutex); - return instance()->storage->setNetworkConnected(user, networkId, isConnected); -} - -QHash Core::persistentChannels(UserId user, const NetworkId &networkId) { - QMutexLocker locker(&mutex); - return instance()->storage->persistentChannels(user, networkId); -} - -void Core::setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) { - QMutexLocker locker(&mutex); - return instance()->storage->setChannelPersistent(user, networkId, channel, isJoined); -} - -void Core::setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) { - QMutexLocker locker(&mutex); - return instance()->storage->setPersistentChannelKey(user, networkId, channel, key); -} - -BufferInfo Core::bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) { - QMutexLocker locker(&mutex); - return instance()->storage->getBufferInfo(user, networkId, type, buffer); -} - -BufferInfo Core::getBufferInfo(UserId user, const BufferId &bufferId) { - QMutexLocker locker(&mutex); - return instance()->storage->getBufferInfo(user, bufferId); -} - -MsgId Core::storeMessage(const Message &message) { - QMutexLocker locker(&mutex); - return instance()->storage->logMessage(message); -} - -QList Core::requestMsgs(UserId user, BufferId buffer, int lastmsgs, int offset) { - QMutexLocker locker(&mutex); - return instance()->storage->requestMsgs(user, buffer, lastmsgs, offset); -} - -QList Core::requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset) { - QMutexLocker locker(&mutex); - return instance()->storage->requestMsgs(user, buffer, since, offset); -} - -QList Core::requestMsgRange(UserId user, BufferId buffer, int first, int last) { - QMutexLocker locker(&mutex); - return instance()->storage->requestMsgRange(user, buffer, first, last); -} - -QList Core::requestBuffers(UserId user) { - QMutexLocker locker(&mutex); - return instance()->storage->requestBuffers(user); -} - -bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) { - QMutexLocker locker(&mutex); - return instance()->storage->removeBuffer(user, bufferId); -} +/*** Network Management ***/ -BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) { - QMutexLocker locker(&mutex); - return instance()->storage->renameBuffer(user, networkId, newName, oldName); -} +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; -void Core::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) { - QMutexLocker locker(&mutex); - return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId); -} + 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; + } + } + } + } + if(!success) + quError() << qPrintable(tr("Could not open any network interfaces to listen on!")); -QHash Core::bufferLastSeenMsgIds(UserId user) { - QMutexLocker locker(&mutex); - return instance()->storage->bufferLastSeenMsgIds(user); + return success; } -/*** Network Management ***/ - -bool Core::startListening(uint port) { - if(!server.listen(QHostAddress::Any, port)) { - qWarning(qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()))); - return false; +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); } - qDebug() << "Listening for GUI clients on port" << server.serverPort(); - return true; -} - -void Core::stopListening() { - server.close(); - qDebug() << "No longer listening for GUI clients."; } void Core::incomingConnection() { - while(server.hasPendingConnections()) { - QTcpSocket *socket = server.nextPendingConnection(); + QTcpServer *server = qobject_cast(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.")); } } } @@ -382,41 +432,53 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { // OK, so we have at least an init message format we can understand if(msg["MsgType"] == "ClientInit") { QVariantMap reply; - reply["CoreVersion"] = Global::quasselVersion; - reply["CoreDate"] = Global::quasselDate; - reply["CoreBuild"] = Global::quasselBuild; + + // Just version information -- check it! + uint ver = msg["ProtocolVersion"].toUInt(); + if(ver < Quassel::buildInfo().coreNeedsProtocol) { + reply["MsgType"] = "ClientInitReject"; + reply["Error"] = tr("Your Quassel Client is too old!
" + "This core needs at least client/core protocol version %1.
" + "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; + } + + 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()); + 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("Quassel Core Version %1 (Build ≥ %2)
" - "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)); - -#ifndef QT_NO_OPENSSL - SslServer *sslServer = qobject_cast(&server); + reply["CoreInfo"] = tr("Quassel Core Version %1
" + "Built: %2
" + "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(&_server); QSslSocket *sslSocket = qobject_cast(socket); - bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid(); + 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; - // switch to ssl after client has been informed about our capabilities (see below) + reply["SupportsCompression"] = supportsCompression; + // switch to ssl/compression after client has been informed about our capabilities (see below) reply["LoginEnabled"] = true; - // Just version information -- check it! - if(msg["ClientBuild"].toUInt() < Global::clientBuildNeeded) { - reply["MsgType"] = "ClientInitReject"; - reply["Error"] = tr("Your Quassel Client is too old!
" - "This core needs at least client version %1 (Build >= %2).
" - "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; - } // check if we are configured, start wizard otherwise if(!configured) { reply["Configured"] = false; @@ -436,15 +498,22 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { reply["MsgType"] = "ClientInitAck"; SignalProxy::writeDataToDevice(socket, reply); -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL // 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()); + qDebug() << qPrintable(tr("Starting TLS for Client:")) << qPrintable(socket->peerAddress().toString()); connect(sslSocket, SIGNAL(sslErrors(const QList &)), this, SLOT(sslErrors(const QList &))); 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)) { @@ -452,12 +521,12 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { reply["MsgType"] = "ClientLoginReject"; reply["Error"] = tr("Client not initialized!
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())); + 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"]); + QString result = setupCore(msg["SetupData"].toMap()); if(!result.isEmpty()) { reply["MsgType"] = "CoreSetupReject"; reply["Error"] = result; @@ -467,9 +536,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { SignalProxy::writeDataToDevice(socket, reply); } else if(msg["MsgType"] == "ClientLogin") { QVariantMap reply; - mutex.lock(); UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); - mutex.unlock(); if(uid == 0) { reply["MsgType"] = "ClientLoginReject"; reply["Error"] = tr("Invalid username or password!
The username/password combination you supplied could not be found in the database."); @@ -478,7 +545,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { } reply["MsgType"] = "ClientLoginAck"; SignalProxy::writeDataToDevice(socket, reply); - qDebug() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).").arg(socket->peerAddress().toString(), msg["User"].toString()).arg(uid.toInt())); + 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); } } @@ -486,13 +553,39 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { // Potentially called during the initialization phase (before handing the connection off to the session) void Core::clientDisconnected() { - QTcpSocket *socket = dynamic_cast(sender()); // Note: This might be a QObject* already (if called by ~Core())! - Q_ASSERT(socket); - blocksizes.remove(socket); - clientInfo.remove(socket); - qDebug() << qPrintable(tr("Non-authed client disconnected.")); - socket->deleteLater(); - socket = 0; + QTcpSocket *socket = qobject_cast(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(sender()); + + QHash::iterator blockSizeIter = blocksizes.begin(); + while(blockSizeIter != blocksizes.end()) { + if(blockSizeIter.key() == socket) { + blockSizeIter = blocksizes.erase(blockSizeIter); + } else { + blockSizeIter++; + } + } + + QHash::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 if (!configured) { @@ -513,12 +606,29 @@ void Core::setupClientSession(QTcpSocket *socket, UserId uid) { 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!"; @@ -530,7 +640,7 @@ SessionThread *Core::createSession(UserId uid, bool restore) { return sess; } -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL void Core::sslErrors(const QList &errors) { Q_UNUSED(errors); QSslSocket *socket = qobject_cast(sender()); @@ -542,5 +652,5 @@ void Core::sslErrors(const QList &errors) { void Core::socketError(QAbstractSocket::SocketError err) { QAbstractSocket *socket = qobject_cast(sender()); if(socket && err != QAbstractSocket::RemoteHostClosedError) - qDebug() << "Core::socketError()" << socket << err << socket->errorString(); + qWarning() << "Core::socketError()" << socket << err << socket->errorString(); }