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/cirm/cdw/lib/cdwStep.c src/hg/cirm/cdw/lib/cdwStep.c
index afb8b22..30d831f 100644
--- src/hg/cirm/cdw/lib/cdwStep.c
+++ src/hg/cirm/cdw/lib/cdwStep.c
@@ -39,35 +39,35 @@
     el = cdwStepDefLoad(row);
     slAddHead(&list, el);
     }
 slReverse(&list);
 sqlFreeResult(&sr);
 return list;
 }
 
 void cdwStepDefSaveToDb(struct sqlConnection *conn, struct cdwStepDef *el, char *tableName, int updateSize)
 /* Save cdwStepDef as a row to the table specified by tableName. 
  * As blob fields may be arbitrary size updateSize specifies the approx size
  * of a string that would contain the entire query. Arrays of native types are
  * converted to comma separated strings and loaded as such, User defined types are
  * inserted as NULL. This function automatically escapes quoted strings for mysql. */
 {
-struct dyString *update = newDyString(updateSize);
+struct dyString *update = dyStringNew(updateSize);
 sqlDyStringPrintf(update, "insert into %s values ( %u,'%s','%s')", 
 	tableName,  el->id,  el->name,  el->description);
 sqlUpdate(conn, update->string);
-freeDyString(&update);
+dyStringFree(&update);
 }
 
 struct cdwStepDef *cdwStepDefLoad(char **row)
 /* Load a cdwStepDef from row fetched with select * from cdwStepDef
  * from database.  Dispose of this with cdwStepDefFree(). */
 {
 struct cdwStepDef *ret;
 
 AllocVar(ret);
 ret->id = sqlUnsigned(row[0]);
 ret->name = cloneString(row[1]);
 ret->description = cloneString(row[2]);
 return ret;
 }
 
@@ -193,35 +193,35 @@
     el = cdwStepRunLoad(row);
     slAddHead(&list, el);
     }
 slReverse(&list);
 sqlFreeResult(&sr);
 return list;
 }
 
 void cdwStepRunSaveToDb(struct sqlConnection *conn, struct cdwStepRun *el, char *tableName, int updateSize)
 /* Save cdwStepRun as a row to the table specified by tableName. 
  * As blob fields may be arbitrary size updateSize specifies the approx size
  * of a string that would contain the entire query. Arrays of native types are
  * converted to comma separated strings and loaded as such, User defined types are
  * inserted as NULL. This function automatically escapes quoted strings for mysql. */
 {
-struct dyString *update = newDyString(updateSize);
+struct dyString *update = dyStringNew(updateSize);
 sqlDyStringPrintf(update, "insert into %s values ( %u,%u,'%s')", 
 	tableName,  el->id,  el->stepDef,  el->stepVersion);
 sqlUpdate(conn, update->string);
-freeDyString(&update);
+dyStringFree(&update);
 }
 
 struct cdwStepRun *cdwStepRunLoad(char **row)
 /* Load a cdwStepRun from row fetched with select * from cdwStepRun
  * from database.  Dispose of this with cdwStepRunFree(). */
 {
 struct cdwStepRun *ret;
 
 AllocVar(ret);
 ret->id = sqlUnsigned(row[0]);
 ret->stepDef = sqlUnsigned(row[1]);
 ret->stepVersion = cloneString(row[2]);
 return ret;
 }
 
@@ -346,35 +346,35 @@
     el = cdwStepInLoad(row);
     slAddHead(&list, el);
     }
 slReverse(&list);
 sqlFreeResult(&sr);
 return list;
 }
 
 void cdwStepInSaveToDb(struct sqlConnection *conn, struct cdwStepIn *el, char *tableName, int updateSize)
 /* Save cdwStepIn as a row to the table specified by tableName. 
  * As blob fields may be arbitrary size updateSize specifies the approx size
  * of a string that would contain the entire query. Arrays of native types are
  * converted to comma separated strings and loaded as such, User defined types are
  * inserted as NULL. This function automatically escapes quoted strings for mysql. */
 {
-struct dyString *update = newDyString(updateSize);
+struct dyString *update = dyStringNew(updateSize);
 sqlDyStringPrintf(update, "insert into %s values ( %u,%u,'%s',%u,%u)", 
 	tableName,  el->id,  el->stepRunId,  el->name,  el->ix,  el->fileId);
 sqlUpdate(conn, update->string);
-freeDyString(&update);
+dyStringFree(&update);
 }
 
 struct cdwStepIn *cdwStepInLoad(char **row)
 /* Load a cdwStepIn from row fetched with select * from cdwStepIn
  * from database.  Dispose of this with cdwStepInFree(). */
 {
 struct cdwStepIn *ret;
 
 AllocVar(ret);
 ret->id = sqlUnsigned(row[0]);
 ret->stepRunId = sqlUnsigned(row[1]);
 ret->name = cloneString(row[2]);
 ret->ix = sqlUnsigned(row[3]);
 ret->fileId = sqlUnsigned(row[4]);
 return ret;
@@ -507,35 +507,35 @@
     el = cdwStepOutLoad(row);
     slAddHead(&list, el);
     }
 slReverse(&list);
 sqlFreeResult(&sr);
 return list;
 }
 
 void cdwStepOutSaveToDb(struct sqlConnection *conn, struct cdwStepOut *el, char *tableName, int updateSize)
 /* Save cdwStepOut as a row to the table specified by tableName. 
  * As blob fields may be arbitrary size updateSize specifies the approx size
  * of a string that would contain the entire query. Arrays of native types are
  * converted to comma separated strings and loaded as such, User defined types are
  * inserted as NULL. This function automatically escapes quoted strings for mysql. */
 {
-struct dyString *update = newDyString(updateSize);
+struct dyString *update = dyStringNew(updateSize);
 sqlDyStringPrintf(update, "insert into %s values ( %u,%u,'%s',%u,%u)", 
 	tableName,  el->id,  el->stepRunId,  el->name,  el->ix,  el->fileId);
 sqlUpdate(conn, update->string);
-freeDyString(&update);
+dyStringFree(&update);
 }
 
 struct cdwStepOut *cdwStepOutLoad(char **row)
 /* Load a cdwStepOut from row fetched with select * from cdwStepOut
  * from database.  Dispose of this with cdwStepOutFree(). */
 {
 struct cdwStepOut *ret;
 
 AllocVar(ret);
 ret->id = sqlUnsigned(row[0]);
 ret->stepRunId = sqlUnsigned(row[1]);
 ret->name = cloneString(row[2]);
 ret->ix = sqlUnsigned(row[3]);
 ret->fileId = sqlUnsigned(row[4]);
 return ret;