Add realm to session context when exporting to prevent NPE when vault…

… is enabled. (keycloak#27911) Closes keycloak#22617 Signed-off-by: Stefan Guilhen <[email protected]>
pedroigor · Mar 15, 2024 · 0e717f7 · 0e717f7
1 parent 9b967e3
commit 0e717f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java b/...services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java
@@ -71,6 +71,7 @@ public void exportModel() {
                 @Override
                 protected void runExportImportTask(KeycloakSession session) throws IOException {
                     Stream<RealmRepresentation> realms = session.realms().getRealmsStream()
+                            .peek(realm -> session.getContext().setRealm(realm))
                             .map(realm -> ExportUtils.exportRealm(session, realm, true, true));
 
                     writeToFile(realms);
@@ -88,6 +89,7 @@ private void exportRealm(final String realmName) {
             protected void runExportImportTask(KeycloakSession session) throws IOException {
                 RealmModel realm = session.realms().getRealmByName(realmName);
                 Objects.requireNonNull(realm, "realm not found by realm name '" + realmName + "'");
+                session.getContext().setRealm(realm);
                 RealmRepresentation realmRep = ExportUtils.exportRealm(session, realm, true, true);
                 writeToFile(realmRep);
             }

diff --git a/...ge-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java b/...ge-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java
@@ -95,6 +95,7 @@ protected void exportRealmImpl(final String realmName) {
             @Override
             protected void runExportImportTask(KeycloakSession session) throws IOException {
                 RealmModel realm = session.realms().getRealmByName(realmName);
+                session.getContext().setRealm(realm);
                 RealmRepresentation rep = ExportUtils.exportRealm(session, realm, exportUsersIntoRealmFile, true);
                 writeRealm(realmName + "-realm.json", rep);
                 logger.info("Realm '" + realmName + "' - data exported");
@@ -131,6 +132,7 @@ protected void runExportImportTask(KeycloakSession session) throws IOException {
                     @Override
                     protected void runExportImportTask(KeycloakSession session) throws IOException {
                         RealmModel realm = session.realms().getRealmByName(realmName);
+                        session.getContext().setRealm(realm);
                         usersHolder.users = session.users()
                                 .searchForUserStream(realm, Collections.emptyMap(), usersHolder.currentPageStart, usersHolder.currentPageEnd - usersHolder.currentPageStart)
                                 .collect(Collectors.toList());
@@ -164,6 +166,7 @@ protected void runExportImportTask(KeycloakSession session) throws IOException {
                     @Override
                     protected void runExportImportTask(KeycloakSession session) throws IOException {
                         RealmModel realm = session.realms().getRealmByName(realmName);
+                        session.getContext().setRealm(realm);
                         federatedUsersHolder.users = UserStorageUtil.userFederatedStorage(session)
                                 .getStoredUsersStream(realm, federatedUsersHolder.currentPageStart, federatedUsersHolder.currentPageEnd - federatedUsersHolder.currentPageStart)
                                 .collect(Collectors.toList());