[CLOUDTRUST-2178] add agent and user info in the admin avents

cloudtrust · Feb 5, 2020 · bae9741 · bae9741
1 parent 7b81d0d
commit bae9741
Show file tree

Hide file tree

Showing 5 changed files with 166 additions and 124 deletions.
diff --git a/api/event/event.fbs b/api/event/event.fbs
@@ -143,6 +143,7 @@ table AuthDetails {
     realmId:string;
     clientId:string;
     userId:string;
+    username:string; 
     ipAddress:string;
 }
 
@@ -164,6 +165,7 @@ table AdminEvent {
     time:long;
     realmId:string;
     authDetails:AuthDetails;
+    details:[Tuple];
     resourceType:ResourceType;
     operationType:OperationType;
     resourcePath:string;

diff --git a/api/event/fb/AdminEvent.go b/api/event/fb/AdminEvent.go
diff --git a/api/event/fb/AuthDetails.go b/api/event/fb/AuthDetails.go
diff --git a/pkg/event/component.go b/pkg/event/component.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -218,14 +217,22 @@ func adminEventToMap(adminEvent *fb.AdminEvent) map[string]string {
 	addInfo["ip_address"] = string(authDetails.IpAddress())
 	adminEventMap[database.CtEventAgentRealmName] = string(authDetails.RealmId()) // agent_realm_name
 	adminEventMap[database.CtEventAgentUserID] = string(authDetails.UserId())     //agent_user_id
+	adminEventMap[database.CtEventAgentUsername] = string(authDetails.Username()) //agent_username
+
+	//details contains the user_id and the username of the user affected by the action
+	var detailsLength = adminEvent.DetailsLength()
+	for i := 0; i < detailsLength; i++ {
+		var tuple = new(fb.Tuple)
+		adminEvent.Details(tuple, i)
+		if string(tuple.Key()) == database.CtEventUsername || string(tuple.Key()) == database.CtEventUserID {
+			adminEventMap[string(tuple.Key())] = string(tuple.Value())
+		}
+
+	}
 
 	addInfo["resource_type"] = string(adminEvent.ResourceType())
 	adminEventMap[database.CtEventKcOperationType] = fb.EnumNamesOperationType[int8(adminEvent.OperationType())] //kc_operation_type
 	addInfo["resource_path"] = string(adminEvent.ResourcePath())
-	reg := regexp.MustCompile(`[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}`)
-	if strings.HasPrefix(addInfo["resource_path"], "users") {
-		adminEventMap[database.CtEventUserID] = string(reg.Find([]byte(addInfo["resource_path"]))) //user_id
-	}
 
 	addInfo["representation"] = string(adminEvent.Representation())
 	addInfo["error"] = string(adminEvent.Error())