improved ldap queries for getGroups; added --delete option to command-line GMS client

projects/cadcAccessControl-Server/build.xml

@@ -132,17 +132,17 @@
         </copy>
     </target>
 
-    <!--<target name="test" depends="compile,compile-test,resources">-->
-        <!--<echo message="Running test suite..." />-->
-        <!--<junit printsummary="yes" haltonfailure="yes" fork="yes">-->
-            <!--<classpath>-->
-                <!--<pathelement path="${build}/class"/>-->
-                <!--<pathelement path="${build}/test/class"/>-->
-                <!--<pathelement path="${testingJars}"/>-->
-            <!--</classpath>-->
-            <!--<test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />-->
-            <!--<formatter type="plain" usefile="false" />-->
-        <!--</junit>-->
-    <!--</target>-->
-
+    <!--
+    <target name="group-dao-test" depends="compile,compile-test,resources">
+        <junit printsummary="yes" haltonfailure="yes" fork="yes">
+            <classpath>
+                <pathelement path="${build}/class"/>
+                <pathelement path="${build}/test/class"/>
+                <pathelement path="${testingJars}"/>
+            </classpath>
+            <test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />
+            <formatter type="plain" usefile="false" />
+        </junit>
+    </target>
+    -->
 </project>

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java

@@ -336,6 +336,23 @@ public class ACSearchRunner implements JobRunner
 //            }
         }
         */
+        catch(IllegalArgumentException ex)
+        {
+            logInfo.setSuccess(true);
+            logInfo.setMessage(ex.getMessage());
+            log.debug("FAIL", ex);
+            
+            syncOut.setResponseCode(400);
+            syncOut.setHeader("Content-Type", "text/plain");
+            try
+            {
+                syncOut.getOutputStream().write(ex.getMessage().getBytes());
+            }
+            catch (IOException e)
+            {
+                log.warn("Could not write response to output stream", e);
+            }
+        }
         catch (AccessControlException t)
         {
             logInfo.setSuccess(true);

projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java

@@ -863,18 +863,10 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest
                     getGroupDAO().getGroups(unknownPrincipal, Role.OWNER, 
                                                groupID);
                     fail("searchGroups with unknown user should throw " + 
-                         "UserNotFoundException");
+                         "AccessControlException");
                 }
                 catch (AccessControlException ignore) {}
                 
-                try
-                {
-                    getGroupDAO().getGroups(daoTestPrincipal1, Role.OWNER, 
-                                               "foo");
-                    fail("searchGroups with unknown user should throw " + 
-                         "GroupNotFoundException");
-                }
-                catch (GroupNotFoundException ignore) {}
                 return null;
             }
         });

projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClientMain.java

@@ -103,6 +103,7 @@ public class GMSClientMain implements PrivilegedAction<Object>
     public static final String ARG_ADD_MEMBER = "add-member";
     public static final String ARG_CREATE_GROUP = "create";
     public static final String ARG_GET_GROUP = "get";
+    public static final String ARG_DELETE_GROUP = "delete";
 
     public static final String ARG_USERID = "userid";
     public static final String ARG_GROUP = "group";
@@ -181,6 +182,9 @@ public class GMSClientMain implements PrivilegedAction<Object>
         
         if (argMap.isSet(ARG_GET_GROUP))
             return ARG_GET_GROUP;
+        
+        if (argMap.isSet(ARG_DELETE_GROUP))
+            return ARG_DELETE_GROUP;
 
         throw new IllegalArgumentException("No valid commands");
     }
@@ -190,7 +194,7 @@ public class GMSClientMain implements PrivilegedAction<Object>
         System.out.println("--add-member --group=<g> --userid=<u>");
         System.out.println("--create --group=<g>");
         System.out.println("--get --group=<g>");
-
+        System.out.println("--delete --group=<g>");
     }
 
     @Override
@@ -213,8 +217,7 @@ public class GMSClientMain implements PrivilegedAction<Object>
 
                 client.addUserMember(group, new HttpPrincipal(userID));
             }
-            
-            if (command.equals(ARG_CREATE_GROUP))
+            else if (command.equals(ARG_CREATE_GROUP))
             {
                 String group = argMap.getValue(ARG_GROUP);
                 if (group == null)
@@ -229,8 +232,7 @@ public class GMSClientMain implements PrivilegedAction<Object>
                 g.getUserMembers().add(g.getOwner());
                 client.createGroup(g);
             }
-            
-            if (command.equals(ARG_GET_GROUP))
+            else if (command.equals(ARG_GET_GROUP))
             {
                 String group = argMap.getValue(ARG_GROUP);
                 if (group == null)
@@ -254,6 +256,14 @@ public class GMSClientMain implements PrivilegedAction<Object>
                     System.out.println("member: " + gm);
                 
             }
+            else if (command.equals(ARG_DELETE_GROUP))
+            {
+                String group = argMap.getValue(ARG_GROUP);
+                if (group == null)
+                    throw new IllegalArgumentException("No group specified");
+             
+                client.deleteGroup(group);
+            }
 
             return null;
         }