/***************************************************************************
- * Copyright (C) 2005-2016 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#endif
#include "core.h"
-#include "logger.h"
+#include "logmessage.h"
using namespace Protocol;
CoreAuthHandler::CoreAuthHandler(QTcpSocket *socket, QObject *parent)
: AuthHandler(parent),
- _peer(0),
+ _peer(nullptr),
_magicReceived(false),
_legacy(false),
_clientRegistered(false),
_connectionFeatures(0)
{
setSocket(socket);
- connect(socket, SIGNAL(readyRead()), SLOT(onReadyRead()));
+ connect(socket, &QIODevice::readyRead, this, &CoreAuthHandler::onReadyRead);
// TODO: Timeout for the handshake phase
socket()->read((char*)&data, 4);
data = qFromBigEndian<quint32>(data);
- Protocol::Type type = static_cast<Protocol::Type>(data & 0xff);
- quint16 protoFeatures = static_cast<quint16>(data>>8 & 0xffff);
+ auto type = static_cast<Protocol::Type>(data & 0xff);
+ auto protoFeatures = static_cast<quint16>(data>>8 & 0xffff);
_supportedProtos.append(PeerFactory::ProtoDescriptor(type, protoFeatures));
if (data >= 0x80000000) { // last protocol
qDebug().nospace() << "Using " << qPrintable(peer->protocolName()) << "...";
_peer = peer;
- disconnect(socket(), SIGNAL(readyRead()), this, SLOT(onReadyRead()));
+ disconnect(socket(), &QIODevice::readyRead, this, &CoreAuthHandler::onReadyRead);
}
// only in compat mode
return;
}
+ _peer->setFeatures(std::move(msg.features));
+ _peer->setBuildDate(msg.buildDate);
+ _peer->setClientVersion(msg.clientVersion);
+
QVariantList backends;
QVariantList authenticators;
bool configured = Core::isConfigured();
if (!configured) {
backends = Core::backendInfo();
- authenticators = Core::authenticatorInfo();
+ if (_peer->hasFeature(Quassel::Feature::Authenticators)) {
+ authenticators = Core::authenticatorInfo();
+ }
}
- // useSsl is only used for the legacy protocol
- // XXX: FIXME: use client features here: we cannot pass authenticators if the client is too old!
- _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, authenticators));
-
- _peer->setBuildDate(msg.buildDate);
- _peer->setClientVersion(msg.clientVersion);
- _peer->setFeatures(Quassel::Features(msg.clientFeatures));
+ _peer->dispatch(ClientRegistered(Quassel::Features{}, configured, backends, authenticators, useSsl));
+ // useSsl is only used for the legacy protocol
if (_legacy && useSsl)
startSsl();
if (!checkClientRegistered())
return;
+ if (!Core::isConfigured()) {
+ qWarning() << qPrintable(tr("Client")) << qPrintable(socket()->peerAddress().toString()) << qPrintable(tr("attempted to login before the core was configured, rejecting."));
+ _peer->dispatch(ClientDenied(tr("<b>Attempted to login before core was configured!</b><br>The core must be configured before attempting to login.")));
+ return;
+ }
+
// First attempt local auth using the real username and password.
// If that fails, move onto the auth provider.
UserId uid = Core::validateUser(msg.user, msg.password);
quInfo() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).").arg(socket()->peerAddress().toString(), msg.user, QString::number(uid.toInt())));
- disconnect(socket(), 0, this, 0);
- disconnect(_peer, 0, this, 0);
- _peer->setParent(0); // Core needs to take care of this one now!
+ const auto &clientFeatures = _peer->features();
+ auto unsupported = clientFeatures.toStringList(false);
+ if (!unsupported.isEmpty()) {
+ if (unsupported.contains("NoFeatures"))
+ quInfo() << qPrintable(tr("Client does not support extended features."));
+ else
+ quInfo() << qPrintable(tr("Client does not support the following features: %1").arg(unsupported.join(", ")));
+ }
+
+ if (!clientFeatures.unknownFeatures().isEmpty()) {
+ quInfo() << qPrintable(tr("Client supports unknown features: %1").arg(clientFeatures.unknownFeatures().join(", ")));
+ }
+
+ disconnect(socket(), nullptr, this, nullptr);
+ disconnect(_peer, nullptr, this, nullptr);
+ _peer->setParent(nullptr); // Core needs to take care of this one now!
socket()->flush(); // Make sure all data is sent before handing over the peer (and socket) to the session thread (bug 682)
emit handshakeComplete(_peer, uid);
void CoreAuthHandler::startSsl()
{
#ifdef HAVE_SSL
- QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket());
+ auto *sslSocket = qobject_cast<QSslSocket *>(socket());
Q_ASSERT(sslSocket);
qDebug() << qPrintable(tr("Starting encryption for Client:")) << _peer->description();
#ifdef HAVE_SSL
void CoreAuthHandler::onSslErrors()
{
- QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket());
+ auto *sslSocket = qobject_cast<QSslSocket *>(socket());
Q_ASSERT(sslSocket);
sslSocket->ignoreSslErrors();
}