* Console:

- Convert GraphHelper to a FormHandler
      - Require POST for all forms
      - Change the way we store the Writer to prevent problems
      - Fix bonus setting on configpeer.jsp
      - More ".jsp" removal

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

@@ -36,7 +36,7 @@ public class ConfigPeerHandler extends FormHandler {
                 return;
             }
             addFormError(_("Invalid peer"));
-        } else if (_action.equals(_("Adjust Profile Bonuses"))) {
+        } else if (_action.equals(_("Adjust peer bonuses"))) {
             Hash h = getHash();
             if (h != null) {
                 PeerProfile prof = _context.profileOrganizer().getProfile(h);
@@ -59,6 +59,8 @@ public class ConfigPeerHandler extends FormHandler {
             addFormError(_("Invalid peer"));
         } else if (_action.startsWith("Check")) {
             addFormError(_("Unsupported"));
+        } else {
+            addFormError("Unknown action \"" + _action + '"');
         }
     }
     

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

@@ -20,26 +20,23 @@ public class FormHandler {
     protected Log _log;
     private String _nonce;
     protected String _action;
+    protected String _method;
     protected String _passphrase;
-    private List<String> _errors;
+    private final List<String> _errors;
-    private List<String> _notices;
+    private final List<String> _notices;
     private boolean _processed;
     private boolean _valid;
     
     public FormHandler() {
         _errors = new ArrayList();
         _notices = new ArrayList();
-        _action = null;
-        _processed = false;
         _valid = true;
-        _nonce = null;
-        _passphrase = null;
     }
     
     /**
      * Configure this bean to query a particular router context
      *
-     * @param contextId begging few characters of the routerHash, or null to pick
+     * @param contextId beginning few characters of the routerHash, or null to pick
      *                  the first one we come across.
      */
     public void setContextId(String contextId) {
@@ -55,6 +52,14 @@ public class FormHandler {
     public void setAction(String val) { _action = val; }
     public void setPassphrase(String val) { _passphrase = val; }
 
+    /**
+     * Call this to prevent changes using GET
+     *
+     * @param the request method
+     * @since 0.8.2
+     */
+    public void storeMethod(String val) { _method = val; }
+    
     /**
      * Override this to perform the final processing (in turn, adding formNotice
      * and formError messages, etc)
@@ -145,6 +150,12 @@ public class FormHandler {
             _valid = false;
             return;
         }
+        // To prevent actions with GET, jsps must call storeMethod()
+        if (_method != null && !"POST".equals(_method)) {
+            addFormError("Invalid form submission, requires POST not " + _method);
+            _valid = false;
+            return;
+        }
         
         String sharedNonce = System.getProperty("router.consoleNonce");
         if ( (sharedNonce != null) && (sharedNonce.equals(_nonce) ) ) {
@@ -211,4 +222,8 @@ public class FormHandler {
         return Messages.getString(s, o, _context);
     }
 
+    /** two params @since 0.8.2 */
+    public String _(String s, Object o, Object o2) {
+        return Messages.getString(s, o, o2, _context);
+    }
 }

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

@@ -1,6 +1,7 @@
 package net.i2p.router.web;
 
 import java.io.IOException;
+import java.io.Writer;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
@@ -9,7 +10,8 @@ import java.util.TreeSet;
 import net.i2p.data.DataHelper;
 import net.i2p.stat.Rate;
 
-public class GraphHelper extends HelperBase {
+public class GraphHelper extends FormHandler {
+    protected Writer _out;
     private int _periodCount;
     private boolean _showEvents;
     private int _width;
@@ -29,9 +31,6 @@ public class GraphHelper extends HelperBase {
     static final int MAX_Y = 1024;
     private static final int MIN_REFRESH = 15;
     
-    public GraphHelper() {
-    }
-
     /** set the defaults after we have a context */
     @Override
     public void setContextId(String contextId) {
@@ -43,6 +42,12 @@ public class GraphHelper extends HelperBase {
         _showEvents = Boolean.valueOf(_context.getProperty(PROP_EVENTS)).booleanValue();
     }
     
+    /**
+     *  This was a HelperBase but now it's a FormHandler
+     *  @since 0.8.2
+     */
+    public void storeWriter(Writer out) { _out = out; }
+
     public void setPeriodCount(String str) { 
         try { _periodCount = Integer.parseInt(str); } catch (NumberFormatException nfe) {}
     }
@@ -125,10 +130,15 @@ public class GraphHelper extends HelperBase {
     }
 
     public String getForm() { 
-        saveSettings();
+        String prev = System.getProperty("net.i2p.router.web.GraphHelper.nonce");
+        if (prev != null) System.setProperty("net.i2p.router.web.GraphHelper.noncePrev", prev);
+        String nonce = "" + _context.random().nextLong();
+        System.setProperty("net.i2p.router.web.GraphHelper.nonce", nonce);
         try {
             _out.write("<br><h3>" + _("Configure Graph Display") + " [<a href=\"configstats\">" + _("Select Stats") + "</a>]</h3>");
-            _out.write("<form action=\"graphs\" method=\"POST\">");
+            _out.write("<form action=\"graphs\" method=\"POST\">\n" +
+                       "<input type=\"hidden\" name=\"action\" value=\"foo\">\n" +
+                       "<input type=\"hidden\" name=\"nonce\" value=\"" + nonce + "\" >\n");
             _out.write(_("Periods") + ": <input size=\"3\" type=\"text\" name=\"periodCount\" value=\"" + _periodCount + "\"><br>\n");
             _out.write(_("Plot averages") + ": <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : "checked=\"true\" ") + "> ");
             _out.write(_("or")+ " " +_("plot events") + ": <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"true\" "+ (_showEvents ? "checked=\"true\" " : "") + "><br>\n");
@@ -143,6 +153,15 @@ public class GraphHelper extends HelperBase {
         return ""; 
     }
 
+    /**
+     *  This was a HelperBase but now it's a FormHandler
+     *  @since 0.8.2
+     */
+    @Override
+    protected void processForm() {
+        saveSettings();
+    }
+
     /**
      *  Silently save settings if changed, no indication of success or failure
      *  @since 0.7.10
@@ -159,6 +178,7 @@ public class GraphHelper extends HelperBase {
             _context.router().setConfigSetting(PROP_REFRESH, "" + _refreshDelaySeconds);
             _context.router().setConfigSetting(PROP_EVENTS, "" + _showEvents);
             _context.router().saveConfig();
+            addFormNotice(_("Graph settings saved"));
         }
     }
 

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

@@ -28,7 +28,13 @@ public abstract class HelperBase {
     /** might be useful in the jsp's */
     //public RouterContext getContext() { return _context; }
 
-    public void setWriter(Writer out) { _out = out; }
+
+    /**
+     *  Renamed from setWriter, we realy don't want setFoo(non-String)
+     *  Prevent jsp.error.beans.property.conversion 500 error for ?writer=foo
+     *  @since 0.8.2
+     */
+    public void storeWriter(Writer out) { _out = out; }
 
     /** translate a string */
     public String _(String s) {

apps/routerconsole/jsp/config.jsp

@@ -16,6 +16,7 @@
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigNetHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />

apps/routerconsole/jsp/configadvanced.jsp

@@ -18,6 +18,7 @@
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />

apps/routerconsole/jsp/configclients.jsp

@@ -21,6 +21,7 @@ button span.hide{
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigClientsHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:setProperty name="formhandler" property="action" value="<%=request.getParameter("action")%>" />
  <jsp:setProperty name="formhandler" property="nonce" value="<%=request.getParameter("nonce")%>" />

apps/routerconsole/jsp/configkeyring.jsp

@@ -13,6 +13,7 @@
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigKeyringHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />

apps/routerconsole/jsp/configlogging.jsp

@@ -15,6 +15,7 @@
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigLoggingHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />

apps/routerconsole/jsp/confignav.jsi

@@ -5,7 +5,7 @@
 %>
 <jsp:useBean class="net.i2p.router.web.ConfigNavHelper" id="navHelper" scope="request" />
 <jsp:setProperty name="navHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-<jsp:setProperty name="navHelper" property="writer" value="<%=out%>" />
+<% navHelper.storeWriter(out); %>
 <div class="confignav" id="confignav">
 <center>
 <%

apps/routerconsole/jsp/configpeer.jsp

@@ -13,6 +13,7 @@
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigPeerHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />
@@ -27,7 +28,7 @@
         peer = net.i2p.data.DataHelper.stripHTML(request.getParameter("peer"));  // XSS
  %>
  <div class="configure">
- <form action="" method="POST">
+ <form action="configpeer" method="POST">
  <% String prev = System.getProperty("net.i2p.router.web.ConfigPeerHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigPeerHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigPeerHandler.nonce", new java.util.Random().nextLong()+""); %>
@@ -64,7 +65,7 @@
  <a name="shitlist"> </a><h2><%=intl._("Banned Peers")%></h2>
  <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
  <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <jsp:setProperty name="profilesHelper" property="writer" value="<%=out%>" />
+ <% profilesHelper.storeWriter(out); %>
  <jsp:getProperty name="profilesHelper" property="shitlistSummary" />
  <div class="wideload"><h2><%=intl._("Banned IPs")%></h2>
  <jsp:getProperty name="peerhelper" property="blocklistSummary" />

apps/routerconsole/jsp/configservice.jsp

@@ -13,6 +13,7 @@
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigServiceHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />

apps/routerconsole/jsp/configstats.jsp

@@ -58,8 +58,9 @@ function toggleAll(category)
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigStatsHandler" id="formhandler" scope="request" />
- <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="*" />
+ <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />
 
  <jsp:useBean class="net.i2p.router.web.ConfigStatsHelper" id="statshelper" scope="request" />

apps/routerconsole/jsp/configtunnels.jsp

@@ -15,6 +15,7 @@
 <div class="main" id="main">
  <%@include file="confignav.jsi" %>
  <jsp:useBean class="net.i2p.router.web.ConfigTunnelsHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:setProperty name="formhandler" property="shouldsave" value="<%=request.getParameter("shouldsave")%>" />
  <jsp:setProperty name="formhandler" property="action" value="<%=request.getParameter("action")%>" />

apps/routerconsole/jsp/configui.jsp

@@ -18,6 +18,7 @@
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigUIHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />

apps/routerconsole/jsp/configupdate.jsp

@@ -13,6 +13,7 @@
  <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigUpdateHandler" id="formhandler" scope="request" />
+ <% formhandler.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />

apps/routerconsole/jsp/dumpprofile.jsp

@@ -1,5 +1,5 @@
 <%@page contentType="text/plain"
 %><jsp:useBean id="helper" class="net.i2p.router.web.StatHelper"
 /><jsp:setProperty name="helper" property="peer" value="<%=request.getParameter("peer")%>"
-/><jsp:setProperty name="helper" property="writer" value="<%=out%>"
+/><% helper.storeWriter(out);
-/><jsp:getProperty name="helper" property="profile" />
+%><jsp:getProperty name="helper" property="profile" />

apps/routerconsole/jsp/graphs.jsp

@@ -13,9 +13,12 @@
  <div class="graphspanel">
  <div class="widepanel">
  <jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" />
+ <% graphHelper.storeMethod(request.getMethod()); %>
  <jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %>
  <jsp:setProperty name="graphHelper" property="*" />
- <jsp:setProperty name="graphHelper" property="writer" value="<%=out%>" />
+ <% graphHelper.storeWriter(out); %>
+ <jsp:getProperty name="graphHelper" property="allMessages" />
  <jsp:getProperty name="graphHelper" property="images" />
  <jsp:getProperty name="graphHelper" property="form" />
 </div></div></div></body></html>

apps/routerconsole/jsp/i2psnark/index.html

@@ -3,6 +3,6 @@
 <meta http-equiv="pragma" content="no-cache" />
 </head>
 <body>
-The I2PSnark Anonymous BitTorrent Client is not running. Please visit the <a href="/configclients.jsp">config clients page</a>
+The I2PSnark Anonymous BitTorrent Client is not running. Please visit the <a href="/configclients#webapp">config clients page</a>
 to start it.
 </body></html>

apps/routerconsole/jsp/i2ptunnel/index.jsp

@@ -3,5 +3,5 @@
 <meta http-equiv="pragma" content="no-cache" />
 </head>
 <body>
-The I2P Tunnel Manager is not currently running. Please visit the <a href="/configclients.jsp">Client Configuration</a> page to start it.
+The I2P Tunnel Manager is not currently running. Please visit the <a href="/configclients#webapp">Client Configuration</a> page to start it.
 </body></html>

apps/routerconsole/jsp/jobs.jsp

@@ -10,6 +10,6 @@
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.JobQueueHelper" id="jobQueueHelper" scope="request" />
  <jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <jsp:setProperty name="jobQueueHelper" property="writer" value="<%=out%>" />
+ <% jobQueueHelper.storeWriter(out); %>
  <jsp:getProperty name="jobQueueHelper" property="jobQueueSummary" />
 <hr></div></body></html>

apps/routerconsole/jsp/netdb.jsp

@@ -12,7 +12,7 @@
  <div class="wideload">
  <jsp:useBean class="net.i2p.router.web.NetDbHelper" id="netdbHelper" scope="request" />
  <jsp:setProperty name="netdbHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <jsp:setProperty name="netdbHelper" property="writer" value="<%=out%>" />
+ <% netdbHelper.storeWriter(out); %>
  <jsp:setProperty name="netdbHelper" property="full" value="<%=request.getParameter("f")%>" />
  <jsp:setProperty name="netdbHelper" property="router" value="<%=request.getParameter("r")%>" />
  <jsp:setProperty name="netdbHelper" property="lease" value="<%=request.getParameter("l")%>" />

apps/routerconsole/jsp/oldconsole.jsp

@@ -12,7 +12,7 @@
 <%@include file="summary.jsi" %>
 <jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="conhelper" scope="request" />
 <jsp:setProperty name="conhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-<jsp:setProperty name="conhelper" property="writer" value="<%=out%>" />
+<% conhelper.storeWriter(out); %>
  <h1>I2P Router &raquo; Old Console</h1>
 <div class="main" id="main">
  <jsp:getProperty name="conhelper" property="console" />

apps/routerconsole/jsp/peers.jsp

@@ -11,7 +11,7 @@
 <div class="main" id="main"><div class="wideload">
  <jsp:useBean class="net.i2p.router.web.PeerHelper" id="peerHelper" scope="request" />
  <jsp:setProperty name="peerHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <jsp:setProperty name="peerHelper" property="writer" value="<%=out%>" />
+ <% peerHelper.storeWriter(out); %>
  <jsp:setProperty name="peerHelper" property="urlBase" value="peers.jsp" />
  <jsp:setProperty name="peerHelper" property="sort" value="<%=request.getParameter("sort") != null ? request.getParameter("sort") : ""%>" />
  <jsp:getProperty name="peerHelper" property="peerSummary" />

apps/routerconsole/jsp/profiles.jsp

@@ -10,7 +10,7 @@
 <div class="main" id="main"><div class="wideload">
  <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
  <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <jsp:setProperty name="profilesHelper" property="writer" value="<%=out%>" />
+ <% profilesHelper.storeWriter(out); %>
  <jsp:setProperty name="profilesHelper" property="full" value="<%=request.getParameter("f")%>" />
  <jsp:getProperty name="profilesHelper" property="profileSummary" />
  <a name="shitlist"> </a><h2><%=intl._("Banned Peers")%></h2>

apps/routerconsole/jsp/stats.jsp

@@ -9,7 +9,7 @@
 <%@include file="summary.jsi" %>
 <jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="oldhelper" scope="request" />
 <jsp:setProperty name="oldhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-<jsp:setProperty name="oldhelper" property="writer" value="<%=out%>" />
+<% oldhelper.storeWriter(out); %>
 <jsp:setProperty name="oldhelper" property="full" value="<%=request.getParameter("f")%>" />
  <h1><%=intl._("I2P Router Statistics")%></h1>
 <div class="main" id="main">

apps/routerconsole/jsp/summarynoframe.jsi

@@ -11,7 +11,7 @@
 <jsp:setProperty name="helper" property="updateNonce" value="<%=request.getParameter("updateNonce")%>" />
 <jsp:setProperty name="helper" property="consoleNonce" value="<%=request.getParameter("consoleNonce")%>" />
 <jsp:setProperty name="helper" property="requestURI" value="<%=request.getRequestURI()%>" />
-<jsp:setProperty name="helper" property="writer" value="<%=out%>" />
+<% helper.storeWriter(out); %>
 <%
 /*
  * The following is required for the reseed button to work, although we probably

apps/routerconsole/jsp/susidns/index.jsp

@@ -3,6 +3,6 @@
 <meta http-equiv="pragma" content="no-cache" />
 </head>
 <body>
-SusiDNS is not running. Go to <a href="/configclients.jsp">the config clients page</a>
+SusiDNS is not running. Go to <a href="/configclients#webapp">the config clients page</a>
 to start it.
 </body></html>

apps/routerconsole/jsp/susimail/susimail

@@ -3,6 +3,6 @@
 <meta http-equiv="pragma" content="no-cache" />
 </head>
 <body>
-SusiMail is not running. Go to <a href="/configclients.jsp">the config clients page</a>
+SusiMail is not running. Go to <a href="/configclients#webapp">the config clients page</a>
 to start it.
 </body></html>

apps/routerconsole/jsp/tunnels.jsp

@@ -10,6 +10,6 @@
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.TunnelHelper" id="tunnelHelper" scope="request" />
  <jsp:setProperty name="tunnelHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <jsp:setProperty name="tunnelHelper" property="writer" value="<%=out%>" />
+ <% tunnelHelper.storeWriter(out); %>
  <jsp:getProperty name="tunnelHelper" property="tunnelSummary" />
 </div></body></html>