-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
package org.xwt;
import java.net.*;
*/
public class HTTP {
- /** the URL as passed to the original constructor; this is never changed */
- final String originalUrl;
- /** the URL to connect to; this is munged when the url is parsed */
- URL url = null;
+ // Public Methods ////////////////////////////////////////////////////////////////////////////////////////
+
+ public HTTP(String url) { this(url, false); }
+ public HTTP(String url, boolean skipResolveCheck) { originalUrl = url; this.skipResolveCheck = skipResolveCheck; }
- /** the host to connect to */
- String host = null;
+ /** Performs an HTTP GET request */
+ public InputStream GET() throws IOException { return makeRequest(null, null); }
+
+ /** Performs an HTTP POST request; content is additional headers, blank line, and body */
+ public InputStream POST(String contentType, String content) throws IOException { return makeRequest(contentType, content); }
- /** the port to connect on */
- int port = -1;
+ public static class HTTPException extends IOException { public HTTPException(String s) { super(s); } }
- /** true if SSL (HTTPS) should be used */
- boolean ssl = false;
- /** the path (URI) to retrieve on the server */
- String path = null;
+ // Statics ///////////////////////////////////////////////////////////////////////////////////////////////
- /** the socket */
- Socket sock = null;
+ static Hash resolvedHosts = new Hash(); ///< cache for resolveAndCheckIfFirewalled()
+ private static Hash authCache = new Hash(); ///< cache of userInfo strings, keyed on originalUrl
- /** the socket's inputstream */
- InputStream in = null;
- /** the username and password portions of the URL */
- String userInfo = null;
+ // Instance Data ///////////////////////////////////////////////////////////////////////////////////////////////
- /** cache of userInfo strings, keyed on originalUrl */
- private static Hashtable authCache = new Hashtable();
+ final String originalUrl; ///< the URL as passed to the original constructor; this is never changed
+ URL url = null; ///< the URL to connect to; this is munged when the url is parsed */
+ String host = null; ///< the host to connect to
+ int port = -1; ///< the port to connect on
+ boolean ssl = false; ///< true if SSL (HTTPS) should be used
+ String path = null; ///< the path (URI) to retrieve on the server
+ Socket sock = null; ///< the socket
+ InputStream in = null; ///< the socket's inputstream
+ String userInfo = null; ///< the username and password portions of the URL
+ boolean firstRequest = true; ///< true iff this is the first request to be made on this socket
+ boolean skipResolveCheck = false; ///< allowed to skip the resolve check when downloading PAC script
+ boolean proxied = false; ///< true iff we're using a proxy
/** this is null if the current request is the first request on
* this HTTP connection; otherwise it is a Semaphore which will be
*/
Semaphore okToRecieve = null;
- /** true iff this is the first request to be made on this socket */
- boolean firstRequest = true;
-
- /** cache for resolveAndCheckIfFirewalled() */
- static Hashtable resolvedHosts = new Hashtable();
-
- /** 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 ////////////////////////////////////////////////////////////////////////////////////////
-
- public HTTP(String url) { this(url, false); }
- public HTTP(String url, boolean skipResolveCheck) {
- originalUrl = url;
- this.skipResolveCheck = skipResolveCheck;
- }
-
- /** Performs an HTTP GET request */
- public InputStream GET() throws IOException { return makeRequest(null, null); }
-
- /** Performs an HTTP POST request; content is appended to the headers (so it should include a blank line to delimit the beginning of the body) */
- public InputStream POST(String contentType, String content) throws IOException { return makeRequest(contentType, content); }
-
/**
* This method isn't synchronized; however, only one thread can be in the inner synchronized block at a time, and the rest of
* the method is protected by in-order one-at-a-time semaphore lock-steps
else doWebAuth(h, content == null ? "GET" : "POST");
if (h.get("HTTP").equals("1.0") && h.get("content-length") == null) {
- if (Log.on) Log.log(this, "proxy returned an HTTP/1.0 reply with no content-length...");
+ if (Log.on) Log.info(this, "proxy returned an HTTP/1.0 reply with no content-length...");
reset();
} else {
int cl = h.get("content-length") == null ? -1 : Integer.parseInt(h.get("content-length").toString());
if ((quadbyte[0] == 10 ||
(quadbyte[0] == 192 && quadbyte[1] == 168) ||
(quadbyte[0] == 172 && (quadbyte[1] & 0xF0) == 16)) && !addr.equals(Main.originAddr))
- throw new HTTPException("security violation: " + host + " [" + addr.getHostAddress() + "] is in a firewalled netblock");
+ throw new HTTPException("security violation: " + host + " [" + addr.getHostAddress() +
+ "] is in a firewalled netblock");
return;
} catch (UnknownHostException uhe) { }
// Methods to attempt socket creation /////////////////////////////////////////////////////////////////
+ private Socket getSocket(String host, int port, boolean ssl, boolean negotiate) throws IOException {
+ Socket ret = ssl ? new SSL(host, port, negotiate) : new Socket(java.net.InetAddress.getByName(host), port);
+ ret.setTcpNoDelay(true);
+ return ret;
+ }
+
/** Attempts a direct connection */
- public Socket attemptDirect() {
+ private Socket attemptDirect() {
try {
- if (Log.verbose) Log.log(this, "attempting to create unproxied socket to " + host + ":" + port + (ssl ? " [ssl]" : ""));
- return Platform.getSocket(host, port, ssl, true);
+ if (Log.verbose) Log.info(this, "attempting to create unproxied socket to " +
+ host + ":" + port + (ssl ? " [ssl]" : ""));
+ return getSocket(host, port, ssl, true);
} catch (IOException e) {
- if (Log.on) Log.log(this, "exception in attemptDirect(): " + e);
+ if (Log.on) Log.info(this, "exception in attemptDirect(): " + e);
return null;
}
}
/** Attempts to use an HTTP proxy, employing the CONNECT method if HTTPS is requested */
- public Socket attemptHttpProxy(String proxyHost, int proxyPort) {
+ private Socket attemptHttpProxy(String proxyHost, int proxyPort) {
try {
- if (Log.verbose) Log.log(this, "attempting to create HTTP proxied socket using proxy " + proxyHost + ":" + proxyPort);
+ if (Log.verbose) Log.info(this, "attempting to create HTTP proxied socket using proxy " + proxyHost + ":" + proxyPort);
+ Socket sock = getSocket(proxyHost, proxyPort, ssl, false);
- Socket sock = Platform.getSocket(proxyHost, proxyPort, ssl, false);
if (!ssl) {
if (!path.startsWith("http://")) path = "http://" + host + ":" + port + path;
- } else {
- PrintWriter pw = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
- BufferedReader br = new BufferedReader(new InputStreamReader(sock.getInputStream()));
- pw.print("CONNECT " + host + ":" + port + " HTTP/1.1\r\n\r\n");
- pw.flush();
- String s = br.readLine();
- if (s.charAt(9) != '2') throw new HTTPException("proxy refused CONNECT method: \"" + s + "\"");
- while (br.readLine().length() > 0) { };
- ((TinySSL)sock).negotiate();
+ return sock;
}
+
+ PrintWriter pw = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
+ BufferedReader br = new BufferedReader(new InputStreamReader(sock.getInputStream()));
+ pw.print("CONNECT " + host + ":" + port + " HTTP/1.1\r\n\r\n");
+ pw.flush();
+ String s = br.readLine();
+ if (s.charAt(9) != '2') throw new HTTPException("proxy refused CONNECT method: \"" + s + "\"");
+ while (br.readLine().length() > 0) { };
+ ((SSL)sock).negotiate();
return sock;
} catch (IOException e) {
- if (Log.on) Log.log(this, "exception in attemptHttpProxy(): " + e);
+ if (Log.on) Log.info(this, "exception in attemptHttpProxy(): " + e);
return null;
}
}
* @see http://www.socks.nec.com/protocol/socks4.protocol
* @see http://www.socks.nec.com/protocol/socks4a.protocol
*/
- public Socket attemptSocksProxy(String proxyHost, int proxyPort) {
+ private Socket attemptSocksProxy(String proxyHost, int proxyPort) {
// even if host is already a "x.y.z.w" string, we use this to parse it into bytes
InetAddress addr = null;
try { addr = InetAddress.getByName(host); } catch (Exception e) { }
- if (Log.verbose) Log.log(this, "attempting to create SOCKSv4" + (addr == null ? "" : "a") +
+ if (Log.verbose) Log.info(this, "attempting to create SOCKSv4" + (addr == null ? "" : "a") +
" proxied socket using proxy " + proxyHost + ":" + proxyPort);
try {
- Socket sock = Platform.getSocket(proxyHost, proxyPort, ssl, false);
+ Socket sock = getSocket(proxyHost, proxyPort, ssl, false);
DataOutputStream dos = new DataOutputStream(sock.getOutputStream());
dos.writeByte(0x04); // SOCKSv4(a)
dis.skip(6); // ip/port
if ((int)(success & 0xff) == 90) {
- if (ssl) ((TinySSL)sock).negotiate();
+ if (ssl) ((SSL)sock).negotiate();
return sock;
}
- if (Log.on) Log.log(this, "SOCKS server denied access, code " + (success & 0xff));
+ if (Log.on) Log.info(this, "SOCKS server denied access, code " + (success & 0xff));
return null;
} catch (IOException e) {
- if (Log.on) Log.log(this, "exception in attemptSocksProxy(): " + e);
+ if (Log.on) Log.info(this, "exception in attemptSocksProxy(): " + e);
return null;
}
}
/** executes the PAC script and dispatches a call to one of the other attempt methods based on the result */
- public Socket attemptPAC(org.xwt.js.JS.Callable pacFunc) {
- if (Log.verbose) Log.log(this, "evaluating PAC script");
+ private Socket attemptPAC(org.xwt.js.JS pacFunc) {
+ if (Log.verbose) Log.info(this, "evaluating PAC script");
String pac = null;
try {
- org.xwt.js.JS.Array args = new org.xwt.js.JS.Array();
- args.addElement(url.toString());
- args.addElement(url.getHost());
- /* FIXME
- Object obj = pacFunc.call(args);
- if (Log.verbose) Log.log(this, " PAC script returned \"" + obj + "\"");
+ org.xwt.js.JSArray args = new org.xwt.js.JSArray();
+ Object obj = pacFunc.call(url.toString(), url.getHost(), null, null, 2);
+ if (Log.verbose) Log.info(this, " PAC script returned \"" + obj + "\"");
pac = obj.toString();
- */
} catch (Throwable e) {
- if (Log.on) Log.log(this, "PAC script threw exception " + e);
+ if (Log.on) Log.info(this, "PAC script threw exception " + e);
return null;
}
StringTokenizer st = new StringTokenizer(pac, ";", false);
while (st.hasMoreTokens()) {
String token = st.nextToken().trim();
- if (Log.verbose) Log.log(this, " trying \"" + token + "\"...");
+ if (Log.verbose) Log.info(this, " trying \"" + token + "\"...");
try {
Socket ret = null;
if (token.startsWith("DIRECT"))
Integer.parseInt(token.substring(token.indexOf(':') + 1)));
if (ret != null) return ret;
} catch (Throwable e) {
- if (Log.on) Log.log(this, "attempt at \"" + token + "\" failed due to " + e + "; trying next token");
+ if (Log.on) Log.info(this, "attempt at \"" + token + "\" failed due to " + e + "; trying next token");
}
}
- if (Log.on) Log.log(this, "all PAC results exhausted");
+ if (Log.on) Log.info(this, "all PAC results exhausted");
return null;
}
// Everything Else ////////////////////////////////////////////////////////////////////////////
private synchronized void connect() throws IOException {
- if (originalUrl.equals("stdio:")) {
- in = new BufferedInputStream(System.in);
- return;
- }
+ if (originalUrl.equals("stdio:")) { in = new BufferedInputStream(System.in); return; }
if (sock != null) {
if (in == null) in = new BufferedInputStream(sock.getInputStream());
return;
path = this.url.getFile();
if (port == -1) port = ssl ? 443 : 80;
host = this.url.getHost();
- if (Log.verbose) Log.log(this, "creating HTTP object for connection to " + host + ":" + port);
+ if (Log.verbose) Log.info(this, "creating HTTP object for connection to " + host + ":" + port);
Proxy pi = Platform.detectProxy();
OUTER: do {
if (pi != null) {
for(int i=0; i<pi.excluded.length; i++) if (host.equals(pi.excluded[i])) break OUTER;
if (sock == null && pi.proxyAutoConfigFunction != null) sock = attemptPAC(pi.proxyAutoConfigFunction);
- if (sock == null && ssl && pi.httpsProxyHost != null) sock = attemptHttpProxy(pi.httpsProxyHost, pi.httpsProxyPort);
+ if (sock == null && ssl && pi.httpsProxyHost != null) sock = attemptHttpProxy(pi.httpsProxyHost,pi.httpsProxyPort);
if (sock == null && pi.httpProxyHost != null) sock = attemptHttpProxy(pi.httpProxyHost, pi.httpProxyPort);
if (sock == null && pi.socksProxyHost != null) sock = attemptSocksProxy(pi.socksProxyHost, pi.socksProxyPort);
}
if (in == null) in = new BufferedInputStream(sock.getInputStream());
}
- public void sendRequest(String contentType, String content) throws IOException {
-
- PrintWriter pw = new PrintWriter(new OutputStreamWriter(originalUrl.equals("stdio:") ? System.out : sock.getOutputStream()));
+ private void sendRequest(String contentType, String content) throws IOException {
+ PrintWriter pw = new PrintWriter(new OutputStreamWriter(originalUrl.equals("stdio:") ?
+ System.out : sock.getOutputStream()));
if (content != null) {
pw.print("POST " + path + " HTTP/1.1\r\n");
int contentLength = content.substring(0, 2).equals("\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 (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");
pw.print(content == null ? "\r\n" : content);
authCache.put(originalUrl, "Basic " + new String(Base64.encode(userInfo.getBytes("US-ASCII"))));
} else if (h.get("AUTHTYPE").equals("Digest")) {
- if (authCache.get(originalUrl) != null && !"true".equals(h.get("stale"))) throw new HTTPException("username/password rejected");
+ if (authCache.get(originalUrl) != null && !"true".equals(h.get("stale")))
+ throw new HTTPException("username/password rejected");
String path2 = path;
if (path2.startsWith("http://") || path2.startsWith("https://")) {
path2 = path2.substring(path2.indexOf("://") + 3);
path2 = path2.substring(path2.indexOf('/'));
}
- String A1 = userInfo.substring(0, userInfo.indexOf(':')) + ":" + h.get("realm") + ":" + userInfo.substring(userInfo.indexOf(':') + 1);
+ String A1 = userInfo.substring(0, userInfo.indexOf(':')) + ":" + h.get("realm") + ":" +
+ userInfo.substring(userInfo.indexOf(':') + 1);
String A2 = method + ":" + path2;
authCache.put(originalUrl,
"Digest " +
}
private void doProxyAuth(Hashtable h0, String method) throws IOException {
- if (Log.on) Log.log(this, "Proxy AuthChallenge: " + h0.get("proxy-authenticate"));
+ if (Log.on) Log.info(this, "Proxy AuthChallenge: " + h0.get("proxy-authenticate"));
Hashtable h = parseAuthenticationChallenge(h0.get("proxy-authenticate").toString());
String style = h.get("AUTHTYPE").toString();
String realm = (String)h.get("realm");
if (style.equals("NTLM") && Proxy.Authorization.authorization2 == null) {
- Log.log(this, "Proxy identified itself as NTLM, sending Type 1 packet");
+ Log.info(this, "Proxy identified itself as NTLM, sending Type 1 packet");
Proxy.Authorization.authorization2 = "NTLM " + Base64.encode(Proxy.NTLM.type1);
return;
}
if (!realm.equals("Digest") || Proxy.Authorization.authorization2 == null || !"true".equals(h.get("stale")))
- Proxy.Authorization.getPassword(realm, style, sock.getInetAddress().getHostAddress(), Proxy.Authorization.authorization);
+ Proxy.Authorization.getPassword(realm, style, sock.getInetAddress().getHostAddress(),
+ Proxy.Authorization.authorization);
if (style.equals("Basic")) {
Proxy.Authorization.authorization2 =
String A2 = method + ":" + path;
Proxy.Authorization.authorization2 =
"Digest " +
- "username=\"" + Proxy.Authorization.authorization.substring(0, Proxy.Authorization.authorization.indexOf(':')) + "\", " +
+ "username=\"" + Proxy.Authorization.authorization.substring(0, Proxy.Authorization.authorization.indexOf(':')) +
+ "\", " +
"realm=\"" + h.get("realm") + "\", " +
"nonce=\"" + h.get("nonce") + "\", " +
"uri=\"" + path + "\", " +
"algorithm=MD5";
} else if (style.equals("NTLM")) {
- Log.log(this, "Proxy identified itself as NTLM, got Type 2 packet");
+ Log.info(this, "Proxy identified itself as NTLM, got Type 2 packet");
byte[] type2 = Base64.decode(((String)h0.get("proxy-authenticate")).substring(5).trim());
for(int i=0; i<type2.length; i += 4) {
String log = "";
if (i+1<type2.length) log += Integer.toString(type2[i+1] & 0xff, 16) + " ";
if (i+2<type2.length) log += Integer.toString(type2[i+2] & 0xff, 16) + " ";
if (i+3<type2.length) log += Integer.toString(type2[i+3] & 0xff, 16) + " ";
- Log.log(this, log);
+ Log.info(this, log);
}
- // FIXME: need to keep the connection open between type1 and type3
- // FIXME: finish this
+ // FEATURE: need to keep the connection open between type1 and type3
+ // FEATURE: finish this
//byte[] type3 = Proxy.NTLM.getResponse(
//Proxy.Authorization.authorization2 = "NTLM " + Base64.encode(type3));
}
}
- // HTTPException ///////////////////////////////////////////////////////////////////////////////////
-
- static class HTTPException extends IOException { public HTTPException(String s) { super(s); } }
-
-
// HTTPInputStream ///////////////////////////////////////////////////////////////////////////////////
/** An input stream that represents a subset of a longer input stream. Supports HTTP chunking as well */
public class HTTPInputStream extends FilterInputStream implements KnownLength {
- /** if chunking, the number of bytes remaining in this subset; otherwise the remainder of the chunk */
- private int length = 0;
-
- /** this semaphore will be released when the stream is closed */
- private Semaphore releaseMe = null;
-
- /** indicates that we have encountered the zero-length terminator chunk */
- boolean chunkedDone = false;
-
- /** if we're on the first chunk, we don't pre-read a CRLF */
- boolean firstChunk = true;
-
- /** the length of the entire content body; -1 if chunked */
- private int contentLength = 0;
- public int getContentLength() { return contentLength; }
+ private int length = 0; ///< if chunking, numbytes left in this subset; else the remainder of the chunk
+ private Semaphore releaseMe = null; ///< this semaphore will be released when the stream is closed
+ boolean chunkedDone = false; ///< indicates that we have encountered the zero-length terminator chunk
+ boolean firstChunk = true; ///< if we're on the first chunk, we don't pre-read a CRLF
+ private int contentLength = 0; ///< the length of the entire content body; -1 if chunked
HTTPInputStream(InputStream in, int length, Semaphore releaseMe) throws IOException {
super(in);
if (read == -1 && buflen == 0) return null;
if (read == -1) throw new HTTPException("stream closed while reading headers");
buf[buflen++] = (byte)read;
- if (buflen >= 4 && buf[buflen - 4] == '\r' && buf[buflen - 3] == '\n' && buf[buflen - 2] == '\r' && buf[buflen - 1] == '\n') break;
+ if (buflen >= 4 && buf[buflen - 4] == '\r' && buf[buflen - 3] == '\n' &&
+ buf[buflen - 2] == '\r' && buf[buflen - 1] == '\n')
+ break;
if (buflen == buf.length) {
byte[] newbuf = new byte[buf.length * 2];
System.arraycopy(buf, 0, newbuf, 0, buflen);
public Proxy() { }
- /** the HTTP Proxy host to use */
- public String httpProxyHost = null;
-
- /** the HTTP Proxy port to use */
- public int httpProxyPort = -1;
-
- /** if a seperate proxy should be used for HTTPS, this is the hostname; otherwise, httpProxyHost is used */
- public String httpsProxyHost = null;
-
- /** if a seperate proxy should be used for HTTPS, this is the port */
+ public String httpProxyHost = null; ///< the HTTP Proxy host to use
+ public int httpProxyPort = -1; ///< the HTTP Proxy port to use
+ public String httpsProxyHost = null; ///< seperate proxy for HTTPS
public int httpsProxyPort = -1;
-
- /** the SOCKS Proxy Host to use */
- public String socksProxyHost = null;
-
- /** the SOCKS Proxy Port to use */
- public int socksProxyPort = -1;
-
- /** hosts to be excluded from proxy use; wildcards permitted */
- public String[] excluded = null;
-
- /** the PAC script */
- public JS.Callable proxyAutoConfigFunction = null;
+ public String socksProxyHost = null; ///< the SOCKS Proxy Host to use
+ public int socksProxyPort = -1; ///< the SOCKS Proxy Port to use
+ public String[] excluded = null; ///< hosts to be excluded from proxy use; wildcards permitted
+ public JS proxyAutoConfigFunction = null; ///< the PAC script
public static Proxy detectProxyViaManual() {
Proxy ret = new Proxy();
ret.httpProxyHost = Platform.getEnv("http_proxy");
if (ret.httpProxyHost != null) {
if (ret.httpProxyHost.startsWith("http://")) ret.httpProxyHost = ret.httpProxyHost.substring(7);
- if (ret.httpProxyHost.endsWith("/")) ret.httpProxyHost = ret.httpProxyHost.substring(0, ret.httpProxyHost.length() - 1);
+ if (ret.httpProxyHost.endsWith("/"))
+ ret.httpProxyHost = ret.httpProxyHost.substring(0, ret.httpProxyHost.length() - 1);
if (ret.httpProxyHost.indexOf(':') != -1) {
ret.httpProxyPort = Integer.parseInt(ret.httpProxyHost.substring(ret.httpProxyHost.indexOf(':') + 1));
ret.httpProxyHost = ret.httpProxyHost.substring(0, ret.httpProxyHost.indexOf(':'));
ret.httpsProxyHost = Platform.getEnv("https_proxy");
if (ret.httpsProxyHost != null) {
if (ret.httpsProxyHost.startsWith("https://")) ret.httpsProxyHost = ret.httpsProxyHost.substring(7);
- if (ret.httpsProxyHost.endsWith("/")) ret.httpsProxyHost = ret.httpsProxyHost.substring(0, ret.httpsProxyHost.length() - 1);
+ if (ret.httpsProxyHost.endsWith("/"))
+ ret.httpsProxyHost = ret.httpsProxyHost.substring(0, ret.httpsProxyHost.length() - 1);
if (ret.httpsProxyHost.indexOf(':') != -1) {
ret.httpsProxyPort = Integer.parseInt(ret.httpsProxyHost.substring(ret.httpsProxyHost.indexOf(':') + 1));
ret.httpsProxyHost = ret.httpsProxyHost.substring(0, ret.httpsProxyHost.indexOf(':'));
ret.socksProxyHost = Platform.getEnv("socks_proxy");
if (ret.socksProxyHost != null) {
if (ret.socksProxyHost.startsWith("socks://")) ret.socksProxyHost = ret.socksProxyHost.substring(7);
- if (ret.socksProxyHost.endsWith("/")) ret.socksProxyHost = ret.socksProxyHost.substring(0, ret.socksProxyHost.length() - 1);
+ if (ret.socksProxyHost.endsWith("/"))
+ ret.socksProxyHost = ret.socksProxyHost.substring(0, ret.socksProxyHost.length() - 1);
if (ret.socksProxyHost.indexOf(':') != -1) {
ret.socksProxyPort = Integer.parseInt(ret.socksProxyHost.substring(ret.socksProxyHost.indexOf(':') + 1));
ret.socksProxyHost = ret.socksProxyHost.substring(0, ret.socksProxyHost.indexOf(':'));
return ret;
}
- public static JS.Scope proxyAutoConfigRootScope = new ProxyAutoConfigRootScope();
- public static JS.Callable getProxyAutoConfigFunction(String url) {
+ public static JSScope proxyAutoConfigRootScope = new ProxyAutoConfigRootScope();
+ public static JS getProxyAutoConfigFunction(String url) {
try {
BufferedReader br = new BufferedReader(new InputStreamReader(new HTTP(url, true).GET()));
String s = null;
String script = "";
while((s = br.readLine()) != null) script += s + "\n";
- if (Log.on) Log.log(Proxy.class, "successfully retrieved WPAD PAC:");
- if (Log.on) Log.log(Proxy.class, script);
+ if (Log.on) Log.info(Proxy.class, "successfully retrieved WPAD PAC:");
+ if (Log.on) Log.info(Proxy.class, script);
// MS CARP hack
Vector carpHosts = new Vector();
for(int i=0; i<script.length(); i++)
if (script.regionMatches(i, "new Node(", 0, 9)) {
String host = script.substring(i + 10, script.indexOf('\"', i + 11));
- if (Log.on) Log.log(Proxy.class, "Detected MS Proxy Server CARP Script, Host=" + host);
+ if (Log.on) Log.info(Proxy.class, "Detected MS Proxy Server CARP Script, Host=" + host);
carpHosts.addElement(host);
}
if (carpHosts.size() > 0) {
for(int i=0; i<carpHosts.size(); i++)
script += "PROXY " + carpHosts.elementAt(i) + "; ";
script += "\";\n}";
- if (Log.on) Log.log(Proxy.class, "DeCARPed PAC script:");
- if (Log.on) Log.log(Proxy.class, script);
+ if (Log.on) Log.info(Proxy.class, "DeCARPed PAC script:");
+ if (Log.on) Log.info(Proxy.class, script);
}
- JS.CompiledFunction scr = JS.parse("PAC script at " + url, 0, new StringReader(script));
- // FIXME
- /*
- scr.call(new JS.Array(), proxyAutoConfigRootScope);
- */
- return (JS.Callable)proxyAutoConfigRootScope.get("FindProxyForURL");
+ JS scr = JS.fromReader("PAC script at " + url, 0, new StringReader(script));
+ JS.cloneWithNewParentScope(scr, proxyAutoConfigRootScope).call(null, null, null, null, 0);
+ return (JS)proxyAutoConfigRootScope.get("FindProxyForURL");
} catch (Exception e) {
if (Log.on) {
- Log.log(Platform.class, "WPAD detection failed due to:");
- if (e instanceof JS.Exn) {
+ Log.info(Platform.class, "WPAD detection failed due to:");
+ if (e instanceof JSExn) {
try {
- org.xwt.js.JS.Array arr = new org.xwt.js.JS.Array();
- arr.addElement(((JS.Exn)e).getObject());
+ org.xwt.js.JSArray arr = new org.xwt.js.JSArray();
+ arr.addElement(((JSExn)e).getObject());
} catch (Exception e2) {
- Log.log(Platform.class, e);
+ Log.info(Platform.class, e);
}
}
- else Log.log(Platform.class, e);
+ else Log.info(Platform.class, e);
}
return null;
}
static public String authorization2 = null;
static public Semaphore waitingForUser = new Semaphore();
- public static synchronized void getPassword(final String realm, final String style, final String proxyIP, String oldAuth) {
+ public static synchronized void getPassword(final String realm, final String style,
+ final String proxyIP, String oldAuth) {
// this handles cases where multiple threads hit the proxy auth at the same time -- all but one will block on the
// synchronized keyword. If 'authorization' changed while the thread was blocked, it means that the user entered
// a password, so we should reattempt authorization.
if (authorization != oldAuth) return;
- if (Log.on) Log.log(Authorization.class, "displaying proxy authorization dialog");
- /*
- FIXME
- Message.Q.add(new Message() {
- public void perform() {
+ if (Log.on) Log.info(Authorization.class, "displaying proxy authorization dialog");
+ Scheduler.add(new Scheduler.Task() {
+ public void perform() throws Exception {
Box b = new Box();
- Template t = Template.getTemplate((Res)Main.builtin.get("org/xwt/builtin/proxy_authorization.xwt"));
- t.apply(b, null, null);
+ Template t = Template.buildTemplate(Stream.getInputStream((JS)Main.builtin.get("org/xwt/builtin/proxy_authorization.xwt")), new XWT(null));
+ t.apply(b);
b.put("realm", realm);
b.put("proxyIP", proxyIP);
}
});
- */
+
waitingForUser.block();
- if (Log.on) Log.log(Authorization.class, "got proxy authorization info; re-attempting connection");
-
+ if (Log.on) Log.info(Authorization.class, "got proxy authorization info; re-attempting connection");
}
}
- // ProxyAutoConfigRootScope ////////////////////////////////////////////////////////////////////
+ // ProxyAutoConfigRootJSScope ////////////////////////////////////////////////////////////////////
- public static class ProxyAutoConfigRootScope extends JS.GlobalScope {
+ public static class ProxyAutoConfigRootScope extends JSScope.Global {
- public ProxyAutoConfigRootScope() { super(null); }
+ public ProxyAutoConfigRootScope() { super(); }
- public Object get(Object name) {
- if (name.equals("isPlainHostName")) return isPlainHostName;
- else if (name.equals("dnsDomainIs")) return dnsDomainIs;
- else if (name.equals("localHostOrDomainIs")) return localHostOrDomainIs;
- else if (name.equals("isResolvable")) return isResolvable;
- else if (name.equals("isInNet")) return isInNet;
- else if (name.equals("dnsResolve")) return dnsResolve;
- else if (name.equals("myIpAddress")) return myIpAddress;
- else if (name.equals("dnsDomainLevels")) return dnsDomainLevels;
- else if (name.equals("shExpMatch")) return shExpMatch;
- else if (name.equals("weekdayRange")) return weekdayRange;
- else if (name.equals("dateRange")) return dateRange;
- else if (name.equals("timeRange")) return timeRange;
- else if (name.equals("ProxyConfig")) return ProxyConfig;
- else return super.get(name);
+ public Object get(Object name) throws JSExn {
+ //#switch(name)
+ case "isPlainHostName": return METHOD;
+ case "dnsDomainIs": return METHOD;
+ case "localHostOrDomainIs": return METHOD;
+ case "isResolvable": return METHOD;
+ case "isInNet": return METHOD;
+ case "dnsResolve": return METHOD;
+ case "myIpAddress": return METHOD;
+ case "dnsDomainLevels": return METHOD;
+ case "shExpMatch": return METHOD;
+ case "weekdayRange": return METHOD;
+ case "dateRange": return METHOD;
+ case "timeRange": return METHOD;
+ case "ProxyConfig": return ProxyConfig;
+ //#end
+ return super.get(name);
}
- private static final JS.Obj proxyConfigBindings = new JS.Obj();
- private static final JS.Obj ProxyConfig = new JS.Obj() {
+ private static final JS proxyConfigBindings = new JS();
+ private static final JS ProxyConfig = new JS() {
public Object get(Object name) {
if (name.equals("bindings")) return proxyConfigBindings;
return null;
}
};
-
- private static final JS.Callable isPlainHostName = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- return (args.elementAt(0).toString().indexOf('.') == -1) ? Boolean.TRUE : Boolean.FALSE;
- }
- };
-
- private static final JS.Callable dnsDomainIs = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- return (args.elementAt(0).toString().endsWith(args.elementAt(1).toString())) ? Boolean.TRUE : Boolean.FALSE;
- }
- };
-
- private static final JS.Callable localHostOrDomainIs = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- return (args.elementAt(0).toString().equals(args.elementAt(1).toString()) ||
- (args.elementAt(0).toString().indexOf('.') == -1 && args.elementAt(1).toString().startsWith(args.elementAt(0).toString()))) ?
+
+ public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
+ //#switch(method)
+ case "isPlainHostName": return (a0.toString().indexOf('.') == -1) ? Boolean.TRUE : Boolean.FALSE;
+ case "dnsDomainIs": return (a0.toString().endsWith(a1.toString())) ? Boolean.TRUE : Boolean.FALSE;
+ case "localHostOrDomainIs":
+ return (a0.equals(a1) || (a0.toString().indexOf('.') == -1 && a1.toString().startsWith(a0.toString()))) ? T:F;
+ case "isResolvable": try {
+ return (InetAddress.getByName(a0.toString()) != null) ? Boolean.TRUE : Boolean.FALSE;
+ } catch (UnknownHostException e) { return F; }
+ case "isInNet":
+ if (nargs != 3) return Boolean.FALSE;
+ try {
+ byte[] host = InetAddress.getByName(a0.toString()).getAddress();
+ byte[] net = InetAddress.getByName(a1.toString()).getAddress();
+ byte[] mask = InetAddress.getByName(a2.toString()).getAddress();
+ return ((host[0] & mask[0]) == net[0] &&
+ (host[1] & mask[1]) == net[1] &&
+ (host[2] & mask[2]) == net[2] &&
+ (host[3] & mask[3]) == net[3]) ?
Boolean.TRUE : Boolean.FALSE;
+ } catch (Exception e) {
+ throw new JSExn("exception in isInNet(): " + e);
}
- };
-
- private static final JS.Callable isResolvable = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- try {
- return (InetAddress.getByName(args.elementAt(0).toString()) != null) ? Boolean.TRUE : Boolean.FALSE;
- } catch (UnknownHostException e) {
- return Boolean.FALSE;
- }
- }
- };
-
- private static final JS.Callable isInNet = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- if (args.length() != 3) return Boolean.FALSE;
- try {
- byte[] host = InetAddress.getByName(args.elementAt(0).toString()).getAddress();
- byte[] net = InetAddress.getByName(args.elementAt(1).toString()).getAddress();
- byte[] mask = InetAddress.getByName(args.elementAt(2).toString()).getAddress();
- return ((host[0] & mask[0]) == net[0] &&
- (host[1] & mask[1]) == net[1] &&
- (host[2] & mask[2]) == net[2] &&
- (host[3] & mask[3]) == net[3]) ?
- Boolean.TRUE : Boolean.FALSE;
- } catch (Exception e) {
- throw new JS.Exn("exception in isInNet(): " + e);
- }
- }
- };
-
- private static final JS.Callable dnsResolve = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- try {
- return InetAddress.getByName(args.elementAt(0).toString()).getHostAddress();
- } catch (UnknownHostException e) {
- return null;
- }
- }
- };
-
- private static final JS.Callable myIpAddress = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- try {
- return InetAddress.getLocalHost().getHostAddress();
- } catch (UnknownHostException e) {
- if (Log.on) Log.log(this, "strange... host does not know its own address");
- return null;
- }
+ case "dnsResolve":
+ try {
+ return InetAddress.getByName(a0.toString()).getHostAddress();
+ } catch (UnknownHostException e) {
+ return null;
}
- };
-
- private static final JS.Callable dnsDomainLevels = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- String s = args.elementAt(0).toString();
- int i = 0;
- while((i = s.indexOf('.', i)) != -1) i++;
- return new Integer(i);
+ case "myIpAddress":
+ try {
+ return InetAddress.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e) {
+ if (Log.on) Log.info(this, "strange... host does not know its own address");
+ return null;
}
- };
-
+ case "dnsDomainLevels":
+ String s = a0.toString();
+ int i = 0;
+ while((i = s.indexOf('.', i)) != -1) i++;
+ return new Integer(i);
+ case "shExpMatch":
+ StringTokenizer st = new StringTokenizer(a1.toString(), "*", false);
+ String[] arr = new String[st.countTokens()];
+ String s = a0.toString();
+ for (int i=0; st.hasMoreTokens(); i++) arr[i] = st.nextToken();
+ return match(arr, s, 0) ? Boolean.TRUE : Boolean.FALSE;
+ case "weekdayRange":
+ TimeZone tz = (nargs < 3 || a2 == null || !a2.equals("GMT")) ?
+ TimeZone.getTimeZone("UTC") : TimeZone.getDefault();
+ Calendar c = new GregorianCalendar();
+ c.setTimeZone(tz);
+ c.setTime(new java.util.Date());
+ java.util.Date d = c.getTime();
+ int day = d.getDay();
+ String d1s = a0.toString().toUpperCase();
+ int d1 = 0, d2 = 0;
+ for(int i=0; i<days.length; i++) if (days[i].equals(d1s)) d1 = i;
+
+ if (nargs == 1)
+ return d1 == day ? Boolean.TRUE : Boolean.FALSE;
+
+ String d2s = a1.toString().toUpperCase();
+ for(int i=0; i<days.length; i++) if (days[i].equals(d2s)) d2 = i;
+
+ return ((d1 <= d2 && day >= d1 && day <= d2) || (d1 > d2 && (day >= d1 || day <= d2))) ? T : F;
+
+ case "dateRange": throw new JSExn("XWT does not support dateRange() in PAC scripts");
+ case "timeRange": throw new JSExn("XWT does not support timeRange() in PAC scripts");
+ //#end
+ return super.callMethod(method, a0, a1, a2, rest, nargs);
+ }
private static boolean match(String[] arr, String s, int index) {
if (index >= arr.length) return true;
for(int i=0; i<s.length(); i++) {
}
return false;
}
-
- private static final JS.Callable shExpMatch = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- StringTokenizer st = new StringTokenizer(args.elementAt(1).toString(), "*", false);
- String[] arr = new String[st.countTokens()];
- String s = args.elementAt(0).toString();
- for (int i=0; st.hasMoreTokens(); i++) arr[i] = st.nextToken();
- return match(arr, s, 0) ? Boolean.TRUE : Boolean.FALSE;
- }
- };
-
public static String[] days = { "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
-
- private static final JS.Callable weekdayRange = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- TimeZone tz = (args.length() < 3 || args.elementAt(2) == null || !args.elementAt(2).equals("GMT")) ? TimeZone.getTimeZone("UTC") : TimeZone.getDefault();
- Calendar c = new GregorianCalendar();
- c.setTimeZone(tz);
- c.setTime(new java.util.Date());
- java.util.Date d = c.getTime();
- int day = d.getDay();
-
- String d1s = args.elementAt(0).toString().toUpperCase();
- int d1 = 0, d2 = 0;
- for(int i=0; i<days.length; i++) if (days[i].equals(d1s)) d1 = i;
-
- if (args.length() == 1)
- return d1 == day ? Boolean.TRUE : Boolean.FALSE;
-
- String d2s = args.elementAt(1).toString().toUpperCase();
- for(int i=0; i<days.length; i++) if (days[i].equals(d2s)) d2 = i;
-
- return
- ((d1 <= d2 && day >= d1 && day <= d2) ||
- (d1 > d2 && (day >= d1 || day <= d2))) ?
- Boolean.TRUE : Boolean.FALSE;
- }
- };
-
- private static final JS.Callable dateRange = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- throw new JS.Exn("XWT does not support dateRange() in PAC scripts");
- }
- };
-
- private static final JS.Callable timeRange = new JS.Callable() {
- public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
- throw new JS.Exn("XWT does not support timeRange() in PAC scripts");
- }
- };
-
}
+
/**
* An implementation of Microsoft's proprietary NTLM authentication protocol. This code was derived from Eric
* Glass's work, and is copyright as follows:
System.arraycopy(highHash, 0, lmHash, 8, 8);
return lmHash;
*/
- return null; // FIXME
+ return null;
}
/**
System.arraycopy(highResponse, 0, lmResponse, 16, 8);
return lmResponse;
*/
- return null; // FIXME
+ return null;
}
/**
projects / org.ibex.core.git / blobdiff