Initial support for Groups

Create separate object for Users and Groups (using same base class)
Check for uniqueness before adding new users and groups
Remove user_container from everything but add operations
Abstract out a number of functions that are common across users and groups
Make sure all strings passed in to be in a filter are checked
Add new error message: No modifications specified

5 files changed, 275 insertions, 1 deletions

diff --git a/ipa-admintools/ipa-addgroup b/ipa-admintools/ipa-addgroup
new file mode 100644
index 000000000..f590f5796
--- /dev/null
+++ b/ipa-admintools/ipa-addgroup
@@ -0,0 +1,83 @@
+#! /usr/bin/python -E
+# Authors: Rob Crittenden <rcritten@redhat.com>
+#
+# Copyright (C) 2007  Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+import sys
+from optparse import OptionParser
+import ipa
+import ipa.group
+import ipa.ipaclient as ipaclient
+import ipa.config
+import ipa.ipaerror
+
+import xmlrpclib
+import kerberos
+import ldap
+
+def usage():
+    print "ipa-addgroup [-d|--description STRING] group"
+    sys.exit(1)
+
+def parse_options():
+    parser = OptionParser()
+    parser.add_option("-d", "--description", dest="desc",
+                      help="A description of this group")
+    parser.add_option("-g", "--gid", dest="gid",
+                      help="The gid to use for this group. If not included one is automatically set.")
+    parser.add_option("--usage", action="store_true",
+                      help="Program usage")
+
+    args = ipa.config.init_config(sys.argv)
+    options, args = parser.parse_args(args)
+
+    return options, args
+
+def main():
+    group=ipa.group.Group()
+    options, args = parse_options()
+
+    if len(args) != 2:
+        usage()
+
+    group.setValue('cn', args[1])
+    if options.desc:
+        group.setValue('description', options.desc)
+    if options.gid:
+        group.setValue('gidnumber', options.gid)
+
+    try:
+        client = ipaclient.IPAClient()
+        client.add_group(group)
+        print args[1] + " successfully added"
+    except xmlrpclib.Fault, f:
+        print f.faultString
+        return 1
+    except kerberos.GSSError, e:
+        print "Could not initialize GSSAPI: %s/%s" % (e[0][0][0], e[0][1][0])
+        return 1
+    except xmlrpclib.ProtocolError, e:
+        print "Unable to connect to IPA server: %s" % (e.errmsg)
+        return 1
+    except ipa.ipaerror.IPAError, e:
+        print "%s" % (e.message)
+        return 1
+
+    return 0
+
+main()
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser
index d2969036d..99aadee40 100644
--- a/ipa-admintools/ipa-adduser
+++ b/ipa-admintools/ipa-adduser
@@ -88,6 +88,9 @@ def main():
     except xmlrpclib.ProtocolError, e:
         print "Unable to connect to IPA server: %s" % (e.errmsg)
         return 1
+    except ipa.ipaerror.IPAError, e:
+        print "%s" % (e.message)
+        return 1
 
     return 0
 
