eUgEntOptIc44/MarginaliaSearch
1
1
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-10-05 21:22:39 +02:00
Code Issues Activity

Implement proper SOCKS proxy support for HTTP Components v5

Browse Source 
- Replace placeholder implementation with working SocketConfig.setSocksProxyAddress()
- Remove complex ConnectionSocketFactory code that wasn't compatible with v5
- Simplify SocksProxyHttpClientFactory to use correct v5 API
- Fix Timeout vs TimeValue compilation error
- SOCKS proxy configuration now fully functional

Resolves the incomplete implementation and enables proper proxy routing.
This commit is contained in:
John Von Essen
2025-09-07 21:49:21 +00:00
parent 2ee0b0e420
commit b8000721bd
1 changed files with 16 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
code/common/config/java/nu/marginalia/proxy/SocksProxyHttpClientFactory.java
View File

@@ -1,27 +1,12 @@
package nu.marginalia.proxy;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.config.Registry;
import org.apache.hc.core5.http.config.RegistryBuilder;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.pool.ConnPoolControl;
import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.util.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.Socket;
import java.net.SocketAddress;
/**
* Utility class for configuring HTTP clients with SOCKS proxy support.
@@ -29,94 +14,28 @@ import java.net.SocketAddress;
public class SocksProxyHttpClientFactory {
private static final Logger logger = LoggerFactory.getLogger(SocksProxyHttpClientFactory.class);
/**
* Creates a SOCKS proxy socket factory for the given proxy configuration.
*/
public static ConnectionSocketFactory createSocksSocketFactory(SocksProxyConfiguration.SocksProxy proxy) {
return new ConnectionSocketFactory() {
@Override
public Socket createSocket(HttpContext context) throws IOException {
Socket socket = new Socket(new Proxy(Proxy.Type.SOCKS,
new InetSocketAddress(proxy.getHost(), proxy.getPort())));
// Set socket timeouts
socket.setSoTimeout(30000); // 30 seconds
return socket;
}
@Override
public Socket connectSocket(TimeValue connectTimeout, Socket socket, HttpHost host,
InetSocketAddress remoteAddress, InetSocketAddress localAddress,
HttpContext context) throws IOException {
if (socket == null) {
socket = createSocket(context);
}
if (localAddress != null) {
socket.bind(localAddress);
}
int timeoutMs = connectTimeout != null ? (int) connectTimeout.toMilliseconds() : 30000;
socket.connect(remoteAddress, timeoutMs);
return socket;
}
};
}
/**
* Creates a SOCKS proxy SSL socket factory for the given proxy configuration.
*/
public static SSLConnectionSocketFactory createSocksSslSocketFactory(SocksProxyConfiguration.SocksProxy proxy) {
try {
return new SSLConnectionSocketFactory(SSLContext.getDefault()) {
@Override
public Socket createSocket(HttpContext context) throws IOException {
Socket socket = new Socket(new Proxy(Proxy.Type.SOCKS,
new InetSocketAddress(proxy.getHost(), proxy.getPort())));
// Set socket timeouts
socket.setSoTimeout(30000); // 30 seconds
return socket;
}
@Override
public Socket connectSocket(TimeValue connectTimeout, Socket socket, HttpHost host,
InetSocketAddress remoteAddress, InetSocketAddress localAddress,
HttpContext context) throws IOException {
if (socket == null) {
socket = createSocket(context);
}
if (localAddress != null) {
socket.bind(localAddress);
}
int timeoutMs = connectTimeout != null ? (int) connectTimeout.toMilliseconds() : 30000;
socket.connect(remoteAddress, timeoutMs);
return socket;
}
};
} catch (Exception e) {
logger.error("Failed to create SOCKS SSL socket factory", e);
throw new RuntimeException(e);
}
}
/**
* Configures a connection manager builder with SOCKS proxy support.
* If no proxy is provided, uses default socket factories.
* If no proxy is provided, uses default socket configuration.
*/
public static void configureConnectionManager(PoolingHttpClientConnectionManagerBuilder builder,
SocksProxyConfiguration.SocksProxy proxy) {
if (proxy != null) {
logger.debug("Configuring HTTP client with SOCKS proxy: {}", proxy);
// For HTTP Components v5, SOCKS proxy support needs to be configured differently
// This is a placeholder implementation - the actual SOCKS proxy configuration
// would need to be handled at the JVM level or through system properties
logger.warn("SOCKS proxy configuration not fully implemented for HTTP Components v5");
// Create SOCKS proxy address
InetSocketAddress socksProxyAddress = new InetSocketAddress(proxy.getHost(), proxy.getPort());
// Configure socket config with SOCKS proxy
SocketConfig socketConfig = SocketConfig.custom()
.setSocksProxyAddress(socksProxyAddress)
.setSoTimeout(Timeout.ofSeconds(30))
.build();
// Apply the socket configuration to the connection manager
builder.setDefaultSocketConfig(socketConfig);
logger.info("SOCKS proxy configured: {}:{}", proxy.getHost(), proxy.getPort());
} else {
logger.debug("Configuring HTTP client without proxy");
}