feature completed and tested

This commit is contained in:
Massimiliano Assante 2020-07-03 14:21:30 +02:00
parent 7445f29213
commit d30760d144
1 changed files with 7 additions and 1 deletions

View File

@ -102,8 +102,10 @@ public class LDAPSync implements Runnable {
DirContext ctx = new InitialDirContext(env); DirContext ctx = new InitialDirContext(env);
_log.debug("Initiating LDAP Sync ..."); _log.debug("Initiating LDAP Sync ...");
createUsersOrganizationalUnit(ctx); createUsersOrganizationalUnit(ctx);
//update the users list //update the users list
exportSingleUsers(ctx, env, users); exportSingleUsers(ctx, env, users);
//crate or update the whole list of organizations (objectClass=organizationalUnit, ou="+orgName+",dc=d4science,dc=org) and groups ( objectClass=top and POSIXGroup) //crate or update the whole list of organizations (objectClass=organizationalUnit, ou="+orgName+",dc=d4science,dc=org) and groups ( objectClass=top and POSIXGroup)
updateGroups(ctx, rootVO); updateGroups(ctx, rootVO);
} catch (NamingException e) { } catch (NamingException e) {
@ -132,6 +134,8 @@ public class LDAPSync implements Runnable {
attributes.put(description); attributes.put(description);
// private static final String USER_CONTEXT = ","; // private static final String USER_CONTEXT = ",";
ctx.createSubcontext("ou=Organizations,dc=d4science,dc=org", attributes); ctx.createSubcontext("ou=Organizations,dc=d4science,dc=org", attributes);
_log.info("organizationalUnit \"ou=Organizations,dc=d4science,dc=org\" created");
attributes = new BasicAttributes(); attributes = new BasicAttributes();
objectClass = new BasicAttribute("objectClass"); objectClass = new BasicAttribute("objectClass");
@ -139,6 +143,7 @@ public class LDAPSync implements Runnable {
attributes.put(objectClass); attributes.put(objectClass);
description.add("Default Organization"); description.add("Default Organization");
ctx.createSubcontext("o=D4Science,ou=Organizations,dc=d4science,dc=org", attributes); ctx.createSubcontext("o=D4Science,ou=Organizations,dc=d4science,dc=org", attributes);
_log.info("organizationalUnit \"o=D4Science,ou=Organizations,dc=d4science,dc=org\" created");
attributes = new BasicAttributes(); attributes = new BasicAttributes();
objectClass = new BasicAttribute("objectClass"); objectClass = new BasicAttribute("objectClass");
@ -146,6 +151,7 @@ public class LDAPSync implements Runnable {
attributes.put(objectClass); attributes.put(objectClass);
description.add("People Org Unit"); description.add("People Org Unit");
ctx.createSubcontext("ou=People,o=D4Science,ou=Organizations,dc=d4science,dc=org", attributes); ctx.createSubcontext("ou=People,o=D4Science,ou=Organizations,dc=d4science,dc=org", attributes);
_log.info("organizationalUnit \"ou=People,o=D4Science,ou=Organizations,dc=d4science,dc=org\" created");
} }
else else
_log.info("ou=Organizations,dc=d4science,dc=org already present, skip"); _log.info("ou=Organizations,dc=d4science,dc=org already present, skip");
@ -203,7 +209,7 @@ public class LDAPSync implements Runnable {
_log.info("Adding user as memberUid: " + user ); _log.info("Adding user as memberUid: " + user );
Attribute member = new BasicAttribute("member"); Attribute member = new BasicAttribute("member");
member.add("uid="+user+","+vreSubCtx); member.add(getSubContext(user));
Attributes attributes2 = new BasicAttributes(); Attributes attributes2 = new BasicAttributes();
attributes2.put(member); attributes2.put(member);
ctx.modifyAttributes(vreSubCtx, DirContext.ADD_ATTRIBUTE, attributes2); ctx.modifyAttributes(vreSubCtx, DirContext.ADD_ATTRIBUTE, attributes2);