X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FWrapCGI.pm;h=fa0d73ac34d968695eaffe4e0a3546b4866edca9;hb=47a5153fd919a2d6b4a5fa3968914924b366ad6b;hp=7338efee6134c34cedf99c991d4d0f92e4f2577e;hpb=457c1d76ed6730ef07a1ab35b1ec1c47d6c4f19d;p=catagits%2FCatalyst-Controller-WrapCGI.git

diff --git a/lib/Catalyst/Controller/WrapCGI.pm b/lib/Catalyst/Controller/WrapCGI.pm
index 7338efe..fa0d73a 100644
--- a/lib/Catalyst/Controller/WrapCGI.pm
+++ b/lib/Catalyst/Controller/WrapCGI.pm
@@ -7,6 +7,7 @@ use parent 'Catalyst::Controller';
 use HTTP::Request::AsCGI;
 use HTTP::Request;
 use URI;
+use Catalyst::Exception ();
 
 =head1 NAME
 
@@ -14,27 +15,27 @@ Catalyst::Controller::WrapCGI - Run CGIs in Catalyst
 
 =head1 VERSION
 
-Version 0.001
+Version 0.0026
 
 =cut
 
-our $VERSION = '0.001';
+our $VERSION = '0.0026';
 
 =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;
         });
     }
 
@@ -42,9 +43,10 @@ In your .conf, configure which environment variables to pass:
 
     <Controller::Foo>
         <CGI>
+            username_field username # used for REMOTE_USER env var
             pass_env PERL5LIB
             pass_env PATH
-            pass_env HLAGH
+            pass_env /^MYAPP_/
         </CGI>
     </Controller::Foo>
 
@@ -53,6 +55,24 @@ In your .conf, configure which environment variables to pass:
 Allows you to run Perl code in a CGI environment derived from your L<Catalyst>
 context.
 
+B<*WARNING*>: do not export L<CGI> functions into a Controller, it will break
+with L<Catalyst> 5.8 onward.
+
+If you just want to run CGIs from files, see L<Catalyst::Controller::CGIBin>.
+
+=head1 CONFIGURATION
+
+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.
+
+Default is to pass the whole of C<%ENV>.
+
+C<{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</SYNOPSIS> for an example.
+
 =cut
 
 # Hack-around because Catalyst::Engine::HTTP goes and changes
@@ -101,7 +121,7 @@ The environment variables to pass on are taken from the configuration for your
 Controller, see L</SYNOPSIS> for an example. If you don't supply a list of
 environment variables to pass, the whole of %ENV is used.
 
-Used by cgi_to_response, which is probably what you want to use as well.
+Used by cgi_to_response (above), which is probably what you want to use as well.
 
 =cut
 
@@ -127,16 +147,34 @@ sub wrap_cgi {
     }
   }
 
-  my @env = @{ $self->{CGI}{pass_env} || [ keys %ENV ] };
+  my @env;
+
+  my $pass_env = $self->{CGI}{pass_env};
+  $pass_env = []            if not defined $pass_env;
+  $pass_env = [ $pass_env ] unless ref $pass_env;
+
+  for (@$pass_env) {
+    if (m!^/(.*)/\z!) {
+      my $re = qr/$1/;
+      push @env, grep /$re/, keys %ENV;
+    } else {
+      push @env, $_;
+    }
+  }
+
+  @env = keys %ENV unless @env;
 
   $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 }
                 : '');
   my $env = HTTP::Request::AsCGI->new(
               $req,
-              REMOTE_USER => $user,
+              ($username ? (REMOTE_USER => $username) : ()),
               map { ($_, $ENV{$_}) } @env
             );
 
@@ -155,8 +193,9 @@ 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;
@@ -168,7 +207,7 @@ Original development sponsored by L<http://www.altinity.com/>
 
 =head1 SEE ALSO
 
-L<Catalyst::Plugin::CGIBin>, L<CatalystX::GlobalContext>,
+L<Catalyst::Controller::CGIBin>, L<CatalystX::GlobalContext>,
 L<Catalyst::Controller>, L<CGI>, L<Catalyst>
 
 =head1 AUTHOR
@@ -218,4 +257,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: