#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() : storage(0) {
- _startTime = QDateTime::currentDateTime(); // for uptime :)
+ _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :)
+
+ loadTranslation(QLocale::system());
// Register storage backends here!
registerStorageBackend(new SqliteStorage(this));
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();
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() {
*/
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);
}
/*** 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()) {
}
CoreSettings s;
s.setStorageSettings(setupData);
- qDebug() << qPrintable(tr("Creating admin user..."));
+ quInfo() << qPrintable(tr("Creating admin user..."));
mutex.lock();
storage->addUser(user, password);
mutex.unlock();
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;
}
/*** 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() << "using protocol version" << Global::protocolVersion;
+ 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<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() << 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."));
}
}
}
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("<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(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("<b>Quassel Core Version %1</b><br>"
"Built: %2<br>"
- "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));
-#ifndef QT_NO_OPENSSL
- SslServer *sslServer = qobject_cast<SslServer *>(&server);
+#ifdef HAVE_SSL
+ SslServer *sslServer = qobject_cast<SslServer *>(&_server);
QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid();
#else
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());
qDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString());
}
#endif
-
+
} else {
// for the rest, we need an initialized connection
if(!clientInfo.contains(socket)) {
}
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;
}
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);
}
}
QTcpSocket *socket = qobject_cast<QTcpSocket *>(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();
// 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) {
sess->addClient(socket);
}
+void Core::setupInternalClientSession(SignalProxy *proxy) {
+ if(!configured) {
+ stopListening();
+ setupCoreForInternalUsage();
+ }
+
+ mutex.lock();
+ UserId uid = storage->internalUser();
+ mutex.unlock();
+
+ // 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;
}
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
void Core::sslErrors(const QList<QSslError> &errors) {
Q_UNUSED(errors);
QSslSocket *socket = qobject_cast<QSslSocket *>(sender());
void Core::socketError(QAbstractSocket::SocketError err) {
QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(sender());
if(socket && err != QAbstractSocket::RemoteHostClosedError)
- qDebug() << "Core::socketError()" << socket << err << socket->errorString();
+ qWarning() << "Core::socketError()" << socket << err << socket->errorString();
}
projects / quassel.git / blobdiff