CDPP / AMDA_IHM

Commit 47ef4864379588ff087bd48ab081c15e37c12b2f

Authored by Nathanael Jourdane
1 parent 6104c71e
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

Set timeLimit in config.php and set it to 10minutes.

Showing 3 changed files with 9 additions and 4 deletions   Show diff stats
Inline Side-by-side
php/classes/WebServer.php
  Diff comments   View file @47ef486
... ... @@ -5,6 +5,9 @@
5 5 *
6 6 * @version $Id: WebServer.php 2968 2015-06-29 13:17:00Z natacha $
7 7 */
  8 +
  9 +require_once '../config.php';
  10 +
8 11 class WebResultMgr
9 12 {
10 13 private $resDOM;
... ... @@ -83,7 +86,6 @@ class WebServer
83 86 private $wsUserMgr;
84 87 private $resultMgr, $myParamsInfoMgr;
85 88 private $dataFileName;
86   - private $timeLimitQuery; // Time interval between 2 queries before to ask for a new authentification, in seconds.
87 89  
88 90 function __construct() {
89 91 $this->userID = 'impex';
... ... @@ -91,7 +93,6 @@ class WebServer
91 93 $this->sessionID = $this->userID;
92 94 $this->myParamsInfoMgr = new ParamsInfoMgr();
93 95 $this->resultMgr = new WebResultMgr();
94   - $this->timeLimitQuery = 30;
95 96 }
96 97  
97 98 protected function init($data) {
... ... @@ -551,7 +552,8 @@ class WebServer
551 552  
552 553 public function getNewToken() {
553 554 $timeStamp = (new DateTime())->getTimestamp();
554   - $newToken = md5((int)($timeStamp/30));
  555 + // generate token from timeStamp and some salt
  556 + $newToken = md5(1321 * (int)($timeStamp/timeLimitQuery));
555 557 return array('success' => true, 'token' => $newToken);
556 558 }
557 559  
... ...
php/config.php
  Diff comments   View file @47ef486
... ... @@ -118,6 +118,9 @@ $SERVER_NAME = $_SERVER['SERVER_NAME'] ? $_SERVER['SERVER_NAME'] : gethostname(
118 118  
119 119 define('webAlias',"http://".$SERVER_NAME.APACHE_ALIAS);
120 120 define('wsdl_AMDA', webAlias."public/wsdl/Methods_AMDA.wsdl");
  121 +
  122 +// Time interval between 2 queries before to ask for a new authentification, in seconds.
  123 +define ('timeLimitQuery', 600);
121 124 /*-------------------END WEB SERVICES section ---------*/
122 125  
123 126 // AKKA - KERNELBIN is now the new kernel bin dir
... ...
php/rest/auth.php
  Diff comments   View file @47ef486
... ... @@ -12,7 +12,7 @@
12 12 require_once '../config.php';
13 13  
14 14 $amda_ws = new WebServer();
15   - $result = $amda_ws->auth($_GET);
  15 + $result = $amda_ws->getNewToken($_GET);
16 16  
17 17 if ($result['success']){
18 18 echo $result['token'];
... ...