X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.cpp;h=17cf26d349348569c2e8184d57bb9aeb846a2063;hb=48017b680ede0dbfb121d1184dfbd13536cfc53f;hp=0dfb33b75b481bdd5eef685de95ee5aa0546e4f6;hpb=d48c2331b38ae46732ac1ab9f35a3a0b85100f92;p=quassel.git diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp index 0dfb33b7..17cf26d3 100644 --- a/src/core/corenetwork.cpp +++ b/src/core/corenetwork.cpp @@ -20,6 +20,8 @@ #include "corenetwork.h" +#include + #include #include #include @@ -84,10 +86,8 @@ CoreNetwork::CoreNetwork(const NetworkId& networkid, CoreSession* session) connect(&socket, selectOverload(&QAbstractSocket::error), this, &CoreNetwork::onSocketError); connect(&socket, &QAbstractSocket::stateChanged, this, &CoreNetwork::onSocketStateChanged); connect(&socket, &QIODevice::readyRead, this, &CoreNetwork::onSocketHasData); -#ifdef HAVE_SSL connect(&socket, &QSslSocket::encrypted, this, &CoreNetwork::onSocketInitialized); connect(&socket, selectOverload&>(&QSslSocket::sslErrors), this, &CoreNetwork::onSslErrors); -#endif connect(this, &CoreNetwork::newEvent, coreSession()->eventManager(), &EventManager::postEvent); // Custom rate limiting @@ -268,7 +268,6 @@ void CoreNetwork::connectToIrc(bool reconnecting) // hostname of the server. Qt's DNS cache also isn't used by the proxy so we don't need to refresh the entry. QHostInfo::fromName(server.host); } -#ifdef HAVE_SSL if (server.useSsl) { CoreIdentity* identity = identityPtr(); if (identity) { @@ -280,9 +279,6 @@ void CoreNetwork::connectToIrc(bool reconnecting) else { socket.connectToHost(server.host, server.port); } -#else - socket.connectToHost(server.host, server.port); -#endif } void CoreNetwork::disconnectFromIrc(bool requested, const QString& reason, bool withReconnect) @@ -563,7 +559,6 @@ void CoreNetwork::onSocketInitialized() Server server = usedServer(); -#ifdef HAVE_SSL // Non-SSL connections enter here only once, always emit socketInitialized(...) in these cases // SSL connections call socketInitialized() twice, only emit socketInitialized(...) on the first (not yet encrypted) run if (!server.useSsl || !socket.isEncrypted()) { @@ -574,9 +569,6 @@ void CoreNetwork::onSocketInitialized() // We'll finish setup once we're encrypted, and called again return; } -#else - emit socketInitialized(identity, localAddress(), localPort(), peerAddress(), peerPort(), _socketId); -#endif socket.setSocketOption(QAbstractSocket::KeepAliveOption, true); @@ -1085,12 +1077,18 @@ void CoreNetwork::resetTokenBucket() void CoreNetwork::serverCapAdded(const QString& capability) { + // Exclude skipped capabilities + if (skipCaps().contains(capability)) { + return; + } + // Check if it's a known capability; if so, add it to the list // Handle special cases first if (capability == IrcCap::SASL) { // Only request SASL if it's enabled - if (networkInfo().useSasl) + if (useSasl()) { queueCap(capability); + } } else if (IrcCap::knownCaps.contains(capability)) { // Handling for general known capabilities @@ -1109,12 +1107,11 @@ void CoreNetwork::serverCapAcknowledged(const QString& capability) } // Handle capabilities that require further messages sent to the IRC server - // If you change this list, ALSO change the list in CoreNetwork::capsRequiringServerMessages + // If you change this list, ALSO change the list in CoreNetwork::capsRequiringConfiguration if (capability == IrcCap::SASL) { // If SASL mechanisms specified, limit to what's accepted for authentication // if the current identity has a cert set, use SASL EXTERNAL // FIXME use event -#ifdef HAVE_SSL if (!identityPtr()->sslCert().isNull()) { if (saslMaybeSupports(IrcCap::SaslMech::EXTERNAL)) { // EXTERNAL authentication supported, send request @@ -1131,7 +1128,6 @@ void CoreNetwork::serverCapAcknowledged(const QString& capability) } } else { -#endif if (saslMaybeSupports(IrcCap::SaslMech::PLAIN)) { // PLAIN authentication supported, send request // Only working with PLAIN atm, blowfish later @@ -1146,9 +1142,7 @@ void CoreNetwork::serverCapAcknowledged(const QString& capability) )); sendNextCap(); } -#ifdef HAVE_SSL } -#endif } } @@ -1267,6 +1261,26 @@ void CoreNetwork::retryCapsIndividually() void CoreNetwork::beginCapNegotiation() { + // Check if any available capabilities have been disabled + QStringList capsSkipped; + if (!skipCaps().isEmpty() && !caps().isEmpty()) { + // Find the entries that are common to skipCaps() and caps(). This represents any + // capabilities supported by the server that were skipped. + + // Both skipCaps() and caps() are already lowercase + // std::set_intersection requires sorted lists, and we can't modify the original lists. + // + // skipCaps() should already be sorted. caps() is intentionally not sorted elsewhere so + // Quassel can show the capabilities in the order transmitted by the network. + auto sortedCaps = caps(); + sortedCaps.sort(); + + // Find the intersection between skipped caps and server-supplied caps + std::set_intersection(skipCaps().cbegin(), skipCaps().cend(), + sortedCaps.cbegin(), sortedCaps.cend(), + std::back_inserter(capsSkipped)); + } + if (!capsPendingNegotiation()) { // No capabilities are queued for request, determine the reason why QString capStatusMsg; @@ -1297,6 +1311,16 @@ void CoreNetwork::beginCapNegotiation() capStatusMsg )); + if (!capsSkipped.isEmpty()) { + // Mention that some capabilities are skipped + showMessage(NetworkInternalMessage( + Message::Server, + BufferInfo::StatusBuffer, + "", + tr("Quassel is configured to ignore some capabilities (skipped: %1)").arg(capsSkipped.join(", ")) + )); + } + // End any ongoing capability negotiation, allowing connection to continue endCapNegotiation(); return; @@ -1310,6 +1334,16 @@ void CoreNetwork::beginCapNegotiation() tr("Ready to negotiate (found: %1)").arg(caps().join(", ")) )); + if (!capsSkipped.isEmpty()) { + // Mention that some capabilities are skipped + showMessage(NetworkInternalMessage( + Message::Server, + BufferInfo::StatusBuffer, + "", + tr("Quassel is configured to ignore some capabilities (skipped: %1)").arg(capsSkipped.join(", ")) + )); + } + // Build a list of queued capabilities, starting with individual, then bundled, only adding the // comma separator between the two if needed (both individual and bundled caps exist). QString queuedCapsDisplay = _capsQueuedIndividual.join(", ") @@ -1334,7 +1368,7 @@ void CoreNetwork::sendNextCap() else { // No pending desired capabilities, capability negotiation finished // If SASL requested but not available, print a warning - if (networkInfo().useSasl && !capEnabled(IrcCap::SASL)) + if (useSasl() && !capEnabled(IrcCap::SASL)) showMessage(NetworkInternalMessage( Message::Error, BufferInfo::StatusBuffer, @@ -1476,7 +1510,6 @@ void CoreNetwork::sendAutoWho() } } -#ifdef HAVE_SSL void CoreNetwork::onSslErrors(const QList& sslErrors) { Server server = usedServer(); @@ -1519,8 +1552,6 @@ void CoreNetwork::onSslErrors(const QList& sslErrors) } } -#endif // HAVE_SSL - void CoreNetwork::checkTokenBucket() { if (_skipMessageRates) {