CDPP / AMDA_IHM

Commit 5e2ea05e36e0e156aac5ec5a4bfcfa9c2f3e1f86

Authored by Elena.Budnik
1 parent 1922ad04
Exists in master and in 110 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, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

update REST

Showing 5 changed files with 66 additions and 58 deletions   Show diff stats
Inline Side-by-side
php/classes/WebServer.php
  Diff comments   View file @5e2ea05
... ... @@ -301,9 +301,9 @@ class WebServer
301 301 */
302 302 public function getNewToken()
303 303 {
304   - $timeStamp = (new DateTime())->getTimestamp();
305 304 // generate token from timeStamp and some salt
306   - $newToken = md5(1321 * (int)($timeStamp / timeLimitQuery));
  305 + $newToken = md5(1321 * (int)( time() / WSConfigClass::$timeLimitQuery));
  306 +
307 307 return array('success' => true, 'token' => $newToken);
308 308 }
309 309  
... ...
php/rest/getDataset.php
  Diff comments   View file @5e2ea05
... ... @@ -5,17 +5,23 @@
5 5 */
6 6  
7 7 //ini_set("allow_url_fopen", true);
8   -require_once '../config.php';
  8 + require_once '../config.php';
9 9  
10   -$amda_ws = new WebServer();
  10 + if (!key_exists("token", $_GET))
  11 + {
  12 + $result = array('success' => false, 'message' => "Authentication is required for this webservice.");
  13 + exit(json_encode($result));
  14 + }
11 15  
12   -if (!key_exists("token", $_GET)) {
13   - $result = array('success' => false, 'message' => "Authentication is required for this webservice.");
14   -} else if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
15   - $result = array('success' => false, 'status' => 'expired', 'message' => "Token expired. Please authenticate again.");
16   -} else {
17   - $result = $amda_ws->getDataset($_GET);
18   -}
  16 + $amda_ws = new WebServer();
  17 +
  18 + if ($amda_ws->getNewToken()['token'] != $_GET["token"])
  19 + {
  20 + $result = array('success' => false, 'status' => 'expired', 'message' => "Token expired. Please authenticate again.");
  21 + } else
  22 + {
  23 + $result = $amda_ws->getDataset($_GET);
  24 + }
19 25  
20   -echo json_encode($result);
21   -?>
  26 + echo json_encode($result);
  27 + ?>
... ...
php/rest/getOrbites.php
  Diff comments   View file @5e2ea05
1 1 <?php
2 2  
3 3 /**
4   - * @file getParameter.php
5   - * @brief REST interface for service getParameter
6   - *
7   - *
8   - * @version $Id: $
  4 + * @file getOrbites.php
  5 + * @brief REST interface for service getOrbites
9 6 */
10 7  
11   -require_once '../config.php';
  8 + require_once '../config.php';
12 9  
13   -$amda_ws = new WebServer();
  10 + if (!key_exists("token", $_GET))
  11 + {
  12 + $result = array('success' => false, 'message' => "Authentication is required for this webservice.");
  13 + exit(json_encode($result));
  14 + }
  15 +
  16 + $amda_ws = new WebServer();
  17 +
  18 + if ($amda_ws->getNewToken()['token'] != $_GET["token"])
  19 + {
  20 + $result = array('success' => false, 'status' => 'expired', 'message' => "Token expired. Please authenticate again.");
  21 + } else
  22 + {
  23 + $result = $amda_ws->getOrbites($_GET);
  24 + }
14 25  
15   -if (!key_exists("token", $_GET)) {
16   - $result = array('success' => false, 'message' => "E01: Authentication is required for this webservice.");
17   -} else if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
18   - $result = array('success' => false, 'message' => "E02: Token expired. Please authenticate again.");
19   -} else {
20   - $result = $amda_ws->getOrbites($_GET);
21   -}
22   -
23   -if ($result['success']) {
24   - echo $result['dataFileURLs'];
25   -} else {
26   - echo $result['message'];
27   -}
  26 + echo json_encode($result);
28 27  
29 28 ?>
30 29 \ No newline at end of file
... ...
php/rest/getParameter.php
  Diff comments   View file @5e2ea05
... ... @@ -3,21 +3,25 @@
3 3 /**
4 4 * @file getParameter.php
5 5 * @brief REST interface for service getParameter
6   - *
7   - *
8   - * @version $Id: $
9 6 */
10 7  
11   -require_once '../config.php';
  8 + require_once '../config.php';
12 9  
13   -$amda_ws = new WebServer();
  10 + if (!key_exists("token", $_GET))
  11 + {
  12 + $result = array('success' => false, 'message' => "Authentication is required for this webservice.");
  13 + exit(json_encode($result));
  14 + }
  15 +
  16 + $amda_ws = new WebServer();
14 17  
15   -if (!key_exists("token", $_GET)) {
16   - $result = array('success' => false, 'message' => "Authentication is required for this webservice.");
17   -} else if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
18   - $result = array('success' => false, 'status' => 'expired', 'message' => "Token expired. Please authenticate again.");
19   -} else {
20   - $result = $amda_ws->getParameter($_GET);
21   -}
22   -echo json_encode($result);
  18 + if ($amda_ws->getNewToken()['token'] != $_GET["token"])
  19 + {
  20 + $result = array('success' => false, 'status' => 'expired', 'message' => "Token expired. Please authenticate again.");
  21 + } else
  22 + {
  23 + $result = $amda_ws->getParameter($_GET);
  24 + }
  25 +
  26 + echo json_encode($result);
23 27 ?>
24 28 \ No newline at end of file
... ...
php/rest/getTimeTablesList.php
  Diff comments   View file @5e2ea05
... ... @@ -3,23 +3,22 @@
3 3 /**
4 4 * @file getTimeTablesList.php
5 5 * @brief REST interface for service getTimeTablesList
6   -*
7   -*
8   -* @version $Id: $
9 6 */
10 7  
11   - require_once '../config.php';
  8 + require_once '../config.php';
12 9  
13   - $amda_ws = new WebServer();
  10 + $amda_ws = new WebServer();
14 11  
15   - $result = $amda_ws->getTimeTablesList($_GET);
  12 + $result = $amda_ws->getTimeTablesList($_GET);
16 13  
17   - if ($result['success']){
18   - echo $result['TimeTablesList'];
19   - }
20   - else {
21   - echo $result['message'];
22   - }
  14 + if ($result['success'])
  15 + {
  16 + echo $result['TimeTablesList'];
  17 + }
  18 + else
  19 + {
  20 + echo $result['message'];
  21 + }
23 22 ?>
24 23  
25 24  
... ...