Fixes and support for PHP 8.5

- PHP 8.5 support.
- StreamDriver: improved issue checking (wrapper_data).
- Improved URL verification.
- Fixed exception messages.

Author: brcontainer

src/Drivers/CurlDriver.php

@@ -58,6 +58,8 @@ public function exec($url, &$httpStatus, &$contentType, &$errorCode, &$errorMess
         if ($this->handle === null || $this->lastUpdate < $update) {
             $this->lastUpdate = $update;
 
+            $this->close();
+
             $this->handle = curl_init();
 
             $ch = $this->handle;
@@ -151,7 +153,7 @@ private function abort($downloaded)
 
         $httpCode = curl_getinfo($this->handle, CURLINFO_HTTP_CODE);
 
-        if ($httpCode !== 0 && $httpCode < 200 || $httpCode >= 400) {
+        if (($httpCode !== 0 && $httpCode < 200) || $httpCode >= 400) {
             $this->httpStatus = $httpCode;
             return 1;
         }
@@ -165,10 +167,17 @@ private function abort($downloaded)
         return 0;
     }
 
-    public function __destruct()
+    private function close()
     {
-        if ($this->handle) {
+        if ($this->handle && PHP_VERSION_ID < 80500) {
             curl_close($this->handle);
         }
+
+        $this->handle = null;
+    }
+
+    public function __destruct()
+    {
+        $this->close();
     }
 }

src/Drivers/StreamDriver.php

@@ -115,6 +115,12 @@ public function exec($url, &$httpStatus, &$contentType, &$errorCode, &$errorMess
 
         $meta_data = stream_get_meta_data($handle);
 
+        if (empty($meta_data['wrapper_data'])) {
+            $errorMessage = 'Missing `wrapper_data` info';
+            fclose($handle);
+            return false;
+        }
+
         foreach ($meta_data['wrapper_data'] as $index => $header) {
             if ($index === 0) {
                 if (preg_match('#HTTP/\d+\.\d+\s+(\d+)#', $header, $match)) {

src/Proxy.php

@@ -361,6 +361,14 @@ public function getTemporary()
      */
     public function download($url)
     {
+        if ($this->isHttpUrl($url, $message) === false) {
+            $this->raise($message);
+        }
+
+        if ($this->checkAllowedUrl($url) === false) {
+            $this->raise('URL not allowed: ' . $url);
+        }
+
         if ($this->temporary === null) {
             $temporary = tmpfile();
 
@@ -371,10 +379,6 @@ public function download($url)
             }
         }
 
-        if ($this->validateUrl($url) === false) {
-            $this->raise('URL not allowed: ' . $url);
-        }
-
         $this->errorCode = null;
         $this->errorMessage = null;
         $this->httpStatus = null;
@@ -434,7 +438,9 @@ public function download($url)
                 $this->errorMessage = 'An unexpected issue occurred';
             }
 
-            $this->raise($this->errorMessage, $this->errorCode);
+            $message = get_class($this->driver) . ': ' . $this->errorMessage;
+
+            $this->raise($message, $this->errorCode);
         }
     }
 
@@ -620,16 +626,34 @@ private function sendHeaders($contentType)
         header('Content-type: ' . $contentType);
     }
 
-    private function validateUrl($url)
+    private function isHttpUrl($url, &$message)
+    {
+        if (filter_var($url, FILTER_VALIDATE_URL) === false) {
+            $message = "Invalid URL: {$url}";
+            return false;
+        }
+
+        if (in_array(parse_url($url, PHP_URL_SCHEME), array('http', 'https')) == false) {
+            $message = "The following URL is not http/https: {$url}";
+            return false;
+        }
+
+        return true;
+    }
+
+    private function checkAllowedUrl($url)
     {
         if ($this->allowedUrls) {
             if ($this->allowedUrlsRegEx === null) {
-                foreach ($this->allowedUrls as &$entry) {
+                $allowed = array();
+
+                foreach ($this->allowedUrls as $entry) {
                     $entry = preg_quote($entry, '#');
                     $entry = str_replace('\\*', '[^/]+', $entry);
+                    $allowed[] = $entry;
                 }
 
-                $this->allowedUrlsRegEx = '#^(' . implode('|', $this->allowedUrls) . ')$#';
+                $this->allowedUrlsRegEx = '#^(' . implode('|', $allowed) . ')$#';
             }
 
             if (preg_match($this->allowedUrlsRegEx, $url) !== 1) {
@@ -642,8 +666,6 @@ private function validateUrl($url)
 
     private function raise($message, $code = 0)
     {
-        $message = get_class($this->driver) . ': ' . $message;
-
         if ($this->coreException) {
             throw new \Inphinit\Exception($message, $code, 3);
         } else {