Update Attack to include user

Author: slack-watcher

agent_api/src/main/java/dev/aikido/agent_api/vulnerabilities/Attack.java

@@ -1,5 +1,7 @@
 package dev.aikido.agent_api.vulnerabilities;
 
+import dev.aikido.agent_api.context.User;
+
 import java.util.Map;
 
 public class Attack {
@@ -10,14 +12,16 @@ public class Attack {
     public final Map<String, String> metadata;
     public final String payload;
     public final String stack;
-    public Attack(String op, Vulnerabilities.Vulnerability vulnerability, String source, String pathToPayload, Map<String, String> metadata, String payload, String stack) {
+    public final User user;
+    public Attack(String op, Vulnerabilities.Vulnerability vulnerability, String source, String pathToPayload, Map<String, String> metadata, String payload, String stack, User user) {
         this.operation = op;
         this.kind = vulnerability.getKind();
         this.source = source;
         this.pathToPayload = pathToPayload;
         this.metadata = metadata;
         this.payload = payload;
         this.stack = stack;
+        this.user = user;
     }
 
     @Override
@@ -30,6 +34,6 @@ public String toString() {
                 ", metadata=" + metadata +
                 ", payload='" + payload + '\'' +
                 ", stack='" + stack + '\'' +
-                '}';
+                ", user=" + user.id() + '}';
     }
 }

agent_api/src/test/java/vulnerabilities/AttackTest.java

@@ -1,5 +1,6 @@
 package vulnerabilities;
 
+import dev.aikido.agent_api.context.User;
 import dev.aikido.agent_api.vulnerabilities.Attack;
 import dev.aikido.agent_api.vulnerabilities.Vulnerabilities;
 import org.junit.jupiter.api.Test;
@@ -22,9 +23,10 @@ public void testAttackConstructor() {
         metadata.put("userId", "123");
         String payload = "SELECT * FROM users WHERE id = 1";
         String stack = "Stack trace here";
+        User user = new User("id", "name", "1.1.1.1", 0);
 
         // Act
-        Attack attack = new Attack(operation, vulnerability, source, pathToPayload, metadata, payload, stack);
+        Attack attack = new Attack(operation, vulnerability, source, pathToPayload, metadata, payload, stack, user);
 
         // Assert
         assertEquals(operation, attack.operation);
@@ -34,8 +36,9 @@ public void testAttackConstructor() {
         assertEquals(metadata, attack.metadata);
         assertEquals(payload, attack.payload);
         assertEquals(stack, attack.stack);
+        assertEquals(user, attack.user);
         assertEquals(
-                "Attack{operation='SQL Injection', kind='sql_injection', source='User Input', pathToPayload='/api/vulnerable', metadata={userId=123}, payload='SELECT * FROM users WHERE id = 1', stack='Stack trace here'}",
+                "Attack{operation='SQL Injection', kind='sql_injection', source='User Input', pathToPayload='/api/vulnerable', metadata={userId=123}, payload='SELECT * FROM users WHERE id = 1', stack='Stack trace here', user=id}",
                 attack.toString()
         );
     }
@@ -50,9 +53,10 @@ public void testAttackWithEmptyMetadata() {
         Map<String, String> metadata = new HashMap<>(); // Empty metadata
         String payload = "<script>alert('XSS');</script>";
         String stack = "Stack trace here";
+        User user = new User("123", "name", "1.1.1.1", 0);
 
         // Act
-        Attack attack = new Attack(operation, vulnerability, source, pathToPayload, metadata, payload, stack);
+        Attack attack = new Attack(operation, vulnerability, source, pathToPayload, metadata, payload, stack, user);
 
         // Assert
         assertEquals(operation, attack.operation);
@@ -63,7 +67,7 @@ public void testAttackWithEmptyMetadata() {
         assertEquals(payload, attack.payload);
         assertEquals(stack, attack.stack);
         assertEquals(
-                "Attack{operation='XSS Attack', kind='sql_injection', source='User Input', pathToPayload='/api/vulnerable', metadata={}, payload='<script>alert('XSS');</script>', stack='Stack trace here'}",
+                "Attack{operation='XSS Attack', kind='sql_injection', source='User Input', pathToPayload='/api/vulnerable', metadata={}, payload='<script>alert('XSS');</script>', stack='Stack trace here', user=123}",
                 attack.toString()
         );
     }