Case insensitive support to tagger options

jjrom · May 6, 2022 · a396945 · a396945
1 parent 4f618ac
commit a396945
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/app/include/iTag/iTag.php b/app/include/iTag/iTag.php
@@ -33,7 +33,7 @@ class iTag
      *  )
      * )
      */
-    const VERSION = '5.3.3';
+    const VERSION = '5.3.5';
 
     /*
      * Character separator
@@ -137,7 +137,7 @@ public function tag($metadata, $taggers = array())
          */
         foreach ($taggers as $name => $options) {
 
-            $tagger = $this->instantiateTagger(ucfirst($name) . 'Tagger');
+            $tagger = $this->instantiateTagger(ucfirst(strtolower(trim($name))) . 'Tagger');
 
             if (isset($tagger)) {
 

diff --git a/app/include/iTagLauncher.php b/app/include/iTagLauncher.php
@@ -359,12 +359,12 @@ private function getParams()
 
             foreach (array_values($taggersList) as $value) {
 
-                $taggerName = ucfirst(trim($value));
+                $taggerName = ucfirst(strtolower(trim($value)));
                 $taggerOptions = array();
 
                 foreach (array_keys($query) as $key ) {
                     $exploded = explode('_', $key);
-                    if ( count($exploded) === 2 && $exploded[0] === $taggerName ) {
+                    if ( count($exploded) === 2 && ucfirst(strtolower(trim($exploded[0]))) === $taggerName ) {
                         $taggerOptions[$exploded[1]] = $this->formatInput($query[$key]);
                     }
                 }
@@ -377,13 +377,13 @@ private function getParams()
 
         $params = array(
             'metadata' => array(
-                'geometry' => rawurldecode(filter_input(INPUT_GET, 'geometry', FILTER_SANITIZE_STRING)),
-                'timestamp' => rawurldecode(filter_input(INPUT_GET, 'timestamp', FILTER_SANITIZE_STRING))
+                'geometry' => rawurldecode(filter_input(INPUT_GET, 'geometry', FILTER_UNSAFE_RAW)),
+                'timestamp' => rawurldecode(filter_input(INPUT_GET, 'timestamp', FILTER_UNSAFE_RAW))
             ),
             'taggers' => $taggers,
             'config' => array(
                 'returnGeometries' => isset($query['_wkt']) ? filter_var($query['_wkt'], FILTER_VALIDATE_BOOLEAN) : false,
-                'planet' => rawurldecode(filter_input(INPUT_GET, 'planet', FILTER_SANITIZE_STRING))
+                'planet' => rawurldecode(filter_input(INPUT_GET, 'planet', FILTER_UNSAFE_RAW))
             )
         );
 
@@ -420,9 +420,9 @@ private function answer($response, $responseStatus)
      */
     private function setCORSHeaders()
     {
-        $httpOrigin = filter_input(INPUT_SERVER, 'HTTP_ORIGIN', FILTER_SANITIZE_STRING);
-        $httpRequestMethod = filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_METHOD', FILTER_SANITIZE_STRING);
-        $httpRequestHeaders = filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS', FILTER_SANITIZE_STRING);
+        $httpOrigin = filter_input(INPUT_SERVER, 'HTTP_ORIGIN', FILTER_UNSAFE_RAW);
+        $httpRequestMethod = filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_METHOD', FILTER_UNSAFE_RAW);
+        $httpRequestHeaders = filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS', FILTER_UNSAFE_RAW);
 
         /*
          * Only set access to known servers