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=fa329020466e591f4abf40b76f2c916e384d72e4;hp=9305c1be9667f9f28e1b1cc6fec8b3a3e498912c;hb=536bee890cf24e0e4bcda7562e7b70cc03ca0620;hpb=c2e8e6fa308480a083f88f9fd82f835aae150c34 diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm index 9305c1b..fa32902 100644 --- a/lib/Catalyst/Engine/CGI.pm +++ b/lib/Catalyst/Engine/CGI.pm @@ -1,9 +1,9 @@ package Catalyst::Engine::CGI; -use strict; -use base 'Catalyst::Engine::CGI::Base'; +use Moose; +extends 'Catalyst::Engine'; -use CGI; +has _header_buf => (is => 'rw', clearer => '_clear_header_buf', predicate => '_has_header_buf'); =head1 NAME @@ -26,128 +26,229 @@ 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: +This is the Catalyst engine specialized for the CGI environment. - use Catalyst qw(-Engine=CGI); +=head1 OVERLOADED METHODS -The performance of this way of using Catalyst is not expected to be -useful in production applications, but it may be helpful for development. +This class overloads some methods from C. -=head1 OVERLOADED METHODS +=head2 $self->finalize_headers($c) + +=cut + +sub finalize_headers { + my ( $self, $c ) = @_; -This class overloads some methods from C. + $c->response->header( Status => $c->response->status ); -=over 4 + $self->_header_buf($c->response->headers->as_string("\015\012") . "\015\012"); +} -=item $c->prepare_body +=head2 $self->prepare_connection($c) =cut -sub prepare_body { - my $c = shift; +sub prepare_connection { + my ( $self, $c ) = @_; + local (*ENV) = $self->env || \%ENV; + + my $request = $c->request; + $request->address( $ENV{REMOTE_ADDR} ); + + 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); + } + + $request->hostname( $ENV{REMOTE_HOST} ) if exists $ENV{REMOTE_HOST}; + $request->protocol( $ENV{SERVER_PROTOCOL} ); + $request->user( $ENV{REMOTE_USER} ); # XXX: Deprecated. See Catalyst::Request for removal information + $request->remote_user( $ENV{REMOTE_USER} ); + $request->method( $ENV{REQUEST_METHOD} ); - # 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. + if ( $ENV{HTTPS} && uc( $ENV{HTTPS} ) eq 'ON' ) { + $request->secure(1); + } - $c->request->body( $c->cgi->param('POSTDATA') ); + if ( $ENV{SERVER_PORT} == 443 ) { + $request->secure(1); + } } -=item $c->prepare_parameters +=head2 $self->prepare_headers($c) =cut -sub prepare_parameters { - my $c = shift; +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} ); + } +} + +=head2 $self->prepare_path($c) - my ( @params ); +=cut - 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 ); - } - } +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} || '/'; } - for my $param ( $c->cgi->param ) { - for my $value ( $c->cgi->param($param) ) { - push ( @params, $param, $value ); + # 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}; + + $host = $ENV{HTTP_X_FORWARDED_HOST}; + + # backend could be on any port, so + # assume frontend is on the default port + $port = $c->request->secure ? 443 : 80; } - $c->request->param(@params); + # 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_request +=head2 $self->prepare_query_parameters($c) + +=cut + +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 sub prepare_request { - my ( $c, $cgi ) = @_; - $c->cgi( $cgi || CGI->new ); - $c->cgi->_reset_globals; + my ( $self, $c, %args ) = @_; + + if ( $args{env} ) { + $self->env( $args{env} ); + } } -=item $c->prepare_uploads +=head2 $self->prepare_write($c) + +Enable autoflush on the output handle for CGI-based engines. =cut -sub prepare_uploads { - my $c = shift; +around prepare_write => sub { + *STDOUT->autoflush(1); + return shift->(@_); +}; - my @uploads; +=head2 $self->write($c, $buffer) - for my $param ( $c->cgi->param ) { +Writes the buffer to the client. - my @values = $c->cgi->param($param); +=cut - next unless ref( $values[0] ); +around write => sub { + my $orig = shift; + my ( $self, $c, $buffer ) = @_; + + # Prepend the headers if they have not yet been sent + if ( $self->_has_header_buf ) { + $buffer = $self->_clear_header_buf . $buffer; + } - for my $fh (@values) { + return $self->$orig( $c, $buffer ); +}; - next unless my $size = ( stat $fh )[7]; +=head2 $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 - ); +sub read_chunk { shift; shift; *STDIN->sysread(@_); } - push( @uploads, $param, $upload ); - } - } +=head2 $self->run - $c->request->upload(@uploads); -} +=cut -=back +sub run { shift; shift->handle_request( env => \%ENV ) } =head1 SEE ALSO -L L L. +L, L -=head1 AUTHOR +=head1 AUTHORS -Sebastian Riedel, C -Christian Hansen, C +Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT -This program is free software, you can redistribute it and/or modify it under +This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut +no Moose; 1;