Changeset 43013

Timestamp:

May 11, 2026, 3:07:05 PM (3 months ago)

Author:

eugene

Message:

only allow pxadmin to delete databases named "test" or "simtest"

Location:

branches/eam_branches/ipp-pstamp-20260421/ippTools/src

Files:

• difftool.c (modified) (3 diffs)
• pxadmin.c (modified) (1 diff)
• stacktool.c (modified) (1 diff)

branches/eam_branches/ipp-pstamp-20260421/ippTools/src/difftool.c

@@ -1250 +1250 @@
   PXOPT_COPY_STR(config->args, where, "-data_group", "warpRun.data_group", "==");
   PXOPT_COPY_STR(config->args, where, "-skycell_id", "warpSkyfile.skycell_id", "==");
-  PXOPT_COPY_F32(config->args, where,  "-good_frac", "warpSkyfile.good_frac", ">=");
+  PXOPT_COPY_F32(config->args, where, "-good_frac", "warpSkyfile.good_frac", ">=");
   PXOPT_COPY_STR(config->args, where, "-stack_label", "stackRun.label", "==");
   PXOPT_COPY_STR(config->args, where, "-stack_data_group", "stackRun.data_group", "==");
@@ -1324 +1324 @@
 
     // This is just a simple query, so we don't need to do a transaction
-    if (!p_psDBRunQueryF(config->dbh, query, whereClauseString, diffWhereClause,joinWhereClause)) {
+    if (!p_psDBRunQueryF(config->dbh, query, whereClauseString, diffWhereClause, joinWhereClause)) {
       psError(PS_ERR_UNKNOWN, false, "database error");
       psFree(query);
@@ -1334 +1334 @@
     psFree(joinWhereClause);
     
-  }
-  else {
+  } else {
     // Don't queue things that already have diffs.
     if (! (reRun || newTemplates) ) {

branches/eam_branches/ipp-pstamp-20260421/ippTools/src/pxadmin.c

@@ -185 +185 @@
 
         // if name is e.g., gpc1, strcasecmp returns FALSE
-        bool allowDelete = true;
-        allowDelete = allowDelete && strcasecmp(dbName, "gpc1");  
-        allowDelete = allowDelete && strcasecmp(dbName, "gpc2");  
-        allowDelete = allowDelete && strcasecmp(dbName, "nebulous");  
-        allowDelete = allowDelete && strcasecmp(dbName, "isp");  
-        allowDelete = allowDelete && strcasecmp(dbName, "ssp");  
-        allowDelete = allowDelete && strcasecmp(dbName, "uic");  
-        allowDelete = allowDelete && strcasecmp(dbName, "hsc_v1");  
-        allowDelete = allowDelete && strcasecmp(dbName, "megacam_v1");  
+        bool allowDelete = false;
+
+        // only allow deletion for the following test databases:
+        allowDelete = allowDelete || !strcasecmp(dbName, "test");  
+        allowDelete = allowDelete || !strcasecmp(dbName, "simtest");  
+
+        // allowDelete = allowDelete && strcasecmp(dbName, "gpc1");  
+        // allowDelete = allowDelete && strcasecmp(dbName, "gpc2");  
+        // allowDelete = allowDelete && strcasecmp(dbName, "nebulous");  
+        // allowDelete = allowDelete && strcasecmp(dbName, "isp");  
+        // allowDelete = allowDelete && strcasecmp(dbName, "ssp");  
+        // allowDelete = allowDelete && strcasecmp(dbName, "uic");  
+        // allowDelete = allowDelete && strcasecmp(dbName, "hsc_v1");  
+        // allowDelete = allowDelete && strcasecmp(dbName, "megacam_v1");  
 
         if (!allowDelete) {

branches/eam_branches/ipp-pstamp-20260421/ippTools/src/stacktool.c

@@ -1554 +1554 @@
     return false;
   }
-
   psFree(where);