From 5dd40b61a2349da5aa6bc9b9d31149e63d54b8e3 Mon Sep 17 00:00:00 2001 From: "Bala.FA" Date: Fri, 5 Aug 2011 12:54:14 +0530 Subject: 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 --- .../src/add_user_cifs.py | 39 ++++++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) (limited to 'src/com.gluster.storage.management.gateway.scripts') 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) -- cgit From ff5573dab24e504247f16c28a41f17f94e731e55 Mon Sep 17 00:00:00 2001 From: "Bala.FA" Date: Fri, 5 Aug 2011 14:19:43 +0530 Subject: Added update_volume_cifs_all.py and update_volume_cifs.py Signed-off-by: Bala.FA --- .../src/update_volume_cifs.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 src/com.gluster.storage.management.gateway.scripts/src/update_volume_cifs.py (limited to 'src/com.gluster.storage.management.gateway.scripts') diff --git a/src/com.gluster.storage.management.gateway.scripts/src/update_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/update_volume_cifs.py new file mode 100755 index 00000000..d1d0f85f --- /dev/null +++ b/src/com.gluster.storage.management.gateway.scripts/src/update_volume_cifs.py @@ -0,0 +1,35 @@ +#!/usr/bin/python +# Copyright (C) 2011 Gluster, Inc. +# This file is part of Gluster Management Gateway. +# + +import os +import sys +p1 = os.path.abspath(os.path.dirname(sys.argv[0])) +p2 = "%s/common" % os.path.dirname(p1) +if not p1 in sys.path: + sys.path.append(p1) +if not p2 in sys.path: + sys.path.append(p2) +import Globals +import Utils +import VolumeUtils + +def main(): + if len(sys.argv) < 3: + sys.stderr.write("usage: %s VOLUME_NAME USER1 USER2 ...\n" % os.path.basename(sys.argv[0])) + sys.exit(-1) + + volumeName = sys.argv[1] + userList = sys.argv[2:] + + if not VolumeUtils.writeVolumeCifsConfiguration(volumeName, userList): + sys.exit(1) + if Utils.runCommand("service smb reload") != 0: + Utils.log("Failed to reload smb service") + sys.exit(2) + sys.exit(0) + + +if __name__ == "__main__": + main() -- cgit