X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FCGI.pm;h=6fb71b951d68d61d3b7530bcf54b972614547e25;hb=e0616220ee0bf2a2a9f0bacc0cb3b7fd2a464f36;hp=8950d73dd04dfa0f790337b70dfd92c26267a02c;hpb=6bd2b72cca4b754f154ed1eca98151ac390d9cb5;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm index 8950d73..6fb71b9 100644 --- a/lib/Catalyst/Engine/CGI.pm +++ b/lib/Catalyst/Engine/CGI.pm @@ -2,12 +2,8 @@ package Catalyst::Engine::CGI; use strict; use base 'Catalyst::Engine'; - -use CGI; +use NEXT; use URI; -use URI::http; - -__PACKAGE__->mk_accessors('cgi'); =head1 NAME @@ -30,26 +26,7 @@ appropriate engine module. =head1 DESCRIPTION -This is the Catalyst engine specialized for the CGI environment (using the -C and C modules). Normally Catalyst will select the -appropriate engine according to the environment that it detects, however you -can force Catalyst to use the CGI engine by specifying the following in your -application module: - - use Catalyst qw(-Engine=CGI); - -The performance of this way of using Catalyst is not expected to be -useful in production applications, but it may be helpful for development. - -=head1 METHODS - -=over 4 - -=item $c->cgi - -This config parameter contains the C object. - -=back +This is the Catalyst engine specialized for the CGI environment. =head1 OVERLOADED METHODS @@ -57,23 +34,12 @@ This class overloads some methods from C. =over 4 -=item $c->finalize_body - -Prints the response output to STDOUT. - -=cut - -sub finalize_body { - my $c = shift; - print $c->response->output; -} - -=item $c->finalize_headers +=item $self->finalize_headers($c) =cut sub finalize_headers { - my $c = shift; + my ( $self, $c ) = @_; $c->response->header( Status => $c->response->status ); @@ -81,170 +47,158 @@ sub finalize_headers { print "\015\012"; } -=item $c->prepare_body +=item $self->prepare_connection($c) =cut -sub prepare_body { - my $c = shift; +sub prepare_connection { + my ( $self, $c ) = @_; - # XXX this is undocumented in CGI.pm. If Content-Type is not - # application/x-www-form-urlencoded or multipart/form-data - # CGI.pm will read STDIN into a param, POSTDATA. + $c->request->address( $ENV{REMOTE_ADDR} ); - $c->request->body( $c->cgi->param('POSTDATA') ); -} + PROXY_CHECK: + { + unless ( $c->config->{using_frontend_proxy} ) { + last PROXY_CHECK if $ENV{REMOTE_ADDR} ne '127.0.0.1'; + last PROXY_CHECK if $c->config->{ignore_frontend_proxy}; + } + last PROXY_CHECK unless $ENV{HTTP_X_FORWARDED_FOR}; + + # If we are running as a backend server, the user will always appear + # as 127.0.0.1. Select the most recent upstream IP (last in the list) + my ($ip) = $ENV{HTTP_X_FORWARDED_FOR} =~ /([^,\s]+)$/; + $c->request->address($ip); + } -=item $c->prepare_connection + $c->request->hostname( $ENV{REMOTE_HOST} ); + $c->request->protocol( $ENV{SERVER_PROTOCOL} ); + $c->request->user( $ENV{REMOTE_USER} ); + $c->request->method( $ENV{REQUEST_METHOD} ); -=cut + if ( $ENV{HTTPS} && uc( $ENV{HTTPS} ) eq 'ON' ) { + $c->request->secure(1); + } -sub prepare_connection { - my $c = shift; - $c->req->hostname( $ENV{REMOTE_HOST} ); - $c->req->address( $ENV{REMOTE_ADDR} ); + if ( $ENV{SERVER_PORT} == 443 ) { + $c->request->secure(1); + } } -=item $c->prepare_headers +=item $self->prepare_headers($c) =cut sub prepare_headers { - my $c = shift; + my ( $self, $c ) = @_; + # Read headers from %ENV while ( my ( $header, $value ) = each %ENV ) { - - next unless $header =~ /^(HTTP|CONTENT)/i; - + next unless $header =~ /^(?:HTTP|CONTENT|COOKIE)/i; ( my $field = $header ) =~ s/^HTTPS?_//; - $c->req->headers->header( $field => $value ); } - - $c->req->method( $ENV{REQUEST_METHOD} || 'GET' ); } -=item $c->prepare_parameters +=item $self->prepare_path($c) =cut -sub prepare_parameters { - my $c = shift; - - my ( @params ); - - if ( $c->request->method eq 'POST' ) { - for my $param ( $c->cgi->url_param ) { - for my $value ( $c->cgi->url_param($param) ) { - push ( @params, $param, $value ); - } - } - } - - for my $param ( $c->cgi->param ) { - for my $value ( $c->cgi->param($param) ) { - push ( @params, $param, $value ); - } - } - - $c->request->param(\@params); -} +sub prepare_path { + my ( $self, $c ) = @_; -=item $c->prepare_path + my $scheme = $c->request->secure ? 'https' : 'http'; + my $host = $ENV{HTTP_HOST} || $ENV{SERVER_NAME}; + my $port = $ENV{SERVER_PORT} || 80; + my $base_path = $ENV{SCRIPT_NAME} || '/'; -=cut + # If we are running as a backend proxy, get the true hostname + PROXY_CHECK: + { + unless ( $c->config->{using_frontend_proxy} ) { + last PROXY_CHECK if $host !~ /localhost|127.0.0.1/; + last PROXY_CHECK if $c->config->{ignore_frontend_proxy}; + } + last PROXY_CHECK unless $ENV{HTTP_X_FORWARDED_HOST}; -sub prepare_path { - my $c = shift; + $host = $ENV{HTTP_X_FORWARDED_HOST}; - my $base; - { - my $scheme = $ENV{HTTPS} ? 'https' : 'http'; - my $host = $ENV{HTTP_HOST} || $ENV{SERVER_NAME}; - my $port = $ENV{SERVER_PORT} || 80; - my $path = $ENV{SCRIPT_NAME} || '/'; - - $base = URI->new; - $base->scheme($scheme); - $base->host($host); - $base->port($port); - $base->path($path); - - $base = $base->canonical->as_string; + # backend could be on any port, so + # assume frontend is on the default port + $port = $c->request->secure ? 443 : 80; } - my $path = $ENV{PATH_INFO} || '/'; - $path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg; - $path =~ s/^\///; - - $c->req->base($base); - $c->req->path($path); + my $path = $base_path . $ENV{PATH_INFO}; + $path =~ s{^/+}{}; + + my $uri = URI->new; + $uri->scheme($scheme); + $uri->host($host); + $uri->port($port); + $uri->path($path); + $uri->query( $ENV{QUERY_STRING} ) if $ENV{QUERY_STRING}; + + # sanitize the URI + $uri = $uri->canonical; + $c->request->uri($uri); + + # set the base URI + # base must end in a slash + $base_path .= '/' unless ( $base_path =~ /\/$/ ); + my $base = $uri->clone; + $base->path_query($base_path); + $c->request->base($base); } -=item $c->prepare_request +=item $self->prepare_query_parameters($c) =cut -sub prepare_request { - my ( $c, $cgi ) = @_; - $c->cgi( $cgi || CGI->new ); - $c->cgi->_reset_globals; +sub prepare_query_parameters { + my ( $self, $c ) = @_; + + $self->SUPER::prepare_query_parameters( $c, $ENV{QUERY_STRING} ); } -=item $c->prepare_uploads +=item $self->prepare_write($c) + +Enable autoflush on the output handle for CGI-based engines. =cut -sub prepare_uploads { - my $c = shift; +sub prepare_write { + my ( $self, $c ) = @_; - my @uploads; - - for my $param ( $c->cgi->param ) { - - my @values = $c->cgi->param($param); - - next unless ref( $values[0] ); + # Set the output handle to autoflush + *STDOUT->autoflush(1); - for my $fh (@values) { + $self->NEXT::prepare_write($c); +} - next unless my $size = ( stat $fh )[7]; +=item $self->read_chunk($c, $buffer, $length) - my $info = $c->cgi->uploadInfo($fh); - my $tempname = $c->cgi->tmpFileName($fh); - my $type = $info->{'Content-Type'}; - my $disposition = $info->{'Content-Disposition'}; - my $filename = ( $disposition =~ / filename="([^;]*)"/ )[0]; +=cut - my $upload = Catalyst::Request::Upload->new( - filename => $filename, - size => $size, - tempname => $tempname, - type => $type - ); - - push( @uploads, $param, $upload ); - } - } - - $c->request->upload(\@uploads); -} +sub read_chunk { shift; shift; *STDIN->sysread(@_); } -=item $c->run +=item $self->run =cut -sub run { shift->handler } +sub run { shift; shift->handle_request(@_) } =back =head1 SEE ALSO -L. +L L. + +=head1 AUTHORS + +Sebastian Riedel, -=head1 AUTHOR +Christian Hansen, -Sebastian Riedel, C +Andy Grundman, =head1 COPYRIGHT