mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* refactoring

This commit is contained in:
Reinhard Pointner 2009-06-29 17:56:41 +00:00
parent 5f073f9124
commit 6a750cb95d
3 changed files with 67 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/net/sourceforge/filebot/format/AssociativeScriptObject.java
View File

@ -156,16 +156,13 @@ public class AssociativeScriptObject implements Scriptable {
* Map allowing look-up of values by a fault-tolerant key as specified by the defining key.
*
*/
protected class LenientLookup extends AbstractMap<String, Object> {
private class LenientLookup extends AbstractMap<String, Object> {
private final Map<String, Entry<String, Object>> source;
private final Map<String, Entry<String, Object>> source = new HashMap<String, Entry<String, Object>>();
public LenientLookup(Map<String, Object> source) {
// initialize source map
this.source = new HashMap<String, Entry<String, Object>>(source.size());
// populate source map
// populate entry map
for (Entry<String, Object> entry : source.entrySet()) {
this.source.put(definingKey(entry.getKey()), entry);
}

58
source/net/sourceforge/filebot/format/ExpressionFormat.java
View File

@ -4,10 +4,6 @@ package net.sourceforge.filebot.format;
import java.io.FilePermission;
import java.io.InputStreamReader;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.security.AccessControlContext;
import java.security.AccessControlException;
import java.security.AccessController;
@ -114,10 +110,12 @@ public class ExpressionFormat extends Format {
public StringBuffer format(Bindings bindings, StringBuffer sb) {
ScriptContext context = new SimpleScriptContext();
// use privileged bindings so we are not restricted by the script sandbox
context.setBindings(PrivilegedBindings.newProxy(bindings, AccessController.getContext()), ScriptContext.GLOBAL_SCOPE);
Bindings priviledgedBindings = PrivilegedInvocation.newProxy(Bindings.class, bindings, AccessController.getContext());
// initialize script context with the privileged bindings
ScriptContext context = new SimpleScriptContext();
context.setBindings(priviledgedBindings, ScriptContext.GLOBAL_SCOPE);
for (Object snipped : compilation) {
if (snipped instanceof CompiledScript) {
@ -181,52 +179,6 @@ public class ExpressionFormat extends Format {
}
private static class PrivilegedBindings implements InvocationHandler {
private final Bindings bindings;
private final AccessControlContext context;
private PrivilegedBindings(Bindings bindings, AccessControlContext context) {
this.bindings = bindings;
this.context = context;
}
@Override
public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
try {
return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
@Override
public Object run() throws Exception {
return method.invoke(bindings, args);
}
}, context);
} catch (PrivilegedActionException e) {
Throwable cause = e.getException();
// the underlying method may have throw an exception
if (cause instanceof InvocationTargetException) {
// get actual cause
cause = cause.getCause();
}
// forward cause
throw cause;
}
}
public static Bindings newProxy(Bindings bindings, AccessControlContext context) {
InvocationHandler invocationHandler = new PrivilegedBindings(bindings, context);
// create dynamic invocation proxy
return (Bindings) Proxy.newProxyInstance(PrivilegedBindings.class.getClassLoader(), new Class[] { Bindings.class }, invocationHandler);
}
}
private static class SecureCompiledScript extends CompiledScript {
private final CompiledScript compiledScript;

59
source/net/sourceforge/filebot/format/PrivilegedInvocation.java Normal file
View File

@ -0,0 +1,59 @@
package net.sourceforge.filebot.format;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
public class PrivilegedInvocation implements InvocationHandler {
private final Object object;
private final AccessControlContext context;
private PrivilegedInvocation(Object object, AccessControlContext context) {
this.object = object;
this.context = context;
}
@Override
public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
try {
return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
@Override
public Object run() throws Exception {
return method.invoke(object, args);
}
}, context);
} catch (PrivilegedActionException e) {
Throwable cause = e.getException();
// the underlying method may have throw an exception
if (cause instanceof InvocationTargetException) {
// get actual cause
cause = cause.getCause();
}
// forward cause
throw cause;
}
}
public static <I> I newProxy(Class<I> type, I object, AccessControlContext context) {
InvocationHandler invocationHandler = new PrivilegedInvocation(object, context);
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
// create dynamic invocation proxy
return type.cast(Proxy.newProxyInstance(classLoader, new Class[] { type }, invocationHandler));
}
}