mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Extract method getSocks5Proxy

Browse Source
This commit is contained in:
chimp1984 2020-12-13 14:52:06 -05:00
parent 77f46a0a5e
commit 3a2e4f1d69
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
p2p/src/main/java/bisq/network/http/HttpClientImpl.java
View File

@ -104,14 +104,7 @@ public class HttpClientImpl implements HttpClient {
@Nullable String headerValue) throws IOException { @Nullable String headerValue) throws IOException {
checkNotNull(baseUrl, "baseUrl must be set before calling requestWithGET"); checkNotNull(baseUrl, "baseUrl must be set before calling requestWithGET");
Socks5Proxy socks5Proxy = null; Socks5Proxy socks5Proxy = getSocks5Proxy(socks5ProxyProvider);
if (socks5ProxyProvider != null) {
// We use the custom socks5ProxyHttp. If not set we request socks5ProxyProvider.getSocks5ProxyBtc()
// which delivers the btc proxy if set, otherwise the internal proxy.
socks5Proxy = socks5ProxyProvider.getSocks5ProxyHttp();
if (socks5Proxy == null)
socks5Proxy = socks5ProxyProvider.getSocks5Proxy();
}
if (ignoreSocks5Proxy || socks5Proxy == null || baseUrl.contains("localhost")) { if (ignoreSocks5Proxy || socks5Proxy == null || baseUrl.contains("localhost")) {
log.debug("Use clear net for HttpClient. socks5Proxy={}, ignoreSocks5Proxy={}, baseUrl={}", log.debug("Use clear net for HttpClient. socks5Proxy={}, ignoreSocks5Proxy={}, baseUrl={}",
socks5Proxy, ignoreSocks5Proxy, baseUrl); socks5Proxy, ignoreSocks5Proxy, baseUrl);
@ -122,6 +115,18 @@ public class HttpClientImpl implements HttpClient {
} }
} }
private Socks5Proxy getSocks5Proxy(Socks5ProxyProvider socks5ProxyProvider) {
Socks5Proxy socks5Proxy = null;
if (socks5ProxyProvider != null) {
// We use the custom socks5ProxyHttp. If not set we request socks5ProxyProvider.getSocks5ProxyBtc()
// which delivers the btc proxy if set, otherwise the internal proxy.
socks5Proxy = socks5ProxyProvider.getSocks5ProxyHttp();
if (socks5Proxy == null)
socks5Proxy = socks5ProxyProvider.getSocks5Proxy();
}
return socks5Proxy;
}
/** /**
* Make an HTTP Get request directly (not routed over socks5 proxy). * Make an HTTP Get request directly (not routed over socks5 proxy).
*/ */