From 0dbc80911111f7f625bb06bdbec47659baba6ea6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 13 Apr 2019 19:02:35 +0000
Subject: [PATCH] i2ptunnel: Fix saving encrypted LS config Disable
 registration authentication when encrypted

---
 .../net/i2p/i2ptunnel/ui/TunnelConfig.java    | 72 ++++++++++---------
 apps/i2ptunnel/jsp/register.jsp               |  9 ++-
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
index e4dabb00c..069695a21 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
@@ -76,6 +76,7 @@ public class TunnelConfig {
     private String _newProxyPW;
     private Destination _dest;
     private String _filterDefinition;
+    private int _encryptMode;
 
     public TunnelConfig() {
         _context = I2PAppContext.getGlobalContext();
@@ -258,40 +259,8 @@ public class TunnelConfig {
 
     /** @since 0.9.40 */
     public void setEncryptMode(int mode) {
-        switch (mode) {
-        case 0:
-        default:
-            setEncrypt(false);
-            _otherOptions.remove("i2cp.leaseSetSecret");
-            break;
-
-        case 1:
-            setEncrypt(true);
-            _otherOptions.remove("i2cp.leaseSetType");
-            // doesn't work, after this in the form
-            _otherOptions.remove("i2cp.leaseSetSecret");
-            break;
-
-        case 4:
-        case 6:
-            // TODO
-            // Fallthrough
-        case 2:
-            setEncrypt(false);
-            _otherOptions.put("i2cp.leaseSetType", "5");
-            // doesn't work, after this in the form
-            _otherOptions.remove("i2cp.leaseSetSecret");
-            break;
-
-        case 5:
-        case 7:
-            // TODO
-            // Fallthrough
-        case 3:
-            setEncrypt(false);
-            _otherOptions.put("i2cp.leaseSetType", "5");
-            break;
-        }
+        setEncrypt(mode == 1);
+        _encryptMode = mode;
     }
     
     /** @since 0.9.40 */
@@ -675,12 +644,45 @@ public class TunnelConfig {
             
             // see TunnelController.setConfig()
             _booleanOptions.add(TunnelController.PROP_LIMITS_SET);
-            for (String p : _booleanServerOpts)
+            for (String p : _booleanServerOpts) {
                 config.setProperty(OPT + p, Boolean.toString(_booleanOptions.contains(p)));
+            }
+
             for (String p : _otherServerOpts) {
                 if (_otherOptions.containsKey(p))
                     config.setProperty(OPT + p, _otherOptions.get(p));
             }
+
+            switch (_encryptMode) {
+              case 0:
+              default:
+                config.remove(OPT + "i2cp.leaseSetSecret");
+                if ("5".equals(config.get(OPT + "i2cp.leaseSetType")))
+                    config.remove(OPT + "i2cp.leaseSetType");
+                break;
+
+              case 1:
+                config.remove(OPT + "i2cp.leaseSetType");
+                config.remove(OPT + "i2cp.leaseSetSecret");
+                break;
+
+              case 4:
+              case 6:
+                // TODO
+                // Fallthrough
+              case 2:
+                config.put(OPT + "i2cp.leaseSetType", "5");
+                config.remove(OPT + "i2cp.leaseSetSecret");
+                break;
+    
+              case 5:
+              case 7:
+                // TODO
+                // Fallthrough
+              case 3:
+                config.put(OPT + "i2cp.leaseSetType", "5");
+                break;
+            }
         }
 
         // override bundle setting set above
diff --git a/apps/i2ptunnel/jsp/register.jsp b/apps/i2ptunnel/jsp/register.jsp
index 5f4f229e9..91bcf7b78 100644
--- a/apps/i2ptunnel/jsp/register.jsp
+++ b/apps/i2ptunnel/jsp/register.jsp
@@ -78,7 +78,14 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 <input type="hidden" name="type" value="<%=tunnelType%>" />
                 <input type="submit" class="default" name="action" value="Save changes" />
 <%
-    if (!"new".equals(tunnelType)) {
+    String curEncryptMode = editBean.getEncryptMode(curTunnel);
+    if (!"0".equals(curEncryptMode)) {
+%>
+      <table><tr><td class="infohelp">
+        <%=intl._t("This service uses encrypted leasesets. Registration is not recommended. Registration authentication is disabled.")%>
+      </td></tr>
+<%
+    } else if (!"new".equals(tunnelType)) {
 %>
 
 <table>