Changeset aae81a7b


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/jsp/editServer.jsi

    rf049319 raae81a7b  
    442442                    <%=intl._t("Disable")%></option>
    443443<%
    444                 if (editBean.isAdvanced() || curEncryptMode.equals("10")) {
     444                if (curEncryptMode.equals("10")) {
    445445%>
    446446                <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="10" <%=(curEncryptMode.equals("10") ? " selected=\"selected\"" : "")%> >
    447447                    <%=intl._t("Disable")%> (LS2)</option>
    448448<%
    449                 } // isAdvanced()
    450 %>
    451                 <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : "")%> >
    452                     <%=intl._t("Encrypted")%></option>
     449                } // mode = 10
     450%>
     451                <option title="<%=intl._t("Send key to all users.")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : "")%> >
     452                    <%=intl._t("Encrypted")%> (AES)</option>
    453453<%
    454454                int curSigType = editBean.getSigType(curTunnel, tunnelType);
     
    459459                    <%=intl._t("Blinded")%></option>
    460460<%
    461                      if (editBean.isAdvanced()) {
    462 %>
    463                 <option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%> >
     461                     if (true /* editBean.isAdvanced() */) {
     462%>
     463                <option title="<%=intl._t("Send password to all users.")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%> >
    464464                    <%=intl._t("Blinded with lookup password")%></option>
    465                 <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : "")%> >
    466                     <%=intl._t("Blinded with shared key")%> (PSK)</option>
    467                 <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : "")%> >
    468                     <%=intl._t("Blinded with lookup password and shared key")%> (PSK)</option>
    469                 <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : "")%> >
    470                     <%=intl._t("Blinded with per-user key")%> (PSK)</option>
    471                 <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : "")%> >
    472                     <%=intl._t("Blinded with lookup password and per-user key")%> (PSK)</option>
    473                 <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : "")%> >
    474                     <%=intl._t("Blinded with per-user key")%> (DH)</option>
    475                 <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : "")%> >
    476                     <%=intl._t("Blinded with lookup password and per-user key")%> (DH)</option>
     465                <option title="<%=intl._t("Send key to all users.")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : "")%> >
     466                    <%=intl._t("Encrypted")%> (PSK)</option>
     467                <option title="<%=intl._t("Send key and password to all users.")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : "")%> >
     468                    <%=intl._t("Encrypted with lookup password")%> (PSK)</option>
     469                <option title="<%=intl._t("Send individual key to each user.")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : "")%> >
     470                    <%=intl._t("Encrypted with per-user key")%> (PSK)</option>
     471                <option title="<%=intl._t("Send individual key to each user.")%> <%=intl._t("Send password to all users.")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : "")%> >
     472                    <%=intl._t("Encrypted with lookup password and per-user key")%> (PSK)</option>
     473                <option title="<%=intl._t("Enter key from each user.")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : "")%> >
     474                    <%=intl._t("Encrypted with per-user key")%> (DH)</option>
     475                <option title="<%=intl._t("Enter key from each user.")%> <%=intl._t("Send password to all users.")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : "")%> >
     476                    <%=intl._t("Encrypted with lookup password and per-user key")%> (DH)</option>
    477477<%
    478478                     } // isAdvanced()
     
    484484            <td>
    485485<%
    486                 if (allowBlinding && editBean.isAdvanced()) {
     486                if (allowBlinding /* && editBean.isAdvanced() */) {
    487487%>
    488488                <b><%=intl._t("Optional lookup password")%>:</b>
     
    505505            <td>
    506506<%
    507                 if (allowBlinding && editBean.isAdvanced()) {
     507                if (allowBlinding /* && editBean.isAdvanced() */) {
    508508%>
    509509                <input type="password" name="nofilter_blindedPassword" title="<%=intl._t("Set password required to access this service")%>" value="<%=editBean.getBlindedPassword(curTunnel)%>" class="freetext password" />
     
    516516        </tr>
    517517<%
    518                 if (allowBlinding && editBean.isAdvanced()) {
     518                if (allowBlinding /* && editBean.isAdvanced() */) {
    519519                    boolean pskClient = curEncryptMode.equals("6") || curEncryptMode.equals("7");
    520520                    boolean dhClient = curEncryptMode.equals("8") || curEncryptMode.equals("9");
  • apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java

    rf049319 raae81a7b  
    161161                        addFormNotice(_t("Key for {0} added to keyring", bdout.toBase32()));
    162162                        if (_mode == 6 || _mode == 7) {
    163                             addFormNotice(_t("Send your new key to the server opererator") + ": " + pk.toPublic().toBase64());
     163                            addFormNotice(_t("Send key to server opererator.") + ' ' + pk.toPublic().toBase64());
    164164                        }
    165165                    } catch (IllegalArgumentException iae) {
  • apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java

    rf049319 raae81a7b  
    8080            buf.append("</td><td>");
    8181            if (!local)
    82                 buf.append(_t("Encrypted")).append("</td><td>");
     82                buf.append(_t("Encrypted")).append(" (AES)</td><td>");
    8383            SessionKey sk = e.getValue();
    8484            buf.append(sk.toBase64());
     
    111111                if (type == BlindData.AUTH_DH) {
    112112                    if (secret != null)
    113                         s = _t("Blinded with lookup password and per-user key");
     113                        s = _t("Encrypted with lookup password") + " (DH)";
    114114                    else
    115                         s = _t("Blinded with per-user key");
     115                        s = _t("Encrypted") + " (DH)";
    116116                } else if (type == BlindData.AUTH_PSK) {
    117117                    if (secret != null)
    118                         s = _t("Blinded with lookup password and shared key");
     118                        s = _t("Encrypted with lookup password") + " (PSK)";
    119119                    else
    120                         s = _t("Blinded with shared key");
     120                        s = _t("Encrypted") + " (PSK)";
    121121                } else  {
    122122                    if (secret != null)
  • apps/routerconsole/jsp/configkeyring.jsp

    rf049319 raae81a7b  
    4747          <td align="right"><b><%=intl._t("Type")%>:</b></td>
    4848          <td><select id="encryptMode" name="encryptMode" class="selectbox">
    49           <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="1">
    50               <%=intl._t("Encrypted")%></option>
     49          <option title="<%=intl._t("Enter key provided by server operator.")%>" value="1">
     50              <%=intl._t("Encrypted")%> (AES)</option>
    5151          <option title="<%=intl._t("Prevents server discovery by floodfills")%>" value="2">
    5252              <%=intl._t("Blinded")%></option>
    53           <option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3">
     53          <option title="<%=intl._t("Enter password provided by server operator.")%>" value="3">
    5454              <%=intl._t("Blinded with lookup password")%></option>
    55           <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4" selected="selected">
    56               <%=intl._t("Blinded with shared key")%></option>
    57           <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="5">
    58               <%=intl._t("Blinded with lookup password and shared key")%></option>
    59           <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="6">
    60               <%=intl._t("Blinded with per-user key")%> (DH)</option>
    61           <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="7">
    62               <%=intl._t("Blinded with lookup password and per-user key")%> (DH)</option>
     55          <option title="<%=intl._t("Enter key provided by server operator.")%>" value="4" selected="selected">
     56              <%=intl._t("Encrypted")%> (PSK)</option>
     57          <option title="<%=intl._t("Enter key and password provided by server operator.")%>" value="5">
     58              <%=intl._t("Encrypted with lookup password")%> (PSK)</option>
     59          <option title="<%=intl._t("Key will be generated.")%> <%=intl._t("Send key to server operator.")%>" value="6">
     60              <%=intl._t("Encrypted")%> (DH)</option>
     61          <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">
     62              <%=intl._t("Encrypted with lookup password")%> (DH)</option>
    6363          </select></td>
    6464        </tr><tr>
Note: See TracChangeset for help on using the changeset viewer.