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

UPnP:

Browse Source 
- New fix Device.getAbsoluteURL() once again after merge
 - Don't load local files in Service.getSCPDNode()
This commit is contained in:
zzz
2015-03-17 21:29:03 +00:00
parent 64faeef6c4
commit 8dde7b70db
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
router/java/src/org/cybergarage/upnp/Device.java
View File

@@ -255,11 +255,13 @@ public class Device implements org.cybergarage.http.HTTPRequestListener,
public String getAbsoluteURL(String urlString, String baseURLStr,
String locationURLStr) {
//Debug.warning("GAURL \"" + urlString + "\" \"" + baseURLStr + "\" \"" + locationURLStr + '"');
if ((urlString == null) || (urlString.length() <= 0))
return "";
try {
URL url = new URL(urlString);
//Debug.warning("Return 0: " + url);
return url.toString();
} catch (Exception e) {
}
@@ -267,9 +269,21 @@ public class Device implements org.cybergarage.http.HTTPRequestListener,
if ((baseURLStr == null) || (baseURLStr.length() <= 0)) {
if ((locationURLStr != null) && (0 < locationURLStr.length())) {
if (!locationURLStr.endsWith("/") || !urlString.startsWith("/")) {
String absUrl = locationURLStr + urlString;
String absUrl;
// I2P - getAbsoluteURL("/WANIPCn.xml", "", "http://192.168.1.1:5555/rootDesc.xml")
// returns here as "http://192.168.1.1:5555/rootDesc.xml/WANIPCn.xml" which is horribly wrong
// So back up to last slash
if (!locationURLStr.endsWith("/")) {
if (urlString.startsWith("/"))
absUrl = locationURLStr.substring(0, locationURLStr.lastIndexOf('/')) + urlString;
else
absUrl = locationURLStr.substring(0, locationURLStr.lastIndexOf('/') + 1) + urlString;
} else {
absUrl = locationURLStr + urlString;
}
try {
URL url = new URL(absUrl);
//Debug.warning("Return 1: " + url);
return url.toString();
} catch (Exception e) {
}
@@ -277,6 +291,7 @@ public class Device implements org.cybergarage.http.HTTPRequestListener,
String absUrl = locationURLStr + urlString.substring(1);
try {
URL url = new URL(absUrl);
//Debug.warning("Return 2: " + url);
return url.toString();
} catch (Exception e) {
}
@@ -285,6 +300,7 @@ public class Device implements org.cybergarage.http.HTTPRequestListener,
String absUrl = HTTP.getAbsoluteURL(locationURLStr, urlString);
try {
URL url = new URL(absUrl);
//Debug.warning("Return 3: " + url);
return url.toString();
} catch (Exception e) {
}
@@ -306,6 +322,7 @@ public class Device implements org.cybergarage.http.HTTPRequestListener,
String absUrl = baseURLStr + urlString;
try {
URL url = new URL(absUrl);
//Debug.warning("Return 4: " + url);
return url.toString();
} catch (Exception e) {
}
@@ -313,6 +330,7 @@ public class Device implements org.cybergarage.http.HTTPRequestListener,
String absUrl = baseURLStr + urlString.substring(1);
try {
URL url = new URL(absUrl);
//Debug.warning("Return 5: " + url);
return url.toString();
} catch (Exception e) {
}
@@ -321,11 +339,13 @@ public class Device implements org.cybergarage.http.HTTPRequestListener,
String absUrl = HTTP.getAbsoluteURL(baseURLStr, urlString);
try {
URL url = new URL(absUrl);
//Debug.warning("Return 6: " + url);
return url.toString();
} catch (Exception e) {
}
}
//Debug.warning("Return 7: " + urlString);
return urlString;
}

13
router/java/src/org/cybergarage/upnp/Service.java
View File

@@ -436,6 +436,9 @@ public class Service
String scpdURLStr = getSCPDURL();
/****
* I2P - no, dont attempt to load local file
*
// Thanks for Robin V. (Sep 18, 2010)
String rootDevPath = rootDev.getDescriptionFilePath();
if(rootDevPath!=null) {
@@ -455,6 +458,7 @@ public class Service
}
}
}
****/
try {
URL scpdUrl = new URL(rootDev.getAbsoluteURL(scpdURLStr));
@@ -464,8 +468,14 @@ public class Service
return scpdNode;
}
}
catch (Exception e) {}
catch (Exception e) {
// I2P
Debug.warning(e);
}
/****
* I2P - no, dont attempt to load local file
*
String newScpdURLStr = rootDev.getDescriptionFilePath() + HTTP.toRelativeURL(scpdURLStr);
try {
scpdNode = getSCPDNode(new File(newScpdURLStr));
@@ -474,6 +484,7 @@ public class Service
catch (Exception e) {
Debug.warning(e);
}
****/
return null;
}