Avoid sending proxy authorization when ssl tunnel is done

F2I-Consulting · Feb 22, 2024 · e7de2a4 · e7de2a4
1 parent 7bbf5e4
commit e7de2a4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/src/etp/AbstractClientSessionCRTP.h b/src/etp/AbstractClientSessionCRTP.h
@@ -44,7 +44,9 @@ namespace ETP_NS
 				{
 					m.insert(boost::beast::http::field::sec_websocket_protocol, "etp12.energistics.org");
 					m.insert(boost::beast::http::field::authorization, etpServerAuthorization);
-					m.insert(boost::beast::http::field::proxy_authorization, proxyAuthorization);
+					if (!proxyHost.empty() && !isTls()) {
+						m.insert(boost::beast::http::field::proxy_authorization, proxyAuthorization);
+					}
 					m.insert("etp-encoding", "binary");
 					for (const auto& mapEntry : additionalHandshakeHeaderFields_) {
 						m.insert(mapEntry.first, mapEntry.second);
@@ -60,7 +62,9 @@ namespace ETP_NS
 				{
 					m.insert(boost::beast::http::field::sec_websocket_protocol, "etp12.energistics.org");
 					m.insert(boost::beast::http::field::authorization, etpServerAuthorization);
-					m.insert(boost::beast::http::field::proxy_authorization, proxyAuthorization);
+					if (!proxyHost.empty() && !isTls()) {
+						m.insert(boost::beast::http::field::proxy_authorization, proxyAuthorization);
+					}
 					m.insert("etp-encoding", "binary");
 					for (const auto& mapEntry : additionalHandshakeHeaderFields_) {
 						m.insert(mapEntry.first, mapEntry.second);

diff --git a/src/etp/ClientSession.h b/src/etp/ClientSession.h
@@ -70,6 +70,7 @@ namespace ETP_NS
 		}
 
 		virtual void on_resolve(boost::system::error_code ec, tcp::resolver::results_type results) = 0;
+		virtual bool isTls() const = 0;
 
 		void on_handshake(boost::system::error_code ec)
 		{

diff --git a/src/etp/PlainClientSession.h b/src/etp/PlainClientSession.h
@@ -37,6 +37,8 @@ namespace ETP_NS
 		// Called by the base class
 		FETPAPI_DLL_IMPORT_OR_EXPORT websocket::stream<tcp::socket>& ws() { return ws_; }
 
+		bool isTls() const final{ return false; }
+
 		void on_resolve(boost::system::error_code ec, tcp::resolver::results_type results)
 		{
 			if (ec) {

diff --git a/src/etp/ssl/HttpsClientSession.h b/src/etp/ssl/HttpsClientSession.h
@@ -92,9 +92,6 @@ namespace ETP_NS
 			if (!authorization.empty()) {
 				req_.set(http::field::authorization, authorization);
 			}
-			if (!proxyAuthorization.empty()) {
-				req_.set(http::field::proxy_authorization, proxyAuthorization);
-			}
 
 			if (!proxyHost.empty()) {
 				proxyHandshake.version(version);

diff --git a/src/etp/ssl/SslClientSession.h b/src/etp/ssl/SslClientSession.h
@@ -58,6 +58,8 @@ namespace ETP_NS
 		// Called by the base class
 		FETPAPI_DLL_IMPORT_OR_EXPORT websocket::stream<boost::beast::ssl_stream<tcp::socket>>& ws() { return ws_; }
 
+		bool isTls() const final { return true; }
+
 		void on_resolve(boost::system::error_code ec, tcp::resolver::results_type results)
 		{
 			if (ec) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,6 +70,7 @@ namespace ETP_NS @@
     		}
     		virtual void on_resolve(boost::system::error_code ec, tcp::resolver::results_type results) = 0;
+    		virtual bool isTls() const = 0;
     		void on_handshake(boost::system::error_code ec)
     		{
@@ Expand Down @@