From 195d7dc653c129cf6a5c5cafe3dd04d5235df63f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 4 Mar 2018 16:11:29 +0000
Subject: [PATCH] Console: Show SAM cert on /certs Stub for jetty cert

---
 .../i2p/router/web/helpers/CertHelper.java    | 38 +++++++++++++++++++
 history.txt                                   |  4 ++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/CertHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/CertHelper.java
index 4860a3d73..2c80f385e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/CertHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/CertHelper.java
@@ -20,6 +20,8 @@ public class CertHelper extends HelperBase {
     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";
+    private static final String SAM_DIR = "sam";
+    private static final String EEPSITE = "eepsite/etc/keystore.ks";
 
     public String getSummary() {
         File dir = new File(_context.getConfigDir(), DIR);
@@ -31,6 +33,7 @@ public class CertHelper extends HelperBase {
             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;
@@ -53,6 +56,28 @@ public class CertHelper extends HelperBase {
             if (!hasTunnels)
                 output(_t("I2PTunnel"), null);
 
+            // SAM
+            tunnelDir = new File(dir, SAM_DIR);
+            hasTunnels = false;
+            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("sam-"))
+                        continue;
+                    output("SAM", f);
+                    hasTunnels = true;
+                }
+            }
+            if (!hasTunnels)
+                output(_t("SAM"), null);
+
+            // Family
             _out.write("<h3>");
             _out.write(_t("Local Router Family Certificate"));
             _out.write("</h3>\n");
@@ -67,6 +92,19 @@ 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) {
diff --git a/history.txt b/history.txt
index 690549bce..8ea992330 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2018-03-04 zzz
+ * i2ptunnel: Fix multipart config for /register
+ * KeyStore: Log expiration of self-signed certs
+
 2018-03-03 zzz
  * Utils:
    - Skip IPs of down interfaces on Windows
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5a58b19bc..e36cd3b14 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -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 = 11;
+    public final static long BUILD = 12;
 
     /** for example "-test" */
     public final static String EXTRA = "";