mirror of https://github.com/jacekkow/keycloak-protocol-cas

Martin Bartos
2020-06-08 c85cab363c64b837ef3fcd1463095faa9000036e
[KEYCLOAK-13202] Reset password redirects to account client
1 files modified
25 ■■■■ changed files
src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java 25 ●●●● patch | view | raw | blame | history
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;
@@ -189,10 +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 validateRedirectUriWildcard(validRedirect);
        }
        return validRedirect;
    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));
    }
}