Only http url scheme's should be used through curl

tdt · Dec 21, 2015 · e7ac97f · e7ac97f
1 parent a03a077
commit e7ac97f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/Tdt/Core/DataControllers/JSONController.php b/app/Tdt/Core/DataControllers/JSONController.php
@@ -100,7 +100,12 @@ private function getPlainJson($uri)
         }
 
         if (!filter_var($uri, FILTER_VALIDATE_URL) === false) {
-            $data = $this->getRemoteData($uri);
+            $parts = parse_url($uri);
+            if ($parts['scheme'] != 'file') {
+                $data = $this->getRemoteData($uri);
+            } else {
+                $data =@ file_get_contents($uri);
+            }
         } else {
             $data =@ file_get_contents($uri);
         }
@@ -139,9 +144,9 @@ private function getRemoteData($url)
         curl_close($c);
 
         preg_match('/(http(|s)):\/\/(.*?)\/(.*\/|)/si', $status['url'], $link);
-        $data = preg_replace('/(src|href|action)=(\'|\")((?!(http|https|javascript:|\/\/|\/)).*?)(\'|\")/si', '$1=$2'.$link[0] . '$3$4$5', $data);
+        $data = preg_replace('/(src|href|action)=(\'|\")((?!(http|https|javascript:|\/\/|\/)).*?)(\'|\")/si', '$1=$2' . $link[0] . '$3$4$5', $data);
 
-        $data=preg_replace('/(src|href|action)=(\'|\")((?!(http|https|javascript:|\/\/)).*?)(\'|\")/si', '$1=$2' . $link[1] .'://' . $link[3] . '$3$4$5', $data);
+        $data = preg_replace('/(src|href|action)=(\'|\")((?!(http|https|javascript:|\/\/)).*?)(\'|\")/si', '$1=$2' . $link[1] . '://' . $link[3] . '$3$4$5', $data);
 
         if ($status['http_code'] == 200) {
             return $data;

diff --git a/app/Tdt/Core/Formatters/JSONFormatter.php b/app/Tdt/Core/Formatters/JSONFormatter.php
@@ -26,10 +26,8 @@ public static function createResponse($dataObj)
 
     public static function getBody($dataObj)
     {
-
         // If the data is semantic, return json ld
         if ($dataObj->is_semantic) {
-
             $jsonld_formatter = new JSONLDFormatter();
 
             return $jsonld_formatter->getBody($dataObj);
@@ -42,7 +40,6 @@ public static function getBody($dataObj)
         }
 
         if ($dataObj->is_semantic) {
-
             // Check if a configuration is given
             $conf = array();
             if (!empty($dataObj->semantic->conf)) {