raito/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Ensure proper encoding of error messages

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-03 17:20:00 +02:00
parent acdeaa1d80
commit 8355dc57ee
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/lib/Hydra/Controller/Root.pm
View file

@ -8,6 +8,7 @@ use Hydra::Helper::CatalystUtils;
use Digest::SHA1 qw(sha1_hex); use Digest::SHA1 qw(sha1_hex);
use Nix::Store; use Nix::Store;
use Nix::Config; use Nix::Config;
use Encode;
# Put this controller at top-level. # Put this controller at top-level.
__PACKAGE__->config->{namespace} = ''; __PACKAGE__->config->{namespace} = '';
@ -211,9 +212,11 @@ sub default :Path {
sub end : ActionClass('RenderView') { sub end : ActionClass('RenderView') {
my ($self, $c) = @_; my ($self, $c) = @_;
my @errors = map { encode_utf8($_); } @{$c->error};
if (defined $c->stash->{json}) { if (defined $c->stash->{json}) {
if (scalar @{$c->error}) { if (scalar @errors) {
$c->stash->{json}->{error} = join "\n", @{$c->error}; $c->stash->{json}->{error} = join "\n", @errors;
$c->clear_errors; $c->clear_errors;
} }
$c->forward('View::JSON'); $c->forward('View::JSON');
@ -222,7 +225,7 @@ sub end : ActionClass('RenderView') {
elsif (scalar @{$c->error}) { elsif (scalar @{$c->error}) {
$c->stash->{resource} = { error => join "\n", @{$c->error} }; $c->stash->{resource} = { error => join "\n", @{$c->error} };
$c->stash->{template} = 'error.tt'; $c->stash->{template} = 'error.tt';
$c->stash->{errors} = $c->error; $c->stash->{errors} = [@errors];
$c->response->status(500) if $c->response->status == 200; $c->response->status(500) if $c->response->status == 200;
if ($c->response->status >= 300) { if ($c->response->status >= 300) {
$c->stash->{httpStatus} = $c->stash->{httpStatus} =