Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow IPv6 connections to Bitcoin nodes #4045

Merged
merged 1 commit into from Mar 20, 2020
Merged

Allow IPv6 connections to Bitcoin nodes #4045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions core/src/main/java/bisq/core/btc/nodes/BtcNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,32 @@ public static class BtcNode {
* @return BtcNode instance
*/
public static BtcNode fromFullAddress(String fullAddress) {
String[] parts = fullAddress.split(":");
String[] parts = fullAddress.split("]");
checkArgument(parts.length > 0);
final String host = parts[0];
String host = "";
int port = DEFAULT_PORT;
if (parts.length == 2)
port = Integer.valueOf(parts[1]);

if (parts[0].contains("[") && parts[0].contains(":")) {
// IPv6 address and optional port number
// address part delimited by square brackets e.g. [2a01:123:456:789::2]:8333
host = parts[0].replace("[", "").replace("]", "");
if (parts.length == 2)
port = Integer.parseInt(parts[1].replace(":", ""));
}
else if (parts[0].contains(":") && !parts[0].contains(".")) {
// IPv6 address only; not delimited by square brackets
host = parts[0];
}
else if (parts[0].contains(".")) {
// address and an optional port number
// e.g. 127.0.0.1:8333 or abcdef123xyz.onion:9999
parts = fullAddress.split(":");
checkArgument(parts.length > 0);
host = parts[0];
if (parts.length == 2)
port = Integer.parseInt(parts[1]);
}

checkArgument(host.length()>0, "BtcNode address format not recognised");
return host.contains(".onion") ? new BtcNode(null, host, null, port, null) : new BtcNode(null, null, host, port, null);
}

Expand Down
19 changes: 11 additions & 8 deletions p2p/src/main/java/bisq/network/DnsLookupTor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ public static InetAddress lookup(Socks5Proxy proxy, String host) throws DnsLooku

byte[] hostBytes = host.getBytes(Charsets.UTF_8);
buf = new byte[7 + hostBytes.length];
buf[0] = b('\u0005');
buf[1] = b('\u00f0');
buf[2] = b('\u0000');
buf[3] = b('\u0003');
buf[0] = b('\u0005'); // version SOCKS5
buf[1] = b('\u00f0'); // CMD_RESOLVE
buf[2] = b('\u0000'); // (reserved)
buf[3] = b('\u0003'); // SOCKS5_ATYPE_HOSTNAME
buf[4] = (byte) hostBytes.length;
System.arraycopy(hostBytes, 0, buf, 5, hostBytes.length);
buf[5 + hostBytes.length] = 0;
Expand All @@ -113,13 +113,16 @@ public static InetAddress lookup(Socks5Proxy proxy, String host) throws DnsLooku
throw new DnsLookupException(torStatusErrors.get(buf[1]) + "(host=" + host + ")");
}

if (buf[3] != b('\u0001'))
final char SOCKS5_ATYPE_IPV4 = '\u0001';
final char SOCKS5_ATYPE_IPV6 = '\u0004';
final byte atype = buf[3];
if (atype != b(SOCKS5_ATYPE_IPV4) && atype != b(SOCKS5_ATYPE_IPV6))
throw new DnsLookupException(torStatusErrors.get(b('\u0001')) + "(host=" + host + ")");

buf = new byte[4];
final int octets = (atype == SOCKS5_ATYPE_IPV4 ? 4 : 16);
buf = new byte[octets];
bytesRead = proxySocket.getInputStream().read(buf);

if (bytesRead != 4)
if (bytesRead != octets)
throw new DnsLookupException("Invalid Tor Address Response");

return InetAddress.getByAddress(buf);
Expand Down