X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=d559e44e162c505fe6cbbe8b10309e2d5f929bbe;hp=913968bca1e7eba75bd465c45f30012a48aca2e5;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=e17fca767d60c06ca02bc5898ced04f06d3670bd diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp index 913968bc..d559e44e 100644 --- a/src/core/coreauthhandler.cpp +++ b/src/core/coreauthhandler.cpp @@ -21,30 +21,28 @@ #include "coreauthhandler.h" #ifdef HAVE_SSL -# include +# include #endif #include "core.h" -#include "logger.h" +#include "logmessage.h" using namespace Protocol; -CoreAuthHandler::CoreAuthHandler(QTcpSocket *socket, QObject *parent) - : AuthHandler(parent), - _peer(0), - _magicReceived(false), - _legacy(false), - _clientRegistered(false), - _connectionFeatures(0) +CoreAuthHandler::CoreAuthHandler(QTcpSocket* socket, QObject* parent) + : AuthHandler(parent) + , _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 - } - void CoreAuthHandler::onReadyRead() { if (socket()->bytesAvailable() < 4) @@ -63,8 +61,12 @@ void CoreAuthHandler::onReadyRead() // no magic, assume legacy protocol qDebug() << "Legacy client detected, switching to compatibility mode"; _legacy = true; - RemotePeer *peer = PeerFactory::createPeer(PeerFactory::ProtoDescriptor(Protocol::LegacyProtocol, 0), this, socket(), Compressor::NoCompression, this); - connect(peer, SIGNAL(protocolVersionMismatch(int,int)), SLOT(onProtocolVersionMismatch(int,int))); + RemotePeer* peer = PeerFactory::createPeer(PeerFactory::ProtoDescriptor(Protocol::LegacyProtocol, 0), + this, + socket(), + Compressor::NoCompression, + this); + connect(peer, &RemotePeer::protocolVersionMismatch, this, &CoreAuthHandler::onProtocolVersionMismatch); setPeer(peer); return; } @@ -77,27 +79,27 @@ void CoreAuthHandler::onReadyRead() if (features & Protocol::Compression) _connectionFeatures |= Protocol::Compression; - socket()->read((char*)&magic, 4); // read the 4 bytes we've just peeked at + socket()->read((char*)&magic, 4); // read the 4 bytes we've just peeked at } // read the list of protocols supported by the client - while (socket()->bytesAvailable() >= 4 && _supportedProtos.size() < 16) { // sanity check + while (socket()->bytesAvailable() >= 4 && _supportedProtos.size() < 16) { // sanity check quint32 data; socket()->read((char*)&data, 4); data = qFromBigEndian(data); - Protocol::Type type = static_cast(data & 0xff); - quint16 protoFeatures = static_cast(data>>8 & 0xffff); + auto type = static_cast(data & 0xff); + auto protoFeatures = static_cast(data >> 8 & 0xffff); _supportedProtos.append(PeerFactory::ProtoDescriptor(type, protoFeatures)); - if (data >= 0x80000000) { // last protocol + if (data >= 0x80000000) { // last protocol Compressor::CompressionLevel level; if (_connectionFeatures & Protocol::Compression) level = Compressor::BestCompression; else level = Compressor::NoCompression; - RemotePeer *peer = PeerFactory::createPeer(_supportedProtos, this, socket(), level, this); + RemotePeer* peer = PeerFactory::createPeer(_supportedProtos, this, socket(), level, this); if (!peer) { qWarning() << "Received invalid handshake data from client" << socket()->peerAddress().toString(); close(); @@ -106,30 +108,29 @@ void CoreAuthHandler::onReadyRead() if (peer->protocol() == Protocol::LegacyProtocol) { _legacy = true; - connect(peer, SIGNAL(protocolVersionMismatch(int,int)), SLOT(onProtocolVersionMismatch(int,int))); + connect(peer, &RemotePeer::protocolVersionMismatch, this, &CoreAuthHandler::onProtocolVersionMismatch); } setPeer(peer); // inform the client - quint32 reply = peer->protocol() | peer->enabledFeatures()<<8 | _connectionFeatures<<24; + quint32 reply = peer->protocol() | peer->enabledFeatures() << 8 | _connectionFeatures << 24; reply = qToBigEndian(reply); socket()->write((char*)&reply, 4); socket()->flush(); if (!_legacy && (_connectionFeatures & Protocol::Encryption)) - startSsl(); // legacy peer enables it later + startSsl(); // legacy peer enables it later return; } } } - -void CoreAuthHandler::setPeer(RemotePeer *peer) +void CoreAuthHandler::setPeer(RemotePeer* peer) { 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 @@ -138,25 +139,26 @@ void CoreAuthHandler::onProtocolVersionMismatch(int actual, int expected) qWarning() << qPrintable(tr("Client")) << _peer->description() << qPrintable(tr("too old, rejecting.")); QString errorString = tr("Your Quassel Client is too old!
" "This core needs at least client/core protocol version %1 (got: %2).
" - "Please consider upgrading your client.").arg(expected, actual); + "Please consider upgrading your client.") + .arg(expected, actual); _peer->dispatch(ClientDenied(errorString)); _peer->close(); } - bool CoreAuthHandler::checkClientRegistered() { if (!_clientRegistered) { - qWarning() << qPrintable(tr("Client")) << qPrintable(socket()->peerAddress().toString()) << qPrintable(tr("did not send a registration message before trying to login, rejecting.")); - _peer->dispatch(ClientDenied(tr("Client not initialized!
You need to send a registration message before trying to login."))); + qWarning() << qPrintable(tr("Client")) << qPrintable(socket()->peerAddress().toString()) + << qPrintable(tr("did not send a registration message before trying to login, rejecting.")); + _peer->dispatch( + ClientDenied(tr("Client not initialized!
You need to send a registration message before trying to login."))); _peer->close(); return false; } return true; } - -void CoreAuthHandler::handle(const RegisterClient &msg) +void CoreAuthHandler::handle(const RegisterClient& msg) { bool useSsl; if (_legacy) @@ -194,8 +196,7 @@ void CoreAuthHandler::handle(const RegisterClient &msg) _clientRegistered = true; } - -void CoreAuthHandler::handle(const SetupData &msg) +void CoreAuthHandler::handle(const SetupData& msg) { if (!checkClientRegistered()) return; @@ -215,15 +216,16 @@ void CoreAuthHandler::handle(const SetupData &msg) _peer->dispatch(SetupDone()); } - -void CoreAuthHandler::handle(const Login &msg) +void CoreAuthHandler::handle(const Login& msg) { 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("Attempted to login before core was configured!
The core must be configured before attempting to login."))); + qWarning() << qPrintable(tr("Client")) << qPrintable(socket()->peerAddress().toString()) + << qPrintable(tr("attempted to login before the core was configured, rejecting.")); + _peer->dispatch(ClientDenied( + tr("Attempted to login before core was configured!
The core must be configured before attempting to login."))); return; } @@ -236,53 +238,56 @@ void CoreAuthHandler::handle(const Login &msg) if (uid == 0) { quInfo() << qPrintable(tr("Invalid login attempt from %1 as \"%2\"").arg(socket()->peerAddress().toString(), msg.user)); - _peer->dispatch(LoginFailed(tr("Invalid username or password!
The username/password combination you supplied could not be found in the database."))); + _peer->dispatch(LoginFailed(tr( + "Invalid username or password!
The username/password combination you supplied could not be found in the database."))); return; } _peer->dispatch(LoginSuccess()); - quInfo() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).").arg(socket()->peerAddress().toString(), msg.user, QString::number(uid.toInt()))); + quInfo() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).") + .arg(socket()->peerAddress().toString(), msg.user, QString::number(uid.toInt()))); - const auto &clientFeatures = _peer->features(); + const auto& clientFeatures = _peer->features(); auto unsupported = clientFeatures.toStringList(false); if (!unsupported.isEmpty()) { - quInfo() << qPrintable(tr("Client does not support the following features: %1").arg(unsupported.join(", "))); + 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(), 0, this, 0); - disconnect(_peer, 0, this, 0); - _peer->setParent(0); // Core needs to take care of this one now! + 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) + 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); } - /*** SSL Stuff ***/ void CoreAuthHandler::startSsl() { - #ifdef HAVE_SSL - QSslSocket *sslSocket = qobject_cast(socket()); +#ifdef HAVE_SSL + auto* sslSocket = qobject_cast(socket()); Q_ASSERT(sslSocket); - qDebug() << qPrintable(tr("Starting encryption for Client:")) << _peer->description(); - connect(sslSocket, SIGNAL(sslErrors(const QList &)), SLOT(onSslErrors())); - sslSocket->flush(); // ensure that the write cache is flushed before we switch to ssl (bug 682) + qDebug() << qPrintable(tr("Starting encryption for Client:")) << _peer->description(); + connect(sslSocket, selectOverload&>(&QSslSocket::sslErrors), this, &CoreAuthHandler::onSslErrors); + sslSocket->flush(); // ensure that the write cache is flushed before we switch to ssl (bug 682) sslSocket->startServerEncryption(); - #endif /* HAVE_SSL */ +#endif /* HAVE_SSL */ } - #ifdef HAVE_SSL void CoreAuthHandler::onSslErrors() { - QSslSocket *sslSocket = qobject_cast(socket()); + auto* sslSocket = qobject_cast(socket()); Q_ASSERT(sslSocket); sslSocket->ignoreSslErrors(); } #endif -