rda-python-setuid 1.0.1__tar.gz → 1.0.3__tar.gz

{rda_python_setuid-1.0.1 → rda_python_setuid-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rda_python_setuid
-Version: 1.0.1
+Version: 1.0.3
 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
@@ -12,5 +12,6 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: rda_python_common
+Dynamic: license-file
 
 RDA python package, including a C code wrapper, to execute commandline applications via setuid for effective and common user names. 

{rda_python_setuid-1.0.1 → rda_python_setuid-1.0.3}/pyproject.toml

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

{rda_python_setuid-1.0.1 → rda_python_setuid-1.0.3}/src/rda_python_setuid/pgstart.py

@@ -35,10 +35,16 @@ def main():
    PgLOG.set_suid(PgLOG.PGLOG['EUID'])
    if PgLOG.PGLOG['CURUID'] != PgLOG.PGLOG['RDAUSER'] and PgLOG.PGLOG['CURUID'] != "zji": permit = 0
 
-   if argv:
+   while argv:
       ms = re.match(r'^-(\w+)$', argv[0])
-      if ms:
-         opt = ms.group(1)
+      if not ms: break
+      argv.pop(0)
+      opt = ms.group(1)
+      if opt == "bg":
+         bckgrd = " &"
+      elif opt == "cwd":
+         if argv: workdir = argv.pop(0)
+      elif opt != "fg":
          display_message(opt)
 
    if not (permit and argv):
@@ -52,7 +58,17 @@ def main():
       if not permit:
          print("* You must be '{}' to execute a command as user '{}'.".format(PgLOG.PGLOG['RDAUSER'], euser))
       print("********************************************************************")
+      sys.exit(0)
 
+   cmd = PgLOG.argv_to_string(argv)
+   
+   msg = "{}-{}{}-{}".format(PgLOG.PGLOG['HOSTNAME'], aname, PgLOG.current_datetime(), PgLOG.PGLOG['CURUID'])
+   if workdir:
+      msg += "-" + workdir
+      os.chdir(workdir)
+
+   PgLOG.pglog("{}: {}".format(msg, cmd), PgLOG.MSGLOG)
+   os.system(cmd + bckgrd)
    sys.exit(0)
 
 #

{rda_python_setuid-1.0.1 → rda_python_setuid-1.0.3}/src/rda_python_setuid/pywrapper.c

@@ -42,16 +42,11 @@
 int is_executable(const char *filename) {
    struct stat sb;
 
-   if(stat(filename, &sb) == 0) {
-      if(sb.st_mode & S_IXUSR) {
-         return 1;
-      } else {
-    	 printf("%s: not executable\n", prog);
-      }
+   if(stat(filename, &sb) == 0 && sb.st_mode & S_IXUSR) {
+      return 1;
    } else {
-      printf("%s: not exists\n", prog);
+      return 0;
    }
-   return 0;
 }
 
 /* main program */
@@ -59,13 +54,15 @@ int main(int argc, char *argv[]) {
    char *name;
    char cname[80], prog[255];
    char file[] = __FILE__;
+   char *fpath = dirname(file);
    char pgstart[] = "pgstart";
+   char **apntr = argv;
 
    name = strrchr(argv[0], '/');
    strcpy(cname, (name == NULL ? argv[0] : ++name));
 
    if(strstr(cname, pgstart) == cname) {
-      if(argc == 1 or argv[1][0] == '-') {
+      if(argc == 1 || argv[1][0] == '-') {
          strcpy(cname, pgstart);
       } else {
          argv += 1;
@@ -73,9 +70,10 @@ int main(int argc, char *argv[]) {
          strcpy(cname, (name == NULL ? argv[0] : ++name));
       }
    }
-   sprintf(prog, "%s/%s.py", dirname(file), cname);
-
-   if(is_executable(prog) {
-      execv(prog, argv);  /* call Python script */
+   sprintf(prog, "%s/%s.py", fpath, cname);
+   if(is_executable(prog) == 0) {
+      sprintf(prog, "%s/pgstart.py", fpath);
+      argv = apntr;
    }
+   execv(prog, argv);  /* call Python script */
 }

{rda_python_setuid-1.0.1 → rda_python_setuid-1.0.3}/src/rda_python_setuid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rda_python_setuid
-Version: 1.0.1
+Version: 1.0.3
 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
@@ -12,5 +12,6 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: rda_python_common
+Dynamic: license-file
 
 RDA python package, including a C code wrapper, to execute commandline applications via setuid for effective and common user names.