mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Better access

Browse Source
This commit is contained in:
Anuken 2019-11-30 17:45:02 -05:00
parent 57f9aeee86
commit 3abcdf2063
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/scripts/base.js Executable file
View File

@ -0,0 +1 @@
const extend = Java.extend

3
core/assets/scripts/global.js
View File

@ -358,3 +358,6 @@ const LiquidModule = Java.type('io.anuke.mindustry.world.modules.LiquidModule')
const PowerModule = Java.type('io.anuke.mindustry.world.modules.PowerModule') const PowerModule = Java.type('io.anuke.mindustry.world.modules.PowerModule')
const Produce = Java.type('io.anuke.mindustry.world.producers.Produce') const Produce = Java.type('io.anuke.mindustry.world.producers.Produce')
const ProduceItem = Java.type('io.anuke.mindustry.world.producers.ProduceItem') const ProduceItem = Java.type('io.anuke.mindustry.world.producers.ProduceItem')
const extend = Java.extend

1
core/src/io/anuke/mindustry/mod/ClassAccess.java
View File

File diff suppressed because one or more lines are too long

11
core/src/io/anuke/mindustry/mod/Scripts.java
View File

@ -6,7 +6,10 @@ import io.anuke.arc.util.*;
import io.anuke.mindustry.mod.Mods.*; import io.anuke.mindustry.mod.Mods.*;
import org.graalvm.polyglot.*; import org.graalvm.polyglot.*;
import java.io.*;
public class Scripts{ public class Scripts{
private static final Class[] denied = {FileHandle.class, InputStream.class, File.class, Scripts.class, Files.class};
private final Context context; private final Context context;
private final String wrapper; private final String wrapper;
@ -15,11 +18,9 @@ public class Scripts{
Context.Builder builder = Context.newBuilder("js").allowHostClassLookup(ClassAccess.allowedClassNames::contains); Context.Builder builder = Context.newBuilder("js").allowHostClassLookup(ClassAccess.allowedClassNames::contains);
HostAccess.Builder hb = HostAccess.newBuilder(); HostAccess.Builder hb = HostAccess.newBuilder();
for(Class c : ClassAccess.allowedClasses){ hb.allowPublicAccess(true);
hb.allowImplementations(c); for(Class c : denied){
Structs.each(hb::allowAccess, c.getConstructors()); hb.denyAccess(c);
Structs.each(hb::allowAccess, c.getFields());
Structs.each(hb::allowAccess, c.getMethods());
} }
builder.allowHostAccess(hb.build()); builder.allowHostAccess(hb.build());

4
tools/src/io/anuke/mindustry/tools/ScriptStubGenerator.java
View File

@ -24,7 +24,7 @@ public class ScriptStubGenerator{
"import io.anuke.arc.collection.*;\n" + "import io.anuke.arc.collection.*;\n" +
"//obviously autogenerated, do not touch\n" + "//obviously autogenerated, do not touch\n" +
"class ClassAccess{\n" + "class ClassAccess{\n" +
"\tstatic final Array<Class<?>> allowedClasses = Array.with($ALLOWED_CLASSES$);\n" + //"\tstatic final Array<Class<?>> allowedClasses = Array.with($ALLOWED_CLASSES$);\n" +
"\tstatic final ObjectSet<String> allowedClassNames = ObjectSet.with($ALLOWED_CLASS_NAMES$);\n" + "\tstatic final ObjectSet<String> allowedClassNames = ObjectSet.with($ALLOWED_CLASS_NAMES$);\n" +
"}"; "}";
@ -50,6 +50,8 @@ public class ScriptStubGenerator{
result.append("const ").append(type.getSimpleName()).append(" = ").append("Java.type('").append(type.getCanonicalName()).append("')\n"); result.append("const ").append(type.getSimpleName()).append(" = ").append("Java.type('").append(type.getCanonicalName()).append("')\n");
} }
result.append("\n").append(new FileHandle("core/assets/scripts/base.js").readString()).append("\n");
//Log.info(result); //Log.info(result);
new FileHandle("core/assets/scripts/global.js").writeString(result.toString()); new FileHandle("core/assets/scripts/global.js").writeString(result.toString());