use Symbol 'gensym';
use List::MoreUtils 'any';
use IO::File ();
-use Carp;
+use File::Temp 'tempfile';
+use File::pushd;
+#use CGI::Compile;
use namespace::clean -except => 'meta';
=head1 VERSION
-Version 0.020
+Version 0.023
=cut
-our $VERSION = '0.020';
+our $VERSION = '0.023';
=head1 SYNOPSIS
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
-CGI actions are named.
-
-A path such as C<root/cgi-bin/hlagh/bar.cgi> will get the private path
-C<foo/CGI_hlagh__bar_cgi>, for controller Foo, with the C</>s converted to C<__>
-and prepended with C<CGI_>, as well as all non-word characters converted to
-C<_>s. This is because L<Catalyst> action names can't have non-word characters
-in them.
-
-This means that C<foo/bar.cgi> and C<foo__bar.cgi> for example will both map to
-the action C<CGI_foo__bar_cgi> so B<DON'T DO THAT>.
+the action name it is registered as.
=cut
sub cgi_action {
my ($self, $cgi) = @_;
- my $action_name = 'CGI_' . join '__' => split '/' => $cgi;
- $action_name =~ s/\W/_/g;
+ my $action_name = 'CGI_' . $cgi;
+ $action_name =~ s/([^A-Za-z0-9_])/sprintf("_%2x", unpack("C", $1))/eg;
- $action_name
+ return $action_name;
}
=head2 cgi_path
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;
+
+ eval { $self->wrap_perl_cgi($cgi, '__DUMMY__') };
+
+ IO::File->new(">$tempfile")->print($@);
- $? >> 8 == 0
+ exit;
}
=head2 wrap_perl_cgi
my ($self, $cgi, $action_name) = @_;
my $code = slurp $cgi;
+ my $dir = File::Basename::dirname($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_sig = %SIG;
+
my $coderef = do {
no warnings;
# catch exit() and turn it into (effectively) a return
# 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 {/
- . $code
+ sub {'."\n"
+ . 'local *DATA;'."\n"
+ . q{open DATA, '<', \$data;}."\n"
+ . qq{local \$0 = '$cgi';}."\n"
+ . "my \$_dir = File::pushd::pushd '$dir';"."\n"
+ . "CGI::initialize_globals() "."\n"
+ . " if defined &CGI::initialize_globals;"."\n"
+ . q/my $rv = eval {/."\n"
+ . 'local %SIG;'."\n"
+ . "#line 1 $cgi"."\n"
+ . $code."\n"
. q/};/
. q{
return $rv unless $@;
return $rv;
}
. '}';
+ eval $source;
};
- croak __PACKAGE__ . ": Could not compile $cgi to coderef: $@" if $@;
+ # clean up
+ *CORE::GLOBAL::exit = $orig_exit;
+ %SIG = %orig_sig;
+
+ die "Could not compile $cgi to coderef: $@" if $@;
- $coderef
+ return $coderef;
}
+# Once CGI::Compile is updated, we can use this:
+
+#sub wrap_perl_cgi {
+# my ($self, $cgi, $action_name) = @_;
+#
+# return CGI::Compile->compile($cgi,
+# "Catalyst::Controller::CGIBin::_CGIs_::$action_name");
+#}
+
=head2 wrap_nonperl_cgi
C<< $self->wrap_nonperl_cgi($path, $action_name) >>
=head1 SEE ALSO
L<Catalyst::Controller::WrapCGI>, L<CatalystX::GlobalContext>,
-L<Catalyst::Controller>, L<CGI>, L<Catalyst>
-
-=head1 AUTHOR
-
-Rafael Kitover, C<< <rkitover at cpan.org> >>
-
-=head1 CONTRIBUTORS
-
-Hans Dieter Pearcey, C<< <hdp at cpan.org> >>
+L<Catalyst::Controller>, L<CGI>, L<CGI::Compile>, L<Catalyst>
=head1 BUGS
=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.