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

Merge pull request #5114 from pedroigor/KEYCLOAK-7028

Browse source 
[KEYCLOAK-7028] - Propagating AuthorizationContext when enforcement-mode is disabled for a path
This commit is contained in:
Pedro Igor 2018-04-03 10:01:57 -03:00 committed by GitHub
commit 28d0ab9da8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 78 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authorization/AbstractPolicyEnforcer.java
View file

@ -95,7 +95,7 @@ public abstract class AbstractPolicyEnforcer {
} }
if (EnforcementMode.DISABLED.equals(pathConfig.getEnforcementMode())) { if (EnforcementMode.DISABLED.equals(pathConfig.getEnforcementMode())) {
return createEmptyAuthorizationContext(true); return createAuthorizationContext(accessToken, pathConfig);
} }
MethodConfig methodConfig = getRequiredScopes(pathConfig, request); MethodConfig methodConfig = getRequiredScopes(pathConfig, request);

6
adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authorization/PolicyEnforcer.java
View file

@ -137,7 +137,11 @@ public class PolicyEnforcer {
if (loadPathsFromServer) { if (loadPathsFromServer) {
LOGGER.info("No path provided in configuration."); LOGGER.info("No path provided in configuration.");
return configureAllPathsForResourceServer(protectedResource); Map<String, PathConfig> paths = configureAllPathsForResourceServer(protectedResource);
paths.putAll(configureDefinedPaths(protectedResource, enforcerConfig));
return paths;
} else { } else {
LOGGER.info("Paths provided in configuration."); LOGGER.info("Paths provided in configuration.");
return configureDefinedPaths(protectedResource, enforcerConfig); return configureDefinedPaths(protectedResource, enforcerConfig);

10
testsuite/integration-arquillian/test-apps/servlet-authz/keycloak-lazy-load-authz-service.json
View file

@ -10,6 +10,14 @@
}, },
"policy-enforcer": { "policy-enforcer": {
"on-deny-redirect-to" : "/servlet-authz-app/accessDenied.jsp", "on-deny-redirect-to" : "/servlet-authz-app/accessDenied.jsp",
"lazy-load-paths": true "lazy-load-paths": true,
"paths": [
{
"name": "Premium Resource",
"path": "/protected/premium/pep-disabled.jsp",
"enforcement-mode": "DISABLED"
}
]
} }
} }

1
testsuite/integration-arquillian/test-apps/servlet-authz/src/main/webapp/index.jsp
View file

@ -14,6 +14,7 @@
<p><a href="protected/dynamicMenu.jsp">Dynamic Menu</a></p> <p><a href="protected/dynamicMenu.jsp">Dynamic Menu</a></p>
<p><a href="protected/premium/onlyPremium.jsp">User Premium</a></p> <p><a href="protected/premium/onlyPremium.jsp">User Premium</a></p>
<p><a href="protected/premium/pep-disabled.jsp">PEP Disabled</a></p>
<p><a href="protected/admin/onlyAdmin.jsp">Administration</a></p> <p><a href="protected/admin/onlyAdmin.jsp">Administration</a></p>
<h3>Your permissions are:</h3> <h3>Your permissions are:</h3>

48
testsuite/integration-arquillian/test-apps/servlet-authz/src/main/webapp/protected/premium/pep-disabled.jsp Normal file
View file

@ -0,0 +1,48 @@
<%@page import="org.keycloak.AuthorizationContext" %>
<%@ page import="org.keycloak.KeycloakSecurityContext" %>
<%
KeycloakSecurityContext keycloakSecurityContext = (KeycloakSecurityContext) request.getAttribute(KeycloakSecurityContext.class.getName());
AuthorizationContext authzContext = keycloakSecurityContext.getAuthorizationContext();
%>
<html>
<body>
<h2>Policy enforcement is disabled. Access granted: <%= authzContext.isGranted() %></h2>
<%@include file="../../logout-include.jsp"%>
<p>Here is a dynamic menu built from the permissions returned by the server:</p>
<ul>
<%
if (authzContext.hasResourcePermission("Protected Resource")) {
%>
<li>
Do user thing
</li>
<%
}
%>
<%
if (authzContext.hasResourcePermission("Premium Resource")) {
%>
<li>
Do user premium thing
</li>
<%
}
%>
<%
if (authzContext.hasPermission("Admin Resource", "urn:servlet-authz:protected:admin:access")) {
%>
<li>
Do administration thing
</li>
<%
}
%>
</ul>
</body>
</html>

4
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractBaseServletAuthzAdapterTest.java
View file

@ -93,7 +93,7 @@ public abstract class AbstractBaseServletAuthzAdapterTest extends AbstractExampl
return this.driver.getPageSource().contains(text); return this.driver.getPageSource().contains(text);
} }
private WebElement getLink(String text) { protected WebElement getLink(String text) {
return this.driver.findElement(By.xpath("//a[text() = '" + text + "']")); return this.driver.findElement(By.xpath("//a[text() = '" + text + "']"));
} }
@ -137,7 +137,7 @@ public abstract class AbstractBaseServletAuthzAdapterTest extends AbstractExampl
} }
} }
private void navigateTo() { protected void navigateTo() {
this.driver.navigate().to(getResourceServerUrl()); this.driver.navigate().to(getResourceServerUrl());
WaitUtils.waitUntilElement(By.xpath("//a[text() = 'Dynamic Menu']")); WaitUtils.waitUntilElement(By.xpath("//a[text() = 'Dynamic Menu']"));
} }

31
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractServletAuthzLazyLoadPathsAdapterTest.java
View file

@ -17,32 +17,13 @@
package org.keycloak.testsuite.adapter.example.authorization; package org.keycloak.testsuite.adapter.example.authorization;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import javax.ws.rs.core.Response;
import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test; import org.junit.Test;
import org.keycloak.admin.client.resource.ClientPoliciesResource;
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.admin.client.resource.ResourcesResource;
import org.keycloak.admin.client.resource.RolePoliciesResource;
import org.keycloak.admin.client.resource.RoleScopeResource;
import org.keycloak.admin.client.resource.RolesResource;
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.admin.client.resource.UsersResource;
import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation;
import org.keycloak.representations.idm.authorization.ResourceRepresentation;
import org.keycloak.representations.idm.authorization.RolePolicyRepresentation;
import org.keycloak.testsuite.util.WaitUtils;
/** /**
* @author <a href="mailto:psilva@redhat.com">Pedro Igor</a> * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
@ -55,4 +36,16 @@ public abstract class AbstractServletAuthzLazyLoadPathsAdapterTest extends Abstr
.addAsWebInfResource(new File(TEST_APPS_HOME_DIR + "/servlet-authz-app/keycloak-lazy-load-authz-service.json"), "keycloak.json"); .addAsWebInfResource(new File(TEST_APPS_HOME_DIR + "/servlet-authz-app/keycloak-lazy-load-authz-service.json"), "keycloak.json");
} }
@Test
public void testPathPEPDisabled() {
performTests(() -> {
login("alice", "alice");
assertFalse(wasDenied());
navigateTo();
getLink("PEP Disabled").click();
hasText("Policy enforcement is disabled. Access granted: true");
});
}
} }