44ccfacbe3a3d4b300f80d48651c77837a4b571e
galt
  Tue Apr 26 11:12:02 2022 -0700
SQL INJECTION Prevention Version 2 - this improves our methods by making subclauses of SQL that get passed around be both easy and correct to use. The way that was achieved was by getting rid of the obscure and not well used functions sqlSafefFrag and sqlDyStringPrintfFrag and replacing them with the plain versions of those functions, since these are not needed anymore. The new version checks for NOSQLINJ in unquoted %-s which is used to include SQL clauses, and will give an error the NOSQLINJ clause is not present, and this will automatically require the correct behavior by developers. sqlDyStringPrint is a very useful function, however because it was not enforced, users could use various other dyString functions and they operated without any awareness or checking for SQL correct use. Now those dyString functions are prohibited and it will produce an error if you try to use a dyString function on a SQL string, which is simply detected by the presence of the NOSQLINJ prefix.

diff --git src/parasol/paraNodeStart/paraNodeStart.c src/parasol/paraNodeStart/paraNodeStart.c
index e7bf256..a21636b 100644
--- src/parasol/paraNodeStart/paraNodeStart.c
+++ src/parasol/paraNodeStart/paraNodeStart.c
@@ -1,116 +1,116 @@
 /* paraNodeStart - Start up parasol node daemons on a list of machines. */
 #include "paraCommon.h"
 #include "linefile.h"
 #include "dystring.h"
 #include "hash.h"
 #include "options.h"
 
 /* command line option specifications */
 static struct optionSpec optionSpecs[] = {
     {"logFacility", OPTION_STRING},
     {"logMinPriority", OPTION_STRING},
     {"log", OPTION_STRING},
     {"hub", OPTION_STRING},
     {"umask", OPTION_INT},
     {"userPath", OPTION_STRING},
     {"sysPath", OPTION_STRING},
     {"env", OPTION_STRING|OPTION_MULTI},
     {"randomDelay", OPTION_INT},
     {"exe", OPTION_STRING},
     {"rsh", OPTION_STRING},
     {NULL, 0}
 };
 
 char *version = PARA_VERSION;   /* Version number. */
 
 void usage()
 /* Explain usage and exit. */
 {
 errAbort(
  "paraNodeStart - version %s\n"
  "Start up parasol node daemons on a list of machines.\n"
  "usage:\n"
  "    paraNodeStart machineList\n"
  "where machineList is a file containing a list of hosts.\n"
  "Machine list contains the following columns:\n"
  "     <name> <number of cpus>\n"
  "It may have other columns as well.\n"
  "options:\n"
  "    -exe=/path/to/paraNode\n"
  "    -logFacility=facility  Log to the specified syslog facility - default local0.\n"
  "    -logMinPriority=pri minimum syslog priority to log, also filters file logging.\n"
  "     defaults to \"warn\"\n"
  "    -log=file  Log to file instead of syslog.\n"
  "    -umask=000  Set umask to run under - default 002.\n"
  "    -randomDelay=N  Set random start delay in milliseconds - default 5000.\n"
  "    -userPath=bin:bin/i386  User dirs to add to path.\n"
  "    -sysPath=/sbin:/local/bin  System dirs to add to path.\n"
  "    -env=name=value - add environment variable to jobs.  Maybe repeated.\n"
  "    -hub=machineHostingParaHub  Nodes will ignore messages from elsewhere.\n"
  "    -rsh=/path/to/rsh/like/command.\n"
  , version
  );
 }
 
 void carryOption(char *option, struct dyString *dy)
 /* Carry option from our command line to paraNode's. */
 {
 char *val = optionVal(option, NULL);
 if (val != NULL)
    dyStringPrintf(dy, " %s=%s", option, val);
 }
 
 void carryMultiOption(char *option, struct dyString *dy)
 /* Carry multi-valued option from our command line to paraNode's. Do
  * naive quoting */
 {
 struct slName *val;
 for (val = optionMultiVal(option, NULL); val != NULL; val = val->next)
     dyStringPrintf(dy, " %s='%s'", option, val->name);
 }
 
 void paraNodeStart(char *machineList)
 /* Start node servers on all machines in list. */
 {
 char *exe = optionVal("exe", "paraNode");
 char *rsh = optionVal("rsh", "rsh");
 struct lineFile *lf = lineFileOpen(machineList, TRUE);
 char *row[2];
-struct dyString *dy = newDyString(256);
+struct dyString *dy = dyStringNew(256);
 
 while (lineFileRow(lf, row))
     {
     char *name = row[0];
     int cpu = atoi(row[1]);
     if (cpu <= 0)
         errAbort("Expecting cpu count in second column, line %d of %s\n",
 		lf->lineIx, lf->fileName);
     dyStringClear(dy);
     dyStringPrintf(dy, "%s %s %s start -cpu=%d", rsh, name, exe, cpu);
     carryOption("logFacility", dy);
     carryOption("logMinPriority", dy);
     carryOption("log", dy);
     carryOption("hub", dy);
     carryOption("umask", dy);
     carryOption("sysPath", dy);
     carryOption("userPath", dy);
     carryMultiOption("env", dy);
     carryOption("randomDelay", dy);
     printf("%s\n", dy->string);
     (void) system(dy->string); // ignore return value
     }
 lineFileClose(&lf);
-freeDyString(&dy);
+dyStringFree(&dy);
 }
 
 int main(int argc, char *argv[])
 /* Process command line. */
 {
 optionInit(&argc, argv, optionSpecs);
 if (argc != 2)
     usage();
 paraNodeStart(argv[1]);
 return 0;
 }