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/utils/ccCpLock/ccCp.c src/utils/ccCpLock/ccCp.c
index 466e331..c715bb9 100644
--- src/utils/ccCpLock/ccCp.c
+++ src/utils/ccCpLock/ccCp.c
@@ -16,60 +16,60 @@
 {
 char firstChar = relName[0];
 char fullPath[512];
 char dir[512];
 
 if (firstChar == '/' || firstChar == '~')
     return cloneString(relName);
 getcwd(dir, sizeof(dir));
 sprintf(fullPath, "%s/%s", dir, relName);
 return cloneString(fullPath);
 }
 
 int rcpFile(char *source, char *destHost, char *destFile)
 /* Execute rcp command to copy source file to host. */
 {
-struct dyString *dy = newDyString(512);
+struct dyString *dy = dyStringNew(512);
 int ret;
 
 dyStringPrintf(dy, "rcp %s %s:/%s",  source, destHost, destFile);
 ret = system(dy->string);
-freeDyString(&dy);
+dyStringFree(&dy);
 return ret;
 }
 
 int cpFile(char *source, char *destFile)
 /* Execute cp command to copy file to host. */
 {
-struct dyString *dy = newDyString(512);
+struct dyString *dy = dyStringNew(512);
 int ret;
 
 dyStringPrintf(dy, "cp %s %s",  source, destFile);
 ret = system(dy->string);
-freeDyString(&dy);
+dyStringFree(&dy);
 return ret;
 }
 
 void rshSelf(char *hostList, char *host, int start, char *destFile, char *lockDir)
 /* Execute rsh command to invoke self. */
 {
-struct dyString *dy = newDyString(512);
+struct dyString *dy = dyStringNew(512);
 dyStringPrintf(dy, 
         "rsh %s /cse/guests/kent/bin/i386/ccCp %s %s %d %s &",
 	host, destFile, hostList, start, lockDir);
 system(dy->string);
-freeDyString(&dy);
+dyStringFree(&dy);
 }
 
 void usage()
 /* Explain usage and exit. */
 {
 errAbort(
 "ccCp - copy a file to cluster."
 "usage:\n"
 "   ccCp sourceFile destFile [hostList]\n"
 "This will copy sourceFile to destFile for all machines in\n"
 "hostList\n"
 "\n"
 "example:\n"
 "   ccCp h.zip /var/tmp/h.zip newHosts");
 }