X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FCGI.pm;h=ae5a65283f069c0e5ab9a8e7d25c2009d4865ef7;hp=409ce5a87a75ca667861a431dd780b7760bebdd0;hb=ac5c933bdd463558e8d621507a53a7b247a9093e;hpb=66294129a6520edc031aa7a43fc9bdfce669af15 diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm index 409ce5a..ae5a652 100644 --- a/lib/Catalyst/Engine/CGI.pm +++ b/lib/Catalyst/Engine/CGI.pm @@ -1,27 +1,9 @@ package Catalyst::Engine::CGI; -use strict; -use base 'Catalyst::Engine::CGI::Base'; +use Moose; +extends 'Catalyst::Engine'; -use CGI; - -our @compile = qw[ - delete - http - new_MultipartBuffer - param - parse_keywordlist - read_from_client - read_multipart - tmpFileName - uploadInfo - url_param - user_agent -]; - -CGI->compile(@compile); - -__PACKAGE__->mk_accessors('cgi'); +has env => (is => 'rw'); =head1 NAME @@ -44,150 +26,225 @@ appropriate engine module. =head1 DESCRIPTION -This is the Catalyst engine specialized for the CGI environment (using the -C and C modules). - -=head1 METHODS - -=over 4 - -=item $c->cgi - -Contains the C object. - -=back +This is the Catalyst engine specialized for the CGI environment. =head1 OVERLOADED METHODS -This class overloads some methods from C. - -=over 4 +This class overloads some methods from C. -=item $c->prepare_body +=head2 $self->finalize_headers($c) =cut -sub prepare_body { - my $c = shift; +sub finalize_headers { + 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->response->header( Status => $c->response->status ); - $c->request->body( $c->cgi->param('POSTDATA') ); + $self->{_header_buf} + = $c->response->headers->as_string("\015\012") . "\015\012"; } -=item $c->prepare_parameters +=head2 $self->prepare_connection($c) =cut -sub prepare_parameters { - my $c = shift; +sub prepare_connection { + my ( $self, $c ) = @_; + local (*ENV) = $self->env || \%ENV; - my ( @params ); + my $request = $c->request; + $request->address( $ENV{REMOTE_ADDR} ); - 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 ); - } + 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]+)$/; + $request->address($ip); } - for my $param ( $c->cgi->param ) { - for my $value ( $c->cgi->param($param) ) { - push ( @params, $param, $value ); - } + $request->hostname( $ENV{REMOTE_HOST} ); + $request->protocol( $ENV{SERVER_PROTOCOL} ); + $request->user( $ENV{REMOTE_USER} ); + $request->method( $ENV{REQUEST_METHOD} ); + + if ( $ENV{HTTPS} && uc( $ENV{HTTPS} ) eq 'ON' ) { + $request->secure(1); } - $c->request->param(@params); + if ( $ENV{SERVER_PORT} == 443 ) { + $request->secure(1); + } } -=item $c->prepare_request +=head2 $self->prepare_headers($c) =cut -sub prepare_request { - my ( $c, $object ) = @_; - - my $cgi; +sub prepare_headers { + my ( $self, $c ) = @_; + local (*ENV) = $self->env || \%ENV; + my $headers = $c->request->headers; + # Read headers from %ENV + foreach my $header ( keys %ENV ) { + next unless $header =~ /^(?:HTTP|CONTENT|COOKIE)/i; + ( my $field = $header ) =~ s/^HTTPS?_//; + $headers->header( $field => $ENV{$header} ); + } +} - if ( defined($object) && ref($object) ) { +=head2 $self->prepare_path($c) - if ( $object->isa('Apache') ) { # MP 1.3 - $cgi = CGI->new($object); - } +=cut - elsif ( $object->isa('Apache::RequestRec') ) { # MP 1.99 - $cgi = CGI->new($object); - } +sub prepare_path { + my ( $self, $c ) = @_; + local (*ENV) = $self->env || \%ENV; + + my $scheme = $c->request->secure ? 'https' : 'http'; + my $host = $ENV{HTTP_HOST} || $ENV{SERVER_NAME}; + my $port = $ENV{SERVER_PORT} || 80; + my $base_path; + if ( exists $ENV{REDIRECT_URL} ) { + $base_path = $ENV{REDIRECT_URL}; + $base_path =~ s/$ENV{PATH_INFO}$//; + } + else { + $base_path = $ENV{SCRIPT_NAME} || '/'; + } - elsif ( $object->isa('Apache2::RequestRec') ) { # MP 2.00 - $cgi = CGI->new($object); + # 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}; - elsif ( $object->isa('CGI') ) { - $cgi = $object; - } + $host = $ENV{HTTP_X_FORWARDED_HOST}; - else { - my $class = ref($object); - die( qq/Invalid argument $object/ ); - } + # backend could be on any port, so + # assume frontend is on the default port + $port = $c->request->secure ? 443 : 80; } - $c->cgi( $cgi || CGI->new ); + # set the request URI + my $path = $base_path . ( $ENV{PATH_INFO} || '' ); + $path =~ s{^/+}{}; + + # Using URI directly is way too slow, so we construct the URLs manually + my $uri_class = "URI::$scheme"; + + # HTTP_HOST will include the port even if it's 80/443 + $host =~ s/:(?:80|443)$//; + + if ( $port !~ /^(?:80|443)$/ && $host !~ /:/ ) { + $host .= ":$port"; + } + + # Escape the path + $path =~ s/([^$URI::uric])/$URI::Escape::escapes{$1}/go; + $path =~ s/\?/%3F/g; # STUPID STUPID SPECIAL CASE + + my $query = $ENV{QUERY_STRING} ? '?' . $ENV{QUERY_STRING} : ''; + my $uri = $scheme . '://' . $host . '/' . $path . $query; + + $c->request->uri( bless \$uri, $uri_class ); + + # set the base URI + # base must end in a slash + $base_path .= '/' unless $base_path =~ m{/$}; + + my $base_uri = $scheme . '://' . $host . $base_path; + + $c->request->base( bless \$base_uri, $uri_class ); } -=item $c->prepare_uploads +=head2 $self->prepare_query_parameters($c) =cut -sub prepare_uploads { - my $c = shift; +around prepare_query_parameters => sub { + my $orig = shift; + my ( $self, $c ) = @_; + local (*ENV) = $self->env || \%ENV; + + if ( $ENV{QUERY_STRING} ) { + $self->$orig( $c, $ENV{QUERY_STRING} ); + } +}; + +=head2 $self->prepare_request($c, (env => \%env)) + +=cut - my @uploads; +sub prepare_request { + my ( $self, $c, %args ) = @_; - for my $param ( $c->cgi->param ) { + if ( $args{env} ) { + $self->env( $args{env} ); + } +} - my @values = $c->cgi->param($param); +=head2 $self->prepare_write($c) - next unless ref( $values[0] ); +Enable autoflush on the output handle for CGI-based engines. - for my $fh (@values) { +=cut - next unless my $size = ( stat $fh )[7]; +before prepare_write => sub { + *STDOUT->autoflush(1); +}; - 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]; +=head2 $self->write($c, $buffer) - my $upload = Catalyst::Request::Upload->new( - filename => $filename, - size => $size, - tempname => $tempname, - type => $type - ); +Writes the buffer to the client. - push( @uploads, $param, $upload ); - } +=cut + +around write => sub { + my $orig = shift; + my ( $self, $c, $buffer ) = @_; + + # Prepend the headers if they have not yet been sent + if ( my $headers = delete $self->{_header_buf} ) { + $buffer = $headers . $buffer; } - $c->request->upload(@uploads); -} + return $self->$orig( $c, $buffer ); +}; + +=head2 $self->read_chunk($c, $buffer, $length) + +=cut -=back +sub read_chunk { shift; shift; *STDIN->sysread(@_); } + +=head2 $self->run + +=cut + +sub run { shift; shift->handle_request(@_) } =head1 SEE ALSO -L L L. +L L. + +=head1 AUTHORS + +Sebastian Riedel, -=head1 AUTHOR +Christian Hansen, -Sebastian Riedel, C -Christian Hansen, C +Andy Grundman, =head1 COPYRIGHT