X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FCGIBin.pm;h=d1760a711481553386be1f42be8ded5fab95754e;hb=5464705b4645ee3f5c5694cbc8e1d9e8f12da983;hp=0d6ff4092f44b7ef1cf7459608b994a4cbf67903;hpb=8ccf44c7f2a05a4694da99f075fc5334e2b76e99;p=catagits%2FCatalyst-Controller-WrapCGI.git

diff --git a/lib/Catalyst/Controller/CGIBin.pm b/lib/Catalyst/Controller/CGIBin.pm
index 0d6ff40..d1760a7 100644
--- a/lib/Catalyst/Controller/CGIBin.pm
+++ b/lib/Catalyst/Controller/CGIBin.pm
@@ -14,7 +14,8 @@ use Symbol 'gensym';
 use List::MoreUtils 'any';
 use IO::File ();
 use Carp;
-
+use File::Temp 'tempfile';
+ 
 use namespace::clean -except => 'meta';
 
 =head1 NAME
@@ -23,11 +24,11 @@ Catalyst::Controller::CGIBin - Serve CGIs from root/cgi-bin
 
 =head1 VERSION
 
-Version 0.011
+Version 0.022
 
 =cut
 
-our $VERSION = '0.011';
+our $VERSION = '0.022';
 
 =head1 SYNOPSIS
 
@@ -37,12 +38,6 @@ In your controller:
 
     use parent qw/Catalyst::Controller::CGIBin/;
 
-    # example of a forward to /cgi-bin/hlagh/mtfnpy.cgi
-    sub serve_cgi : Local Args(0) {
-        my ($self, $c) = @_;
-        $c->forward($self->cgi_action('hlagh/mtfnpy.cgi'));
-    }
-
 In your .conf:
 
     <Controller::Foo>
