Fix bugs with Javalin found in e2e test

Author: bitterpanda63

agent/src/main/java/dev/aikido/agent/Wrappers.java

@@ -1,8 +1,7 @@
 package dev.aikido.agent;
 
 import dev.aikido.agent.wrappers.*;
-import dev.aikido.agent.wrappers.javalin.JavalinDataWrapper;
-import dev.aikido.agent.wrappers.javalin.JavalinWrapper;
+import dev.aikido.agent.wrappers.javalin.*;
 import dev.aikido.agent.wrappers.jdbc.MSSQLWrapper;
 import dev.aikido.agent.wrappers.jdbc.MariaDBWrapper;
 import dev.aikido.agent.wrappers.jdbc.MysqlCJWrapper;
@@ -34,6 +33,7 @@ private Wrappers() {}
             new PathsWrapper(),
             new NettyWrapper(),
             new JavalinWrapper(),
-            new JavalinDataWrapper()
+            new JavalinDataWrapper(),
+            new JavalinContextClearWrapper()
     );
 }

agent/src/main/java/dev/aikido/agent/wrappers/javalin/JavalinContextClearWrapper.java

@@ -0,0 +1,34 @@
+package dev.aikido.agent.wrappers.javalin;
+
+import dev.aikido.agent.wrappers.Wrapper;
+import dev.aikido.agent_api.context.Context;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import static net.bytebuddy.matcher.ElementMatchers.*;
+
+public class JavalinContextClearWrapper implements Wrapper {
+
+    @Override
+    public String getName() {
+        return JavalinContextClearAdvice.class.getName();
+    }
+
+    @Override
+    public ElementMatcher<? super MethodDescription> getMatcher() {
+        return isDeclaredBy(getTypeMatcher()).and(named("service"));
+    }
+
+    @Override
+    public ElementMatcher<? super TypeDescription> getTypeMatcher() {
+        return nameContains("io.javalin.jetty.JavalinJettyServlet");
+    }
+
+    public static class JavalinContextClearAdvice {
+        @Advice.OnMethodEnter
+        public static void before() {
+            Context.reset();
+        }
+    }
+}

agent_api/src/main/java/dev/aikido/agent_api/context/JavalinContextObject.java

@@ -18,10 +18,10 @@ public JavalinContextObject(
         }
         this.query = new HashMap<>(queryParams);
         this.cookies = extractCookies(cookies);
-        this.headers = new HashMap<>(headers);
+        this.headers = extractHeaders(headers);
         this.route = buildRouteFromUrl(this.url);
         this.remoteAddress = getIpFromRequest(rawIp, this.headers);
-        this.source = "SpringFramework";
+        this.source = "Javalin";
         this.redirectStartNodes = new ArrayList<>();
 
         // We don't have access yet to the route parameters, will add once we have access.
@@ -40,4 +40,12 @@ private static HashMap<String, List<String>> extractCookies(Map<String, String>
         }
         return cookies;
     }
+    private static HashMap<String, String> extractHeaders(Map<String, String> rawHeaders) {
+        HashMap<String, String> headers = new HashMap<>();
+        for (Map.Entry<String, String> entry: rawHeaders.entrySet()) {
+            // Lower-case keys :
+            headers.put(entry.getKey().toLowerCase(), entry.getValue());
+        }
+        return headers;
+    }
 }