I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 217cb1f6 authored by zzz's avatar zzz
Browse files

* Reseed: 

    - Add HTTP proxy authorization support
    - Stub out SSL proxy support
    - Disable i2pbote reseed
  * EepGet: Add some new command line options
parent 1d179813
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java
+ 27
− 8
View file @ 217cb1f6
...@@ -43,13 +43,32 @@ public class ConfigReseedHandler extends FormHandler { ...@@ -43,13 +43,32 @@ public class ConfigReseedHandler extends FormHandler {
return arr[0].trim(); 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() { private void saveChanges() {
String port = getJettyString("port"); saveString(Reseeder.PROP_PROXY_PORT, "port");
if (port != null) saveString(Reseeder.PROP_PROXY_HOST, "host");
_context.router().setConfigSetting(Reseeder.PROP_PROXY_PORT, port); saveString(Reseeder.PROP_PROXY_USERNAME, "username");
String host = getJettyString("host"); saveString(Reseeder.PROP_PROXY_PASSWORD, "password");
if (host != null) saveBoolean(Reseeder.PROP_PROXY_AUTH_ENABLE, "auth");
_context.router().setConfigSetting(Reseeder.PROP_PROXY_HOST, host); 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"); String url = getJettyString("reseedURL");
if (url != null) if (url != null)
_context.router().setConfigSetting(Reseeder.PROP_RESEED_URL, url.trim().replace("\r\n", ",").replace("\n", ",")); _context.router().setConfigSetting(Reseeder.PROP_RESEED_URL, url.trim().replace("\r\n", ",").replace("\n", ","));
...@@ -60,8 +79,8 @@ public class ConfigReseedHandler extends FormHandler { ...@@ -60,8 +79,8 @@ public class ConfigReseedHandler extends FormHandler {
Boolean.toString(req)); Boolean.toString(req));
_context.router().setConfigSetting(Reseeder.PROP_SSL_DISABLE, _context.router().setConfigSetting(Reseeder.PROP_SSL_DISABLE,
Boolean.toString(disabled)); Boolean.toString(disabled));
boolean proxy = getJettyString("enable") != null; saveBoolean(Reseeder.PROP_PROXY_ENABLE, "enable");
_context.router().setConfigSetting(Reseeder.PROP_PROXY_ENABLE, Boolean.toString(proxy)); saveBoolean(Reseeder.PROP_SPROXY_ENABLE, "senable");
_context.router().saveConfig(); _context.router().saveConfig();
addFormNotice(_("Configuration saved successfully.")); addFormNotice(_("Configuration saved successfully."));
} }
......
apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java
+ 50
− 1
View file @ 217cb1f6
...@@ -20,6 +20,36 @@ public class ConfigReseedHelper extends HelperBase { ...@@ -20,6 +20,36 @@ public class ConfigReseedHelper extends HelperBase {
return _context.getProperty(Reseeder.PROP_PROXY_HOST, ""); 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) { public String modeChecked(int mode) {
boolean required = _context.getBooleanProperty(Reseeder.PROP_SSL_REQUIRED); boolean required = _context.getBooleanProperty(Reseeder.PROP_SSL_REQUIRED);
boolean disabled = _context.getBooleanPropertyDefaultTrue(Reseeder.PROP_SSL_DISABLE); boolean disabled = _context.getBooleanPropertyDefaultTrue(Reseeder.PROP_SSL_DISABLE);
...@@ -31,7 +61,26 @@ public class ConfigReseedHelper extends HelperBase { ...@@ -31,7 +61,26 @@ public class ConfigReseedHelper extends HelperBase {
} }
public String getEnable() { 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) if (enabled)
return "checked=\"true\""; return "checked=\"true\"";
return ""; return "";
......
apps/routerconsole/jsp/configreseed.jsp
+ 32
− 7
View file @ 217cb1f6
...@@ -33,21 +33,46 @@ ...@@ -33,21 +33,46 @@
</p> </p>
<div class="wideload"> <div class="wideload">
<table border="0" cellspacing="5"> <table border="0" cellspacing="5">
<tr><td class="mediumtags" align="right"><b><%=intl._("Reseed URL Selection")%></b></td> <tr><td class="mediumtags" align="right"><b><%=intl._("Reseed URL Selection")%>:</b></td>
<td><input type="radio" class="optbox" name="mode" value="0" <%=reseedHelper.modeChecked(0) %> > <td><input type="radio" class="optbox" name="mode" value="0" <%=reseedHelper.modeChecked(0) %> >
<%=intl._("Try SSL first then non-SSL")%> <b><%=intl._("Try SSL first then non-SSL")%></b><br>
<input type="radio" class="optbox" name="mode" value="1" <%=reseedHelper.modeChecked(1) %> > <input type="radio" class="optbox" name="mode" value="1" <%=reseedHelper.modeChecked(1) %> >
<%=intl._("Use SSL only")%> <b><%=intl._("Use SSL only")%></b><br>
<input type="radio" class="optbox" name="mode" value="2" <%=reseedHelper.modeChecked(2) %> > <input type="radio" class="optbox" name="mode" value="2" <%=reseedHelper.modeChecked(2) %> >
<%=intl._("Use non-SSL only")%></td></tr> <b><%=intl._("Use non-SSL only")%></b></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("Reseed URLs")%></b></td> <tr><td class="mediumtags" align="right"><b><%=intl._("Reseed URLs")%>:</b></td>
<td><textarea name="reseedURL" wrap="off" spellcheck="false"><jsp:getProperty name="reseedHelper" property="reseedURL" /></textarea></td></tr> <td><textarea name="reseedURL" wrap="off" spellcheck="false"><jsp:getProperty name="reseedHelper" property="reseedURL" /></textarea></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("Enable HTTP proxy (not used for SSL)")%></b></td>
<tr><td class="mediumtags" align="right"><b><%=intl._("Enable HTTP Proxy?")%></b></td>
<td><input type="checkbox" class="optbox" name="enable" value="true" <jsp:getProperty name="reseedHelper" property="enable" /> ></td></tr> <td><input type="checkbox" class="optbox" name="enable" value="true" <jsp:getProperty name="reseedHelper" property="enable" /> ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("HTTP Proxy Host")%>:</b></td> <tr><td class="mediumtags" align="right"><b><%=intl._("HTTP Proxy Host")%>:</b></td>
<td><input name="host" type="text" value="<jsp:getProperty name="reseedHelper" property="host" />" ></td></tr> <td><input name="host" type="text" value="<jsp:getProperty name="reseedHelper" property="host" />" ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("HTTP Proxy Port")%>:</b></td> <tr><td class="mediumtags" align="right"><b><%=intl._("HTTP Proxy Port")%>:</b></td>
<td><input name="port" type="text" value="<jsp:getProperty name="reseedHelper" property="port" />" ></td></tr> <td><input name="port" type="text" size="5" maxlength="5" value="<jsp:getProperty name="reseedHelper" property="port" />" ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("Use HTTP Proxy Authorization?")%></b></td>
<td><input type="checkbox" class="optbox" name="auth" value="true" <jsp:getProperty name="reseedHelper" property="auth" /> ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("HTTP Proxy Username")%>:</b></td>
<td><input name="username" type="text" value="<jsp:getProperty name="reseedHelper" property="username" />" ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("HTTP Proxy Password")%>:</b></td>
<td><input name="password" type="password" value="<jsp:getProperty name="reseedHelper" property="password" />" ></td></tr>
<!-- TODO Need SSLEepGet support
<tr><td class="mediumtags" align="right"><b><%=intl._("Enable HTTPS Proxy?")%></b></td>
<td><input type="checkbox" class="optbox" name="senable" value="true" <jsp:getProperty name="reseedHelper" property="senable" /> ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("HTTPS Proxy Host")%>:</b></td>
<td><input name="shost" type="text" value="<jsp:getProperty name="reseedHelper" property="shost" />" ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("HTTPS Proxy Port")%>:</b></td>
<td><input name="sport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="reseedHelper" property="sport" />" ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("Use HTTPS Proxy Authorization?")%></b></td>
<td><input type="checkbox" class="optbox" name="sauth" value="true" <jsp:getProperty name="reseedHelper" property="sauth" /> ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("HTTPS Proxy Username")%>:</b></td>
<td><input name="susername" type="text" value="<jsp:getProperty name="reseedHelper" property="susername" />" ></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("HTTPS Proxy Password")%>:</b></td>
<td><input name="spassword" type="password" value="<jsp:getProperty name="reseedHelper" property="spassword" />" ></td></tr>
-->
</table></div> </table></div>
<hr><div class="formaction"> <hr><div class="formaction">
<input type="submit" name="foo" value="<%=intl._("Cancel")%>" /> <input type="submit" name="foo" value="<%=intl._("Cancel")%>" />
......
core/java/src/net/i2p/util/EepGet.java
+ 37
− 4
View file @ 217cb1f6
...@@ -15,6 +15,7 @@ import java.util.List; ...@@ -15,6 +15,7 @@ import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.data.Base64;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.util.InternalSocket; import net.i2p.util.InternalSocket;
...@@ -142,6 +143,9 @@ public class EepGet { ...@@ -142,6 +143,9 @@ public class EepGet {
String etag = null; String etag = null;
String saveAs = null; String saveAs = null;
String url = null; String url = null;
List<String> extra = null;
String username = null;
String password = null;
try { try {
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
if (args[i].equals("-p")) { if (args[i].equals("-p")) {
...@@ -162,9 +166,16 @@ public class EepGet { ...@@ -162,9 +166,16 @@ public class EepGet {
saveAs = args[i+1]; saveAs = args[i+1];
i++; i++;
} else if (args[i].equals("-m")) { } else if (args[i].equals("-m")) {
markSize = Integer.parseInt(args[i+1]); markSize = Integer.parseInt(args[++i]);
lineLen = Integer.parseInt(args[i+2]); lineLen = Integer.parseInt(args[++i]);
i += 2; } else if (args[i].equals("-h")) {
if (extra == null)
extra = new ArrayList(2);
extra.add(args[++i]);
extra.add(args[++i]);
} else if (args[i].equals("-u")) {
username = args[++i];
password = args[++i];
} else if (args[i].startsWith("-")) { } else if (args[i].startsWith("-")) {
usage(); usage();
return; return;
...@@ -186,6 +197,13 @@ public class EepGet { ...@@ -186,6 +197,13 @@ public class EepGet {
saveAs = suggestName(url); saveAs = suggestName(url);
EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true, proxyHost, proxyPort, numRetries, saveAs, url, true, etag); EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true, proxyHost, proxyPort, numRetries, saveAs, url, true, etag);
if (extra != null) {
for (int i = 0; i < extra.size(); i += 2) {
get.addHeader(extra.get(i), extra.get(i + 1));
}
}
if (username != null && password != null)
get.addAuthorization(username, password);
get.addStatusListener(get.new CLIStatusListener(markSize, lineLen)); get.addStatusListener(get.new CLIStatusListener(markSize, lineLen));
get.fetch(CONNECT_TIMEOUT, -1, inactivityTimeout); get.fetch(CONNECT_TIMEOUT, -1, inactivityTimeout);
} }
...@@ -221,7 +239,9 @@ public class EepGet { ...@@ -221,7 +239,9 @@ public class EepGet {
} }
private static void usage() { private static void usage() {
System.err.println("EepGet [-p 127.0.0.1:4444] [-n #retries] [-o outputFile] [-m markSize lineLen] [-t timeout] url"); System.err.println("EepGet [-p 127.0.0.1:4444] [-n #retries] [-o outputFile] " +
"[-m markSize lineLen] [-t timeout] [-h headerKey headerValue] " +
"[-u username password] url");
} }
public static interface StatusListener { public static interface StatusListener {
...@@ -1094,4 +1114,17 @@ public class EepGet { ...@@ -1094,4 +1114,17 @@ public class EepGet {
_extraHeaders = new ArrayList(); _extraHeaders = new ArrayList();
_extraHeaders.add(name + ": " + value); _extraHeaders.add(name + ": " + value);
} }
/**
* Add basic authorization header for the proxy.
* Only added if the request is going through a proxy.
* Must be called before fetch().
*
* @since 0.8.9
*/
public void addAuthorization(String userName, String password) {
if (_shouldProxy)
addHeader("Proxy-Authorization",
"Basic " + Base64.encode((userName + ':' + password).getBytes(), true)); // true = use standard alphabet
}
} }
router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+ 21
− 2
View file @ 217cb1f6
...@@ -60,7 +60,7 @@ public class Reseeder { ...@@ -60,7 +60,7 @@ public class Reseeder {
"http://c.netdb.i2p2.de/," + "http://c.netdb.i2p2.de/," +
"http://reseed.i2p-projekt.de/," + "http://reseed.i2p-projekt.de/," +
"http://forum.i2p2.de/netdb/," + "http://forum.i2p2.de/netdb/," +
"http://www.i2pbote.net/netDb/," + /* "http://www.i2pbote.net/netDb/," + NO DATA */
"http://r31453.ovh.net/static_media/files/netDb/," + "http://r31453.ovh.net/static_media/files/netDb/," +
"http://cowpuncher.drollette.com/netdb/"; "http://cowpuncher.drollette.com/netdb/";
...@@ -69,7 +69,7 @@ public class Reseeder { ...@@ -69,7 +69,7 @@ public class Reseeder {
/* "https://a.netdb.i2p2.de/," + bad cert */ /* "https://a.netdb.i2p2.de/," + bad cert */
/* "https://c.netdb.i2p2.de/," + no data */ /* "https://c.netdb.i2p2.de/," + no data */
"https://forum.i2p2.de/netdb/," + "https://forum.i2p2.de/netdb/," +
"https://www.i2pbote.net/netDb/," + /* "https://www.i2pbote.net/netDb/," + NO DATA */
"https://reseed.i2p-projekt.de/," + "https://reseed.i2p-projekt.de/," +
"https://r31453.ovh.net/static_media/files/netDb/," + "https://r31453.ovh.net/static_media/files/netDb/," +
"https://cowpuncher.drollette.com/netdb/"; "https://cowpuncher.drollette.com/netdb/";
...@@ -89,6 +89,16 @@ public class Reseeder { ...@@ -89,6 +89,16 @@ public class Reseeder {
public static final String PROP_SSL_REQUIRED = "router.reseedSSLRequired"; public static final String PROP_SSL_REQUIRED = "router.reseedSSLRequired";
/** @since 0.8.3 */ /** @since 0.8.3 */
public static final String PROP_RESEED_URL = "i2p.reseedURL"; public static final String PROP_RESEED_URL = "i2p.reseedURL";
/** all these @since 0.8.9 */
public static final String PROP_PROXY_USERNAME = "router.reseedProxy.username";
public static final String PROP_PROXY_PASSWORD = "router.reseedProxy.password";
public static final String PROP_PROXY_AUTH_ENABLE = "router.reseedProxy.authEnable";
public static final String PROP_SPROXY_HOST = "router.reseedSSLProxyHost";
public static final String PROP_SPROXY_PORT = "router.reseedSSLProxyPort";
public static final String PROP_SPROXY_ENABLE = "router.reseedSSLProxyEnable";
public static final String PROP_SPROXY_USERNAME = "router.reseedSSLProxy.username";
public static final String PROP_SPROXY_PASSWORD = "router.reseedSSLProxy.password";
public static final String PROP_SPROXY_AUTH_ENABLE = "router.reseedSSLProxy.authEnable";
public Reseeder(RouterContext ctx) { public Reseeder(RouterContext ctx) {
_context = ctx; _context = ctx;
...@@ -393,6 +403,7 @@ public class Reseeder { ...@@ -393,6 +403,7 @@ public class Reseeder {
boolean ssl = url.toString().startsWith("https"); boolean ssl = url.toString().startsWith("https");
if (ssl) { if (ssl) {
SSLEepGet sslget; SSLEepGet sslget;
// TODO SSL PROXY
if (_sslState == null) { if (_sslState == null) {
sslget = new SSLEepGet(I2PAppContext.getGlobalContext(), baos, url.toString()); sslget = new SSLEepGet(I2PAppContext.getGlobalContext(), baos, url.toString());
// save state for next time // save state for next time
...@@ -401,11 +412,19 @@ public class Reseeder { ...@@ -401,11 +412,19 @@ public class Reseeder {
sslget = new SSLEepGet(I2PAppContext.getGlobalContext(), baos, url.toString(), _sslState); sslget = new SSLEepGet(I2PAppContext.getGlobalContext(), baos, url.toString(), _sslState);
} }
get = sslget; get = sslget;
// TODO SSL PROXY AUTH
} else { } else {
// Do a (probably) non-proxied eepget into our ByteArrayOutputStream with 0 retries // Do a (probably) non-proxied eepget into our ByteArrayOutputStream with 0 retries
boolean shouldProxy = _proxyHost != null && _proxyHost.length() > 0 && _proxyPort > 0; boolean shouldProxy = _proxyHost != null && _proxyHost.length() > 0 && _proxyPort > 0;
get = new EepGet(I2PAppContext.getGlobalContext(), shouldProxy, _proxyHost, _proxyPort, 0, 0, MAX_RESEED_RESPONSE_SIZE, get = new EepGet(I2PAppContext.getGlobalContext(), shouldProxy, _proxyHost, _proxyPort, 0, 0, MAX_RESEED_RESPONSE_SIZE,
null, baos, url.toString(), false, null, null); null, baos, url.toString(), false, null, null);
if (shouldProxy && _context.getBooleanProperty(PROP_PROXY_AUTH_ENABLE)) {
String user = _context.getProperty(PROP_PROXY_USERNAME);
String pass = _context.getProperty(PROP_PROXY_PASSWORD);
if (user != null && user.length() > 0 &&
pass != null && pass.length() > 0)
get.addAuthorization(user, pass);
}
} }
get.addStatusListener(ReseedRunner.this); get.addStatusListener(ReseedRunner.this);
if (get.fetch()) if (get.fetch())
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]