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

Merge remote-tracking branch 'origin' into 021214renderer 

Conflicts:
	src/net/mosstest/scripting/MossScriptEnv.java
master
Aaron Chan 2014-04-13 19:19:16 -04:00
parent a26ce109e4 dfe3a21850
commit fc95712e17
55 changed files with 4906 additions and 4911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/net/mosstest/scripting/MossScriptEnv.java
View File

@ -4,6 +4,7 @@ import net.mosstest.scripting.events.IMossEvent;
import net.mosstest.scripting.handlers.MossEventHandler;
import net.mosstest.scripting.handlers.MossNodeChangeHandler;
import net.mosstest.servercore.*;
import org.mozilla.javascript.NativeJavaPackage;
import java.util.ArrayList;
import java.util.HashMap;

3
src/net/mosstest/servercore/LocalFileManager.java
View File

@ -104,8 +104,7 @@ public class LocalFileManager implements IFileManager {
while ((bytesRead != -1) && (bytesRead != 0)) {
bbf.flip();
byte[] bytes = new byte[bytesRead];
bbf.get(bytes);
md.update(bbf);

17
src/net/mosstest/servercore/ScriptEnv.java
View File

@ -10,7 +10,7 @@ import java.io.IOException;
// TODO: Auto-generated Javadoc
/**
* Static environment for executing scripts. Call {@link ScriptEnv.runScript()}
* Static environment for executing scripts. Call {@link ScriptEnv#runScript()}
* to call a script.
*
* @author rarkenin
@ -19,7 +19,7 @@ public class ScriptEnv {
static Logger logger = Logger.getLogger(MossDebugUtils.class);
ScriptableObject globalScope;
ImporterTopLevel globalScope;
/**
@ -52,14 +52,9 @@ public class ScriptEnv {
/**
* Executes a script with default permissions. This will allow sandboxed
* access to the database, and gameplay data, without access to
* authentication data. These scripts have access to
* <code>Hashmap&lt;String, Object&gt;</code>-style maps used for extended
* custom attributes, and may access various API classes via
* {@link net.mosstest.scripting.JavaApi JavaApi}(which internally uses
* reflection to obtain classes). Via an ACL, certain classes may be blocked
* authentication data. Via an ACL, certain classes may be blocked
* or replaced with limited versions thereof. At the time of writing, this
* feature is incomplete and will not allow any access to the Java(tm) SE
* API.
* feature uses a security manager to disallow anything that tries to access risky data or sockets.
*
* @param script A string representing the script to run
* @return A {@link ScriptEnv.ScriptResult} constant representing the
@ -101,9 +96,9 @@ public class ScriptEnv {
* @param ev the ev
*/
public ScriptEnv(MossScriptEnv ev) {
this.cx = ContextFactory.getGlobal().enterContext();
this.globalScope = this.cx.initStandardObjects();
this.globalScope = new ImporterTopLevel();
this.globalScope.initStandardObjects(cx, false);
cx.setOptimizationLevel(9);
this.globalScope.put("moss", this.globalScope, ev); //$NON-NLS-1$