API Endpoint detection if handler is not object of Router in vertx

newrelic · Jul 29, 2024 · 04249a6 · 04249a6
1 parent 0e78306
commit 04249a6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/...curity/vertx-web-3.2.0/src/main/java/io/vertx/ext/web/impl/RouteImpl_Instrumentation.java b/...curity/vertx-web-3.2.0/src/main/java/io/vertx/ext/web/impl/RouteImpl_Instrumentation.java
@@ -45,6 +45,7 @@ public abstract class RouteImpl_Instrumentation {
 
     synchronized void handleContext(RoutingContext context) {
         try {
+            VertxApiEndpointUtils.getInstance().generateAPIEndpointsIfNotPresent(this.hashCode());
             VertxApiEndpointUtils.getInstance().routeDetection(path, pattern);
         } catch (Exception e) {
             NewRelicSecurity.getAgent().log(LogLevel.WARNING, String.format(GenericHelper.ERROR_WHILE_GETTING_ROUTE_FOR_INCOMING_REQUEST, "VERTX-WEB-3.2.0", e.getMessage()), e, this.getClass().getName());

diff --git a/...curity/vertx-web-3.5.1/src/main/java/io/vertx/ext/web/impl/RouteImpl_Instrumentation.java b/...curity/vertx-web-3.5.1/src/main/java/io/vertx/ext/web/impl/RouteImpl_Instrumentation.java
@@ -46,6 +46,7 @@ public class RouteImpl_Instrumentation {
 
     void handleContext(RoutingContextImplBase context) {
         try {
+            VertxApiEndpointUtils.getInstance().generateAPIEndpointsIfNotPresent(this.hashCode());
             VertxApiEndpointUtils.getInstance().routeDetection(path, pattern);
         } catch (Exception e) {
             NewRelicSecurity.getAgent().log(LogLevel.WARNING, String.format(GenericHelper.ERROR_WHILE_GETTING_ROUTE_FOR_INCOMING_REQUEST, "VERTX-WEB-3.5.1", e.getMessage()), e, this.getClass().getName());

diff --git a/...urity/vertx-web-3.8.3/src/main/java/io/vertx/ext/web/impl/RouteState_Instrumentation.java b/...urity/vertx-web-3.8.3/src/main/java/io/vertx/ext/web/impl/RouteState_Instrumentation.java
@@ -13,8 +13,11 @@
 @Weave(originalName = "io.vertx.ext.web.impl.RouteState")
 abstract class RouteState_Instrumentation {
 
+    private final RouteImpl route = Weaver.callOriginal();
+
     void handleContext(RoutingContextImplBase context){
         try {
+            VertxApiEndpointUtils.getInstance().generateAPIEndpointsIfNotPresent(route.hashCode());
             VertxApiEndpointUtils.getInstance().routeDetection(getPath(), getPattern());
         } catch (Exception e) {
             NewRelicSecurity.getAgent().log(LogLevel.WARNING, String.format(GenericHelper.ERROR_WHILE_GETTING_ROUTE_FOR_INCOMING_REQUEST, "VERTX-WEB-3.8.3", e.getMessage()), e, this.getClass().getName());

diff --git a/...n/java/com/newrelic/api/agent/security/instrumentation/helpers/VertxApiEndpointUtils.java b/...n/java/com/newrelic/api/agent/security/instrumentation/helpers/VertxApiEndpointUtils.java
@@ -39,7 +39,7 @@ private void addRouteImpl(int routerHashCode, int routeHashCode) throws Exceptio
                 if (!routes.containsKey(routerHashCode)) {
                     routes.put(routerHashCode, new ConcurrentHashMap<>());
                 }
-                routes.get(routerHashCode).put(route.hashCode(), route);
+                routes.get(routerHashCode).put(routeHashCode, route);
             }
         } finally {
             if (isLockAcquired) {
@@ -54,7 +54,7 @@ public void addRouteImpl(int routerHashCode, int routeHashCode, String path, Str
             if (!routes.containsKey(routerHashCode)){
                 return;
             }
-            VertxRoute route = routes.get(routerHashCode).get(Objects.hash(routerHashCode, routeHashCode));
+            VertxRoute route = routes.get(routerHashCode).get(routeHashCode);
             if (route == null){
                 return;
             }
@@ -77,7 +77,7 @@ public void addHandlerClass(int routerHashCode, int routeHashCode, String handle
             if (!routes.containsKey(routerHashCode)){
                 return;
             }
-            VertxRoute route = routes.get(routerHashCode).get(Objects.hash(routerHashCode, routeHashCode));
+            VertxRoute route = routes.get(routerHashCode).get(routeHashCode);
             if (route == null || !Objects.isNull(route.getHandlerName())){
                 return;
             }
@@ -99,7 +99,7 @@ public void resolveSubRoutes(int parentRouterHashCode, int childRouterHashCode,
                 String subRoutePath = getPath(route.getPath(), route.getPattern());
                 route.setPath(StringUtils.removeEnd(path, StringUtils.SEPARATOR) + StringUtils.prependIfMissing(subRoutePath, StringUtils.SEPARATOR));
                 route.setRouterHashCode(parentRouterHashCode);
-                routes.get(parentRouterHashCode).put(route.hashCode(), route);
+                routes.get(parentRouterHashCode).put(route.getRouteHashCode(), route);
             }
         } catch (Exception e) {
             NewRelicSecurity.getAgent().log(LogLevel.WARNING, String.format(GenericHelper.ERROR_WHILE_GETTING_APP_ENDPOINTS, VERTX_FRAMEWORK, e.getMessage()), e, VertxApiEndpointUtils.class.getName());
@@ -155,16 +155,25 @@ public String getPath(String path, Object pattern) {
 
     public void routeDetection(String path, Pattern pattern) {
         if (NewRelicSecurity.isHookProcessingActive()){
-            if (URLMappingsHelper.getSegmentCount(NewRelicSecurity.getAgent().getSecurityMetaData().getRequest().getRoute()) == URLMappingsHelper.getSegmentCount(path)) {
-                return;
-            }
-            boolean isAlreadyServlet = Objects.equals(NewRelicSecurity.getAgent().getSecurityMetaData().getMetaData().getFramework(), Framework.SERVLET.name());
+            String route = StringUtils.EMPTY;
             if (path != null){
-                NewRelicSecurity.getAgent().getSecurityMetaData().getRequest().setRoute(path, isAlreadyServlet);
+                route = path;
             } else if (pattern != null){
-                NewRelicSecurity.getAgent().getSecurityMetaData().getRequest().setRoute(pattern.pattern(), isAlreadyServlet);
+                route = pattern.pattern();
+            }
+            if (URLMappingsHelper.getSegmentCount(NewRelicSecurity.getAgent().getSecurityMetaData().getRequest().getRoute()) == URLMappingsHelper.getSegmentCount(route)) {
+                return;
             }
+            NewRelicSecurity.getAgent().getSecurityMetaData().getRequest().setRoute(route, Objects.equals(NewRelicSecurity.getAgent().getSecurityMetaData().getMetaData().getFramework(), Framework.SERVLET.name()));
             NewRelicSecurity.getAgent().getSecurityMetaData().getMetaData().setFramework(Framework.VERTX);
         }
     }
+
+    public void generateAPIEndpointsIfNotPresent(int routeHashCode) {
+        for (Map.Entry<Integer, Map<Integer, VertxRoute>> routesSet : routes.entrySet()) {
+            if (routesSet.getValue().containsKey(routeHashCode)) {
+                generateAPIEndpoints(routesSet.getKey());
+            }
+        }
+    }
 }