Modding Integration + Codebase Update

Author: BC100Dev

AppSettings.cfg

@@ -23,6 +23,15 @@ ModdingEnabled = false
 # It is recommended to let this enabled, unless you know EXACTLY, what you are doing.
 DisableModsOnAdministration = true
 
+# Disables the external mod JAR files, when the Application was built, or its binaries changed
+# permission levels from regular to SetUID/SetGID permissions. These permissions have security
+# implications, and external mod JAR files can initiate a SetUID/SetGID change, allowing Root
+# execution. Recommended to let it stay enabled (true).
+# !! WARNING !!
+# If someone tells you to disable it, it is very likely a SCAM or MALWARE being delivered.
+# It is recommended to let this enabled, unless you know EXACTLY, what you are doing.
+DisableModsOnUidChange = true
+
 # Allows the execution of this software, even with tampered core application files.
 # Not recommended, when you did not allow the core application to be modified.
 # Use at your own risk.

build.sh

@@ -170,7 +170,7 @@ if [[ "$INSTALL_CHOICE" =~ ^[Yy]$ ]]; then
         fi
     fi
 
-    echo "> Copying built files"
+    echo "// Copying built files"
     "$PREFIX" mkdir -p /usr/share/bc100dev/osintgram4j/
     "$PREFIX" cp -r out/pkg/osintgram4j/* /usr/share/bc100dev/osintgram4j
     "$PREFIX" ln -s /usr/share/bc100dev/osintgram4j/bin/osintgram4j /usr/bin/osintgram4j

commons/src/net/bc100dev/commons/utils/Utility.java

@@ -183,17 +183,11 @@ public static File getBinaryPath(String name) throws IOException {
                 File bin = new File(pathContent);
                 if ((bin.exists() && bin.canExecute()) && (getOperatingSystem() == OperatingSystem.WINDOWS ?
                         bin.getName().equalsIgnoreCase(name) : bin.getName().equals(name))) {
-                    passedPathContents.clear();
-                    passedPathEntries.clear();
-
                     return bin;
                 }
             }
         }
 
-        passedPathContents.clear();
-        passedPathEntries.clear();
-
         return null;
     }
 

commons/src/osintgram4j/commons/AppConstants.java

@@ -4,6 +4,7 @@
 
 public class AppConstants {
 
-    public static final Logger log = Logger.getLogger("osintgram4j");
+    public static final Logger log_og4j = Logger.getLogger("osintgram4j");
+    public static final Logger log_net = Logger.getLogger("og4j-network");
 
 }

commons/src/osintgram4j/commons/PackagedApplication.java

@@ -1,5 +1,7 @@
 package osintgram4j.commons;
 
+import net.bc100dev.commons.ApplicationException;
+
 import java.io.File;
 
 /**
@@ -16,37 +18,49 @@ private static String withValue(String key) {
     private static final String oldPrefix = ".app.locations";
     private static final String newPrefix = "og4j.location";
 
-    public static File getApplicationDirectory() {
+    public static File getApplicationDirectory() throws ApplicationException {
         String k = oldPrefix + ".app_dir";
         String v = withValue(k);
         if (v != null)
             return new File(v);
 
         k = newPrefix + ".app_dir";
         v = withValue(k);
-        return v != null ? new File(v) : null;
+
+        if (v == null)
+            throw new ApplicationException("Application directory was not initialized");
+
+        return new File(v);
     }
 
-    public static File getRootDirectory() {
+    public static File getRootDirectory() throws ApplicationException {
         String k = oldPrefix + ".root_dir";
         String v = withValue(k);
         if (v != null)
             return new File(v);
 
         k = newPrefix + ".root_dir";
         v = withValue(k);
-        return v != null ? new File(v) : null;
+
+        if (v == null)
+            throw new ApplicationException("Application directory was not initialized");
+
+        return new File(v);
     }
 
-    public static File getBinaryDirectory() {
+    public static File getBinaryDirectory() throws ApplicationException {
         String k = oldPrefix + ".bin_dir";
         String v = withValue(k);
         if (v != null)
             return new File(v);
 
         k = newPrefix + ".bin_dir";
         v = withValue(k);
-        return v != null ? new File(v) : null;
+
+        if (v == null)
+            throw new ApplicationException("Application directory was not initialized");
+
+        return new File(v);
     }
 
 }

…src/osintgram4j/commons/ShellConfig.java …sintgram4j/commons/ShellEnvironment.javacommons/src/osintgram4j/commons/ShellConfig.java renamed to commons/src/osintgram4j/commons/ShellEnvironment.java commons/src/osintgram4j/commons/ShellConfig.java renamed to commons/src/osintgram4j/commons/ShellEnvironment.java

@@ -1,11 +1,11 @@
 package osintgram4j.commons;
 
-public class ShellConfig {
+public class ShellEnvironment {
 
     private final String name;
     private String value;
 
-    public ShellConfig(String name, String value) {
+    public ShellEnvironment(String name, String value) {
         this.name = name;
         this.value = value;
     }

extres/usermod-example.json

@@ -2,13 +2,10 @@
     "ModInfo": {
         "Author": "ExampleUser",
         "Name": "ModName",
-        "Version": "1.00",
-        "PackageName": "com.example"
+        "Version": "1.00"
     },
-    "Actions": {
-        "OnStart": {
-            "LaunchClass": ".ModMain",
-            "InitiateCommands": "{pkg}/resources/commands.json"
-        }
-    }
+    "JsonCommandFiles": [
+        "com/app_package/example/commands.json"
+    ],
+    "StartClass": "com.app_package.example.StartClass"
 }

modapi/src/osintgram4j/api/Launcher.java

@@ -4,4 +4,6 @@ public abstract class Launcher {
 
     public abstract void onLaunch(String[] cliArgs);
 
+    public abstract void onExit(String reason);
+
 }

modapi/src/osintgram4j/api/sh/Command.java

@@ -1,14 +1,14 @@
 package osintgram4j.api.sh;
 
-import osintgram4j.commons.ShellConfig;
+import osintgram4j.commons.ShellEnvironment;
 
 import java.util.List;
 
 public abstract class Command {
 
     private boolean asAlias = false;
 
-    public abstract int launchCmd(String[] args, List<ShellConfig> env);
+    public abstract int launchCmd(String[] args, List<ShellEnvironment> env);
 
     public abstract String helpCmd(String[] args);