From 0f85fdb396735f42e95e94e205e03adde6f7655e Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Fri, 19 Jun 2020 17:21:50 +0600 Subject: [PATCH 01/12] HTTPS Proxy support --- Net/include/Poco/Net/HTTPClientSession.h | 38 +++++++++++- Net/src/HTTPClientSession.cpp | 60 +++++++++++++++---- NetSSL_OpenSSL/src/HTTPSClientSession.cpp | 72 ++++++++++++++--------- 3 files changed, 129 insertions(+), 41 deletions(-) diff --git a/Net/include/Poco/Net/HTTPClientSession.h b/Net/include/Poco/Net/HTTPClientSession.h index 14ae999bb9..019282d333 100644 --- a/Net/include/Poco/Net/HTTPClientSession.h +++ b/Net/include/Poco/Net/HTTPClientSession.h @@ -20,6 +20,7 @@ #include "Poco/Net/Net.h" #include "Poco/Net/HTTPSession.h" +#include "Poco/Net/HTTPSessionFactory.h" #include "Poco/Net/HTTPBasicCredentials.h" #include "Poco/Net/HTTPDigestCredentials.h" #include "Poco/Net/HTTPNTLMCredentials.h" @@ -78,6 +79,8 @@ class Net_API HTTPClientSession: public HTTPSession { ProxyConfig(): port(HTTP_PORT), + protocol("http"), + tunnel(true), authMethod(PROXY_AUTH_HTTP_BASIC) { } @@ -86,6 +89,11 @@ class Net_API HTTPClientSession: public HTTPSession /// Proxy server host name or IP address. Poco::UInt16 port; /// Proxy server TCP port. + std::string protocol; + /// Protocol to use (http or https). + bool tunnel; + /// Use proxy as tunnel (establish 2-way communication through CONNECT request). + /// If tunnel option is 'false' request will be send directly to proxy without CONNECT request. std::string username; /// Proxy server username. std::string password; @@ -167,8 +175,8 @@ class Net_API HTTPClientSession: public HTTPSession const SocketAddress& getSourceAddress6(); /// Returns the last IPV6 source address set with setSourceAddress - void setProxy(const std::string& host, Poco::UInt16 port = HTTPSession::HTTP_PORT); - /// Sets the proxy host name and port number. + void setProxy(const std::string& host, Poco::UInt16 port = HTTPSession::HTTP_PORT, const std::string& protocol = "http", bool tunnel = true); + /// Sets the proxy host name, port number, protocol (http or https) and tunnel behaviour. void setProxyHost(const std::string& host); /// Sets the host name of the proxy server. @@ -176,12 +184,24 @@ class Net_API HTTPClientSession: public HTTPSession void setProxyPort(Poco::UInt16 port); /// Sets the port number of the proxy server. + void setProxyProtocol(const std::string& protocol); + /// Sets the proxy protocol (http or https). + + void setProxyTunnel(bool tunnel); + /// If 'true' proxy will be used as tunnel. + const std::string& getProxyHost() const; /// Returns the proxy host name. Poco::UInt16 getProxyPort() const; /// Returns the proxy port number. + const std::string& getProxyProtocol() const; + /// Returns the proxy protocol. + + bool isProxyTunnel() const; + /// Returns 'true' if proxy is configured as tunnel. + void setProxyCredentials(const std::string& username, const std::string& password); /// Sets the username and password for proxy authentication. /// Only Basic authentication is supported. @@ -363,6 +383,8 @@ class Net_API HTTPClientSession: public HTTPSession /// Calls proxyConnect() and attaches the resulting StreamSocket /// to the HTTPClientSession. + HTTPSessionFactory _proxySessionFactory; + /// Factory to create HTTPClientSession to proxy. private: using OStreamPtr = Poco::SharedPtr; using IStreamPtr = Poco::SharedPtr; @@ -422,6 +444,18 @@ inline Poco::UInt16 HTTPClientSession::getProxyPort() const } +inline const std::string& HTTPClientSession::getProxyProtocol() const +{ + return _proxyConfig.protocol; +} + + +inline bool HTTPClientSession::isProxyTunnel() const +{ + return _proxyConfig.tunnel; +} + + inline const std::string& HTTPClientSession::getProxyUsername() const { return _proxyConfig.username; diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp index 7197e26adb..b39341e9e8 100644 --- a/Net/src/HTTPClientSession.cpp +++ b/Net/src/HTTPClientSession.cpp @@ -13,6 +13,7 @@ #include "Poco/Net/HTTPClientSession.h" +#include "Poco/Net/HTTPSessionInstantiator.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPResponse.h" #include "Poco/Net/HTTPHeaderStream.h" @@ -50,6 +51,7 @@ HTTPClientSession::HTTPClientSession(): _responseReceived(false), _ntlmProxyAuthenticated(false) { + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } @@ -66,6 +68,7 @@ HTTPClientSession::HTTPClientSession(const StreamSocket& socket): _responseReceived(false), _ntlmProxyAuthenticated(false) { + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } @@ -82,6 +85,7 @@ HTTPClientSession::HTTPClientSession(const SocketAddress& address): _responseReceived(false), _ntlmProxyAuthenticated(false) { + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } @@ -98,6 +102,7 @@ HTTPClientSession::HTTPClientSession(const std::string& host, Poco::UInt16 port) _responseReceived(false), _ntlmProxyAuthenticated(false) { + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } @@ -127,11 +132,13 @@ HTTPClientSession::HTTPClientSession(const StreamSocket& socket, const ProxyConf _expectResponseBody(false), _responseReceived(false) { + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } HTTPClientSession::~HTTPClientSession() { + _proxySessionFactory.unregisterProtocol("http"); } @@ -186,14 +193,19 @@ const SocketAddress& HTTPClientSession::getSourceAddress6() } -void HTTPClientSession::setProxy(const std::string& host, Poco::UInt16 port) +void HTTPClientSession::setProxy(const std::string& host, Poco::UInt16 port, const std::string& protocol, bool tunnel) { + if (protocol != "http" && protocol != "https") + throw IllegalStateException("Protocol must be either http or https"); + if (!connected()) { _proxyConfig.host = host; _proxyConfig.port = port; + _proxyConfig.protocol = protocol; + _proxyConfig.tunnel = tunnel; } - else throw IllegalStateException("Cannot set the proxy host and port for an already connected session"); + else throw IllegalStateException("Cannot set the proxy host, port and protocol for an already connected session"); } @@ -215,6 +227,28 @@ void HTTPClientSession::setProxyPort(Poco::UInt16 port) } +void HTTPClientSession::setProxyProtocol(const std::string& protocol) +{ + if (protocol != "http" && protocol != "https") + throw IllegalStateException("Protocol must be either http or https"); + + if (!connected()) + _proxyConfig.protocol = protocol; + else + throw IllegalStateException("Cannot set the proxy port number for an already connected session"); +} + + +void HTTPClientSession::setProxyTunnel(bool tunnel) +{ + if (!connected()) + _proxyConfig.tunnel = tunnel; + else + throw IllegalStateException("Cannot set the proxy tunnel for an already connected session"); + +} + + void HTTPClientSession::setProxyCredentials(const std::string& username, const std::string& password) { _proxyConfig.username = username; @@ -583,25 +617,30 @@ void HTTPClientSession::sendChallengeRequest(const HTTPRequest& request, HTTPRes StreamSocket HTTPClientSession::proxyConnect() { - ProxyConfig emptyProxyConfig; - HTTPClientSession proxySession(getProxyHost(), getProxyPort(), emptyProxyConfig); - proxySession.setTimeout(getTimeout()); + URI proxyUri; + proxyUri.setScheme(getProxyProtocol()); + proxyUri.setHost(getProxyHost()); + proxyUri.setPort(getProxyPort()); + + SharedPtr proxySession (HTTPSessionFactory::defaultFactory().createClientSession(proxyUri)); + + proxySession->setTimeout(getTimeout()); std::string targetAddress(_host); targetAddress.append(":"); NumberFormatter::append(targetAddress, _port); HTTPRequest proxyRequest(HTTPRequest::HTTP_CONNECT, targetAddress, HTTPMessage::HTTP_1_1); HTTPResponse proxyResponse; proxyRequest.set(HTTPMessage::PROXY_CONNECTION, HTTPMessage::CONNECTION_KEEP_ALIVE); - proxyRequest.set(HTTPRequest::HOST, getHost()); + proxyRequest.set(HTTPRequest::HOST, targetAddress); proxySession.proxyAuthenticateImpl(proxyRequest, _proxyConfig); - proxySession.setKeepAlive(true); + proxySession->setKeepAlive(true); proxySession.setSourceAddress(_sourceAddress4); proxySession.setSourceAddress(_sourceAddress6); - proxySession.sendRequest(proxyRequest); - proxySession.receiveResponse(proxyResponse); + proxySession->sendRequest(proxyRequest); + proxySession->receiveResponse(proxyResponse); if (proxyResponse.getStatus() != HTTPResponse::HTTP_OK) throw HTTPException("Cannot establish proxy connection", proxyResponse.getReason()); - return proxySession.detachSocket(); + return proxySession->detachSocket(); } @@ -621,5 +660,4 @@ bool HTTPClientSession::bypassProxy() const else return false; } - } } // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp index 73cc3f61dd..bdc250bf6a 100644 --- a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp +++ b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp @@ -13,6 +13,7 @@ #include "Poco/Net/HTTPSClientSession.h" +#include "Poco/Net/HTTPSSessionInstantiator.h" #include "Poco/Net/SecureStreamSocket.h" #include "Poco/Net/SecureStreamSocketImpl.h" #include "Poco/Net/SSLManager.h" @@ -36,6 +37,7 @@ HTTPSClientSession::HTTPSClientSession(): _pContext(SSLManager::instance().defaultClientContext()) { setPort(HTTPS_PORT); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); } @@ -44,6 +46,7 @@ HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& socket): _pContext(socket.context()) { setPort(HTTPS_PORT); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); } @@ -53,6 +56,7 @@ HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& socket, Session _pSession(pSession) { setPort(HTTPS_PORT); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); } @@ -62,6 +66,7 @@ HTTPSClientSession::HTTPSClientSession(const std::string& host, Poco::UInt16 por { setHost(host); setPort(port); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); } @@ -69,6 +74,7 @@ HTTPSClientSession::HTTPSClientSession(Context::Ptr pContext): HTTPClientSession(SecureStreamSocket(pContext)), _pContext(pContext) { + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); } @@ -77,6 +83,7 @@ HTTPSClientSession::HTTPSClientSession(Context::Ptr pContext, Session::Ptr pSess _pContext(pContext), _pSession(pSession) { + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); } @@ -86,6 +93,7 @@ HTTPSClientSession::HTTPSClientSession(const std::string& host, Poco::UInt16 por { setHost(host); setPort(port); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); } @@ -96,11 +104,13 @@ HTTPSClientSession::HTTPSClientSession(const std::string& host, Poco::UInt16 por { setHost(host); setPort(port); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); } HTTPSClientSession::~HTTPSClientSession() { + _proxySessionFactory.unregisterProtocol("https"); } @@ -126,7 +136,11 @@ X509Certificate HTTPSClientSession::serverCertificate() std::string HTTPSClientSession::proxyRequestPrefix() const { - return std::string(); + std::string result("https://"); + result.append(getHost()); + result.append(":"); + NumberFormatter::append(result, getPort()); + return result; } @@ -137,33 +151,35 @@ void HTTPSClientSession::proxyAuthenticate(HTTPRequest& request) void HTTPSClientSession::connect(const SocketAddress& address) { - if (getProxyHost().empty() || bypassProxy()) - { - SecureStreamSocket sss(socket()); - if (sss.getPeerHostName().empty()) - { - sss.setPeerHostName(getHost()); - } - if (_pContext->sessionCacheEnabled()) - { - sss.useSession(_pSession); - } - HTTPSession::connect(address); - if (_pContext->sessionCacheEnabled()) - { - _pSession = sss.currentSession(); - } - } - else - { - StreamSocket proxySocket(proxyConnect()); - SecureStreamSocket secureSocket = SecureStreamSocket::attach(proxySocket, getHost(), _pContext, _pSession); - attachSocket(secureSocket); - if (_pContext->sessionCacheEnabled()) - { - _pSession = secureSocket.currentSession(); - } - } + bool useProxy = !getProxyHost().empty() && !bypassProxy(); + + if (useProxy && isProxyTunnel()) + { + StreamSocket proxySocket(proxyConnect()); + SecureStreamSocket secureSocket = SecureStreamSocket::attach(proxySocket, getHost(), _pContext, _pSession); + attachSocket(secureSocket); + if (_pContext->sessionCacheEnabled()) + { + _pSession = secureSocket.currentSession(); + } + } + else + { + SecureStreamSocket sss(socket()); + if (sss.getPeerHostName().empty()) + { + sss.setPeerHostName(useProxy ? getProxyHost() : getHost()); + } + if (_pContext->sessionCacheEnabled()) + { + sss.useSession(_pSession); + } + HTTPSession::connect(address); + if (_pContext->sessionCacheEnabled()) + { + _pSession = sss.currentSession(); + } + } } From 74acc46292184accd82a07fd1a697d3da122147f Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Sat, 9 Jul 2022 16:09:26 +0600 Subject: [PATCH 02/12] HTTPS Proxy support --- Net/src/HTTPClientSession.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp index b39341e9e8..f90d7a1946 100644 --- a/Net/src/HTTPClientSession.cpp +++ b/Net/src/HTTPClientSession.cpp @@ -622,7 +622,7 @@ StreamSocket HTTPClientSession::proxyConnect() proxyUri.setHost(getProxyHost()); proxyUri.setPort(getProxyPort()); - SharedPtr proxySession (HTTPSessionFactory::defaultFactory().createClientSession(proxyUri)); + SharedPtr proxySession (_proxySessionFactory.createClientSession(proxyUri)); proxySession->setTimeout(getTimeout()); std::string targetAddress(_host); From 350d692d7913d0b1a380677fa50fb157d3fddf38 Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Thu, 30 Jun 2022 13:13:26 +0600 Subject: [PATCH 03/12] Do not add default port for requests via proxy (fixes GCS via proxy tunnel usage) GCS server does not handle requests with port, and simply report an error: InvalidURI Couldn't parse the specified URI.
Invalid URL: storage.googleapis.com:443/...
 Removing the port fixes the issue. Note that there is port in the Host header anyway. Note, this is a problem only for proxy in a tunnel mode, since only it sends such requests, other sends requests directly via HTTP methods. --- Net/src/HTTPClientSession.cpp | 9 +++++++-- NetSSL_OpenSSL/src/HTTPSClientSession.cpp | 7 +++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp index f90d7a1946..28f0c860bc 100644 --- a/Net/src/HTTPClientSession.cpp +++ b/Net/src/HTTPClientSession.cpp @@ -510,8 +510,13 @@ std::string HTTPClientSession::proxyRequestPrefix() const { std::string result("http://"); result.append(_host); - result.append(":"); - NumberFormatter::append(result, _port); + /// Do not append default by default, since this may break some servers. + /// One example of such server is GCS (Google Cloud Storage). + if (_port != HTTPSession::HTTP_PORT) + { + result.append(":"); + NumberFormatter::append(result, _port); + } return result; } diff --git a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp index bdc250bf6a..467f9661fd 100644 --- a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp +++ b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp @@ -138,8 +138,11 @@ std::string HTTPSClientSession::proxyRequestPrefix() const { std::string result("https://"); result.append(getHost()); - result.append(":"); - NumberFormatter::append(result, getPort()); + /// Do not append default by default, since this may break some servers. + /// One example of such server is GCS (Google Cloud Storage). + if (getPort() != HTTPS_PORT) + {result.append(":"); + NumberFormatter::append(result, getPort());} return result; } From dbb7949331f0b6b7fc4f74f057b5d50e3e6e6913 Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Sat, 9 Jul 2022 16:12:57 +0600 Subject: [PATCH 04/12] Formatting --- NetSSL_OpenSSL/src/HTTPSClientSession.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp index 467f9661fd..1828afd99c 100644 --- a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp +++ b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp @@ -140,9 +140,10 @@ std::string HTTPSClientSession::proxyRequestPrefix() const result.append(getHost()); /// Do not append default by default, since this may break some servers. /// One example of such server is GCS (Google Cloud Storage). - if (getPort() != HTTPS_PORT) - {result.append(":"); - NumberFormatter::append(result, getPort());} + if (getPort() != HTTPS_PORT) { + result.append(":"); + NumberFormatter::append(result, getPort()); + } return result; } From fdcd5b84cc82e4835b2cf2d4e65200536f55e952 Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Sat, 9 Jul 2022 16:22:44 +0600 Subject: [PATCH 05/12] Formatting --- Net/include/Poco/Net/HTTPClientSession.h | 12 ++++++------ Net/src/HTTPClientSession.cpp | 12 ++++++------ NetSSL_OpenSSL/src/HTTPSClientSession.cpp | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Net/include/Poco/Net/HTTPClientSession.h b/Net/include/Poco/Net/HTTPClientSession.h index 019282d333..77e5b325dd 100644 --- a/Net/include/Poco/Net/HTTPClientSession.h +++ b/Net/include/Poco/Net/HTTPClientSession.h @@ -79,9 +79,9 @@ class Net_API HTTPClientSession: public HTTPSession { ProxyConfig(): port(HTTP_PORT), - protocol("http"), - tunnel(true), - authMethod(PROXY_AUTH_HTTP_BASIC) + protocol("http"), + tunnel(true), + authMethod(PROXY_AUTH_HTTP_BASIC) { } @@ -91,9 +91,9 @@ class Net_API HTTPClientSession: public HTTPSession /// Proxy server TCP port. std::string protocol; /// Protocol to use (http or https). - bool tunnel; - /// Use proxy as tunnel (establish 2-way communication through CONNECT request). - /// If tunnel option is 'false' request will be send directly to proxy without CONNECT request. + bool tunnel; + /// Use proxy as tunnel (establish 2-way communication through CONNECT request). + /// If tunnel option is 'false' request will be send directly to proxy without CONNECT request. std::string username; /// Proxy server username. std::string password; diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp index 28f0c860bc..bf5546689a 100644 --- a/Net/src/HTTPClientSession.cpp +++ b/Net/src/HTTPClientSession.cpp @@ -623,9 +623,9 @@ void HTTPClientSession::sendChallengeRequest(const HTTPRequest& request, HTTPRes StreamSocket HTTPClientSession::proxyConnect() { URI proxyUri; - proxyUri.setScheme(getProxyProtocol()); - proxyUri.setHost(getProxyHost()); - proxyUri.setPort(getProxyPort()); + proxyUri.setScheme(getProxyProtocol()); + proxyUri.setHost(getProxyHost()); + proxyUri.setPort(getProxyPort()); SharedPtr proxySession (_proxySessionFactory.createClientSession(proxyUri)); @@ -637,10 +637,10 @@ StreamSocket HTTPClientSession::proxyConnect() HTTPResponse proxyResponse; proxyRequest.set(HTTPMessage::PROXY_CONNECTION, HTTPMessage::CONNECTION_KEEP_ALIVE); proxyRequest.set(HTTPRequest::HOST, targetAddress); - proxySession.proxyAuthenticateImpl(proxyRequest, _proxyConfig); + proxySession->proxyAuthenticateImpl(proxyRequest, _proxyConfig); proxySession->setKeepAlive(true); - proxySession.setSourceAddress(_sourceAddress4); - proxySession.setSourceAddress(_sourceAddress6); + proxySession->setSourceAddress(_sourceAddress4); + proxySession->setSourceAddress(_sourceAddress6); proxySession->sendRequest(proxyRequest); proxySession->receiveResponse(proxyResponse); if (proxyResponse.getStatus() != HTTPResponse::HTTP_OK) diff --git a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp index 1828afd99c..26226569b0 100644 --- a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp +++ b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp @@ -46,7 +46,7 @@ HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& socket): _pContext(socket.context()) { setPort(HTTPS_PORT); - _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); } @@ -56,7 +56,7 @@ HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& socket, Session _pSession(pSession) { setPort(HTTPS_PORT); - _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); } @@ -66,7 +66,7 @@ HTTPSClientSession::HTTPSClientSession(const std::string& host, Poco::UInt16 por { setHost(host); setPort(port); - _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator); } @@ -74,7 +74,7 @@ HTTPSClientSession::HTTPSClientSession(Context::Ptr pContext): HTTPClientSession(SecureStreamSocket(pContext)), _pContext(pContext) { - _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); } @@ -83,7 +83,7 @@ HTTPSClientSession::HTTPSClientSession(Context::Ptr pContext, Session::Ptr pSess _pContext(pContext), _pSession(pSession) { - _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); } @@ -93,7 +93,7 @@ HTTPSClientSession::HTTPSClientSession(const std::string& host, Poco::UInt16 por { setHost(host); setPort(port); - _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); } @@ -104,13 +104,13 @@ HTTPSClientSession::HTTPSClientSession(const std::string& host, Poco::UInt16 por { setHost(host); setPort(port); - _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); + _proxySessionFactory.registerProtocol("https", new HTTPSSessionInstantiator(pContext)); } HTTPSClientSession::~HTTPSClientSession() { - _proxySessionFactory.unregisterProtocol("https"); + _proxySessionFactory.unregisterProtocol("https"); } From 9660a96f6aa70b9bc187b9187c1a816de075cb49 Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Mon, 18 Jul 2022 13:38:14 +0600 Subject: [PATCH 06/12] Formatting --- Net/include/Poco/Net/HTTPClientSession.h | 8 +-- Net/src/HTTPClientSession.cpp | 40 +++++++------- NetSSL_OpenSSL/src/HTTPSClientSession.cpp | 66 +++++++++++------------ 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Net/include/Poco/Net/HTTPClientSession.h b/Net/include/Poco/Net/HTTPClientSession.h index 77e5b325dd..7abb2b795b 100644 --- a/Net/include/Poco/Net/HTTPClientSession.h +++ b/Net/include/Poco/Net/HTTPClientSession.h @@ -383,8 +383,8 @@ class Net_API HTTPClientSession: public HTTPSession /// Calls proxyConnect() and attaches the resulting StreamSocket /// to the HTTPClientSession. - HTTPSessionFactory _proxySessionFactory; - /// Factory to create HTTPClientSession to proxy. + HTTPSessionFactory _proxySessionFactory; + /// Factory to create HTTPClientSession to proxy. private: using OStreamPtr = Poco::SharedPtr; using IStreamPtr = Poco::SharedPtr; @@ -446,13 +446,13 @@ inline Poco::UInt16 HTTPClientSession::getProxyPort() const inline const std::string& HTTPClientSession::getProxyProtocol() const { - return _proxyConfig.protocol; + return _proxyConfig.protocol; } inline bool HTTPClientSession::isProxyTunnel() const { - return _proxyConfig.tunnel; + return _proxyConfig.tunnel; } diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp index bf5546689a..bbc341ecb4 100644 --- a/Net/src/HTTPClientSession.cpp +++ b/Net/src/HTTPClientSession.cpp @@ -51,7 +51,7 @@ HTTPClientSession::HTTPClientSession(): _responseReceived(false), _ntlmProxyAuthenticated(false) { - _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } @@ -68,7 +68,7 @@ HTTPClientSession::HTTPClientSession(const StreamSocket& socket): _responseReceived(false), _ntlmProxyAuthenticated(false) { - _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } @@ -85,7 +85,7 @@ HTTPClientSession::HTTPClientSession(const SocketAddress& address): _responseReceived(false), _ntlmProxyAuthenticated(false) { - _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } @@ -102,7 +102,7 @@ HTTPClientSession::HTTPClientSession(const std::string& host, Poco::UInt16 port) _responseReceived(false), _ntlmProxyAuthenticated(false) { - _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } @@ -132,13 +132,13 @@ HTTPClientSession::HTTPClientSession(const StreamSocket& socket, const ProxyConf _expectResponseBody(false), _responseReceived(false) { - _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); + _proxySessionFactory.registerProtocol("http", new HTTPSessionInstantiator); } HTTPClientSession::~HTTPClientSession() { - _proxySessionFactory.unregisterProtocol("http"); + _proxySessionFactory.unregisterProtocol("http"); } @@ -195,17 +195,17 @@ const SocketAddress& HTTPClientSession::getSourceAddress6() void HTTPClientSession::setProxy(const std::string& host, Poco::UInt16 port, const std::string& protocol, bool tunnel) { - if (protocol != "http" && protocol != "https") - throw IllegalStateException("Protocol must be either http or https"); + if (protocol != "http" && protocol != "https") + throw IllegalStateException("Protocol must be either http or https"); - if (!connected()) + if (!connected()) { _proxyConfig.host = host; _proxyConfig.port = port; _proxyConfig.protocol = protocol; _proxyConfig.tunnel = tunnel; } - else throw IllegalStateException("Cannot set the proxy host, port and protocol for an already connected session"); + else throw IllegalStateException("Cannot set the proxy host, port and protocol for an already connected session"); } @@ -229,22 +229,22 @@ void HTTPClientSession::setProxyPort(Poco::UInt16 port) void HTTPClientSession::setProxyProtocol(const std::string& protocol) { - if (protocol != "http" && protocol != "https") - throw IllegalStateException("Protocol must be either http or https"); + if (protocol != "http" && protocol != "https") + throw IllegalStateException("Protocol must be either http or https"); - if (!connected()) - _proxyConfig.protocol = protocol; - else - throw IllegalStateException("Cannot set the proxy port number for an already connected session"); + if (!connected()) + _proxyConfig.protocol = protocol; + else + throw IllegalStateException("Cannot set the proxy port number for an already connected session"); } void HTTPClientSession::setProxyTunnel(bool tunnel) { - if (!connected()) - _proxyConfig.tunnel = tunnel; - else - throw IllegalStateException("Cannot set the proxy tunnel for an already connected session"); + if (!connected()) + _proxyConfig.tunnel = tunnel; + else + throw IllegalStateException("Cannot set the proxy tunnel for an already connected session"); } diff --git a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp index 26226569b0..a48b620a9e 100644 --- a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp +++ b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp @@ -136,15 +136,15 @@ X509Certificate HTTPSClientSession::serverCertificate() std::string HTTPSClientSession::proxyRequestPrefix() const { - std::string result("https://"); - result.append(getHost()); - /// Do not append default by default, since this may break some servers. - /// One example of such server is GCS (Google Cloud Storage). - if (getPort() != HTTPS_PORT) { - result.append(":"); - NumberFormatter::append(result, getPort()); - } - return result; + std::string result("https://"); + result.append(getHost()); + /// Do not append default by default, since this may break some servers. + /// One example of such server is GCS (Google Cloud Storage). + if (getPort() != HTTPS_PORT) { + result.append(":"); + NumberFormatter::append(result, getPort()); + } + return result; } @@ -155,34 +155,34 @@ void HTTPSClientSession::proxyAuthenticate(HTTPRequest& request) void HTTPSClientSession::connect(const SocketAddress& address) { - bool useProxy = !getProxyHost().empty() && !bypassProxy(); + bool useProxy = !getProxyHost().empty() && !bypassProxy(); - if (useProxy && isProxyTunnel()) - { - StreamSocket proxySocket(proxyConnect()); - SecureStreamSocket secureSocket = SecureStreamSocket::attach(proxySocket, getHost(), _pContext, _pSession); - attachSocket(secureSocket); - if (_pContext->sessionCacheEnabled()) - { - _pSession = secureSocket.currentSession(); - } - } - else - { - SecureStreamSocket sss(socket()); - if (sss.getPeerHostName().empty()) - { - sss.setPeerHostName(useProxy ? getProxyHost() : getHost()); - } - if (_pContext->sessionCacheEnabled()) + if (useProxy && isProxyTunnel()) { - sss.useSession(_pSession); + StreamSocket proxySocket(proxyConnect()); + SecureStreamSocket secureSocket = SecureStreamSocket::attach(proxySocket, getHost(), _pContext, _pSession); + attachSocket(secureSocket); + if (_pContext->sessionCacheEnabled()) + { + _pSession = secureSocket.currentSession(); + } } - HTTPSession::connect(address); - if (_pContext->sessionCacheEnabled()) + else { - _pSession = sss.currentSession(); - } + SecureStreamSocket sss(socket()); + if (sss.getPeerHostName().empty()) + { + sss.setPeerHostName(useProxy ? getProxyHost() : getHost()); + } + if (_pContext->sessionCacheEnabled()) + { + sss.useSession(_pSession); + } + HTTPSession::connect(address); + if (_pContext->sessionCacheEnabled()) + { + _pSession = sss.currentSession(); + } } } From b974e99e9dd3818e473adc5378665b52c495758b Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Mon, 18 Jul 2022 13:41:18 +0600 Subject: [PATCH 07/12] Get rid of shared_ptr --- Net/src/HTTPClientSession.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp index bbc341ecb4..95156d4f72 100644 --- a/Net/src/HTTPClientSession.cpp +++ b/Net/src/HTTPClientSession.cpp @@ -627,9 +627,9 @@ StreamSocket HTTPClientSession::proxyConnect() proxyUri.setHost(getProxyHost()); proxyUri.setPort(getProxyPort()); - SharedPtr proxySession (_proxySessionFactory.createClientSession(proxyUri)); + HTTPClientSession proxySession (_proxySessionFactory.createClientSession(proxyUri)); - proxySession->setTimeout(getTimeout()); + proxySession.setTimeout(getTimeout()); std::string targetAddress(_host); targetAddress.append(":"); NumberFormatter::append(targetAddress, _port); @@ -637,15 +637,15 @@ StreamSocket HTTPClientSession::proxyConnect() HTTPResponse proxyResponse; proxyRequest.set(HTTPMessage::PROXY_CONNECTION, HTTPMessage::CONNECTION_KEEP_ALIVE); proxyRequest.set(HTTPRequest::HOST, targetAddress); - proxySession->proxyAuthenticateImpl(proxyRequest, _proxyConfig); - proxySession->setKeepAlive(true); - proxySession->setSourceAddress(_sourceAddress4); - proxySession->setSourceAddress(_sourceAddress6); - proxySession->sendRequest(proxyRequest); - proxySession->receiveResponse(proxyResponse); + proxySession.proxyAuthenticateImpl(proxyRequest, _proxyConfig); + proxySession.setKeepAlive(true); + proxySession.setSourceAddress(_sourceAddress4); + proxySession.setSourceAddress(_sourceAddress6); + proxySession.sendRequest(proxyRequest); + proxySession.receiveResponse(proxyResponse); if (proxyResponse.getStatus() != HTTPResponse::HTTP_OK) throw HTTPException("Cannot establish proxy connection", proxyResponse.getReason()); - return proxySession->detachSocket(); + return proxySession.detachSocket(); } From 7ebb25952bc2d032513b15eae3d7433034049e77 Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Mon, 18 Jul 2022 14:13:53 +0600 Subject: [PATCH 08/12] Extract ProxyConfig to separate class --- Net/include/Poco/Net/HTTPClientSession.h | 47 +------------ Net/include/Poco/Net/HTTPSessionFactory.h | 14 ++-- .../Poco/Net/HTTPSessionInstantiator.h | 8 +-- Net/include/Poco/Net/ProxyConfig.h | 66 +++++++++++++++++++ Net/src/HTTPClientSession.cpp | 21 +++--- Net/src/HTTPSessionFactory.cpp | 4 +- Net/src/HTTPSessionInstantiator.cpp | 2 +- 7 files changed, 94 insertions(+), 68 deletions(-) create mode 100644 Net/include/Poco/Net/ProxyConfig.h diff --git a/Net/include/Poco/Net/HTTPClientSession.h b/Net/include/Poco/Net/HTTPClientSession.h index 7abb2b795b..bc1eaadf0c 100644 --- a/Net/include/Poco/Net/HTTPClientSession.h +++ b/Net/include/Poco/Net/HTTPClientSession.h @@ -24,6 +24,7 @@ #include "Poco/Net/HTTPBasicCredentials.h" #include "Poco/Net/HTTPDigestCredentials.h" #include "Poco/Net/HTTPNTLMCredentials.h" +#include "Poco/Net/ProxyConfig.h" #include "Poco/Net/SocketAddress.h" #include "Poco/SharedPtr.h" #include @@ -33,7 +34,6 @@ namespace Poco { namespace Net { - class HTTPRequest; class HTTPResponse; @@ -66,47 +66,6 @@ class Net_API HTTPClientSession: public HTTPSession /// set up a session through a proxy. { public: - enum ProxyAuthentication - { - PROXY_AUTH_NONE, /// No proxy authentication - PROXY_AUTH_HTTP_BASIC, /// HTTP Basic proxy authentication (default, if username and password are supplied) - PROXY_AUTH_HTTP_DIGEST, /// HTTP Digest proxy authentication - PROXY_AUTH_NTLM /// NTLMv2 proxy authentication - }; - - struct ProxyConfig - /// HTTP proxy server configuration. - { - ProxyConfig(): - port(HTTP_PORT), - protocol("http"), - tunnel(true), - authMethod(PROXY_AUTH_HTTP_BASIC) - { - } - - std::string host; - /// Proxy server host name or IP address. - Poco::UInt16 port; - /// Proxy server TCP port. - std::string protocol; - /// Protocol to use (http or https). - bool tunnel; - /// Use proxy as tunnel (establish 2-way communication through CONNECT request). - /// If tunnel option is 'false' request will be send directly to proxy without CONNECT request. - std::string username; - /// Proxy server username. - std::string password; - /// Proxy server password. - std::string nonProxyHosts; - /// A regular expression defining hosts for which the proxy should be bypassed, - /// e.g. "localhost|127\.0\.0\.1|192\.168\.0\.\d+". Can also be an empty - /// string to disable proxy bypassing. - - ProxyAuthentication authMethod; - /// The authentication method to use - HTTP Basic or NTLM. - }; - HTTPClientSession(); /// Creates an unconnected HTTPClientSession. @@ -468,13 +427,13 @@ inline const std::string& HTTPClientSession::getProxyPassword() const } -inline const HTTPClientSession::ProxyConfig& HTTPClientSession::getProxyConfig() const +inline const ProxyConfig& HTTPClientSession::getProxyConfig() const { return _proxyConfig; } -inline const HTTPClientSession::ProxyConfig& HTTPClientSession::getGlobalProxyConfig() +inline const ProxyConfig& HTTPClientSession::getGlobalProxyConfig() { return _globalProxyConfig; } diff --git a/Net/include/Poco/Net/HTTPSessionFactory.h b/Net/include/Poco/Net/HTTPSessionFactory.h index 58bbc7a3ff..28fc2e4828 100644 --- a/Net/include/Poco/Net/HTTPSessionFactory.h +++ b/Net/include/Poco/Net/HTTPSessionFactory.h @@ -19,7 +19,7 @@ #include "Poco/Net/Net.h" -#include "Poco/Net/HTTPClientSession.h" +#include "Poco/Net/ProxyConfig.h" #include "Poco/Mutex.h" #include "Poco/URI.h" #include "Poco/SingletonHolder.h" @@ -30,7 +30,7 @@ namespace Poco { namespace Net { - +class HTTPClientSession; class HTTPSessionInstantiator; @@ -52,7 +52,7 @@ class Net_API HTTPSessionFactory HTTPSessionFactory(const std::string& proxyHost, Poco::UInt16 proxyPort); /// Creates the HTTPSessionFactory and sets the proxy host and port. - HTTPSessionFactory(const HTTPClientSession::ProxyConfig& proxyConfig); + HTTPSessionFactory(const ProxyConfig& proxyConfig); /// Creates the HTTPSessionFactory and sets the proxy configuration. ~HTTPSessionFactory(); @@ -97,10 +97,10 @@ class Net_API HTTPSessionFactory const std::string& proxyPassword() const; /// Returns the password for proxy authorization. - void setProxyConfig(const HTTPClientSession::ProxyConfig& proxyConfig); + void setProxyConfig(const ProxyConfig& proxyConfig); /// Sets the proxy configuration. - const HTTPClientSession::ProxyConfig& getProxyConfig() const; + const ProxyConfig& getProxyConfig() const; /// Returns the proxy configuration. static HTTPSessionFactory& defaultFactory(); @@ -122,7 +122,7 @@ class Net_API HTTPSessionFactory typedef std::map Instantiators; Instantiators _instantiators; - HTTPClientSession::ProxyConfig _proxyConfig; + ProxyConfig _proxyConfig; mutable Poco::FastMutex _mutex; }; @@ -155,7 +155,7 @@ inline const std::string& HTTPSessionFactory::proxyPassword() const } -inline const HTTPClientSession::ProxyConfig& HTTPSessionFactory::getProxyConfig() const +inline const ProxyConfig& HTTPSessionFactory::getProxyConfig() const { return _proxyConfig; } diff --git a/Net/include/Poco/Net/HTTPSessionInstantiator.h b/Net/include/Poco/Net/HTTPSessionInstantiator.h index 3cfedfa91c..45b35081cd 100644 --- a/Net/include/Poco/Net/HTTPSessionInstantiator.h +++ b/Net/include/Poco/Net/HTTPSessionInstantiator.h @@ -52,14 +52,14 @@ class Net_API HTTPSessionInstantiator /// Unregisters the factory with the global HTTPSessionFactory. protected: - void setProxyConfig(const HTTPClientSession::ProxyConfig& proxyConfig); + void setProxyConfig(const ProxyConfig& proxyConfig); /// Sets the proxy configuration. - const HTTPClientSession::ProxyConfig& getProxyConfig() const; + const ProxyConfig& getProxyConfig() const; /// Returns the proxy configuration. private: - HTTPClientSession::ProxyConfig _proxyConfig; + ProxyConfig _proxyConfig; friend class HTTPSessionFactory; }; @@ -68,7 +68,7 @@ class Net_API HTTPSessionInstantiator // // inlines // -inline const HTTPClientSession::ProxyConfig& HTTPSessionInstantiator::getProxyConfig() const +inline const ProxyConfig& HTTPSessionInstantiator::getProxyConfig() const { return _proxyConfig; } diff --git a/Net/include/Poco/Net/ProxyConfig.h b/Net/include/Poco/Net/ProxyConfig.h new file mode 100644 index 0000000000..10c5186de2 --- /dev/null +++ b/Net/include/Poco/Net/ProxyConfig.h @@ -0,0 +1,66 @@ +// +// ProxyConfig.h +// +// Library: Net +// Package: HTTP +// Module: ProxyConfig +// +// Definition of the ProxyConfig class. +// +// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + +#ifndef Net_ProxyConfig_INCLUDED +#define Net_ProxyConfig_INCLUDED + +#include "Poco/Net/Net.h" +#include "Poco/Net/HTTPSession.h" +#include + +namespace Poco { +namespace Net { + enum ProxyAuthentication { + PROXY_AUTH_NONE, /// No proxy authentication + PROXY_AUTH_HTTP_BASIC, /// HTTP Basic proxy authentication (default, if username and password are supplied) + PROXY_AUTH_HTTP_DIGEST, /// HTTP Digest proxy authentication + PROXY_AUTH_NTLM /// NTLMv2 proxy authentication + }; + + struct ProxyConfig + /// HTTP proxy server configuration. + { + ProxyConfig() : + port(HTTPSession::HTTP_PORT), + protocol("http"), + tunnel(true), + authMethod(PROXY_AUTH_HTTP_BASIC) { + } + + std::string host; + /// Proxy server host name or IP address. + Poco::UInt16 port; + /// Proxy server TCP port. + std::string protocol; + /// Protocol to use (http or https). + bool tunnel; + /// Use proxy as tunnel (establish 2-way communication through CONNECT request). + /// If tunnel option is 'false' request will be send directly to proxy without CONNECT request. + std::string username; + /// Proxy server username. + std::string password; + /// Proxy server password. + std::string nonProxyHosts; + /// A regular expression defining hosts for which the proxy should be bypassed, + /// e.g. "localhost|127\.0\.0\.1|192\.168\.0\.\d+". Can also be an empty + /// string to disable proxy bypassing. + + ProxyAuthentication authMethod; + /// The authentication method to use - HTTP Basic or NTLM. + }; + +} } // namespace Poco::Net + +#endif // Net_ProxyConfig_INCLUDED diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp index 95156d4f72..0b17a8a7e9 100644 --- a/Net/src/HTTPClientSession.cpp +++ b/Net/src/HTTPClientSession.cpp @@ -13,6 +13,7 @@ #include "Poco/Net/HTTPClientSession.h" +#include "Poco/Net/HTTPSessionFactory.h" #include "Poco/Net/HTTPSessionInstantiator.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPResponse.h" @@ -36,7 +37,7 @@ namespace Poco { namespace Net { -HTTPClientSession::ProxyConfig HTTPClientSession::_globalProxyConfig; +ProxyConfig HTTPClientSession::_globalProxyConfig; HTTPClientSession::HTTPClientSession(): @@ -627,9 +628,9 @@ StreamSocket HTTPClientSession::proxyConnect() proxyUri.setHost(getProxyHost()); proxyUri.setPort(getProxyPort()); - HTTPClientSession proxySession (_proxySessionFactory.createClientSession(proxyUri)); + SharedPtr proxySession (_proxySessionFactory.createClientSession(proxyUri)); - proxySession.setTimeout(getTimeout()); + proxySession->setTimeout(getTimeout()); std::string targetAddress(_host); targetAddress.append(":"); NumberFormatter::append(targetAddress, _port); @@ -637,15 +638,15 @@ StreamSocket HTTPClientSession::proxyConnect() HTTPResponse proxyResponse; proxyRequest.set(HTTPMessage::PROXY_CONNECTION, HTTPMessage::CONNECTION_KEEP_ALIVE); proxyRequest.set(HTTPRequest::HOST, targetAddress); - proxySession.proxyAuthenticateImpl(proxyRequest, _proxyConfig); - proxySession.setKeepAlive(true); - proxySession.setSourceAddress(_sourceAddress4); - proxySession.setSourceAddress(_sourceAddress6); - proxySession.sendRequest(proxyRequest); - proxySession.receiveResponse(proxyResponse); + proxySession->proxyAuthenticateImpl(proxyRequest, _proxyConfig); + proxySession->setKeepAlive(true); + proxySession->setSourceAddress(_sourceAddress4); + proxySession->setSourceAddress(_sourceAddress6); + proxySession->sendRequest(proxyRequest); + proxySession->receiveResponse(proxyResponse); if (proxyResponse.getStatus() != HTTPResponse::HTTP_OK) throw HTTPException("Cannot establish proxy connection", proxyResponse.getReason()); - return proxySession.detachSocket(); + return proxySession->detachSocket(); } diff --git a/Net/src/HTTPSessionFactory.cpp b/Net/src/HTTPSessionFactory.cpp index 01b86666b2..352e34f554 100644 --- a/Net/src/HTTPSessionFactory.cpp +++ b/Net/src/HTTPSessionFactory.cpp @@ -39,7 +39,7 @@ HTTPSessionFactory::HTTPSessionFactory(const std::string& proxyHost, Poco::UInt1 } -HTTPSessionFactory::HTTPSessionFactory(const HTTPClientSession::ProxyConfig& proxyConfig): +HTTPSessionFactory::HTTPSessionFactory(const ProxyConfig& proxyConfig): _proxyConfig(proxyConfig) { } @@ -129,7 +129,7 @@ void HTTPSessionFactory::setProxyCredentials(const std::string& username, const } -void HTTPSessionFactory::setProxyConfig(const HTTPClientSession::ProxyConfig& proxyConfig) +void HTTPSessionFactory::setProxyConfig(const ProxyConfig& proxyConfig) { FastMutex::ScopedLock lock(_mutex); diff --git a/Net/src/HTTPSessionInstantiator.cpp b/Net/src/HTTPSessionInstantiator.cpp index e92d8a4de5..71a31a79d0 100644 --- a/Net/src/HTTPSessionInstantiator.cpp +++ b/Net/src/HTTPSessionInstantiator.cpp @@ -58,7 +58,7 @@ void HTTPSessionInstantiator::unregisterInstantiator() } -void HTTPSessionInstantiator::setProxyConfig(const HTTPClientSession::ProxyConfig& proxyConfig) +void HTTPSessionInstantiator::setProxyConfig(const ProxyConfig& proxyConfig) { _proxyConfig = proxyConfig; } From b8b63287d37e76fb1a0f6ccb5c3c5edec3f427ea Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Mon, 18 Jul 2022 14:21:19 +0600 Subject: [PATCH 09/12] Formatting --- Net/include/Poco/Net/ProxyConfig.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Net/include/Poco/Net/ProxyConfig.h b/Net/include/Poco/Net/ProxyConfig.h index 10c5186de2..b9d5f05dac 100644 --- a/Net/include/Poco/Net/ProxyConfig.h +++ b/Net/include/Poco/Net/ProxyConfig.h @@ -18,7 +18,6 @@ #include "Poco/Net/Net.h" #include "Poco/Net/HTTPSession.h" -#include namespace Poco { namespace Net { @@ -40,25 +39,25 @@ namespace Net { } std::string host; - /// Proxy server host name or IP address. + /// Proxy server host name or IP address. Poco::UInt16 port; - /// Proxy server TCP port. + /// Proxy server TCP port. std::string protocol; - /// Protocol to use (http or https). + /// Protocol to use (http or https). bool tunnel; - /// Use proxy as tunnel (establish 2-way communication through CONNECT request). - /// If tunnel option is 'false' request will be send directly to proxy without CONNECT request. + /// Use proxy as tunnel (establish 2-way communication through CONNECT request). + /// If tunnel option is 'false' request will be send directly to proxy without CONNECT request. std::string username; - /// Proxy server username. + /// Proxy server username. std::string password; - /// Proxy server password. + /// Proxy server password. std::string nonProxyHosts; - /// A regular expression defining hosts for which the proxy should be bypassed, - /// e.g. "localhost|127\.0\.0\.1|192\.168\.0\.\d+". Can also be an empty - /// string to disable proxy bypassing. + /// A regular expression defining hosts for which the proxy should be bypassed, + /// e.g. "localhost|127\.0\.0\.1|192\.168\.0\.\d+". Can also be an empty + /// string to disable proxy bypassing. ProxyAuthentication authMethod; - /// The authentication method to use - HTTP Basic or NTLM. + /// The authentication method to use - HTTP Basic or NTLM. }; } } // namespace Poco::Net From 2e60751193729523ec447f046a3b7736418a1679 Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Mon, 18 Jul 2022 14:39:57 +0600 Subject: [PATCH 10/12] Formatting --- Net/include/Poco/Net/HTTPClientSession.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Net/include/Poco/Net/HTTPClientSession.h b/Net/include/Poco/Net/HTTPClientSession.h index bc1eaadf0c..5cad1bcb46 100644 --- a/Net/include/Poco/Net/HTTPClientSession.h +++ b/Net/include/Poco/Net/HTTPClientSession.h @@ -144,7 +144,7 @@ class Net_API HTTPClientSession: public HTTPSession /// Sets the port number of the proxy server. void setProxyProtocol(const std::string& protocol); - /// Sets the proxy protocol (http or https). + /// Sets the proxy protocol (http or https). void setProxyTunnel(bool tunnel); /// If 'true' proxy will be used as tunnel. @@ -156,7 +156,7 @@ class Net_API HTTPClientSession: public HTTPSession /// Returns the proxy port number. const std::string& getProxyProtocol() const; - /// Returns the proxy protocol. + /// Returns the proxy protocol. bool isProxyTunnel() const; /// Returns 'true' if proxy is configured as tunnel. From 86e750ad475fb2162167de1248ec34791a8b6eae Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Mon, 18 Jul 2022 15:21:25 +0600 Subject: [PATCH 11/12] Test fix --- Net/testsuite/src/HTTPClientSessionTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Net/testsuite/src/HTTPClientSessionTest.cpp b/Net/testsuite/src/HTTPClientSessionTest.cpp index b7bf375e4d..69f43a8a78 100644 --- a/Net/testsuite/src/HTTPClientSessionTest.cpp +++ b/Net/testsuite/src/HTTPClientSessionTest.cpp @@ -298,7 +298,7 @@ void HTTPClientSessionTest::testProxyAuth() void HTTPClientSessionTest::testBypassProxy() { - HTTPClientSession::ProxyConfig proxyConfig; + ProxyConfig proxyConfig; proxyConfig.host = "proxy.domain.com"; proxyConfig.port = 80; proxyConfig.nonProxyHosts = "localhost|127\\.0\\.0\\.1"; From 052c542a2cf76c28f842401f3fa0a6e5d25a8425 Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Mon, 18 Jul 2022 17:52:15 +0600 Subject: [PATCH 12/12] Test fix --- Net/testsuite/src/HTTPClientSessionTest.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Net/testsuite/src/HTTPClientSessionTest.cpp b/Net/testsuite/src/HTTPClientSessionTest.cpp index 69f43a8a78..ab5279153c 100644 --- a/Net/testsuite/src/HTTPClientSessionTest.cpp +++ b/Net/testsuite/src/HTTPClientSessionTest.cpp @@ -22,6 +22,7 @@ using Poco::Net::HTTPClientSession; +using Poco::Net::ProxyConfig; using Poco::Net::HTTPRequest; using Poco::Net::HTTPResponse; using Poco::Net::HTTPMessage;