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

i2ptunnel: Fix saving encrypted LS config

Browse Source 
Disable registration authentication when encrypted
This commit is contained in:
zzz
2019-04-13 19:02:35 +00:00
parent 64c7625524
commit 0dbc809111
2 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
View File

@@ -76,6 +76,7 @@ public class TunnelConfig {
private String _newProxyPW;
private Destination _dest;
private String _filterDefinition;
private int _encryptMode;
public TunnelConfig() {
_context = I2PAppContext.getGlobalContext();
@@ -258,40 +259,8 @@ public class TunnelConfig {
/** @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;
}
/** @since 0.9.40 */
@@ -675,12 +644,45 @@ public class TunnelConfig {
// 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;
}
}
// override bundle setting set above