Group lookup correction; pulled version to 1.0.2

Signed-off-by: dwimberger <[email protected]>

Author: dwimberger

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.wimpi.crowd.ldap</groupId>
     <artifactId>crowd-ldap-server</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Crowd-LDAP-Server</name>

run.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-JAR=target/crowd-ldap-server-1.0-SNAPSHOT.jar
+JAR=target/crowd-ldap-server-1.0.2-SNAPSHOT.jar
 
 # Apache DS Settings
 FIXADS="-Duser.language=en -Duser.country=US"

src/main/java/net/wimpi/crowd/ldap/CrowdPartition.java

@@ -264,12 +264,18 @@ public boolean hasEntry(EntryOperationContext ctx) throws UserNotFoundException,
           log.error("hasEntry()", ex);
         }
         log.debug("Prefix=" + prefix);
-        if (isCrowdGroups(prefix) || isCrowdUsers(prefix)) {
+        if (isCrowdUsers(prefix)) {
           RDN rdn = dn.getRdn(2);
           String user = rdn.getNormValue();
           log.debug("user=" + user);
           ServerEntry userEntry = createUserEntry(dn);
           return (userEntry != null);
+        } else if(isCrowdGroups(prefix)) {
+          RDN rdn = dn.getRdn(2);
+          String group = rdn.getNormValue();
+          log.debug("group=" + group);
+          ServerEntry groupEntry = createGroupEntry(dn);
+          return (groupEntry != null);        
         } else {
           log.debug("Prefix is neither users nor groups");
           log.debug("Crowd Users = " + m_CrowdUsersEntry.getDn());

testAuth.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
-USER_UID=<Crowd user>
+USER_UID=$1
+GROUP_ID=$2
 ldapsearch -v -x -D 'uid='${USER_UID}',ou=users,dc=crowd' -W -H ldap://localhost:10389 -b ou=users,dc=crowd uid=${USER_UID}
+ldapsearch -WxD "uid=${USER_UID},ou=users,dc=crowd" -H ldap://localhost:10389 -b "dn=${GROUP_ID},ou=groups,dc=crowd"