echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Console, i2ptunnel: Reword blinding options and tooltips

Browse Source 
i2ptunnel: Unhide blinding options
This commit is contained in:
zzz
2019-05-30 15:16:47 +00:00
parent f049319500
commit aae81a7b5f
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
apps/i2ptunnel/jsp/editServer.jsi
View File

@ -441,15 +441,15 @@
<option title="<%=intl._t("Allow all clients to connect to this service")%>" value="0" <%=(curEncryptMode.equals("0") ? " selected=\"selected\"" : "")%> >
<%=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()
} // mode = 10
%>
<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>
<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);
boolean allowBlinding = (curSigType == 7 || curSigType == 11);
@ -458,22 +458,22 @@
<option title="<%=intl._t("Prevents server discovery by floodfills")%>" value="2" <%=(curEncryptMode.equals("2") ? " selected=\"selected\"" : "")%> >
<%=intl._t("Blinded")%></option>
<%
if (editBean.isAdvanced()) {
if (true /* editBean.isAdvanced() */) {
%>
<option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%> >
<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()
} // allowBlinding
@ -483,7 +483,7 @@
</tr><tr>
<td>
<%
if (allowBlinding && editBean.isAdvanced()) {
if (allowBlinding /* && editBean.isAdvanced() */) {
%>
<b><%=intl._t("Optional lookup password")%>:</b>
<%
@ -504,7 +504,7 @@
</tr><tr>
<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" />
<%
@ -515,7 +515,7 @@
</td>
</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");
if (pskClient || dhClient) {

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

@ -160,7 +160,7 @@ public class ConfigKeyringHandler extends FormHandler {
_context.netDb().setBlindData(bdout);
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) {
addFormError(_t("Invalid destination") + ": " + iae.getMessage());

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

@ -79,7 +79,7 @@ public class ConfigKeyringHelper extends HelperBase {
}
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());
if (!local)
@ -110,14 +110,14 @@ public class ConfigKeyringHelper extends HelperBase {
String s;
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)
s = _t("Blinded with lookup password");

22
apps/routerconsole/jsp/configkeyring.jsp
View File

@ -46,20 +46,20 @@
</tr><tr>
<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>
<td align="right"><b><%=intl._t("Encryption Key")%>:</b></td>