Merge pull request #275 from AikidoSec/java-normalize-hostname-to-lowercase

Java normalize hostname to lowercase

Author: bitterpanda63

agent_api/src/main/java/dev/aikido/agent_api/storage/Hostnames.java

@@ -16,9 +16,11 @@ protected boolean removeEldestEntry(Map.Entry<String, HostnameEntry> eldest) {
     }
 
     public void add(String hostname, int port) {
-        String key = getKey(hostname, port);
+        if (hostname == null) return;
+        String normalizedHostname = hostname.toLowerCase();
+        String key = getKey(normalizedHostname, port);
         if (!map.containsKey(key)) {
-            map.put(key, new HostnameEntry(hostname, port));
+            map.put(key, new HostnameEntry(normalizedHostname, port));
         }
         map.get(key).incrementHits();
     }

agent_api/src/test/java/storage/HostnamesTest.java

@@ -106,6 +106,30 @@ public void testExceedMaxEntriesWithMultiplePorts() {
         assertTrue(containsEntry(entries, "newsite.com", 3000));
     }
 
+    @Test
+    public void testAddNullHostnameIsIgnored() {
+        hostnames.add(null, 80);
+        assertEquals(0, hostnames.asArray().length);
+    }
+
+    @Test
+    public void testAddUppercaseHostnameIsLowercased() {
+        hostnames.add("EXAMPLE.COM", 80);
+        Hostnames.HostnameEntry[] entries = hostnames.asArray();
+        assertEquals(1, entries.length);
+        assertEquals("example.com", entries[0].getHostname());
+    }
+
+    @Test
+    public void testMixedCaseAndLowercaseSameEntryDeduplication() {
+        hostnames.add("Example.COM", 80);
+        hostnames.add("example.com", 80);
+        Hostnames.HostnameEntry[] entries = hostnames.asArray();
+        assertEquals(1, entries.length);
+        assertEquals("example.com", entries[0].getHostname());
+        assertEquals(2, entries[0].getHits());
+    }
+
     private boolean containsEntry(Hostnames.HostnameEntry[] entries, String hostname, int port) {
         for (Hostnames.HostnameEntry entry : entries) {
             if (entry.getHostname().equals(hostname) && entry.getPort() == port) {