diff --git a/ipa-admintools/ipa-findgroup b/ipa-admintools/ipa-findgroup
new file mode 100644
index 000000000..43171e424
--- /dev/null
+++ b/ipa-admintools/ipa-findgroup
@@ -0,0 +1,85 @@
+#! /usr/bin/python -E
+# Authors: Rob Crittenden <rcritten@redhat.com>
+#
+# Copyright (C) 2007  Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+import sys
+from optparse import OptionParser
+import ipa.ipaclient as ipaclient
+import ipa.config
+
+import sys
+import xmlrpclib
+import kerberos
+
+def usage():
+    print "ipa-findgroup <uid>"
+    sys.exit()
+
+def parse_options():
+    parser = OptionParser()
+
+    args = ipa.config.init_config(sys.argv)
+    options, args = parser.parse_args(args)
+
+    return options, args
+
+def main():
+    group={}
+    options, args = parse_options()
+
+    if len(args) != 2:
+        usage()
+
+    try:
+        client = ipaclient.IPAClient()
+        groups = client.find_groups(args[1])
+
+        if len(groups) == 0:
+            print "No entries found for", args[1]
+            return 0
+
+        for ent in groups:
+            attr = ent.attrList()
+
+            print "dn: " + ent.dn
+
+            for a in attr:
+                value = ent.getValues(a)
+                if isinstance(value,str):
+                    print a + ": " + value
+                else:
+                    print a + ": "
+                    for l in value:
+                        print "\t" +  l
+            # blank line between results
+            print 
+
+    except xmlrpclib.Fault, fault:
+        print fault.faultString
+        return 1
+    except kerberos.GSSError, e:
+        print "Could not initialize GSSAPI: %s/%s" % (e[0][0][0], e[0][1][0])
+        return 1
+    except xmlrpclib.ProtocolError, e:
+        print "Unable to connect to IPA server: %s" % (e.errmsg)
+        return 1
+
+    return 0
+
+main()
diff --git a/ipa-admintools/ipa-groupmod b/ipa-admintools/ipa-groupmod
new file mode 100644
index 000000000..eea96b43a
--- /dev/null
+++ b/ipa-admintools/ipa-groupmod
@@ -0,0 +1,99 @@
+#! /usr/bin/python -E
+# Authors: Rob Crittenden <rcritten@redhat.com>
+#
+# Copyright (C) 2007  Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+import sys
+from optparse import OptionParser
+import ipa
+import ipa.group
+import ipa.ipaclient as ipaclient
+import ipa.config
+import ipa.ipaerror
+
+import xmlrpclib
+import kerberos
+import ldap
+
+def usage():
+    print "ipa-groupmod [-a] [-r] user group"
+    print "ipa-groupmod [-d|--desc description STRING] group"
+    sys.exit(1)
+
+def parse_options():
+    parser = OptionParser()
+    parser.add_option("-a", "--add", dest="add", action="store_true",
+                      help="Add a user to the group")
+    parser.add_option("-r", "--remove", dest="remove", action="store_true",
+                      help="Remove a user from the group")
+    parser.add_option("-d", "--description", dest="desc", 
+                      help="Modify the description of the group")
+    parser.add_option("--usage", action="store_true",
+                      help="Program usage")
+
+    args = ipa.config.init_config(sys.argv)
+    options, args = parser.parse_args(args)
+
+    if (not options.add and not options.remove) and (not options.desc):
+        usage()
+
+    return options, args
+
+def main():
+    group=ipa.group.Group()
+    options, args = parse_options()
+
+    print "len = ", len(args)
+    if (options.add or options.remove) and (len(args) != 3):
+        usage()
+    if (options.desc and (len(args) != 2)):
+        usage()
+
+    try:
+        client = ipaclient.IPAClient()
+        if options.add:
+            client.add_user_to_group(args[1], args[2])
+            print args[1] + " successfully added"
+        elif options.remove:
+            client.remove_user_from_group(args[1], args[2])
+            print args[1] + " successfully removed"
+        elif options.desc:
+            try:
+                group = client.get_group_by_cn(args[1])
+            except ipa.ipaerror.IPAError, e:
+                print "%s" % e.message
+                return 1
+            group.setValue('description', options.desc)
+            client.update_group(group)
+            print args[1] + " successfully updated"
+    except xmlrpclib.Fault, f:
+        print f.faultString
+        return 1
+    except kerberos.GSSError, e:
+        print "Could not initialize GSSAPI: %s/%s" % (e[0][0][0], e[0][1][0])
+        return 1
+    except xmlrpclib.ProtocolError, e:
+        print "Unable to connect to IPA server: %s" % (e.errmsg)
+        return 1
+    except ipa.ipaerror.IPAError, e:
+        print "%s" % (e.message)
+        return 1
+
+    return 0
+
+main()
diff --git a/ipa-admintools/ipa-usermod b/ipa-admintools/ipa-usermod
index 3c9f8adc0..0c61f4097 100644
--- a/ipa-admintools/ipa-usermod
+++ b/ipa-admintools/ipa-usermod
@@ -54,7 +54,11 @@ def main():
         usage()
 
     client = ipaclient.IPAClient()
-    user = client.get_user_by_uid(args[1])
+    try:
+        user = client.get_user_by_uid(args[1])
+    except ipa.ipaerror.IPAError, e:
+        print "%s" % e.message
+        return 1
 
     if options.gecos:
         user.setValue('gecos', options.gecos)