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

Console: Redirect to HTTPS if available (ticket #2160)

Browse Source 
Show console links as HTTPS if available
Extend blacklisted ports to cover HTTPS console and eepsite
This commit is contained in:
zzz
2018-02-20 20:19:34 +00:00
parent 33ea4cf571
commit f00bf7d2cb
6 changed files with 120 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/java/src/net/i2p/util/PortMapper.java
View File

@ -19,6 +19,7 @@ import net.i2p.I2PAppContext;
*/
public class PortMapper {
private final ConcurrentHashMap<String, InetSocketAddress> _dir;
public static final String PROP_PREFER_HTTPS = "routerconsole.preferHTTPS";
public static final String SVC_CONSOLE = "console";
public static final String SVC_HTTPS_CONSOLE = "https_console";
@ -177,16 +178,39 @@ public class PortMapper {
return rv;
}
/*
* @return http URL unless console is https only. Default http://127.0.0.1:7657/
/**
* If PROP_PREFER_HTTPS is true or unset,
* return https URL unless console is http only. Default https://127.0.0.1:7667/
* If PROP_PREFER_HTTPS is set to false,
* return http URL unless console is https only. Default http://127.0.0.1:7657/
*
* @since 0.9.33 consolidated from i2ptunnel and desktopgui
*/
public String getConsoleURL() {
return getConsoleURL(I2PAppContext.getGlobalContext().getBooleanPropertyDefaultTrue(PROP_PREFER_HTTPS));
}
/**
* If preferHTTPS is true,
* return https URL unless console is http only. Default https://127.0.0.1:7667/
* If preferHTTPS is false,
* return http URL unless console is https only. Default http://127.0.0.1:7657/
*
* @since 0.9.34
*/
public String getConsoleURL(boolean preferHTTPS) {
return preferHTTPS ? getHTTPSConsoleURL() : getHTTPConsoleURL();
}
/**
* @return http URL unless console is https only. Default http://127.0.0.1:7657/
*/
private String getHTTPConsoleURL() {
String unset = "*unset*";
String httpHost = getActualHost(SVC_CONSOLE, unset);
String httpsHost = getActualHost(SVC_HTTPS_CONSOLE, unset);
int httpPort = getPort(SVC_CONSOLE, 7657);
int httpsPort = getPort(SVC_HTTPS_CONSOLE, -1);
int httpsPort = getPort(SVC_HTTPS_CONSOLE);
boolean httpsOnly = httpsPort > 0 && httpHost.equals(unset) && !httpsHost.equals(unset);
if (httpsOnly)
return "https://" + httpsHost + ':' + httpsPort + '/';
@ -195,6 +219,24 @@ public class PortMapper {
return "http://" + httpHost + ':' + httpPort + '/';
}
/**
* @return https URL unless console is http only. Default https://127.0.0.1:7667/
* @since 0.9.34
*/
private String getHTTPSConsoleURL() {
String unset = "*unset*";
String httpHost = getActualHost(SVC_CONSOLE, unset);
String httpsHost = getActualHost(SVC_HTTPS_CONSOLE, unset);
int httpPort = getPort(SVC_CONSOLE);
int httpsPort = getPort(SVC_HTTPS_CONSOLE, 7667);
boolean httpOnly = httpPort > 0 && httpsHost.equals(unset) && !httpHost.equals(unset);
if (httpOnly)
return "http://" + httpHost + ':' + httpPort + '/';
if (httpsHost.equals(unset))
httpsHost = "127.0.0.1";
return "https://" + httpsHost + ':' + httpsPort + '/';
}
/**
* For debugging only
* @since 0.9.20