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

Show family cert on /certs; fix HTML

Browse Source
This commit is contained in:
zzz
2015-12-13 02:42:12 +00:00
parent 4fe24790fd
commit fee755bdb7
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,9 @@ package net.i2p.router.web;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import net.i2p.data.DataHelper;
import net.i2p.util.FileUtil; import net.i2p.util.FileUtil;
import net.i2p.router.crypto.FamilyKeyCrypto;
/** /**
@ -49,7 +51,23 @@ public class CertHelper extends HelperBase {
} }
if (!hasTunnels) if (!hasTunnels)
output(_t("I2PTunnel"), null); output(_t("I2PTunnel"), null);
_out.write("<h3>");
_out.write(_t("Local Router Family Certificate"));
_out.write("</h3>\n");
String family = _context.getProperty(FamilyKeyCrypto.PROP_FAMILY_NAME);
if (family != null) {
File f = new File(dir, "family");
f = new File(f, family + ".crt");
output(_t("Family") + ": " + DataHelper.escapeHTML(family), f);
} else {
_out.write("<p>");
_out.write(_t("none"));
_out.write("</p>\n");
}
// anything else? plugins? // anything else? plugins?
} catch (IOException ioe) { } catch (IOException ioe) {
ioe.printStackTrace(); ioe.printStackTrace();
} }
@ -61,8 +79,8 @@ public class CertHelper extends HelperBase {
*/ */
private void output(String name, File file) throws IOException { private void output(String name, File file) throws IOException {
_out.write("<p><h4>"); _out.write("<p><h4>");
_out.write("</h4>");
_out.write(name); _out.write(name);
_out.write("</h4>");
if (file != null && file.exists()) { if (file != null && file.exists()) {
String cert = FileUtil.readTextFile(file.toString(), -1, true); String cert = FileUtil.readTextFile(file.toString(), -1, true);
if (cert != null) { if (cert != null) {
@ -73,9 +91,9 @@ public class CertHelper extends HelperBase {
_out.write(": read failure"); _out.write(": read failure");
} }
} else { } else {
_out.write(": "); _out.write("<p>");
_out.write(_t("none")); _out.write(_t("none"));
_out.write("</p>\n");
} }
_out.write("</p>\n");
} }
} }