From 008debf2670394c02765ebc2688cada7f82090b2 Mon Sep 17 00:00:00 2001 From: Scott Battaglia Date: Thu, 20 Sep 2012 22:20:48 -0400 Subject: [PATCH] CAS-188 provide default Tomcat behavior --- .../jasig/cas/client/tomcat/AssertionCasRealmDelegate.java | 3 +++ .../jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java index bdd1d56..88b4b82 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java @@ -73,6 +73,9 @@ public class AssertionCasRealmDelegate implements CasRealm { /** {@inheritDoc} */ public boolean hasRole(final Principal principal, final String role) { + if ("*".equals(role)) { + return true; + } return getRoleCollection(principal).contains(role); } diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java index 3b135d4..9512cad 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java @@ -109,6 +109,10 @@ public class PropertiesCasRealmDelegate implements CasRealm { /** {@inheritDoc} */ public boolean hasRole(final Principal principal, final String role) { + if ("*".equals(role)) { + return true; + } + final Set roles = this.roleMap.get(principal.getName()); return roles != null && roles.contains(role);