rda-python-setuid 1.0.7__tar.gz → 1.0.9__tar.gz

{rda_python_setuid-1.0.7/src/rda_python_setuid.egg-info → rda_python_setuid-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_setuid
-Version: 1.0.7
+Version: 1.0.9
 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
@@ -74,8 +74,9 @@ prefix:
 ```
 
 `pip install` then places `setuid_dsarch` in the environment's `bin/` directory
-automatically.  `pywrapper-install -l/--link` locks it down to `chmod 700` so users
-cannot bypass the setuid wrapper by running it directly.
+automatically.  `pywrapper-install -l/--link` creates the symlink
+`dsarch -> pywrapper`; running `dsarch` goes through the setuid wrapper, which
+execs `setuid_dsarch` as CommonUser.
 
 ## Environment setup
 
@@ -113,13 +114,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 +130,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
@@ -138,7 +139,6 @@ pywrapper-install -l dsarch -s
 user runs:  dsarch [args]
               |  (symlink -> pywrapper, setuid bit -> EUID=gdexdata)
 pywrapper.c:  execv(bin/setuid_dsarch, args)
-              |  (chmod 700, only gdexdata can exec directly)
 setuid_dsarch: calls dsarch:main() as gdexdata
 ```
 

{rda_python_setuid-1.0.7 → rda_python_setuid-1.0.9}/README.md

@@ -58,8 +58,9 @@ prefix:
 ```
 
 `pip install` then places `setuid_dsarch` in the environment's `bin/` directory
-automatically.  `pywrapper-install -l/--link` locks it down to `chmod 700` so users
-cannot bypass the setuid wrapper by running it directly.
+automatically.  `pywrapper-install -l/--link` creates the symlink
+`dsarch -> pywrapper`; running `dsarch` goes through the setuid wrapper, which
+execs `setuid_dsarch` as CommonUser.
 
 ## Environment setup
 
@@ -97,13 +98,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)
@@ -113,7 +114,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
@@ -122,7 +123,6 @@ pywrapper-install -l dsarch -s
 user runs:  dsarch [args]
               |  (symlink -> pywrapper, setuid bit -> EUID=gdexdata)
 pywrapper.c:  execv(bin/setuid_dsarch, args)
-              |  (chmod 700, only gdexdata can exec directly)
 setuid_dsarch: calls dsarch:main() as gdexdata
 ```
 

{rda_python_setuid-1.0.7 → rda_python_setuid-1.0.9}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_setuid"
-version = "1.0.7"
+version = "1.0.9"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_setuid-1.0.7 → rda_python_setuid-1.0.9}/src/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]
@@ -28,8 +31,9 @@
 #      [project.scripts]
 #      "setuid_dsarch" = "rda_python_dsarch.dsarch:main"
 #   pip install places setuid_dsarch in the bin dir automatically.
-#   pywrapper-install --link dsarch will chown setuid_dsarch to CommonUser and
-#   chmod 700, so users cannot run it directly and must go through the setuid wrapper.
+#   pywrapper-install --link dsarch creates the symlink dsarch -> pywrapper, so
+#   users invoking dsarch go through the setuid wrapper which execs setuid_dsarch
+#   as CommonUser.
 #   pywrapper-install --link dsarch --simple creates dsarch -> setuid_dsarch directly,
 #   skipping setuid; the program runs as the current user.
 #
@@ -65,9 +69,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 +85,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 +99,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:
@@ -118,19 +126,13 @@ def main():
             os.symlink(script, target)
             print("Created: {} -> setuid_{}".format(target, args.link))
       else:
-         # Mode 1: symlink PROGRAM -> pywrapper, then lock down setuid_PROGRAM
-         # so users cannot bypass the setuid wrapper by running it directly.
+         # Mode 1: symlink PROGRAM -> pywrapper. setuid_PROGRAM is left with its
+         # default ownership/permissions so it can be loaded and executed normally.
          if os.path.lexists(target):
             print("Already exists: {}".format(target))
          else:
             os.symlink(pywrapper, target)
             print("Created: {} -> pywrapper".format(target))
