Merge remote-tracking branch 'origin/supremm_module_warnings' into su…

…pport_jobarrays
ubccr · May 22, 2023 · a60611e · a60611e
2 parents f2f6ac7 + b209be4
commit a60611e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/classes/DataWarehouse/Access/Common.php b/classes/DataWarehouse/Access/Common.php
@@ -45,6 +45,12 @@ public function __construct($request) {
 
     protected function checkDateParameters()
     {
+        if (!isset($this->request['start_date'])) {
+            throw new \DataWarehouse\Query\Exceptions\BadRequestException(
+                'missing required start_date parameter'
+            );
+        }
+
         $start_date_parsed = date_parse_from_format(
             'Y-m-d',
             $this->request['start_date']
@@ -56,6 +62,12 @@ protected function checkDateParameters()
             );
         }
 
+        if (!isset($this->request['end_date'])) {
+            throw new \DataWarehouse\Query\Exceptions\BadRequestException(
+                'missing required end_date parameter'
+            );
+        }
+
         $end_date_parsed = date_parse_from_format('Y-m-d', $this->request['end_date']);
 
         if ($end_date_parsed['error_count'] !== 0) {
@@ -178,7 +190,7 @@ protected function getFontSize()
         return
             isset($this->request['font_size']) && $this->request['font_size'] != ''
             ? $this->request['font_size']
-            : 'default';
+            : '3';
     }
 
     protected function getTitle()

diff --git a/classes/DataWarehouse/Access/MetricExplorer.php b/classes/DataWarehouse/Access/MetricExplorer.php
@@ -14,6 +14,7 @@
 use DataWarehouse\Query\Exceptions\AccessDeniedException;
 use DataWarehouse\Query\Exceptions\MissingFilterListTableException;
 use DataWarehouse\Query\Exceptions\UnknownGroupByException;
+use DataWarehouse\Query\Exceptions\BadRequestException;
 use FilterListHelper;
 use XDUser;
 
@@ -411,6 +412,10 @@ private function getDataSeries()
 
         $jret = json_decode($ret);
 
+        if (!is_array($jret)) {
+            throw new BadRequestException('Invalid data_series specified');
+        }
+
         foreach ($jret as &$y) {
 
             // Set values of new attribs for backward compatibility.

diff --git a/classes/Rest/Controllers/WarehouseControllerProvider.php b/classes/Rest/Controllers/WarehouseControllerProvider.php
@@ -601,7 +601,7 @@ public function updateHistory(Request $request, Application $app, $id)
             array(
                 'success' => true,
                 'action' => $action,
-                'total' => count($history),
+                'total' => count($result),
                 'results' => $result
             ),
             200

diff --git a/tests/integration/lib/Controllers/UsageExplorerTest.php b/tests/integration/lib/Controllers/UsageExplorerTest.php
@@ -89,10 +89,18 @@ public function corruptDataProvider()
             "controller_module"=> "user_interface"
         );
 
+        $view['start_date'] = null;
+        $tests[] = array($view, 'missing required start_date parameter');
+
+        $view['start_date'] = '2017-05-01';
         $view['end_date'] = null;
+        $tests[] = array($view, 'missing required end_date parameter');
+
+        $view['end_date'] = 'Yesterday';
         $tests[] = array($view, 'end_date param is not in the correct format of Y-m-d.');
 
-        $view['start_date'] = null;
+        $view['start_date'] = 'Tomorrow';
+        $view['end_date'] = '2017-05-01';
         $tests[] = array($view, 'start_date param is not in the correct format of Y-m-d.');
 
         $view['group_by'] = "elephants";