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

i2ptunnel: Copy over all relevant options to other shared clients

Browse Source 
when saving, not just tunnel quantity and length (ticket #1545)
Don't take sig type from client private key file unless persistent option is set also
This commit is contained in:
zzz
2020-05-04 14:10:20 +00:00
parent f04526d83a
commit 26af857dc7
1 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
View File

@@ -184,12 +184,7 @@ public class GeneralHelper {
// Only modify this non-current tunnel
// if it belongs to a shared destination, and is of supported type
if (Boolean.parseBoolean(c.getSharedClient()) && TunnelController.isClient(c.getType())) {
Properties cOpt = c.getConfig("");
config.updateTunnelQuantities(cOpt);
cOpt.setProperty("option.inbound.nickname", TunnelConfig.SHARED_CLIENT_NICKNAME);
cOpt.setProperty("option.outbound.nickname", TunnelConfig.SHARED_CLIENT_NICKNAME);
c.setConfig(cOpt, "");
copySharedOptions(config, props, c);
try {
tcg.saveConfig(c);
} catch (IOException ioe) {
@@ -203,6 +198,48 @@ public class GeneralHelper {
return msgs;
}
/**
* I2CP/Dest/LS options affecting shared client tunnels.
* Streaming options should not be here, each client gets its own SocketManger.
* All must be prefixed with "option."
* @since 0.9.46
*/
private static final String[] SHARED_OPTIONS = {
// I2CP
"i2cp.reduceOnIdle", "i2cp.closeOnIdle", "i2cp.newDestOnResume",
"i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.closeIdleTime",
// dest / LS
I2PClient.PROP_SIGTYPE, "i2cp.leaseSetEncType", "i2cp.leaseSetType",
"persistentClientKey",
// following are mostly server but could also be persistent client
"inbound.randomKey", "outbound.randomKey", "i2cp.leaseSetSigningPrivateKey", "i2cp.leaseSetPrivateKey"
};
/**
* Copy relevant options over
* @since 0.9.46 pulled out of updateTunnelConfig
*/
private static void copySharedOptions(TunnelConfig fromConfig, Properties from,
TunnelController to) {
Properties cOpt = to.getConfig("");
fromConfig.updateTunnelQuantities(cOpt);
cOpt.setProperty("option.inbound.nickname", TunnelConfig.SHARED_CLIENT_NICKNAME);
cOpt.setProperty("option.outbound.nickname", TunnelConfig.SHARED_CLIENT_NICKNAME);
for (String p : SHARED_OPTIONS) {
String k = TunnelController.PFX_OPTION + p;
String v = from.getProperty(k);
if (v != null)
cOpt.setProperty(k, v);
else
cOpt.remove(k);
}
// persistent client key, not prefixed with "option."
String v = from.getProperty(TunnelController.PROP_FILE);
if (v != null)
cOpt.setProperty(TunnelController.PROP_FILE, v);
to.setConfig(cOpt, "");
}
protected static List<String> saveConfig(
I2PAppContext context, TunnelControllerGroup tcg, int tunnel) {
List<String> rv = tcg.clearAllMessages();
@@ -673,22 +710,22 @@ public class GeneralHelper {
public int getSigType(int tunnel, String newTunnelType) {
SigType type;
String ttype;
boolean isShared;
if (tunnel >= 0) {
Destination d = getDestination(tunnel);
if (d != null) {
type = d.getSigType();
if (type != null)
return type.getCode();
ttype = getTunnelType(tunnel);
if (!TunnelController.isClient(ttype) ||
getBooleanProperty(tunnel, "persistentClientKey")) {
Destination d = getDestination(tunnel);
if (d != null) {
type = d.getSigType();
if (type != null)
return type.getCode();
}
}
String stype = getProperty(tunnel, I2PClient.PROP_SIGTYPE, null);
type = stype != null ? SigType.parseSigType(stype) : null;
ttype = getTunnelType(tunnel);
isShared = isSharedClient(tunnel);
} else {
type = null;
ttype = newTunnelType;
isShared = false;
}
if (type == null) {
// same default logic as in TunnelController.setConfig()
@@ -1014,6 +1051,7 @@ public class GeneralHelper {
private boolean getBooleanProperty(int tunnel, String prop) {
return getBooleanProperty(tunnel, prop, false);
}
private boolean getBooleanProperty(int tunnel, String prop, boolean def) {
TunnelController tun = getController(tunnel);
if (tun != null) {