Convert to curl header format after filtering

WordPress · Dec 4, 2024 · d658b45 · d658b45
1 parent 78501d3
commit d658b45
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/packages/playground/php-cors-proxy/cors-proxy-functions.php b/packages/playground/php-cors-proxy/cors-proxy-functions.php
@@ -304,6 +304,9 @@ private static function ipv6InRange($ip, $start, $end)
 
 
 function filter_headers_strings($php_headers, $allowed_headers, $remove_headers) {
+    $allowed_headers = $allowed_headers ?? [];
+    $remove_headers = $remove_headers ?? [];
+
     $allowed_request_headers_header = strtolower('X-Cors-Proxy-Allowed-Request-Headers');
 
     // Add any additional allowed headers from X-Cors-Proxy-Allowed-Request-Headers
@@ -326,17 +329,15 @@ function filter_headers_strings($php_headers, $allowed_headers, $remove_headers)
     });
 
     $remove_headers = array_map('strtolower', $remove_headers);
-    $headers = [];
-    foreach ($php_headers as $header) {
-        $lower_header = strtolower($header);
-        foreach($remove_headers as $remove_header) {
-            if (strpos($lower_header, $remove_header) === 0) {
-                continue 2;
-            }
-        }
-        $headers[] = $header;
-    }
-    return $headers;
+
+    // Remove strictly disallowed headers
+    return array_filter(
+        $php_headers,
+        function($key) use ($remove_headers) {
+            return !in_array(strtolower($key), $remove_headers);
+        },
+        ARRAY_FILTER_USE_KEY
+    );
 }
 
 function kv_headers_to_curl_format($headers) {

diff --git a/packages/playground/php-cors-proxy/cors-proxy.php b/packages/playground/php-cors-proxy/cors-proxy.php
@@ -107,10 +107,12 @@
     'Cookie',
     'Host'
 ];
-$curlHeaders = filter_headers_strings(
-    kv_headers_to_curl_format(getallheaders()),
-    $default_allowed_headers,
-    $strictly_disallowed_headers
+$curlHeaders = kv_headers_to_curl_format(
+    filter_headers_strings(
+        getallheaders(),
+        $default_allowed_headers,
+        $strictly_disallowed_headers
+    )
 );
 curl_setopt(
     $ch,