Merge pull request #1 from edquist/SOFTWARE-4751.moate-updates

Updates per Moate (SOFTWARE-4751)

Author: edquist

osg-comanage-project-usermap.py

@@ -17,12 +17,16 @@
 OPTIONS:
   -u USER[:PASS]      specify USER and optionally PASS on command line
   -d passfd           specify open fd to read PASS
+  -f passfile         specify path to file to open and read PASS
   -e ENDPOINT         specify REST endpoint
+  -o outfile          specify output file (default: write to stdout)
+  -h                  display this help text
 
 PASS for USER is taken from the first of:
   1. -u USER:PASS
   2. -d passfd (read from fd)
-  3. read from $PASS env var
+  3. -f passfile (read from file)
+  4. read from $PASS env var
 
 ENDPOINT defaults to {ENDPOINT}
 """
@@ -39,17 +43,20 @@ def usage(msg=None):
 class Options:
     endpoint = ENDPOINT
     user = "co_8.project_script"
+    outfile = None
     authstr = None
 
 
 options = Options()
 
 
-def getpw(user, passfd=None):
+def getpw(user, passfd, passfile):
     if ':' in user:
         user, pw = user.split(':', 1)
     elif passfd is not None:
         pw = os.fdopen(passfd).readline().rstrip('\n')
+    elif passfile is not None:
+        pw = open(passfile).readline().rstrip('\n')
     elif 'PASS' in os.environ:
         pw = os.environ['PASS']
     else:
@@ -64,7 +71,7 @@ def mkauthstr(user, passwd):
 
 
 def mkrequest(target, **kw):
-    url = options.endpoint + target
+    url = os.path.join(options.endpoint, target)
     if kw:
         url += "?" + "&".join( "{}={}".format(k,v) for k,v in kw.items() )
     req = urllib.request.Request(url)
@@ -131,17 +138,27 @@ def get_co_person_osguser(pid):
 
 
 def parse_options(args):
-    ops, args = getopt.getopt(args, 'u:d:')
-    ops = dict(ops)
+    try:
+        ops, args = getopt.getopt(args, 'u:d:f:e:o:h')
+    except getopt.GetoptError:
+        usage()
+
+    if args:
+        usage("Extra arguments: %s" % repr(args))
 
     passfd = None
+    passfile = None
 
-    if '-u' in ops: options.user     =     ops['-u']
-    if '-d' in ops: passfd           = int(ops['-d'])
-    if '-e' in ops: options.endpoint =     ops['-e']
+    for op, arg in ops:
+        if op == '-h': usage()
+        if op == '-u': options.user     = arg
+        if op == '-d': passfd           = int(arg)
+        if op == '-f': passfile         = arg
+        if op == '-e': options.endpoint = arg
+        if op == '-o': options.outfile  = arg
 
-    options.user, passwd = getpw(options.user, passfd)
-    options.authstr = mkauthstr(options.user, passwd)
+    user, passwd = getpw(options.user, passfd, passfile)
+    options.authstr = mkauthstr(user, passwd)
 
 
 def gid_pids_to_osguser_pid_gids(gid_pids, pid_osguser):
@@ -167,9 +184,17 @@ def get_osguser_groups():
              for pid, gids in pid_gids.items() }
 
 
-def print_usermap(osguser_groups):
+def print_usermap_to_file(osguser_groups, file):
     for osguser, groups in osguser_groups.items():
-        print("* {} {}".format(osguser, ",".join(groups)))
+        print("* {} {}".format(osguser, ",".join(groups)), file=file)
+
+
+def print_usermap(osguser_groups):
+    if options.outfile:
+        with open(options.outfile, "w") as w:
+            print_usermap_to_file(osguser_groups, w)
+    else:
+        print_usermap_to_file(osguser_groups, sys.stdout)
 
 
 def main(args):