From 1d8fab5dd3d4a791c54e79825074e1da7f1bbe93 Mon Sep 17 00:00:00 2001
From: Andy Nguyen <theofficialflow1996@gmail.com>
Date: Thu, 4 Nov 2021 18:04:31 +0100
Subject: [PATCH] Move security manager checks.

---
 src/com/bdjb/Exploit.java                                 | 3 +--
 src/com/bdjb/exploit/sandbox/ExploitServiceProxyImpl.java | 2 +-
 src/com/bdjb/exploit/sandbox/ExploitUserPrefsImpl.java    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/com/bdjb/Exploit.java b/src/com/bdjb/Exploit.java
index d075d22..07fefe2 100644
--- a/src/com/bdjb/Exploit.java
+++ b/src/com/bdjb/Exploit.java
@@ -29,8 +29,7 @@ class Exploit implements Runnable {
 
     for (int i = 0; i < exploits.length; i++) {
       try {
-        exploits[i].trigger();
-        if (System.getSecurityManager() == null) {
+        if (exploits[i].trigger()) {
           break;
         }
       } catch (Exception e) {
diff --git a/src/com/bdjb/exploit/sandbox/ExploitServiceProxyImpl.java b/src/com/bdjb/exploit/sandbox/ExploitServiceProxyImpl.java
index e1251d8..87cc66d 100644
--- a/src/com/bdjb/exploit/sandbox/ExploitServiceProxyImpl.java
+++ b/src/com/bdjb/exploit/sandbox/ExploitServiceProxyImpl.java
@@ -57,6 +57,6 @@ public class ExploitServiceProxyImpl implements ExploitSandboxInterface {
     Class payloadClass = urlClassLoader.loadClass(PAYLOAD_CLASS_NAME);
     payloadClass.newInstance();
 
-    return true;
+    return System.getSecurityManager() == null;
   }
 }
diff --git a/src/com/bdjb/exploit/sandbox/ExploitUserPrefsImpl.java b/src/com/bdjb/exploit/sandbox/ExploitUserPrefsImpl.java
index 9b9edec..3d1979e 100644
--- a/src/com/bdjb/exploit/sandbox/ExploitUserPrefsImpl.java
+++ b/src/com/bdjb/exploit/sandbox/ExploitUserPrefsImpl.java
@@ -44,7 +44,7 @@ public class ExploitUserPrefsImpl implements ExploitSandboxInterface {
         // Instantiate the payload class.
         PayloadClassLoader.getInstance().newPayload();
 
-        return true;
+        return System.getSecurityManager() == null;
       }
     } finally {
       // Restore userprefs file.