SHIBUI-1747

minor fixes/updates
TIER · Sep 18, 2021 · 45de780 · 45de780
1 parent d6397f9
commit 45de780
Show file tree

Hide file tree

Showing 4 changed files with 1,005 additions and 1,004 deletions.
diff --git a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/AddNewUserFilter.java b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/AddNewUserFilter.java
@@ -71,6 +71,7 @@ User buildAndPersistNewUserFromProfile(CommonProfile profile) {
 
         // get profile attribute for groups
         Object obj = profile.getAttribute(simpleProfileMapping.getGroups());
+        log.debug("User's incoming group from mapping: [{}]", obj);
         if (obj != null) {
             final ArrayList<String> groupNames = new ArrayList<>();
             if (obj instanceof String) {

diff --git a/testbed/authentication/shibboleth-idp/config/shib-idp/conf/attributes/inetOrgPerson.xml b/testbed/authentication/shibboleth-idp/config/shib-idp/conf/attributes/inetOrgPerson.xml
@@ -506,7 +506,7 @@
         <bean parent="shibboleth.TranscodingProperties">
             <property name="properties">
                 <props merge="true">
-                    <prop key="id">businessCategofy</prop>
+                    <prop key="id">businessCategory</prop>
                     <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
                     <prop key="saml2.name">urn:oid:2.5.4.15</prop>
                     <prop key="saml1.name">urn:mace:dir:attribute-def:businessCategory</prop>
@@ -519,4 +519,4 @@
     </constructor-arg>
     </bean>
 
-</beans>
+</beans>
diff --git a/testbed/authentication/shibui/application.yml b/testbed/authentication/shibui/application.yml
@@ -6,7 +6,7 @@ spring:
     include:
 shibui:
   user-bootstrap-resource: file:/conf/users.csv
-  roles: ROLE_ADMIN,ROLE_NONE,ROLE_USER,ROLE_PONY
+  roles: ROLE_ADMIN,ROLE_NONE,ROLE_USER,ROLE_ENABLE,ROLE_PONY
   pac4j-enabled: true
   pac4j:
     keystorePath: "/conf/samlKeystore.jks"
@@ -23,5 +23,5 @@ shibui:
       firstName: urn:oid:2.5.4.42
       lastName: urn:oid:2.5.4.4
       email: urn:oid:0.9.2342.19200300.100.1.3
-      groups: businessCategory
-      roles: urn:oid:1.3.6.1.4.1.5923.1.1.1.7
+      groups: urn:oid:2.5.4.15  # businessCategory
+      roles: urn:oid:1.3.6.1.4.1.5923.1.1.1.7  # eduPersonEntitlement