mirror of
https://github.com/alextselegidis/easyappointments.git
synced 2024-12-20 21:52:22 +03:00
The plain user password might appear in the log messages in case of an error (#1590)
This commit is contained in:
parent
0d4ee9e0dc
commit
c8bb40d2b9
2 changed files with 20 additions and 1 deletions
|
@ -20,6 +20,7 @@ developers to maintain and readjust their custom modifications on the main proje
|
||||||
- Fix ICS file mimetype (#1630)
|
- Fix ICS file mimetype (#1630)
|
||||||
- Incorrect Timezone Handling in CalDAV Synchronization Causes Time Shifts (#1626)
|
- Incorrect Timezone Handling in CalDAV Synchronization Causes Time Shifts (#1626)
|
||||||
- No color change in the appointment modal window (in the backend calendar) (#1641)
|
- No color change in the appointment modal window (in the backend calendar) (#1641)
|
||||||
|
- The plain user password might appear in the log messages in case of an error (#1590)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -136,11 +136,13 @@ if (!function_exists('json_exception')) {
|
||||||
$response = [
|
$response = [
|
||||||
'success' => false,
|
'success' => false,
|
||||||
'message' => $e->getMessage(),
|
'message' => $e->getMessage(),
|
||||||
'trace' => config('debug') ? $e->getTrace() : [],
|
'trace' => trace($e),
|
||||||
];
|
];
|
||||||
|
|
||||||
log_message('error', 'JSON exception: ' . json_encode($response));
|
log_message('error', 'JSON exception: ' . json_encode($response));
|
||||||
|
|
||||||
|
unset($response['trace']); // Do not send the trace to the browser as it might contain sensitive info
|
||||||
|
|
||||||
json_response($response, 500);
|
json_response($response, 500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -171,3 +173,19 @@ if (!function_exists('abort')) {
|
||||||
show_error($message, $code);
|
show_error($message, $code);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!function_exists('trace')) {
|
||||||
|
/**
|
||||||
|
* Prepare a well formatted string for an exception
|
||||||
|
*
|
||||||
|
* @param Throwable $e
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
function trace(Throwable $e): string
|
||||||
|
{
|
||||||
|
return get_class($e) .
|
||||||
|
" '{$e->getMessage()}' in {$e->getFile()}({$e->getLine()})\n" .
|
||||||
|
"{$e->getTraceAsString()}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue