Changeset 5974

Timestamp:

02/12/15 14:53:18 (9 years ago)

Author:

Twan Goosen

Message:

also report as unauthenticated when current user is 'anonymous' (in case of shib)

File:

• ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/AuthenticationRestService.java (modified) (4 diffs)

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/AuthenticationRestService.java

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.AuthenticationRequiredException;
-import clarin.cmdi.componentregistry.Configuration;
+import clarin.cmdi.componentregistry.ComponentRegistryFactory;
 import clarin.cmdi.componentregistry.UserCredentials;
 import clarin.cmdi.componentregistry.impl.database.ValidationException;
@@ -38 +38 @@
 
     private final Logger logger = LoggerFactory.getLogger(AuthenticationRestService.class);
-    
+
     @Context
     private SecurityContext security;
     @Context
     private UriInfo uriInfo;
-    
+
     @GET
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@@ -50 +50 @@
         final Principal userPrincipal = security.getUserPrincipal();
 
-        if (userPrincipal == null) {
+        if (userPrincipal == null || ComponentRegistryFactory.ANONYMOUS_USER.equals(userPrincipal.getName())) {
             return new AuthenticationInfo(false);
         } else {
@@ -65 +65 @@
     public Response triggerAuthenticationRequest() {
         logger.debug("Client has triggered authentication request");
-        
+
         //done - redirect to front end
         final URI frontEndUri = uriInfo.getBaseUri().resolve("..");