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/hg/encode/hgEncodeScheduler/hgEncodeScheduler.c src/hg/encode/hgEncodeScheduler/hgEncodeScheduler.c
index e040df4..d6d565a 100644
--- src/hg/encode/hgEncodeScheduler/hgEncodeScheduler.c
+++ src/hg/encode/hgEncodeScheduler/hgEncodeScheduler.c
@@ -28,44 +28,45 @@
 {
 errAbort(
   "hgEncodeScheduler - a chron job that runs ENCODE pipeline load jobs "
   "that are ready for scheduling\n"
   "usage:\n"
   "   hgEncodeScheduler db working\n"
   "where db is the encpipeline database\n"
   "and working is the working file area\n"
   "options:\n"
   );
 }
 
 void initRunning(struct sqlConnection *conn)
 /* create running table if not exist */
 {
-char sql[512] = 
-NOSQLINJ "create table running ("
+char query[512]; 
+
+if (sqlTableExists(conn,"running"))
+    return;
+sqlSafef(query, sizeof query, 
+"create table running ("
 "  pid int(10) unsigned,"
 "  project int(10) unsigned,"
 "  jobType varchar(255),"
 "  startTime int(10),"
 "  timeOut int(10),"
 "  commandLine varchar(255)"
-")";
+")");
 
-if (sqlTableExists(conn,"running"))
-    return;
-
-sqlUpdate(conn, sql);
+sqlUpdate(conn, query);
 
 }
 
 char *getProcCmdLine(int pid)
 /* get the commandline of the process by pid - linux specific */
     // alternate method:  ps --format cmd --no-heading -p 32481
 {
 char procPath[256];
 safef(procPath, sizeof(procPath), "/proc/%d/cmdline", pid);
 FILE *f = fopen(procPath, "r");
 char *procLine = readLine(f);
 carefulClose(&f);
 char *c = procLine;
 while(TRUE)
     {