From 1d2e01c8cdbacacd877ee4f7057773133d256196 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 2 Sep 2014 14:08:41 +0000
Subject: [PATCH] i2ptunnel filter tweaks

---
 .../src/net/i2p/i2ptunnel/web/IndexBean.java    | 17 ++++++++++-------
 apps/i2ptunnel/jsp/editClient.jsp               |  2 +-
 apps/i2ptunnel/jsp/editServer.jsp               |  2 +-
 apps/i2ptunnel/jsp/wizard.jsp                   | 10 +++++-----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index cda31bdf6..30aee1eb4 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -258,6 +258,7 @@ public class IndexBean {
         // give the messages a chance to make it to the window
         try { Thread.sleep(1000); } catch (InterruptedException ie) {}
         // and give them something to look at in any case
+        // FIXME name will be HTML escaped twice
         return _("Starting tunnel") + ' ' + getTunnelName(_tunnel) + "...";
     }
     
@@ -271,6 +272,7 @@ public class IndexBean {
         // give the messages a chance to make it to the window
         try { Thread.sleep(1000); } catch (InterruptedException ie) {}
         // and give them something to look at in any case
+        // FIXME name will be HTML escaped twice
         return _("Stopping tunnel") + ' ' + getTunnelName(_tunnel) + "...";
     }
     
@@ -352,6 +354,7 @@ public class IndexBean {
         List<String> msgs = doSave();
         if (ksMsg != null)
             msgs.add(ksMsg);
+        // FIXME name will be HTML escaped twice
         return getMessages(msgs);
     }
 
@@ -402,7 +405,8 @@ public class IndexBean {
                             name = Long.toString(_context.clock().now());
                     }
                 }
-                name = "i2ptunnel-deleted-" + name.replace(' ', '_') + '-' + _context.clock().now() + "-privkeys.dat";
+                name = name.replace(' ', '_').replace(':', '_').replace("..", "_").replace('/', '_').replace('\\', '_');
+                name = "i2ptunnel-deleted-" + name + '-' + _context.clock().now() + "-privkeys.dat";
                 File backupDir = new SecureFile(_context.getConfigDir(), TunnelController.KEY_BACKUP_DIR);
                 File to;
                 if (backupDir.isDirectory() || backupDir.mkdir())
@@ -451,13 +455,11 @@ public class IndexBean {
     }
 
     public boolean allowCSS() {
-        String css = _context.getProperty(PROP_CSS_DISABLED);
-        return (css == null);
+        return !_context.getBooleanProperty(PROP_CSS_DISABLED);
     }
     
     public boolean allowJS() {
-        String js = _context.getProperty(PROP_JS_DISABLED);
-        return (js == null);
+        return !_context.getBooleanProperty(PROP_JS_DISABLED);
     }
     
     public int getTunnelCount() {
@@ -727,8 +729,9 @@ public class IndexBean {
         _name = (name != null ? name.trim() : null);
     }
     /** one line description */
-    public void setDescription(String description) { 
-        _description = (description != null ? description.trim() : null);
+    public void setNofilter_description(String description) { 
+        // '#' will blow up DataHelper.storeProps()
+        _description = (description != null ? description.replace('#', ' ').trim() : null);
     }
     /** I2CP host the router is on, ignored when in router context */
     public void setClientHost(String host) {
diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index 449f42949..8fa03c96c 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -79,7 +79,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 <label for="description" accesskey="e">
                     <%=intl._("Description")%>:(<span class="accessKey">E</span>)
                 </label>
-                <input type="text" size="60" maxlength="80" name="description"  id="description" title="Tunnel Description" value="<%=editBean.getTunnelDescription(curTunnel)%>" class="freetext" />                
+                <input type="text" size="60" maxlength="80" name="nofilter_description"  id="description" title="Tunnel Description" value="<%=editBean.getTunnelDescription(curTunnel)%>" class="freetext" />                
             </div>
                  
             <div class="subdivider">
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index 6ceacc787..43b173503 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -79,7 +79,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 <label for="description" accesskey="e">
                     <%=intl._("Description")%>(<span class="accessKey">e</span>):
                 </label>
-                <input type="text" size="60" maxlength="80" name="description"  id="description" title="Tunnel Description" value="<%=editBean.getTunnelDescription(curTunnel)%>" class="freetext" />                
+                <input type="text" size="60" maxlength="80" name="nofilter_description"  id="description" title="Tunnel Description" value="<%=editBean.getTunnelDescription(curTunnel)%>" class="freetext" />                
             </div>
             <div id="startupField" class="rowItem">
                 <label for="startOnLoad" accesskey="a">
diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
index 0749bb54a..fe0f67a8b 100644
--- a/apps/i2ptunnel/jsp/wizard.jsp
+++ b/apps/i2ptunnel/jsp/wizard.jsp
@@ -233,11 +233,11 @@
                 <label for="description" accesskey="e">
                     <%=intl._("Description")%>:(<span class="accessKey">E</span>)
                 </label>
-                <input type="text" size="60" maxlength="80" name="description"  id="description" title="Tunnel Description" value="<%=(!"null".equals(request.getParameter("description")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("description")) : "" ) %>" class="freetext" />
+                <input type="text" size="60" maxlength="80" name="nofilter_description"  id="description" title="Tunnel Description" value="<%=(!"null".equals(request.getParameter("description")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("description")) : "" ) %>" class="freetext" />
             </div><%
             } else {
             %><input type="hidden" name="name" value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("name"))%>" />
-            <input type="hidden" name="description" value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("description"))%>" /><%
+            <input type="hidden" name="nofilter_description" value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("description"))%>" /><%
             } /* curPage 3 */
 
                /* End page 3 */ %>
@@ -484,7 +484,7 @@
             <input type="hidden" name="tunnelBackupQuantity" value="0" />
             <input type="hidden" name="clientHost" value="internal" />
             <input type="hidden" name="clientport" value="internal" />
-            <input type="hidden" name="customOptions" value="" />
+            <input type="hidden" name="nofilter_customOptions" value="" />
 
             <%
               if (!"streamrclient".equals(tunnelType)) {
@@ -501,9 +501,9 @@
                 }
                 if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) {
             %><input type="hidden" name="proxyUsername" value="" />
-            <input type="hidden" name="proxyPassword" value="" />
+            <input type="hidden" name="nofilter_proxyPassword" value="" />
             <input type="hidden" name="outproxyUsername" value="" />
-            <input type="hidden" name="outproxyPassword" value="" /><%
+            <input type="hidden" name="nofilter_outproxyPassword" value="" /><%
                 }
                 if ("httpclient".equals(tunnelType)) {
             %><input type="hidden" name="jumpList" value="http://i2host.i2p/cgi-bin/i2hostjump?