zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPnP: IPv6 part 2

Browse Source 
Add support for storing multiple location URLs in DeviceData
Add methods to prefer IPv6 for location URLs
Prefer IPv6 for POST target to WANIPv6FirewallControl service
Add method to bind local address for POST, needed for security checks when forwarding IPv6
Remove IPv6 checks from XML URL parser
Remove unused call in QueryRequest
This commit is contained in:
zzz
2021-02-28 08:08:07 -05:00
parent fa3ca565ca
commit eb535762c4
8 changed files with 146 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
router/java/src/org/cybergarage/upnp/ControlPoint.java
View File

@@ -108,6 +108,9 @@ public class ControlPoint implements HTTPRequestListener
private final static String DEFAULT_EVENTSUB_URI = "/evetSub";
// I2P
private static final boolean ALLOW_IPV6_LOCATION = true;
////////////////////////////////////////////////
// Member
////////////////////////////////////////////////
@@ -277,15 +280,20 @@ public class ControlPoint implements HTTPRequestListener
Debug.warning("Ignoring localhost device at " + location);
return;
}
if (host.startsWith("[")) {
Debug.warning("Ignoring IPv6 device at " + location);
return;
if (host.startsWith("[") && host.endsWith("]")) {
if (!ALLOW_IPV6_LOCATION) {
Debug.warning("Ignoring IPv6 device at " + location);
return;
}
// fixup for valid checks below
host = host.substring(1, host.length() - 1);
}
if (!"http".equals(locationUrl.getProtocol())) {
Debug.warning("Ignoring non-http device at " + location);
return;
}
if (!Addresses.isIPv4Address(host)) {
if (!Addresses.isIPv4Address(host) &&
(!ALLOW_IPV6_LOCATION || !Addresses.isIPv6Address(host))) {
Debug.warning("Ignoring non-IPv4 address at " + location);
return;
}
@@ -294,7 +302,7 @@ public class ControlPoint implements HTTPRequestListener
Debug.warning("Ignoring bad IP at " + location);
return;
}
if (TransportUtil.isPubliclyRoutable(ip, false)) {
if (TransportUtil.isPubliclyRoutable(ip, ALLOW_IPV6_LOCATION)) {
Debug.warning("Ignoring public address at " + location);
return;
}