X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientauthhandler.cpp;h=52bd1e4a827fee8cf52676844f05a8379ce2a0db;hp=fc6156d2a743858825beedcf25b499d6b9ad9fa7;hb=af29862368978b94f00f13b957f685d78c7e8104;hpb=61aac1868f15babb7086d8bc6bbcff530346f438 diff --git a/src/client/clientauthhandler.cpp b/src/client/clientauthhandler.cpp index fc6156d2..52bd1e4a 100644 --- a/src/client/clientauthhandler.cpp +++ b/src/client/clientauthhandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * 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 * @@ -20,44 +20,39 @@ #include "clientauthhandler.h" -// TODO: support system application proxy (new in Qt 4.6) - #include #ifdef HAVE_SSL - #include +# include #else - #include +# include #endif #include "client.h" #include "clientsettings.h" #include "peerfactory.h" - -#if QT_VERSION < 0x050000 -# include "../../3rdparty/sha512/sha512.h" -#endif - -using namespace Protocol; - -ClientAuthHandler::ClientAuthHandler(CoreAccount account, QObject *parent) - : AuthHandler(parent), - _peer(0), - _account(account), - _probing(false), - _legacy(false), - _connectionFeatures(0) +#include "util.h" + +ClientAuthHandler::ClientAuthHandler(CoreAccount account, QObject* parent) + : AuthHandler(parent) + , _peer(nullptr) + , _account(account) + , _probing(false) + , _legacy(false) + , _connectionFeatures(0) +{} + +Peer* ClientAuthHandler::peer() const { - + return _peer; } - void ClientAuthHandler::connectToCore() { CoreAccountSettings s; #ifdef HAVE_SSL - QSslSocket *socket = new QSslSocket(this); + auto* socket = new QSslSocket(this); // make sure the warning is shown if we happen to connect without SSL support later s.setAccountValue("ShowNoClientSslWarning", true); #else @@ -72,59 +67,69 @@ void ClientAuthHandler::connectToCore() s.setAccountValue("ShowNoClientSslWarning", false); } } - QTcpSocket *socket = new QTcpSocket(this); + QTcpSocket* socket = new QTcpSocket(this); #endif -// TODO: Handle system proxy #ifndef QT_NO_NETWORKPROXY - if (_account.useProxy()) { - QNetworkProxy proxy(_account.proxyType(), _account.proxyHostName(), _account.proxyPort(), _account.proxyUser(), _account.proxyPassword()); + QNetworkProxy proxy; + proxy.setType(_account.proxyType()); + if (_account.proxyType() == QNetworkProxy::Socks5Proxy || _account.proxyType() == QNetworkProxy::HttpProxy) { + proxy.setHostName(_account.proxyHostName()); + proxy.setPort(_account.proxyPort()); + proxy.setUser(_account.proxyUser()); + proxy.setPassword(_account.proxyPassword()); + } + + if (_account.proxyType() == QNetworkProxy::DefaultProxy) { + QNetworkProxyFactory::setUseSystemConfiguration(true); + } + else { + QNetworkProxyFactory::setUseSystemConfiguration(false); socket->setProxy(proxy); } #endif setSocket(socket); - connect(socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SLOT(onSocketStateChanged(QAbstractSocket::SocketState))); - connect(socket, SIGNAL(readyRead()), SLOT(onReadyRead())); - connect(socket, SIGNAL(connected()), SLOT(onSocketConnected())); + connect(socket, &QAbstractSocket::stateChanged, this, &ClientAuthHandler::onSocketStateChanged); + connect(socket, &QIODevice::readyRead, this, &ClientAuthHandler::onReadyRead); + connect(socket, &QAbstractSocket::connected, this, &ClientAuthHandler::onSocketConnected); emit statusMessage(tr("Connecting to %1...").arg(_account.accountName())); socket->connectToHost(_account.hostName(), _account.port()); } - void ClientAuthHandler::onSocketStateChanged(QAbstractSocket::SocketState socketState) { QString text; - switch(socketState) { - case QAbstractSocket::HostLookupState: - if (!_legacy) - text = tr("Looking up %1...").arg(_account.hostName()); - break; - case QAbstractSocket::ConnectingState: - if (!_legacy) - text = tr("Connecting to %1...").arg(_account.hostName()); - break; - case QAbstractSocket::ConnectedState: - text = tr("Connected to %1").arg(_account.hostName()); - break; - case QAbstractSocket::ClosingState: - if (!_probing) - text = tr("Disconnecting from %1...").arg(_account.hostName()); - break; - case QAbstractSocket::UnconnectedState: - if (!_probing) { - text = tr("Disconnected"); - // Ensure the disconnected() signal is sent even if we haven't reached the Connected state yet. - // The baseclass implementation will make sure to only send the signal once. - // However, we do want to prefer a potential socket error signal that may be on route already, so - // give this a chance to overtake us by spinning the loop... - QTimer::singleShot(0, this, SLOT(onSocketDisconnected())); - } - break; - default: - break; + switch (socketState) { + case QAbstractSocket::HostLookupState: + if (!_legacy) + text = tr("Looking up %1...").arg(_account.hostName()); + break; + case QAbstractSocket::ConnectingState: + if (!_legacy) + text = tr("Connecting to %1...").arg(_account.hostName()); + break; + case QAbstractSocket::ConnectedState: + text = tr("Connected to %1").arg(_account.hostName()); + break; + case QAbstractSocket::ClosingState: + if (!_probing) + text = tr("Disconnecting from %1...").arg(_account.hostName()); + break; + case QAbstractSocket::UnconnectedState: + if (!_probing) { + text = tr("Disconnected"); + // Ensure the disconnected() signal is sent even if we haven't reached the Connected state yet. + // The baseclass implementation will make sure to only send the signal once. + // However, we do want to prefer a potential socket error signal that may be on route already, so + // give this a chance to overtake us by spinning the loop... + QTimer::singleShot(0, this, &ClientAuthHandler::onSocketDisconnected); + } + break; + default: + break; } if (!text.isEmpty()) { @@ -139,17 +144,16 @@ void ClientAuthHandler::onSocketError(QAbstractSocket::SocketError error) return; } - _probing = false; // all other errors are unrelated to probing and should be handled + _probing = false; // all other errors are unrelated to probing and should be handled AuthHandler::onSocketError(error); } - void ClientAuthHandler::onSocketDisconnected() { if (_probing && _legacy) { // Remote host has closed the connection while probing _probing = false; - disconnect(socket(), SIGNAL(readyRead()), this, SLOT(onReadyRead())); + disconnect(socket(), &QIODevice::readyRead, this, &ClientAuthHandler::onReadyRead); emit statusMessage(tr("Reconnecting in compatibility mode...")); socket()->connectToHost(_account.hostName(), _account.port()); return; @@ -158,7 +162,6 @@ void ClientAuthHandler::onSocketDisconnected() AuthHandler::onSocketDisconnected(); } - void ClientAuthHandler::onSocketConnected() { if (_peer) { @@ -172,7 +175,7 @@ void ClientAuthHandler::onSocketConnected() // First connection attempt, try probing for a capable core _probing = true; - QDataStream stream(socket()); // stream handles the endianness for us + QDataStream stream(socket()); // stream handles the endianness for us stream.setVersion(QDataStream::Qt_4_2); quint32 magic = Protocol::magic; @@ -188,13 +191,13 @@ void ClientAuthHandler::onSocketConnected() PeerFactory::ProtoList protos = PeerFactory::supportedProtocols(); for (int i = 0; i < protos.count(); ++i) { quint32 reply = protos[i].first; - reply |= protos[i].second<<8; + reply |= protos[i].second << 8; if (i == protos.count() - 1) - reply |= 0x80000000; // end list + reply |= 0x80000000; // end list stream << reply; } - socket()->flush(); // make sure the probing data is sent immediately + socket()->flush(); // make sure the probing data is sent immediately return; } @@ -202,32 +205,35 @@ void ClientAuthHandler::onSocketConnected() qDebug() << "Legacy core detected, switching to compatibility mode"; - RemotePeer *peer = PeerFactory::createPeer(PeerFactory::ProtoDescriptor(Protocol::LegacyProtocol, 0), this, socket(), Compressor::NoCompression, this); + auto* peer = PeerFactory::createPeer(PeerFactory::ProtoDescriptor(Protocol::LegacyProtocol, 0), + this, + socket(), + Compressor::NoCompression, + this); // Only needed for the legacy peer, as all others check the protocol version before instantiation - connect(peer, SIGNAL(protocolVersionMismatch(int,int)), SLOT(onProtocolVersionMismatch(int,int))); + connect(peer, &RemotePeer::protocolVersionMismatch, this, &ClientAuthHandler::onProtocolVersionMismatch); setPeer(peer); } - void ClientAuthHandler::onReadyRead() { if (socket()->bytesAvailable() < 4) return; if (!_probing) - return; // make sure to not read more data than needed + return; // make sure to not read more data than needed _probing = false; - disconnect(socket(), SIGNAL(readyRead()), this, SLOT(onReadyRead())); + disconnect(socket(), &QIODevice::readyRead, this, &ClientAuthHandler::onReadyRead); quint32 reply; - socket()->read((char *)&reply, 4); + socket()->read((char*)&reply, 4); reply = qFromBigEndian(reply); - Protocol::Type type = static_cast(reply & 0xff); - quint16 protoFeatures = static_cast(reply>>8 & 0xffff); - _connectionFeatures = static_cast(reply>>24); + auto type = static_cast(reply & 0xff); + auto protoFeatures = static_cast(reply >> 8 & 0xffff); + _connectionFeatures = static_cast(reply >> 24); Compressor::CompressionLevel level; if (_connectionFeatures & Protocol::Compression) @@ -235,7 +241,7 @@ void ClientAuthHandler::onReadyRead() else level = Compressor::NoCompression; - RemotePeer *peer = PeerFactory::createPeer(PeerFactory::ProtoDescriptor(type, protoFeatures), this, socket(), level, this); + RemotePeer* peer = PeerFactory::createPeer(PeerFactory::ProtoDescriptor(type, protoFeatures), this, socket(), level, this); if (!peer) { qWarning() << "No valid protocol supported for this core!"; emit errorPopup(tr("Incompatible Quassel Core!
" @@ -246,28 +252,27 @@ void ClientAuthHandler::onReadyRead() } if (peer->protocol() == Protocol::LegacyProtocol) { - connect(peer, SIGNAL(protocolVersionMismatch(int,int)), SLOT(onProtocolVersionMismatch(int,int))); + connect(peer, &RemotePeer::protocolVersionMismatch, this, &ClientAuthHandler::onProtocolVersionMismatch); _legacy = true; } setPeer(peer); } - void ClientAuthHandler::onProtocolVersionMismatch(int actual, int expected) { emit errorPopup(tr("The Quassel Core you are trying to connect to is too old!
" - "We need at least protocol v%1, but the core speaks v%2 only.").arg(expected, actual)); + "We need at least protocol v%1, but the core speaks v%2 only.") + .arg(expected, actual)); requestDisconnect(tr("Incompatible protocol version, connection to core refused")); } - -void ClientAuthHandler::setPeer(RemotePeer *peer) +void ClientAuthHandler::setPeer(RemotePeer* peer) { qDebug().nospace() << "Using " << qPrintable(peer->protocolName()) << "..."; _peer = peer; - connect(_peer, SIGNAL(transferProgress(int,int)), SIGNAL(transferProgress(int,int))); + connect(_peer, &RemotePeer::transferProgress, this, &ClientAuthHandler::transferProgress); // The legacy protocol enables SSL later, after registration if (!_account.useSsl() || _legacy) @@ -277,7 +282,6 @@ void ClientAuthHandler::setPeer(RemotePeer *peer) checkAndEnableSsl(_connectionFeatures & Protocol::Encryption); } - void ClientAuthHandler::startRegistration() { emit statusMessage(tr("Synchronizing to core...")); @@ -288,68 +292,70 @@ void ClientAuthHandler::startRegistration() useSsl = _account.useSsl(); #endif - _peer->dispatch(RegisterClient(Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().commitDate, useSsl)); + _peer->dispatch(Protocol::RegisterClient(Quassel::Features{}, Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().commitDate, useSsl)); } - -void ClientAuthHandler::handle(const ClientDenied &msg) +void ClientAuthHandler::handle(const Protocol::ClientDenied& msg) { emit errorPopup(msg.errorString); requestDisconnect(tr("The core refused connection from this client")); } - -void ClientAuthHandler::handle(const ClientRegistered &msg) +void ClientAuthHandler::handle(const Protocol::ClientRegistered& msg) { _coreConfigured = msg.coreConfigured; _backendInfo = msg.backendInfo; - _authBackendInfo = msg.authBackendInfo; + _authenticatorInfo = msg.authenticatorInfo; - Client::setCoreFeatures(static_cast(msg.coreFeatures)); + _peer->setFeatures(std::move(msg.features)); // The legacy protocol enables SSL at this point - if(_legacy && _account.useSsl()) + if (_legacy && _account.useSsl()) checkAndEnableSsl(msg.sslSupported); else onConnectionReady(); } - void ClientAuthHandler::onConnectionReady() { + const auto& coreFeatures = _peer->features(); + auto unsupported = coreFeatures.toStringList(false); + if (!unsupported.isEmpty()) { + qInfo() << qPrintable(tr("Core does not support the following features: %1").arg(unsupported.join(", "))); + } + if (!coreFeatures.unknownFeatures().isEmpty()) { + qInfo() << qPrintable(tr("Core supports unknown features: %1").arg(coreFeatures.unknownFeatures().join(", "))); + } + emit connectionReady(); emit statusMessage(tr("Connected to %1").arg(_account.accountName())); if (!_coreConfigured) { // start wizard - emit startCoreSetup(_backendInfo, _authBackendInfo); + emit startCoreSetup(_backendInfo, _authenticatorInfo); } - else // TODO: check if we need LoginEnabled + else // TODO: check if we need LoginEnabled login(); } - -void ClientAuthHandler::setupCore(const SetupData &setupData) +void ClientAuthHandler::setupCore(const Protocol::SetupData& setupData) { _peer->dispatch(setupData); } - -void ClientAuthHandler::handle(const SetupFailed &msg) +void ClientAuthHandler::handle(const Protocol::SetupFailed& msg) { emit coreSetupFailed(msg.errorString); } - -void ClientAuthHandler::handle(const SetupDone &msg) +void ClientAuthHandler::handle(const Protocol::SetupDone& msg) { Q_UNUSED(msg) emit coreSetupSuccessful(); } - -void ClientAuthHandler::login(const QString &user, const QString &password, bool remember) +void ClientAuthHandler::login(const QString& user, const QString& password, bool remember) { _account.setUser(user); _account.setPassword(password); @@ -357,47 +363,42 @@ void ClientAuthHandler::login(const QString &user, const QString &password, bool login(); } - -void ClientAuthHandler::login(const QString &previousError) +void ClientAuthHandler::login(const QString& previousError) { emit statusMessage(tr("Logging in...")); if (_account.user().isEmpty() || _account.password().isEmpty() || !previousError.isEmpty()) { bool valid = false; - emit userAuthenticationRequired(&_account, &valid, previousError); // *must* be a synchronous call + emit userAuthenticationRequired(&_account, &valid, previousError); // *must* be a synchronous call if (!valid || _account.user().isEmpty() || _account.password().isEmpty()) { requestDisconnect(tr("Login canceled")); return; } } - _peer->dispatch(Login(_account.user(), _account.password())); + _peer->dispatch(Protocol::Login(_account.user(), _account.password())); } - -void ClientAuthHandler::handle(const LoginFailed &msg) +void ClientAuthHandler::handle(const Protocol::LoginFailed& msg) { login(msg.errorString); } - -void ClientAuthHandler::handle(const LoginSuccess &msg) +void ClientAuthHandler::handle(const Protocol::LoginSuccess& msg) { Q_UNUSED(msg) emit loginSuccessful(_account); } - -void ClientAuthHandler::handle(const SessionState &msg) +void ClientAuthHandler::handle(const Protocol::SessionState& msg) { - disconnect(socket(), 0, this, 0); // this is the last message we shall ever get + disconnect(socket(), nullptr, this, nullptr); // this is the last message we shall ever get // give up ownership of the peer; CoreSession takes responsibility now - _peer->setParent(0); + _peer->setParent(nullptr); emit handshakeComplete(_peer, msg); } - /*** SSL Stuff ***/ void ClientAuthHandler::checkAndEnableSsl(bool coreSupportsSsl) @@ -410,10 +411,10 @@ void ClientAuthHandler::checkAndEnableSsl(bool coreSupportsSsl) // Make sure the warning is shown next time we don't have SSL in the core s.setAccountValue("ShowNoCoreSslWarning", true); - QSslSocket *sslSocket = qobject_cast(socket()); + auto* sslSocket = qobject_cast(socket()); Q_ASSERT(sslSocket); - connect(sslSocket, SIGNAL(encrypted()), SLOT(onSslSocketEncrypted())); - connect(sslSocket, SIGNAL(sslErrors(QList)), SLOT(onSslErrors())); + connect(sslSocket, &QSslSocket::encrypted, this, &ClientAuthHandler::onSslSocketEncrypted); + connect(sslSocket, selectOverload&>(&QSslSocket::sslErrors), this, &ClientAuthHandler::onSslErrors); qDebug() << "Starting encryption..."; sslSocket->flush(); sslSocket->startClientEncryption(); @@ -442,7 +443,7 @@ void ClientAuthHandler::checkAndEnableSsl(bool coreSupportsSsl) void ClientAuthHandler::onSslSocketEncrypted() { - QSslSocket *socket = qobject_cast(sender()); + auto* socket = qobject_cast(sender()); Q_ASSERT(socket); if (!socket->sslErrors().count()) { @@ -461,15 +462,15 @@ void ClientAuthHandler::onSslSocketEncrypted() startRegistration(); } - void ClientAuthHandler::onSslErrors() { - QSslSocket *socket = qobject_cast(sender()); + auto* socket = qobject_cast(sender()); Q_ASSERT(socket); CoreAccountSettings s; QByteArray knownDigest = s.accountValue("SslCert").toByteArray(); - ClientAuthHandler::DigestVersion knownDigestVersion = static_cast(s.accountValue("SslCertDigestVersion").toInt()); + ClientAuthHandler::DigestVersion knownDigestVersion = static_cast( + s.accountValue("SslCertDigestVersion").toInt()); QByteArray calculatedDigest; switch (knownDigestVersion) { @@ -478,17 +479,13 @@ void ClientAuthHandler::onSslErrors() break; case ClientAuthHandler::DigestVersion::Sha2_512: -#if QT_VERSION >= 0x050000 calculatedDigest = socket->peerCertificate().digest(QCryptographicHash::Sha512); -#else - calculatedDigest = sha2_512(socket->peerCertificate().toDer()); -#endif break; default: qWarning() << "Certificate digest version" << QString(knownDigestVersion) << "is not supported"; } - + if (knownDigest != calculatedDigest) { bool accepted = false; bool permanently = false; @@ -500,11 +497,7 @@ void ClientAuthHandler::onSslErrors() } if (permanently) { -#if QT_VERSION >= 0x050000 s.setAccountValue("SslCert", socket->peerCertificate().digest(QCryptographicHash::Sha512)); -#else - s.setAccountValue("SslCert", sha2_512(socket->peerCertificate().toDer())); -#endif s.setAccountValue("SslCertDigestVersion", ClientAuthHandler::DigestVersion::Latest); } else { @@ -513,28 +506,11 @@ void ClientAuthHandler::onSslErrors() } } else if (knownDigestVersion != ClientAuthHandler::DigestVersion::Latest) { -#if QT_VERSION >= 0x050000 s.setAccountValue("SslCert", socket->peerCertificate().digest(QCryptographicHash::Sha512)); -#else - s.setAccountValue("SslCert", sha2_512(socket->peerCertificate().toDer())); -#endif s.setAccountValue("SslCertDigestVersion", ClientAuthHandler::DigestVersion::Latest); } socket->ignoreSslErrors(); } -#if QT_VERSION < 0x050000 -QByteArray ClientAuthHandler::sha2_512(const QByteArray &input) { - unsigned char output[64]; - sha512((unsigned char*) input.constData(), input.size(), output, false); - // QByteArray::fromRawData() cannot be used here because that constructor - // does not copy "output" and the data is clobbered when the variable goes - // out of scope. - QByteArray result; - result.append((char*) output, 64); - return result; -} -#endif - #endif /* HAVE_SSL */