X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=830a79b15bc7b2a241dd3eedfcdb0ac7d1fbd44f;hp=4b4aa7256e261ee761915a3f95d36d1250b5696d;hb=4bb7c6540eb44dc47b2b93051a46c5bdc9a7f5ba;hpb=a33e42aee121185f479667b2104a15fc2033762e diff --git a/src/core/core.cpp b/src/core/core.cpp index 4b4aa725..830a79b1 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -20,20 +20,20 @@ #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" Core *Core::instanceptr = 0; -QMutex Core::mutex; Core *Core::instance() { if(instanceptr) return instanceptr; @@ -48,7 +48,9 @@ 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)); @@ -70,7 +72,7 @@ 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."); + 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(); @@ -78,14 +80,15 @@ void Core::init() { QVariantMap newSettings; newSettings["Backend"] = "SQLite"; if((configured = initStorage(newSettings))) { - qWarning("...but thankfully I found some old settings to migrate!"); + qWarning() << "...but thankfully I found some old settings to migrate!"; cs.setStorageSettings(newSettings); } } } - 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() { @@ -127,7 +130,7 @@ void Core::restoreState() { */ 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); @@ -136,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()) { @@ -149,10 +165,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(); } @@ -186,12 +200,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; } @@ -207,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; @@ -232,152 +234,67 @@ 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(uint port) { - bool success = 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; - // let's see if ipv6 is available - success = server.listen(QHostAddress::AnyIPv6, port); + bool success = false; + uint port = Quassel::optionValue("port").toUInt(); - if(!success && server.serverError() == QAbstractSocket::UnsupportedSocketOperationError) { - // fall back to v4 - success = server.listen(QHostAddress::Any, port); + if(_server.listen(QHostAddress::Any, port)) { + 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 IPv6 port" << _v6server.serverPort() + << "using protocol version" << Quassel::buildInfo().protocolVersion; + success = true; } if(!success) { - qWarning("%s", qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()))); - } else { - qDebug() << "Listening for GUI clients on port" << server.serverPort(); + qCritical() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(_server.errorString())); } - + 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() { - 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() << qPrintable(tr("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.")); } } } @@ -405,35 +322,33 @@ 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); 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) - .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate)); + "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)); -#ifndef QT_NO_OPENSSL - SslServer *sslServer = qobject_cast(&server); +#ifdef HAVE_SSL + SslServer *sslServer = qobject_cast(&_server); QSslSocket *sslSocket = qobject_cast(socket); bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid(); #else @@ -471,7 +386,7 @@ 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() << qPrintable(tr("Starting TLS for Client:")) << qPrintable(socket->peerAddress().toString()); @@ -486,7 +401,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { qDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString()); } #endif - + } else { // for the rest, we need an initialized connection if(!clientInfo.contains(socket)) { @@ -499,7 +414,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { } 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; @@ -509,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."); @@ -520,7 +433,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { } reply["MsgType"] = "ClientLoginAck"; SignalProxy::writeDataToDevice(socket, reply); - qDebug() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("initialized and authenticated successfully as \"%1\" (UserId: %2).").arg(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); } } @@ -531,14 +444,17 @@ void Core::clientDisconnected() { QTcpSocket *socket = qobject_cast(sender()); if(socket) { // here it's safe to call methods on socket! - qDebug() << qPrintable(tr("Non-authed client disconnected.")) << qPrintable(socket->peerAddress().toString()); + 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) { @@ -582,6 +498,23 @@ void Core::setupClientSession(QTcpSocket *socket, UserId uid) { 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!"; @@ -593,7 +526,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()); @@ -605,5 +538,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(); }