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

Console:

Browse Source 
- Export SSL cert on creation
 - new /certs page to show local SSL certs
This commit is contained in:
zzz
2015-09-27 15:56:03 +00:00
parent 4d7ad6ef7f
commit 1c3527e1a4
3 changed files with 105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
apps/routerconsole/java/src/net/i2p/router/web/CertHelper.java Normal file
View File

@ -0,0 +1,81 @@
package net.i2p.router.web;
import java.io.File;
import java.io.IOException;
import net.i2p.util.FileUtil;
/**
* Dump out our local SSL certs, if any
*
* @since 0.9.23
*/
public class CertHelper extends HelperBase {
private static final String DIR = "certificates";
private static final String I2CP = "i2cp/i2cp.local.crt";
private static final String CONSOLE = "console/console.local.crt";
private static final String I2PTUNNEL_DIR = "i2ptunnel";
public String getSummary() {
File dir = new File(_context.getConfigDir(), DIR);
try {
_out.write("<h3>");
_out.write(_t("Local SSL Certificates"));
_out.write("</h3>\n");
// console
output("Console", new File(dir, CONSOLE));
// I2CP
output("I2CP", new File(dir, I2CP));
// i2ptunnel clients
File tunnelDir = new File(_context.getConfigDir(), I2PTUNNEL_DIR);
boolean hasTunnels = false;
File[] tunnels = tunnelDir.listFiles();
if (tunnels != null) {
for (int i = 0; i < tunnels.length; i++) {
File f = tunnels[i];
if (!f.isFile())
continue;
String name = f.getName();
if (!name.endsWith(".local.crt"))
continue;
if (!name.startsWith("i2ptunnel-"))
continue;
String b32 = name.substring(10, name.length() - 10);
output(_t("I2PTunnel") + ' ' + b32, f);
hasTunnels = true;
}
}
if (!hasTunnels)
output(_t("I2PTunnel"), null);
// anything else? plugins?
} catch (IOException ioe) {
ioe.printStackTrace();
}
return "";
}
/**
* @param file may be null
*/
private void output(String name, File file) throws IOException {
_out.write("<p><h4>");
_out.write("</h4>");
_out.write(name);
if (file != null && file.exists()) {
String cert = FileUtil.readTextFile(file.toString(), -1, true);
if (cert != null) {
_out.write("\n<textarea readonly=\"readonly\">\n");
_out.write(cert);
_out.write("</textarea>\n");
} else {
_out.write(": read failure");
}
} else {
_out.write(": ");
_out.write(_t("none"));
}
_out.write("</p>\n");
}
}

7
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -760,6 +760,13 @@ public class RouterConsoleRunner implements RouterApp {
changes.put(PROP_KEY_PASSWORD, keyPassword); changes.put(PROP_KEY_PASSWORD, keyPassword);
_context.router().saveConfig(changes, null); _context.router().saveConfig(changes, null);
} catch (Exception e) {} // class cast exception } catch (Exception e) {} // class cast exception
// export cert, fails silently
File dir = new SecureDirectory(_context.getConfigDir(), "certificates");
dir.mkdir();
dir = new SecureDirectory(dir, "console");
dir.mkdir();
File certFile = new File(dir, "console.local.crt");
KeyStoreUtil.exportCert(ks, DEFAULT_KEYSTORE_PASSWORD, "console", certFile);
} }
} }
if (success) { if (success) {

17
apps/routerconsole/jsp/certs.jsp Normal file
View File

@ -0,0 +1,17 @@
<%@page contentType="text/html"%>
<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head>
<%@include file="css.jsi" %>
<%=intl.title("Certificates")%>
<script src="/js/ajax.js" type="text/javascript"></script>
<%@include file="summaryajax.jsi" %>
</head><body onload="initAjax()">
<%@include file="summary.jsi" %><h1><%=intl._t("Certificates")%></h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.CertHelper" id="certhelper" scope="request" />
<jsp:setProperty name="certhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<% certhelper.storeWriter(out); %>
<jsp:getProperty name="certhelper" property="summary" />
</div></body></html>