From 89433ee3c7c3fe12b85ac5de9f2e8669218a2e8f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 5 Oct 2022 10:42:59 -0700 Subject: [PATCH] GUACAMOLE-1224: Log extension sources of objects affected by REST API. --- .../org/apache/guacamole/event/AffectedObject.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/guacamole/src/main/java/org/apache/guacamole/event/AffectedObject.java b/guacamole/src/main/java/org/apache/guacamole/event/AffectedObject.java index c610bf177..c08b4ed03 100644 --- a/guacamole/src/main/java/org/apache/guacamole/event/AffectedObject.java +++ b/guacamole/src/main/java/org/apache/guacamole/event/AffectedObject.java @@ -55,6 +55,7 @@ public class AffectedObject implements LoggableDetail { Object object = event.getObject(); String identifier = event.getObjectIdentifier(); + String dataSource = event.getAuthenticationProvider().getIdentifier(); String objectType; String name = null; // Not all objects have names @@ -95,8 +96,8 @@ public class AffectedObject implements LoggableDetail { // Users case USER: - if (identifier.equals(event.getAuthenticatedUser().getIdentifier())) - return "their own user account"; + if (identifier != null && identifier.equals(event.getAuthenticatedUser().getIdentifier())) + return "their own user account within \"" + dataSource + "\""; objectType = "user"; break; @@ -116,12 +117,12 @@ public class AffectedObject implements LoggableDetail { // including the name of the object, as well, if available if (identifier != null) { if (name != null) - return objectType + " \"" + identifier + "\" (currently named \"" + name + "\")"; + return objectType + " \"" + identifier + "\" within \"" + dataSource + "\" (currently named \"" + name + "\")"; else - return objectType + " \"" + identifier + "\""; + return objectType + " \"" + identifier + "\" within \"" + dataSource + "\""; } else - return objectType; + return objectType + " within \"" + dataSource + "\""; }