@appthreat/atom 0.7.2 → 0.7.3

package/index.js

@@ -1 +1,73 @@
-console.log("atom plugins check");
+#!/usr/bin/env node
+
+const os = require("os");
+const fs = require("fs");
+const path = require("path");
+const { spawnSync } = require("child_process");
+const isWin = require("os").platform() === "win32";
+const LOG4J_CONFIG = path.join(__dirname, "plugins", "log4j2.xml");
+const ATOM_HOME = path.join(__dirname, "plugins", "atom-1.0.0");
+const APP_LIB_DIR = path.join(__dirname, "plugins", "atom-1.0.0", "lib");
+const freeMemoryGB = Math.floor(os.freemem() / 1024 / 1024 / 1024);
+const JAVA_OPTS = `${
+  process.env.JAVA_OPTS || ""
+} -Xms${freeMemoryGB}G -Xmx${freeMemoryGB}G`;
+const APP_MAIN_CLASS = "io.appthreat.atom.Atom";
+let APP_CLASSPATH = path.join(APP_LIB_DIR, "io.appthreat.atom-1.0.0.jar");
+let JAVACMD = "java";
+if (process.env.JAVA_HOME) {
+  JAVACMD = path.join(
+    process.env.JAVA_HOME,
+    "bin",
+    "java" + (isWin ? ".exe" : "")
+  );
+}
+const getAllFiles = (dir, extn, files, result, regex) => {
+  regex = regex || new RegExp(`\\.jar$`);
+  files = files || fs.readdirSync(dir);
+  for (let i = 0; i < files.length; i++) {
+    let file = path.join(dir, files[i]);
+    if (fs.statSync(file).isDirectory()) {
+      // Ignore directories
+      const dirName = path.basename(file);
+      if (
+        dirName.startsWith(".") ||
+        IGNORE_DIRS.includes(dirName.toLowerCase())
+      ) {
+        continue;
+      }
+      try {
+        result = getAllFiles(file, extn, fs.readdirSync(file), result, regex);
+      } catch (error) {
+        continue;
+      }
+    } else {
+      if (regex.test(file) && !file.includes("io.appthreat.atom-1.0.0.jar")) {
+        result.push(file);
+      }
+    }
+  }
+  return result;
+};
+
+const atomLibs = getAllFiles(APP_LIB_DIR, ".jar", undefined, [APP_CLASSPATH]);
+const argv = process.argv.slice(2);
+const args = [
+  "-cp",
+  atomLibs.join(path.delimiter),
+  `-Dlog4j.configurationFile=${LOG4J_CONFIG}`,
+  APP_MAIN_CLASS,
+  ...argv
+];
+const env = {
+  ...process.env,
+  JAVA_OPTS
+};
+const cwd = process.env.ATOM_CWD || process.cwd();
+spawnSync(JAVACMD, args, {
+  encoding: "utf-8",
+  env,
+  cwd,
+  stdio: "inherit",
+  stderr: "inherit"
+});

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@appthreat/atom",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Create atom (⚛) representation for your application, packages and libraries",
   "main": "index.js",
-  "bin": {
-    "atom": "./plugins/atom-1.0.0/bin/atom"
-  },
   "scripts": {
     "pretty": "prettier --write *.js --trailing-comma=none"
   },

package/plugins/atom-1.0.0/bin/atom

@@ -200,9 +200,9 @@ process_args () {
 
      -java-home) require_arg path "$1" "$2" && jre=`eval echo $2` && java_cmd="$jre/bin/java" && shift 2 ;;
 
- -D*|-agentlib*|-XX*) addJava "$1" && shift ;;
-                 -J*) addJava "${1:2}" && shift ;;
-                   *) addResidual "$1" && shift ;;
+ -D*|-agentlib*|-agentpath*|-javaagent*|-XX*) addJava "$1" && shift ;;
+                                         -J*) addJava "${1:2}" && shift ;;
+                                           *) addResidual "$1" && shift ;;
     esac
   done
 
@@ -246,6 +246,16 @@ run() {
     mainclass=("${app_mainclass[@]}")
   fi
 
+  # Fallback to custom mainclass if main class is not provided (this is the case if the JAR contains multiple apps)
+  if [ "$app_mainclass" = "" ] || [ $custom_mainclass ];then
+    if [ "$custom_mainclass" = "" ]; then
+      echo "You need to pass -main argument."
+      exit 1
+    fi
+
+    app_mainclass=$custom_mainclass
+  fi
+
   # Now we check to see if there are any java opts on the environment. These get listed first, with the script able to override them.
   if [[ "$JAVA_OPTS" != "" ]]; then
     java_opts="${JAVA_OPTS}"
@@ -273,7 +283,7 @@ loadConfigFile() {
 }
 
 # Now check to see if it's a good enough version
-# TODO - Check to see if we have a configured default java version, otherwise use 1.6
+# TODO - Check to see if we have a configured default java version, otherwise use 1.8
 java_version_check() {
   readonly java_version=$("$java_cmd" -version 2>&1 | awk -F '"' '/version/ {print $2}')
   if [[ "$java_version" == "" ]]; then
@@ -287,10 +297,10 @@ java_version_check() {
     if [[ "$major" -eq "1" ]]; then
      local major=$(echo "$java_version" | cut -d'.' -f2)
     fi
-    if [[ "$major" -lt "6" ]]; then
+    if [[ "$major" -lt "8" ]]; then
       echo
       echo The java installation you have is not up to date
-      echo $app_name requires at least version 1.6+, you have
+      echo $app_name requires at least version 1.8+, you have
       echo version $java_version
       echo
       echo Please go to http://www.java.com/getjava/ and download

package/plugins/log4j2.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="ERROR">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_ERR">
+            <PatternLayout pattern="%d{yyy-MM-dd HH:mm:ss.SSS} %p %c{0}: %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="ERROR">
+            <AppenderRef ref="Console" />
+        </Root>
+    </Loggers>
+</Configuration>