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

* I2PTunnel: Rename privkey file when deleting tunnel to prevent inadvertent reuse

Browse Source
This commit is contained in:
zzz
2011-07-17 16:38:02 +00:00
parent 7fbb3b12d1
commit a8378d0411
1 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
View File

@@ -8,6 +8,7 @@ package net.i2p.i2ptunnel.web;
* *
*/ */
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -30,6 +31,7 @@ import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase;
import net.i2p.i2ptunnel.TunnelController; import net.i2p.i2ptunnel.TunnelController;
import net.i2p.i2ptunnel.TunnelControllerGroup; import net.i2p.i2ptunnel.TunnelControllerGroup;
import net.i2p.util.ConcurrentHashSet; import net.i2p.util.ConcurrentHashSet;
import net.i2p.util.FileUtil;
import net.i2p.util.Log; import net.i2p.util.Log;
/** /**
@@ -40,9 +42,9 @@ import net.i2p.util.Log;
* Usage by classes outside of i2ptunnel.war is deprecated. * Usage by classes outside of i2ptunnel.war is deprecated.
*/ */
public class IndexBean { public class IndexBean {
protected I2PAppContext _context; protected final I2PAppContext _context;
protected Log _log; protected final Log _log;
protected TunnelControllerGroup _group; protected final TunnelControllerGroup _group;
private String _action; private String _action;
private int _tunnel; private int _tunnel;
//private long _prevNonce; //private long _prevNonce;
@@ -74,8 +76,8 @@ public class IndexBean {
private boolean _sharedClient; private boolean _sharedClient;
private boolean _privKeyGenerate; private boolean _privKeyGenerate;
private boolean _removeConfirmed; private boolean _removeConfirmed;
private Set<String> _booleanOptions; private final Set<String> _booleanOptions;
private Map<String, String> _otherOptions; private final Map<String, String> _otherOptions;
private int _hashCashValue; private int _hashCashValue;
private int _certType; private int _certType;
private String _certSigner; private String _certSigner;
@@ -198,17 +200,17 @@ public class IndexBean {
} }
private String stopAll() { private String stopAll() {
if (_group == null) return ""; if (_group == null) return "";
List msgs = _group.stopAllControllers(); List<String> msgs = _group.stopAllControllers();
return getMessages(msgs); return getMessages(msgs);
} }
private String startAll() { private String startAll() {
if (_group == null) return ""; if (_group == null) return "";
List msgs = _group.startAllControllers(); List<String> msgs = _group.startAllControllers();
return getMessages(msgs); return getMessages(msgs);
} }
private String restartAll() { private String restartAll() {
if (_group == null) return ""; if (_group == null) return "";
List msgs = _group.restartAllControllers(); List<String> msgs = _group.restartAllControllers();
return getMessages(msgs); return getMessages(msgs);
} }
private String reloadConfig() { private String reloadConfig() {
@@ -316,6 +318,10 @@ public class IndexBean {
return rv; return rv;
} }
/**
* Stop the tunnel, delete from config,
* rename the private key file if in the default directory
*/
private String deleteTunnel() { private String deleteTunnel() {
if (!_removeConfirmed) if (!_removeConfirmed)
return "Please confirm removal"; return "Please confirm removal";
@@ -324,8 +330,38 @@ public class IndexBean {
if (cur == null) if (cur == null)
return "Invalid tunnel number"; return "Invalid tunnel number";
List msgs = _group.removeController(cur); List<String> msgs = _group.removeController(cur);
msgs.addAll(doSave()); msgs.addAll(doSave());
// Rename private key file if it was a default name in
// the default directory, so it doesn't get reused when a new
// tunnel is created.
// Use configured file name if available, not the one from the form.
String pk = cur.getPrivKeyFile();
if (pk == null)
pk = _privKeyFile;
if (pk != null && pk.startsWith("i2ptunnel") && pk.endsWith("-privKeys.dat")) {
File pkf = new File(_context.getConfigDir(), pk);
if (pkf.exists()) {
String name = cur.getName();
if (name == null) {
name = cur.getDescription();
if (name == null) {
name = cur.getType();
if (name == null)
name = Long.toString(_context.clock().now());
}
}
name = "i2ptunnel-deleted-" + name.replace(' ', '_') + "-privkeys.dat";
File to = new File(_context.getConfigDir(), name);
if (to.exists())
to = new File(_context.getConfigDir(), name + '-' + _context.clock().now());
boolean success = FileUtil.rename(pkf, to);
if (success)
msgs.add("Private key file " + pkf.getAbsolutePath() +
" renamed to " + to.getAbsolutePath());
}
}
return getMessages(msgs); return getMessages(msgs);
} }