Changeset 0dbc809

Timestamp:

Apr 13, 2019 7:02:35 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

89b38f4f

Parents:

64c7625

Message:

i2ptunnel: Fix saving encrypted LS config
Disable registration authentication when encrypted

Location:

apps/i2ptunnel

Files:

• java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java (modified) (3 diffs)
• jsp/register.jsp (modified) (1 diff)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java

@@ -77 +77 @@
     private Destination _dest;
     private String _filterDefinition;
+    private int _encryptMode;
 
     public TunnelConfig() {
@@ -259 +260 @@
     /** @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;
     }
     
@@ -676 +645 @@
             // 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;
             }
         }

apps/i2ptunnel/jsp/register.jsp

@@ -79 +79 @@
                 <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)) {
 %>