Change user and group validators to match shadow-utils

This sets the regex to [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?

Also change the validators to return True/False

450613, 457124

4 files changed, 19 insertions, 14 deletions

diff --git a/ipa-admintools/ipa-addgroup b/ipa-admintools/ipa-addgroup
index cc813836c..d99d588b8 100644
--- a/ipa-admintools/ipa-addgroup
+++ b/ipa-admintools/ipa-addgroup
@@ -27,6 +27,7 @@ try:
     import ipa.ipautil as ipautil
     import ipa.config
     import ipa.ipaerror
+    import ipa.ipaadminutil as ipaadminutil
 
     import xmlrpclib
     import kerberos
@@ -82,18 +83,20 @@ def main():
         usage()
 
     if (len(args) != 2):
-        cn = ipautil.user_input("Group name", allow_empty = False)
+        cn = ipautil.user_input_name("Group name")
     else:
         cn = args[1]
-        if (ipavalidate.String(cn, notEmpty=True)):
-            print "Please enter a value"
+        try:
+            ipaadminutil.check_name(cn)
+        except ValueError, e:
+            print "Group name " + str(e)
             return 1
 
     if not options.desc:
         desc = ipautil.user_input("Description", allow_empty = False)
     else:
         desc = options.desc
-        if (ipavalidate.String(desc, notEmpty=True)):
+        if (not ipavalidate.String(desc, notEmpty=True)):
             print "Please enter a value"
             return 1
 
diff --git a/ipa-admintools/ipa-addservice b/ipa-admintools/ipa-addservice
index ddf75a808..29d0bb966 100644
--- a/ipa-admintools/ipa-addservice
+++ b/ipa-admintools/ipa-addservice
@@ -23,7 +23,6 @@ try:
     import ipa
     import ipa.user
     import ipa.ipaclient as ipaclient
-    import ipa.ipavalidate as ipavalidate
     import ipa.ipautil as ipautil
     import ipa.config
 
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser
index 17c75edf8..9db45166d 100644
--- a/ipa-admintools/ipa-adduser
+++ b/ipa-admintools/ipa-adduser
@@ -26,6 +26,7 @@ try:
     import ipa.ipavalidate as ipavalidate
     import ipa.ipautil as ipautil
     import ipa.config
+    import ipa.ipaadminutil as ipaadminutil
 
     import xmlrpclib
     import kerberos
@@ -118,7 +119,7 @@ def main():
         givenname = ipautil.user_input("First name", allow_empty = False)
     else:
         givenname = options.gn
-        if (ipavalidate.String(givenname, notEmpty=True)):
+        if (not ipavalidate.String(givenname, notEmpty=True)):
             print "Please enter a value"
             return 1
 
@@ -126,16 +127,18 @@ def main():
         lastname = ipautil.user_input("Last name", allow_empty = False)
     else:
         lastname = options.sn
-        if (ipavalidate.String(lastname, notEmpty=True)):
+        if (not ipavalidate.String(lastname, notEmpty=True)):
             print "Please enter a value"
             return 1
 
     if (len(args) != 2):
-        username = ipautil.user_input_plain("Login name", allow_empty = False, allow_spaces = False)
+        username = ipautil.user_input_name("Login name")
     else:
         username = args[1]
-        if (ipavalidate.Plain(username, notEmpty=True, allowSpaces=False)):
-            print "Username is required and may only include letters and numbers"
+        try:
+            ipaadminutil.check_name(username)
+        except ValueError, e:
+            print "Login name " + str(e)
             return 1
 
     if options.password_prompt:
@@ -155,7 +158,7 @@ def main():
 
     if options.mail:
         mail = options.mail
-        if (ipavalidate.Email(mail)):
+        if (not ipavalidate.Email(mail)):
             print "The email provided seem not a valid email."
             return 1
 
diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser
index 4b3bd5c9c..4ea40632e 100644
--- a/ipa-admintools/ipa-moduser
+++ b/ipa-admintools/ipa-moduser
@@ -143,7 +143,7 @@ def main():
             givenname = ipautil.user_input("First name", user.getValue('givenname'), allow_empty = False)
         else:
             givenname = options.gn
-            if (ipavalidate.String(givenname, notEmpty=True)):
+            if (not ipavalidate.String(givenname, notEmpty=True)):
                 print "Please enter a value"
                 return 1
 
@@ -151,7 +151,7 @@ def main():
             lastname = ipautil.user_input("Last name", user.getValue('sn'), allow_empty = False)
         else:
             lastname = options.sn
-            if (ipavalidate.String(lastname, notEmpty=True)):
+            if (not ipavalidate.String(lastname, notEmpty=True)):
                 print "Please enter a value"
                 return 1
 
@@ -159,7 +159,7 @@ def main():
             mail = ipautil.user_input_email("E-mail address", user.getValue('mail'), allow_empty = True)
         else:
             mail = options.mail
-            if (ipavalidate.Email(mail)):
+            if (not ipavalidate.Email(mail)):
                 print "E-mail must include a user and domain name"
                 return 1