merge

Author: planetlevel

src/main/java/com/contrastsecurity/App.java

@@ -11,6 +11,7 @@
 public class App {
 
     public static void main(String[] args){
+        System.out.println();
         System.out.println("SafeLog4j by Contrast Security");
         System.out.println( "https://contrastsecurity.com" );
 
@@ -27,6 +28,7 @@ public static void main(String[] args){
                 File agentFile = new File(filename);
                 ByteBuddyAgent.attach(agentFile.getAbsoluteFile(), pid, options);
                 System.out.println("Attached to target jvm and loaded agent successfully");
+                System.out.println();
             }catch(Exception e){
                 e.printStackTrace();
             }
@@ -35,6 +37,21 @@ public static void main(String[] args){
         }
     }
 
+    private static void showHelp(){
+        System.out.println();
+        System.out.println("List of eligible JVM PIDs (must be running as same user):");
+        try{
+            listProcesses();
+        }catch(NoClassDefFoundError err){
+            System.err.println("Error. Try using 'jps' or 'jcmd' to list Java processes.");
+        }
+        System.out.println();
+        System.out.println("To attach Safelog4j to your application, either:");
+        System.out.println("1. Launch with -javaagent:safelog4j-x.x.x");
+        System.out.println("2. Attach to a running JVM with java -jar safelog4j-x.x.x PID [both|check|block|none]");
+        System.out.println();
+    }
+
     public static void listProcesses(){
         List<VirtualMachineDescriptor> vms = VirtualMachine.list();
         vms.stream()
@@ -44,19 +61,4 @@ public static void listProcesses(){
         });
     }
 
-    private static void showHelp(){
-        System.out.println("This tool can be used in two modes for custom and third party applications:");
-        System.out.println("1. At application startup, through the -javaagent flag.");
-        System.out.println("2. Without application restart, if supported.");
-        System.out.println();
-        System.out.println("SafeLog4j can connect to and patch the following Java processes:");
-        try{
-            listProcesses();
-            System.out.println();
-            System.out.println("To patch a process, add an argument of the ID or use the word all.");
-        }catch(NoClassDefFoundError err){
-            System.err.println("Please use jcmd to list Java processes.");
-        }
-    }
-
 }

src/main/java/com/contrastsecurity/SafeLog4J.java

@@ -38,7 +38,7 @@ public static void transform(String args, Instrumentation inst) {
 		agentRunning = true;
 
 		if ( args == null ) args = "both";
-		switch(args) {
+		switch(args.toLowerCase()) {
 			case "block" : checkMode = false; break;
 			case "check" : blockMode = false; break;
 			case "none"  : return;