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

Replace URL with URI where possible

Browse Source 
URL bad for anon and has traps like equals()
This commit is contained in:
zzz
2015-11-07 22:38:05 +00:00
parent 1e5a35c7f8
commit 8e77188560
12 changed files with 151 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
View File

@@ -18,7 +18,8 @@ import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.URL;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Locale;
import net.i2p.I2PAppContext;
@@ -115,18 +116,16 @@ public class UrlLauncher implements ClientApp {
* @return success
*/
private static boolean waitForServer(String urlString) {
URL url;
URI url;
try {
url = new URL(urlString);
} catch (MalformedURLException e) {
url = new URI(urlString);
} catch (URISyntaxException e) {
return false;
}
String host = url.getHost();
int port = url.getPort();
if (port <= 0) {
port = url.getDefaultPort();
if (port <= 0)
return false;
port = "https".equals(url.getScheme()) ? 443 : 80;
}
SocketAddress sa;
try {
@@ -261,8 +260,8 @@ public class UrlLauncher implements ClientApp {
private static boolean validateUrlFormat(String urlString) {
try {
// just to check validity
new URL(urlString);
} catch (MalformedURLException e) {
new URI(urlString);
} catch (URISyntaxException e) {
return false;
}
return true;