X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FCGIBin.pm;h=48eaae086698303263630bf72f76de4a4824f277;hb=2e6f9c85d869a3fd48134c5990ed654ad272fd12;hp=c9119053f8151f81d52ec430a97a4e1b08885ae0;hpb=2340af9d7778ff7ed8e40289015463570ed09c6e;p=catagits%2FCatalyst-Controller-WrapCGI.git diff --git a/lib/Catalyst/Controller/CGIBin.pm b/lib/Catalyst/Controller/CGIBin.pm index c911905..48eaae0 100644 --- a/lib/Catalyst/Controller/CGIBin.pm +++ b/lib/Catalyst/Controller/CGIBin.pm @@ -1,9 +1,10 @@ package Catalyst::Controller::CGIBin; -use strict; -use warnings; +use Moose; +use mro 'c3'; + +extends 'Catalyst::Controller::WrapCGI'; -use Class::C3; use File::Slurp 'slurp'; use File::Find::Rule (); use Catalyst::Exception (); @@ -12,21 +13,21 @@ use IPC::Open3; use Symbol 'gensym'; use List::MoreUtils 'any'; use IO::File (); +use Carp; + use namespace::clean -except => 'meta'; -use parent 'Catalyst::Controller::WrapCGI'; - =head1 NAME Catalyst::Controller::CGIBin - Serve CGIs from root/cgi-bin =head1 VERSION -Version 0.004 +Version 0.020 =cut -our $VERSION = '0.004'; +our $VERSION = '0.020'; =head1 SYNOPSIS @@ -36,15 +37,11 @@ In your controller: use parent qw/Catalyst::Controller::CGIBin/; - # example of a forward to /cgi-bin/hlagh/mtfnpy.cgi - sub dongs : Local Args(0) { - my ($self, $c) = @_; - $c->forward($self->cgi_action('hlagh/mtfnpy.cgi')); - } - In your .conf: + cgi_root_path cgi-bin + cgi_dir cgi-bin username_field username # used for REMOTE_USER env var pass_env PERL5LIB @@ -58,25 +55,35 @@ In your .conf: Dispatches to CGI files in root/cgi-bin for /cgi-bin/ paths. Unlike L this module does _NOT_ stat and recompile the CGI -for every invocation. If this is something you need, let me know. - -CGI paths are converted into action names using cgi_action (below.) +for every invocation. This may be supported in the future if there's interest. -A path such as C will get the private path -C, for controller Foo, with the Cs converted to C<_>s -and prepended with C, as well as all non-word characters converted to -C<_>s. This is because L action names can't have non-word characters -in them. +CGI paths are converted into action names using L. Inherits from L, see the documentation for that -module for configuration information. +module for other configuration information. + +=head1 CONFIG PARAMS + +=head2 cgi_root_path + +The global URI path prefix for CGIs, defaults to C. + +=head2 cgi_dir + +Path from which to read CGI files. Can be relative to C<$MYAPP_HOME/root> or +absolute. Defaults to C<$MYAPP_HOME/root/cgi-bin>. =cut +has cgi_root_path => (is => 'ro', isa => 'Str', default => 'cgi-bin'); +has cgi_dir => (is => 'ro', isa => 'Str', default => 'cgi-bin'); + sub register_actions { my ($self, $app) = @_; - my $cgi_bin = $app->path_to('root', 'cgi-bin'); + my $cgi_bin = File::Spec->file_name_is_absolute($self->cgi_dir) ? + $self->cgi_dir + : $app->path_to('root', $self->cgi_dir); my $namespace = $self->action_namespace($app); @@ -86,11 +93,13 @@ sub register_actions { my $cgi_path = abs2rel($file, $cgi_bin); next if any { $_ eq '.svn' } splitdir $cgi_path; + next if $cgi_path =~ /\.swp\z/; my $path = join '/' => splitdir($cgi_path); my $action_name = $self->cgi_action($path); + my $public_path = $self->cgi_path($path); my $reverse = $namespace ? "$namespace/$action_name" : $action_name; - my $attrs = { Path => [ "cgi-bin/$path" ], Args => [ 0 ] }; + my $attrs = { Path => [ $public_path ] }; my ($cgi, $type); @@ -124,40 +133,75 @@ sub register_actions { $self->next::method($app, @_); -# Tell Static::Simple to ignore the cgi-bin dir. - if (!any{ $_ eq 'cgi-bin' } @{ $app->config->{static}{ignore_dirs}||[] }) { - push @{ $app->config->{static}{ignore_dirs} }, 'cgi-bin'; +# Tell Static::Simple to ignore cgi_dir + if ($cgi_bin =~ /^@{[ $app->path_to('root') ]}/) { + my $rel = File::Spec->abs2rel($cgi_bin, $app->path_to('root')); + + if (!any { $_ eq $rel } + @{ $app->config->{static}{ignore_dirs}||[] }) { + push @{ $app->config->{static}{ignore_dirs} }, $rel; + } } } =head1 METHODS -=head2 $self->cgi_action($cgi_path) +=head2 cgi_action + +C<< $self->cgi_action($cgi) >> Takes a path to a CGI from C such as C and returns the action name it is registered as. See L for a discussion on how CGI actions are named. +A path such as C will get the private path +C, for controller Foo, with the Cs converted to C<__> +and prepended with C, as well as all non-word characters converted to +C<_>s. This is because L action names can't have non-word characters +in them. + +This means that C and C for example will both map to +the action C so B. + =cut sub cgi_action { my ($self, $cgi) = @_; - my $action_name = 'CGI_' . join '_' => split '/' => $cgi; + my $action_name = 'CGI_' . join '__' => split '/' => $cgi; $action_name =~ s/\W/_/g; $action_name } -=head2 $self->is_perl_cgi($path) +=head2 cgi_path + +C<< $self->cgi_path($cgi) >> + +Takes a path to a CGI from C such as C and returns +the public path it should be registered under. + +The default is to prefix with C<$cgi_root_path/>, using the C +config setting, above. + +=cut + +sub cgi_path { + my ($self, $cgi) = @_; + + my $root = $self->cgi_root_path; + $root =~ s{/*$}{}; + return "$root/$cgi"; +} + +=head2 is_perl_cgi + +C<< $self->is_perl_cgi($path) >> Tries to figure out whether the CGI is Perl or not. If it's Perl, it will be inlined into a sub instead of being forked off, see -wrap_perl_cgi (below.) - -If it's not doing what you expect, you might want to override it, and let me -know as well! +L. =cut @@ -178,32 +222,73 @@ sub is_perl_cgi { $? >> 8 == 0 } -=head2 $self->wrap_perl_cgi($path, $action_name) +=head2 wrap_perl_cgi + +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.) -C<$action_name> is the generated name for the action representing the CGI file. +C<$action_name> is the generated name for the action representing the CGI file +from C. This is similar to how L works, but will only work for well-written CGIs. Otherwise, you may have to override this method to do something more involved (see L.) +Scripts with C<__DATA__> sections now work too, as well as scripts that call +C. + =cut sub wrap_perl_cgi { my ($self, $cgi, $action_name) = @_; - do { + my $code = slurp $cgi; + + $code =~ s/^__DATA__(?:\r?\n|\r\n?)(.*)//ms; + my $data = $1; + + my $coderef = do { no warnings; -# CGIs import stuff, so putting them into this package breaks Cat 5.8 + # catch exit() and turn it into (effectively) a return + # we *must* eval STRING because the code needs to be compiled with the + # overridden CORE::GLOBAL::exit in view + # + # set $0 to the name of the cgi file in case it's used there eval ' + my $cgi_exited = "EXIT\n"; + BEGIN { *CORE::GLOBAL::exit = sub (;$) { + die [ $cgi_exited, $_[0] || 0 ]; + } } package Catalyst::Controller::CGIBin::_CGIs_::'.$action_name.'; - sub {' . slurp($cgi) . '}' - } + sub {' + . 'local *DATA;' + . q{open DATA, '<', \$data;} + . qq{local \$0 = "\Q$cgi\E";} + . q/my $rv = eval {/ + . $code + . q/};/ + . q{ + return $rv unless $@; + die $@ if $@ and not ( + ref($@) eq 'ARRAY' and + $@->[0] eq $cgi_exited + ); + die "exited nonzero: $@->[1]" if $@->[1] != 0; + return $rv; + } + . '}'; + }; + + croak __PACKAGE__ . ": Could not compile $cgi to coderef: $@" if $@; + + $coderef } -=head2 $self->wrap_nonperl_cgi($path, $action_name) +=head2 wrap_nonperl_cgi + +C<< $self->wrap_nonperl_cgi($path, $action_name) >> Takes the path to a non-Perl CGI and returns a coderef for executing it. @@ -221,6 +306,8 @@ sub wrap_nonperl_cgi { sub { system $cgi } } +__PACKAGE__->meta->make_immutable; + =head1 SEE ALSO L, L, @@ -230,6 +317,10 @@ L, L, L Rafael Kitover, C<< >> +=head1 CONTRIBUTORS + +Hans Dieter Pearcey, C<< >> + =head1 BUGS Please report any bugs or feature requests to C