Changeset aae81a7b

Timestamp:

May 30, 2019 3:16:47 PM (11 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

447e29e

Parents:

f049319

Message:

Console, i2ptunnel: Reword blinding options and tooltips
i2ptunnel: Unhide blinding options

Location:

apps

Files:

• i2ptunnel/jsp/editServer.jsi (modified) (5 diffs)
• routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java (modified) (1 diff)
• routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java (modified) (2 diffs)
• routerconsole/jsp/configkeyring.jsp (modified) (1 diff)

apps/i2ptunnel/jsp/editServer.jsi

@@ -442 +442 @@
                     <%=intl._t("Disable")%></option>
 <%
-                if (editBean.isAdvanced() || curEncryptMode.equals("10")) {
+                if (curEncryptMode.equals("10")) {
 %>
                 <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="10" <%=(curEncryptMode.equals("10") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Disable")%> (LS2)</option>
 <%
-                } // isAdvanced()
-%>
-                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : "")%> >
-                    <%=intl._t("Encrypted")%></option>
+                } // mode = 10
+%>
+                <option title="<%=intl._t("Send key to all users.")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : "")%> >
+                    <%=intl._t("Encrypted")%> (AES)</option>
 <%
                 int curSigType = editBean.getSigType(curTunnel, tunnelType);
@@ -459 +459 @@
                     <%=intl._t("Blinded")%></option>
 <%
-                     if (editBean.isAdvanced()) {
-%>
-                <option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%> >
+                     if (true /* editBean.isAdvanced() */) {
+%>
+                <option title="<%=intl._t("Send password to all users.")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Blinded with lookup password")%></option>
-                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : "")%> >
-                    <%=intl._t("Blinded with shared key")%> (PSK)</option>
-                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : "")%> >
-                    <%=intl._t("Blinded with lookup password and shared key")%> (PSK)</option>
-                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : "")%> >
-                    <%=intl._t("Blinded with per-user key")%> (PSK)</option>
-                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : "")%> >
-                    <%=intl._t("Blinded with lookup password and per-user key")%> (PSK)</option>
-                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : "")%> >
-                    <%=intl._t("Blinded with per-user key")%> (DH)</option>
-                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : "")%> >
-                    <%=intl._t("Blinded with lookup password and per-user key")%> (DH)</option>
+                <option title="<%=intl._t("Send key to all users.")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : "")%> >
+                    <%=intl._t("Encrypted")%> (PSK)</option>
+                <option title="<%=intl._t("Send key and password to all users.")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : "")%> >
+                    <%=intl._t("Encrypted with lookup password")%> (PSK)</option>
+                <option title="<%=intl._t("Send individual key to each user.")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : "")%> >
+                    <%=intl._t("Encrypted with per-user key")%> (PSK)</option>
+                <option title="<%=intl._t("Send individual key to each user.")%> <%=intl._t("Send password to all users.")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : "")%> >
+                    <%=intl._t("Encrypted with lookup password and per-user key")%> (PSK)</option>
+                <option title="<%=intl._t("Enter key from each user.")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : "")%> >
+                    <%=intl._t("Encrypted with per-user key")%> (DH)</option>
+                <option title="<%=intl._t("Enter key from each user.")%> <%=intl._t("Send password to all users.")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : "")%> >
+                    <%=intl._t("Encrypted with lookup password and per-user key")%> (DH)</option>
 <%
                      } // isAdvanced()
@@ -484 +484 @@
             <td>
 <%
-                if (allowBlinding && editBean.isAdvanced()) {
+                if (allowBlinding /* && editBean.isAdvanced() */) {
 %>
                 <b><%=intl._t("Optional lookup password")%>:</b>
@@ -505 +505 @@
             <td>
 <%
-                if (allowBlinding && editBean.isAdvanced()) {
+                if (allowBlinding /* && editBean.isAdvanced() */) {
 %>
                 <input type="password" name="nofilter_blindedPassword" title="<%=intl._t("Set password required to access this service")%>" value="<%=editBean.getBlindedPassword(curTunnel)%>" class="freetext password" />
@@ -516 +516 @@
         </tr>
 <%
-                if (allowBlinding && editBean.isAdvanced()) {
+                if (allowBlinding /* && editBean.isAdvanced() */) {
                     boolean pskClient = curEncryptMode.equals("6") || curEncryptMode.equals("7");
                     boolean dhClient = curEncryptMode.equals("8") || curEncryptMode.equals("9");

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java

@@ -161 +161 @@
                         addFormNotice(_t("Key for {0} added to keyring", bdout.toBase32()));
                         if (_mode == 6 || _mode == 7) {
-                            addFormNotice(_t("Send your new key to the server opererator") + ": " + pk.toPublic().toBase64());
+                            addFormNotice(_t("Send key to server opererator.") + ' ' + pk.toPublic().toBase64());
                         }
                     } catch (IllegalArgumentException iae) {

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java

@@ -80 +80 @@
             buf.append("</td><td>");
             if (!local)
-                buf.append(_t("Encrypted")).append("</td><td>");
+                buf.append(_t("Encrypted")).append(" (AES)</td><td>");
             SessionKey sk = e.getValue();
             buf.append(sk.toBase64());
@@ -111 +111 @@
                 if (type == BlindData.AUTH_DH) {
                     if (secret != null)
-                        s = _t("Blinded with lookup password and per-user key");
+                        s = _t("Encrypted with lookup password") + " (DH)";
                     else
-                        s = _t("Blinded with per-user key");
+                        s = _t("Encrypted") + " (DH)";
                 } else if (type == BlindData.AUTH_PSK) {
                     if (secret != null)
-                        s = _t("Blinded with lookup password and shared key");
+                        s = _t("Encrypted with lookup password") + " (PSK)";
                     else
-                        s = _t("Blinded with shared key");
+                        s = _t("Encrypted") + " (PSK)";
                 } else  {
                     if (secret != null)

apps/routerconsole/jsp/configkeyring.jsp

@@ -47 +47 @@
           <td align="right"><b><%=intl._t("Type")%>:</b></td>
           <td><select id="encryptMode" name="encryptMode" class="selectbox">
-          <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="1">
-              <%=intl._t("Encrypted")%></option>
+          <option title="<%=intl._t("Enter key provided by server operator.")%>" value="1">
+              <%=intl._t("Encrypted")%> (AES)</option>
           <option title="<%=intl._t("Prevents server discovery by floodfills")%>" value="2">
               <%=intl._t("Blinded")%></option>
-          <option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3">
+          <option title="<%=intl._t("Enter password provided by server operator.")%>" value="3">
               <%=intl._t("Blinded with lookup password")%></option>
-          <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4" selected="selected">
-              <%=intl._t("Blinded with shared key")%></option>
-          <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="5">
-              <%=intl._t("Blinded with lookup password and shared key")%></option>
-          <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="6">
-              <%=intl._t("Blinded with per-user key")%> (DH)</option>
-          <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="7">
-              <%=intl._t("Blinded with lookup password and per-user key")%> (DH)</option>
+          <option title="<%=intl._t("Enter key provided by server operator.")%>" value="4" selected="selected">
+              <%=intl._t("Encrypted")%> (PSK)</option>
+          <option title="<%=intl._t("Enter key and password provided by server operator.")%>" value="5">
+              <%=intl._t("Encrypted with lookup password")%> (PSK)</option>
+          <option title="<%=intl._t("Key will be generated.")%> <%=intl._t("Send key to server operator.")%>" value="6">
+              <%=intl._t("Encrypted")%> (DH)</option>
+          <option title="<%=intl._t("Enter password provided by server operator.")%> <%=intl._t("Key will be generated.")%> <%=intl._t("Send key to server operator.")%>" value="7">
+              <%=intl._t("Encrypted with lookup password")%> (DH)</option>
           </select></td>
         </tr><tr>