libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Move session iframe pages (#14769)

Browse source 
Closes #14767
This commit is contained in:
Stian Thorgersen 2022-10-13 08:16:20 +02:00 committed by GitHub
parent 8ea3f30d82
commit ded52c6228
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adapters/oidc/js/pom.xml
View file

@ -30,9 +30,6 @@
<build> <build>
<resources> <resources>
<resource>
<directory>static</directory>
</resource>
<resource> <resource>
<directory>dist</directory> <directory>dist</directory>
</resource> </resource>

6
services/src/main/java/org/keycloak/services/util/IframeUtil.java → services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java
View file

@ -15,11 +15,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.keycloak.services.util; package org.keycloak.protocol.oidc.endpoints;
import org.keycloak.common.Version; import org.keycloak.common.Version;
import org.keycloak.headers.SecurityHeadersProvider; import org.keycloak.headers.SecurityHeadersProvider;
import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSession;
import org.keycloak.services.util.CacheControlUtil;
import org.keycloak.services.util.P3PHelper;
import javax.ws.rs.core.CacheControl; import javax.ws.rs.core.CacheControl;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
@ -37,7 +39,7 @@ public class IframeUtil {
cacheControl = CacheControlUtil.noCache(); cacheControl = CacheControlUtil.noCache();
} }
InputStream resource = IframeUtil.class.getClassLoader().getResourceAsStream(fileName); InputStream resource = IframeUtil.class.getResourceAsStream(fileName);
if (resource != null) { if (resource != null) {
P3PHelper.addP3PHeader(); P3PHelper.addP3PHeader();
session.getProvider(SecurityHeadersProvider.class).options().allowAnyFrameAncestor(); session.getProvider(SecurityHeadersProvider.class).options().allowAnyFrameAncestor();

2
services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java
View file

@ -33,7 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.UriInfo;
import java.util.Set; import java.util.Set;
import static org.keycloak.services.util.IframeUtil.returnIframeFromResources; import static org.keycloak.protocol.oidc.endpoints.IframeUtil.returnIframeFromResources;
/** /**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a> * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

2
services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java
View file

@ -27,7 +27,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import static org.keycloak.services.util.IframeUtil.returnIframeFromResources; import static org.keycloak.protocol.oidc.endpoints.IframeUtil.returnIframeFromResources;
/** /**
* @author Vaclav Muzikar <vmuzikar@redhat.com> * @author Vaclav Muzikar <vmuzikar@redhat.com>

0
adapters/oidc/js/static/3p-cookies-step1.html → services/src/main/resources/org/keycloak/protocol/oidc/endpoints/3p-cookies-step1.html
View file

0
adapters/oidc/js/static/3p-cookies-step2.html → services/src/main/resources/org/keycloak/protocol/oidc/endpoints/3p-cookies-step2.html
View file

0
adapters/oidc/js/static/login-status-iframe.html → services/src/main/resources/org/keycloak/protocol/oidc/endpoints/login-status-iframe.html
View file