php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-10 23:50:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4826 from yiisoft/rest-dont-show-full-exceptions-in-production

Browse Source 
Fixes #4188: API exceptions are now exposing less data when YII_DEBUG is false
This commit is contained in:
Qiang Xue
2014-08-26 16:59:22 -04:00
parent 74e9ce9401 355c26df8b
commit 88843ea288
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -230,6 +230,7 @@ Yii Framework 2 Change Log
- Chg #4051: Renamed `yii\caching\GroupDependency` to `TagDependency` and added support for associating multiple tags to a single cached data item (qiangxue) - Chg #4051: Renamed `yii\caching\GroupDependency` to `TagDependency` and added support for associating multiple tags to a single cached data item (qiangxue)
- Chg #4071: `mail` component renamed to `mailer`, `yii\log\EmailTarget::$mail` renamed to `yii\log\EmailTarget::$mailer` (samdark) - Chg #4071: `mail` component renamed to `mailer`, `yii\log\EmailTarget::$mail` renamed to `yii\log\EmailTarget::$mailer` (samdark)
- Chg #4147: `BaseMailer::compose()` will not overwrite the `message` parameter if it is explicitly provided (qiangxue) - Chg #4147: `BaseMailer::compose()` will not overwrite the `message` parameter if it is explicitly provided (qiangxue)
- Chg #4188: API exceptions are now exposing less data when YII_DEBUG is false (samdark)
- Chg #4201: change default value of `SyslogTarget::facility` from LOG_SYSLOG to LOG_USER (dizews) - Chg #4201: change default value of `SyslogTarget::facility` from LOG_SYSLOG to LOG_USER (dizews)
- Chg #4211: BaseActiveRecord::populateRecord now silently hide selected columns that are not defined in AR instead of failing with an error (miramir) - Chg #4211: BaseActiveRecord::populateRecord now silently hide selected columns that are not defined in AR instead of failing with an error (miramir)
- Chg #4227: `\yii\widgets\LinkPager::$hideOnSinglePage` is now `true` by default (samdark) - Chg #4227: `\yii\widgets\LinkPager::$hideOnSinglePage` is now `true` by default (samdark)

10
framework/web/ErrorHandler.php
View File

@@ -117,8 +117,11 @@ class ErrorHandler extends \yii\base\ErrorHandler
*/ */
protected function convertExceptionToArray($exception) protected function convertExceptionToArray($exception)
{ {
if (!YII_DEBUG && !$exception instanceof UserException && !$exception instanceof HttpException) {
$exception = new HttpException(500, 'There was an error at the server.');
}
$array = [ $array = [
'type' => get_class($exception),
'name' => ($exception instanceof Exception || $exception instanceof ErrorException) ? $exception->getName() : 'Exception', 'name' => ($exception instanceof Exception || $exception instanceof ErrorException) ? $exception->getName() : 'Exception',
'message' => $exception->getMessage(), 'message' => $exception->getMessage(),
'code' => $exception->getCode(), 'code' => $exception->getCode(),
@@ -126,7 +129,9 @@ class ErrorHandler extends \yii\base\ErrorHandler
if ($exception instanceof HttpException) { if ($exception instanceof HttpException) {
$array['status'] = $exception->statusCode; $array['status'] = $exception->statusCode;
} }
if (YII_DEBUG && !$exception instanceof UserException) { if (YII_DEBUG) {
$array['type'] = get_class($exception);
if (!$exception instanceof UserException) {
$array['file'] = $exception->getFile(); $array['file'] = $exception->getFile();
$array['line'] = $exception->getLine(); $array['line'] = $exception->getLine();
$array['stack-trace'] = explode("\n", $exception->getTraceAsString()); $array['stack-trace'] = explode("\n", $exception->getTraceAsString());
@@ -134,6 +139,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
$array['error-info'] = $exception->errorInfo; $array['error-info'] = $exception->errorInfo;
} }
} }
}
if (($prev = $exception->getPrevious()) !== null) { if (($prev = $exception->getPrevious()) !== null) {
$array['previous'] = $this->convertExceptionToArray($prev); $array['previous'] = $this->convertExceptionToArray($prev);
} }