Changeset cde5353

Timestamp:

Apr 8, 2019 8:37:58 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

6237fc8

Parents:

5490de1

Message:

i2ptunnel: Config UI for encrypted ls2

Location:

apps/i2ptunnel

Files:

• java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java (modified) (1 diff)
• java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java (modified) (2 diffs)
• java/src/net/i2p/i2ptunnel/web/EditBean.java (modified) (1 diff)
• java/src/net/i2p/i2ptunnel/web/IndexBean.java (modified) (1 diff)
• jsp/editServer.jsi (modified) (2 diffs)

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

@@ -538 +538 @@
         return getBooleanProperty(tunnel, "i2cp.encryptLeaseSet");
     }
+    
+    /**
+     *  @since 0.9.40
+     */
+    public int getEncryptMode(int tunnel) {
+        if (getEncrypt(tunnel))
+            return 1;
+        if (getProperty(tunnel, "i2cp.leaseSetType", "1").equals("5")) {
+            String pw = getBlindedPassword(tunnel);
+            if (pw != null && pw.length() > 0)
+                return 3;
+            return 2;
+            // LS auth (rv 4-7) TODO
+        }
+        return 0;
+    }
+    
+    /**
+     *  @since 0.9.40
+     */
+    public String getBlindedPassword(int tunnel) {
+        return getProperty(tunnel, "i2cp.leaseSetSecret", "");
+    }
 
     /**

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

@@ -256 +256 @@
             _booleanOptions.remove("i2cp.encryptLeaseSet");
     }
+
+    /** @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;
+        }
+    }
+    
+    /** @since 0.9.40 */
+    public void setBlindedPassword(String s) {
+        if (s != null && s.length() > 0)
+            _otherOptions.put("i2cp.leaseSetSecret", s);
+        else
+            _otherOptions.remove("i2cp.leaseSetSecret");
+    }
+
     public void setDCC(boolean val) {
         if (val)
@@ -804 +851 @@
          PROP_MAX_TOTAL_CONNS_MIN, PROP_MAX_TOTAL_CONNS_HOUR, PROP_MAX_TOTAL_CONNS_DAY,
          PROP_MAX_STREAMS, I2PClient.PROP_SIGTYPE,
-        "inbound.randomKey", "outbound.randomKey", "i2cp.leaseSetSigningPrivateKey", "i2cp.leaseSetPrivateKey",
-         I2PTunnelServer.PROP_ALT_PKF
+         "inbound.randomKey", "outbound.randomKey", "i2cp.leaseSetSigningPrivateKey", "i2cp.leaseSetPrivateKey",
+         I2PTunnelServer.PROP_ALT_PKF,
+         "i2cp.leaseSetSecret"
         };
     private static final String _httpServerOpts[] = {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

@@ -211 +211 @@
     public boolean getEncrypt(int tunnel) {
         return _helper.getEncrypt(tunnel);
+    }
+    
+    /**
+     *  @since 0.9.40
+     */
+    public String getEncryptMode(int tunnel) {
+        return Integer.toString(_helper.getEncryptMode(tunnel));
+    }
+    
+    /**
+     *  @since 0.9.40
+     */
+    public String getBlindedPassword(int tunnel) {
+        return _helper.getBlindedPassword(tunnel);
     }
     

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

@@ -826 +826 @@
     }
 
+    /** @since 0.9.40 */
+    public void setEncryptMode(String val) {
+        if (val != null) {
+            try {
+                _config.setEncryptMode(Integer.parseInt(val.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
+    }
+    
+    /** @since 0.9.40 */
+    public void setNofilter_blindedPassword(String s) {
+        _config.setBlindedPassword(s);
+    }
+
     /** @since 0.8.9 */
     public void setDCC(String moo) {

apps/i2ptunnel/jsp/editServer.jsi

@@ -495 +495 @@
         <tr>
             <td colspan="2">
-                <label title="<%=intl._t("Only clients with the encryption key will be able to connect")%>"><input value="1" type="checkbox" id="startOnLoad" name="encrypt"<%=(editBean.getEncrypt(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
-                <%=intl._t("Only allow clients with the encryption key to connect to this server")%></label>
+                <%
+                   String curEncryptMode = editBean.getEncryptMode(curTunnel);
+                  %>
+                <span class="multiOption"><label title="<%=intl._t("Allow all clients to connect to this service")%>"><input value="0" type="radio" name="encryptMode"<%=(curEncryptMode.equals("0") ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <%=intl._t("Disable")%></label></span>
+                <span class="multiOption"><label title="<%=intl._t("Only clients with the encryption key will be able to connect")%>"><input value="1" type="radio" name="encryptMode"<%=(curEncryptMode.equals("1") ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <%=intl._t("Encrypted")%></label></span>
+                <%
+                    int curSigType = editBean.getSigType(curTunnel, tunnelType);
+                    if (curSigType == 7 || curSigType == 11) {
+                  %>
+                <span class="multiOption"><label title="<%=intl._t("Prevents snooping by floodfills")%>"><input value="2" type="radio" name="encryptMode"<%=(curEncryptMode.equals("2") ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <%=intl._t("Blinded")%></label></span>
+                <span class="multiOption"><label title="<%=intl._t("Only clients with the password will be able to connect")%>"><input value="3" type="radio" name="encryptMode"<%=(curEncryptMode.equals("3") ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <%=intl._t("Blinded with password")%></label></span>
+                  <%
+                     if (editBean.isAdvanced()) {
+                         // TODO, unimplemented
+                    %>
+                <span class="multiOption"><label title="<%=intl._t("Only clients with the encryption key will be able to connect")%>"><input value="4" type="radio" name="encryptMode"<%=(curEncryptMode.equals("4") ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <%=intl._t("Blinded with shared key")%></label></span>
+                <span class="multiOption"><label title="<%=intl._t("Only clients with the password and key will be able to connect")%>"><input value="5" type="radio" name="encryptMode"<%=(curEncryptMode.equals("5") ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <%=intl._t("Blinded with shared key and password")%></label></span>
+                <span class="multiOption"><label title="<%=intl._t("Only clients with the encryption key will be able to connect")%>"><input value="6" type="radio" name="encryptMode"<%=(curEncryptMode.equals("6") ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <%=intl._t("Blinded with per-user key")%></label></span>
+                <span class="multiOption"><label title="<%=intl._t("Only clients with the password and key will be able to connect")%>"><input value="7" type="radio" name="encryptMode"<%=(curEncryptMode.equals("7") ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <%=intl._t("Blinded with shared password and per-user key")%></label></span>
+                <%
+                        } // isAdvanced()
+                    } // curSigType
+                  %>
             </td>
         </tr>
@@ -519 +548 @@
             </td>
         </tr>
+
+        <%
+            if (curSigType == 7 || curSigType == 11) {
+          %>
+        <tr>
+            <td>
+                <b><%=intl._t("Blinded Password")%>:</b>
+                <input type="password" name="nofilter_blindedPassword" title="<%=intl._t("Set password required to access this service")%>" value="<%=editBean.getBlindedPassword(curTunnel)%>" class="freetext password" />
+            </td><td> </td>
+        </tr>
+        <%
+            } // curSigType
+          %>
 
         <tr>