CDPP / AMDA_IHM

Commit 189a6f4f94ff13b25c24d8b31863ebd7692ede76

Authored by Elena.Budnik
1 parent 8da91bff
Exists in master and in 103 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot-request, special-params, test-merge, ws_get_catalog

coorect timie

Showing 4 changed files with 95 additions and 39 deletions   Show diff stats
Inline Side-by-side
php/WebServices/WebServer.php
  Diff comments   View file @189a6f4
... ... @@ -286,17 +286,6 @@ class WebServer
286 286 $this->throwError("deleteProcessError", $e->getMessage());
287 287 }
288 288 }
289   -
290   -/*
291   -* generate AUTH token for access to REST services
292   -*/
293   - public function getNewToken()
294   - {
295   - // generate token from timeStamp and some salt
296   - $newToken = md5(1321 * (int)( time() / WSConfigClass::$timeLimitQuery));
297   -
298   - return array('success' => true, 'token' => $newToken);
299   - }
300 289  
301 290 private function excludePrivateNodes($locParamSrc, $locParamDst)
302 291 {
... ... @@ -325,8 +314,24 @@ class WebServer
325 314 $this->throwError('workspaceError', 'Cannot save Amda Local DataBase Parameters description file'.$this->userID);
326 315 }
327 316  
  317 + private function checkInputTime($startTime, $stopTime)
  318 + {
  319 + if ($stopTime <= $startTime )
  320 + $this->throwError("requestError", "Requested time interval should be greater than 0");
  321 + }
  322 +
328 323 /************************** WEB SERVICES **************************************/
329   -
  324 +/*
  325 +* generate AUTH token for access to REST services
  326 +*/
  327 + public function getNewToken()
  328 + {
  329 + // generate token from timeStamp and some salt
  330 + $newToken = md5(1321 * (int)( time() / WSConfigClass::$timeLimitQuery));
  331 +
  332 + return array('success' => true, 'token' => $newToken);
  333 + }
  334 +
