archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

When proxying cluster HTTP requests, forward only selected headers

Browse Source 
In the live cluster, some subset of the forwarded headers are creating
some issues for HTTP repository operations.
This commit is contained in:
epriestley
2016-04-09 03:39:17 -07:00
parent 57e606b395
commit 997460f12f
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/aphront/AphrontRequest.php
View File

@@ -754,7 +754,10 @@ final class AphrontRequest extends Phobject {
// NOTE: apache_request_headers() might provide a nicer way to do this, // NOTE: apache_request_headers() might provide a nicer way to do this,
// but isn't available under FCGI until PHP 5.4.0. // but isn't available under FCGI until PHP 5.4.0.
foreach ($_SERVER as $key => $value) { foreach ($_SERVER as $key => $value) {
if (preg_match('/^HTTP_/', $key)) { if (!preg_match('/^HTTP_/', $key)) {
continue;
}
// Unmangle the header as best we can. // Unmangle the header as best we can.
$key = substr($key, strlen('HTTP_')); $key = substr($key, strlen('HTTP_'));
$key = str_replace('_', ' ', $key); $key = str_replace('_', ' ', $key);
@@ -762,6 +765,15 @@ final class AphrontRequest extends Phobject {
$key = ucwords($key); $key = ucwords($key);
$key = str_replace(' ', '-', $key); $key = str_replace(' ', '-', $key);
// By default, do not forward headers.
$should_forward = false;
// Forward "X-Hgarg-..." headers.
if (preg_match('/^X-Hgarg-/', $key)) {
$should_forward = true;
}
if ($should_forward) {
$headers[] = array($key, $value); $headers[] = array($key, $value);
$seen[$key] = true; $seen[$key] = true;
} }