Introduce Argeo user edition

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / core / ArgeoUserDetails.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
index a018826f844939b8ce53e4b74d0250f8ca23fef2..1785357d589a253af76012de5ca29fc11a03fe97 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
@@ -1,29 +1,51 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.security.core;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.security.ArgeoUser;
-import org.argeo.security.BasicArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
 import org.argeo.security.UserNature;
+import org.argeo.security.nature.SimpleUserNature;
 import org.springframework.security.Authentication;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;
 
 public class ArgeoUserDetails extends User implements ArgeoUser {
        private static final long serialVersionUID = 1L;
+       private final static Log log = LogFactory.getLog(ArgeoUserDetails.class);
 
-       private final List<UserNature> userNatures;
+       private final Map<String, UserNature> userNatures;
        private final List<String> roles;
 
-       public ArgeoUserDetails(String username, List<UserNature> userNatures,
-                       String password, GrantedAuthority[] authorities)
-                       throws IllegalArgumentException {
+       public ArgeoUserDetails(String username,
+                       Map<String, UserNature> userNatures, String password,
+                       GrantedAuthority[] authorities) throws IllegalArgumentException {
                super(username, password, true, true, true, true, authorities);
-               this.userNatures = Collections.unmodifiableList(userNatures);
+               this.userNatures = Collections.unmodifiableMap(userNatures);
 
                // Roles
                this.roles = Collections.unmodifiableList(addAuthoritiesToRoles(
@@ -35,16 +57,21 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
                                .getPassword(), rolesToAuthorities(argeoUser.getRoles()));
        }
 
-       public List<UserNature> getUserNatures() {
+       public Map<String, UserNature> getUserNatures() {
                return userNatures;
        }
 
+       public void updateUserNatures(Map<String, UserNature> userNaturesData) {
+               SimpleArgeoUser
+                               .updateUserNaturesWithCheck(userNatures, userNaturesData);
+       }
+
        public List<String> getRoles() {
                return roles;
        }
 
        /** The provided list, for chaining using {@link Collections} */
-       protected static List<String> addAuthoritiesToRoles(
+       public static List<String> addAuthoritiesToRoles(
                        GrantedAuthority[] authorities, List<String> roles) {
                for (GrantedAuthority authority : authorities) {
                        roles.add(authority.getAuthority());
@@ -52,35 +79,52 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
                return roles;
        }
 
-       protected static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
+       public static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
                GrantedAuthority[] arr = new GrantedAuthority[roles.size()];
                for (int i = 0; i < roles.size(); i++) {
-                       arr[i] = new GrantedAuthorityImpl(roles.get(i));
+                       String role = roles.get(i);
+                       if (log.isTraceEnabled())
+                               log.debug("Convert role " + role + " to authority (i=" + i
+                                               + ")");
+                       arr[i] = new GrantedAuthorityImpl(role);
                }
                return arr;
        }
 
-       public static BasicArgeoUser createBasicArgeoUser(UserDetails userDetails) {
+       public static SimpleArgeoUser createSimpleArgeoUser(UserDetails userDetails) {
                if (userDetails instanceof ArgeoUser) {
-                       return new BasicArgeoUser((ArgeoUser) userDetails);
+                       return new SimpleArgeoUser((ArgeoUser) userDetails);
                } else {
-                       BasicArgeoUser argeoUser = new BasicArgeoUser();
+                       SimpleArgeoUser argeoUser = new SimpleArgeoUser();
                        argeoUser.setUsername(userDetails.getUsername());
-                       addAuthoritiesToRoles(userDetails.getAuthorities(), argeoUser
-                                       .getRoles());
+                       addAuthoritiesToRoles(userDetails.getAuthorities(),
+                                       argeoUser.getRoles());
                        return argeoUser;
                }
        }
 
+       /** Creates an argeo user based on spring authentication */
        public static ArgeoUser asArgeoUser(Authentication authentication) {
+               if (authentication == null)
+                       return null;
+
                if (authentication.getPrincipal() instanceof ArgeoUser) {
-                       return (ArgeoUser) authentication.getPrincipal();
+                       return new SimpleArgeoUser(
+                                       (ArgeoUser) authentication.getPrincipal());
                } else {
-                       BasicArgeoUser argeoUser = new BasicArgeoUser();
+                       SimpleArgeoUser argeoUser = new SimpleArgeoUser();
                        argeoUser.setUsername(authentication.getName());
-                       addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
-                                       .getRoles());
+                       addAuthoritiesToRoles(authentication.getAuthorities(),
+                                       argeoUser.getRoles());
                        return argeoUser;
                }
        }
+
+       /** The Spring security context as an argeo user */
+       public static ArgeoUser securityContextUser() {
+               Authentication authentication = SecurityContextHolder.getContext()
+                               .getAuthentication();
+               ArgeoUser argeoUser = ArgeoUserDetails.asArgeoUser(authentication);
+               return argeoUser;
+       }
 }