Changeset 5472

Timestamp:

07/10/14 09:23:47 (10 years ago)

Author:

Twan Goosen

Message:

aai: getting display name from a shibboleth authprincipal, fixed the login link; removed the deprecated auth filter and strategies

Location:

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

Files:

• ApplicationSession.java (modified) (4 diffs)
• auth (deleted)
• pages/AuthenticationStatePanel.java (modified) (4 diffs)
• pages/DummyLoginPage.java (added)

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

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui;
 
+import de.mpg.aai.shhaa.model.AuthAttribute;
+import de.mpg.aai.shhaa.model.AuthPrincipal;
 import java.security.Principal;
 import java.util.regex.Pattern;
-
 import org.apache.wicket.Request;
 import org.apache.wicket.authentication.AuthenticatedWebSession;
 import org.apache.wicket.authorization.strategies.role.Roles;
-
-import eu.clarin.cmdi.virtualcollectionregistry.gui.auth.AuthPrincipal;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @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 final static Logger logger = LoggerFactory.getLogger(ApplicationSession.class);
+
+    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 String user;
     private boolean isAdmin;
@@ -30 +33 @@
 
     public boolean signIn(Principal principal) {
+        logger.trace("Signing in principal {}", principal);
         boolean result = false;
         if (principal != null) {
@@ -37 +41 @@
                 isAdmin = ((Application) getApplication()).isAdmin(user);
                 userDisplay = findDisplayName(principal);
+                logger.debug("Principal is signed in [user = {}, display name = {}, isAdmin = {}]", user, userDisplay, isAdmin);
             }
         }
@@ -83 +88 @@
 
     private static String findDisplayName(Principal p) {
+        logger.trace("Looking for display name for principal {}", p);
         if (p instanceof AuthPrincipal) {
             final AuthPrincipal principal = (AuthPrincipal) p;
-            for (String attr : ATTRIBUTE_NAMES_NAME ) {
-                String name = principal.getAttibute(attr);
+            for (String attr : ATTRIBUTE_NAMES_NAME) {
+                final String name = getAttribute(principal, attr);
                 if (name != null) {
+                    logger.debug("Display name found for principal: {}", name);
                     return name;
                 }
             }
-            String givenName = principal.getAttibute("givenName");
-            String surname = principal.getAttibute("surname");
+            String givenName = getAttribute(principal, "givenName");
+            String surname = getAttribute(principal, "surname");
             if ((givenName != null) && (surname != null)) {
-                return givenName + " " + surname;
+                final String name = givenName + " " + surname;
+                logger.debug("Display name found for principal: {}", name);
+                return name;
+            }
+        }
+        logger.debug("No display name found for principal");
+        return null;
+    }
+
+    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) {
+            final Object value = attribute.getValue();
+            if (value != null) {
+                logger.trace("Found attribute value: {} = {}", attr, value);
+                return value.toString();
             }
         }

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

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.pages;
 
-import org.apache.wicket.Page;
+import eu.clarin.cmdi.virtualcollectionregistry.gui.ApplicationSession;
 import org.apache.wicket.authentication.AuthenticatedWebSession;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.StatelessLink;
+import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.Model;
-
-import eu.clarin.cmdi.virtualcollectionregistry.gui.ApplicationSession;
 
 @SuppressWarnings("serial")
@@ -22 +20 @@
 
     private class LoginFragment extends Fragment {
+
         public LoginFragment(String id) {
             super(id, "loginFragment", AuthenticationStatePanel.this);
             setRenderBodyOnly(true);
-            final StatelessLink loginLink = new StatelessLink("loginLink") {
+            add(new Link("loginLink") {
+
                 @Override
                 public void onClick() {
+                    setResponsePage(new DummyLoginPage(getPage().getPageReference()));
                 }
-
-                @Override
-                protected CharSequence getURL() {
-                    final Page page = getPage();
-                    StringBuilder url =
-                        new StringBuilder(urlFor(page.getClass(),
-                                page.getPageParameters()));
-                    if (url.indexOf("?") != -1) {
-                        url.append('&');
-                    } else {
-                        url.append('?');
-                    }
-                    url.append("authAction=LOGIN");
-                    return url.toString();
-                }
-            };
-            add(loginLink);
+            });
         }
 
@@ -60 +45 @@
 
     private class LogoutFragment extends Fragment {
+
         private final Label usernameLabel;
 
@@ -84 +70 @@
         protected void onBeforeRender() {
             ApplicationSession session = (ApplicationSession) getSession();
-            final Model<String> userModel =
-                new Model<String>(session.getUserDisplay());
+            final Model<String> userModel
+                    = new Model<String>(session.getUserDisplay());
             usernameLabel.setDefaultModel(userModel);
             super.onBeforeRender();