Introduce Argeo 2 security model-

[lgpl/argeo-commons.git] / org.argeo.security.core / src / org / argeo / osgi / useradmin / LdifAuthorization.java

diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifAuthorization.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifAuthorization.java
index 4ae2434b4ceb24381d0eac5ec4063710bfe80e53..8f167c3683c58f7e7537194f50b14881cd6aaae9 100644 (file)
--- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifAuthorization.java
+++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifAuthorization.java
@@ -15,6 +15,8 @@ public class LdifAuthorization implements Authorization {
 
        @Override
        public String getName() {
+               if (user == null)
+                       return null;
                return user.getName();
        }
 
@@ -30,16 +32,20 @@ public class LdifAuthorization implements Authorization {
        @Override
        public String[] getRoles() {
                List<Role> allRoles = getAllRoles();
-               String[] res = new String[allRoles.size() + 1];
-               res[0] = user.getName();
+               if (user != null)
+                       allRoles.add(0, user);
+               String[] res = new String[allRoles.size()];
                for (int i = 0; i < allRoles.size(); i++)
-                       res[i + 1] = allRoles.get(i).getName();
+                       res[i] = allRoles.get(i).getName();
                return res;
        }
 
        List<Role> getAllRoles() {
                List<Role> allRoles = new ArrayList<Role>();
-               collectRoles(user, allRoles);
+               if (user != null)
+                       collectRoles(user, allRoles);
+               else
+                       collectAnonymousRoles(allRoles);
                return allRoles;
        }
 
@@ -51,4 +57,8 @@ public class LdifAuthorization implements Authorization {
                }
        }
 
+       private void collectAnonymousRoles(List<Role> allRoles) {
+               // TODO gather anonymous roles
+       }
+
 }