X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FWrapCGI.pm;h=f1de732e5aa301e7f86e31a47bd2b591829d450d;hb=05f3f060f92985dd99c3e4a4577aa3284efca2fe;hp=3e9d1174566db3139ff29d6a80338ca2986ca5fe;hpb=32b32c6209c69a810c2d0b66a8cfc6efcae66d32;p=catagits%2FCatalyst-Controller-WrapCGI.git diff --git a/lib/Catalyst/Controller/WrapCGI.pm b/lib/Catalyst/Controller/WrapCGI.pm index 3e9d117..f1de732 100644 --- a/lib/Catalyst/Controller/WrapCGI.pm +++ b/lib/Catalyst/Controller/WrapCGI.pm @@ -1,43 +1,97 @@ package Catalyst::Controller::WrapCGI; -use strict; -use warnings; -use parent 'Catalyst::Controller'; +use 5.008_001; +use Moose; +use mro 'c3'; -use HTTP::Request::AsCGI; -use HTTP::Request; -use URI; +extends 'Catalyst::Controller'; -=head1 NAME +use HTTP::Request::AsCGI (); +use HTTP::Request (); +use URI (); +use Catalyst::Exception (); +use URI::Escape; +use HTTP::Request::Common; -Catalyst::Controller::WrapCGI - Run CGIs in Catalyst +use namespace::clean -except => 'meta'; -=head1 VERSION +=head1 NAME -Version 0.001 +Catalyst::Controller::WrapCGI - Run CGIs in Catalyst =cut -our $VERSION = '0.001'; +our $VERSION = '0.029'; =head1 SYNOPSIS package MyApp::Controller::Foo; use parent qw/Catalyst::Controller::WrapCGI/; + use CGI (); sub hello : Path('cgi-bin/hello.cgi') { my ($self, $c) = @_; $self->cgi_to_response($c, sub { - use CGI ':standard'; - - print header, start_html('Hello'), - h1('Catalyst Rocks!'), - end_html; + my $q = CGI->new; + print $q->header, $q->start_html('Hello'), + $q->h1('Catalyst Rocks!'), + $q->end_html; }); } +In your .conf, configure which environment variables to pass: + + + + username_field username # used for REMOTE_USER env var + pass_env PERL5LIB + pass_env PATH + pass_env /^MYAPP_/ + kill_env MYAPP_BAD + + + +=head1 DESCRIPTION + +Allows you to run Perl code in a CGI environment derived from your L +context. + +B<*WARNING*>: do not export L functions into a Controller, it will break +with L 5.8 onward. + +If you just want to run CGIs from files, see L. + +C will be set to C<< $c->user->obj->$username_field >> if +available, or to C<< $c->req->remote_user >> otherwise. + +=head1 CONFIGURATION + +=head2 pass_env + +C<< $your_controller->{CGI}{pass_env} >> should be an array of environment variables +or regular expressions to pass through to your CGIs. Entries surrounded by C +characters are considered regular expressions. + +=head2 kill_env + +C<< $your_controller->{CGI}{kill_env} >> should be an array of environment +variables or regular expressions to remove from the environment before passing +it to your CGIs. Entries surrounded by C characters are considered regular +expressions. + +Default is to pass the whole of C<%ENV>, except for entries listed in +L below. + +=head2 username_field + +C<< $your_controller->{CGI}{username_field} >> should be the field for your +user's name, which will be read from C<< $c->user->obj >>. Defaults to +'username'. + +See L for an example. + =cut # Hack-around because Catalyst::Engine::HTTP goes and changes @@ -48,15 +102,20 @@ open my $REAL_STDOUT, ">>&=".fileno(*STDOUT); =head1 METHODS -=head2 $self->cgi_to_response($c, $coderef) +=head2 cgi_to_response + +C<< $self->cgi_to_response($c, $coderef) >> Does the magic of running $coderef in a CGI environment, and populating the appropriate parts of your Catalyst context with the results. +Calls L. + =cut sub cgi_to_response { my ($self, $c, $script) = @_; + my $res = $self->wrap_cgi($c, $script); # if the CGI doesn't set the response code but sets location they were @@ -73,14 +132,21 @@ sub cgi_to_response { $c->res->headers($res->headers); } -=head2 $self->wrap_cgi($c, $coderef) +=head2 wrap_cgi -Runs $coderef in a CGI environment using L, returns an +C<< $self->wrap_cgi($c, $coderef) >> + +Runs C<$coderef> in a CGI environment using L, returns an L. -The CGI environment is set up based on $c. +The CGI environment is set up based on C<$c>. + +The environment variables to pass on are taken from the configuration for your +Controller, see L for an example. If you don't supply a list of +environment variables to pass, the whole of %ENV is used (with exceptions listed +in L. -Used by cgi_to_response, which is probably what you want to use as well. +Used by L, which is probably what you want to use as well. =cut @@ -98,7 +164,28 @@ sub wrap_cgi { local $/; $body_content = <$body>; } else { my $body_params = $c->req->body_parameters; - if (%$body_params) { + + if (my %uploads = %{ $c->req->uploads }) { + my $post = POST 'http://localhost/', + Content_Type => 'form-data', + Content => [ + %$body_params, + map { + my $upl = $uploads{$_}; + $_ => [ + undef, + $upl->filename, + Content => $upl->slurp, + map { + my $header = $_; + map { $header => $_ } $upl->headers->header($header) + } $upl->headers->header_field_names + ] + } keys %uploads + ]; + $body_content = $post->content; + $req->content_type($post->header('Content-Type')); + } elsif (%$body_params) { my $encoder = URI->new; $encoder->query_form(%$body_params); $body_content = $encoder->query; @@ -108,13 +195,26 @@ sub wrap_cgi { $req->content($body_content); $req->content_length(length($body_content)); - my $user = (($c->can('user_exists') && $c->user_exists) - ? eval { $c->user->obj->username } + + my $username_field = $self->{CGI}{username_field} || 'username'; + + my $username = (($c->can('user_exists') && $c->user_exists) + ? eval { $c->user->obj->$username_field } : ''); + + $username ||= $c->req->remote_user if $c->req->can('remote_user'); + + my $path_info = '/'.join '/' => map { + utf8::is_utf8($_) ? uri_escape_utf8($_) : uri_escape($_) + } @{ $c->req->args }; + my $env = HTTP::Request::AsCGI->new( $req, - REMOTE_USER => $user, - %ENV + ($username ? (REMOTE_USER => $username) : ()), + PATH_INFO => $path_info, +# eww, this is likely broken: + FILEPATH_INFO => '/'.$c->action.$path_info, + SCRIPT_NAME => $c->uri_for($c->action, $c->req->captures)->path ); { @@ -125,6 +225,8 @@ sub wrap_cgi { my $saved_error; + local %ENV = %{ $self->_filtered_env(\%ENV) }; + $env->setup; eval { $call->() }; $saved_error = $@; @@ -132,20 +234,118 @@ sub wrap_cgi { select($old); - warn "CGI invoke failed: $saved_error" if $saved_error; - + Catalyst::Exception->throw( + message => "CGI invocation failed: $saved_error" + ) if $saved_error; } return $env->response; } +=head1 FILTERED ENVIRONMENT + +If you don't use the L option to restrict which environment variables +are passed in, the default is to pass the whole of C<%ENV> except the variables +listed below. + + MOD_PERL + SERVER_SOFTWARE + SERVER_NAME + GATEWAY_INTERFACE + SERVER_PROTOCOL + SERVER_PORT + REQUEST_METHOD + PATH_INFO + PATH_TRANSLATED + SCRIPT_NAME + QUERY_STRING + REMOTE_HOST + REMOTE_ADDR + AUTH_TYPE + REMOTE_USER + REMOTE_IDENT + CONTENT_TYPE + CONTENT_LENGTH + HTTP_ACCEPT + HTTP_USER_AGENT + +C<%ENV> can be further trimmed using L. + +=cut + +my $DEFAULT_KILL_ENV = [qw/ + MOD_PERL SERVER_SOFTWARE SERVER_NAME GATEWAY_INTERFACE SERVER_PROTOCOL + SERVER_PORT REQUEST_METHOD PATH_INFO PATH_TRANSLATED SCRIPT_NAME QUERY_STRING + REMOTE_HOST REMOTE_ADDR AUTH_TYPE REMOTE_USER REMOTE_IDENT CONTENT_TYPE + CONTENT_LENGTH HTTP_ACCEPT HTTP_USER_AGENT +/]; + +sub _filtered_env { + my ($self, $env) = @_; + my @ok; + + my $pass_env = $self->{CGI}{pass_env}; + $pass_env = [] if not defined $pass_env; + $pass_env = [ $pass_env ] unless ref $pass_env; + + my $kill_env = $self->{CGI}{kill_env}; + $kill_env = $DEFAULT_KILL_ENV unless defined $kill_env; + $kill_env = [ $kill_env ] unless ref $kill_env; + + if (@$pass_env) { + for (@$pass_env) { + if (m!^/(.*)/\z!) { + my $re = qr/$1/; + push @ok, grep /$re/, keys %$env; + } else { + push @ok, $_; + } + } + } else { + @ok = keys %$env; + } + + for my $k (@$kill_env) { + if ($k =~ m!^/(.*)/\z!) { + my $re = qr/$1/; + @ok = grep { ! /$re/ } @ok; + } else { + @ok = grep { $_ ne $k } @ok; + } + } + return { map {; $_ => $env->{$_} } @ok }; +} + +__PACKAGE__->meta->make_immutable; + +=head1 DIRECT SOCKET/NPH SCRIPTS + +This currently won't work: + + #!/usr/bin/perl + + use CGI ':standard'; + + $| = 1; + + print header; + + for (0..1000) { + print $_, br, "\n"; + sleep 1; + } + +because the coderef is executed synchronously with C pointing to a temp +file. + =head1 ACKNOWLEDGEMENTS Original development sponsored by L -=head1 AUTHOR +=head1 SEE ALSO -Matt S. Trout, C<< >> +L, L, +L, L, L =head1 BUGS @@ -179,9 +379,22 @@ L =back +=head1 AUTHOR + +Matt S. Trout C<< >> + +=head1 CONTRIBUTORS + +Rafael Kitover C<< >> + +Hans Dieter Pearcey C<< >> + +Some code stolen from Tatsuhiko Miyagawa's L. + =head1 COPYRIGHT & LICENSE -Copyright (c) 2008 Matt S. Trout +Copyright (c) 2008-2009 L and +L. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. @@ -190,4 +403,4 @@ under the same terms as Perl itself. 1; # End of Catalyst::Controller::WrapCGI -# vim: expandtab shiftwidth=4 ts=4 tw=80: +# vim: expandtab shiftwidth=2 ts=2 tw=80: