From 6810af88a7e8eb6d3158fff9b2032ff7bafc128e Mon Sep 17 00:00:00 2001
From: Florin Papa <florin.papa@intel.com>
Date: Fri, 9 Feb 2018 09:31:29 -0800
Subject: [PATCH] Check for invalid arguments passed to perf.php

oss-performance does not give any warnings when passing
an incorrect argument. When a wrong argument is found, the "getopt" Hack
function that parses arguments stops silently and the rest of the arguments
are simply discarded without notice.

This change fixes this verbosity issue by going through all the parameters
passed to perf.php and checking if they are valid. If they are not, a
warning is displayed saying which parameter is wrong and the "help" message
is printed.
---
 base/PerfOptions.php | 69 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/base/PerfOptions.php b/base/PerfOptions.php
index a0247cc..df96c10 100644
--- a/base/PerfOptions.php
+++ b/base/PerfOptions.php
@@ -202,7 +202,7 @@ public function __construct(Vector<string> $argv) {
     $GLOBALS['argv'] = $original_argv;
 
     $this->help = array_key_exists('help', $o);
-    if ($this->help) {
+    if ($this->help || (!$this->sanitizeInput($argv, $def))) {
       fprintf(
         STDERR,
         "Usage: %s \\\n".
@@ -444,6 +444,73 @@ public function validate() {
     $this->getTarget();
   }
 
+  private function sanitizeInput(Vector<string> $given, Vector<string> $allowed
+  ): bool {
+    //skip perf.php from the count
+    $given = $given->skip(1);
+    $skip = false;
+    $argMap = new Map<string, bool>(null);
+
+    // Create the argMap, where the keys are all the arguments that the
+    // script can take, and the values are boolean values: false for
+    // standalone argument and true for arguments that require a value
+    foreach ($allowed as $ap) {
+      // argument needs value
+      if (substr($ap, -1) == ':') {
+        $argMap[substr($ap, 0, -1)] = true;
+      // standalone argument
+      } else {
+        $argMap[$ap] = false;
+      }
+    }
+
+    // Iterate through all the arguments passed to the script and check
+    // if they are valid. Skip values of arguments that were given like
+    // "--arg value" instead of "--arg=value"
+    foreach($given as $currentArg) {
+      $shouldBreak = false;
+
+      if ($skip) {
+        $skip = false;
+        continue;
+      } else {
+        // Argument should be at least 3 characters, in order
+        // to have something after the "--"
+        if (strlen($currentArg) > 2 && substr($currentArg, 0, 2) == "--") {
+          // drop "--" from argument
+          $currentArg = substr($currentArg, 2);
+          $shouldSkip = false;
+
+          $pos = strpos($currentArg, "=");
+          // we received the parameter in the format "--arg=value"
+          if ($pos !== false) {
+            $currentArg = explode("=", $currentArg)[0];
+          // we received the parameter in the format "--arg value"
+          } else {
+            $shouldSkip = true;
+          }
+
+          if ($argMap->contains($currentArg)) {
+            $skip = $argMap[$currentArg] && $shouldSkip;
+          // argument not valid
+          } else {
+            $shouldBreak = true;
+          }
+        // argument too short
+        } else {
+            $shouldBreak = true;
+        }
+      }
+
+      if ($shouldBreak) {
+        fprintf(STDERR, "Invalid argument near %s\n", $currentArg);
+        return false;
+      }
+    }
+
+    return true;
+  }
+
   private function getBool(string $name): bool {
     $value = array_key_exists($name, $this->args);
     if ($value) {