libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Adding realmName to be logged by jboss-logging event listener

Browse source 
closes #27506

Signed-off-by: mposolda <mposolda@gmail.com>
This commit is contained in:
mposolda 2024-05-28 10:57:56 +02:00 committed by Marek Posolda
parent 25548a7ccc
commit 49a2aaf7bc
8 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server-spi-private/src/main/java/org/keycloak/events/Event.java
View file

@ -32,6 +32,7 @@ public class Event {
private EventType type;
private String realmId;
private String realmName;
private String clientId;
@ -77,6 +78,14 @@ public class Event {
this.realmId = maxLength(realmId, 255);
}
public String getRealmName() {
return realmName;
}
public void setRealmName(String realmName) {
this.realmName = realmName;
}
public String getClientId() {
return clientId;
}
@ -131,6 +140,7 @@ public class Event {
clone.time = time;
clone.type = type;
clone.realmId = realmId;
clone.realmName = realmName;
clone.clientId = clientId;
clone.userId = userId;
clone.sessionId = sessionId;

6
server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java
View file

@ -104,11 +104,7 @@ public class EventBuilder {
public EventBuilder realm(RealmModel realm) {
event.setRealmId(realm == null ? null : realm.getId());
return this;
}
public EventBuilder realm(String realmId) {
event.setRealmId(realmId);
event.setRealmName(realm == null ? null : realm.getName());
return this;
}

14
server-spi-private/src/main/java/org/keycloak/events/admin/AdminEvent.java
View file

@ -28,6 +28,8 @@ public class AdminEvent {
private String realmId;
private String realmName;
private AuthDetails authDetails;
/**
@ -48,6 +50,7 @@ public class AdminEvent {
this.id = toCopy.getId();
this.time = toCopy.getTime();
this.realmId = toCopy.getRealmId();
this.realmName = toCopy.getRealmName();
this.authDetails = new AuthDetails(toCopy.getAuthDetails());
this.resourceType = toCopy.getResourceTypeAsString();
this.operationType = toCopy.getOperationType();
@ -95,6 +98,17 @@ public class AdminEvent {
this.realmId = realmId;
}
/**
* @return the name of the realm
*/
public String getRealmName() {
return realmName;
}
public void setRealmName(String realmName) {
this.realmName = realmName;
}
/**
* Returns authentication details
*

10
server-spi-private/src/main/java/org/keycloak/events/admin/AuthDetails.java
View file

@ -23,6 +23,7 @@ package org.keycloak.events.admin;
public class AuthDetails {
private String realmId;
private String realmName;
private String clientId;
@ -33,6 +34,7 @@ public class AuthDetails {
public AuthDetails() {}
public AuthDetails(AuthDetails toCopy) {
this.realmId = toCopy.getRealmId();
this.realmName = toCopy.getRealmName();
this.clientId = toCopy.getClientId();
this.userId = toCopy.getUserId();
this.ipAddress = toCopy.getIpAddress();
@ -46,6 +48,14 @@ public class AuthDetails {
this.realmId = realmId;
}
public String getRealmName() {
return realmName;
}
public void setRealmName(String realmName) {
this.realmName = realmName;
}
public String getClientId() {
return clientId;
}

4
services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java
View file

@ -90,6 +90,8 @@ public class JBossLoggingEventListenerProvider implements EventListenerProvider
sanitize(sb, event.getType().toString());
sb.append(", realmId=");
sanitize(sb, event.getRealmId());
sb.append(", realmName=");
sanitize(sb, event.getRealmName());
sb.append(", clientId=");
sanitize(sb, event.getClientId());
sb.append(", userId=");
@ -145,6 +147,8 @@ public class JBossLoggingEventListenerProvider implements EventListenerProvider
sanitize(sb, adminEvent.getOperationType().toString());
sb.append(", realmId=");
sanitize(sb, adminEvent.getAuthDetails().getRealmId());
sb.append(", realmName=");
sanitize(sb, adminEvent.getAuthDetails().getRealmName());
sb.append(", clientId=");
sanitize(sb, adminEvent.getAuthDetails().getClientId());
sb.append(", userId=");

7
services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java
View file

@ -103,11 +103,7 @@ public class AdminEventBuilder {
public AdminEventBuilder realm(RealmModel realm) {
adminEvent.setRealmId(realm.getId());
return this;
}
public AdminEventBuilder realm(String realmId) {
adminEvent.setRealmId(realmId);
adminEvent.setRealmName(realm.getName());
return this;
}
@ -173,6 +169,7 @@ public class AdminEventBuilder {
} else {
authDetails.setRealmId(realm.getId());
}
authDetails.setRealmName(realm.getName());
adminEvent.setAuthDetails(authDetails);
return this;
}

2
services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
View file

@ -497,7 +497,7 @@ public class RealmAdminResource {
// instead of the realm being deleted.
AdminEventBuilder deleteAdminEvent = new AdminEventBuilder(auth.adminAuth().getRealm(), auth.adminAuth(), session, connection);
deleteAdminEvent.operation(OperationType.DELETE).resource(ResourceType.REALM)
.realm(auth.adminAuth().getRealm().getId()).resourcePath(realm.getName()).success();
.realm(auth.adminAuth().getRealm()).resourcePath(realm.getName()).success();
}
/**

2
services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java
View file

@ -154,7 +154,7 @@ public class RealmsAdminResource {
// The create event is associated with the realm of the user executing the operation,
// instead of the realm being created.
AdminEventBuilder adminEvent = new AdminEventBuilder(auth.getRealm(), auth, session, clientConnection);
adminEvent.resource(ResourceType.REALM).realm(auth.getRealm().getId()).operation(OperationType.CREATE)
adminEvent.resource(ResourceType.REALM).realm(auth.getRealm()).operation(OperationType.CREATE)
.resourcePath(realm.getName())
.representation(ModelToRepresentation.toRepresentation(session, realm, false))
.success();