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

Console: Hide links to eepsite if not running (ticket #2161)

Browse Source 
Show https eepsite link if available (ticket #2159)
Use port mapper instead of webapp starter for webapp detection, much faster
This commit is contained in:
zzz
2018-03-14 15:47:55 +00:00
parent 948bbae661
commit b9d5cdf2be
4 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
View File

@ -191,9 +191,19 @@ public class HomeHelper extends HelperBase {
for (App app : apps) {
String url;
if (app.name.equals(website) && app.url.equals("http://127.0.0.1:7658/")) {
PortMapper pm = _context.portMapper();
int port = pm.getPort(PortMapper.SVC_EEPSITE);
int sslPort = pm.getPort(PortMapper.SVC_HTTPS_EEPSITE);
if (port <= 0 && sslPort <= 0)
continue;
// fixup eepsite link
url = "http://" + _context.portMapper().getActualHost(PortMapper.SVC_EEPSITE, "127.0.0.1") +
':' + _context.portMapper().getPort(PortMapper.SVC_EEPSITE, 7658) + '/';
if (sslPort > 0) {
url = "https://" + pm.getActualHost(PortMapper.SVC_HTTPS_EEPSITE, "127.0.0.1") +
':' + sslPort + '/';
} else {
url = "http://" + pm.getActualHost(PortMapper.SVC_EEPSITE, "127.0.0.1") +
':' + port + '/';
}
} else {
url = app.url;
// check for disabled webapps and other things

33
apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java
View File

@ -21,7 +21,6 @@ import net.i2p.router.web.Messages;
import net.i2p.router.web.NavHelper;
import net.i2p.router.web.NewsHelper;
import net.i2p.router.web.StatSummarizer;
import net.i2p.router.web.WebAppStarter;
import net.i2p.util.PortMapper;
import net.i2p.util.SystemVersion;
@ -214,7 +213,8 @@ class SummaryBarRenderer {
"<hr class=\"b\"><table id=\"sb_services\"><tr><td>");
if (WebAppStarter.isWebAppRunning("susimail")) {
PortMapper pm = _context.portMapper();
if (pm.getPort(PortMapper.SVC_SUSIMAIL) > 0) {
buf.append("<a href=\"/webmail\" target=\"_top\" title=\"")
.append(_t("Anonymous webmail client"))
.append("\">")
@ -222,7 +222,7 @@ class SummaryBarRenderer {
.append("</a>\n");
}
if (WebAppStarter.isWebAppRunning("i2psnark")) {
if (pm.getPort(PortMapper.SVC_I2PSNARK) > 0) {
buf.append("<a href=\"/torrents\" target=\"_top\" title=\"")
.append(_t("Built-in anonymous BitTorrent Client"))
.append("\">")
@ -230,17 +230,29 @@ class SummaryBarRenderer {
.append("</a>\n");
}
buf.append("<a href=\"http://")
.append(_context.portMapper().getActualHost(PortMapper.SVC_EEPSITE, "127.0.0.1"))
int port = pm.getPort(PortMapper.SVC_EEPSITE);
int sslPort = pm.getPort(PortMapper.SVC_HTTPS_EEPSITE);
if (sslPort > 0 || port > 0) {
String svc;
if (sslPort > 0) {
buf.append("<a href=\"https://");
svc = PortMapper.SVC_HTTPS_EEPSITE;
port = sslPort;
} else {
buf.append("<a href=\"http://");
svc = PortMapper.SVC_EEPSITE;
}
buf.append(pm.getActualHost(svc, "127.0.0.1"))
.append(':')
.append(_context.portMapper().getPort(PortMapper.SVC_EEPSITE, 7658))
.append(port)
.append("/\" target=\"_blank\" title=\"")
.append(_t("Local web server"))
.append("\">")
.append(nbsp(_t("Web Server")))
.append("</a>\n")
.append("</a>\n");
}
.append(NavHelper.getClientAppLinks(_context))
buf.append(NavHelper.getClientAppLinks(_context))
.append("</td></tr></table>\n");
return buf.toString();
@ -256,7 +268,8 @@ class SummaryBarRenderer {
"<table id=\"sb_internals\"><tr><td>\n");
if (WebAppStarter.isWebAppRunning("susidns")) {
PortMapper pm = _context.portMapper();
if (pm.getPort(PortMapper.SVC_SUSIDNS) > 0) {
buf.append("<a href=\"/dns\" target=\"_top\" title=\"")
.append(_t("Manage your I2P hosts file here (I2P domain name resolution)"))
.append("\">")
@ -278,7 +291,7 @@ class SummaryBarRenderer {
.append(nbsp(_t("Help")))
.append("</a>\n");
if (WebAppStarter.isWebAppRunning("i2ptunnel")) {
if (pm.getPort(PortMapper.SVC_I2PTUNNEL) > 0) {
buf.append("<a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"")
.append(_t("Local Tunnels"))
.append("\">")

11
history.txt
View File

@ -1,4 +1,15 @@
2018-03-14 zzz
* Console:
- Hide links to webapps and eepsite if not running (ticket #2161)
- Hide link to /configplugins if disabled
* i2ptunnel: Hide links to webapps that are not runnning (ticket #2161)
* SusDNS: Translate svg image text (ticket #1749)
2018-03-12 zzz
* Susimail: Fix up compose.js (ticket #2176)
2018-03-11 zzz
* Crypto: Add utils for renewing a cert in a keystore
* Router: More peer selection fixes for hidden mode
2018-03-10 zzz

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 15;
public final static long BUILD = 16;
/** for example "-test" */
public final static String EXTRA = "";