Changeset 942

Timestamp:

11/26/10 17:12:05 (14 years ago)

Author:

oschonef

Message:

• work around for users where only the persistent-id attribute is available

Location:

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

Files:

• ApplicationSession.java (modified) (5 diffs)
• pages/AuthenticationStatePanel.java (modified) (1 diff)

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

@@ -2 +2 @@
 
 import java.security.Principal;
+import java.util.regex.Pattern;
 
 import org.apache.wicket.Request;
@@ -7 +8 @@
 import org.apache.wicket.authorization.strategies.role.Roles;
 
+import eu.clarin.cmdi.virtualcollectionregistry.gui.auth.AuthPrincipal;
+
 
 @SuppressWarnings("serial")
 public class ApplicationSession extends AuthenticatedWebSession {
+    private static final String[] ATTRIBUTE_NAMES_NAME =
+        { "cn", "commonName", "displayName" };
+    private static final Pattern PERSITENT_ID_REGEX =
+        Pattern.compile("^[^!]+![^!]+![^!]+$");
     private static final Roles ROLES_USER =
         new Roles(Roles.USER);
     private static final Roles ROLES_ADMIN =
         new Roles(new String[] { Roles.USER, Roles.ADMIN}); 
-    private Principal principal;
+    private String user;
     private boolean isAdmin;
+    private String userDisplay;
     
     public ApplicationSession(Request request) {
@@ -26 +34 @@
             result = signIn(principal.getName(), null);
             if (result) {
-                // XXX: possibly do something with attributes
-                this.principal = principal; 
-                this.isAdmin =
-                    ((Application) getApplication()).isAdmin(getUser());
+                user = principal.getName();
+                isAdmin = ((Application) getApplication()).isAdmin(user);
+                userDisplay = findDisplayName(principal);
             }
         }
@@ -53 +60 @@
 
     public Principal getPrincipal() {
-        return principal;
+        return new Principal() {
+            @Override
+            public String getName() {
+                return user;
+            }
+        };
     }
 
     public String getUser() {
-        return principal.getName();
+        return user;
+    }
+
+    public String getUserDisplay() {
+        if (userDisplay != null) {
+            return userDisplay;
+        }
+        if (PERSITENT_ID_REGEX.matcher(user).matches()) {
+            return "Authenticated via Shibboleth";
+        }
+        return user;
     }
 
@@ -64 +86 @@
     }
 
+    private static String findDisplayName(Principal p) {
+        if (p instanceof AuthPrincipal) {
+            final AuthPrincipal principal = (AuthPrincipal) p;
+            for (String attr : ATTRIBUTE_NAMES_NAME ) {
+                String name = principal.getAttibute(attr);
+                if (name != null) {
+                    return name;
+                }
+            }
+            String givenName = principal.getAttibute("givenName");
+            String surname = principal.getAttibute("surname");
+            if ((givenName != null) && (surname != null)) {
+                return givenName + " " + surname;
+            }
+        }
+        return null;
+    }
+
 } // class ApplicationSession

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

@@ -84 +84 @@
         protected void onBeforeRender() {
             ApplicationSession session = (ApplicationSession) getSession();
-            usernameLabel.setDefaultModel(new Model<String>(session.getUser()));
+            final Model<String> userModel =
+                new Model<String>(session.getUserDisplay());
+            usernameLabel.setDefaultModel(userModel);
             super.onBeforeRender();
         }