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

Tagged couple of messages required for error pages (previously marked as fixme's)

Browse Source
This commit is contained in:
forget
2010-01-02 07:49:42 +00:00
parent c012e5bf17
commit 62786dcc09
1 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
View File

@@ -32,6 +32,8 @@ import net.i2p.util.EventDispatcher;
import net.i2p.util.FileUtil; import net.i2p.util.FileUtil;
import net.i2p.util.Log; import net.i2p.util.Log;
import net.i2p.util.Translate;
/** /**
* Act as a mini HTTP proxy, handling various different types of requests, * Act as a mini HTTP proxy, handling various different types of requests,
* forwarding them through I2P appropriately, and displaying the reply. Supported * forwarding them through I2P appropriately, and displaying the reply. Supported
@@ -41,7 +43,7 @@ import net.i2p.util.Log;
* $method $path $protocolVersion\nHost: $site * $method $path $protocolVersion\nHost: $site
* or * or
* $method http://i2p/$b64key/$path $protocolVersion * $method http://i2p/$b64key/$path $protocolVersion
* or * or
* $method /$site/$path $protocolVersion * $method /$site/$path $protocolVersion
* </pre> * </pre>
* *
@@ -70,7 +72,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
"<html><body><H1>I2P ERROR: REQUEST DENIED</H1>"+ "<html><body><H1>I2P ERROR: REQUEST DENIED</H1>"+
"You attempted to connect to a non-I2P website or location.<BR>") "You attempted to connect to a non-I2P website or location.<BR>")
.getBytes(); .getBytes();
private final static byte[] ERR_DESTINATION_UNKNOWN = private final static byte[] ERR_DESTINATION_UNKNOWN =
("HTTP/1.1 503 Service Unavailable\r\n"+ ("HTTP/1.1 503 Service Unavailable\r\n"+
"Content-Type: text/html; charset=iso-8859-1\r\n"+ "Content-Type: text/html; charset=iso-8859-1\r\n"+
@@ -80,10 +82,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
"That I2P Destination was not found. Perhaps you pasted in the "+ "That I2P Destination was not found. Perhaps you pasted in the "+
"wrong BASE64 I2P Destination or the link you are following is "+ "wrong BASE64 I2P Destination or the link you are following is "+
"bad. The host (or the WWW proxy, if you're using one) could also "+ "bad. The host (or the WWW proxy, if you're using one) could also "+
"be temporarily offline. You may want to <b>retry</b>. "+ "be temporarily offline. You may want to <b>retry</b>. "+
"Could not find the following Destination:<BR><BR><div>") "Could not find the following Destination:<BR><BR><div>")
.getBytes(); .getBytes();
/***** /*****
private final static byte[] ERR_TIMEOUT = private final static byte[] ERR_TIMEOUT =
("HTTP/1.1 504 Gateway Timeout\r\n"+ ("HTTP/1.1 504 Gateway Timeout\r\n"+
@@ -107,7 +109,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
"Your request was for a site outside of I2P, but you have no "+ "Your request was for a site outside of I2P, but you have no "+
"HTTP outproxy configured. Please configure an outproxy in I2PTunnel") "HTTP outproxy configured. Please configure an outproxy in I2PTunnel")
.getBytes(); .getBytes();
private final static byte[] ERR_AHELPER_CONFLICT = private final static byte[] ERR_AHELPER_CONFLICT =
("HTTP/1.1 409 Conflict\r\n"+ ("HTTP/1.1 409 Conflict\r\n"+
"Content-Type: text/html; charset=iso-8859-1\r\n"+ "Content-Type: text/html; charset=iso-8859-1\r\n"+
@@ -123,7 +125,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
"discarding the host entry from your host database, "+ "discarding the host entry from your host database, "+
"or naming one of them differently.<p>") "or naming one of them differently.<p>")
.getBytes(); .getBytes();
private final static byte[] ERR_BAD_PROTOCOL = private final static byte[] ERR_BAD_PROTOCOL =
("HTTP/1.1 403 Bad Protocol\r\n"+ ("HTTP/1.1 403 Bad Protocol\r\n"+
"Content-Type: text/html; charset=iso-8859-1\r\n"+ "Content-Type: text/html; charset=iso-8859-1\r\n"+
@@ -133,7 +135,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
"The request uses a bad protocol. "+ "The request uses a bad protocol. "+
"The I2P HTTP Proxy supports http:// requests ONLY. Other protocols such as https:// and ftp:// are not allowed.<BR>") "The I2P HTTP Proxy supports http:// requests ONLY. Other protocols such as https:// and ftp:// are not allowed.<BR>")
.getBytes(); .getBytes();
private final static byte[] ERR_LOCALHOST = private final static byte[] ERR_LOCALHOST =
("HTTP/1.1 403 Access Denied\r\n"+ ("HTTP/1.1 403 Access Denied\r\n"+
"Content-Type: text/html; charset=iso-8859-1\r\n"+ "Content-Type: text/html; charset=iso-8859-1\r\n"+
@@ -142,7 +144,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
"<html><body><H1>I2P ERROR: REQUEST DENIED</H1>"+ "<html><body><H1>I2P ERROR: REQUEST DENIED</H1>"+
"Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>") "Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>")
.getBytes(); .getBytes();
/** used to assign unique IDs to the threads / clients. no logic or functionality */ /** used to assign unique IDs to the threads / clients. no logic or functionality */
private static volatile long __clientId = 0; private static volatile long __clientId = 0;
@@ -153,8 +155,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
* @throws IllegalArgumentException if the I2PTunnel does not contain * @throws IllegalArgumentException if the I2PTunnel does not contain
* valid config to contact the router * valid config to contact the router
*/ */
public I2PTunnelHTTPClient(int localPort, Logging l, boolean ownDest, public I2PTunnelHTTPClient(int localPort, Logging l, boolean ownDest,
String wwwProxy, EventDispatcher notifyThis, String wwwProxy, EventDispatcher notifyThis,
I2PTunnel tunnel) throws IllegalArgumentException { I2PTunnel tunnel) throws IllegalArgumentException {
super(localPort, ownDest, l, notifyThis, "HTTPHandler " + (++__clientId), tunnel); super(localPort, ownDest, l, notifyThis, "HTTPHandler " + (++__clientId), tunnel);
@@ -178,7 +180,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
} }
private String getPrefix(long requestId) { return "Client[" + _clientId + "/" + requestId + "]: "; } private String getPrefix(long requestId) { return "Client[" + _clientId + "/" + requestId + "]: "; }
private String selectProxy() { private String selectProxy() {
synchronized (proxyList) { synchronized (proxyList) {
int size = proxyList.size(); int size = proxyList.size();
@@ -195,8 +197,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
} }
private static final int DEFAULT_READ_TIMEOUT = 60*1000; private static final int DEFAULT_READ_TIMEOUT = 60*1000;
/** /**
* create the default options (using the default timeout, etc) * create the default options (using the default timeout, etc)
* unused? * unused?
*/ */
@@ -212,8 +214,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT); opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
return opts; return opts;
} }
/** /**
* create the default options (using the default timeout, etc) * create the default options (using the default timeout, etc)
* *
*/ */
@@ -262,7 +264,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
public static final String PROP_USER_AGENT = "i2ptunnel.httpclient.sendUserAgent"; public static final String PROP_USER_AGENT = "i2ptunnel.httpclient.sendUserAgent";
public static final String PROP_VIA = "i2ptunnel.httpclient.sendVia"; public static final String PROP_VIA = "i2ptunnel.httpclient.sendVia";
public static final String PROP_JUMP_SERVERS = "i2ptunnel.httpclient.jumpServers"; public static final String PROP_JUMP_SERVERS = "i2ptunnel.httpclient.jumpServers";
private static long __requestId = 0; private static long __requestId = 0;
protected void clientConnectionRun(Socket s) { protected void clientConnectionRun(Socket s) {
InputStream in = null; InputStream in = null;
@@ -282,17 +284,17 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
line = line.trim(); line = line.trim();
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug(getPrefix(requestId) + "Line=[" + line + "]"); _log.debug(getPrefix(requestId) + "Line=[" + line + "]");
String lowercaseLine = line.toLowerCase(); String lowercaseLine = line.toLowerCase();
if (lowercaseLine.startsWith("connection: ") || if (lowercaseLine.startsWith("connection: ") ||
lowercaseLine.startsWith("keep-alive: ") || lowercaseLine.startsWith("keep-alive: ") ||
lowercaseLine.startsWith("proxy-connection: ")) lowercaseLine.startsWith("proxy-connection: "))
continue; continue;
if (method == null) { // first line (GET /base64/realaddr) if (method == null) { // first line (GET /base64/realaddr)
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug(getPrefix(requestId) + "Method is null for [" + line + "]"); _log.debug(getPrefix(requestId) + "Method is null for [" + line + "]");
int pos = line.indexOf(" "); int pos = line.indexOf(" ");
if (pos == -1) break; if (pos == -1) break;
method = line.substring(0, pos); method = line.substring(0, pos);
@@ -328,7 +330,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
break; break;
} }
host = request.substring(0, pos); host = request.substring(0, pos);
// parse port // parse port
int posPort = host.indexOf(":"); int posPort = host.indexOf(":");
int port = 80; int port = 80;
@@ -341,7 +343,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
// TODO: log this // TODO: log this
} }
} }
if (host.toLowerCase().equals("proxy.i2p")) { if (host.toLowerCase().equals("proxy.i2p")) {
// so we don't do any naming service lookups // so we don't do any naming service lookups
destination = "proxy.i2p"; destination = "proxy.i2p";
@@ -358,7 +360,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
// and split the request into it's component parts for rebuilding later // and split the request into it's component parts for rebuilding later
String ahelperKey = null; String ahelperKey = null;
boolean ahelperConflict = false; boolean ahelperConflict = false;
String fragments = request.substring(pos2 + 1); String fragments = request.substring(pos2 + 1);
String uriPath = request.substring(0, pos2); String uriPath = request.substring(0, pos2);
pos2 = fragments.indexOf(" "); pos2 = fragments.indexOf(" ");
@@ -372,15 +374,15 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
pos2 = fragments.indexOf("&"); pos2 = fragments.indexOf("&");
fragment = fragments.substring(0, pos2); fragment = fragments.substring(0, pos2);
fragments = fragments.substring(pos2 + 1); fragments = fragments.substring(pos2 + 1);
// Fragment looks like addresshelper key // Fragment looks like addresshelper key
if (fragment.startsWith("i2paddresshelper=")) { if (fragment.startsWith("i2paddresshelper=")) {
pos2 = fragment.indexOf("="); pos2 = fragment.indexOf("=");
ahelperKey = fragment.substring(pos2 + 1); ahelperKey = fragment.substring(pos2 + 1);
// Key contains data, lets not ignore it // Key contains data, lets not ignore it
if (ahelperKey != null) { if (ahelperKey != null) {
// Host resolvable only with addresshelper // Host resolvable only with addresshelper
if ( (host == null) || ("i2p".equals(host)) ) if ( (host == null) || ("i2p".equals(host)) )
{ {
@@ -404,25 +406,25 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
if ("".equals(urlEncoding)) { if ("".equals(urlEncoding)) {
urlEncoding = "?" + fragment; urlEncoding = "?" + fragment;
} else { } else {
urlEncoding = urlEncoding + "&" + fragment; urlEncoding = urlEncoding + "&" + fragment;
} }
} }
} }
// Reconstruct the request minus the i2paddresshelper GET var // Reconstruct the request minus the i2paddresshelper GET var
request = uriPath + urlEncoding + " " + protocolVersion; request = uriPath + urlEncoding + " " + protocolVersion;
// Did addresshelper key conflict? // Did addresshelper key conflict?
if (ahelperConflict) if (ahelperConflict)
{ {
if (out != null) { if (out != null) {
// Fixme untranslated
long alias = I2PAppContext.getGlobalContext().random().nextLong(); long alias = I2PAppContext.getGlobalContext().random().nextLong();
String trustedURL = protocol + uriPath + urlEncoding; String trustedURL = protocol + uriPath + urlEncoding;
String conflictURL = protocol + alias + ".i2p/?" + initialFragments; String conflictURL = protocol + alias + ".i2p/?" + initialFragments;
byte[] header = getErrorPage("ahelper-conflict", ERR_AHELPER_CONFLICT); byte[] header = getErrorPage("ahelper-conflict", ERR_AHELPER_CONFLICT);
out.write(header); out.write(header);
out.write(("To visit the destination in your host database, click <a href=\"" + trustedURL + "\">here</a>. To visit the conflicting addresshelper link by temporarily giving it a random alias, click <a href=\"" + conflictURL + "\">here</a>.<p></div>").getBytes()); out.write(_("To visit the destination in your host database, click <a href=\"{0}\">here</a>. To visit the conflicting addresshelper link by temporarily giving it a random alias, click <a href=\"{1}\">here</a>.", trustedURL, conflictURL).getBytes("UTF-8"));
out.write(("<p></div>").getBytes());
writeFooter(out); writeFooter(out);
} }
s.close(); s.close();
@@ -436,7 +438,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
host = getHostName(destination); host = getHostName(destination);
ahelper = 1; ahelper = 1;
} }
line = method + " " + request.substring(pos); line = method + " " + request.substring(pos);
} else if (host.toLowerCase().equals("localhost") || host.equals("127.0.0.1")) { } else if (host.toLowerCase().equals("localhost") || host.equals("127.0.0.1")) {
if (out != null) { if (out != null) {
@@ -508,7 +510,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
} else { } else {
if (lowercaseLine.startsWith("host: ") && !usingWWWProxy) { if (lowercaseLine.startsWith("host: ") && !usingWWWProxy) {
line = "Host: " + host; line = "Host: " + host;
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info(getPrefix(requestId) + "Setting host = " + host); _log.info(getPrefix(requestId) + "Setting host = " + host);
} else if (lowercaseLine.startsWith("user-agent: ") && } else if (lowercaseLine.startsWith("user-agent: ") &&
!Boolean.valueOf(getTunnel().getClientOptions().getProperty(PROP_USER_AGENT)).booleanValue()) { !Boolean.valueOf(getTunnel().getClientOptions().getProperty(PROP_USER_AGENT)).booleanValue()) {
@@ -538,7 +540,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
} }
if (line.length() == 0) { if (line.length() == 0) {
String ok = getTunnel().getClientOptions().getProperty("i2ptunnel.gzip"); String ok = getTunnel().getClientOptions().getProperty("i2ptunnel.gzip");
boolean gzip = DEFAULT_GZIP; boolean gzip = DEFAULT_GZIP;
if (ok != null) if (ok != null)
@@ -574,10 +576,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
s.close(); s.close();
return; return;
} }
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug(getPrefix(requestId) + "Destination: " + destination); _log.debug(getPrefix(requestId) + "Destination: " + destination);
// Serve local proxy files (images, css linked from error pages) // Serve local proxy files (images, css linked from error pages)
// Ignore all the headers // Ignore all the headers
if (usingInternalServer) { if (usingInternalServer) {
@@ -610,7 +612,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
return; return;
} }
String remoteID; String remoteID;
Properties opts = new Properties(); Properties opts = new Properties();
//opts.setProperty("i2p.streaming.inactivityTimeout", ""+120*1000); //opts.setProperty("i2p.streaming.inactivityTimeout", ""+120*1000);
// 1 == disconnect. see ConnectionOptions in the new streaming lib, which i // 1 == disconnect. see ConnectionOptions in the new streaming lib, which i
@@ -754,12 +756,12 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
public void run() { public void run() {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Timeout occured requesting " + _target); _log.debug("Timeout occured requesting " + _target);
handleHTTPClientException(new RuntimeException("Timeout"), _out, handleHTTPClientException(new RuntimeException("Timeout"), _out,
_target, _usingProxy, _wwwProxy, _requestId); _target, _usingProxy, _wwwProxy, _requestId);
closeSocket(_socket); closeSocket(_socket);
} }
} }
private static String DEFAULT_JUMP_SERVERS = private static String DEFAULT_JUMP_SERVERS =
"http://i2host.i2p/cgi-bin/i2hostjump?," + "http://i2host.i2p/cgi-bin/i2hostjump?," +
"http://stats.i2p/cgi-bin/jump.cgi?a=," + "http://stats.i2p/cgi-bin/jump.cgi?a=," +
@@ -786,8 +788,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
out.write("</a>".getBytes()); out.write("</a>".getBytes());
if (usingWWWProxy) out.write(("<br>WWW proxy: " + wwwProxy).getBytes()); if (usingWWWProxy) out.write(("<br>WWW proxy: " + wwwProxy).getBytes());
if (jumpServers != null && jumpServers.length() > 0) { if (jumpServers != null && jumpServers.length() > 0) {
// Fixme untranslated out.write("<br><br>".getBytes());
out.write("<br><br>Click a link below to look for an address helper by using a \"jump\" service:<br>".getBytes()); out.write(_("Click a link below to look for an address helper by using a \"jump\" service:").getBytes("UTF-8"));
out.write("<br>".getBytes());
StringTokenizer tok = new StringTokenizer(jumpServers, ", "); StringTokenizer tok = new StringTokenizer(jumpServers, ", ");
while (tok.hasMoreTokens()) { while (tok.hasMoreTokens()) {
@@ -821,7 +824,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
private static void handleHTTPClientException(Exception ex, OutputStream out, String targetRequest, private static void handleHTTPClientException(Exception ex, OutputStream out, String targetRequest,
boolean usingWWWProxy, String wwwProxy, long requestId) { boolean usingWWWProxy, String wwwProxy, long requestId) {
// static // static
//if (_log.shouldLog(Log.WARN)) //if (_log.shouldLog(Log.WARN))
// _log.warn(getPrefix(requestId) + "Error sending to " + wwwProxy + " (proxy? " + usingWWWProxy + ", request: " + targetRequest, ex); // _log.warn(getPrefix(requestId) + "Error sending to " + wwwProxy + " (proxy? " + usingWWWProxy + ", request: " + targetRequest, ex);
@@ -942,4 +945,18 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
out.flush(); out.flush();
} catch (IOException ioe) {} } catch (IOException ioe) {}
} }
private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.web.messages";
/** lang in routerconsole.lang property, else current locale */
public static String _(String key) {
return Translate.getString(key, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
}
/** {0} and {1} */
public static String _(String key, Object o, Object o2) {
return Translate.getString(key, o, o2, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
}
} }