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

mposolda
2021-02-10 2532c465f8ed9941e4aef634b5fdafff1d99c2b1
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;
@@ -31,6 +32,7 @@
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>
@@ -70,16 +72,14 @@
    }
    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(client -> client.isEnabled() && OIDCLoginProtocol.LOGIN_PROTOCOL.equals(client.getProtocol()) && !client.isBearerOnly() && (client.isStandardFlowEnabled() || client.isImplicitFlowEnabled()))
                .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) {
    public static String verifyRedirectUri(KeycloakSession session, String rootUrl, String redirectUri, Set<String> validRedirects, boolean requireRedirectUri) {
        KeycloakUriInfo uriInfo = session.getContext().getUri();
        RealmModel realm = session.getContext().getRealm();
@@ -116,7 +116,7 @@
            boolean valid = matchesRedirects(resolveValidRedirects, r);
            if (!valid && r.startsWith(Constants.INSTALLED_APP_URL) && r.indexOf(':', Constants.INSTALLED_APP_URL.length()) >= 0) {
            if (!valid && (r.startsWith(Constants.INSTALLED_APP_URL) || r.startsWith(Constants.INSTALLED_APP_LOOPBACK)) && r.indexOf(':', Constants.INSTALLED_APP_URL.length()) >= 0) {
                int i = r.indexOf(':', Constants.INSTALLED_APP_URL.length());
                StringBuilder sb = new StringBuilder();