import java.net.*;
import java.io.*;
import java.util.*;
+import org.xwt.js.*;
import org.xwt.util.*;
-import org.mozilla.javascript.*;
import org.bouncycastle.util.encoders.Base64;
import org.bouncycastle.crypto.digests.*;
/** true iff we are allowed to skip the resolve check (only allowed when we're downloading the PAC script) */
boolean skipResolveCheck = false;
+ /** true iff we're using a proxy */
+ boolean proxied = false;
+
// Public Methods ////////////////////////////////////////////////////////////////////////////////////////
// Safeguarded DNS Resolver ///////////////////////////////////////////////////////////////////////////
/**
- * resolves the hostname and returns it as a string in the form "x.y.z.w", except for the special case "xmlrpc.xwt.org".
+ * resolves the hostname and returns it as a string in the form "x.y.z.w"
* @throws HTTPException if the host falls within a firewalled netblock
*/
private void resolveAndCheckIfFirewalled(String host) throws HTTPException {
- // special case
- if (host.equals("xmlrpc.xwt.org")) return;
-
// cached
if (resolvedHosts.get(host) != null) return;
return;
} catch (UnknownHostException uhe) { }
- // resolve using xmlrpc.xwt.org
if (Platform.detectProxy() == null) throw new HTTPException("could not resolve hostname \"" + host + "\" and no proxy configured");
- if (Log.on) Log.log(this, " could not resolve host " + host + "; using xmlrpc.xwt.org to ensure security");
- try {
- Object ret = new XMLRPC("http://xmlrpc.xwt.org/RPC2/", "dns.resolve").call(new Object[] { host });
- if (ret == null || !(ret instanceof String)) throw new Exception(" xmlrpc.xwt.org returned non-String: " + ret);
- resolvedHosts.put(host, ret);
- return;
- } catch (Throwable e) {
- throw new HTTPException("exception while attempting to use xmlrpc.xwt.org to resolve " + host + ": " + e);
- }
}
}
/** executes the PAC script and dispatches a call to one of the other attempt methods based on the result */
- public Socket attemptPAC(Function pacFunc) {
+ public Socket attemptPAC(org.xwt.js.JS.Callable pacFunc) {
if (Log.verbose) Log.log(this, "evaluating PAC script");
String pac = null;
try {
- Object obj = pacFunc.call(Context.enter(), Proxy.proxyAutoConfigRootScope, null, new Object[] { url.toString(), url.getHost() });
+ org.xwt.js.JS.Array args = new org.xwt.js.JS.Array();
+ args.addElement(url.toString());
+ args.addElement(url.getHost());
+ Object obj = pacFunc.call(args);
if (Log.verbose) Log.log(this, " PAC script returned \"" + obj + "\"");
pac = obj.toString();
} catch (Throwable e) {
if (sock == null && pi != null && ssl && pi.httpsProxyHost != null) sock = attemptHttpProxy(pi.httpsProxyHost, pi.httpsProxyPort);
if (sock == null && pi != null && pi.httpProxyHost != null) sock = attemptHttpProxy(pi.httpProxyHost, pi.httpProxyPort);
if (sock == null && pi != null && pi.socksProxyHost != null) sock = attemptSocksProxy(pi.socksProxyHost, pi.socksProxyPort);
+ proxied = sock != null;
if (sock == null) sock = attemptDirect();
if (sock == null) throw new HTTPException("unable to contact host " + host);
if (in == null) in = new BufferedInputStream(sock.getInputStream());
PrintWriter pw = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
if (content != null) {
pw.print("POST " + path + " HTTP/1.1\r\n");
- pw.print("Content-Length: " + content.length() + "\r\n");
+ int contentLength = content.substring(0, 2).equals("\r\n") ?
+ content.length() - 2 :
+ (content.length() - content.indexOf("\r\n\r\n") - 4);
+ pw.print("Content-Length: " + contentLength + "\r\n");
if (contentType != null) pw.print("Content-Type: " + contentType + "\r\n");
} else {
pw.print("GET " + path + " HTTP/1.1\r\n");
pw.print("User-Agent: XWT\r\n");
pw.print("Host: " + (host + (port == 80 ? "" : (":" + port))) + "\r\n");
+ if (proxied) pw.print("X-RequestOrigin: " + Main.originHost + "\r\n");
if (Proxy.Authorization.authorization != null) pw.print("Proxy-Authorization: " + Proxy.Authorization.authorization2 + "\r\n");
if (authCache.get(originalUrl) != null) pw.print("Authorization: " + authCache.get(originalUrl) + "\r\n");
// HTTPException ///////////////////////////////////////////////////////////////////////////////////
- static class HTTPException extends IOException {
- public HTTPException(String s) { super(s); }
- }
+ static class HTTPException extends IOException { public HTTPException(String s) { super(s); } }
// HTTPInputStream ///////////////////////////////////////////////////////////////////////////////////
this.length = length == -1 ? 0 : length;
}
+ public boolean markSupported() { return false; }
+ public int read(byte[] b) throws IOException { return read(b, 0, b.length); }
+ public long skip(long n) throws IOException { return read(null, -1, (int)n); }
+ public int available() throws IOException {
+ if (contentLength == -1) return java.lang.Math.min(super.available(), length);
+ return super.available();
+ }
+
+ public int read() throws IOException {
+ byte[] b = new byte[1];
+ int ret = read(b, 0, 1);
+ return ret == -1 ? -1 : b[0] & 0xff;
+ }
+
private void readChunk() throws IOException {
if (chunkedDone) return;
if (!firstChunk) super.skip(2); // CRLF
chunkLen += (char)i;
}
}
- length = Integer.parseInt(chunkLen, 16);
+ length = Integer.parseInt(chunkLen.trim(), 16);
if (length == 0) chunkedDone = true;
}
public int read(byte[] b, int off, int len) throws IOException {
boolean good = false;
try {
- if (length == 0 && contentLength == -1) readChunk();
+ if (length == 0 && contentLength == -1) {
+ readChunk();
+ if (chunkedDone) { good = true; return -1; }
+ } else {
+ if (length == 0) { good = true; return -1; }
+ }
if (len > length) len = length;
- int ret = super.read(b, off, len);
- length -= ret;
- good = true;
+ int ret = b == null ? (int)super.skip(len) : super.read(b, off, len);
+ if (ret >= 0) {
+ length -= ret;
+ good = true;
+ }
return ret;
} finally {
if (!good) invalid = true;
}
skip(2);
} else {
- skip(length);
+ if (length != 0) skip(length);
}
if (releaseMe != null) releaseMe.release();
}
projects / org.ibex.core.git / blobdiff