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

Fix the configFile property so that removeControllers can work, fix cross-platform/un-migrated platform bugs, override equals so the list of controllers can remove a controller by passing the object

Browse Source
This commit is contained in:
hankhill19580
2019-07-17 02:22:07 +00:00
parent 9c2dc47a8a
commit aaacb2e558
3 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
View File

@@ -174,9 +174,9 @@ public class TunnelController implements Logging {
* The config may contain a large number of options - only ones that begin in
* the prefix should be used (and, in turn, that prefix should be stripped off
* before being interpreted by this controller)
*
*
* Defaults in config properties are not recommended, they may or may not be honored.
*
*
* @param config original key=value mapping non-null
* @param prefix beginning of key values that are relevant to this tunnel
*/
@@ -186,7 +186,7 @@ public class TunnelController implements Logging {
/**
* Defaults in config properties are not recommended, they may or may not be honored.
*
*
* @param config original key=value mapping non-null
* @param prefix beginning of key values that are relevant to this tunnel
* @param createKey for servers, whether we want to create a brand new destination
@@ -219,7 +219,7 @@ public class TunnelController implements Logging {
log("No filename specified for the private key");
return false;
}
if (keyFile.exists()) {
//log("Not overwriting existing private keys in " + keyFile.getAbsolutePath());
return true;
@@ -324,7 +324,7 @@ public class TunnelController implements Logging {
} else if (len > 128) {
// copy of excess data handled in KeyCertificate constructor
}
out = new SecureFileOutputStream(altFile);
d.writeBytes(out);
priv.writeBytes(out);
@@ -411,7 +411,7 @@ public class TunnelController implements Logging {
return;
}
String type = getType();
String type = getType();
if ( (type == null) || (type.length() <= 0) ) {
changeState(TunnelState.STOPPED);
if (_log.shouldLog(Log.ERROR))
@@ -496,7 +496,7 @@ public class TunnelController implements Logging {
String dest = getTargetDestination();
String sharedClient = getSharedClient();
if (getPersistentClientKey()) {
String privKeyFile = getPrivKeyFile();
String privKeyFile = getPrivKeyFile();
_tunnel.runIrcClient(new String[] { listenPort, dest, sharedClient, privKeyFile }, this);
} else {
_tunnel.runIrcClient(new String[] { listenPort, dest, sharedClient }, this);
@@ -515,7 +515,7 @@ public class TunnelController implements Logging {
props.setProperty(I2PSOCKSTunnel.PROP_PROXY_DEFAULT, proxyList);
}
if (getPersistentClientKey()) {
String privKeyFile = getPrivKeyFile();
String privKeyFile = getPrivKeyFile();
_tunnel.runSOCKSTunnel(new String[] { listenPort, "false", privKeyFile }, this);
} else {
_tunnel.runSOCKSTunnel(new String[] { listenPort, sharedClient }, this);
@@ -535,7 +535,7 @@ public class TunnelController implements Logging {
props.setProperty(I2PSOCKSTunnel.PROP_PROXY_DEFAULT, proxyList);
}
if (getPersistentClientKey()) {
String privKeyFile = getPrivKeyFile();
String privKeyFile = getPrivKeyFile();
_tunnel.runSOCKSIRCTunnel(new String[] { listenPort, "false", privKeyFile }, this);
} else {
_tunnel.runSOCKSIRCTunnel(new String[] { listenPort, sharedClient }, this);
@@ -561,11 +561,11 @@ public class TunnelController implements Logging {
_tunnel.runListenOn(new String[] { listenOn }, this);
}
String listenPort = getTargetPort();
String privKeyFile = getPrivKeyFile();
String privKeyFile = getPrivKeyFile();
_tunnel.runStreamrServer(new String[] { listenPort, privKeyFile }, this);
}
/**
/**
* Note the fact that we are using some sessions, so that they dont get
* closed by some other tunnels
*/
@@ -587,7 +587,7 @@ public class TunnelController implements Logging {
}
}
/**
/**
* Note the fact that we are no longer using some sessions, and if
* no other tunnels are using them, close them.
*/
@@ -607,7 +607,7 @@ public class TunnelController implements Logging {
}
}
/**
/**
* Get all the sessions we may be using.
*
* @return a copy, non-null
@@ -625,11 +625,11 @@ public class TunnelController implements Logging {
private void startClient() {
setListenOn();
String listenPort = getListenPort();
String listenPort = getListenPort();
String dest = getTargetDestination();
String sharedClient = getSharedClient();
if (getPersistentClientKey()) {
String privKeyFile = getPrivKeyFile();
String privKeyFile = getPrivKeyFile();
_tunnel.runClient(new String[] { listenPort, dest, sharedClient, privKeyFile }, this);
} else {
_tunnel.runClient(new String[] { listenPort, dest, sharedClient }, this);
@@ -637,17 +637,17 @@ public class TunnelController implements Logging {
}
private void startServer() {
String targetHost = getTargetHost();
String targetPort = getTargetPort();
String privKeyFile = getPrivKeyFile();
String targetHost = getTargetHost();
String targetPort = getTargetPort();
String privKeyFile = getPrivKeyFile();
_tunnel.runServer(new String[] { targetHost, targetPort, privKeyFile }, this);
}
private void startHttpServer() {
String targetHost = getTargetHost();
String targetPort = getTargetPort();
String spoofedHost = getSpoofedHost();
String privKeyFile = getPrivKeyFile();
String targetHost = getTargetHost();
String targetPort = getTargetPort();
String spoofedHost = getSpoofedHost();
String privKeyFile = getPrivKeyFile();
_tunnel.runHttpServer(new String[] { targetHost, targetPort, spoofedHost, privKeyFile }, this);
}
@@ -662,9 +662,9 @@ public class TunnelController implements Logging {
}
private void startIrcServer() {
String targetHost = getTargetHost();
String targetPort = getTargetPort();
String privKeyFile = getPrivKeyFile();
String targetHost = getTargetHost();
String targetPort = getTargetPort();
String privKeyFile = getPrivKeyFile();
_tunnel.runIrcServer(new String[] { targetHost, targetPort, privKeyFile }, this);
}
@@ -723,10 +723,10 @@ public class TunnelController implements Logging {
private void setI2CPOptions() {
String host = getI2CPHost();
if ( (host != null) && (host.length() > 0) )
if ( (host != null) && (host.length() > 0) )
_tunnel.host = host;
// woohah, special casing for people with ipv6/etc
if ("localhost".equals(_tunnel.host))
if ("localhost".equals(_tunnel.host))
_tunnel.host = "127.0.0.1";
String port = getI2CPPort();
if ( (port != null) && (port.length() > 0) ) {
@@ -841,7 +841,7 @@ public class TunnelController implements Logging {
}
if (!isClient(type)) {
_tunnel.filterDefinition = _config.getProperty(PROP_FILTER);
String p1 = _config.getProperty(OPT_MAX_CONNS_MIN, "0");
String p2 = _config.getProperty(OPT_MAX_CONNS_HOUR, "0");
String p3 = _config.getProperty(OPT_MAX_CONNS_DAY, "0");
@@ -924,7 +924,7 @@ public class TunnelController implements Logging {
/**
* @return a copy
*/
public Properties getConfig(String prefix) {
public Properties getConfig(String prefix) {
Properties rv = new Properties();
if (prefix.length() > 0) {
for (Map.Entry<Object, Object> e : _config.entrySet()) {
@@ -968,7 +968,7 @@ public class TunnelController implements Logging {
* @since 0.9.17 moved from IndexBean
*/
public static boolean isClient(String type) {
return TYPE_STD_CLIENT.equals(type) ||
return TYPE_STD_CLIENT.equals(type) ||
TYPE_HTTP_CLIENT.equals(type) ||
TYPE_SOCKS.equals(type) ||
TYPE_SOCKS_IRC.equals(type) ||
@@ -1152,6 +1152,18 @@ public class TunnelController implements Logging {
****/
}
public boolean equals(Object o) {
if (!(o instanceof TunnelController)) {
return false;
}
TunnelController other = (TunnelController) o;
return getName().equals(other.getName());
}
public int hashCode() {
return getName().hashCode();
}
/****
private void getHttpClientSummary(StringBuilder buf) {
String description = getDescription();
@@ -1159,7 +1171,7 @@ public class TunnelController implements Logging {
buf.append("<i>").append(description).append("</i><br />\n");
buf.append("HTTP proxy listening on port ").append(getListenPort());
String listenOn = getListenOnInterface();
if ("0.0.0.0".equals(listenOn))
if ("0.0.0.0".equals(listenOn))
buf.append(" (reachable by any machine)");
else if ("127.0.0.1".equals(listenOn))
buf.append(" (reachable locally only)");
@@ -1181,7 +1193,7 @@ public class TunnelController implements Logging {
buf.append("Client tunnel listening on port ").append(getListenPort());
buf.append(" pointing at ").append(getTargetDestination());
String listenOn = getListenOnInterface();
if ("0.0.0.0".equals(listenOn))
if ("0.0.0.0".equals(listenOn))
buf.append(" (reachable by any machine)");
else if ("127.0.0.1".equals(listenOn))
buf.append(" (reachable locally only)");
@@ -1260,11 +1272,11 @@ public class TunnelController implements Logging {
}
/**
* Pull off any messages that the I2PTunnel has produced
* Pull off any messages that the I2PTunnel has produced
*
* @return list of messages pulled off (each is a String, earliest first)
*/
public List<String> clearMessages() {
public List<String> clearMessages() {
List<String> rv;
synchronized (_messages) {
rv = new ArrayList<String>(_messages);
@@ -1277,7 +1289,7 @@ public class TunnelController implements Logging {
* @since 0.9.15
*/
@Override
public String toString() {
public String toString() {
return "TC " + getType() + ' ' + getName() + " for " + _tunnel + ' ' + _state;
}
}

35
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
View File

@@ -1,6 +1,8 @@
package net.i2p.i2ptunnel;
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -327,8 +329,8 @@ public class TunnelControllerGroup implements ClientApp {
List<Properties> props = null;
if (cfgFile.exists()) {
try {
props = loadConfig(cfgFile);
if (shouldMigrate && !dir.exists()) {
props = loadConfig(cfgFile);
boolean ok = migrate(props, cfgFile, dir);
if (!ok)
shouldMigrate = false;
@@ -689,6 +691,7 @@ public class TunnelControllerGroup implements ClientApp {
map.putAll(cur);
i++;
}
map.setProperty("configFile", cfgFile.getAbsolutePath());
} finally {
_controllersLock.readLock().unlock();
}
@@ -700,12 +703,17 @@ public class TunnelControllerGroup implements ClientApp {
* @since 0.9.42
*/
public synchronized void saveConfig(TunnelController tc) throws IOException {
if (!shouldMigrate()){
saveConfig();
return;
}
if (_log.shouldInfo())
_log.info("Saving tunnel configuration for " + tc);
Properties inputController = tc.getConfig("");
File cfgFile = assureConfigFile(tc);
inputController.setProperty("configFile", cfgFile.getAbsolutePath());
DataHelper.storeProps(inputController, cfgFile);
tc.setConfig(inputController, "");
}
/**
@@ -714,21 +722,12 @@ public class TunnelControllerGroup implements ClientApp {
*/
public synchronized void removeConfig(TunnelController tc) throws IOException {
File cfgFile = assureConfigFile(tc);
_controllersLock.writeLock().lock();
try {
_controllers.remove(tc);
// FIXME
for (TunnelController c : _controllers) {
saveConfig(c);
}
} finally {
_controllersLock.writeLock().unlock();
if (!FileUtil.rename(cfgFile, new File(cfgFile.getAbsolutePath() + ".bak")))
if (! cfgFile.delete())
if (_log.shouldLog(Log.WARN))
_log.warn("could not delete config file" + cfgFile.toString());
}
if (!FileUtil.rename(cfgFile, new File(cfgFile.getAbsolutePath() + ".bak")))
if (! cfgFile.delete())
if (_log.shouldLog(Log.WARN))
_log.warn("could not delete config file" + cfgFile.toString());
if (!shouldMigrate())
saveConfig();
}
/**
@@ -742,9 +741,11 @@ public class TunnelControllerGroup implements ClientApp {
Properties inputController = tc.getConfig("");
String configFileName = inputController.getProperty("configFile");
if (configFileName == null) {
if (_log.shouldLog(Log.WARN))
_log.warn("configFile property not found");
String fileName = inputController.getProperty("name");
if (fileName == null)
fileName = "tunnel";
fileName = "New Tunnel";
configFileName = _controllers.size() + "-" + fileName + "-i2ptunnel.config";
if (_controllers.size() < 10)
configFileName = '0' + configFileName;

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

@@ -251,7 +251,6 @@ public class GeneralHelper {
}catch (IOException ioe){
msgs.add(ioe.toString());
}
msgs.addAll(saveConfig(context, tcg, tunnel));
// Rename private key file if it was a default name in
// the default directory, so it doesn't get reused when a new