Merge pull request #174 from AikidoSec/fix-crash-on-aikido-log-level-not-recognized

Fix: stops crashing when AIKIDO_LOG_LEVEL is set to something invalid

Author: bitterpanda63

agent_api/src/main/java/dev/aikido/agent_api/helpers/logging/Logger.java

@@ -8,18 +8,23 @@
 import java.util.List;
 
 public class Logger {
-    private final LogLevel logLevel;
+    private LogLevel logLevel;
     private final Class<?> logClass;
     private static final int MAX_ARGUMENT_LENGTH = 300;
+    private static final LogLevel DEFAULT_LOG_LEVEL = LogLevel.INFO;
 
     public Logger(Class<?> logClass) {
+        this.logLevel = DEFAULT_LOG_LEVEL;
+        this.logClass = logClass;
+
         String logLevelString = System.getenv("AIKIDO_LOG_LEVEL");
         if (logLevelString != null) {
-            this.logLevel = LogLevel.valueOf(logLevelString.toUpperCase());
-        } else {
-            this.logLevel = LogLevel.INFO; // Default loglevel
+            try {
+                this.logLevel = LogLevel.valueOf(logLevelString.toUpperCase());
+            } catch (IllegalArgumentException ignored) {
+                this.error("Unknown log level `%s`", logLevelString);
+            }
         }
-        this.logClass = logClass;
     }
     public Logger(Class<?> logClass, LogLevel logLevel) {
         this.logLevel = logLevel;
@@ -101,4 +106,4 @@ public void error(Object message, Object... args) {
     public void fatal(Object message, Object... args) {
         log(LogLevel.FATAL, message, args);
     }
-}
+}

agent_api/src/test/java/helpers/LoggingTest.java

@@ -105,6 +105,29 @@ public void testLoggerUsesProvidedLevel1(StdOut out) {
         assertFalse(out.capturedString().contains("TEST2"));
         assertFalse(out.capturedString().contains("TEST3"));
     }
+
+    @Test
+    @SetEnvironmentVariable(key = "AIKIDO_LOG_LEVEL", value = "ekjflos")
+    @StdIo
+    public void testLoggerUsesProvidedLevel1GivenInvalidEnv(StdOut out) {
+        // Check it reads environment variable
+        Logger logger = new Logger(FileCollector.class);
+        logger.info("TEST1");
+        logger.trace("TEST2");
+        logger.debug("TEST3");
+        logger.error("TEST4");
+        logger.fatal("TEST5");
+        logger.warn("TEST6");
+
+        assertTrue(out.capturedString().contains("INFO dev.aikido.agent_api.collectors.FileCollector: TEST1"));
+        assertTrue(out.capturedString().contains("ERROR dev.aikido.agent_api.collectors.FileCollector: TEST4"));
+        assertTrue(out.capturedString().contains("FATAL dev.aikido.agent_api.collectors.FileCollector: TEST5"));
+        assertTrue(out.capturedString().contains("WARN dev.aikido.agent_api.collectors.FileCollector: TEST6"));
+        assertFalse(out.capturedString().contains("TEST2"));
+        assertFalse(out.capturedString().contains("TEST3"));
+        assertTrue(out.capturedString().contains("Unknown log level `ekjflos`"));
+    }
+
     @Test
     @StdIo
     public void testLoggerUsesProvidedLevel2(StdOut out) {