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

* Console: Verify valid host/IP before saving on net config form

Browse Source
This commit is contained in:
zzz
2011-09-14 12:58:46 +00:00
parent 667b6b69b6
commit e249b22312
1 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
View File

@ -1,7 +1,11 @@
package net.i2p.router.web; package net.i2p.router.web;
import java.net.InetAddress;
import java.net.UnknownHostException;
import net.i2p.router.Router; import net.i2p.router.Router;
import net.i2p.router.transport.FIFOBandwidthRefiller; import net.i2p.router.transport.FIFOBandwidthRefiller;
import net.i2p.router.transport.TransportImpl;
import net.i2p.router.transport.TransportManager; import net.i2p.router.transport.TransportManager;
import net.i2p.router.transport.udp.UDPTransport; import net.i2p.router.transport.udp.UDPTransport;
import net.i2p.router.web.ConfigServiceHandler; import net.i2p.router.web.ConfigServiceHandler;
@ -144,12 +148,16 @@ public class ConfigNetHandler extends FormHandler {
_udpAutoIP = UDPTransport.DEFAULT_SOURCES; _udpAutoIP = UDPTransport.DEFAULT_SOURCES;
} }
_context.router().setConfigSetting(UDPTransport.PROP_SOURCES, _udpAutoIP); _context.router().setConfigSetting(UDPTransport.PROP_SOURCES, _udpAutoIP);
// Todo: Catch local IPs right here rather than complaining later boolean valid = true;
if (uhost.length() > 0) if (uhost.length() > 0) {
_context.router().setConfigSetting(UDPTransport.PROP_EXTERNAL_HOST, uhost); valid = verifyAddress(uhost);
else if (valid) {
_context.router().setConfigSetting(UDPTransport.PROP_EXTERNAL_HOST, uhost);
}
} else {
_context.router().removeConfigSetting(UDPTransport.PROP_EXTERNAL_HOST); _context.router().removeConfigSetting(UDPTransport.PROP_EXTERNAL_HOST);
if ((!oldUdp.equals(_udpAutoIP)) || (!oldUHost.equals(uhost))) { }
if (valid && ((!oldUdp.equals(_udpAutoIP)) || (!oldUHost.equals(uhost)))) {
addFormNotice(_("Updating IP address")); addFormNotice(_("Updating IP address"));
restartRequired = true; restartRequired = true;
} }
@ -167,12 +175,15 @@ public class ConfigNetHandler extends FormHandler {
if (_ntcpAutoIP == null) _ntcpAutoIP = "true"; if (_ntcpAutoIP == null) _ntcpAutoIP = "true";
if ((!oldAutoHost.equals(_ntcpAutoIP)) || ! oldNHost.equalsIgnoreCase(_ntcpHostname)) { if ((!oldAutoHost.equals(_ntcpAutoIP)) || ! oldNHost.equalsIgnoreCase(_ntcpHostname)) {
boolean valid = true;
if ("disabled".equals(_ntcpAutoIP)) { if ("disabled".equals(_ntcpAutoIP)) {
addFormNotice(_("Disabling TCP completely")); addFormNotice(_("Disabling TCP completely"));
} else if ("false".equals(_ntcpAutoIP) && _ntcpHostname.length() > 0) { } else if ("false".equals(_ntcpAutoIP) && _ntcpHostname.length() > 0) {
// Todo: Catch local IPs right here rather than complaining later valid = verifyAddress(_ntcpHostname);
_context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME, _ntcpHostname); if (valid) {
addFormNotice(_("Updating inbound TCP address to") + " " + _ntcpHostname); _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME, _ntcpHostname);
addFormNotice(_("Updating inbound TCP address to") + " " + _ntcpHostname);
}
} else { } else {
_context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME); _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME);
if ("false".equals(_ntcpAutoIP)) if ("false".equals(_ntcpAutoIP))
@ -180,9 +191,11 @@ public class ConfigNetHandler extends FormHandler {
else else
addFormNotice(_("Updating inbound TCP address to auto")); // true or always addFormNotice(_("Updating inbound TCP address to auto")); // true or always
} }
_context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP, _ntcpAutoIP); if (valid) {
_context.router().setConfigSetting(TransportManager.PROP_ENABLE_NTCP, "" + !"disabled".equals(_ntcpAutoIP)); _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP, _ntcpAutoIP);
restartRequired = true; _context.router().setConfigSetting(TransportManager.PROP_ENABLE_NTCP, "" + !"disabled".equals(_ntcpAutoIP));
restartRequired = true;
}
} }
if (oldAutoPort != _ntcpAutoPort || ! oldNPort.equals(_ntcpPort)) { if (oldAutoPort != _ntcpAutoPort || ! oldNPort.equals(_ntcpPort)) {
if (_ntcpPort.length() > 0 && !_ntcpAutoPort) { if (_ntcpPort.length() > 0 && !_ntcpAutoPort) {
@ -295,6 +308,27 @@ public class ConfigNetHandler extends FormHandler {
} }
} }
/**
* Do basic verification of address here to prevent problems later
* @return valid
* @since 0.8.9
*/
private boolean verifyAddress(String addr) {
if (addr == null || addr.length() <= 0)
return false;
try {
InetAddress ia = InetAddress.getByName(addr);
byte[] iab = ia.getAddress();
boolean rv = TransportImpl.isPubliclyRoutable(iab);
if (!rv)
addFormError(_("The hostname or IP {0} is not publicly routable", addr));
return rv;
} catch (UnknownHostException uhe) {
addFormError(_("The hostname or IP {0} is invalid", addr) + ": " + uhe);
return false;
}
}
private void hiddenSwitch() { private void hiddenSwitch() {
// Full restart required to generate new keys // Full restart required to generate new keys
// FIXME don't call wrapper if not present, only rekey // FIXME don't call wrapper if not present, only rekey