X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FData%2FSerializer.pm;h=6904a845cf0574dbe5733f4cfbc5d4f01d7e2dd7;hb=351f252f57354a5a0c50e3c931b0addd4f1988ff;hp=ef435740c9295153fe43f3680924c24f60393a12;hpb=eccb21379de1fbdc65740e0cb4158d3b4d055cab;p=catagits%2FCatalyst-Action-REST.git diff --git a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm index ef43574..6904a84 100644 --- a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm +++ b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm @@ -1,39 +1,70 @@ -# -# Catalyst::Action::Deserialize::Data::Serializer.pm -# Created by: Adam Jacob, Marchex, -# Created on: 10/12/2006 03:00:32 PM PDT -# -# $Id$ - package Catalyst::Action::Deserialize::Data::Serializer; -use strict; -use warnings; +use Moose; +use namespace::autoclean; -use base 'Catalyst::Action'; +extends 'Catalyst::Action'; use Data::Serializer; +use Safe; +use Scalar::Util qw(openhandle); +my $compartment = Safe->new; +$compartment->permit_only( qw(padany null lineseq const pushmark list anonhash anonlist refgen leaveeval undef) ); + +our $VERSION = '0.98'; +$VERSION = eval $VERSION; sub execute { my $self = shift; my ( $controller, $c, $serializer ) = @_; + my $sp = $serializer; + $sp =~ s/::/\//g; + $sp .= ".pm"; + eval { + require $sp + }; + if ($@) { + $c->log->debug("Could not load $serializer, refusing to serialize: $@") + if $c->debug; + return 0; + } my $body = $c->request->body; if ($body) { - my $rbody; - if ( -f $c->request->body ) { - open( BODY, "<", $c->request->body ); - while ( my $line = ) { + my $rbody = ''; + + if(openhandle $body) { + seek($body, 0, 0); # in case something has already read from it + while ( defined( my $line = <$body> ) ) { $rbody .= $line; } - close(BODY); + } else { + $rbody = $body; + } + + my $rdata; + if ( $serializer eq "Data::Dumper" ) { + # Taken from Data::Serialize::Data::Dumper::deserialize, but run within a Safe compartment + my $code = $rbody =~ /^\{/ ? "+".$rbody : $rbody; + $rdata = $compartment->reval( $code ); + } + else { + my $dso = Data::Serializer->new( serializer => $serializer ); + eval { + $rdata = $dso->raw_deserialize($rbody); + }; + } + if ($@) { + return $@; } - my $dso = Data::Serializer->new( serializer => $serializer ); - my $rdata = $dso->raw_deserialize($rbody); $c->request->data($rdata); } else { $c->log->debug( - 'I would have deserialized, but there was nothing in the body!'); + 'I would have deserialized, but there was nothing in the body!') + if $c->debug; } + return 1; } +__PACKAGE__->meta->make_immutable; + 1;