Add rate limit only for Rest webservice, and also on GetOrbites and getDatasetData methods

Nathanael Jourdane
1 parent 47ef4864
Showing 5 changed files with 97 additions and 88 deletions Show diff stats
php/classes/WebServer.php
php/rest/auth.php
php/rest/getDatasetData.php
php/rest/getOrbites.php
php/rest/getParameter.php
@@ -6,8 +6,6 @@
 *   @version $Id: WebServer.php 2968 2015-06-29 13:17:00Z natacha $ 
 */
  
-require_once '../config.php';
-
 class WebResultMgr
 {
   private $resDOM;
@@ -572,14 +570,6 @@ class WebServer
  
     $vars = $res['vars'];
  
-	if (!$vars["token"]) {
-		return array('success' => false, 'message' => "E01\nAuthentication is required for this webservice.");
-	}
-
-	  if($this->getNewToken()['token'] != $vars["token"]) {
-		  return array('success' => false, 'message' => "E02\nToken expired. Please authenticate again.");
-	  }
-
 	if ((strtotime($vars["stopTime"]) - strtotime($vars["startTime"])) < 0){
       if ($this->isSoap)  throw new SoapFault("request01","Start time must be higher than stop time"); 
       else return array('success' => false, 'message' => "Start time must be higher than stop time");
-
 <?php
  
 /**
- *   @file getParameter.php
- *   @brief  REST interface for service getParameter
+ * @file getParameter.php
+ * @brief  REST interface for service getParameter
  *
  *
- *   @version $Id:  $
+ * @version $Id:  $
  */
  
-  require_once '../config.php';
+require_once '../config.php';
  
-  $amda_ws = new WebServer();
-  $result = $amda_ws->getNewToken($_GET);
+$amda_ws = new WebServer();
+$result = $amda_ws->getNewToken($_GET);
  
- if ($result['success']){
-	 echo $result['token'];
- }
- else {
-	 echo $result['message'];
- }
+if ($result['success']) {
+    echo $result['token'];
+} else {
+    echo $result['message'];
+}
  
 ?>
 \ No newline at end of file
 <?php
-/** 
-*   @file getParameter.php 
-*   @brief  REST interface for service getParameter
-*
-*   
-*   @version $Id:  $ 
-*/
-  ini_set("allow_url_fopen", true);
-  require_once '../config.php';
-
-  $amda_ws = new WebServer();
-  $result = $amda_ws->getDataset($_GET);
-
-  if ($result['success']){
-      $file = str_replace("http://oberoi.cesr.fr/AMDA-WS/",BASE_PATH ,$result['dataFileURLs']);
-
-      if ($file){
+/**
+ * @file getParameter.php
+ * @brief  REST interface for service getParameter
+ *
+ *
+ * @version $Id:  $
+ */
+ini_set("allow_url_fopen", true);
+require_once '../config.php';
+
+$amda_ws = new WebServer();
+
+if (!$_GET["token"]) {
+    return array('success' => false, 'message' => "E01\nAuthentication is required for this webservice.");
+}
+if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
+    return array('success' => false, 'message' => "E02\nToken expired. Please authenticate again.");
+}
+
+$result = $amda_ws->getDataset($_GET);
+
+if ($result['success']) {
+    $file = str_replace("http://oberoi.cesr.fr/AMDA-WS/", BASE_PATH, $result['dataFileURLs']);
+
+    if ($file) {
 // 	header('Content-type: text/xml');
 //         $contenu = file_get_contents($file); 
 // error_log($contenu,3,'/home/natacha/TMP/tmp.xml');        
 // 	echo $contenu; 
-	
-header('Content-type: text/xml');	
-$doc = new DOMDocument();
-$doc->load($file);
-echo $doc->saveXML();
-	
-
-      }
-    }
-    else {
-      $success = "false";
-      echo '<?xml version="1.0" encoding="UTF-8"?><getParameterResponse>';
-      echo '<success>'.$success.'</success>';
-      echo '<message>'.$result['message'].'</message></getParameterResponse>';  
+
+        header('Content-type: text/xml');
+        $doc = new DOMDocument();
+        $doc->load($file);
+        echo $doc->saveXML();
+
+
     }
+} else {
+    $success = "false";
+    echo '<?xml version="1.0" encoding="UTF-8"?><getParameterResponse>';
+    echo '<success>' . $success . '</success>';
+    echo '<message>' . $result['message'] . '</message></getParameterResponse>';
+}
 ?>
 <?php
-  
-/** 
-*   @file getParameter.php 
-*   @brief  REST interface for service getParameter
-*
-*   
-*   @version $Id:  $ 
-*/
  
-  require_once '../config.php';
+/**
+ * @file getParameter.php
+ * @brief  REST interface for service getParameter
+ *
+ *
+ * @version $Id:  $
+ */
  
-  $amda_ws = new WebServer();
-  $result = $amda_ws->getOrbites($_GET);
+require_once '../config.php';
  
- if ($result['success']){
-	echo $result['dataFileURLs'];
-   }
-    else {
-     echo $result['message'];  
-    }
+$amda_ws = new WebServer();
+
+if (!$_GET["token"]) {
+    return array('success' => false, 'message' => "E01\nAuthentication is required for this webservice.");
+}
+if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
+    return array('success' => false, 'message' => "E02\nToken expired. Please authenticate again.");
+}
+
+$result = $amda_ws->getOrbites($_GET);
+
+if ($result['success']) {
+    echo $result['dataFileURLs'];
+} else {
+    echo $result['message'];
+}
  
 ?>
 \ No newline at end of file
 <?php
-  
-/** 
-*   @file getParameter.php 
-*   @brief  REST interface for service getParameter
-*
-*   
-*   @version $Id:  $ 
-*/
  
-  require_once '../config.php';
+/**
+ * @file getParameter.php
+ * @brief  REST interface for service getParameter
+ *
+ *
+ * @version $Id:  $
+ */
  
-  $amda_ws = new WebServer();
-  $result = $amda_ws->getParameter($_GET);
+require_once '../config.php';
  
- if ($result['success']){
-	echo $result['dataFileURLs'];
-   }
-    else {
-     echo $result['message'];  
-    }
+$amda_ws = new WebServer();
+
+if (!$_GET["token"]) {
+    return array('success' => false, 'message' => "E01\nAuthentication is required for this webservice.");
+}
+if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
+    return array('success' => false, 'message' => "E02\nToken expired. Please authenticate again.");
+}
+
+$result = $amda_ws->getParameter($_GET);
+
+if ($result['success']) {
+    echo $result['dataFileURLs'];
+} else {
+    echo $result['message'];
+}
  
 ?>
 \ No newline at end of file