rda-python-setuid 1.0.7__py3-none-any.whl → 1.0.8__py3-none-any.whl

rda_python_setuid/install.py

@@ -11,8 +11,11 @@
 #    Github: https://github.com/NCAR/rda-python-setuid.git
 #
 # Usage:
+#   # 0. Display this user guide:
+#   pywrapper-install
+#
 #   # 1. Compile and install pywrapper (run once per environment):
-#   pywrapper-install [-u gdexdata] [-e $ENVHOME]
+#   pywrapper-install -c [-u gdexdata] [-e $ENVHOME]
 #
 #   # 2. Create pgstart_USER entry so USER can run commands as themselves:
 #   pywrapper-install -p [-u zji] [-e $ENVHOME]
@@ -65,9 +68,6 @@ def show_usage():
 
 def main():
 
-   if len(sys.argv) == 1:
-      show_usage()
-
    parser = argparse.ArgumentParser(
       description="Compile and install the pywrapper setuid C binary."
    )
@@ -84,6 +84,10 @@ def main():
       help="Simple install: create symlink PROGRAM -> setuid_PROGRAM, skipping setuid (use with -l/--link)"
    )
    group = parser.add_mutually_exclusive_group()
+   group.add_argument(
+      '-c', '--compile', action='store_true',
+      help="Compile pywrapper.c and install bin/pywrapper as a setuid binary (run once per environment)"
+   )
    group.add_argument(
       '-p', '--pgstart', action='store_true',
       help="Create pgstart_USER for running commands as USER (Mode 2)"
@@ -94,6 +98,9 @@ def main():
    )
    args = parser.parse_args()
 
+   if not (args.compile or args.pgstart or args.link):
+      show_usage()
+
    if args.user is None and not args.simple:
       import pwd
       if args.pgstart:
@@ -142,8 +149,8 @@ def main():
       run(['sudo', '-u', args.user, 'chmod', '4750', target])
       print("Installed: {} (setuid, owned by {})".format(target, args.user))
 
-   else:
-      # Default: compile pywrapper.c and install pywrapper with setuid
+   elif args.compile:
+      # Compile pywrapper.c and install pywrapper with setuid
       src = get_c_source()
       src_dest = os.path.join(bindir, 'pywrapper.c')
       shutil.copy(src, src_dest)

rda_python_setuid/install.usg

@@ -2,7 +2,14 @@
  that execute Python scripts as a common or effective user via the setuid mechanism.
  Must be run inside the target Python virtual environment.
 
- Usage: pywrapper-install [-u USER] [-e ENVHOME] [-p | -l PROGRAM [-s]]
+ Usage: pywrapper-install [-u|--user USER] [-e|--envhome ENVHOME]
+                          ( -c|--compile
+                          | -p|--pgstart
+                          | -l|--link PROGRAM [-s|--simple] )
+
+ Run pywrapper-install with no arguments to display this user guide.  Exactly
+ one of -c/--compile, -p/--pgstart, or -l/--link must be given to perform an
+ action.
 
       - Option -u or --user USER
           The user name to own the setuid binary.  For Mode 1 (CommonUser program),
@@ -16,16 +23,22 @@
           Only needed when installing into an environment other than the one
           currently active.
 
+      - Option -c or --compile
+          Compile pywrapper.c (bundled with this package) and install it as
+          bin/pywrapper, owned by USER with chmod 4750 (setuid).  Must be done
+          once per environment before using -p/--pgstart or -l/--link.  Cannot
+          be combined with -p/--pgstart or -l/--link.
+
       - Option -p or --pgstart
           Mode 2: copy the compiled pywrapper binary to pgstart_USER (owned by USER,
           chmod 4750).  Allows USER to run arbitrary commands as themselves via the
-          setuid wrapper.  Cannot be combined with -l/--link.
+          setuid wrapper.  Cannot be combined with -c/--compile or -l/--link.
 
       - Option -l or --link PROGRAM
           Mode 1: create a symlink PROGRAM -> pywrapper in the bin/ directory, then
           lock down setuid_PROGRAM (chmod 700, owned by USER) so users cannot bypass
           the setuid wrapper by running setuid_PROGRAM directly.  Cannot be combined
-          with -p/--pgstart.
+          with -c/--compile or -p/--pgstart.
 
       - Option -s or --simple (use with -l/--link)
           Simple install: create a symlink PROGRAM -> setuid_PROGRAM directly,
@@ -33,11 +46,6 @@
           user with no privilege change.  -u/--user is not required with this option.
           Useful for users who do not need or cannot set up the setuid wrapper.
 
- When run without --pgstart or --link, the default action is to compile pywrapper.c
- (bundled with this package) and install it as bin/pywrapper, owned by USER with
- chmod 4750 (setuid).  This step must be done once per environment before using
- --pgstart or --link.
-
  Convention for wrapped programs:
    Any Python package whose program is to be run via pywrapper must:
 
@@ -99,7 +107,7 @@
          pip install rda_python_dsarch
 
    2. Compile pywrapper (once per environment):
-         pywrapper-install
+         pywrapper-install -c
 
    3. Wire up each program as a setuid entry:
          pywrapper-install -l dsarch
@@ -118,10 +126,10 @@
  Examples:
 
    1. Compile and install pywrapper for common user gdexdata (default):
-         pywrapper-install
+         pywrapper-install -c
 
    2. Same, but targeting a specific environment:
-         pywrapper-install -e /glade/u/home/gdexdata/gdexmsenv
+         pywrapper-install -c -e /glade/u/home/gdexdata/gdexmsenv
 
    3. Wire up dsarch to run as gdexdata via pywrapper:
          pywrapper-install -l dsarch

rda_python_setuid/pywrapper.c

