Changeset 5523

Timestamp:

08/05/14 15:41:36 (10 years ago)

Author:

Twan Goosen

Message:

Added reading of shibboleth attributes for display name, organisation and e-mail. Also added these properties to the shhaa filter.
Principal is now dynamically retrieved from the http request.
Refs #595

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/gui/ApplicationSession.java (modified) (2 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/SAMLCreatorProvider.java (modified) (3 diffs)
• webapp/WEB-INF/shhaa.xml (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/ApplicationSession.java

@@ -6 +6 @@
 import java.security.Principal;
 import java.util.regex.Pattern;
-import org.apache.http.auth.BasicUserPrincipal;
+import javax.servlet.http.HttpServletRequest;
 import org.apache.wicket.Request;
+import org.apache.wicket.RequestCycle;
 import org.apache.wicket.authentication.AuthenticatedWebSession;
 import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63 +65 @@
 
     public Principal getPrincipal() {
-        return new BasicUserPrincipal(getUser());
+        ServletWebRequest servletWebRequest = (ServletWebRequest) RequestCycle.get().getRequest();
+        HttpServletRequest request = servletWebRequest.getHttpServletRequest();
+        return request.getUserPrincipal();
     }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/SAMLCreatorProvider.java

@@ -6 +6 @@
 import eu.clarin.cmdi.virtualcollectionregistry.service.CreatorProvider;
 import java.security.Principal;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -13 +15 @@
 public class SAMLCreatorProvider implements CreatorProvider {
 
+    private final static Logger logger = LoggerFactory.getLogger(SAMLCreatorProvider.class);
+    public static final String[] DISPLAY_NAME_ATTRIBUTE = new String[]{"cn", "commonName", "displayName"};
+    public static final String[] ORGANISATION_ATTRIBUTE = new String[]{"o", "organizationName", "schacHomeOrganization"};
+    public static final String[] MAIL_ATTRIBUTE = new String[]{"mail"};
+
     @Override
     public Creator getCreator(Principal userPrincipal) {
-        final Creator creator = new Creator();        
+        final Creator creator = new Creator();
         if (userPrincipal instanceof AuthPrincipal) {
             final AuthPrincipal principal = (AuthPrincipal) userPrincipal;
-            creator.setPerson(getAttribute(principal, "cn")); //TODO: configure more properties
-        } else {
+            creator.setPerson(getAttribute(principal, DISPLAY_NAME_ATTRIBUTE));
+            creator.setOrganisation(getAttribute(principal, ORGANISATION_ATTRIBUTE));
+            creator.setEMail(getAttribute(principal, MAIL_ATTRIBUTE));
+        }
+
+        if (creator.getPerson() == null) {
             creator.setPerson(userPrincipal.getName());
         }
@@ -26 +37 @@
     }
 
-    private static String getAttribute(final AuthPrincipal principal, String attr) {
-//        logger.trace("Looking for attribute {}", attr);
-        final AuthAttribute<?> attribute = principal.getAttribues().get(attr);
-        if (attribute != null) {
+    private static String getAttribute(final AuthPrincipal principal, String[] attrs) {
+        for (String attr : attrs) {
+            final String value = getAttributeValue(principal, attr);
+            if (value != null) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    private static String getAttributeValue(final AuthPrincipal principal, String attr) {
+        logger.trace("Looking for attribute {}", attr);
+        final AuthAttribute<?> attribute = principal.getAttribues().get(attr); 
+       if (attribute != null) {
             final Object value = attribute.getValue();
             if (value != null) {
-//                logger.trace("Found attribute value: {} = {}", attr, value);
+                logger.trace("Found attribute value: {} = {}", attr, value);
                 return value.toString();
             }

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/WEB-INF/shhaa.xml

@@ -32 +32 @@
         <composition action="rF">
             <shibheader>
+                <attribute>cn</attribute>
+                <attribute>commonName</attribute>
                 <attribute>displayName</attribute>
-                <attribute>commonName</attribute>
+                
+                <attribute>mail</attribute>
+                
+                <attribute>o</attribute>                
+                <attribute>organizationName</attribute>
+                <attribute>schacHomeOrganization</attribute>
+                
             </shibheader>
         </composition>