-         # chown and chmod 700: only CommonUser can execute setuid_PROGRAM directly.
-         # pywrapper (running as CommonUser via setuid) can still execv it, but any
-         # direct invocation by other users will get "permission denied".
-         run(['sudo', '-u', args.user, 'chown', args.user, script])
-         run(['sudo', '-u', args.user, 'chmod', '700', script])
-         print("Locked: {} (chmod 700, owned by {})".format(script, args.user))
 
    elif args.pgstart:
       # Mode 2: copy pywrapper to pgstart_USER with setuid owned by USER
@@ -138,12 +140,15 @@ def main():
          print("Error: {} not found. Run pywrapper-install --user COMMONUSER first.".format(pywrapper))
          sys.exit(1)
       target = os.path.join(bindir, 'pgstart_{}'.format(args.user))
-      run(['sudo', '-u', args.user, 'cp', pywrapper, target])
-      run(['sudo', '-u', args.user, 'chmod', '4750', target])
+      import pwd
+      curuser = pwd.getpwuid(os.getuid()).pw_name
+      sudo_prefix = [] if curuser == args.user else ['sudo', '-u', args.user]
+      run(sudo_prefix + ['cp', pywrapper, target])
+      run(sudo_prefix + ['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-1.0.7 → rda_python_setuid-1.0.9}/src/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,23 @@
           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.
+          Mode 1: create a symlink PROGRAM -> pywrapper in the bin/ directory so
+          that running PROGRAM invokes the setuid wrapper, which then execs
+          setuid_PROGRAM as CommonUser.  setuid_PROGRAM keeps its default
+          ownership and permissions.  Cannot be combined 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 +47,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:
 
@@ -58,8 +67,8 @@
          "setuid_dsarch" = "rda_python_dsarch.dsarch:main"
 
       pip install then places setuid_dsarch in the bin/ directory automatically.
-      Running pywrapper-install --link will lock it down (chmod 700) so that only
-      pywrapper (running as CommonUser via its setuid bit) can execv it.
+      Running pywrapper-install --link creates the symlink dsarch -> pywrapper;
+      pywrapper (running as CommonUser via its setuid bit) execs setuid_dsarch.
 
  Environment Setup:
 
@@ -99,7 +108,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 +127,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-1.0.7 → rda_python_setuid-1.0.9}/src/rda_python_setuid/pgstart.py

@@ -49,7 +49,7 @@ def main():
    euid = pglog.PGLOG['EUID']
    ruser = pwd.getpwuid(ruid).pw_name
    euser = pwd.getpwuid(euid).pw_name
-   if ruser == euser or ruser == pglog.PGLOG['GDEXUSER']: permit = True
+   if ruser == euser or ruser == pglog.PGLOG['GDEXUSER'] or euser == pglog.PGLOG['GDEXUSER']: permit = True
    pglog.set_suid(euid)
 
    while argv:

{rda_python_setuid-1.0.7 → rda_python_setuid-1.0.9}/src/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 → rda_python_setuid-1.0.9/src/rda_python_setuid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_setuid
-Version: 1.0.7
+Version: 1.0.9
 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
@@ -74,8 +74,9 @@ prefix:
 ```
 
 `pip install` then places `setuid_dsarch` in the environment's `bin/` directory
-automatically.  `pywrapper-install -l/--link` locks it down to `chmod 700` so users
-cannot bypass the setuid wrapper by running it directly.
+automatically.  `pywrapper-install -l/--link` creates the symlink
+`dsarch -> pywrapper`; running `dsarch` goes through the setuid wrapper, which
+execs `setuid_dsarch` as CommonUser.
 
 ## Environment setup
 
@@ -113,13 +114,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 +130,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
@@ -138,7 +139,6 @@ pywrapper-install -l dsarch -s
 user runs:  dsarch [args]
               |  (symlink -> pywrapper, setuid bit -> EUID=gdexdata)
 pywrapper.c:  execv(bin/setuid_dsarch, args)
-              |  (chmod 700, only gdexdata can exec directly)
 setuid_dsarch: calls dsarch:main() as gdexdata
 ```