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

* Reseed:

Browse Source 
- Add HTTP proxy authorization support
    - Stub out SSL proxy support
    - Disable i2pbote reseed
  * EepGet: Add some new command line options
This commit is contained in:
zzz
2011-09-16 14:45:02 +00:00
parent 1d17981325
commit 217cb1f66d
5 changed files with 167 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java
View File

@ -43,13 +43,32 @@ public class ConfigReseedHandler extends FormHandler {
return arr[0].trim();
}
/** @since 0.8.9 */
private void saveString(String config, String param) {
String val = getJettyString(param);
if (val != null && val.length() > 0)
_context.router().setConfigSetting(config, val);
else
_context.router().removeConfigSetting(config);
}
/** @since 0.8.9 */
private void saveBoolean(String config, String param) {
boolean val = getJettyString(param) != null;
_context.router().setConfigSetting(config, Boolean.toString(val));
}
private void saveChanges() {
String port = getJettyString("port");
if (port != null)
_context.router().setConfigSetting(Reseeder.PROP_PROXY_PORT, port);
String host = getJettyString("host");
if (host != null)
_context.router().setConfigSetting(Reseeder.PROP_PROXY_HOST, host);
saveString(Reseeder.PROP_PROXY_PORT, "port");
saveString(Reseeder.PROP_PROXY_HOST, "host");
saveString(Reseeder.PROP_PROXY_USERNAME, "username");
saveString(Reseeder.PROP_PROXY_PASSWORD, "password");
saveBoolean(Reseeder.PROP_PROXY_AUTH_ENABLE, "auth");
saveString(Reseeder.PROP_SPROXY_PORT, "sport");
saveString(Reseeder.PROP_SPROXY_HOST, "shost");
saveString(Reseeder.PROP_SPROXY_USERNAME, "susername");
saveString(Reseeder.PROP_SPROXY_PASSWORD, "spassword");
saveBoolean(Reseeder.PROP_SPROXY_AUTH_ENABLE, "sauth");
String url = getJettyString("reseedURL");
if (url != null)
_context.router().setConfigSetting(Reseeder.PROP_RESEED_URL, url.trim().replace("\r\n", ",").replace("\n", ","));
@ -60,8 +79,8 @@ public class ConfigReseedHandler extends FormHandler {
Boolean.toString(req));
_context.router().setConfigSetting(Reseeder.PROP_SSL_DISABLE,
Boolean.toString(disabled));
boolean proxy = getJettyString("enable") != null;
_context.router().setConfigSetting(Reseeder.PROP_PROXY_ENABLE, Boolean.toString(proxy));
saveBoolean(Reseeder.PROP_PROXY_ENABLE, "enable");
saveBoolean(Reseeder.PROP_SPROXY_ENABLE, "senable");
_context.router().saveConfig();
addFormNotice(_("Configuration saved successfully."));
}

51
apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java
View File

@ -20,6 +20,36 @@ public class ConfigReseedHelper extends HelperBase {
return _context.getProperty(Reseeder.PROP_PROXY_HOST, "");
}
/** @since 0.8.9 */
public String getUsername() {
return _context.getProperty(Reseeder.PROP_PROXY_USERNAME, "");
}
/** @since 0.8.9 */
public String getPassword() {
return _context.getProperty(Reseeder.PROP_PROXY_PASSWORD, "");
}
/** @since 0.8.9 */
public String getSport() {
return _context.getProperty(Reseeder.PROP_SPROXY_PORT, "");
}
/** @since 0.8.9 */
public String getShost() {
return _context.getProperty(Reseeder.PROP_SPROXY_HOST, "");
}
/** @since 0.8.9 */
public String getSusername() {
return _context.getProperty(Reseeder.PROP_SPROXY_USERNAME, "");
}
/** @since 0.8.9 */
public String getSpassword() {
return _context.getProperty(Reseeder.PROP_SPROXY_PASSWORD, "");
}
public String modeChecked(int mode) {
boolean required = _context.getBooleanProperty(Reseeder.PROP_SSL_REQUIRED);
boolean disabled = _context.getBooleanPropertyDefaultTrue(Reseeder.PROP_SSL_DISABLE);
@ -31,7 +61,26 @@ public class ConfigReseedHelper extends HelperBase {
}
public String getEnable() {
boolean enabled = _context.getBooleanProperty(Reseeder.PROP_PROXY_ENABLE);
return checked(Reseeder.PROP_PROXY_ENABLE);
}
/** @since 0.8.9 */
public String getAuth() {
return checked(Reseeder.PROP_PROXY_AUTH_ENABLE);
}
public String getSenable() {
return checked(Reseeder.PROP_SPROXY_ENABLE);
}
/** @since 0.8.9 */
public String getSauth() {
return checked(Reseeder.PROP_SPROXY_AUTH_ENABLE);
}
/** @since 0.8.9 */
private String checked(String prop) {
boolean enabled = _context.getBooleanProperty(prop);
if (enabled)
return "checked=\"true\"";
return "";