#include "sqlitestorage.h"
#include "network.h"
+#include "util.h"
+
Core *Core::instanceptr = 0;
QMutex Core::mutex;
instanceptr = 0;
}
-Core::Core()
- : storage(0)
-{
- startTime = QDateTime::currentDateTime(); // for uptime :)
+Core::Core() : storage(0) {
+ _startTime = QDateTime::currentDateTime(); // for uptime :)
+
+ // Register storage backends here!
+ registerStorageBackend(new SqliteStorage(this));
- connect(&_storageSyncTimer, SIGNAL(timeout()),
- this, SLOT(syncStorage()));
+ 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
}
configured = false;
CoreSettings cs;
- if(!(configured = initStorage(cs.databaseSettings().toMap()))) {
- qWarning("Core is currently not configured!");
- }
-
- connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
- startListening(cs.port());
- guiUser = 0;
-
-}
-
-bool Core::initStorage(QVariantMap dbSettings, bool setup) {
- QString engine = dbSettings["Type"].toString().toLower();
-
- if(storage) {
- qDebug() << "Deleting old storage object.";
- storage->deleteLater();
- storage = 0;
- }
- // 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;
- }
-
- 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()));
+ if(!startListening(cs.port())) 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);
}
-void Core::syncStorage() {
- QMutexLocker locker(&mutex);
- return instance()->storage->sync();
+/*** 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...";
UserId user = v.value<UserId>();
instance()->createSession(user, true);
}
- qDebug() << "...done.";
}
}
-void Core::saveState() {
+/*** Core Setup ***/
+
+QString Core::setupCore(const QVariant &setupData_) {
+ QVariantMap setupData = setupData_.toMap();
+ 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);
+ qDebug() << qPrintable(tr("Creating admin user..."));
+ mutex.lock();
+ storage->addUser(user, password);
+ mutex.unlock();
+ startListening(); // TODO check when we need this
+ return QString();
+}
+
+/*** Storage Handling ***/
+
+bool Core::registerStorageBackend(Storage *backend) {
+ if(backend->isAvailable()) {
+ _storageBackends[backend->displayName()] = backend;
+ return true;
+ } else {
+ backend->deleteLater();
+ return false;
+ }
+}
+
+void Core::unregisterStorageBackend(Storage *backend) {
+ _storageBackends.remove(backend->displayName());
+ backend->deleteLater();
+}
+
+// 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;
+ }
+
+ if(_storageBackends.contains(backend)) {
+ storage = _storageBackends[backend];
+ } else {
+ qWarning() << "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!";
+ storage = 0;
+ return configured = false;
+ }
+ }
+ // delete all other backends
+ foreach(Storage *s, _storageBackends.values()) {
+ if(s != storage) s->deleteLater();
+ }
+ _storageBackends.clear();
+
+ connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)));
+ return configured = true;
+}
+
+void Core::syncStorage() {
+ QMutexLocker locker(&mutex);
+ if(storage) storage->sync();
}
/*** Storage Access ***/
-bool Core::createNetworkId(UserId user, NetworkInfo &info) {
+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->createNetworkId(user, info);
+ NetworkId networkId = instance()->storage->createNetwork(user, info);
if(!networkId.isValid())
return false;
-
+
info.networkId = networkId;
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<NetworkInfo> 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);
}
-BufferInfo Core::bufferInfo(UserId user, const NetworkId &networkId, const QString &buffer) {
+QList<NetworkId> 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->getBufferInfo(user, networkId, buffer);
+ return instance()->storage->setNetworkConnected(user, networkId, isConnected);
+}
+
+QHash<QString, QString> 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) {
return instance()->storage->logMessage(message);
}
-QList<Message> Core::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) {
+QList<Message> Core::requestMsgs(UserId user, BufferId buffer, int lastmsgs, int offset) {
+ QMutexLocker locker(&mutex);
+ return instance()->storage->requestMsgs(user, buffer, lastmsgs, offset);
+}
+
+QList<Message> Core::requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset) {
+ QMutexLocker locker(&mutex);
+ return instance()->storage->requestMsgs(user, buffer, since, offset);
+}
+
+QList<Message> Core::requestMsgRange(UserId user, BufferId buffer, int first, int last) {
+ QMutexLocker locker(&mutex);
+ return instance()->storage->requestMsgRange(user, buffer, first, last);
+}
+
+QList<BufferInfo> Core::requestBuffers(UserId user) {
+ QMutexLocker locker(&mutex);
+ return instance()->storage->requestBuffers(user);
+}
+
+QList<BufferId> 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->requestMsgs(buffer, lastmsgs, offset);
+ return instance()->storage->removeBuffer(user, bufferId);
}
-QList<Message> Core::requestMsgs(BufferInfo buffer, QDateTime since, int offset) {
+BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) {
QMutexLocker locker(&mutex);
- return instance()->storage->requestMsgs(buffer, since, offset);
+ return instance()->storage->renameBuffer(user, networkId, newName, oldName);
}
-QList<Message> Core::requestMsgRange(BufferInfo buffer, int first, int last) {
+void Core::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) {
QMutexLocker locker(&mutex);
- return instance()->storage->requestMsgRange(buffer, first, last);
+ return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId);
}
-QList<BufferInfo> Core::requestBuffers(UserId user, QDateTime since) {
+QHash<BufferId, MsgId> Core::bufferLastSeenMsgIds(UserId user) {
QMutexLocker locker(&mutex);
- return instance()->storage->requestBuffers(user, since);
+ return instance()->storage->bufferLastSeenMsgIds(user);
}
/*** 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 success = false;
+
+ // let's see if ipv6 is available
+ success = server.listen(QHostAddress::AnyIPv6, port);
+
+ if(!success && server.serverError() == QAbstractSocket::UnsupportedSocketOperationError) {
+ // fall back to v4
+ success = server.listen(QHostAddress::Any, port);
}
- qDebug() << "Listening for GUI clients on port" << server.serverPort();
- return 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;
+ }
+
+ return success;
}
void Core::stopListening() {
}
void Core::incomingConnection() {
- // TODO implement SSL
- while (server.hasPendingConnections()) {
+ 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());
+ qDebug() << qPrintable(tr("Client connected from")) << qPrintable(socket->peerAddress().toString());
if (!configured) {
server.close();
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 = 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) {
+ 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);
+ 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;
+ // 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</b><br>"
+ "Built: %2<br>"
+ "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));
+
+#ifndef QT_NO_OPENSSL
+ SslServer *sslServer = qobject_cast<SslServer *>(&server);
+ QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
+ bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid();
+#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;
}
- // OK, so we have at least an init message format we can understand
- if(msg["MsgType"] == "ClientInit") {
+ clientInfo[socket] = msg; // store for future reference
+ reply["MsgType"] = "ClientInitAck";
+ SignalProxy::writeDataToDevice(socket, reply);
+
+#ifndef QT_NO_OPENSSL
+ // 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"]);
+ 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();
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()));
+ 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()));
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!
+ qDebug() << 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) {
+ blocksizes.erase(blockSizeIter);
+ }
+ blockSizeIter++;
+ }
- // make server listen again if still not configured FIXME
+ QHash<QTcpSocket *, QVariantMap>::iterator clientInfoIter = clientInfo.begin();
+ while(clientInfoIter != clientInfo.end()) {
+ if(clientInfoIter.key() == socket) {
+ clientInfo.erase(clientInfoIter);
+ }
+ clientInfoIter++;
+ }
+ }
+
+
+ // 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);
return sess;
}
-QStringList Core::availableStorageProviders() {
- QStringList storageProviders;
- if (SqliteStorage::isAvailable()) {
- storageProviders.append(SqliteStorage::displayName());
- }
- // TODO: temporary
- // storageProviders.append("MySQL");
-
- return storageProviders;
+#ifndef QT_NO_OPENSSL
+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)
+ qDebug() << "Core::socketError()" << socket << err << socket->errorString();
}
projects / quassel.git / blobdiff