add_user_cifs_all.py and add_user_cifs.py support to ignore existing user on given server list. This enables password reset and adding user to newly added servers on existing storage clusters.

Signed-off-by: Bala.FA <bala@gluster.com>

2 files changed, 55 insertions, 15 deletions

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py
index 48888744..2bff2a06 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py
@@ -11,6 +11,8 @@ if not p1 in sys.path:
     sys.path.append(p1)
 if not p2 in sys.path:
     sys.path.append(p2)
+import grp
+import pwd
 import Globals
 import Utils
 
@@ -19,23 +21,38 @@ def main():
         sys.stderr.write("usage: %s UID USERNAME PASSWORD\n" % os.path.basename(sys.argv[0]))
         sys.exit(-1)
 
-    uid = sys.argv[1]
+    try:
+        uid = int(sys.argv[1])
+    except ValueError, e:
+        sys.stderr.write("invalid uid %s\n" % sys.argv[1])
+        sys.exit(-2)
     userName = sys.argv[2]
     password = sys.argv[3]
 
-    if Utils.runCommand("groupadd -g %s %s" % (uid, userName)) != 0:
-        Utils.log("failed to add group gid:%s, name:%s\n" % (uid, userName))
-        sys.exit(1)
-
-    command = ["useradd", "-c", Globals.VOLUME_USER_DESCRIPTION, "-M", "-d", "/", "-s", "/sbin/nologin", "-u", uid, "-g", uid, userName]
-    if Utils.runCommand(command) != 0:
-        Utils.log("failed to add user uid:%s, name:%s\n" % (uid, userName))
-        sys.exit(2)
+    try:
+        groupInfo = grp.getgrnam(userName)
+        if uid != groupInfo.gr_gid:
+            Utils.log("group %s exists with different gid %s\n" % (userName, groupInfo.gr_gid))
+            sys.exit(1)
+    except KeyError, e:
+        if Utils.runCommand("groupadd -g %s %s" % (uid, userName)) != 0:
+            Utils.log("failed to add group %s gid %s\n" % (username, uid))
+            sys.exit(2)
+    try:
+        userInfo = pwd.getpwnam(userName)
+        if uid != userInfo.pw_uid:
+            Utils.log("user %s exists with different uid %s\n" % (userName, userInfo.pw_uid))
+            sys.exit(3)
+    except KeyError, e:
+        command = ["useradd", "-c", Globals.VOLUME_USER_DESCRIPTION, "-M", "-d", "/", "-s", "/sbin/nologin", "-u", str(uid), "-g", str(uid), userName]
+        if Utils.runCommand(command) != 0:
+            Utils.log("failed to add user %s uid %s\n" % (userName, uid))
+            sys.exit(4)
 
     if Utils.runCommand("smbpasswd -s -a %s" % userName,
                   input="%s\n%s\n" % (password, password)) != 0:
-        Utils.log("failed to set smbpassword of user uid:%s, name:%s\n" % (uid, userName))
-        sys.exit(3)
+        Utils.log("failed to set smbpassword of user %s\n" %  userName)
+        sys.exit(5)
     sys.exit(0)
 
 
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
index 02855cd7..f1e899ec 100755
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
@@ -18,6 +18,22 @@ defaultUid = 1024000
 cifsUserFile = "/opt/glustermg/etc/users.cifs"
 
 
+def getUid(userName):
+    try:
+        fp = open(cifsUserFile)
+        content = fp.read()
+        fp.close()
+    except IOError, e:
+        Utils.log("failed to read file %s: %s" % (cifsUserFile, str(e)))
+        return False
+
+    for line in content.strip().split():
+        tokens = line.split(":")
+        if tokens[1] == UserName:
+            return int(tokens[0])
+    return None
+
+
 def getLastUid():
     if not os.path.exists(cifsUserFile):
         return defaultUid
@@ -55,13 +71,20 @@ def main():
     userName = sys.argv[2]
     password = sys.argv[3]
 
-    uid = getLastUid()
+    existingUser = False
+    uid = getUid(userName)
     if not uid:
-        sys.exit(10)
-
-    uid += 1
+        uid = getLastUid()
+        if not uid:
+            sys.exit(10)
+        uid += 1
+    else:
+        existingUser = True
 
     rv = Utils.runCommand("grun.py %s add_user_cifs.py %s %s %s" % (serverFile, uid, userName, password))
+    if existingUser:
+        sys.exit(rv)
+
     if rv == 0:
         if not setUid(uid, userName):
             sys.exit(11)