From f3adcc0f4d9afd0a68197656f040e43d9964c52c Mon Sep 17 00:00:00 2001
From: Hynek Mlnarik <hmlnarik@redhat.com>
Date: Tue, 18 May 2021 18:31:21 +0000
Subject: [PATCH] KEYCLOAK-17748 Optimize validation of redirect URIs in logout endpoint
---
src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
index b192e50..da0f11a 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
@@ -24,6 +24,7 @@
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakUriInfo;
import org.keycloak.models.RealmModel;
+import org.keycloak.protocol.oidc.OIDCLoginProtocol;
import org.keycloak.services.Urls;
import org.keycloak.services.util.ResolveRelative;
@@ -71,11 +72,12 @@
}
private static Set<String> getValidateRedirectUris(KeycloakSession session) {
- return session.getContext().getRealm().getClientsStream()
- .filter(ClientModel::isEnabled)
- .map(c -> resolveValidRedirects(session, c.getRootUrl(), c.getRedirectUris()))
- .flatMap(Collection::stream)
- .collect(Collectors.toSet());
+ RealmModel realm = session.getContext().getRealm();
+ return session.clientStorageManager().getAllRedirectUrisOfEnabledClients(realm).entrySet().stream()
+ .filter(me -> me.getKey().isEnabled() && OIDCLoginProtocol.LOGIN_PROTOCOL.equals(me.getKey().getProtocol()) && !me.getKey().isBearerOnly() && (me.getKey().isStandardFlowEnabled() || me.getKey().isImplicitFlowEnabled()))
+ .map(me -> resolveValidRedirects(session, me.getKey().getRootUrl(), me.getValue()))
+ .flatMap(Collection::stream)
+ .collect(Collectors.toSet());
}
public static String verifyRedirectUri(KeycloakSession session, String rootUrl, String redirectUri, Set<String> validRedirects, boolean requireRedirectUri) {
--
Gitblit v1.10.0