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

SSL Wizard: Change cert type, export cert, show in cert helper,

Browse Source 
relay keystore password via POST
This commit is contained in:
zzz
2018-04-29 15:46:30 +00:00
parent 4d09e507fb
commit cdd58f168a
3 changed files with 81 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apps/routerconsole/java/src/net/i2p/router/web/helpers/CertHelper.java
View File

@ -22,7 +22,7 @@ public class CertHelper extends HelperBase {
private static final String CONSOLE = "console/console.local.crt";
private static final String I2PTUNNEL_DIR = "i2ptunnel";
private static final String SAM_DIR = "sam";
private static final String EEPSITE = "eepsite/etc/keystore.ks";
private static final String EEPSITE_DIR = "eepsite";
public String getSummary() {
File dir = new File(_context.getConfigDir(), DIR);
@ -31,9 +31,9 @@ public class CertHelper extends HelperBase {
_out.write(_t("Local SSL Certificates"));
_out.write("</h3>\n");
// console
output("Console", new File(dir, CONSOLE));
output(_t("Router Console"), new File(dir, CONSOLE));
// I2CP
output("I2CP", new File(dir, I2CP));
output(_t("I2CP"), new File(dir, I2CP));
// i2ptunnel clients
File tunnelDir = new File(_context.getConfigDir(), I2PTUNNEL_DIR);
@ -58,13 +58,28 @@ public class CertHelper extends HelperBase {
if (tunnels != null) {
for (int i = 0; i < tunnels.length; i++) {
File f = tunnels[i];
output("SAM", f);
output(_t("SAM"), f);
hasTunnels = true;
}
}
if (!hasTunnels)
output(_t("SAM"), null);
// Eepsite
tunnelDir = new File(dir, EEPSITE_DIR);
hasTunnels = false;
tunnels = tunnelDir.listFiles(new FileSuffixFilter(".crt"));
if (tunnels != null) {
for (int i = 0; i < tunnels.length; i++) {
File f = tunnels[i];
String name = f.getName();
output(_t("Website") + ' ' + name.substring(0, name.length() - 4), f);
hasTunnels = true;
}
}
if (!hasTunnels)
output(_t("Website"), null);
// Family
_out.write("<h3>");
_out.write(_t("Local Router Family Certificate"));
@ -80,19 +95,6 @@ public class CertHelper extends HelperBase {
_out.write("</p>\n");
}
// Eepsite
_out.write("<h3>");
_out.write(_t("Website"));
_out.write("</h3>\n");
File ks = new File(_context.getConfigDir(), EEPSITE);
if (ks.exists()) {
// TODO
} else {
_out.write("<p>");
_out.write(_t("none"));
_out.write("</p>\n");
}
// anything else? plugins?
} catch (IOException ioe) {