mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

use internal proxy instead of external. tidy up for pull request.

Browse source
This commit is contained in:
danda 2016-07-25 18:47:46 -07:00
parent 909bf4cab1
commit 0a439c9b3d
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
network/src/main/java/io/bitsquare/http/HttpClient.java
View file

@ -42,8 +42,7 @@ public class HttpClient {
} }
public String requestWithGET(String param) throws IOException, HttpException { public String requestWithGET(String param) throws IOException, HttpException {
return requestWithGETProxy(param); return proxy != null ? requestWithGETProxy(param) : requestWithGETNoProxy(param);
// return proxy != null ? requestWithGETProxy(param) : requestWithGETNoProxy(param);
} }
/** /**
@ -76,7 +75,6 @@ public class HttpClient {
* Make an HTTP Get request routed over socks5 proxy. * Make an HTTP Get request routed over socks5 proxy.
*/ */
private String requestWithGETProxy(String param) throws IOException, HttpException { private String requestWithGETProxy(String param) throws IOException, HttpException {
// This code is adapted from: // This code is adapted from:
// http://stackoverflow.com/a/25203021/5616248 // http://stackoverflow.com/a/25203021/5616248
@ -88,22 +86,22 @@ public class HttpClient {
// Use FakeDNSResolver if not resolving DNS locally. // Use FakeDNSResolver if not resolving DNS locally.
// This prevents a local DNS lookup (which would be ignored anyway) // This prevents a local DNS lookup (which would be ignored anyway)
PoolingHttpClientConnectionManager cm = proxy.resolveAddrLocally() ? PoolingHttpClientConnectionManager cm = proxy != null && proxy.resolveAddrLocally() ?
new PoolingHttpClientConnectionManager(reg) : new PoolingHttpClientConnectionManager(reg) :
new PoolingHttpClientConnectionManager(reg, new FakeDnsResolver()); new PoolingHttpClientConnectionManager(reg, new FakeDnsResolver());
CloseableHttpClient httpclient = HttpClients.custom().setConnectionManager(cm).build(); CloseableHttpClient httpclient = HttpClients.custom().setConnectionManager(cm).build();
try { try {
// InetSocketAddress socksaddr = new InetSocketAddress(proxy.getInetAddress(), proxy.getPort()); InetSocketAddress socksaddr = new InetSocketAddress(proxy.getInetAddress(), proxy.getPort());
// remove me: Use this to test with system-wide Tor proxy. // remove me: Use this to test with system-wide Tor proxy, or change port for another proxy.
InetSocketAddress socksaddr = new InetSocketAddress("127.0.0.1", 9050); // InetSocketAddress socksaddr = new InetSocketAddress("127.0.0.1", 9050);
HttpClientContext context = HttpClientContext.create(); HttpClientContext context = HttpClientContext.create();
context.setAttribute("socks.address", socksaddr); context.setAttribute("socks.address", socksaddr);
HttpGet request = new HttpGet(baseUrl + param); HttpGet request = new HttpGet(baseUrl + param);
log.error( "Executing request " + request + " proxy: " + socksaddr); log.info( "Executing request " + request + " proxy: " + socksaddr);
CloseableHttpResponse response = httpclient.execute(request, context); CloseableHttpResponse response = httpclient.execute(request, context);
try { try {
InputStream stream = response.getEntity().getContent(); InputStream stream = response.getEntity().getContent();

2
network/src/main/java/io/bitsquare/http/SocksSSLConnectionSocketFactory.java
View file

@ -20,7 +20,7 @@ class SocksSSLConnectionSocketFactory extends SSLConnectionSocketFactory {
// Only allow connection's to site's with valid certs. // Only allow connection's to site's with valid certs.
super(sslContext, STRICT_HOSTNAME_VERIFIER); super(sslContext, STRICT_HOSTNAME_VERIFIER);
// Or to allow insecure (eg self-signed certs) // Or to allow "insecure" (eg self-signed certs)
// super(sslContext, ALLOW_ALL_HOSTNAME_VERIFIER); // super(sslContext, ALLOW_ALL_HOSTNAME_VERIFIER);
} }