Merge pull request #182 from AikidoSec/fix-wrappers-and-fix-inet

Fix InetAddress issue with null and add logs on error to sys wrappers

Author: willem-delbare

agent/src/main/java/dev/aikido/agent/wrappers/InetAddressWrapper.java

@@ -34,7 +34,7 @@ public static class InetAdvice {
         // To bypass this issue we load collectors from a .jar file
         @Advice.OnMethodExit
         public static void after(
-                @Advice.Enter String hostname,
+                @Advice.Argument(0) String hostname,
                 @Advice.Return InetAddress[] inetAddresses
         ) throws Throwable {
             String jarFilePath = System.getProperty("AIK_agent_api_jar");
@@ -64,15 +64,9 @@ public static void after(
                     throw invocationTargetException.getCause();
                 }
                 // Ignore non-aikido throwables.
-            } catch(Throwable e) {}
-        }
-        @Advice.OnMethodEnter
-        public static String before(
-                @Advice.This(typing = DYNAMIC, optional = true) Object target,
-                @Advice.Origin Executable method,
-                @Advice.Argument(0) Object argument
-        ) {
-            return argument.toString();
+            } catch(Throwable e) {
+                System.out.println("AIKIDO: " + e.getMessage());
+            }
         }
     }
 }

agent/src/main/java/dev/aikido/agent/wrappers/PathWrapper.java

@@ -72,6 +72,7 @@ public static void before(
                 }
                 // Ignore non-aikido throwables.
             } catch(Throwable e) {
+                System.out.println("AIKIDO: " + e.getMessage());
             }
             classLoader.close(); // Close the class loader
         }

agent/src/main/java/dev/aikido/agent/wrappers/PathsWrapper.java

@@ -71,7 +71,9 @@ public static void before(
                     throw invocationTargetException.getCause();
                 }
                 // Ignore non-aikido throwables.
-            } catch(Throwable e) {}
+            } catch(Throwable e) {
+                System.out.println("AIKIDO: " + e.getMessage());
+            }
             classLoader.close(); // Close the class loader
         }
     }

agent/src/main/java/dev/aikido/agent/wrappers/RuntimeExecWrapper.java

@@ -73,7 +73,9 @@ public static void before(
                     throw invocationTargetException.getCause();
                 }
                 // Ignore non-aikido throwables.
-            } catch(Throwable e) {}
+            } catch(Throwable e) {
+                System.out.println("AIKIDO: " + e.getMessage());
+            }
         }
     }
 }

agent/src/main/java/dev/aikido/agent/wrappers/file/FileConstructorMultiArgumentWrapper.java

@@ -84,6 +84,7 @@ public static void before(
                 }
                 // Ignore non-aikido throwables.
             } catch (Throwable e) {
+                System.out.println("AIKIDO: " + e.getMessage());
             }
         }
     }

agent/src/main/java/dev/aikido/agent/wrappers/file/FileConstructorSingleArgumentWrapper.java

@@ -82,6 +82,7 @@ public static void before(
                 }
                 // Ignore non-aikido throwables.
             } catch (Throwable e) {
+                System.out.println("AIKIDO: " + e.getMessage());
             }
         }
     }

agent_api/src/test/java/wrappers/InetAddressTest.java

@@ -76,6 +76,13 @@ public void testSSRFWithoutPort() throws Exception {
         assertEquals(1, StatisticsStore.getStatsRecord().operations().get("java.net.InetAddress.getAllByName").getAttacksDetected().get("blocked"));
     }
 
+    @Test
+    public void testCanHandleNullInput() {
+        assertDoesNotThrow(() -> {
+            InetAddress.getAllByName(null);
+        });
+    }
+
     @Test
     public void testSSRFWithoutPortAndWithoutContext() {
         setContextAndLifecycle("http://localhost:80");