#include "sqlitestorage.h"
#include "network.h"
+#include "util.h"
+
Core *Core::instanceptr = 0;
QMutex Core::mutex;
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()));
CoreSettings cs;
if(!(configured = initStorage(cs.storageSettings().toMap()))) {
- qWarning("Core is currently not configured!");
+ 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();
Core::~Core() {
foreach(QTcpSocket *socket, blocksizes.keys()) {
- socket->disconnectFromHost(); // disconnect local (i.e. non-authed) clients
+ socket->disconnectFromHost(); // disconnect non authed clients
}
qDeleteAll(sessions);
qDeleteAll(_storageBackends);
QVariantMap state;
QVariantList activeSessions;
foreach(UserId user, instance()->sessions.keys()) activeSessions << QVariant::fromValue<UserId>(user);
- state["CoreBuild"] = Global::quasselBuild;
+ 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!"));
+ // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!"));
return;
}
if(instance()->sessions.count()) {
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...";
return tr("Could not setup storage!");
}
CoreSettings s;
- //s.setStorageSettings(msg);
+ s.setStorageSettings(setupData);
qDebug() << qPrintable(tr("Creating admin user..."));
mutex.lock();
storage->addUser(user, password);
}
/*** 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;
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->setNetworkConnected(user, networkId, isConnected);
+}
+
+QHash<QString, QString> Core::persistentChannels(UserId user, const NetworkId &networkId) {
QMutexLocker locker(&mutex);
- return instance()->storage->getBufferInfo(user, networkId, buffer);
+ 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(buffer, lastmsgs, offset);
+ return instance()->storage->requestMsgs(user, buffer, lastmsgs, offset);
}
-QList<Message> Core::requestMsgs(BufferInfo buffer, QDateTime since, int offset) {
+QList<Message> Core::requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset) {
QMutexLocker locker(&mutex);
- return instance()->storage->requestMsgs(buffer, since, offset);
+ return instance()->storage->requestMsgs(user, buffer, since, offset);
}
-QList<Message> Core::requestMsgRange(BufferInfo buffer, int first, int last) {
+QList<Message> Core::requestMsgRange(UserId user, BufferId buffer, int first, int last) {
QMutexLocker locker(&mutex);
- return instance()->storage->requestMsgRange(buffer, first, last);
+ return instance()->storage->requestMsgRange(user, buffer, first, last);
}
-QList<BufferInfo> Core::requestBuffers(UserId user, QDateTime since) {
+QList<BufferInfo> Core::requestBuffers(UserId user) {
QMutexLocker locker(&mutex);
- return instance()->storage->requestBuffers(user, since);
+ 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->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<BufferId, MsgId> Core::bufferLastSeenMsgIds(UserId user) {
+ QMutexLocker locker(&mutex);
+ return instance()->storage->bufferLastSeenMsgIds(user);
}
/*** 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;
+ 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();
+ }
+
+ return success;
}
void Core::stopListening() {
}
void Core::incomingConnection() {
- // TODO implement SSL
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());
while(SignalProxy::readDataFromDevice(socket, blocksizes[socket], item)) {
QVariantMap msg = item.toMap();
processClientMessage(socket, msg);
+ if(!blocksizes.contains(socket)) break; // this socket is no longer ours to handle!
}
}
// 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 %1 too old, rejecting.").arg(socket->peerAddress().toString()));
+ socket->close(); return;
+ }
+
reply["CoreVersion"] = Global::quasselVersion;
- reply["CoreDate"] = Global::quasselDate;
- reply["CoreBuild"] = Global::quasselBuild;
+ 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 (Build >= %2)</b><br>"
- "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuild)
+ 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));
- reply["SupportSsl"] = false;
+#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;
- // 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;
- }
// check if we are configured, start wizard otherwise
if(!configured) {
reply["Configured"] = false;
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() << "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)) {
}
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 %1 initialized and authenticated successfully as \"%2\" (UserId: %3).").arg(socket->peerAddress().toString(), msg["User"].toString()).arg(uid.toInt()));
setupClientSession(socket, uid);
}
}
// Potentially called during the initialization phase (before handing the connection off to the session)
void Core::clientDisconnected() {
- QTcpSocket *socket = dynamic_cast<QTcpSocket*>(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<QTcpSocket *>(sender());
+ if(socket) {
+ // here it's safe to call methods on socket!
+ qDebug() << qPrintable(tr("Non-authed client disconnected.")) << qPrintable(socket->peerAddress().toString());
+ socket->deleteLater();
+ } else {
+ // we have to crawl through the hashes and see if we find a victim to remove
+
+ // 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++;
+ }
+
+ 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) {
sess->start();
return sess;
}
+
+#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