@@ -154,7 +149,7 @@ sub register_actions {
 
 =head2 cgi_action
 
-C<<$self->cgi_action($cgi)>>
+C<< $self->cgi_action($cgi) >>
 
 Takes a path to a CGI from C<root/cgi-bin> such as C<foo/bar.cgi> and returns
 the action name it is registered as. See L</DESCRIPTION> for a discussion on how
@@ -182,7 +177,7 @@ sub cgi_action {
 
 =head2 cgi_path
 
-C<<$self->cgi_path($cgi)>>
+C<< $self->cgi_path($cgi) >>
 
 Takes a path to a CGI from C<root/cgi-bin> such as C<foo/bar.cgi> and returns
 the public path it should be registered under.
@@ -202,7 +197,7 @@ sub cgi_path {
 
 =head2 is_perl_cgi
 
-C<<$self->is_perl_cgi($path)>>
+C<< $self->is_perl_cgi($path) >>
 
 Tries to figure out whether the CGI is Perl or not.
 
@@ -214,23 +209,35 @@ L</wrap_perl_cgi>.
 sub is_perl_cgi {
     my ($self, $cgi) = @_;
 
-    my $shebang = IO::File->new($cgi)->getline;
+    my (undef, $tempfile) = tempfile;
 
-    return 0 if $shebang !~ /perl/ && $cgi !~ /\.pl\z/;
+    my $pid = fork;
+    die "Cannot fork: $!" unless defined $pid;
 
-    my $taint_check = $shebang =~ /-T/ ?  '-T' : '';
+    if ($pid) {
+        waitpid $pid, 0;
+        my $errors = IO::File->new($tempfile)->getline;
+        unlink $tempfile;
+        return $errors ? 0 : 1;
+    }
 
+    # child
+    local *NULL;
     open NULL, '>', File::Spec->devnull;
-    my $pid = open3(gensym, '&>NULL', '&>NULL', "$^X $taint_check -c $cgi");
-    close NULL;
-    waitpid $pid, 0;
+    open STDOUT, '>&', \*NULL;
+    open STDERR, '>&', \*NULL;
+    close STDIN;
 
-    $? >> 8 == 0
+    eval { $self->wrap_perl_cgi($cgi, '__DUMMY__') };
+
+    IO::File->new(">$tempfile")->print($@);
+
+    exit;
 }
 
 =head2 wrap_perl_cgi
 
-C<<$self->wrap_perl_cgi($path, $action_name)>>
+C<< $self->wrap_perl_cgi($path, $action_name) >>
 
 Takes the path to a Perl CGI and returns a coderef suitable for passing to
 cgi_to_response (from L<Catalyst::Controller::WrapCGI>.)
@@ -252,9 +259,13 @@ sub wrap_perl_cgi {
 
     my $code = slurp $cgi;
 
-    $code =~ s/^__DATA__(?:\r?\n|\r\n?)(.*)//ms;
+    $code =~ s/^__DATA__\n(.*)//ms;
     my $data = $1;
 
+    my $orig_exit = \*CORE::GLOBAL::exit;
+    my $orig_die  = $SIG{__DIE__};
+    my $orig_warn = $SIG{__WARN__};
+
     my $coderef = do {
         no warnings;
         # catch exit() and turn it into (effectively) a return
@@ -262,17 +273,19 @@ sub wrap_perl_cgi {
         # overridden CORE::GLOBAL::exit in view
         #
         # set $0 to the name of the cgi file in case it's used there
-        eval ' 
+        my $source = ' 
             my $cgi_exited = "EXIT\n";
             BEGIN { *CORE::GLOBAL::exit = sub (;$) {
                 die [ $cgi_exited, $_[0] || 0 ];
             } }
             package Catalyst::Controller::CGIBin::_CGIs_::'.$action_name.';
-            sub {'
-                . 'local *DATA;'
-                . q{open DATA, '<', \$data;}
-                . qq{local \$0 = "\Q$cgi\E";}
-                . q/my $rv = eval {/
+            sub {'."\n"
+                . 'local *DATA;'."\n"
+                . q{open DATA, '<', \$data;}."\n"
+                . qq{local \$0 = "\Q$cgi\E";}."\n"
+                . q/my $rv = eval {/."\n"
+                . 'local $SIG{__DIE__}  = $SIG{__DIE__}  || sub { die @_ };'."\n"
+                . 'local $SIG{__WARN__} = $SIG{__WARN__} || sub { warn @_ };'."\n"
                 . $code
                 . q/};/
                 . q{
@@ -285,16 +298,22 @@ sub wrap_perl_cgi {
                     return $rv;
                 }
          . '}';
+         eval $source;
     };
 
+    # clean up
+    *CORE::GLOBAL::exit = $orig_exit;
+    $SIG{__DIE__}       = $orig_die;
+    $SIG{__WARN__}      = $orig_warn;
+
     croak __PACKAGE__ . ": Could not compile $cgi to coderef: $@" if $@;
 
-    $coderef
+    return $coderef
 }
 
 =head2 wrap_nonperl_cgi
 
-C<<$self->wrap_nonperl_cgi($path, $action_name)>>
+C<< $self->wrap_nonperl_cgi($path, $action_name) >>
 
 Takes the path to a non-Perl CGI and returns a coderef for executing it.
 
@@ -319,12 +338,6 @@ __PACKAGE__->meta->make_immutable;
 L<Catalyst::Controller::WrapCGI>, L<CatalystX::GlobalContext>,
 L<Catalyst::Controller>, L<CGI>, L<Catalyst>
 
-=head1 AUTHORS
-
-Rafael Kitover, C<< <rkitover at cpan.org> >>
-
-Hans Dieter Pearcey, C<< <hdp at cpan.org> >>
-
 =head1 BUGS
 
 Please report any bugs or feature requests to C<bug-catalyst-controller-wrapcgi at
@@ -357,9 +370,15 @@ L<http://search.cpan.org/dist/Catalyst-Controller-WrapCGI>
 
 =back
 
+=head1 AUTHOR
+
+See L<Catalyst::Controller::WrapCGI/AUTHOR> and
+L<Catalyst::Controller::WrapCGI/CONTRIBUTORS>.
+
 =head1 COPYRIGHT & LICENSE
 
-Copyright (c) 2008 Rafael Kitover
+Copyright (c) 2008-2009 L<Catalyst::Controller::WrapCGI/AUTHOR> and
+L<Catalyst::Controller::WrapCGI/CONTRIBUTORS>.
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.