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/encodeExp/encodeExp.c src/hg/encode/encodeExp/encodeExp.c
index fa91ead..3a97ef0 100644
--- src/hg/encode/encodeExp/encodeExp.c
+++ src/hg/encode/encodeExp/encodeExp.c
@@ -124,32 +124,35 @@
         verbose(2, "Old experiment: %s\n", key);
     }
 }
 
 void expRestoreTable(char *file)
 /* Fill empty table with experiments in .ra file with id's */
 {
 struct hash *ra = NULL;
 struct lineFile *lf = lineFileOpen(file, TRUE);
 struct encodeExp *exp;
 int ix = 1;
 int expId;
 char *accession;
 char *key;
 
+char queryTblSafe[1024];
+sqlSafef(queryTblSafe, sizeof queryTblSafe, "%s", table);
+
 verbose(1, "Restoring experiments from file \'%s\' to table \'%s\'\n", file, table);
-if (sqlRowCount(connExp, sqlCheckIdentifier(table)) != 0)
+if (sqlRowCount(connExp, queryTblSafe) != 0)
     errAbort("ERROR: table for restore must exist and be empty");
 
 while ((ra = raNextRecord(lf)) != NULL)
     {
     exp = encodeExpFromRa(ra);
 
     /* save accession and id as we may stomp on these for to-delete experiments */
     accession = cloneString(exp->lab);
     expId = exp->ix;
 
     key = encodeExpKey(exp);
     while (ix < expId)
         {
         exp->accession = "DELETED";
         exp->ix = ix;
@@ -218,43 +221,44 @@
     char *val = encodeExpGetField(exp, var);
     if (val != NULL)
         puts(val);
     }
 }
 
 void expHistory(int id)
 /* Show changes to an existing experiment */
 {
 // TODO:  Libify
 
 int i;
 char **row;
 struct dyString *dy = sqlDyStringCreate("select * from %sHistory", table);
 if (id != 0)
-    dyStringPrintf(dy, " where %s=%d ", ENCODE_EXP_FIELD_IX, id);
-dyStringPrintf(dy, " order by updateTime, %s", ENCODE_EXP_FIELD_IX);
-struct sqlResult *sr = sqlGetResult(connExp, dyStringCannibalize(&dy));
+    sqlDyStringPrintf(dy, " where %s=%d ", ENCODE_EXP_FIELD_IX, id);
+sqlDyStringPrintf(dy, " order by updateTime, %s", ENCODE_EXP_FIELD_IX);
+struct sqlResult *sr = sqlGetResult(connExp, dyStringContents(dy));
 while ((row = sqlNextRow(sr)) != NULL)
     {
     for (i = 0; i < ENCODEEXP_NUM_COLS+2; i++)
         // history has 2 additional fields:  action and user
         {
         printf("%s\t", row[i]);
         }
     puts("\n");
     }
 sqlFreeResult(&sr);
+dyStringFree(&dy);
 }
 
 void expDump(char *file)
 /* Output rows to .ra file */
 {
 struct encodeExp *exp = NULL, *exps = NULL;
 
 verbose(1, "Dumping table %s to %s\n", table, file);
 FILE *f  = mustOpen(file, "w");
 exps = encodeExpLoadAllFromTable(connExp, table);
 while ((exp = slPopHead(&exps)) != NULL)
     encodeExpToRaFile(exp, f);
 carefulClose(&f);
 }