X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=9b7f5b65965c5f2410cb22df72ac132fc83bff87;hp=87193bcac443e7d9cdb0d8657d2993ac24033ef6;hb=3af9d3aeccfac1218ad3342434e5fda0c4ad1266;hpb=5c6804f291a63f978e328aeddcc8448e3443b45e diff --git a/src/core/core.cpp b/src/core/core.cpp index 87193bca..9b7f5b65 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include "core.h" @@ -35,7 +34,6 @@ #include "util.h" Core *Core::instanceptr = 0; -QMutex Core::mutex; Core *Core::instance() { if(instanceptr) return instanceptr; @@ -50,20 +48,22 @@ void Core::destroy() { } Core::Core() : storage(0) { - _startTime = QDateTime::currentDateTime(); // for uptime :) + _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) + + loadTranslation(QLocale::system()); // Register storage backends here! registerStorageBackend(new SqliteStorage(this)); if(!_storageBackends.count()) { - quWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting...")); - quWarning() << qPrintable(tr("Currently, Quassel only supports SQLite3. You need to build your\n" + 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() { @@ -72,7 +72,7 @@ void Core::init() { CoreSettings cs; if(!(configured = initStorage(cs.storageSettings().toMap()))) { - quWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; + 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(); @@ -80,7 +80,7 @@ void Core::init() { QVariantMap newSettings; newSettings["Backend"] = "SQLite"; if((configured = initStorage(newSettings))) { - quWarning() << "...but thankfully I found some old settings to migrate!"; + qWarning() << "...but thankfully I found some old settings to migrate!"; cs.setStorageSettings(newSettings); } } @@ -117,7 +117,7 @@ void Core::restoreState() { return; } if(instance()->sessions.count()) { - quWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); + qWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); return; } CoreSettings s; @@ -139,9 +139,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()) { @@ -153,9 +166,7 @@ QString Core::setupCore(const QVariant &setupData_) { CoreSettings s; s.setStorageSettings(setupData); quInfo() << qPrintable(tr("Creating admin user...")); - mutex.lock(); storage->addUser(user, password); - mutex.unlock(); startListening(); // TODO check when we need this return QString(); } @@ -189,12 +200,12 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { if(_storageBackends.contains(backend)) { storage = _storageBackends[backend]; } else { - quError() << "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))) { - quError() << "Could not init storage!"; + qCritical() << "Could not init storage!"; storage = 0; return configured = false; } @@ -210,23 +221,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; @@ -235,137 +234,50 @@ 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); -} - -QList Core::requestBufferIdsForNetwork(UserId user, NetworkId networkId) { - QMutexLocker locker(&mutex); - return instance()->storage->requestBufferIdsForNetwork(user, networkId); -} - -bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) { - QMutexLocker locker(&mutex); - return instance()->storage->removeBuffer(user, bufferId); -} - -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); -} - -void Core::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) { - QMutexLocker locker(&mutex); - return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId); -} - -QHash Core::bufferLastSeenMsgIds(UserId user) { - QMutexLocker locker(&mutex); - return instance()->storage->bufferLastSeenMsgIds(user); -} - /*** Network Management ***/ 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(); if(_server.listen(QHostAddress::Any, port)) { - quInfo() << "Listening for GUI clients on IPv6 port" << _server.serverPort() << "using protocol version" << Global::protocolVersion; + quInfo() << "Listening for GUI clients on IPv4 port" << _server.serverPort() + << "using protocol version" << Quassel::buildInfo().protocolVersion; success = true; } if(_v6server.listen(QHostAddress::AnyIPv6, port)) { - quInfo() << "Listening for GUI clients on IPv4 port" << _v6server.serverPort() << "using protocol version" << Global::protocolVersion; + quInfo() << "Listening for GUI clients on IPv6 port" << _v6server.serverPort() + << "using protocol version" << Quassel::buildInfo().protocolVersion; success = true; } if(!success) { - quError() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(_server.errorString())); + qCritical() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(_server.errorString())); } return success; } -void Core::stopListening() { - _server.close(); - _v6server.close(); - quInfo() << "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() { @@ -382,9 +294,7 @@ void Core::incomingConnection() { quInfo() << qPrintable(tr("Client connected from")) << qPrintable(socket->peerAddress().toString()); if(!configured) { - _server.close(); - _v6server.close(); - quDebug() << "Closing server for basic setup."; + stopListening(tr("Closing server for basic setup.")); } } } @@ -403,7 +313,7 @@ void Core::clientHasData() { 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 - quWarning() << qPrintable(tr("Antique client trying to connect... refusing.")); + qWarning() << qPrintable(tr("Antique client trying to connect... refusing.")); socket->close(); return; } @@ -412,31 +322,29 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { QVariantMap reply; // Just version information -- check it! - uint ver = 0; - if(!msg.contains("ProtocolVersion") && msg["ClientBuild"].toUInt() >= 732) ver = 1; // FIXME legacy - if(msg.contains("ProtocolVersion")) ver = msg["ProtocolVersion"].toUInt(); - if(ver < Global::coreNeedsProtocol) { + 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(Global::coreNeedsProtocol); + "Please consider upgrading your client.").arg(Quassel::buildInfo().coreNeedsProtocol); SignalProxy::writeDataToDevice(socket, reply); - quWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("too old, rejecting.")); + qWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("too old, rejecting.")); socket->close(); return; } - reply["CoreVersion"] = Global::quasselVersion; - reply["CoreDate"] = Global::quasselBuildDate; - reply["CoreBuild"] = 860; // FIXME legacy - reply["ProtocolVersion"] = Global::protocolVersion; + 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
" "Built: %2
" - "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuildDate) + "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 @@ -481,7 +389,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { #ifdef HAVE_SSL // after we told the client that we are ssl capable we switch to ssl mode if(supportSsl && msg["UseSsl"].toBool()) { - quDebug() << qPrintable(tr("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(); } @@ -490,7 +398,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { #ifndef QT_NO_COMPRESS if(supportsCompression && msg["UseCompression"].toBool()) { socket->setProperty("UseCompression", true); - quDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString()); + qDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString()); } #endif @@ -501,12 +409,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); - quWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("did not send an init message before trying to login, rejecting.")); + 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; @@ -516,9 +424,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."); @@ -544,7 +450,7 @@ void Core::clientDisconnected() { socket->deleteLater(); } else { // we have to crawl through the hashes and see if we find a victim to remove - quDebug() << qPrintable(tr("Non-authed client disconnected. (socket allready destroyed)")); + qDebug() << qPrintable(tr("Non-authed client disconnected. (socket allready destroyed)")); // DO NOT CALL ANY METHODS ON socket!! socket = static_cast(sender()); @@ -552,17 +458,19 @@ void Core::clientDisconnected() { QHash::iterator blockSizeIter = blocksizes.begin(); while(blockSizeIter != blocksizes.end()) { if(blockSizeIter.key() == socket) { - blocksizes.erase(blockSizeIter); + blockSizeIter = blocksizes.erase(blockSizeIter); + } else { + blockSizeIter++; } - blockSizeIter++; } QHash::iterator clientInfoIter = clientInfo.begin(); while(clientInfoIter != clientInfo.end()) { if(clientInfoIter.key() == socket) { - clientInfo.erase(clientInfoIter); + clientInfoIter = clientInfo.erase(clientInfoIter); + } else { + clientInfoIter++; } - clientInfoIter++; } } @@ -586,15 +494,32 @@ void Core::setupClientSession(QTcpSocket *socket, UserId uid) { blocksizes.remove(socket); clientInfo.remove(socket); if(!sess) { - quWarning() << qPrintable(tr("Could not initialize session for client:")) << qPrintable(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)) { - quWarning() << "Calling createSession() when a session for the user already exists!"; + qWarning() << "Calling createSession() when a session for the user already exists!"; return 0; } SessionThread *sess = new SessionThread(uid, restore, this); @@ -615,5 +540,5 @@ void Core::sslErrors(const QList &errors) { void Core::socketError(QAbstractSocket::SocketError err) { QAbstractSocket *socket = qobject_cast(sender()); if(socket && err != QAbstractSocket::RemoteHostClosedError) - quWarning() << "Core::socketError()" << socket << err << socket->errorString(); + qWarning() << "Core::socketError()" << socket << err << socket->errorString(); }