diff options
Diffstat (limited to 'src/network')
39 files changed, 303 insertions, 174 deletions
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index 66dd3f9371..cda800ce35 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -317,7 +317,7 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port) socket = nullptr; } socket = new QTcpSocket(this); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the socket socket->setProperty("_q_networksession", property("_q_networksession")); #endif @@ -333,7 +333,7 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port) int QFtpDTP::setupListener(const QHostAddress &address) { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the socket listener.setProperty("_q_networksession", property("_q_networksession")); #endif @@ -817,7 +817,7 @@ QFtpPI::QFtpPI(QObject *parent) : void QFtpPI::connectToHost(const QString &host, quint16 port) { emit connectState(QFtp::HostLookup); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the socket & DTP commandSocket.setProperty("_q_networksession", property("_q_networksession")); dtp.setProperty("_q_networksession", property("_q_networksession")); @@ -2287,7 +2287,7 @@ void QFtpPrivate::_q_startNextCommand() c->rawCmds.clear(); _q_piFinished(QLatin1String("Proxy set to ") + proxyHost + QLatin1Char(':') + QString::number(proxyPort)); } else if (c->command == QFtp::ConnectToHost) { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the PI pi.setProperty("_q_networksession", q->property("_q_networksession")); #endif diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 04f63e8735..b64e4fde86 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -132,7 +132,7 @@ void QHttpNetworkConnectionPrivate::init() for (int i = 0; i < channelCount; i++) { channels[i].setConnection(this->q_func()); channels[i].ssl = encrypt; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //push session down to channels channels[i].networkSession = networkSession; #endif @@ -1267,7 +1267,7 @@ void QHttpNetworkConnectionPrivate::startNetworkLayerStateLookup() channels[1].networkLayerPreference = QAbstractSocket::IPv6Protocol; int timeout = 300; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section if (networkSession) { const QNetworkConfiguration::BearerType bearerType = networkSession->configuration().bearerType(); if (bearerType == QNetworkConfiguration::Bearer2G) @@ -1309,7 +1309,7 @@ void QHttpNetworkConnectionPrivate::_q_connectDelayedChannel() channels[1].ensureConnection(); } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QHttpNetworkConnection::QHttpNetworkConnection(const QString &hostName, quint16 port, bool encrypt, QHttpNetworkConnection::ConnectionType connectionType, QObject *parent, QSharedPointer<QNetworkSession> networkSession) diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index fee84bb6c0..cfce3ecc00 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -100,7 +100,7 @@ public: ConnectionTypeHTTP2Direct }; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section explicit QHttpNetworkConnection(const QString &hostName, quint16 port = 80, bool encrypt = false, ConnectionType connectionType = ConnectionTypeHTTP, QObject *parent = nullptr, QSharedPointer<QNetworkSession> networkSession @@ -290,7 +290,7 @@ public: QSharedPointer<QSslContext> sslContext; #endif -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> networkSession; #endif diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 98809e460b..a3c8172a70 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -56,7 +56,7 @@ # include <QtNetwork/qsslcipher.h> #endif -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section #include "private/qnetworksession_p.h" #endif @@ -123,7 +123,7 @@ void QHttpNetworkConnectionChannel::init() #else socket = new QTcpSocket; #endif -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //push session down to socket if (networkSession) socket->setProperty("_q_networksession", QVariant::fromValue(networkSession)); diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 44ad2d7959..c73c4c3bd5 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -136,7 +136,7 @@ public: #endif // to emit the signal for all in-flight replies: void emitFinishedWithError(QNetworkReply::NetworkError error, const char *message); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> networkSession; #endif diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 6322c773ac..5a0940aa24 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -185,7 +185,7 @@ public: QNetworkAccessCachedHttpConnection(const QString &hostName, quint16 port, bool encrypt, QHttpNetworkConnection::ConnectionType connectionType) : QHttpNetworkConnection(hostName, port, encrypt, connectionType) -#else +#else // ### Qt6: Remove section QNetworkAccessCachedHttpConnection(const QString &hostName, quint16 port, bool encrypt, QHttpNetworkConnection::ConnectionType connectionType, QSharedPointer<QNetworkSession> networkSession) @@ -337,7 +337,7 @@ void QHttpThreadDelegate::startRequest() #ifdef QT_NO_BEARERMANAGEMENT httpConnection = new QNetworkAccessCachedHttpConnection(urlCopy.host(), urlCopy.port(), ssl, connectionType); -#else +#else // ### Qt6: Remove section httpConnection = new QNetworkAccessCachedHttpConnection(urlCopy.host(), urlCopy.port(), ssl, connectionType, networkSession); diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h index 208b2cb149..8a197b0b98 100644 --- a/src/network/access/qhttpthreaddelegate_p.h +++ b/src/network/access/qhttpthreaddelegate_p.h @@ -118,7 +118,7 @@ public: QNetworkReply::NetworkError incomingErrorCode; QString incomingErrorDetail; QHttp2Configuration http2Parameters; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> networkSession; #endif diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index 8f42f3690b..9d7e7200fa 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -371,7 +371,7 @@ void QNetworkAccessBackend::sslErrors(const QList<QSslError> &errors) */ bool QNetworkAccessBackend::start() { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section // For bearer, check if session start is required QSharedPointer<QNetworkSession> networkSession(manager->getNetworkSession()); if (networkSession) { diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp index fb8cd79c12..7b09608499 100644 --- a/src/network/access/qnetworkaccessftpbackend.cpp +++ b/src/network/access/qnetworkaccessftpbackend.cpp @@ -161,7 +161,7 @@ void QNetworkAccessFtpBackend::open() if (!objectCache->requestEntry(cacheKey, this, SLOT(ftpConnectionReady(QNetworkAccessCache::CacheableObject*)))) { ftp = new QNetworkAccessCachedFtpConnection; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the QFtp ftp->setProperty("_q_networksession", property("_q_networksession")); #endif diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index c80600d1b7..38807d3cda 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -311,6 +311,7 @@ static void ensureInitialized() /*! \fn void QNetworkAccessManager::networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility accessible) + \obsolete This signal is emitted when the value of the \l networkAccessible property changes. \a accessible is the new network accessibility. @@ -320,6 +321,7 @@ static void ensureInitialized() \fn void QNetworkAccessManager::networkSessionConnected() \since 4.7 + \obsolete \internal @@ -1008,10 +1010,11 @@ QNetworkReply *QNetworkAccessManager::deleteResource(const QNetworkRequest &requ return d_func()->postProcess(createRequest(QNetworkAccessManager::DeleteOperation, request)); } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section /*! \since 4.7 + \obsolete Sets the network configuration that will be used when creating the \l {QNetworkSession}{network session} to \a config. @@ -1049,6 +1052,7 @@ void QNetworkAccessManager::setConfiguration(const QNetworkConfiguration &config /*! \since 4.7 + \obsolete Returns the network configuration that will be used to create the \l {QNetworkSession}{network session} which will be used when processing network requests. @@ -1069,6 +1073,7 @@ QNetworkConfiguration QNetworkAccessManager::configuration() const /*! \since 4.7 + \obsolete Returns the current active network configuration. @@ -1097,6 +1102,7 @@ QNetworkConfiguration QNetworkAccessManager::activeConfiguration() const /*! \since 4.7 + \obsolete Overrides the reported network accessibility. If \a accessible is NotAccessible the reported network accessiblity will always be NotAccessible. Otherwise the reported network @@ -1109,16 +1115,20 @@ void QNetworkAccessManager::setNetworkAccessible(QNetworkAccessManager::NetworkA d->defaultAccessControl = accessible == NotAccessible ? false : true; if (d->networkAccessible != accessible) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED NetworkAccessibility previous = networkAccessible(); d->networkAccessible = accessible; NetworkAccessibility current = networkAccessible(); if (previous != current) emit networkAccessibleChanged(current); +QT_WARNING_POP } } /*! \since 4.7 + \obsolete Returns the current network accessibility. */ @@ -1482,7 +1492,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera if (!d->statusMonitor.isMonitoring() && !d->statusMonitor.start()) qWarning(lcNetMon, "failed to start network status monitoring"); } else { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section // Return a disabled network reply if network access is disabled. // Except if the scheme is empty or file:// or if the host resolves to a loopback address. if (d->networkAccessible == NotAccessible && !isLocalFile) { @@ -1556,7 +1566,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera } #endif QNetworkReplyHttpImpl *reply = new QNetworkReplyHttpImpl(this, request, op, outgoingData); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section if (!d->statusMonitor.isEnabled()) { connect(this, SIGNAL(networkSessionConnected()), reply, SLOT(_q_networkSessionConnected())); @@ -1568,7 +1578,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera // first step: create the reply QNetworkReplyImpl *reply = new QNetworkReplyImpl(this); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section // NETMONTODO: network reply impl must be augmented to use the same monitoring // capabilities as http network reply impl does. Once it does: uncomment the condition below if (!isLocalFile /*&& !d->statusMonitor.isEnabled()*/) { @@ -1759,7 +1769,7 @@ void QNetworkAccessManagerPrivate::_q_replyFinished(QNetworkReply *reply) if (reply->request().attribute(QNetworkRequest::AutoDeleteReplyOnFinishAttribute, false).toBool()) QMetaObject::invokeMethod(reply, [reply] { reply->deleteLater(); }, Qt::QueuedConnection); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section // If there are no active requests, release our reference to the network session. // It will not be destroyed immediately, but rather when the connection cache is flushed // after 2 minutes. @@ -1817,7 +1827,7 @@ QNetworkReply *QNetworkAccessManagerPrivate::postProcess(QNetworkReply *reply) q->connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SLOT(_q_replySslErrors(QList<QSslError>))); q->connect(reply, SIGNAL(preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*)), SLOT(_q_replyPreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*))); #endif -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section activeReplyCount++; #endif @@ -1987,7 +1997,7 @@ void QNetworkAccessManagerPrivate::destroyThread() } } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section void QNetworkAccessManagerPrivate::createSession(const QNetworkConfiguration &config) { Q_Q(QNetworkAccessManager); @@ -2022,10 +2032,13 @@ void QNetworkAccessManagerPrivate::createSession(const QNetworkConfiguration &co if (!networkSessionStrongRef) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED if (networkAccessible == QNetworkAccessManager::NotAccessible || !online) emit q->networkAccessibleChanged(QNetworkAccessManager::NotAccessible); else emit q->networkAccessibleChanged(QNetworkAccessManager::UnknownAccessibility); +QT_WARNING_POP return; } @@ -2072,6 +2085,8 @@ void QNetworkAccessManagerPrivate::_q_networkSessionStateChanged(QNetworkSession bool reallyOnline = false; //Do not emit the networkSessionConnected signal here, except for roaming -> connected //transition, otherwise it is emitted twice in a row when opening a connection. +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED if (state == QNetworkSession::Connected && lastSessionState != QNetworkSession::Roaming) emit q->networkSessionConnected(); lastSessionState = state; @@ -2107,6 +2122,7 @@ void QNetworkAccessManagerPrivate::_q_networkSessionStateChanged(QNetworkSession _q_networkSessionClosed(); createSession(q->configuration()); } +QT_WARNING_POP } void QNetworkAccessManagerPrivate::_q_onlineStateChanged(bool isOnline) @@ -2118,6 +2134,8 @@ void QNetworkAccessManagerPrivate::_q_onlineStateChanged(bool isOnline) return; } +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED // if the user set a config, we only care whether this one is active. // Otherwise, this QNAM is online if there is an online config. @@ -2143,6 +2161,7 @@ void QNetworkAccessManagerPrivate::_q_onlineStateChanged(bool isOnline) emit q->networkAccessibleChanged(networkAccessible); } } +QT_WARNING_POP } void QNetworkAccessManagerPrivate::_q_configurationChanged(const QNetworkConfiguration &configuration) diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index c84116fd41..cfb75f0f90 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -63,7 +63,7 @@ class QNetworkProxy; class QNetworkProxyFactory; class QSslError; class QHstsPolicy; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section class QNetworkConfiguration; #endif class QHttpMultiPart; @@ -74,7 +74,7 @@ class Q_NETWORK_EXPORT QNetworkAccessManager: public QObject { Q_OBJECT -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section Q_PROPERTY(NetworkAccessibility networkAccessible READ networkAccessible WRITE setNetworkAccessible NOTIFY networkAccessibleChanged) #endif @@ -90,7 +90,7 @@ public: UnknownOperation = 0 }; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section enum NetworkAccessibility { UnknownAccessibility = -1, NotAccessible = 0, @@ -145,13 +145,13 @@ public: QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QHttpMultiPart *multiPart); #endif -#ifndef QT_NO_BEARERMANAGEMENT - void setConfiguration(const QNetworkConfiguration &config); - QNetworkConfiguration configuration() const; - QNetworkConfiguration activeConfiguration() const; +#if !defined(QT_NO_BEARERMANAGEMENT) // ### Qt6: Remove section + QT_DEPRECATED_VERSION_5_15 void setConfiguration(const QNetworkConfiguration &config); + QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration configuration() const; + QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration activeConfiguration() const; - void setNetworkAccessible(NetworkAccessibility accessible); - NetworkAccessibility networkAccessible() const; + QT_DEPRECATED_VERSION_5_15 void setNetworkAccessible(NetworkAccessibility accessible); + QT_DEPRECATED_VERSION_5_15 NetworkAccessibility networkAccessible() const; #endif #ifndef QT_NO_SSL @@ -184,10 +184,10 @@ Q_SIGNALS: void preSharedKeyAuthenticationRequired(QNetworkReply *reply, QSslPreSharedKeyAuthenticator *authenticator); #endif -#ifndef QT_NO_BEARERMANAGEMENT - void networkSessionConnected(); +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section + QT_DEPRECATED_VERSION_5_15 void networkSessionConnected(); - void networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility accessible); + QT_DEPRECATED_VERSION_5_15 void networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility accessible); #endif protected: @@ -209,7 +209,7 @@ private: Q_DECLARE_PRIVATE(QNetworkAccessManager) Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>)) Q_PRIVATE_SLOT(d_func(), void _q_replyPreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*)) -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section Q_PRIVATE_SLOT(d_func(), void _q_networkSessionClosed()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State)) Q_PRIVATE_SLOT(d_func(), void _q_configurationChanged(const QNetworkConfiguration &)) diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h index da92cad704..7926463d56 100644 --- a/src/network/access/qnetworkaccessmanager_p.h +++ b/src/network/access/qnetworkaccessmanager_p.h @@ -62,7 +62,7 @@ #include "QtNetwork/qnetworkproxy.h" #include "QtNetwork/qnetworksession.h" #include "qnetworkaccessauthenticationmanager_p.h" -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section #include "QtNetwork/qnetworkconfigmanager.h" #endif @@ -87,7 +87,7 @@ public: #ifndef QT_NO_NETWORKPROXY proxyFactory(nullptr), #endif -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section lastSessionState(QNetworkSession::Invalid), networkConfiguration(networkConfigurationManager.defaultConfiguration()), customNetworkConfiguration(false), @@ -102,7 +102,7 @@ public: redirectPolicy(QNetworkRequest::ManualRedirectPolicy), authenticationManager(QSharedPointer<QNetworkAccessAuthenticationManager>::create()) { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section // we would need all active configurations to check for // d->networkConfigurationManager.isOnline(), which is asynchronous // and potentially expensive. We can just check the configuration here @@ -153,7 +153,7 @@ public: QStringList backendSupportedSchemes() const; void _q_onlineStateChanged(bool isOnline); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section void createSession(const QNetworkConfiguration &config); QSharedPointer<QNetworkSession> getNetworkSession() const; @@ -186,7 +186,7 @@ public: QNetworkProxyFactory *proxyFactory; #endif -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> networkSessionStrongRef; QWeakPointer<QNetworkSession> networkSessionWeakRef; QNetworkSession::State lastSessionState; @@ -231,7 +231,7 @@ public: int transferTimeout = 0; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section Q_AUTOTEST_EXPORT static const QWeakPointer<const QNetworkSession> getNetworkSession(const QNetworkAccessManager *manager); #endif Q_DECLARE_PUBLIC(QNetworkAccessManager) diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 002d9ec5d1..c7d22be8f5 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -164,7 +164,7 @@ static QHash<QByteArray, QByteArray> parseHttpOptionHeader(const QByteArray &hea } } -#if QT_CONFIG(bearermanagement) +#if QT_CONFIG(bearermanagement) // ### Qt6: Remove section static bool isSessionNeeded(const QUrl &url) { if (QNetworkStatusMonitor::isEnabled()) { @@ -798,7 +798,7 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq QHttpThreadDelegate *delegate = new QHttpThreadDelegate; // Propagate Http/2 settings: delegate->http2Parameters = request.http2Configuration(); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section if (!QNetworkStatusMonitor::isEnabled()) delegate->networkSession = managerPrivate->getNetworkSession(); #endif @@ -1206,7 +1206,7 @@ void QNetworkReplyHttpImplPrivate::followRedirect() if (managerPrivate->thread) managerPrivate->thread->disconnect(); -#if QT_CONFIG(bearermanagement) +#if QT_CONFIG(bearermanagement) // ### Qt6: Remove section // If the original request didn't need a session (i.e. it was to localhost) // then we might not have a session open, to which to redirect, if the // new URL is remote. When this happens, we need to open the session now: @@ -1782,13 +1782,13 @@ void QNetworkReplyHttpImplPrivate::setResumeOffset(quint64 offset) */ bool QNetworkReplyHttpImplPrivate::start(const QNetworkRequest &newHttpRequest) { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> networkSession(managerPrivate->getNetworkSession()); if (!networkSession || QNetworkStatusMonitor::isEnabled()) { #endif postRequest(newHttpRequest); return true; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section } // This is not ideal. @@ -1817,7 +1817,7 @@ bool QNetworkReplyHttpImplPrivate::start(const QNetworkRequest &newHttpRequest) #endif } -#if QT_CONFIG(bearermanagement) +#if QT_CONFIG(bearermanagement) // ### Qt6: Remove section bool QNetworkReplyHttpImplPrivate::startWaitForSession(QSharedPointer<QNetworkSession> &session) { Q_Q(QNetworkReplyHttpImpl); @@ -1853,7 +1853,7 @@ void QNetworkReplyHttpImplPrivate::_q_startOperation() state = Working; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section // Do not start background requests if they are not allowed by session policy QSharedPointer<QNetworkSession> session(manager->d_func()->getNetworkSession()); QVariant isBackground = request.attribute(QNetworkRequest::BackgroundRequestAttribute, QVariant::fromValue(false)); @@ -2049,7 +2049,7 @@ void QNetworkReplyHttpImplPrivate::setupTransferTimeout() } } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section void QNetworkReplyHttpImplPrivate::_q_networkSessionConnected() { Q_Q(QNetworkReplyHttpImpl); @@ -2185,7 +2185,7 @@ void QNetworkReplyHttpImplPrivate::finished() if (preMigrationDownloaded != Q_INT64_C(-1)) totalSize = totalSize.toLongLong() + preMigrationDownloaded; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section Q_ASSERT(managerPrivate); QSharedPointer<QNetworkSession> session = managerPrivate->getNetworkSession(); if (!QNetworkStatusMonitor::isEnabled() && session && session->state() == QNetworkSession::Roaming && diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index dec0c4c589..c4de63990b 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -66,7 +66,7 @@ #include <private/qhttpnetworkrequest_p.h> #include <private/qnetworkreply_p.h> #include <QtNetwork/QNetworkProxy> -#include <QtNetwork/QNetworkSession> +#include <QtNetwork/QNetworkSession> // ### Qt6: Remove include #ifndef QT_NO_SSL #include <QtNetwork/QSslConfiguration> @@ -102,7 +102,7 @@ public: Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingData()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingDataFinished()) Q_PRIVATE_SLOT(d_func(), void _q_transferTimedOut()) -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section Q_PRIVATE_SLOT(d_func(), void _q_networkSessionConnected()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionFailed()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State)) @@ -162,7 +162,7 @@ signals: class QNetworkReplyHttpImplPrivate: public QNetworkReplyPrivate { -#if QT_CONFIG(bearermanagement) +#if QT_CONFIG(bearermanagement) // ### Qt6: Remove section bool startWaitForSession(QSharedPointer<QNetworkSession> &session); #endif @@ -186,7 +186,7 @@ public: void _q_transferTimedOut(); void setupTransferTimeout(); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section void _q_networkSessionConnected(); void _q_networkSessionFailed(); void _q_networkSessionStateChanged(QNetworkSession::State); diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index a43a29a239..51bb386186 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -45,7 +45,7 @@ #include "QtCore/qcoreapplication.h" #include "QtCore/qdatetime.h" #include "QtNetwork/qsslconfiguration.h" -#include "QtNetwork/qnetworksession.h" +#include "QtNetwork/qnetworksession.h" // ### Qt6: Remove include #include "qnetworkaccessmanager_p.h" #include <QtCore/QCoreApplication> @@ -88,7 +88,7 @@ void QNetworkReplyImplPrivate::_q_startOperation() return; } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section Q_Q(QNetworkReplyImpl); // Do not start background requests if they are not allowed by session policy QSharedPointer<QNetworkSession> session(manager->d_func()->getNetworkSession()); @@ -102,7 +102,7 @@ void QNetworkReplyImplPrivate::_q_startOperation() #endif if (!backend->start()) { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section // backend failed to start because the session state is not Connected. // QNetworkAccessManager will call _q_startOperation again for us when the session // state changes. @@ -132,7 +132,7 @@ void QNetworkReplyImplPrivate::_q_startOperation() #endif return; } else { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section if (session) { QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)), q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection); @@ -140,7 +140,7 @@ void QNetworkReplyImplPrivate::_q_startOperation() #endif } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section if (session) { //get notification of policy changes. QObject::connect(session.data(), SIGNAL(usagePoliciesChanged(QNetworkSession::UsagePolicies)), @@ -287,7 +287,7 @@ void QNetworkReplyImplPrivate::_q_bufferOutgoingData() } } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section void QNetworkReplyImplPrivate::_q_networkSessionConnected() { Q_Q(QNetworkReplyImpl); @@ -787,7 +787,7 @@ void QNetworkReplyImplPrivate::finished() totalSize = totalSize.toLongLong() + preMigrationDownloaded; if (!manager.isNull()) { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> session (manager->d_func()->getNetworkSession()); if (session && session->state() == QNetworkSession::Roaming && state == Working && errorCode != QNetworkReply::OperationCanceledError) { diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index 8cec79541a..f98f773775 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -62,7 +62,7 @@ #include "private/qringbuffer_p.h" #include "private/qbytedata_p.h" #include <QSharedPointer> -#include <QtNetwork/QNetworkSession> +#include <QtNetwork/QNetworkSession> // ### Qt6: Remove include QT_BEGIN_NAMESPACE @@ -92,7 +92,7 @@ public: Q_PRIVATE_SLOT(d_func(), void _q_copyReadChannelFinished()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingData()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingDataFinished()) -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section Q_PRIVATE_SLOT(d_func(), void _q_networkSessionConnected()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionFailed()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State)) @@ -124,7 +124,7 @@ public: void _q_copyReadChannelFinished(); void _q_bufferOutgoingData(); void _q_bufferOutgoingDataFinished(); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section void _q_networkSessionConnected(); void _q_networkSessionFailed(); void _q_networkSessionStateChanged(QNetworkSession::State); diff --git a/src/network/doc/snippets/network/tcpwait.cpp b/src/network/doc/snippets/network/tcpwait.cpp index 97856e157f..d57305930c 100644 --- a/src/network/doc/snippets/network/tcpwait.cpp +++ b/src/network/doc/snippets/network/tcpwait.cpp @@ -51,8 +51,6 @@ #include <QtGui> #include <QTcpSocket> -#include "server.h" - int main(int argv, char **args) { QCoreApplication app(argv, args); diff --git a/src/network/doc/snippets/snippets.pro b/src/network/doc/snippets/snippets.pro new file mode 100644 index 0000000000..39153e0c8e --- /dev/null +++ b/src/network/doc/snippets/snippets.pro @@ -0,0 +1,7 @@ +TEMPLATE = app + +TARGET = network_cppsnippets + +QT += network + +SOURCES += network/tcpwait.cpp diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 90c8b75a86..3cabdd0bd5 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -241,7 +241,7 @@ #include "qstringlist.h" #include "qurl.h" -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section #include <QtNetwork/QNetworkConfiguration> #endif @@ -984,11 +984,6 @@ template<> void QSharedDataPointer<QNetworkProxyQueryPrivate>::detach() like choosing an caching HTTP proxy for HTTP-based connections, but a more powerful SOCKSv5 proxy for all others. - The network configuration specifies which configuration to use, - when bearer management is used. For example on a mobile phone - the proxy settings are likely to be different for the cellular - network vs WLAN. - Some of the criteria may not make sense in all of the types of query. The following table lists the criteria that are most commonly used, according to the type of query. diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index b8957ce818..3d88c0337d 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -464,7 +464,10 @@ #include "qabstractsocket_p.h" #include "private/qhostinfo_p.h" +#if QT_CONFIG(bearermanagement) // ### Qt6: Remove section #include "private/qnetworksession_p.h" +#endif +#include "private/qnetworkconfiguration_p.h" // ### Qt6: Remove include #include <qabstracteventdispatcher.h> #include <qhostaddress.h> @@ -643,7 +646,7 @@ bool QAbstractSocketPrivate::initSocketLayer(QAbstractSocket::NetworkLayerProtoc QAbstractSocket::tr("Operation on socket is not supported")); return false; } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the socket engine (if it has been set) socketEngine->setProperty("_q_networksession", q->property("_q_networksession")); #endif @@ -1146,7 +1149,7 @@ void QAbstractSocketPrivate::_q_connectToNextAddress() Qt::DirectConnection); } int connectTimeout = QNetworkConfigurationPrivate::DefaultTimeout; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> networkSession = qvariant_cast< QSharedPointer<QNetworkSession> >(q->property("_q_networksession")); if (networkSession) { QNetworkConfiguration networkConfiguration = networkSession->configuration(); @@ -1941,7 +1944,7 @@ bool QAbstractSocket::setSocketDescriptor(qintptr socketDescriptor, SocketState d->setError(UnsupportedSocketOperationError, tr("Operation on socket is not supported")); return false; } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the socket engine (if it has been set) d->socketEngine->setProperty("_q_networksession", property("_q_networksession")); #endif @@ -2134,7 +2137,7 @@ bool QAbstractSocket::waitForConnected(int msecs) QElapsedTimer stopWatch; stopWatch.start(); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> networkSession = qvariant_cast< QSharedPointer<QNetworkSession> >(property("_q_networksession")); #endif @@ -2157,7 +2160,7 @@ bool QAbstractSocket::waitForConnected(int msecs) return false; // connect not im progress anymore! int connectTimeout = QNetworkConfigurationPrivate::DefaultTimeout; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section if (networkSession) { QNetworkConfiguration networkConfiguration = networkSession->configuration(); connectTimeout = networkConfiguration.connectTimeout(); diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 98f850ba1b..b80bdec992 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -72,7 +72,7 @@ bool QHttpSocketEngine::initialize(QAbstractSocket::SocketType type, QAbstractSo setSocketType(type); d->socket = new QTcpSocket(this); d->reply = new QHttpNetworkReply(QUrl(), this); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section d->socket->setProperty("_q_networkSession", property("_q_networkSession")); #endif diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp index d517f91aad..38e47d6e26 100644 --- a/src/network/socket/qlocalsocket.cpp +++ b/src/network/socket/qlocalsocket.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE The socket is opened in the given \a openMode and first enters ConnectingState. If a connection is established, QLocalSocket enters ConnectedState and emits connected(). - After calling this function, the socket can emit error() to signal that an error occurred. + After calling this function, the socket can emit errorOccurred() to signal that an error occurred. \sa state(), serverName(), waitForConnected() */ @@ -87,7 +87,7 @@ QT_BEGIN_NAMESPACE Note that unlike in most other QIODevice subclasses, open() may not open the device directly. The function return false if the socket was already connected or if the server to connect - to was not defined and true in any other case. The connected() or error() signals will be + to was not defined and true in any other case. The connected() or errorOccurred() signals will be emitted once the device is actualy open (or the connection failed). See connectToServer() for more details. @@ -220,25 +220,11 @@ QT_BEGIN_NAMESPACE /*! \fn QLocalSocket::LocalSocketError QLocalSocket::error() const - \deprecated - - Use socketError() instead. - - Returns the type of error that last occurred. - - \sa state(), errorString(), socketError() -*/ - -/*! - \fn QLocalSocket::LocalSocketError QLocalSocket::socketError() const - \since 5.15 - Returns the type of error that last occurred. \sa state(), errorString() */ - /*! \fn bool QLocalSocket::isValid() const @@ -286,7 +272,7 @@ QT_BEGIN_NAMESPACE Waits until the socket is connected, up to \a msecs milliseconds. If the connection has been established, this function returns \c true; otherwise it returns \c false. In the case where it returns \c false, you can call - socketError() to determine the cause of the error. + error() to determine the cause of the error. The following example waits up to one second for a connection to be established: @@ -305,7 +291,7 @@ QT_BEGIN_NAMESPACE connection was successfully disconnected, this function returns \c true; otherwise it returns \c false (if the operation timed out, if an error occurred, or if this QLocalSocket is already disconnected). In the case - where it returns \c false, you can call socketError() to determine the cause of + where it returns \c false, you can call error() to determine the cause of the error. The following example waits up to one second for a connection @@ -343,6 +329,14 @@ QT_BEGIN_NAMESPACE /*! \fn void QLocalSocket::error(QLocalSocket::LocalSocketError socketError) + \obsolete + + Use errorOccurred() instead. +*/ + +/*! + \fn void QLocalSocket::errorOccurred(QLocalSocket::LocalSocketError socketError) + \since 5.15 This signal is emitted after an error occurred. The \a socketError parameter describes the type of error that occurred. @@ -351,7 +345,7 @@ QT_BEGIN_NAMESPACE connections, you will have to register it with Q_DECLARE_METATYPE() and qRegisterMetaType(). - \sa socketError(), errorString(), {Creating Custom Qt Types} + \sa error(), errorString(), {Creating Custom Qt Types} */ /*! @@ -376,6 +370,9 @@ QLocalSocket::QLocalSocket(QObject * parent) { Q_D(QLocalSocket); d->init(); + + // Support the deprecated error() signal: + connect(this, &QLocalSocket::errorOccurred, this, QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error)); } /*! @@ -403,7 +400,7 @@ bool QLocalSocket::open(OpenMode openMode) The socket is opened in the given \a openMode and first enters ConnectingState. If a connection is established, QLocalSocket enters ConnectedState and emits connected(). - After calling this function, the socket can emit error() to signal that an error occurred. + After calling this function, the socket can emit errorOccurred() to signal that an error occurred. \sa state(), serverName(), waitForConnected() */ @@ -460,7 +457,7 @@ QString QLocalSocket::fullServerName() const /*! Returns the state of the socket. - \sa socketError() + \sa error() */ QLocalSocket::LocalSocketState QLocalSocket::state() const { @@ -480,7 +477,7 @@ bool QLocalSocket::isSequential() const The LocalServerError enumeration represents the errors that can occur. The most recent error can be retrieved through a call to - \l QLocalSocket::socketError(). + \l QLocalSocket::error(). \value ConnectionRefusedError The connection was refused by the peer (or timed out). diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 9cf76d1022..ae78c86b3c 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -97,12 +97,7 @@ public: virtual bool canReadLine() const override; virtual bool open(OpenMode openMode = ReadWrite) override; virtual void close() override; - -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_X("Use socketError()") LocalSocketError error() const; -#endif // QT_DEPRECATED_SINCE(5, 15) - - LocalSocketError socketError() const; + LocalSocketError error() const; bool flush(); bool isValid() const; qint64 readBufferSize() const; @@ -122,7 +117,11 @@ public: Q_SIGNALS: void connected(); void disconnected(); +#if QT_DEPRECATED_SINCE(5,15) + QT_DEPRECATED_X("Use QLocalSocket::errorOccurred(QLocalSocket::LocalSocketError) instead") void error(QLocalSocket::LocalSocketError socketError); +#endif + void errorOccurred(QLocalSocket::LocalSocketError socketError); void stateChanged(QLocalSocket::LocalSocketState socketState); protected: diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h index d93b53be0c..e3bcd92326 100644 --- a/src/network/socket/qlocalsocket_p.h +++ b/src/network/socket/qlocalsocket_p.h @@ -125,7 +125,7 @@ public: bool ownsTcpSocket; void setSocket(QLocalUnixSocket*); QString generateErrorString(QLocalSocket::LocalSocketError, const QString &function) const; - void errorOccurred(QLocalSocket::LocalSocketError, const QString &function); + void setErrorAndEmit(QLocalSocket::LocalSocketError, const QString &function); void _q_stateChanged(QAbstractSocket::SocketState newState); void _q_error(QAbstractSocket::SocketError newError); #elif defined(Q_OS_WIN) @@ -142,7 +142,7 @@ public: qint64 skip(qint64 maxSize) override; QLocalUnixSocket unixSocket; QString generateErrorString(QLocalSocket::LocalSocketError, const QString &function) const; - void errorOccurred(QLocalSocket::LocalSocketError, const QString &function); + void setErrorAndEmit(QLocalSocket::LocalSocketError, const QString &function); void _q_stateChanged(QAbstractSocket::SocketState newState); void _q_error(QAbstractSocket::SocketError newError); void _q_connectToSocket(); diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 74d3d547b9..e13bcfc0cb 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -95,7 +95,7 @@ void QLocalSocketPrivate::_q_error(QAbstractSocket::SocketError socketError) QLocalSocket::LocalSocketError error = (QLocalSocket::LocalSocketError)socketError; QString errorString = generateErrorString(error, function); q->setErrorString(errorString); - emit q->error(error); + emit q->errorOccurred(error); } void QLocalSocketPrivate::_q_stateChanged(QAbstractSocket::SocketState newState) @@ -168,7 +168,7 @@ QString QLocalSocketPrivate::generateErrorString(QLocalSocket::LocalSocketError return errorString; } -void QLocalSocketPrivate::errorOccurred(QLocalSocket::LocalSocketError error, const QString &function) +void QLocalSocketPrivate::setErrorAndEmit(QLocalSocket::LocalSocketError error, const QString &function) { Q_Q(QLocalSocket); switch (error) { @@ -206,7 +206,7 @@ void QLocalSocketPrivate::errorOccurred(QLocalSocket::LocalSocketError error, co QString errorString = generateErrorString(error, function); q->setErrorString(errorString); - emit q->error(error); + emit q->errorOccurred(error); // errors cause a disconnect tcpSocket->setSocketState(QAbstractSocket::UnconnectedState); @@ -222,7 +222,7 @@ void QLocalSocket::connectToServer(OpenMode openMode) Q_D(QLocalSocket); if (state() == ConnectedState || state() == ConnectingState) { setErrorString(tr("Trying to connect while connection is in progress")); - emit error(QLocalSocket::OperationError); + emit errorOccurred(QLocalSocket::OperationError); return; } @@ -231,8 +231,8 @@ void QLocalSocket::connectToServer(OpenMode openMode) emit stateChanged(d->state); if (d->serverName.isEmpty()) { - d->errorOccurred(ServerNotFoundError, - QLatin1String("QLocalSocket::connectToServer")); + d->setErrorAndEmit(ServerNotFoundError, + QLatin1String("QLocalSocket::connectToServer")); return; } @@ -246,8 +246,8 @@ void QLocalSocket::connectToServer(OpenMode openMode) bool ok; const quint16 port = settings.value(d->fullServerName).toUInt(&ok); if (!ok) { - d->errorOccurred(ServerNotFoundError, - QLatin1String("QLocalSocket::connectToServer")); + d->setErrorAndEmit(ServerNotFoundError, + QLatin1String("QLocalSocket::connectToServer")); return; } QIODevice::open(openMode); @@ -363,15 +363,8 @@ void QLocalSocket::disconnectFromServer() d->tcpSocket->disconnectFromHost(); } -#if QT_DEPRECATED_SINCE(5, 15) QLocalSocket::LocalSocketError QLocalSocket::error() const { - return socketError(); -} -#endif // QT_DEPRECATED_SINCE(5, 15) - -QLocalSocket::LocalSocketError QLocalSocket::socketError() const -{ Q_D(const QLocalSocket); switch (d->tcpSocket->error()) { case QAbstractSocket::ConnectionRefusedError: diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 2e2eb7dee9..e860b880d5 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -99,7 +99,7 @@ void QLocalSocketPrivate::_q_error(QAbstractSocket::SocketError socketError) QLocalSocket::LocalSocketError error = (QLocalSocket::LocalSocketError)socketError; QString errorString = generateErrorString(error, function); q->setErrorString(errorString); - emit q->error(error); + emit q->errorOccurred(error); } void QLocalSocketPrivate::_q_stateChanged(QAbstractSocket::SocketState newState) @@ -172,7 +172,7 @@ QString QLocalSocketPrivate::generateErrorString(QLocalSocket::LocalSocketError return errorString; } -void QLocalSocketPrivate::errorOccurred(QLocalSocket::LocalSocketError error, const QString &function) +void QLocalSocketPrivate::setErrorAndEmit(QLocalSocket::LocalSocketError error, const QString &function) { Q_Q(QLocalSocket); switch (error) { @@ -210,7 +210,7 @@ void QLocalSocketPrivate::errorOccurred(QLocalSocket::LocalSocketError error, co QString errorString = generateErrorString(error, function); q->setErrorString(errorString); - emit q->error(error); + emit q->errorOccurred(error); // errors cause a disconnect unixSocket.setSocketState(QAbstractSocket::UnconnectedState); @@ -227,7 +227,7 @@ void QLocalSocket::connectToServer(OpenMode openMode) if (state() == ConnectedState || state() == ConnectingState) { QString errorString = d->generateErrorString(QLocalSocket::OperationError, QLatin1String("QLocalSocket::connectToserver")); setErrorString(errorString); - emit error(QLocalSocket::OperationError); + emit errorOccurred(QLocalSocket::OperationError); return; } @@ -237,15 +237,15 @@ void QLocalSocket::connectToServer(OpenMode openMode) emit stateChanged(d->state); if (d->serverName.isEmpty()) { - d->errorOccurred(ServerNotFoundError, - QLatin1String("QLocalSocket::connectToServer")); + d->setErrorAndEmit(ServerNotFoundError, + QLatin1String("QLocalSocket::connectToServer")); return; } // create the socket if (-1 == (d->connectingSocket = qt_safe_socket(PF_UNIX, SOCK_STREAM, 0, O_NONBLOCK))) { - d->errorOccurred(UnsupportedSocketOperationError, - QLatin1String("QLocalSocket::connectToServer")); + d->setErrorAndEmit(UnsupportedSocketOperationError, + QLatin1String("QLocalSocket::connectToServer")); return; } @@ -281,7 +281,7 @@ void QLocalSocketPrivate::_q_connectToSocket() name.sun_family = PF_UNIX; if (sizeof(name.sun_path) < (uint)encodedConnectingPathName.size() + 1) { QString function = QLatin1String("QLocalSocket::connectToServer"); - errorOccurred(QLocalSocket::ServerNotFoundError, function); + setErrorAndEmit(QLocalSocket::ServerNotFoundError, function); return; } ::memcpy(name.sun_path, encodedConnectingPathName.constData(), @@ -292,17 +292,17 @@ void QLocalSocketPrivate::_q_connectToSocket() { case EINVAL: case ECONNREFUSED: - errorOccurred(QLocalSocket::ConnectionRefusedError, function); + setErrorAndEmit(QLocalSocket::ConnectionRefusedError, function); break; case ENOENT: - errorOccurred(QLocalSocket::ServerNotFoundError, function); + setErrorAndEmit(QLocalSocket::ServerNotFoundError, function); break; case EACCES: case EPERM: - errorOccurred(QLocalSocket::SocketAccessError, function); + setErrorAndEmit(QLocalSocket::SocketAccessError, function); break; case ETIMEDOUT: - errorOccurred(QLocalSocket::SocketTimeoutError, function); + setErrorAndEmit(QLocalSocket::SocketTimeoutError, function); break; case EAGAIN: // Try again later, all of the sockets listening are full @@ -320,7 +320,7 @@ void QLocalSocketPrivate::_q_connectToSocket() delayConnect->setEnabled(true); break; default: - errorOccurred(QLocalSocket::UnknownSocketError, function); + setErrorAndEmit(QLocalSocket::UnknownSocketError, function); } return; } @@ -336,7 +336,7 @@ void QLocalSocketPrivate::_q_connectToSocket() q->emit connected(); } else { QString function = QLatin1String("QLocalSocket::connectToServer"); - errorOccurred(QLocalSocket::UnknownSocketError, function); + setErrorAndEmit(QLocalSocket::UnknownSocketError, function); } connectingSocket = -1; connectingName.clear(); @@ -461,15 +461,8 @@ void QLocalSocket::disconnectFromServer() d->unixSocket.disconnectFromHost(); } -#if QT_DEPRECATED_SINCE(5, 15) QLocalSocket::LocalSocketError QLocalSocket::error() const { - return socketError(); -} -#endif // QT_DEPRECATED_SINCE(5, 15) - -QLocalSocket::LocalSocketError QLocalSocket::socketError() const -{ Q_D(const QLocalSocket); switch (d->unixSocket.socketError()) { case QAbstractSocket::ConnectionRefusedError: @@ -536,8 +529,8 @@ bool QLocalSocket::waitForConnected(int msec) const int result = qt_poll_msecs(&pfd, 1, timeout); if (result == -1) - d->errorOccurred(QLocalSocket::UnknownSocketError, - QLatin1String("QLocalSocket::waitForConnected")); + d->setErrorAndEmit(QLocalSocket::UnknownSocketError, + QLatin1String("QLocalSocket::waitForConnected")); else if (result > 0) d->_q_connectToSocket(); } while (state() == ConnectingState && !timer.hasExpired(msec)); diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 657790519b..48ffd87beb 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -91,7 +91,7 @@ void QLocalSocketPrivate::_q_winError(ulong windowsError, const QString &functio if (state == QLocalSocket::UnconnectedState && currentState != QLocalSocket::ConnectingState) emit q->disconnected(); } - emit q->error(error); + emit q->errorOccurred(error); } QLocalSocketPrivate::QLocalSocketPrivate() : QIODevicePrivate(), @@ -123,7 +123,7 @@ void QLocalSocket::connectToServer(OpenMode openMode) if (state() == ConnectedState || state() == ConnectingState) { d->error = OperationError; d->errorString = tr("Trying to connect while connection is in progress"); - emit error(QLocalSocket::OperationError); + emit errorOccurred(QLocalSocket::OperationError); return; } @@ -135,7 +135,7 @@ void QLocalSocket::connectToServer(OpenMode openMode) d->error = ServerNotFoundError; d->errorString = tr("%1: Invalid name").arg(QLatin1String("QLocalSocket::connectToServer")); d->state = UnconnectedState; - emit error(d->error); + emit errorOccurred(d->error); emit stateChanged(d->state); return; } @@ -330,15 +330,8 @@ void QLocalSocket::disconnectFromServer() } } -#if QT_DEPRECATED_SINCE(5, 15) QLocalSocket::LocalSocketError QLocalSocket::error() const { - return socketError(); -} -#endif // QT_DEPRECATED_SINCE(5, 15) - -QLocalSocket::LocalSocketError QLocalSocket::socketError() const -{ Q_D(const QLocalSocket); return d->error; } diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index b2eefa352f..eb5d181134 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -535,7 +535,7 @@ void QSocks5SocketEnginePrivate::initialize(Socks5Mode socks5Mode) udpData = new QSocks5UdpAssociateData; data = udpData; udpData->udpSocket = new QUdpSocket(q); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section udpData->udpSocket->setProperty("_q_networksession", q->property("_q_networksession")); #endif udpData->udpSocket->setProxy(QNetworkProxy::NoProxy); @@ -549,7 +549,7 @@ void QSocks5SocketEnginePrivate::initialize(Socks5Mode socks5Mode) } data->controlSocket = new QTcpSocket(q); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section data->controlSocket->setProperty("_q_networksession", q->property("_q_networksession")); #endif data->controlSocket->setProxy(QNetworkProxy::NoProxy); diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp index 9916c75e65..c23b143de3 100644 --- a/src/network/socket/qtcpserver.cpp +++ b/src/network/socket/qtcpserver.cpp @@ -314,7 +314,7 @@ bool QTcpServer::listen(const QHostAddress &address, quint16 port) d->serverSocketErrorString = tr("Operation on socket is not supported"); return false; } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the socket engine (if it has been set) d->socketEngine->setProperty("_q_networksession", property("_q_networksession")); #endif @@ -436,7 +436,7 @@ bool QTcpServer::setSocketDescriptor(qintptr socketDescriptor) d->serverSocketErrorString = tr("Operation on socket is not supported"); return false; } -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the socket engine (if it has been set) d->socketEngine->setProperty("_q_networksession", property("_q_networksession")); #endif diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index b6199a2b16..8c7437a8de 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -657,6 +657,8 @@ void QSslConfiguration::setCaCertificates(const QList<QSslCertificate> &certific } /*! + \since 5.15 + Searches all files in the \a path for certificates encoded in the specified \a format and adds them to this socket's CA certificate database. \a path must be a file or a pattern matching one or more @@ -672,7 +674,7 @@ void QSslConfiguration::setCaCertificates(const QList<QSslCertificate> &certific \sa addCaCertificate(), QSslCertificate::fromPath() */ bool QSslConfiguration::addCaCertificates(const QString &path, QSsl::EncodingFormat format, - QRegExp::PatternSyntax syntax) + QSslCertificate::PatternSyntax syntax) { QList<QSslCertificate> certs = QSslCertificate::fromPath(path, format, syntax); if (certs.isEmpty()) @@ -777,7 +779,7 @@ bool QSslConfiguration::testSslOption(QSsl::SslOption option) const knowledge of the session allows for eavesdropping on data encrypted with the session parameters. - \sa setSessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption() + \sa setSessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption(), QSslSocket::newSessionTicketReceived() */ QByteArray QSslConfiguration::sessionTicket() const { @@ -792,7 +794,7 @@ QByteArray QSslConfiguration::sessionTicket() const for this to work, and \a sessionTicket must be in ASN.1 format as returned by sessionTicket(). - \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption() + \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption(), QSslSocket::newSessionTicketReceived() */ void QSslConfiguration::setSessionTicket(const QByteArray &sessionTicket) { @@ -810,7 +812,7 @@ void QSslConfiguration::setSessionTicket(const QByteArray &sessionTicket) QSsl::SslOptionDisableSessionPersistence was not turned off, this function returns -1. - \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption() + \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption(), QSslSocket::newSessionTicketReceived() */ int QSslConfiguration::sessionTicketLifeTimeHint() const { diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index dc4587a835..5732deaaef 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -131,7 +131,7 @@ public: QList<QSslCertificate> caCertificates() const; void setCaCertificates(const QList<QSslCertificate> &certificates); bool addCaCertificates(const QString &path, QSsl::EncodingFormat format = QSsl::Pem, - QRegExp::PatternSyntax syntax = QRegExp::FixedString); + QSslCertificate::PatternSyntax syntax = QSslCertificate::FixedString); void addCaCertificate(const QSslCertificate &certificate); void addCaCertificates(const QList<QSslCertificate> &certificates); diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp index 574f48a2b5..78e37460c8 100644 --- a/src/network/ssl/qsslcontext_openssl.cpp +++ b/src/network/ssl/qsslcontext_openssl.cpp @@ -71,6 +71,10 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, } #endif // dtls +#ifdef TLS1_3_VERSION +extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); +#endif // TLS1_3_VERSION + // Defined in qsslsocket.cpp QList<QSslCipher> q_getDefaultDtlsCiphers(); @@ -169,8 +173,8 @@ SSL* QSslContext::createSsl() if (!session && !sessionASN1().isEmpty() && !sslConfiguration.testSslOption(QSsl::SslOptionDisableSessionPersistence)) { const unsigned char *data = reinterpret_cast<const unsigned char *>(m_sessionASN1.constData()); - session = q_d2i_SSL_SESSION( - nullptr, &data, m_sessionASN1.size()); // refcount is 1 already, set by function above + session = q_d2i_SSL_SESSION(nullptr, &data, m_sessionASN1.size()); + // 'session' has refcount 1 already, set by the function above } if (session) { @@ -568,7 +572,8 @@ init_context: } } - // Initialize peer verification. + // Initialize peer verification, different callbacks, TLS/DTLS verification first + // (note, all these set_some_callback do not have return value): if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, nullptr); } else { @@ -588,7 +593,17 @@ init_context: q_SSL_CTX_set_verify(sslContext->ctx, verificationMode, verificationCallback); } +#ifdef TLS1_3_VERSION + // NewSessionTicket callback: + if (mode == QSslSocket::SslClientMode && !isDtls) { + q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb); + q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT); + } + +#endif // TLS1_3_VERSION + #if QT_CONFIG(dtls) + // DTLS cookies: if (mode == QSslSocket::SslServerMode && isDtls && configuration.dtlsCookieVerificationEnabled()) { q_SSL_CTX_set_cookie_generate_cb(sslContext->ctx, dtlscallbacks::q_generate_cookie_callback); q_SSL_CTX_set_cookie_verify_cb(sslContext->ctx, dtlscallbacks::q_verify_cookie_callback); diff --git a/src/network/ssl/qsslpresharedkeyauthenticator.cpp b/src/network/ssl/qsslpresharedkeyauthenticator.cpp index 01e1501763..ed6dbb87cf 100644 --- a/src/network/ssl/qsslpresharedkeyauthenticator.cpp +++ b/src/network/ssl/qsslpresharedkeyauthenticator.cpp @@ -141,7 +141,7 @@ QSslPreSharedKeyAuthenticator &QSslPreSharedKeyAuthenticator::operator=(const QS /*! \fn QSslPreSharedKeyAuthenticator &QSslPreSharedKeyAuthenticator::operator=(QSslPreSharedKeyAuthenticator &&authenticator) - Move-assigns the the QSslPreSharedKeyAuthenticator object \a authenticator to this + Move-assigns the QSslPreSharedKeyAuthenticator object \a authenticator to this object, and returns a reference to the moved instance. */ diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 504e27a463..64c6629645 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -432,6 +432,23 @@ \sa continueInterruptedHandshake(), sslErrors(), QSslConfiguration::setHandshakeMustInterruptOnError() */ + +/*! + \fn void QSslSocket::newSessionTicketReceived() + \since 5.15 + + If TLS 1.3 protocol was negotiated during a handshake, QSslSocket + emits this signal after receiving NewSessionTicket message. Session + and session ticket's lifetime hint are updated in the socket's + configuration. The session can be used for session resumption (and + a shortened handshake) in future TLS connections. + + \note This functionality enabled only with OpenSSL backend and requires + OpenSSL v 1.1.1 or above. + + \sa QSslSocket::sslConfiguration(), QSslConfiguration::sessionTicket(), QSslConfiguration::sessionTicketLifeTimeHint() +*/ + #include "qssl_p.h" #include "qsslsocket.h" #include "qsslcipher.h" @@ -1530,7 +1547,10 @@ bool QSslSocket::addCaCertificates(const QString &path, QSsl::EncodingFormat for QRegExp::PatternSyntax syntax) { Q_D(QSslSocket); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QList<QSslCertificate> certs = QSslCertificate::fromPath(path, format, syntax); +QT_WARNING_POP if (certs.isEmpty()) return false; @@ -2502,7 +2522,10 @@ bool QSslSocketPrivate::addDefaultCaCertificates(const QString &path, QSsl::Enco QRegExp::PatternSyntax syntax) { QSslSocketPrivate::ensureInitialized(); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QList<QSslCertificate> certs = QSslCertificate::fromPath(path, format, syntax); +QT_WARNING_POP if (certs.isEmpty()) return false; @@ -2642,7 +2665,7 @@ void QSslSocketPrivate::createPlainSocket(QIODevice::OpenMode openMode) q->setPeerName(QString()); plainSocket = new QTcpSocket(q); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the plain socket (if it has been set) plainSocket->setProperty("_q_networksession", q->property("_q_networksession")); #endif diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index c12bb53334..e99c79a967 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -261,6 +261,7 @@ Q_SIGNALS: void modeChanged(QSslSocket::SslMode newMode); void encryptedBytesWritten(qint64 totalBytes); void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator); + void newSessionTicketReceived(); void alertSent(QAlertLevel level, QAlertType type, const QString &description); void alertReceived(QAlertLevel level, QAlertType type, const QString &description); void handshakeInterruptedOnError(const QSslError &error); diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 11989cd2ef..f033d3b298 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -300,6 +300,22 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, const EVP_MD *md, const unsi return 1; // need to return 1 or else "the connection setup fails." } + +int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *session) +{ + if (!ssl) { + qCWarning(lcSsl, "Invalid SSL (nullptr)"); + return 0; + } + if (!session) { + qCWarning(lcSsl, "Invalid SSL_SESSION (nullptr)"); + return 0; + } + + auto socketPrivate = static_cast<QSslSocketBackendPrivate *>(q_SSL_get_ex_data(ssl, + QSslSocketBackendPrivate::s_indexForSSLExtraData)); + return socketPrivate->handleNewSessionTicket(ssl); +} #endif // TLS1_3_VERSION #endif // !OPENSSL_NO_PSK @@ -1526,6 +1542,60 @@ void QSslSocketBackendPrivate::storePeerCertificates() } } +int QSslSocketBackendPrivate::handleNewSessionTicket(SSL *connection) +{ + // If we return 1, this means we own the session, but we don't. + // 0 would tell OpenSSL to deref (but they still have it in the + // internal cache). + Q_Q(QSslSocket); + + Q_ASSERT(connection); + + if (q->sslConfiguration().testSslOption(QSsl::SslOptionDisableSessionPersistence)) { + // We silently ignore, do nothing, remove from cache. + return 0; + } + + SSL_SESSION *currentSession = q_SSL_get_session(connection); + if (!currentSession) { + qCWarning(lcSsl, + "New session ticket callback, the session is invalid (nullptr)"); + return 0; + } + + if (q_SSL_version(connection) < 0x304) { + // We only rely on this mechanics with TLS >= 1.3 + return 0; + } + +#ifdef TLS1_3_VERSION + if (!q_SSL_SESSION_is_resumable(currentSession)) { + qCDebug(lcSsl, "New session ticket, but the session is non-resumable"); + return 0; + } +#endif // TLS1_3_VERSION + + const int sessionSize = q_i2d_SSL_SESSION(currentSession, nullptr); + if (sessionSize <= 0) { + qCWarning(lcSsl, "could not store persistent version of SSL session"); + return 0; + } + + // We have somewhat perverse naming, it's not a ticket, it's a session. + QByteArray sessionTicket(sessionSize, 0); + auto data = reinterpret_cast<unsigned char *>(sessionTicket.data()); + if (!q_i2d_SSL_SESSION(currentSession, &data)) { + qCWarning(lcSsl, "could not store persistent version of SSL session"); + return 0; + } + + configuration.sslSession = sessionTicket; + configuration.sslSessionTicketLifeTimeHint = int(q_SSL_SESSION_get_ticket_lifetime_hint(currentSession)); + + emit q->newSessionTicketReceived(); + return 0; +} + bool QSslSocketBackendPrivate::checkSslErrors() { Q_Q(QSslSocket); diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index 06af9f5974..6c1ffb7237 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -150,6 +150,7 @@ public: void continueHandshake() override; bool checkSslErrors(); void storePeerCertificates(); + int handleNewSessionTicket(SSL *context); unsigned int tlsPskClientCallback(const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len); unsigned int tlsPskServerCallback(const char *identity, unsigned char *psk, unsigned int max_psk_len); #ifdef Q_OS_WIN diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 5b0a70d495..21f37789ff 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -163,6 +163,8 @@ DEFINEFUNC(const char *, SSL_alert_desc_string_long, int value, value, return nu #ifdef TLS1_3_VERSION DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) +DEFINEFUNC2(void, SSL_CTX_sess_set_new_cb, SSL_CTX *ctx, ctx, NewSessionCallback cb, cb, return, return) +DEFINEFUNC(int, SSL_SESSION_is_resumable, const SSL_SESSION *s, s, return 0, return) #endif DEFINEFUNC3(size_t, SSL_get_client_random, SSL *a, a, unsigned char *out, out, size_t outlen, outlen, return 0, return) DEFINEFUNC3(size_t, SSL_SESSION_get_master_key, const SSL_SESSION *ses, ses, unsigned char *out, out, size_t outlen, outlen, return 0, return) @@ -849,6 +851,8 @@ bool q_resolveOpenSslSymbols() #ifdef TLS1_3_VERSION RESOLVEFUNC(SSL_CTX_set_ciphersuites) RESOLVEFUNC(SSL_set_psk_use_session_callback) + RESOLVEFUNC(SSL_CTX_sess_set_new_cb) + RESOLVEFUNC(SSL_SESSION_is_resumable) #endif // TLS 1.3 or OpenSSL > 1.1.1 RESOLVEFUNC(SSL_get_client_random) diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h index ac6aa1760f..273a4f359a 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols_p.h +++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -224,7 +224,6 @@ QT_BEGIN_NAMESPACE // To reduce the amount of the change, I'm directly copying and pasting the // content of the header here. Later, can be better sorted/split into groups, // depending on the functionality. -//#include "qsslsocket_openssl11_symbols_p.h" const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); @@ -287,6 +286,23 @@ unsigned long q_SSL_set_options(SSL *s, unsigned long op); #ifdef TLS1_3_VERSION int q_SSL_CTX_set_ciphersuites(SSL_CTX *ctx, const char *str); + +// The functions below do not really have to be ifdefed like this, but for now +// they only used in TLS 1.3 handshake (and probably future versions). +// Plus, 'is resumalbe' is OpenSSL 1.1.1-only (and again we need it for +// TLS 1.3-specific session management). + +extern "C" +{ +using NewSessionCallback = int (*)(SSL *, SSL_SESSION *); +} + +void q_SSL_CTX_sess_set_new_cb(SSL_CTX *ctx, NewSessionCallback cb); +int q_SSL_SESSION_is_resumable(const SSL_SESSION *s); + +#define q_SSL_CTX_set_session_cache_mode(ctx,m) \ + q_SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_MODE,m,NULL) + #endif #if QT_CONFIG(dtls) |