Escaped nodeid in test threaded - release 1.19.3

purplepixie · Sep 1, 2017 · 39ae6c5 · 39ae6c5
1 parent 42f341e
commit 39ae6c5
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/doc/html/README.html b/doc/html/README.html
@@ -1,4 +1,4 @@
-<p align="right"><i>Updated: 11:40:25 01/09/2017</i></p>
+<p align="right"><i>Updated: 14:09:46 01/09/2017</i></p>
 
 <h1>FreeNATS</h1>
 

diff --git a/doc/html/THIS_IS_NOT_VMWARE.html b/doc/html/THIS_IS_NOT_VMWARE.html
@@ -1,4 +1,4 @@
-<p align="right"><i>Updated: 11:40:25 01/09/2017</i></p>
+<p align="right"><i>Updated: 14:09:46 01/09/2017</i></p>
 
 This is NOT the VMWare Virtual Appliance it is just the PHP source code
 <br><br>

diff --git a/doc/html/install.html b/doc/html/install.html
@@ -1,4 +1,4 @@
-<p align="right"><i>Updated: 11:40:25 01/09/2017</i></p>
+<p align="right"><i>Updated: 14:09:46 01/09/2017</i></p>
 
 <h1>FreeNATS - Installation Documentation</h1>
 

diff --git a/sql/latest/schema.drop.sql b/sql/latest/schema.drop.sql
@@ -75,7 +75,7 @@ CREATE TABLE `fnalertlog` (
   `logentry` varchar(250) DEFAULT NULL,
   PRIMARY KEY (`alid`),
   KEY `alertid` (`alertid`)
-) ENGINE=MyISAM AUTO_INCREMENT=49766 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=49767 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -212,7 +212,7 @@ CREATE TABLE `fnlog` (
   `loglevel` int(11) NOT NULL DEFAULT '1',
   `logevent` varchar(250) NOT NULL DEFAULT '',
   PRIMARY KEY (`logid`)
-) ENGINE=MyISAM AUTO_INCREMENT=52 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=60 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -322,7 +322,7 @@ CREATE TABLE `fnrecord` (
   PRIMARY KEY (`recordid`),
   KEY `testid` (`testid`),
   KEY `recordx` (`recordx`)
-) ENGINE=MyISAM AUTO_INCREMENT=4768912 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=4768915 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -431,7 +431,7 @@ CREATE TABLE `fntestrun` (
   PRIMARY KEY (`trid`),
   KEY `finishx` (`finishx`),
   KEY `fnode` (`fnode`)
-) ENGINE=MyISAM AUTO_INCREMENT=49 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=52 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -507,4 +507,4 @@ CREATE TABLE `fnviewitem` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-09-01 12:40:26
+-- Dump completed on 2017-09-01 15:09:48
diff --git a/sql/latest/schema.sql b/sql/latest/schema.sql
@@ -1,4 +1,4 @@
--- FreeNATS freenats-1.19.2a Schema
+-- FreeNATS freenats-1.19.3a Schema
 -- No DROP TABLES - suitable for upgrade
 -- MySQL dump 10.13  Distrib 5.6.35, for osx10.9 (x86_64)
 --
@@ -73,7 +73,7 @@ CREATE TABLE `fnalertlog` (
   `logentry` varchar(250) DEFAULT NULL,
   PRIMARY KEY (`alid`),
   KEY `alertid` (`alertid`)
-) ENGINE=MyISAM AUTO_INCREMENT=49766 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=49767 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -203,7 +203,7 @@ CREATE TABLE `fnlog` (
   `loglevel` int(11) NOT NULL DEFAULT '1',
   `logevent` varchar(250) NOT NULL DEFAULT '',
   PRIMARY KEY (`logid`)
-) ENGINE=MyISAM AUTO_INCREMENT=52 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=60 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -309,7 +309,7 @@ CREATE TABLE `fnrecord` (
   PRIMARY KEY (`recordid`),
   KEY `testid` (`testid`),
   KEY `recordx` (`recordx`)
-) ENGINE=MyISAM AUTO_INCREMENT=4768912 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=4768915 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -412,7 +412,7 @@ CREATE TABLE `fntestrun` (
   PRIMARY KEY (`trid`),
   KEY `finishx` (`finishx`),
   KEY `fnode` (`fnode`)
-) ENGINE=MyISAM AUTO_INCREMENT=49 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=52 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -485,4 +485,4 @@ CREATE TABLE `fnviewitem` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-09-01 12:40:26
+-- Dump completed on 2017-09-01 15:09:47
diff --git a/sql/latest/schema.upgrade.sql b/sql/latest/schema.upgrade.sql
@@ -1,4 +1,4 @@
--- FreeNATS freenats-1.19.2a Schema
+-- FreeNATS freenats-1.19.3a Schema
 -- Experimental Upgrade SQL - run after schema.sql (not drop!)
 -- Both will generate many many errors - run with --force, ignore errors
 -- myrug -- PurplePixie Systems

diff --git a/src/server/base/freenats.inc.php b/src/server/base/freenats.inc.php
@@ -28,7 +28,7 @@ class TFreeNATS
 var $Tests;
 var $Lang;
 var $RSS;
-var $Version="1.19.2";
+var $Version="1.19.3";
 var $Release="a";
 var $EventHandlers=array();
 

diff --git a/src/server/bin/test-threaded.php b/src/server/bin/test-threaded.php
@@ -10,7 +10,7 @@
 echo "test-threaded.sh: spawning node tester processes\n";
 
 $q="SELECT nodeid FROM fnnode WHERE nodeenabled>0";
-if (count($nodelist)>0) 
+if (count($nodelist)>0)
 	{
 	$q.=" AND nodeid IN(";
 	$first=true;
@@ -40,11 +40,10 @@
 		// Test Execution Delay / test.spawndelay
 		if ($spawn_delay>0) usleep($spawn_delay);
 		}
-	$cmd="php ./tester.php ".$row['nodeid']." > /tmp/nr.".$row['nodeid']." &";
+	$cmd="php ./tester.php ".escapeshellarg($row['nodeid'])." > ".escapeshellarg("/tmp/nr.".$row['nodeid'])." &";
 	echo $cmd."\n";
 	exec($cmd);
 	}
 $NATS->DB->Free($r);
 $NATS->Stop();
 ?>
-