#include "sqlitestorage.h"
#include "network.h"
+#include "util.h"
+
Core *Core::instanceptr = 0;
QMutex Core::mutex;
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()) {
+ foreach(QTcpSocket *socket, blocksizes.keys()) { qDebug() << "disconnecting" << socket << blocksizes.keys();
socket->disconnectFromHost(); // disconnect local (i.e. non-authed) clients
}
qDeleteAll(sessions);
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 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);
return instance()->storage->getNetworkId(user, network);
}
+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->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<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) {
return instance()->storage->requestBuffers(user, since);
}
+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) {
}
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!
}
}
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>"
+ 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;
+#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
+
+ reply["SupportSsl"] = supportSsl;
+ // switch to ssl after client has been informed about our capabilities (see below)
+
reply["LoginEnabled"] = true;
// Just version information -- check it!
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
+
} 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 authentificated successfully as \"%2\" (UserId: %3).").arg(socket->peerAddress().toString(), msg["User"].toString()).arg(uid.toInt()));
setupClientSession(socket, uid);
}
}
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