Revised for clarity and conciseness

Author: brcontainer

README.md

@@ -84,16 +84,16 @@ html2canvas(document.getElementById('container'), {
 
 Method | Description
 --- | ---
-`setOptions(string $key, mixed $value): void` | Setup generic options
+`setDrivers(array $drivers): void` | Set drivers used to download the resource
+`setOptions(string $key, mixed $value): void` | Set generic options
 `getOptions([string $key]): mixed` | Get generic options
-`urls([array $urls]): array` | Get or redefine allowed URLs
-`setDrivers(array $drivers): void` | Sets drivers used for download resource
-`addAllowedType(string $type, bool $binary): void` | Add Content-Type to the allowed list
-`removeAllowedType(string $type): void` | Remove content-type from the allowed list
+`setAllowUrls(array $urls): void` | Set allowed URLs
+`addAllowType(string $type, bool $binary): void` | Add content-type to the allowed list
+`removeAllowType(string $type): void` | Remove content-type from the allowed list
 `setTemporary(string $path): void` | Sets temporary handle path, eg.: `/mnt/storage/`, `php://temp`, `php://memory`
 `getTemporary(): resource` | Get temporary stream
 `download(string $url[, bool $ignoreDownloadError]): void` | Perform download
-`setResponseCacheTime(int $seconds): void` | Enable or disable cache for Proxy::respose() or Proxy::jsonp()
+`setResponseCacheTime(int $seconds): void` | Enable or disable cache for `Proxy::respose()` or `Proxy::jsonp()`
 `response(): void` | Dump response to output
 `jsonp(string $callback): void` | Output JSONP callback with URL or data URI content
 `getContents([int $length[, int $offset]]): string` | If last download was successful, contents will be returned
@@ -156,7 +156,7 @@ $proxy->setOptions('stream', [
 ]);
 ```
 
-## Allowed Content-Type
+## Allow Content-Type
 
 When executing the download() method a content-type validation will be performed, by default the following Content-Types are allowed:
 
@@ -174,16 +174,16 @@ Content-Type | `Proxy::jsonp()`
 You can define another allowed content-type, example:
 
 ```php
-$proxy->addAllowedType('image/x-icon', true);
-$proxy->addAllowedType('image/vnd.microsoft.icon', true);
+$proxy->addAllowType('image/x-icon', true);
+$proxy->addAllowType('image/vnd.microsoft.icon', true);
 ```
 
 Second parameter of the method specifies whether the `Proxy::jsonp()` should use URL encoding or Base64 encoding in the data URI scheme.
 
-To remove an allowed Content-Type use the `Proxy::removeAllowedType()` method, example:
+To remove an allowed Content-Type use the `Proxy::removeAllowType()` method, example:
 
 ```php
-$proxy->removeAllowedType('image/apng');
+$proxy->removeAllowType('image/apng');
 ```
 
 ## How to use

proxy.php

@@ -18,15 +18,20 @@
 $proxy = new Proxy();
 
 // Set allowed URLs
-// $proxy->urls([ 'https://*.domain.io/', 'https://cdn.foobar.io/' ]);
+/*
+$proxy->setAllowUrls([
+    'https://*.domain.io/',
+    'https://cdn.foobar.io/'
+]);
+*/
 
 // Set allowed content-types
-// $proxy->addAllowedType('image/ico', true);
+// $proxy->addAllowType('image/ico', true);
 
-// Extra configs for CURL
+// Extra configs for CurlDriver
 // $proxy->setOptions('curl', [ CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1_3 ]);
 
-// Extra configs for stream, see details in: https://www.php.net/manual/en/context.php
+// Extra configs for StreamDriver, see details in: https://www.php.net/manual/en/context.php
 /*
 $proxy->setOptions('stream', [
     'http' => [

src/Proxy.php

@@ -21,8 +21,9 @@ class Proxy
     ];
     private $driver;
     private $drivers = [];
-    private $allowedUrls = ['*'];
-    private $allowedTypes = [
+    private $allowUrls = [];
+    private $allowUrlsRegEx;
+    private $allowTypes = [
         'image/apng' => true,
         'image/png' => true,
         'image/avif' => true,
@@ -48,7 +49,18 @@ public function __construct()
     }
 
     /**
-     * Setup generic options
+     * Set drivers used to download the resource
+     *
+     * @param array $drivers Set drivers
+     * @return void
+     */
+    public function setDrivers(array $drivers)
+    {
+        $this->drivers = $drivers;
+    }
+
+    /**
+     * Set generic options
      *
      * @param string $key
      * @param mixed $value
@@ -85,31 +97,15 @@ public function getOptions($key = null)
     }
 
     /**
-     * Get or redefine allowed URLs
+     * Set allowed URLs
      *
-     * @param array $urls Optional. Redefine allowed URLs
-     * @return array      Return current allowed URLs
-     */
-    public function urls(array $urls = [])
-    {
-        if (empty($urls)) {
-            return $this->allowedUrls;
-        }
-
-        $current = $this->allowedUrls;
-        $this->allowedUrls = $urls;
-        return $current;
-    }
-
-    /**
-     * Set drivers used for download resource
-     *
-     * @param array $drivers Set drivers
+     * @param array $urls
      * @return void
      */
-    public function setDrivers(array $drivers)
+    public function setAllowUrls(array $urls)
     {
-        $this->drivers = $drivers;
+        $this->allowUrls = $urls;
+        $this->allowUrlsRegEx = null;
     }
 
     /**
@@ -119,9 +115,9 @@ public function setDrivers(array $drivers)
      * @param string $binary
      * @return void
      */
-    public function addAllowedType($type, $binary)
+    public function addAllowType($type, $binary)
     {
-        $this->allowedTypes[$type] = $binary;
+        $this->allowTypes[$type] = $binary;
     }
 
     /**
@@ -130,9 +126,9 @@ public function addAllowedType($type, $binary)
      * @param string $type
      * @return void
      */
-    public function removeAllowedType($type)
+    public function removeAllowType($type)
     {
-        unset($this->allowedTypes[$type]);
+        unset($this->allowTypes[$type]);
     }
 
     /**
@@ -222,7 +218,7 @@ public function download($url, $ignoreDownloadError = false)
             $contentType = trim($contentType);
         }
 
-        if (array_key_exists($contentType, $this->allowedTypes) === false) {
+        if (array_key_exists($contentType, $this->allowTypes) === false) {
             $this->raise('Not allowed Content-type: ' . $contentType);
         }
 
@@ -305,7 +301,7 @@ public function jsonp($callback)
             list($contentType, $extra) = $extract;
         }
 
-        $binary = $this->allowedTypes[$contentType];
+        $binary = $this->allowTypes[$contentType];
 
         if ($binary) {
             $contentType .= ';base64';
@@ -433,17 +429,21 @@ private function httpCache()
 
     private function validateUrl($url)
     {
-        $alloweds = $this->allowedUrls;
-
-        if (in_array('*', $alloweds) === false) {
-            $re = implode('|', $alloweds);
-            $re = preg_quote($re, '#');
-            $re = strtr($re, array(
-                '\\*' => '\\w+',
-                '\\|' => '|'
-            ));
+        $urlList = $this->allowUrls;
+
+        if ($urlList) {
+            if ($this->allowUrlsRegEx === null) {
+                $regex = implode('|', $urlList);
+                $regex = preg_quote($regex, '#');
+                $regex = strtr($regex, array(
+                    '\\*' => '\\w+',
+                    '\\|' => '|'
+                ));
+
+                $this->allowUrlsRegEx = '#^(' . $regex . ')#';
+            }
 
-            if (!preg_match('#^(' . $re . ')#', $url)) {
+            if (!preg_match($this->allowUrlsRegEx, $url)) {
                 return false;
             }
         }