X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXMLRPC.java;h=ebea2a666a253b9a93a7fd76d38326e1c8dc838c;hb=ce05c727a51c093b14816a88c0cdd33951396d93;hp=ca5b54f88ed38b08e02b2ac2d8dc93a11918e5e1;hpb=6242c991f365dbd67eba62ecfa5df769a83fcbc6;p=org.ibex.core.git diff --git a/src/org/xwt/XMLRPC.java b/src/org/xwt/XMLRPC.java index ca5b54f..ebea2a6 100644 --- a/src/org/xwt/XMLRPC.java +++ b/src/org/xwt/XMLRPC.java @@ -6,6 +6,7 @@ import java.net.*; import java.util.*; import org.mozilla.javascript.*; import org.xwt.util.*; +import org.bouncycastle.util.encoders.Base64; /** * An XML-RPC client implemented as a Rhino JavaScript Host @@ -31,27 +32,18 @@ import org.xwt.util.*; */ class XMLRPC extends XML implements Function { - /** should we use SSL? */ - protected boolean ssl = false; - /** the url to connect to */ - protected URL url = null; + protected String url = null; /** the method name to invoke on the remove server */ protected String methodname = null; - /** the host portion of the url; not calculated until first call() */ - protected String host = null; - - /** the filename portion of the url; not calculated until first call() */ - protected String filename = null; - - /** the port to connect to; not calculated until the first call() */ - protected int port = -1; - /** this holds character content as we read it in -- since there is only one per instance, we don't support mixed content */ protected AccessibleCharArrayWriter content = new AccessibleCharArrayWriter(100); + /** the HTTP connection to use */ + protected HTTP http = null; + /** The object stack. As we process xml elements, pieces of the * return value are pushed onto and popped off of this stack. * @@ -84,37 +76,38 @@ class XMLRPC extends XML implements Function { // Methods to Recieve and parse XML-RPC Response //////////////////////////////////////////////////// - public void startElement(String name, String[] keys, Object[] vals, int line, int col) { - if (name.equals("fault")) fault = true; - else if (name.equals("struct")) objects.setElementAt(new JSObject(false), objects.size() - 1); - else if (name.equals("array")) objects.setElementAt(null, objects.size() - 1); - else if (name.equals("value")) objects.addElement(""); + public void startElement(XML.Element c) { + content.reset(); + if (c.localName.equals("fault")) fault = true; + else if (c.localName.equals("struct")) objects.setElementAt(new JSObject(false), objects.size() - 1); + else if (c.localName.equals("array")) objects.setElementAt(null, objects.size() - 1); + else if (c.localName.equals("value")) objects.addElement(""); } - public void endElement(String name, int line, int col) { + public void endElement(XML.Element c) { - if (name.equals("int") || name.equals("i4")) + if (c.localName.equals("int") || c.localName.equals("i4")) objects.setElementAt(new Integer(new String(content.getBuf(), 0, content.size())), objects.size() - 1); - else if (name.equals("boolean")) + else if (c.localName.equals("boolean")) objects.setElementAt(content.getBuf()[0] == '1' ? Boolean.TRUE : Boolean.FALSE, objects.size() - 1); - else if (name.equals("string")) + else if (c.localName.equals("string")) objects.setElementAt(new String(content.getBuf(), 0, content.size()), objects.size() - 1); - else if (name.equals("double")) + else if (c.localName.equals("double")) objects.setElementAt(new Double(new String(content.getBuf(), 0, content.size())), objects.size() - 1); - else if (name.equals("base64")) - objects.setElementAt(new String(content.getBuf(), 0, content.size()), objects.size() - 1); + else if (c.localName.equals("base64")) + objects.setElementAt(new ByteStream(Base64.decode(new String(content.getBuf(), 0, content.size()))), objects.size() - 1); - else if (name.equals("name")) + else if (c.localName.equals("name")) objects.addElement(new String(content.getBuf(), 0, content.size())); - else if (name.equals("value") && "".equals(objects.lastElement())) + else if (c.localName.equals("value") && "".equals(objects.lastElement())) objects.setElementAt(new String(content.getBuf(), 0, content.size()), objects.size() - 1); - else if (name.equals("dateTime.iso8601")) { + else if (c.localName.equals("dateTime.iso8601")) { String s = new String(content.getBuf(), 0, content.size()); // strip whitespace @@ -140,14 +133,14 @@ class XMLRPC extends XML implements Function { if (Log.on) Log.log(this, e); } - } else if (name.equals("member")) { + } else if (c.localName.equals("member")) { Object memberValue = objects.elementAt(objects.size() - 1); String memberName = (String)objects.elementAt(objects.size() - 2); Scriptable struct = (Scriptable)objects.elementAt(objects.size() - 3); struct.put(memberName, struct, memberValue); objects.setSize(objects.size() - 2); - } else if (name.equals("data")) { + } else if (c.localName.equals("data")) { int i; for(i=objects.size() - 1; objects.elementAt(i) != null; i--); Object[] arr = new Object[objects.size() - i - 1]; @@ -160,7 +153,7 @@ class XMLRPC extends XML implements Function { content.reset(); } - public void content(char[] ch, int start, int length, int line, int col) { + public void characters(char[] ch, int start, int length) { try { content.write(ch, start, length); } catch (Exception e) { if (Log.on) Log.log(this, "Exception in XMLRPC.content() -- this should never happen"); @@ -168,6 +161,8 @@ class XMLRPC extends XML implements Function { } } + public void whitespace(char[] ch, int start, int length) {} + // Methods to make outbound XML-RPC request /////////////////////////////////////////////////// /** Appends the XML-RPC representation of o to sb */ @@ -192,6 +187,30 @@ class XMLRPC extends XML implements Function { sb.append(((Boolean)o).booleanValue() ? "1" : "0"); sb.append("\n"); + } else if (o instanceof ByteStream) { + try { + sb.append(" \n"); + InputStream is = ((ByteStream)o).getInputStream(); + byte[] buf = new byte[54]; + while(true) { + int numread = is.read(buf, 0, 54); + if (numread == -1) break; + byte[] writebuf = buf; + if (numread < buf.length) { + writebuf = new byte[numread]; + System.arraycopy(buf, 0, writebuf, 0, numread); + } + sb.append(" "); + sb.append(new String(Base64.encode(writebuf))); + sb.append("\n"); + } + sb.append("\n \n"); + } catch (IOException e) { + if (Log.on) Log.log(this, "caught IOException while attempting to send a ByteStream via XML-RPC"); + if (Log.on) Log.log(this, e); + throw new JavaScriptException("caught IOException while attempting to send a ByteStream via XML-RPC"); + } + } else if (o instanceof String) { sb.append(" "); String s = (String)o; @@ -212,6 +231,26 @@ class XMLRPC extends XML implements Function { } sb.append("\n"); + } else if (o instanceof NativeDate) { + sb.append(" "); + NativeDate nd = (NativeDate)o; + Date d = new Date(nd.getRawTime()); + sb.append(d.getYear() + 1900); + if (d.getMonth() + 1 < 10) sb.append('0'); + sb.append(d.getMonth() + 1); + if (d.getDate() < 10) sb.append('0'); + sb.append(d.getDate()); + sb.append('T'); + if (d.getHours() < 10) sb.append('0'); + sb.append(d.getHours()); + sb.append(':'); + if (d.getMinutes() < 10) sb.append('0'); + sb.append(d.getMinutes()); + sb.append(':'); + if (d.getSeconds() < 10) sb.append('0'); + sb.append(d.getSeconds()); + sb.append("\n"); + } else if (o instanceof NativeArray) { if (tracker.get(o) != null) throw new JavaScriptException("attempted to send multi-ref data structure via XML-RPC"); tracker.put(o, Boolean.TRUE); @@ -240,142 +279,88 @@ class XMLRPC extends XML implements Function { } } - private Object connect(Object[] args) throws JavaScriptException, IOException { - if (filename == null) { - filename = url.getFile(); - host = url.getHost(); - port = url.getPort(); - - InetAddress addr; - try { addr = InetAddress.getByName(host); } - catch (UnknownHostException uhe) { throw new JavaScriptException("could not resolve hostname \"" + host + "\""); } - byte[] quadbyte = addr.getAddress(); - - if (quadbyte[0] == 10 || - (quadbyte[0] == 192 && quadbyte[1] == 168) || - (quadbyte[0] == 172 && (quadbyte[1] & 0xF0) == 16) && - !addr.equals(Main.originAddr)) { - filename = null; - throw new JavaScriptException("security violation: " + host + " [" + addr.getHostAddress() + "] is in a firewalled netblock"); - } - } + // this is synchronized in case multiple threads try to make a call on the same object... in the future, change this + // behavior to use pipelining. + public synchronized Object call(Object[] args) throws JavaScriptException, IOException { + if (Log.verbose) Log.log(this, "call to " + url + " : " + methodname); - Socket s; - if (ssl) s = Platform.getSocket(host, port == -1 ? 443 : port, true); - else if (url.getProtocol().equals("http")) s = Platform.getSocket(host, port == -1 ? 80 : port, false); - else throw new JavaScriptException("only http[s] is supported"); + if (tracker == null) tracker = new Hash(); + else tracker.clear(); - s.setTcpNoDelay(true); - OutputStream os = new BufferedOutputStream(s.getOutputStream(), 4000); - InputStream is = new BufferedInputStream(new Filter(s.getInputStream())); - - PrintWriter ps; - if (!Log.verbose) ps = new PrintWriter(os); - else ps = new PrintWriter(new FilterWriter(new OutputStreamWriter(os)) { - public void write(int i) throws IOException { - super.write(i); - if (Log.on) Log.log(this, "send: " + ((char)i)); - } - public void write(String s, int start, int len) throws IOException { - super.write(s, start, len); - if (Log.on) Log.log(this, "send: " + s.substring(start, start + len)); - } - public void write(char[] c, int start, int len) throws IOException { - super.write(c, start, len); - if (Log.on) Log.log(this, "send: " + new String(c, start, len)); - } - }); - - BufferedReader br; - if (!Log.verbose) br = new BufferedReader(new InputStreamReader(is)); - else br = new BufferedReader(new FilterReader(new InputStreamReader(is)) { - public int read() throws IOException { - int i = super.read(); - if (Log.on) Log.log(this, "recv: " + ((char)i)); - return i; - } - public int read(char[] c, int off, int len) throws IOException { - int ret = super.read(c, off, len); - if (ret == -1) return ret; - if (Log.on) Log.log(this, "recv: " + new String(c, off, ret)); - return ret; - } - }); - - if (Log.verbose) Log.log(this, "call to " + url + " : " + methodname); - return send(args, br, ps); - } + if (objects == null) objects = new Vec(); + else objects.setSize(0); + + String content = send(args, http); + if (Log.verbose) { + String s; + BufferedReader br2 = new BufferedReader(new StringReader(content)); + while ((s = br2.readLine()) != null) Log.log(this, "send: " + s); + } - protected Object send(Object[] args, BufferedReader br, PrintWriter ps) throws JavaScriptException, IOException { + HTTP.HTTPInputStream is = http.POST("text/xml", content); + try { + BufferedReader br = !Log.verbose ? + new BufferedReader(new InputStreamReader(new Filter(is))) : + new BufferedReader(new FilterReader(new InputStreamReader(new Filter(is))) { + public int read() throws IOException { + int i = super.read(); + if (Log.on) Log.log(this, "recv: " + ((char)i)); + return i; + } + public int read(char[] c, int off, int len) throws IOException { + int ret = super.read(c, off, len); + if (ret == -1) return ret; + String s; + BufferedReader br2 = new BufferedReader(new StringReader(new String(c, off, ret))); + while ((s = br2.readLine()) != null) Log.log(this, "recv: " + s); + return ret; + } + }); + return recieve(br); + } finally { + is.close(); + } + } - // Construct payload + protected String send(Object[] args, HTTP http) throws JavaScriptException, IOException { StringBuffer content = new StringBuffer(); + content.append("\r\n"); content.append("\n"); content.append(" \n"); content.append(" "); content.append(methodname); content.append("\n"); - if (args.length > 0) { - content.append(" \n"); - for(int i=0; i\n"); - appendObject(args[i], content); - content.append(" \n"); - } - content.append(" \n"); + content.append(" \n"); + for(int i=0; i\n"); + appendObject(args[i], content); + content.append(" \n"); } + content.append(" \n"); content.append(" "); + return content.toString(); + } - // Header - ps.print("POST " + filename + " HTTP/1.0\r\n"); - ps.print("Host: " + host + "\r\n"); - ps.print("User-Agent: XWT (http://www.xwt.org/)\r\n"); - ps.print("Content-Type: text/xml\r\n"); - ps.print("Content-length: " + (content.length() + 1) + "\r\n"); - ps.print("\r\n"); - ps.print(content); - ps.print("\n"); - ps.flush(); - - // throw away HTTP reply headers - while(!br.readLine().equals("")) { } - + protected Object recieve(BufferedReader br) throws JavaScriptException, IOException { // parse XML reply try { parse(br); - } catch (XML.SAXException e) { + } catch (XML.XMLException e) { if (Log.on) Log.log(this, "reply from server was not well-formed XML: " + e); throw new JavaScriptException("reply from server was not well-formed XML: " + e); } if (fault) throw new JavaScriptException(objects.elementAt(0)); - if (objects.size() == 0) return null; return objects.elementAt(0); - } public final Object call(Context cx, Scriptable scope, Scriptable thisObj, java.lang.Object[] args) throws JavaScriptException { - if (tracker == null) tracker = new Hash(); - else tracker.clear(); - - if (objects == null) objects = new Vec(); - else objects.setSize(0); - - // put ourselves in the background - Thread thread = Thread.currentThread(); - if (!(thread instanceof ThreadMessage)) { - if (Log.on) Log.log(this, "RPC calls may only be made from background threads"); - return null; - } - ThreadMessage mythread = (ThreadMessage)thread; - mythread.setPriority(Thread.MIN_PRIORITY); - mythread.done.release(); + if (!ThreadMessage.suspendThread()) return null; try { - return connect(args); - + return call(args); } catch (IOException se) { if (Log.on) Log.log(this, se); if (Log.on) Log.log(this, " at " + cx.interpreterSourceFile + ":" + cx.interpreterLine); @@ -388,40 +373,30 @@ class XMLRPC extends XML implements Function { if (Log.on) Log.log(this, " at " + cx.interpreterSourceFile + ":" + cx.interpreterLine); } throw jse; - } finally { - // okay, let ourselves be brought to the foreground - MessageQueue.add(mythread); - mythread.setPriority(Thread.NORM_PRIORITY); - mythread.go.block(); + ThreadMessage.resumeThread(); } } /** When you get a property from an XMLRPC, it just returns another XMLRPC with the property name tacked onto methodname. */ public Object get(String name, Scriptable start) { - return new XMLRPC(url.toString(), (methodname.equals("") ? "" : methodname + ".") + name, ssl); + return new XMLRPC(url, (methodname.equals("") ? "" : methodname + ".") + name, http); } - public XMLRPC(String urlstr, String methodname) { this(urlstr, methodname, false); } - public XMLRPC(String urlstr, String methodname, boolean ssl) { - this.ssl = ssl; - try { - if (urlstr.startsWith("https:")) { - urlstr = "http" + urlstr.substring(5); - this.ssl = true; - } - URL url = new URL(urlstr); - if (methodname == null) methodname = ""; - this.methodname = methodname; - this.url = url; + public XMLRPC(String url, String methodname) { + this(url, methodname, new HTTP(url)); + } - } catch (MalformedURLException e) { - if (Log.on) Log.log(this, e); + public XMLRPC(String url, String methodname, HTTP http) { + super(BUFFER_SIZE); - } + this.http = http; + this.url = url; + this.methodname = methodname; } + // Helper Classes /////////////////////////////////////////////////////////////////////////////////// /** CharArrayWriter that lets us touch its buffer */ @@ -435,21 +410,22 @@ class XMLRPC extends XML implements Function { public Filter(InputStream is) { super(is); } public int read() throws IOException { Thread.yield(); - while(MessageQueue.working) try { Thread.sleep(100); } catch (Exception e) { }; + while(MessageQueue.nonThreadEventsInQueue > 0) try { Thread.sleep(100); } catch (Exception e) { }; return super.read(); } public int read(byte[] b) throws IOException { Thread.yield(); - while(MessageQueue.working) try { Thread.sleep(100); } catch (Exception e) { }; + while(MessageQueue.nonThreadEventsInQueue > 0) try { Thread.sleep(100); } catch (Exception e) { }; return super.read(b); } public int read(byte[] b, int i, int j) throws IOException { Thread.yield(); - while(MessageQueue.working) try { Thread.sleep(100); } catch (Exception e) { }; + while(MessageQueue.nonThreadEventsInQueue > 0) try { Thread.sleep(100); } catch (Exception e) { }; return super.read(b, i, j); } } + // Methods Required by Rhino //////////////////////////////////////////////////////// public String getClassName() { return "XMLRPC"; }