@@ -10,15 +10,15 @@
  *    python -m pip install rda_python_setuid
  *
  *    # Compile pywrapper and set setuid bit (owned by CommonUser):
- *    pywrapper-install [-u CommonUser] [-e $ENVHOME/bin]
+ *    pywrapper-install -c|--compile [-u|--user CommonUser] [-e|--envhome $ENVHOME]
  *
  *    # For an existing python program, $ENVHOME/bin/setuid_CommonProgram, to execute it
  *    # as the common user (Mode 1 - symlink):
- *    pywrapper-install -l CommonProgram [-u CommonUser] [-e $ENVHOME/bin]
+ *    pywrapper-install -l|--link CommonProgram [-u|--user CommonUser] [-e|--envhome $ENVHOME]
  *    CommonProgram [options]
  *
  *    # For a specialist to run commands as themselves via pgstart (Mode 2):
- *    pywrapper-install -p [-u EffectUser] [-e $ENVHOME/bin]
+ *    pywrapper-install -p|--pgstart [-u|--user EffectUser] [-e|--envhome $ENVHOME]
  *    pgstart_EffectUser EffectProgram [options]
  *
  *           N: python 3 release number, it is 10 for Python 3.10.12

{rda_python_setuid-1.0.7.dist-info → rda_python_setuid-1.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_setuid
-Version: 1.0.7
+Version: 1.0.8
 Summary: RDA Python Package to setuid for program executions as an effective or common user
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-setuid
@@ -113,13 +113,13 @@ pywrapper-install
 pip install rda_python_dsarch
 
 # 2. Compile pywrapper C binary (once per environment):
-pywrapper-install
+pywrapper-install -c|--compile
 
 # 3. Wire up each program as a setuid entry:
-pywrapper-install -l dsarch
+pywrapper-install -l|--link dsarch
 
 # 4. Optionally, allow a specialist to run commands as themselves:
-pywrapper-install -p -u zji
+pywrapper-install -p|--pgstart -u|--user zji
 ```
 
 ### Simple install (no sudo required, runs as current user)
@@ -129,7 +129,7 @@ direct symlink from `dsarch` to `setuid_dsarch`:
 
 ```bash
 pip install rda_python_dsarch
-pywrapper-install -l dsarch -s
+pywrapper-install -l|--link dsarch -s|--simple
 ```
 
 ## Runtime flow

rda_python_setuid-1.0.8.dist-info/RECORD

@@ -0,0 +1,12 @@
+rda_python_setuid/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+rda_python_setuid/install.py,sha256=-YoqQ9OTguOwVaWGOkVEQgzZMxfpHIyG4MEM_oRA8oE,6379
+rda_python_setuid/install.usg,sha256=V2sbJo5hTB4hWKGZClAHBojm7wg1B1cQRZN7NdvTEHo,5543
+rda_python_setuid/pgstart.py,sha256=dzYzuc2ce60RNx7FBxVhUgHYwlVnbiZcCrxVQ6MvZZ4,3909
+rda_python_setuid/pywrapper.c,sha256=Dp9EOFU9IShduQ4WMeFRiiIJLQvgZHsiQlc89vJgtII,4190
+rda_python_setuid/pywrapper.py,sha256=pyQZfITTpxQ_lVkWc_0ZJRF_sZnq8NQdOvR5lObu6mw,2898
+rda_python_setuid-1.0.8.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_setuid-1.0.8.dist-info/METADATA,sha256=sxD3iWI8gQ0iHRxYJdN853asC8dlvKP1yMae1aYOJJQ,5048
+rda_python_setuid-1.0.8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rda_python_setuid-1.0.8.dist-info/entry_points.txt,sha256=mWZUCa2KYzGsYVa33M7W03CY9SMsJYsywlIDF-4iMaQ,165
+rda_python_setuid-1.0.8.dist-info/top_level.txt,sha256=ONMhKLagyTBktuz5dTyipSnRC0YhomTMs8eFRjM9kHQ,18
+rda_python_setuid-1.0.8.dist-info/RECORD,,

rda_python_setuid-1.0.7.dist-info/RECORD

@@ -1,12 +0,0 @@
-rda_python_setuid/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-rda_python_setuid/install.py,sha256=eDVHdI2T7Yr1G3I-lWonnGnVfLHp_-zwyQtaL5KieWc,6106
-rda_python_setuid/install.usg,sha256=CqFcedPP27cHInSVGCv4HqO5hnyehAQOxoYfkpV3zmA,5147
-rda_python_setuid/pgstart.py,sha256=dzYzuc2ce60RNx7FBxVhUgHYwlVnbiZcCrxVQ6MvZZ4,3909
-rda_python_setuid/pywrapper.c,sha256=hqLY69JIClKhQ8a26tEF-NyzjGzNS_Yu6wlnfv5DFKI,4121
-rda_python_setuid/pywrapper.py,sha256=pyQZfITTpxQ_lVkWc_0ZJRF_sZnq8NQdOvR5lObu6mw,2898
-rda_python_setuid-1.0.7.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_setuid-1.0.7.dist-info/METADATA,sha256=k4ULqMhiQY9HBuGtQEuKZOawd1s29wRCyO2EHbh_ulA,4995
-rda_python_setuid-1.0.7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-rda_python_setuid-1.0.7.dist-info/entry_points.txt,sha256=mWZUCa2KYzGsYVa33M7W03CY9SMsJYsywlIDF-4iMaQ,165
-rda_python_setuid-1.0.7.dist-info/top_level.txt,sha256=ONMhKLagyTBktuz5dTyipSnRC0YhomTMs8eFRjM9kHQ,18
-rda_python_setuid-1.0.7.dist-info/RECORD,,