lb/HttpConnection: add methods GetPeerSubject(), GetPeerIssuerSubject()

CM4all · Oct 29, 2024 · 27e263e · 27e263e
1 parent f26f5e2
commit 27e263e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/src/lb/ForwardHttpRequest.cxx b/src/lb/ForwardHttpRequest.cxx
@@ -12,7 +12,6 @@
 #include "Cookie.hxx"
 #include "JvmRoute.hxx"
 #include "Headers.hxx"
-#include "ssl/Filter.hxx"
 #include "cluster/AddressSticky.hxx"
 #include "address_string.hxx"
 #include "http/IncomingRequest.hxx"
@@ -359,19 +358,13 @@ LbRequest::OnFilteredSocketReady(Lease &lease,
 
 	SetForwardedTo();
 
-	const char *peer_subject = connection.ssl_filter != nullptr
-		? ssl_filter_get_peer_subject(*connection.ssl_filter)
-		: nullptr;
-	const char *peer_issuer_subject = connection.ssl_filter != nullptr
-		? ssl_filter_get_peer_issuer_subject(*connection.ssl_filter)
-		: nullptr;
-
 	auto &headers = request.headers;
 	lb_forward_request_headers(pool, headers,
 				   request.local_host_and_port,
 				   request.remote_host,
 				   connection.IsEncrypted(),
-				   peer_subject, peer_issuer_subject,
+				   connection.GetPeerSubject(),
+				   connection.GetPeerIssuerSubject(),
 				   cluster_config.mangle_via);
 
 	if (!cluster_config.http_host.empty())

diff --git a/src/lb/HttpConnection.cxx b/src/lb/HttpConnection.cxx
@@ -21,6 +21,7 @@
 #include "pool/pool.hxx"
 #include "fs/FilteredSocket.hxx"
 #include "ssl/AlpnCompare.hxx"
+#include "ssl/Filter.hxx"
 #include "uri/Verify.hxx"
 #include "lib/fmt/SocketAddressFormatter.hxx"
 #include "net/SocketProtocolError.hxx"
@@ -175,6 +176,22 @@ LbHttpConnection::LogSendError(IncomingHttpRequest &request,
 	SendError(request, ep);
 }
 
+const char *
+LbHttpConnection::GetPeerSubject() const noexcept
+{
+	return ssl_filter != nullptr
+		? ssl_filter_get_peer_subject(*ssl_filter)
+		: nullptr;
+}
+
+const char *
+LbHttpConnection::GetPeerIssuerSubject() const noexcept
+{
+	return ssl_filter != nullptr
+		? ssl_filter_get_peer_issuer_subject(*ssl_filter)
+		: nullptr;
+}
+
 void
 LbHttpConnection::RecordAbuse(double size) noexcept
 {

diff --git a/src/lb/HttpConnection.hxx b/src/lb/HttpConnection.hxx
@@ -71,6 +71,12 @@ struct LbHttpConnection final
 		return ssl_filter != nullptr;
 	}
 
+	[[gnu::pure]]
+	const char *GetPeerSubject() const noexcept;
+
+	[[gnu::pure]]
+	const char *GetPeerIssuerSubject() const noexcept;
+
 	bool IsHTTP2() const noexcept {
 #ifdef HAVE_NGHTTP2
 		return http2;

diff --git a/src/lb/ResolveConnect.cxx b/src/lb/ResolveConnect.cxx
@@ -13,7 +13,6 @@
 #include "http/Client.hxx"
 #include "http/Headers.hxx"
 #include "http/Method.hxx"
-#include "ssl/Filter.hxx"
 #include "istream/UnusedHoldPtr.hxx"
 #include "fs/Stock.hxx"
 #include "stock/GetHandler.hxx"
@@ -126,19 +125,13 @@ LbResolveConnectRequest::OnStockItemReady(StockItem &item) noexcept
 	stock_item = &item;
 	lease_state = LeaseState::BUSY;
 
-	const char *peer_subject = connection.ssl_filter != nullptr
-		? ssl_filter_get_peer_subject(*connection.ssl_filter)
-		: nullptr;
-	const char *peer_issuer_subject = connection.ssl_filter != nullptr
-		? ssl_filter_get_peer_issuer_subject(*connection.ssl_filter)
-		: nullptr;
-
 	auto &headers = request.headers;
 	lb_forward_request_headers(pool, headers,
 				   request.local_host_and_port,
 				   request.remote_host,
 				   connection.IsEncrypted(),
-				   peer_subject, peer_issuer_subject,
+				   connection.GetPeerSubject(),
+				   connection.GetPeerIssuerSubject(),
 				   false);
 
 	http_client_request(pool, nullptr,