From c85cab363c64b837ef3fcd1463095faa9000036e Mon Sep 17 00:00:00 2001
From: Martin Bartos <mabartos@redhat.com>
Date: Thu, 18 Jun 2020 11:08:36 +0000
Subject: [PATCH] [KEYCLOAK-13202] Reset password redirects to account client
---
src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 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 5f89335..dd8cebb 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
@@ -28,7 +28,6 @@
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;
@@ -84,8 +83,18 @@
KeycloakUriInfo uriInfo = session.getContext().getUri();
RealmModel realm = session.getContext().getRealm();
- if (redirectUri != null)
- redirectUri = normalizeUrl(redirectUri);
+ if (redirectUri != null) {
+ try {
+ URI uri = URI.create(redirectUri);
+ redirectUri = uri.normalize().toString();
+ } catch (IllegalArgumentException cause) {
+ logger.debug("Invalid redirect uri", cause);
+ return null;
+ } catch (Exception cause) {
+ logger.debug("Unexpected error when parsing redirect uri", cause);
+ return null;
+ }
+ }
if (redirectUri == null) {
if (!requireRedirectUri) {
@@ -179,19 +188,26 @@
private static String getSingleValidRedirectUri(Collection<String> validRedirects) {
if (validRedirects.size() != 1) return null;
String validRedirect = validRedirects.iterator().next();
- int idx = validRedirect.indexOf("/*");
- if (idx > -1) {
- validRedirect = validRedirect.substring(0, idx);
- }
- return validRedirect;
+ return validateRedirectUriWildcard(validRedirect);
}
- private static String normalizeUrl(String url) {
- try {
- URI uri = new URI(url);
- return uri.normalize().toString();
- } catch (URISyntaxException e) {
- throw new IllegalArgumentException("Invalid URL syntax: " + e.getMessage());
+ public static String validateRedirectUriWildcard(String redirectUri) {
+ if (redirectUri == null)
+ return null;
+
+ int idx = redirectUri.indexOf("/*");
+ if (idx > -1) {
+ redirectUri = redirectUri.substring(0, idx);
}
+ 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