Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13822840
D18136.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Referenced Files
None
Subscribers
None
D18136.diff
View Options
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
@@ -270,7 +270,10 @@
}
} catch (Exception $ex) {
$original_exception = $ex;
- $response = $this->handleException($ex);
+ $response = $this->handleThrowable($ex);
+ } catch (Throwable $ex) {
+ $original_exception = $ex;
+ $response = $this->handleThrowable($ex);
}
try {
@@ -663,24 +666,24 @@
* This method delegates exception handling to available subclasses of
* @{class:AphrontRequestExceptionHandler}.
*
- * @param Exception Exception which needs to be handled.
+ * @param Throwable Exception which needs to be handled.
* @return wild Response or response producer, or null if no available
* handler can produce a response.
* @task exception
*/
- private function handleException(Exception $ex) {
+ private function handleThrowable($throwable) {
$handlers = AphrontRequestExceptionHandler::getAllHandlers();
$request = $this->getRequest();
foreach ($handlers as $handler) {
- if ($handler->canHandleRequestException($request, $ex)) {
- $response = $handler->handleRequestException($request, $ex);
+ if ($handler->canHandleRequestThrowable($request, $throwable)) {
+ $response = $handler->handleRequestThrowable($request, $throwable);
$this->validateErrorHandlerResponse($handler, $response);
return $response;
}
}
- throw $ex;
+ throw $throwable;
}
private static function newSelfCheckResponse() {
diff --git a/src/aphront/handler/AphrontRequestExceptionHandler.php b/src/aphront/handler/AphrontRequestExceptionHandler.php
--- a/src/aphront/handler/AphrontRequestExceptionHandler.php
+++ b/src/aphront/handler/AphrontRequestExceptionHandler.php
@@ -12,19 +12,13 @@
abstract public function getRequestExceptionHandlerPriority();
- public function shouldLogException(
+ abstract public function canHandleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
- return null;
- }
-
- abstract public function canHandleRequestException(
- AphrontRequest $request,
- Exception $ex);
+ $throwable);
- abstract public function handleRequestException(
+ abstract public function handleRequestThrowable(
AphrontRequest $request,
- Exception $ex);
+ $throwable);
final public static function getAllHandlers() {
return id(new PhutilClassMapQuery())
diff --git a/src/aphront/handler/PhabricatorAjaxRequestExceptionHandler.php b/src/aphront/handler/PhabricatorAjaxRequestExceptionHandler.php
--- a/src/aphront/handler/PhabricatorAjaxRequestExceptionHandler.php
+++ b/src/aphront/handler/PhabricatorAjaxRequestExceptionHandler.php
@@ -11,27 +11,28 @@
return pht('Responds to requests made by AJAX clients.');
}
- public function canHandleRequestException(
+ public function canHandleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
// For non-workflow requests, return a Ajax response.
return ($request->isAjax() && !$request->isWorkflow());
}
- public function handleRequestException(
+ public function handleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
// Log these; they don't get shown on the client and can be difficult
// to debug.
- phlog($ex);
+ phlog($throwable);
$response = new AphrontAjaxResponse();
$response->setError(
array(
- 'code' => get_class($ex),
- 'info' => $ex->getMessage(),
+ 'code' => get_class($throwable),
+ 'info' => $throwable->getMessage(),
));
+
return $response;
}
diff --git a/src/aphront/handler/PhabricatorConduitRequestExceptionHandler.php b/src/aphront/handler/PhabricatorConduitRequestExceptionHandler.php
--- a/src/aphront/handler/PhabricatorConduitRequestExceptionHandler.php
+++ b/src/aphront/handler/PhabricatorConduitRequestExceptionHandler.php
@@ -11,19 +11,19 @@
return pht('Responds to requests made by Conduit clients.');
}
- public function canHandleRequestException(
+ public function canHandleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
return $request->isConduit();
}
- public function handleRequestException(
+ public function handleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
$response = id(new ConduitAPIResponse())
- ->setErrorCode(get_class($ex))
- ->setErrorInfo($ex->getMessage());
+ ->setErrorCode(get_class($throwable))
+ ->setErrorInfo($throwable->getMessage());
return id(new AphrontJSONResponse())
->setAddJSONShield(false)
diff --git a/src/aphront/handler/PhabricatorDefaultRequestExceptionHandler.php b/src/aphront/handler/PhabricatorDefaultRequestExceptionHandler.php
--- a/src/aphront/handler/PhabricatorDefaultRequestExceptionHandler.php
+++ b/src/aphront/handler/PhabricatorDefaultRequestExceptionHandler.php
@@ -11,9 +11,9 @@
return pht('Handles all other exceptions.');
}
- public function canHandleRequestException(
+ public function canHandleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
if (!$this->isPhabricatorSite($request)) {
return false;
@@ -22,9 +22,9 @@
return true;
}
- public function handleRequestException(
+ public function handleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
$viewer = $this->getViewer($request);
@@ -33,18 +33,18 @@
// the internet. These include requests with bad CSRF tokens and
// questionable "Host" headers.
$should_log = true;
- if ($ex instanceof AphrontMalformedRequestException) {
- $should_log = !$ex->getIsUnlogged();
+ if ($throwable instanceof AphrontMalformedRequestException) {
+ $should_log = !$throwable->getIsUnlogged();
}
if ($should_log) {
- phlog($ex);
+ phlog($throwable);
}
- $class = get_class($ex);
- $message = $ex->getMessage();
+ $class = get_class($throwable);
+ $message = $throwable->getMessage();
- if ($ex instanceof AphrontSchemaQueryException) {
+ if ($throwable instanceof AphrontSchemaQueryException) {
$message .= "\n\n".pht(
"NOTE: This usually indicates that the MySQL schema has not been ".
"properly upgraded. Run '%s' to ensure your schema is up to date.",
@@ -54,7 +54,7 @@
if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
$trace = id(new AphrontStackTraceView())
->setUser($viewer)
- ->setTrace($ex->getTrace());
+ ->setTrace($throwable->getTrace());
} else {
$trace = null;
}
diff --git a/src/aphront/handler/PhabricatorHighSecurityRequestExceptionHandler.php b/src/aphront/handler/PhabricatorHighSecurityRequestExceptionHandler.php
--- a/src/aphront/handler/PhabricatorHighSecurityRequestExceptionHandler.php
+++ b/src/aphront/handler/PhabricatorHighSecurityRequestExceptionHandler.php
@@ -13,26 +13,26 @@
'to present MFA credentials to take an action.');
}
- public function canHandleRequestException(
+ public function canHandleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
if (!$this->isPhabricatorSite($request)) {
return false;
}
- return ($ex instanceof PhabricatorAuthHighSecurityRequiredException);
+ return ($throwable instanceof PhabricatorAuthHighSecurityRequiredException);
}
- public function handleRequestException(
+ public function handleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
$viewer = $this->getViewer($request);
$form = id(new PhabricatorAuthSessionEngine())->renderHighSecurityForm(
- $ex->getFactors(),
- $ex->getFactorValidationResults(),
+ $throwable->getFactors(),
+ $throwable->getFactorValidationResults(),
$viewer,
$request);
@@ -61,7 +61,7 @@
'period of time. When you are finished taking sensitive '.
'actions, you should leave high security.'))
->setSubmitURI($request->getPath())
- ->addCancelButton($ex->getCancelURI())
+ ->addCancelButton($throwable->getCancelURI())
->addSubmitButton(pht('Enter High Security'));
$request_parameters = $request->getPassthroughRequestParameters(
diff --git a/src/aphront/handler/PhabricatorPolicyRequestExceptionHandler.php b/src/aphront/handler/PhabricatorPolicyRequestExceptionHandler.php
--- a/src/aphront/handler/PhabricatorPolicyRequestExceptionHandler.php
+++ b/src/aphront/handler/PhabricatorPolicyRequestExceptionHandler.php
@@ -13,20 +13,20 @@
'do something they do not have permission to do.');
}
- public function canHandleRequestException(
+ public function canHandleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
if (!$this->isPhabricatorSite($request)) {
return false;
}
- return ($ex instanceof PhabricatorPolicyException);
+ return ($throwable instanceof PhabricatorPolicyException);
}
- public function handleRequestException(
+ public function handleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
$viewer = $this->getViewer($request);
@@ -52,12 +52,12 @@
array(
'class' => 'aphront-policy-rejection',
),
- $ex->getRejection()),
+ $throwable->getRejection()),
);
$list = null;
- if ($ex->getCapabilityName()) {
- $list = $ex->getMoreInfo();
+ if ($throwable->getCapabilityName()) {
+ $list = $throwable->getMoreInfo();
foreach ($list as $key => $item) {
$list[$key] = $item;
}
@@ -67,12 +67,14 @@
array(
'class' => 'aphront-capability-details',
),
- pht('Users with the "%s" capability:', $ex->getCapabilityName()));
+ pht(
+ 'Users with the "%s" capability:',
+ $throwable->getCapabilityName()));
}
$dialog = id(new AphrontDialogView())
- ->setTitle($ex->getTitle())
+ ->setTitle($throwable->getTitle())
->setClass('aphront-access-dialog')
->setUser($viewer)
->appendChild($content);
diff --git a/src/aphront/handler/PhabricatorRateLimitRequestExceptionHandler.php b/src/aphront/handler/PhabricatorRateLimitRequestExceptionHandler.php
--- a/src/aphront/handler/PhabricatorRateLimitRequestExceptionHandler.php
+++ b/src/aphront/handler/PhabricatorRateLimitRequestExceptionHandler.php
@@ -13,20 +13,20 @@
'does something too frequently.');
}
- public function canHandleRequestException(
+ public function canHandleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
if (!$this->isPhabricatorSite($request)) {
return false;
}
- return ($ex instanceof PhabricatorSystemActionRateLimitException);
+ return ($throwable instanceof PhabricatorSystemActionRateLimitException);
}
- public function handleRequestException(
+ public function handleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
$viewer = $this->getViewer($request);
@@ -34,8 +34,8 @@
->setTitle(pht('Slow Down!'))
->setUser($viewer)
->setErrors(array(pht('You are being rate limited.')))
- ->appendParagraph($ex->getMessage())
- ->appendParagraph($ex->getRateExplanation())
+ ->appendParagraph($throwable->getMessage())
+ ->appendParagraph($throwable->getRateExplanation())
->addCancelButton('/', pht('Okaaaaaaaaaaaaaay...'));
}
diff --git a/src/infrastructure/cluster/exception/PhabricatorClusterExceptionHandler.php b/src/infrastructure/cluster/exception/PhabricatorClusterExceptionHandler.php
--- a/src/infrastructure/cluster/exception/PhabricatorClusterExceptionHandler.php
+++ b/src/infrastructure/cluster/exception/PhabricatorClusterExceptionHandler.php
@@ -11,24 +11,24 @@
return pht('Handles runtime problems with cluster configuration.');
}
- public function canHandleRequestException(
+ public function canHandleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
- return ($ex instanceof PhabricatorClusterException);
+ $throwable) {
+ return ($throwable instanceof PhabricatorClusterException);
}
- public function handleRequestException(
+ public function handleRequestThrowable(
AphrontRequest $request,
- Exception $ex) {
+ $throwable) {
$viewer = $this->getViewer($request);
- $title = $ex->getExceptionTitle();
+ $title = $throwable->getExceptionTitle();
$dialog = id(new AphrontDialogView())
->setTitle($title)
->setUser($viewer)
- ->appendParagraph($ex->getMessage())
+ ->appendParagraph($throwable->getMessage())
->addCancelButton('/', pht('Proceed With Caution'));
return id(new AphrontDialogResponse())
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Sep 22, 10:03 AM (6 h, 35 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6628407
Default Alt Text
D18136.diff (12 KB)
Attached To
Mode
D18136: Pass all Throwables to Exception Handlers, not just Exceptions
Attached
Detach File
Event Timeline
Log In to Comment