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=29b8421a2383c3117d4fb82fb50dd82518cdbda9;hb=ac5c933bdd463558e8d621507a53a7b247a9093e;hpb=6dc87a0f8301391acfe25ee5bcaad0fe48dad559 diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm index 29b8421..ae5a652 100644 --- a/lib/Catalyst/Engine/CGI.pm +++ b/lib/Catalyst/Engine/CGI.pm @@ -1,15 +1,9 @@ package Catalyst::Engine::CGI; -use strict; -use base 'Catalyst::Engine'; -use URI; +use Moose; +extends 'Catalyst::Engine'; -require CGI::Simple; - -$CGI::Simple::POST_MAX = 1048576; -$CGI::Simple::DISABLE_UPLOADS = 0; - -__PACKAGE__->mk_accessors('cgi'); +has env => (is => 'rw'); =head1 NAME @@ -32,171 +26,225 @@ 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 This class overloads some methods from C. -=over 4 - -=item $c->finalize_headers +=head2 $self->finalize_headers($c) =cut sub finalize_headers { - my $c = shift; - my %headers; - - $headers{-status} = $c->response->status if $c->response->status; + my ( $self, $c ) = @_; - for my $name ( $c->response->headers->header_field_names ) { - $headers{"-$name"} = $c->response->header($name); - } + $c->response->header( Status => $c->response->status ); - print $c->cgi->header(%headers); + $self->{_header_buf} + = $c->response->headers->as_string("\015\012") . "\015\012"; } -=item $c->finalize_output - -Prints the response output to STDOUT. +=head2 $self->prepare_connection($c) =cut -sub finalize_output { - my $c = shift; - print $c->response->output; -} +sub prepare_connection { + my ( $self, $c ) = @_; + local (*ENV) = $self->env || \%ENV; -=item $c->prepare_connection + my $request = $c->request; + $request->address( $ENV{REMOTE_ADDR} ); -=cut + 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); + } -sub prepare_connection { - my $c = shift; - $c->req->hostname( $c->cgi->remote_host ); - $c->req->address( $c->cgi->remote_addr ); + $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); + } + + if ( $ENV{SERVER_PORT} == 443 ) { + $request->secure(1); + } } -=item $c->prepare_headers +=head2 $self->prepare_headers($c) =cut sub prepare_headers { - my $c = shift; - $c->req->method( $c->cgi->request_method ); - for my $header ( $c->cgi->http ) { + 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?_//; - $c->req->headers->header( $field => $c->cgi->http($header) ); + $headers->header( $field => $ENV{$header} ); } - $c->req->headers->header( 'Content-Type' => $c->cgi->content_type ); - $c->req->headers->header( 'Content-Length' => $c->cgi->content_length ); } -=item $c->prepare_parameters +=head2 $self->prepare_path($c) =cut -sub prepare_parameters { - my $c = shift; +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} || '/'; + } + + # 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->cgi->parse_query_string; - - my %vars = $c->cgi->Vars; - while ( my ( $key, $value ) = each %vars ) { - my @values = split "\0", $value; - $vars{$key} = @values <= 1 ? $values[0] : \@values; + # 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"; } - $c->req->parameters( {%vars} ); + + # 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_path +=head2 $self->prepare_query_parameters($c) =cut -sub prepare_path { - my $c = shift; +around prepare_query_parameters => sub { + my $orig = shift; + my ( $self, $c ) = @_; + local (*ENV) = $self->env || \%ENV; - 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; + if ( $ENV{QUERY_STRING} ) { + $self->$orig( $c, $ENV{QUERY_STRING} ); } +}; + +=head2 $self->prepare_request($c, (env => \%env)) + +=cut - my $path = $ENV{PATH_INFO} || '/'; - $path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg; - $path =~ s/^\///; +sub prepare_request { + my ( $self, $c, %args ) = @_; - $c->req->base($base); - $c->req->path($path); + if ( $args{env} ) { + $self->env( $args{env} ); + } } -=item $c->prepare_request +=head2 $self->prepare_write($c) + +Enable autoflush on the output handle for CGI-based engines. =cut -sub prepare_request { shift->cgi( CGI::Simple->new ) } +before prepare_write => sub { + *STDOUT->autoflush(1); +}; + +=head2 $self->write($c, $buffer) -=item $c->prepare_uploads +Writes the buffer to the client. =cut -sub prepare_uploads { - my $c = shift; - for my $name ( $c->cgi->upload ) { - next unless defined $name; - $c->req->uploads->{$name} = { - fh => $c->cgi->upload($name), - size => $c->cgi->upload_info( $name, 'size' ), - type => $c->cgi->upload_info( $name, 'mime' ) - }; +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; } -} -=item $c->run + return $self->$orig( $c, $buffer ); +}; + +=head2 $self->read_chunk($c, $buffer, $length) =cut -sub run { shift->handler } +sub read_chunk { shift; shift; *STDIN->sysread(@_); } -=back +=head2 $self->run + +=cut + +sub run { shift; shift->handle_request(@_) } =head1 SEE ALSO -L. +L L. + +=head1 AUTHORS + +Sebastian Riedel, -=head1 AUTHOR +Christian Hansen, -Sebastian Riedel, C +Andy Grundman, =head1 COPYRIGHT