* Console:

- Fix NPE after restart (ticket #763)
   - Move more nonces out of system properties

apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java

@@ -3,6 +3,8 @@ package net.i2p.router.web;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import net.i2p.util.RandomSource;
+
 /**
  * Copied and modded from I2PTunnel IndexBean (GPL)
  * @author zzz
@@ -11,8 +13,6 @@ public class CSSHelper extends HelperBase {
 
     private static final Map<String, Boolean> _UACache = new ConcurrentHashMap();
 
-    public CSSHelper() {}
-
     public static final String PROP_UNIVERSAL_THEMING = "routerconsole.universal.theme";
     public static final String PROP_THEME_NAME = "routerconsole.theme";
     public static final String DEFAULT_THEME = "light";
@@ -24,6 +24,16 @@ public class CSSHelper extends HelperBase {
     public static final String PROP_DISABLE_REFRESH = "routerconsole.summaryDisableRefresh";
     private static final String PROP_XFRAME = "routerconsole.disableXFrame";
 
+    private static final String _consoleNonce = Long.toString(RandomSource.getInstance().nextLong());
+
+    /**
+     *  formerly stored in System.getProperty("router.consoleNonce")
+     *  @since 0.9.4
+     */
+    public static String getNonce() { 
+        return _consoleNonce;
+    }
+
     public String getTheme(String userAgent) {
         String url = BASE_THEME_PATH;
         if (userAgent != null && userAgent.contains("MSIE")) {

apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java

@@ -3,6 +3,7 @@ package net.i2p.router.web;
 import net.i2p.data.DataHelper;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
+import net.i2p.util.RandomSource;
 
 /**
  * simple helper to control restarts/shutdowns in the left hand nav
@@ -12,20 +13,18 @@ public class ConfigRestartBean {
     /** all these are tagged below so no need to _x them here.
      *  order is: form value, form class, display text.
      */
-    static final String[] SET1 = {"shutdownImmediate", "stop", "Shutdown immediately", "cancelShutdown", "cancel", "Cancel shutdown"};
+    private static final String[] SET1 = {"shutdownImmediate", "stop", "Shutdown immediately", "cancelShutdown", "cancel", "Cancel shutdown"};
-    static final String[] SET2 = {"restartImmediate", "reload", "Restart immediately", "cancelShutdown", "cancel", "Cancel restart"};
+    private static final String[] SET2 = {"restartImmediate", "reload", "Restart immediately", "cancelShutdown", "cancel", "Cancel restart"};
-    static final String[] SET3 = {"restart", "reload", "Restart", "shutdown", "stop", "Shutdown"};
+    private static final String[] SET3 = {"restart", "reload", "Restart", "shutdown", "stop", "Shutdown"};
-    static final String[] SET4 = {"shutdown", "stop", "Shutdown"};
+    private static final String[] SET4 = {"shutdown", "stop", "Shutdown"};
 
+    private static final String _systemNonce = Long.toString(RandomSource.getInstance().nextLong());
+
+    /** formerly System.getProperty("console.nonce") */
     public static String getNonce() { 
-        RouterContext ctx = ContextHelper.getContext(null);
+        return _systemNonce;
-        String nonce = System.getProperty("console.nonce");
-        if (nonce == null) {
-            nonce = ""+ctx.random().nextLong();
-            System.setProperty("console.nonce", nonce);
-        }
-        return nonce;
     }
+
     public static String renderStatus(String urlBase, String action, String nonce) {
         RouterContext ctx = ContextHelper.getContext(null);
         String systemNonce = getNonce();

apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java

@@ -194,8 +194,8 @@ public class FormHandler {
             return;
         }
         
-        String sharedNonce = System.getProperty("router.consoleNonce");
+        String sharedNonce = CSSHelper.getNonce();
-        if ( (sharedNonce != null) && (sharedNonce.equals(_nonce) ) ) {
+        if (sharedNonce.equals(_nonce)) {
             return;
         }
         

apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java

@@ -212,7 +212,7 @@ public class NewsHelper extends ContentHelper {
                                            ctx));
          }
          buf.append("</i>");
-         String consoleNonce = System.getProperty("router.consoleNonce");
+         String consoleNonce = CSSHelper.getNonce();
          if (lastUpdated > 0 && consoleNonce != null) {
              if (shouldShowNews(ctx)) {
                  buf.append(" <a href=\"/?news=0&amp;consoleNonce=").append(consoleNonce).append("\">")

apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java

@@ -606,7 +606,7 @@ public class SummaryBarRenderer {
         NewsHelper newshelper = _helper.getNewsHelper();
         if (newshelper == null || newshelper.shouldShowNews()) return "";
         StringBuilder buf = new StringBuilder(512);
-        String consoleNonce = System.getProperty("router.consoleNonce");
+        String consoleNonce = CSSHelper.getNonce();
         if (consoleNonce != null) {
             // Set up title and pre-headings stuff.
             buf.append("<h3><a href=\"/configupdate\">")

apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java

@@ -809,7 +809,13 @@ public class SummaryHelper extends HelperBase {
 
     private String _requestURI;
     public void setRequestURI(String s) { _requestURI = s; }
-    public String getRequestURI() { return _requestURI; }
+
+    /**
+     * @return non-null; "/home" if (strangely) not set by jsp
+     */
+    public String getRequestURI() {
+        return _requestURI != null ? _requestURI : "/home";
+    }
 
     public String getConfigTable() {
         String[] allSections = SummaryBarRenderer.ALL_SECTIONS;

apps/routerconsole/jsp/configui.jsp

@@ -31,15 +31,7 @@ input.default {
 <%@include file="formhandler.jsi" %>
 <div class="configure"><div class="topshimten"><h3><%=uihelper._("Router Console Theme")%></h3></div>
  <form action="" method="POST">
-<%
+ <input type="hidden" name="consoleNonce" value="<%=intl.getNonce()%>" >
-    /** lang setting is done in css.jsi, not in ConfigUIHandler */
-    String consoleNonce = System.getProperty("router.consoleNonce");
-    if (consoleNonce == null) {
-        consoleNonce = Long.toString(new java.util.Random().nextLong());
-        System.setProperty("router.consoleNonce", consoleNonce);
-    }
-%>
- <input type="hidden" name="consoleNonce" value="<%=consoleNonce%>" >
  <input type="hidden" name="nonce" value="<%=pageNonce%>" >
  <input type="hidden" name="action" value="blah" >
 <%

apps/routerconsole/jsp/console.jsp

@@ -10,11 +10,7 @@
 <%@include file="summaryajax.jsi" %>
 </head><body onload="initAjax()">
 <%
-    String consoleNonce = System.getProperty("router.consoleNonce");
+    String consoleNonce = intl.getNonce();
-    if (consoleNonce == null) {
-        consoleNonce = Long.toString(new java.util.Random().nextLong());
-        System.setProperty("router.consoleNonce", consoleNonce);
-    }
 %>
 
 <%@include file="summary.jsi" %>

apps/routerconsole/jsp/css.jsi

@@ -34,7 +34,7 @@
       response.setHeader("X-Frame-Options", "SAMEORIGIN");
 
    String conNonceParam = request.getParameter("consoleNonce");
-   if (conNonceParam != null && conNonceParam.equals(System.getProperty("router.consoleNonce"))) {
+   if (intl.getNonce().equals(conNonceParam)) {
        intl.setLang(request.getParameter("lang"));
        intl.setNews(request.getParameter("news"));
    }

apps/routerconsole/jsp/home.jsp

@@ -8,11 +8,7 @@
 <%@include file="summaryajax.jsi" %>
 </head><body onload="initAjax()">
 <%
-    String consoleNonce = System.getProperty("router.consoleNonce");
+    String consoleNonce = intl.getNonce();
-    if (consoleNonce == null) {
-        consoleNonce = Long.toString(new java.util.Random().nextLong());
-        System.setProperty("router.consoleNonce", consoleNonce);
-    }
 %>
 <jsp:useBean class="net.i2p.router.web.NewsHelper" id="newshelper" scope="request" />
 <jsp:setProperty name="newshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />