From b290c235964ade0c72a483f7592b660c29c77253 Mon Sep 17 00:00:00 2001
From: Martin Kanis <mkanis@redhat.com>
Date: Mon, 07 Sep 2020 11:11:55 +0000
Subject: [PATCH] KEYCLOAK-14901 Replace deprecated ClientProvider related methods across Keycloak
---
src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 0b108f1..d6e739d 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
@@ -28,10 +28,10 @@
import org.keycloak.services.util.ResolveRelative;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
@@ -71,13 +71,11 @@
}
private static Set<String> getValidateRedirectUris(KeycloakSession session) {
- Set<String> redirects = new HashSet<>();
- for (ClientModel client : session.getContext().getRealm().getClients()) {
- if (client.isEnabled()) {
- redirects.addAll(resolveValidRedirects(session, client.getRootUrl(), client.getRedirectUris()));
- }
- }
- return redirects;
+ return session.getContext().getRealm().getClientsStream()
+ .filter(ClientModel::isEnabled)
+ .map(c -> resolveValidRedirects(session, c.getRootUrl(), c.getRedirectUris()))
+ .flatMap(Collection::stream)
+ .collect(Collectors.toSet());
}
private static String verifyRedirectUri(KeycloakSession session, String rootUrl, String redirectUri, Set<String> validRedirects, boolean requireRedirectUri) {
@@ -189,10 +187,26 @@
private static String getSingleValidRedirectUri(Collection<String> validRedirects) {
if (validRedirects.size() != 1) return null;
String validRedirect = validRedirects.iterator().next();
- int idx = validRedirect.indexOf("/*");
+ return validateRedirectUriWildcard(validRedirect);
+ }
+
+ public static String validateRedirectUriWildcard(String redirectUri) {
+ if (redirectUri == null)
+ return null;
+
+ int idx = redirectUri.indexOf("/*");
if (idx > -1) {
- validRedirect = validRedirect.substring(0, idx);
+ redirectUri = redirectUri.substring(0, idx);
}
- return validRedirect;
+ return redirectUri;
+ }
+
+ private static String getFirstValidRedirectUri(Collection<String> validRedirects) {
+ final String redirectUri = validRedirects.stream().findFirst().orElse(null);
+ return (redirectUri != null) ? validateRedirectUriWildcard(redirectUri) : null;
+ }
+
+ public static String getFirstValidRedirectUri(KeycloakSession session, String rootUrl, Set<String> validRedirects) {
+ return getFirstValidRedirectUri(resolveValidRedirects(session, rootUrl, validRedirects));
}
}
--
Gitblit v1.10.0