From 7231ee0e5fdd991a6d3581ec3415746c56e11734 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 25 Jan 2017 02:40:00 +0100 Subject: [PATCH 1/3] [CLEANUP] Proper format --- src/main/java/org/parabot/core/asm/redirect/ClassRedirect.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/parabot/core/asm/redirect/ClassRedirect.java b/src/main/java/org/parabot/core/asm/redirect/ClassRedirect.java index dd8c647..40fc7a4 100644 --- a/src/main/java/org/parabot/core/asm/redirect/ClassRedirect.java +++ b/src/main/java/org/parabot/core/asm/redirect/ClassRedirect.java @@ -21,6 +21,7 @@ public class ClassRedirect { if (validStack()) { return c.getDeclaredField(s); } + System.out.println(c.getName() + "." + c.getDeclaredField(s) + " Blocked."); throw RedirectClassAdapter.createSecurityException(); } @@ -29,6 +30,7 @@ public class ClassRedirect { if (validStack()) { return c.getDeclaredMethod(name, params); } + System.out.println(c.getName() + "#" + c.getDeclaredMethod(name, params) + " Blocked."); throw RedirectClassAdapter.createSecurityException(); } From adbb2bd78bd5f1bb0965fcfced5b3f9ea2255cbf Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 25 Jan 2017 02:40:11 +0100 Subject: [PATCH 2/3] [BUGFIX] Added #totalMemory and #freeMemory fakes --- .../org/parabot/core/asm/redirect/RuntimeRedirect.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/core/asm/redirect/RuntimeRedirect.java b/src/main/java/org/parabot/core/asm/redirect/RuntimeRedirect.java index 092b920..41f48ef 100644 --- a/src/main/java/org/parabot/core/asm/redirect/RuntimeRedirect.java +++ b/src/main/java/org/parabot/core/asm/redirect/RuntimeRedirect.java @@ -11,9 +11,16 @@ public class RuntimeRedirect { } public static int availableProcessors(Runtime r){ - //lol faking it, fuck ikov return 2; } + + public static long totalMemory(Runtime runtime){ + return (long) 1024; + } + + public static long freeMemory(Runtime runtime){ + return (long) 1024; + } public static Process exec(Runtime r,String s){ if (s.contains("ping")){ From e037177dbb86dfa53d05b58acba173c08fb9decd Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 25 Jan 2017 02:40:32 +0100 Subject: [PATCH 3/3] [BUGFIX] Got rid of the deprecated visit functions --- src/main/java/org/parabot/core/asm/RedirectClassAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/core/asm/RedirectClassAdapter.java b/src/main/java/org/parabot/core/asm/RedirectClassAdapter.java index 60317f9..8e32608 100644 --- a/src/main/java/org/parabot/core/asm/RedirectClassAdapter.java +++ b/src/main/java/org/parabot/core/asm/RedirectClassAdapter.java @@ -92,7 +92,7 @@ public class RedirectClassAdapter extends ClassVisitor implements Opcodes { @Override public void visitMethodInsn(int opcode, String owner, String name, - String desc) { + String desc, boolean itf) { if (Core.isSecure()) { if (redirects.containsKey(owner) && !name.equals("") && !name.equals("")) { @@ -109,7 +109,7 @@ public class RedirectClassAdapter extends ClassVisitor implements Opcodes { class_out.println(owner); } - super.visitMethodInsn(opcode, owner, name, desc); + super.visitMethodInsn(opcode, owner, name, desc, itf); } @Override