X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=7d73e9c78d859638d5d7ba259eeb394de941184f;hb=86320c355844775b0a5aa6a92258c46ccbd85d90;hp=2eeaadf3740559358b1709098804d1491c696889;hpb=3a003a2e72e4762366a00aeb8ffbd9c6fb4b11f5;p=org.ibex.core.git diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java index 2eeaadf..7d73e9c 100644 --- a/src/org/xwt/XWT.java +++ b/src/org/xwt/XWT.java @@ -7,6 +7,7 @@ import java.text.*; import java.util.*; import org.xwt.util.*; import org.mozilla.javascript.*; +import org.bouncycastle.util.encoders.Base64; /** Singleton class that provides all functionality in the xwt.* namespace */ public final class XWT extends JSObject { @@ -53,6 +54,7 @@ public final class XWT extends JSObject { else if (name.equals("homeDir")) return System.getProperty("user.home"); else if (name.equals("tempDir")) return System.getProperty("java.io.tempdir"); else if (name.equals("recursivePrintObject")) return recursivePrintObject; + else if (name.equals("parseHTML")) return parseHTML; else if (name.equals("button")) { if (Surface.button1 && !Surface.button2 && !Surface.button3) return new Integer(1); else if (!Surface.button1 && Surface.button2 && !Surface.button3) return new Integer(1); @@ -61,6 +63,13 @@ public final class XWT extends JSObject { } else if (name.equals("println")) return println; else if (name.equals("math")) return org.xwt.util.JSObject.defaultObjects.get("Math", null); + else if (name.equals("loadArchive")) return loadArchive; + else if (name.equals("prefetchImage")) return prefetchImage; + else if (name.equals("prefs")) return prefs; + else if (name.equals("encodeURI")) return JSObject.defaultObjects.get("encodeURI", null); + else if (name.equals("encodeURIComponent")) return JSObject.defaultObjects.get("encodeURIComponent", null); + else if (name.equals("decodeURI")) return JSObject.defaultObjects.get("decodeURI", null); + else if (name.equals("decodeURIComponent")) return JSObject.defaultObjects.get("decodeURIComponent", null); else return super.get(name, start); } @@ -68,19 +77,103 @@ public final class XWT extends JSObject { if (name == null) return; else if (name.equals("thread") && value != null && value instanceof Function) ThreadMessage.newthread((Function)value); else if (name.equals("clipboard")) Platform.setClipBoard(value.toString()); + + // FIXME: undocumented, possibly insecure + else if (name.equals("proxyAuthorization")) { + Proxy.Authorization.authorization = value.toString(); + Proxy.Authorization.waitingForUser.release(); + } + else super.put(name, start, value); } - // JSFunction Instances /////////////////////////////////////////////////////////////////// + // Prefs Object ////////////////////////////////////////////////////////////////////////// - /** Helper class for defining functions. */ - private static abstract class JSFunction extends JSObject implements Function { - JSFunction() { setSeal(true); } - public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; } - } + static Scriptable prefsRPC = new XMLRPC("http://megacz:mypassword@localhost/RPC2", "prefs"); - private static final JSFunction newBrowserWindow = new JSFunction() { + private static final JSObject prefs = new JSObject(false, true) { + public Object get(String name, Scriptable start) { + if (name.equals("get")) return prefsGet; + else if (name.equals("list")) return prefsList; + else if (name.equals("put")) return prefsPut; + else return null; + } + }; + + private static final JSObject.JSFunction prefsGet = new JSObject.JSFunction() { + public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { + if (args.length != 1 || args[0] == null) return null; + try { + return ((Function)prefsRPC.get("get", null)).call(cx, null, null, new Object[] { args[0] }); + } catch (JavaScriptException jse) { + Object val = jse.getValue(); + if (val instanceof JSObject && new Integer(1).equals(((JSObject)val).get("faultCode"))) + return null; + throw jse; + } catch (Exception e) { + // FIXME + throw new JavaScriptException(e.toString()); + } + } + }; + + private static final JSObject.JSFunction prefsPut = new JSObject.JSFunction() { + public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { + if (args.length < 2 || args[0] == null) return null; + try { + return ((Function)prefsRPC.get("put", null)).call(cx, null, null, new Object[] { args[0].toString(), args[1] }); + } catch (JavaScriptException jse) { + Object val = jse.getValue(); + if (val instanceof JSObject && new Integer(1).equals(((JSObject)val).get("faultCode"))) + return null; + throw jse; + } catch (Exception e) { + // FIXME + throw new JavaScriptException(e.toString()); + } + } + }; + + private static final JSObject.JSFunction prefsList = new JSObject.JSFunction() { + public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { + if (args.length < 2 || args[0] == null) return null; + try { + return ((Function)prefsRPC.get("list", null)).call(cx, null, null, new Object[] { args[0].toString(), args[1] }); + } catch (JavaScriptException jse) { + Object val = jse.getValue(); + if (val instanceof JSObject && new Integer(1).equals(((JSObject)val).get("faultCode"))) + return null; + throw jse; + } catch (Exception e) { + // FIXME + throw new JavaScriptException(e.toString()); + } + } + }; + + private static final JSObject.JSFunction prefsInvoke = new JSObject.JSFunction() { + public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { + if (args.length < 2 || args[0] == null) return null; + try { + return ((Function)prefs.get("invoke")).call(cx, null, null, new Object[] { args[0].toString(), args[1], "megacz", "mypassword" }); + } catch (JavaScriptException jse) { + Object val = jse.getValue(); + if (val instanceof JSObject && new Integer(1).equals(((JSObject)val).get("faultCode"))) + return null; + throw jse; + } catch (Exception e) { + // FIXME + throw new JavaScriptException(e.toString()); + } + } + }; + + + + // JSFunction Instances /////////////////////////////////////////////////////////////////// + + private static final JSObject.JSFunction newBrowserWindow = new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { if (args.length != 1 || args[0] == null) return null; Platform.newBrowserWindow(args[0].toString()); @@ -88,23 +181,26 @@ public final class XWT extends JSObject { } }; - private static final JSFunction yield = new JSFunction() { + public static final JSObject.JSFunction yield = new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { sleep.call(cx, null, null, null); return null; } }; - private static final JSFunction println = new JSFunction() { + private static final JSObject.JSFunction println = new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { if (args.length == 1) - if (Log.on) - Log.log(cx.interpreterSourceFile, args[0] == null ? "null" : args[0].toString()); + if (Log.on) { + String source = cx.interpreterSourceFile; + if (source.endsWith("._")) source = source.substring(0, source.length() - 2); + Log.log(source, args[0] == null ? "null" : args[0].toString()); + } return null; } }; - private static final JSFunction date = new JSFunction() { + private static final JSObject.JSFunction date = new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { try { return Context.enter().newObject(org.xwt.util.JSObject.defaultObjects, "Date", args); } catch (Exception e) { @@ -115,7 +211,7 @@ public final class XWT extends JSObject { } }; - private static final JSFunction regexp = new JSFunction() { + private static final JSObject.JSFunction regexp = new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { try { return Context.enter().newObject(org.xwt.util.JSObject.defaultObjects, "RegExp", args); } catch (Exception e) { @@ -126,29 +222,41 @@ public final class XWT extends JSObject { } }; - private static final JSFunction listfonts = new JSFunction() { + private static final JSObject.JSFunction listfonts = new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { return Context.enter().newArray(org.xwt.util.JSObject.defaultObjects, Platform.listFonts()); } }; - private static final JSFunction theme = new JSFunction() { + private static final JSObject.JSFunction theme = new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { if (args.length != 2) return null; if (args[0] == null || args[1] == null) return null; - Template.retheme(args[0].toString(), args[1].toString()); + + for(int i=1; i 2) return null; if (args[0] == null || (args.length == 2 && args[1] == null)) return null; @@ -172,7 +280,7 @@ public final class XWT extends JSObject { }; - private static final JSFunction textheight = new JSFunction() { + private static final JSObject.JSFunction textheight = new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { if (args.length > 1) return null; if (args.length == 1 && args[0] == null) return null; @@ -183,14 +291,25 @@ public final class XWT extends JSObject { } }; - private static final JSFunction newBox = new JSFunction() { + private static final JSObject.JSFunction newBox = new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { - Box ret = new Box(args.length == 0 || args[0] == null ? "box" : args[0].toString(), Template.defaultImportList); + + if (args.length > 0) + if (Log.on) Log.log(XWT.class, "DEPRECATED: xwt.newBox() with multiple arguments is deprecated; use xwt.newBox().apply() " + + Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + + Function callback = null; + for(int i=1; i"); Scriptable s = (Scriptable)o; Object[] keys = s.getIds(); @@ -304,14 +440,83 @@ public final class XWT extends JSObject { } } - private static final JSFunction recursivePrintObject = new JSFunction() { - public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { + static final JSObject.JSFunction recursivePrintObject = new JSObject.JSFunction() { + public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) { if (args == null || args.length != 1) return null; recurse("", "", args[0], cx); return null; } }; + private static final JSObject.JSFunction loadArchive = new JSObject.JSFunction() { + public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { + if (!ThreadMessage.suspendThread()) return null; + + try { + if (args == null || args.length < 1 || args[0] == null) return null; + URL u = new URL(args[0].toString()); + + Function callback = null; + if (args.length == 2 && args[1] != null && args[1] instanceof Function) callback = (Function)args[1]; + + if (!u.getFile().endsWith(".xwar")) { + if (Log.on) Log.log(this, "Error: archive names must end with .xwar: " + u.getFile()); + throw new JavaScriptException("Error: archive names must end with .xwar: " + u.getFile()); + } + + if (u.getProtocol().equals("http")) { + HTTP http = new HTTP(u.toString()); + if (Main.originAddr == null) { + try { + Main.originAddr = InetAddress.getByName(u.getHost()); + } catch (UnknownHostException e) { + if (Log.on) Log.log(this, "couldn't resolve " + u.getHost() + "; proceeding without permissions"); + Main.originAddr = InetAddress.getByName("0.0.0.0"); + } + } else { + Main.originAddr = InetAddress.getByName("0.0.0.0"); + } + HTTP.HTTPInputStream in = http.GET(); + Resources.loadArchive(in, in.getContentLength(), callback); + + } else if (u.getProtocol().equals("file")) { + if (Main.originAddr != null) { + if (Log.on) Log.log(this, "scripts downloaded from the network may not load xwars from the local filesystem"); + throw new JavaScriptException("scripts downloaded from the network may not load xwars from the local filesystem"); + } + Resources.loadArchive(new FileInputStream(u.getFile()), (int)new File(u.getFile()).length(), callback); + + } else { + if (Log.on) Log.log(this, "unknown protocol \"" + u.getProtocol() + "\""); + throw new JavaScriptException("unknown protocol \"" + u.getProtocol() + "\""); + } + + } catch (MalformedURLException me) { + if (Log.on) Log.log(this, "Malformed URL: " + args[0]); + if (Log.on) Log.log(this, me); + throw new JavaScriptException(me.toString()); + + } catch (IOException ioe) { + if (Log.on) Log.log(this, "IOException while loading archive:"); + if (Log.on) Log.log(this, ioe); + throw new JavaScriptException(ioe.toString()); + + } finally { + ThreadMessage.resumeThread(); + + } + return null; + } + }; + + private static final JSObject.JSFunction prefetchImage = new JSObject.JSFunction() { + public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { + if (args == null || args.length < 1 || args[0] == null) return null; + Box.getImage(args[0].toString(), args.length > 1 && args[1] instanceof Function ? (Function)args[1] : null); + return null; + } + }; + }