Page MenuHomePhabricator
Files F15463315

D20046.id47909.diff
No OneTemporary
Actions

D20046.id47909.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -183,7 +183,6 @@
'AphrontCalendarEventView' => 'applications/calendar/view/AphrontCalendarEventView.php',
'AphrontController' => 'aphront/AphrontController.php',
'AphrontCursorPagerView' => 'view/control/AphrontCursorPagerView.php',
- 'AphrontDefaultApplicationConfiguration' => 'aphront/configuration/AphrontDefaultApplicationConfiguration.php',
'AphrontDialogResponse' => 'aphront/response/AphrontDialogResponse.php',
'AphrontDialogView' => 'view/AphrontDialogView.php',
'AphrontEpochHTTPParameterType' => 'aphront/httpparametertype/AphrontEpochHTTPParameterType.php',
@@ -5631,7 +5630,6 @@
'AphrontCalendarEventView' => 'AphrontView',
'AphrontController' => 'Phobject',
'AphrontCursorPagerView' => 'AphrontView',
- 'AphrontDefaultApplicationConfiguration' => 'AphrontApplicationConfiguration',
'AphrontDialogResponse' => 'AphrontResponse',
'AphrontDialogView' => array(
'AphrontView',
diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -5,55 +5,81 @@
* @task response Response Handling
* @task exception Exception Handling
*/
-abstract class AphrontApplicationConfiguration extends Phobject {
+final class AphrontApplicationConfiguration
+ extends Phobject {
private $request;
private $host;
private $path;
private $console;
- abstract public function buildRequest();
- abstract public function build404Controller();
- abstract public function buildRedirectController($uri, $external);
+ public function buildRequest() {
+ $parser = new PhutilQueryStringParser();
- final public function setRequest(AphrontRequest $request) {
+ $data = array();
+ $data += $_POST;
+ $data += $parser->parseQueryString(idx($_SERVER, 'QUERY_STRING', ''));
+
+ $cookie_prefix = PhabricatorEnv::getEnvConfig('phabricator.cookie-prefix');
+
+ $request = new AphrontRequest($this->getHost(), $this->getPath());
+ $request->setRequestData($data);
+ $request->setApplicationConfiguration($this);
+ $request->setCookiePrefix($cookie_prefix);
+
+ return $request;
+ }
+
+ public function build404Controller() {
+ return array(new Phabricator404Controller(), array());
+ }
+
+ public function buildRedirectController($uri, $external) {
+ return array(
+ new PhabricatorRedirectController(),
+ array(
+ 'uri' => $uri,
+ 'external' => $external,
+ ),
+ );
+ }
+
+ public function setRequest(AphrontRequest $request) {
$this->request = $request;
return $this;
}
- final public function getRequest() {
+ public function getRequest() {
return $this->request;
}
- final public function getConsole() {
+ public function getConsole() {
return $this->console;
}
- final public function setConsole($console) {
+ public function setConsole($console) {
$this->console = $console;
return $this;
}
- final public function setHost($host) {
+ public function setHost($host) {
$this->host = $host;
return $this;
}
- final public function getHost() {
+ public function getHost() {
return $this->host;
}
- final public function setPath($path) {
+ public function setPath($path) {
$this->path = $path;
return $this;
}
- final public function getPath() {
+ public function getPath() {
return $this->path;
}
- public function willBuildRequest() {}
-
/**
* @phutil-external-symbol class PhabricatorStartup
@@ -126,6 +152,8 @@
'M' => idx($_SERVER, 'REQUEST_METHOD', '-'),
));
+ self::readHTTPPOSTData();
+
DarkConsoleXHProfPluginAPI::hookProfiler();
// We just activated the profiler, so we don't need to keep track of
@@ -142,16 +170,10 @@
$host = AphrontRequest::getHTTPHeader('Host');
$path = $_REQUEST['__path__'];
- switch ($host) {
- default:
- $config_key = 'aphront.default-application-configuration-class';
- $application = PhabricatorEnv::newObjectFromConfig($config_key);
- break;
- }
+ $application = new self();
$application->setHost($host);
$application->setPath($path);
- $application->willBuildRequest();
$request = $application->buildRequest();
// Now that we have a request, convert the write guard into one which
@@ -313,7 +335,7 @@
* parameters.
* @task routing
*/
- final private function buildController() {
+ private function buildController() {
$request = $this->getRequest();
// If we're configured to operate in cluster mode, reject requests which
@@ -708,4 +730,84 @@
->setContent($result);
}
+ private static function readHTTPPOSTData() {
+ $request_method = idx($_SERVER, 'REQUEST_METHOD');
+ if ($request_method === 'PUT') {
+ // For PUT requests, do nothing: in particular, do NOT read input. This
+ // allows us to stream input later and process very large PUT requests,
+ // like those coming from Git LFS.
+ return;
+ }
+
+
+ // For POST requests, we're going to read the raw input ourselves here
+ // if we can. Among other things, this corrects variable names with
+ // the "." character in them, which PHP normally converts into "_".
+
+ // There are two major considerations here: whether the
+ // `enable_post_data_reading` option is set, and whether the content
+ // type is "multipart/form-data" or not.
+
+ // If `enable_post_data_reading` is off, we're free to read the entire
+ // raw request body and parse it -- and we must, because $_POST and
+ // $_FILES are not built for us. If `enable_post_data_reading` is on,
+ // which is the default, we may not be able to read the body (the
+ // documentation says we can't, but empirically we can at least some
+ // of the time).
+
+ // If the content type is "multipart/form-data", we need to build both
+ // $_POST and $_FILES, which is involved. The body itself is also more
+ // difficult to parse than other requests.
+ $raw_input = PhabricatorStartup::getRawInput();
+ $parser = new PhutilQueryStringParser();
+
+ if (strlen($raw_input)) {
+ $content_type = idx($_SERVER, 'CONTENT_TYPE');
+ $is_multipart = preg_match('@^multipart/form-data@i', $content_type);
+ if ($is_multipart && !ini_get('enable_post_data_reading')) {
+ $multipart_parser = id(new AphrontMultipartParser())
+ ->setContentType($content_type);
+
+ $multipart_parser->beginParse();
+ $multipart_parser->continueParse($raw_input);
+ $parts = $multipart_parser->endParse();
+
+ $query_string = array();
+ foreach ($parts as $part) {
+ if (!$part->isVariable()) {
+ continue;
+ }
+
+ $name = $part->getName();
+ $value = $part->getVariableValue();
+
+ $query_string[] = urlencode($name).'='.urlencode($value);
+ }
+ $query_string = implode('&', $query_string);
+ $post = $parser->parseQueryString($query_string);
+
+ $files = array();
+ foreach ($parts as $part) {
+ if ($part->isVariable()) {
+ continue;
+ }
+
+ $files[$part->getName()] = $part->getPHPFileDictionary();
+ }
+ $_FILES = $files;
+ } else {
+ $post = $parser->parseQueryString($raw_input);
+ }
+
+ $_POST = $post;
+ PhabricatorStartup::rebuildRequest();
+ } else if ($_POST) {
+ $post = filter_input_array(INPUT_POST, FILTER_UNSAFE_RAW);
+ if (is_array($post)) {
+ $_POST = $post;
+ PhabricatorStartup::rebuildRequest();
+ }
+ }
+ }
+
}
diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
deleted file mode 100644
--- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * NOTE: Do not extend this!
- *
- * @concrete-extensible
- */
-class AphrontDefaultApplicationConfiguration
- extends AphrontApplicationConfiguration {
-
- /**
- * @phutil-external-symbol class PhabricatorStartup
- */
- public function buildRequest() {
- $parser = new PhutilQueryStringParser();
- $data = array();
-
- $request_method = idx($_SERVER, 'REQUEST_METHOD');
- if ($request_method === 'PUT') {
- // For PUT requests, do nothing: in particular, do NOT read input. This
- // allows us to stream input later and process very large PUT requests,
- // like those coming from Git LFS.
- } else {
- // For POST requests, we're going to read the raw input ourselves here
- // if we can. Among other things, this corrects variable names with
- // the "." character in them, which PHP normally converts into "_".
-
- // There are two major considerations here: whether the
- // `enable_post_data_reading` option is set, and whether the content
- // type is "multipart/form-data" or not.
-
- // If `enable_post_data_reading` is off, we're free to read the entire
- // raw request body and parse it -- and we must, because $_POST and
- // $_FILES are not built for us. If `enable_post_data_reading` is on,
- // which is the default, we may not be able to read the body (the
- // documentation says we can't, but empirically we can at least some
- // of the time).
-
- // If the content type is "multipart/form-data", we need to build both
- // $_POST and $_FILES, which is involved. The body itself is also more
- // difficult to parse than other requests.
- $raw_input = PhabricatorStartup::getRawInput();
- if (strlen($raw_input)) {
- $content_type = idx($_SERVER, 'CONTENT_TYPE');
- $is_multipart = preg_match('@^multipart/form-data@i', $content_type);
- if ($is_multipart && !ini_get('enable_post_data_reading')) {
- $multipart_parser = id(new AphrontMultipartParser())
- ->setContentType($content_type);
-
- $multipart_parser->beginParse();
- $multipart_parser->continueParse($raw_input);
- $parts = $multipart_parser->endParse();
-
- $query_string = array();
- foreach ($parts as $part) {
- if (!$part->isVariable()) {
- continue;
- }
-
- $name = $part->getName();
- $value = $part->getVariableValue();
-
- $query_string[] = urlencode($name).'='.urlencode($value);
- }
- $query_string = implode('&', $query_string);
- $post = $parser->parseQueryString($query_string);
-
- $files = array();
- foreach ($parts as $part) {
- if ($part->isVariable()) {
- continue;
- }
-
- $files[$part->getName()] = $part->getPHPFileDictionary();
- }
- $_FILES = $files;
- } else {
- $post = $parser->parseQueryString($raw_input);
- }
-
- $_POST = $post;
- PhabricatorStartup::rebuildRequest();
-
- $data += $post;
- } else if ($_POST) {
- $post = filter_input_array(INPUT_POST, FILTER_UNSAFE_RAW);
- if (is_array($post)) {
- $_POST = $post;
- PhabricatorStartup::rebuildRequest();
- }
- $data += $_POST;
- }
- }
-
- $data += $parser->parseQueryString(idx($_SERVER, 'QUERY_STRING', ''));
-
- $cookie_prefix = PhabricatorEnv::getEnvConfig('phabricator.cookie-prefix');
-
- $request = new AphrontRequest($this->getHost(), $this->getPath());
- $request->setRequestData($data);
- $request->setApplicationConfiguration($this);
- $request->setCookiePrefix($cookie_prefix);
-
- return $request;
- }
-
- public function build404Controller() {
- return array(new Phabricator404Controller(), array());
- }
-
- public function buildRedirectController($uri, $external) {
- return array(
- new PhabricatorRedirectController(),
- array(
- 'uri' => $uri,
- 'external' => $external,
- ),
- );
- }
-
-}
diff --git a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
--- a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
+++ b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
@@ -12,7 +12,7 @@
$root = dirname(phutil_get_library_root('phabricator'));
require_once $root.'/support/startup/PhabricatorStartup.php';
- $application_configuration = new AphrontDefaultApplicationConfiguration();
+ $application_configuration = new AphrontApplicationConfiguration();
$host = 'meow.example.com';
diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
@@ -416,6 +416,10 @@
'metamta.pholio.subject-prefix' => $prefix_reason,
'metamta.phriction.subject-prefix' => $prefix_reason,
+ 'aphront.default-application-configuration-class' => pht(
+ 'This ancient extension point has been replaced with other '.
+ 'mechanisms, including "AphrontSite".'),
+
);
return $ancient_config;
diff --git a/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php b/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php
--- a/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php
+++ b/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php
@@ -36,14 +36,6 @@
'occur. Specify a list of classes which extend '.
'PhabricatorEventListener here.'))
->addExample('MyEventListener', pht('Valid Setting')),
- $this->newOption(
- 'aphront.default-application-configuration-class',
- 'class',
- 'AphrontDefaultApplicationConfiguration')
- ->setLocked(true)
- ->setBaseClass('AphrontApplicationConfiguration')
- // TODO: This could probably use some better documentation.
- ->setDescription(pht('Application configuration class.')),
);
}

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 2, 10:24 PM (6 d, 8 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7714572
Default Alt Text
D20046.id47909.diff (14 KB)

Event Timeline

Phabricator · Built by Phacility