From 6a97520fb8ff6c0164dbe1840222dddf0c476096 Mon Sep 17 00:00:00 2001 From: Michal Hajas Date: Fri, 14 Jul 2023 14:47:16 +0200 Subject: [PATCH] Check whether realm has store enabled for immediately sent events Closes #21698 Signed-off-by: Michal Hajas --- .../org/keycloak/events/EventBuilder.java | 24 ++++++++++++------- .../admin/event/LoginEventsTest.java | 11 ++++++++- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java b/server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java index 496f5939b2dd..aa682b5ad634 100755 --- a/server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java +++ b/server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java @@ -50,6 +50,7 @@ public class EventBuilder { private RealmModel realm; private Event event; private Boolean storeImmediately; + private final boolean isEventsEnabled; public EventBuilder(RealmModel realm, KeycloakSession session, ClientConnection clientConnection) { this(realm, session); @@ -59,19 +60,25 @@ public EventBuilder(RealmModel realm, KeycloakSession session, ClientConnection public EventBuilder(RealmModel realm, KeycloakSession session) { this.session = session; this.realm = realm; + this.isEventsEnabled = realm.isEventsEnabled(); event = new Event(); - this.store = realm.isEventsEnabled() ? session.getProvider(EventStoreProvider.class) : null; - if (realm.isEventsEnabled() && this.store == null) { - log.error("Events enabled, but no event store provider configured"); - } - + this.store = this.isEventsEnabled ? getEventStoreProvider(session) : null; this.listeners = getEventListeners(session, realm); realm(realm); } + private static EventStoreProvider getEventStoreProvider(KeycloakSession session) { + EventStoreProvider store = session.getProvider(EventStoreProvider.class); + if (store == null) { + log.error("Events enabled, but no event store provider configured"); + } + + return store; + } + private static List getEventListeners(KeycloakSession session, RealmModel realm) { return realm.getEventsListenersStream().map(id -> { EventListenerProvider listener = session.getProvider(EventListenerProvider.class, id); @@ -92,6 +99,7 @@ private EventBuilder(KeycloakSession session, EventStoreProvider store, List eventTypes = realm.getEnabledEventTypesStream().collect(Collectors.toSet()); if (sendImmediately) { - KeycloakModelUtils.runJobInTransaction(session.getKeycloakSessionFactory(), session.getContext(), session -> { - EventStoreProvider store = session.getProvider(EventStoreProvider.class); - List listeners = getEventListeners(session, realm); + KeycloakModelUtils.runJobInTransaction(session.getKeycloakSessionFactory(), session.getContext(), innerSession -> { + EventStoreProvider store = this.isEventsEnabled ? getEventStoreProvider(innerSession) : null; + List listeners = getEventListeners(innerSession, realm); sendNow(store, eventTypes, listeners); }); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/LoginEventsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/LoginEventsTest.java index 95da7e05bc7c..0b19b53427b4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/LoginEventsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/LoginEventsTest.java @@ -53,7 +53,7 @@ private List events() { } private void badLogin() { - driver.navigate().to(oauth.getLoginFormUrl()); + oauth.openLoginForm(); loginPage.form().login("bad", "user"); } @@ -166,6 +166,15 @@ public void orderResultsTest() { } + @Test + public void testErrorEventsAreNotStoredWhenDisabled() { + configRep.setEventsEnabled(false); + saveConfig(); + + badLogin(); + assertEquals(0, events().size()); + } + /* Removed this test because it takes too long. The default interval for event cleanup is 15 minutes (900 seconds). I don't have time to figure out