330 335 /*
331 336 * public data only : user impex
332 337 */
... ... @@ -390,18 +395,25 @@ class WebServer
390 395 $this->initUserMgr();
391 396  
392 397 $vars = $res['vars'];
393   -
394   - if (strtotime($vars["stopTime"]) <= strtotime($vars["startTime"])){
395   - $this->throwError("requestError", "Requested time interval should be greater than 0");
  398 +
  399 + if (is_numeric($vars["startTime"])) {
  400 + $this->checkInputTime($vars["startTime"],$vars["stopTime"]);
  401 + $vars["startTime"] = date("Y-m-d\TH:i:s", $vars["startTime"]);
  402 + $vars["stopTime"] = date("Y-m-d\TH:i:s", $vars["stopTime"]);
  403 + }
  404 + else {
  405 + $this->checkInputTime(strtotime($vars["startTime"]),strtotime($vars["stopTime"]));
396 406 }
397 407  
398   - $paramId = array();
399   - array_push($paramId, $vars["parameterID"]);
400   -
401   - if (!$vars["timeFormat"])
  408 + if (!$vars["timeFormat"]) {
402 409 $timeFormat = "ISO8601";
403   - else
  410 + }
  411 + else {
404 412 $timeFormat = $vars["timeFormat"];
  413 + }
  414 +
  415 + $paramId = array();
  416 + array_push($paramId, $vars["parameterID"]);
405 417  
406 418 if (!$vars["gzip"])
407 419 $gzip = 0;
... ... @@ -465,11 +477,23 @@ class WebServer
465 477 $this->initUserMgr();
466 478  
467 479 $vars = $res['vars'];
468   -
469   - if (strtotime($vars["stopTime"]) <= strtotime($vars["startTime"])){
470   - $this->throwError("requestError", "Requested time interval should be greater than 0");
471   - }
472 480  
  481 + if (is_numeric($vars["startTime"])) {
  482 + $this->checkInputTime($vars["startTime"],$vars["stopTime"]);
  483 + $vars["startTime"] = date("Y-m-d\TH:i:s", $vars["startTime"]);
  484 + $vars["stopTime"] = date("Y-m-d\TH:i:s", $vars["stopTime"]);
  485 + }
  486 + else {
  487 + $this->checkInputTime(strtotime($vars["startTime"]),strtotime($vars["stopTime"]));
  488 + }
  489 +
  490 + if (!$vars["timeFormat"]) {
  491 + $timeFormat = "ISO8601";
  492 + }
  493 + else {
  494 + $timeFormat = $vars["timeFormat"];
  495 + }
  496 +
473 497 $dataSetDom = $this->getDatasetInfo($vars['datasetID']);
474 498  
475 499 $params = $dataSetDom->getElementsByTagName("parameter");
... ... @@ -506,11 +530,6 @@ class WebServer
506 530 $sampling = $vars["sampling"];
507 531 }
508 532  
509   - if (!$vars["timeFormat"])
510   - $timeFormat = "ISO8601";
511   - else
512   - $timeFormat = $vars["timeFormat"];
513   -
514 533 if (!$vars["gzip"])
515 534 $gzip = 0;
516 535 else
... ... @@ -642,11 +661,23 @@ class WebServer
642 661 $this->initUserMgr();
643 662  
644 663 $vars = $res['vars'];
645   -
646   - if (strtotime($vars["stopTime"]) <= strtotime($vars["startTime"])){
647   - $this->throwError("requestError", "Requested time interval should be greater than 0");
  664 +
  665 + if (is_numeric($vars["startTime"])) {
  666 + $this->checkInputTime($vars["startTime"],$vars["stopTime"]);
  667 + $vars["startTime"] = date("Y-m-d\TH:i:s", $vars["startTime"]);
  668 + $vars["stopTime"] = date("Y-m-d\TH:i:s", $vars["stopTime"]);
  669 + }
  670 + else {
  671 + $this->checkInputTime(strtotime($vars["startTime"]),strtotime($vars["stopTime"]));
  672 + }
  673 +
  674 + if (!$vars["timeFormat"]) {
  675 + $timeFormat = "ISO8601";
  676 + }
  677 + else {
  678 + $timeFormat = $vars["timeFormat"];
648 679 }
649   -
  680 +
650 681 $spacecraft = $vars["spacecraft"];
651 682 $coordinateSystem = $vars["coordinateSystem"];
652 683  
... ... @@ -667,11 +698,6 @@ class WebServer
667 698 $paramId = array();
668 699 array_push($paramId, $orbitParam['parameterID']);
669 700  
670   - if (!$vars["timeFormat"])
671   - $timeFormat = "ISO8601";
672   - else
673   - $timeFormat = $vars["timeFormat"];
674   -
675 701 if (!$vars["gzip"])
676 702 $gzip = 0;
677 703 else
... ... @@ -705,6 +731,15 @@ class WebServer
705 731 $vars = $res['vars'];
706 732 $mission = $vars["missionID"];
707 733  
  734 + if (is_numeric($vars["startTime"])) {
  735 + $this->checkInputTime($vars["startTime"],$vars["stopTime"]);
  736 + $vars["startTime"] = date("Y-m-d\TH:i:s", $vars["startTime"]);
  737 + $vars["stopTime"] = date("Y-m-d\TH:i:s", $vars["stopTime"]);
  738 + }
  739 + else {
  740 + $this->checkInputTime(strtotime($vars["startTime"]),strtotime($vars["stopTime"]));
  741 + }
  742 +
708 743 $resultFilePrefix = strtolower(__FUNCTION__)."_".$mission."_".date("YmdHms",strtotime($vars["startTime"]))."_".date("YmdHms",strtotime($vars["stopTime"]));
709 744  
710 745 if ($this->userID != "impex")
... ...
php/rest/getDataset.php
  Diff comments   View file @189a6f4
... ... @@ -41,7 +41,14 @@
41 41 $result = array('success' => false, 'message' => "Authentication is required for this webservice.");
42 42 exit(json_encode($result));
43 43 }
44   -
  44 +
  45 + if ($_GET['startTime'] && strpos($_GET['startTime'], ' ') !== false)
  46 + {
  47 + $result = array('success' => false,
  48 + 'message' => "Check that there is no + (plus) character in your time definition. + is a special character and should be encoded by %2B");
  49 + exit(json_encode($result));
  50 + }
  51 +
45 52 $amda_ws = new WebServer();
46 53  
47 54 if ($amda_ws->getNewToken()['token'] != $_GET["token"])
... ...
php/rest/getOrbites.php
  Diff comments   View file @189a6f4
... ... @@ -52,6 +52,13 @@
52 52 exit(json_encode($result));
53 53 }
54 54  
  55 + if ($_GET['startTime'] && strpos($_GET['startTime'], ' ') !== false)
  56 + {
  57 + $result = array('success' => false,
  58 + 'message' => "Check that there is no + (plus) character in your time definition. + is a special character and should be encoded by %2B");
  59 + exit(json_encode($result));
  60 + }
  61 +
55 62 $amda_ws = new WebServer();
56 63  
57 64 if ($amda_ws->getNewToken()['token'] != $_GET["token"])
... ...
php/rest/getParameter.php
  Diff comments   View file @189a6f4
... ... @@ -42,6 +42,13 @@
42 42 $result = array('success' => false, 'message' => "Authentication is required for this webservice.");
43 43 exit(json_encode($result));
44 44 }
  45 +
  46 + if ($_GET['startTime'] && strpos($_GET['startTime'], ' ') !== false)
  47 + {
  48 + $result = array('success' => false,
  49 + 'message' => "Check that there is no + (plus) character in your time definition. + is a special character and should be encoded by %2B");
  50 + exit(json_encode($result));
  51 + }
45 52  
46 53 $amda_ws = new WebServer();
47 54  
... ...