X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FCGI.pm;h=741816e34e240ad787d9f297e232212af9290325;hb=84528885db9fca49c55d5859e275b70ec1a3ea28;hp=e94452644945a8b1be7d910fee2b91d6b22033e3;hpb=0556eb49954590b794221ed3a033565c85dbeb32;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm index e944526..741816e 100644 --- a/lib/Catalyst/Engine/CGI.pm +++ b/lib/Catalyst/Engine/CGI.pm @@ -2,15 +2,10 @@ package Catalyst::Engine::CGI; use strict; use base 'Catalyst::Engine'; +use NEXT; use URI; -require CGI::Simple; -require CGI::Cookie; - -$CGI::Simple::POST_MAX = 1048576; -$CGI::Simple::DISABLE_UPLOADS = 0; - -__PACKAGE__->mk_accessors('cgi'); +__PACKAGE__->mk_accessors( 'env' ); =head1 NAME @@ -33,177 +28,197 @@ 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); +This is the Catalyst engine specialized for the CGI environment. -Catalyst::Engine::CGI generates a full set of HTTP headers, which means that -applications using the engine must be be configured as "Non-parsed Headers" -scripts (at least when running under Apache). To configure this under Apache -name the starting with C. - -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 OVERLOADED METHODS -=head1 METHODS +This class overloads some methods from C. =over 4 -=item $c->run - -To be called from a CGI script to start the Catalyst application. +=item $self->finalize_headers($c) -=item $c->cgi - -This config parameter contains the C object. - -=back +=cut -=head1 OVERLOADED METHODS +sub finalize_headers { + my ( $self, $c ) = @_; -This class overloads some methods from C. + $c->response->header( Status => $c->response->status ); -=over 4 + print $c->response->headers->as_string("\015\012"); + print "\015\012"; +} -=item $c->finalize_headers +=item $self->prepare_connection($c) =cut -sub finalize_headers { - my $c = shift; - my %headers = ( -nph => 1 ); - $headers{-status} = $c->response->status if $c->response->status; - for my $name ( $c->response->headers->header_field_names ) { - $headers{"-$name"} = $c->response->headers->header($name); - } - my @cookies; - while ( my ( $name, $cookie ) = each %{ $c->response->cookies } ) { - push @cookies, $c->cgi->cookie( - -name => $name, - -value => $cookie->{value}, - -expires => $cookie->{expires}, - -domain => $cookie->{domain}, - -path => $cookie->{path}, - -secure => $cookie->{secure} || 0 - ); +sub prepare_connection { + my ( $self, $c ) = @_; + local(*ENV) = $self->env || \%ENV; + + $c->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]+)$/; + $c->request->address($ip); } - $headers{-cookie} = \@cookies if @cookies; - print $c->cgi->header(%headers); -} -=item $c->finalize_output + $c->request->hostname( $ENV{REMOTE_HOST} ); + $c->request->protocol( $ENV{SERVER_PROTOCOL} ); + $c->request->user( $ENV{REMOTE_USER} ); + $c->request->method( $ENV{REQUEST_METHOD} ); -Prints the response output to STDOUT. - -=cut + if ( $ENV{HTTPS} && uc( $ENV{HTTPS} ) eq 'ON' ) { + $c->request->secure(1); + } -sub finalize_output { - my $c = shift; - print $c->response->output; + if ( $ENV{SERVER_PORT} == 443 ) { + $c->request->secure(1); + } } -=item $c->prepare_connection +=item $self->prepare_headers($c) =cut -sub prepare_connection { - my $c = shift; - $c->req->hostname( $c->cgi->remote_host ); - $c->req->address( $c->cgi->remote_addr ); -} +sub prepare_headers { + my ( $self, $c ) = @_; + local(*ENV) = $self->env || \%ENV; -=item $c->prepare_cookies + # Read headers from %ENV + while ( my ( $header, $value ) = each %ENV ) { + next unless $header =~ /^(?:HTTP|CONTENT|COOKIE)/i; + ( my $field = $header ) =~ s/^HTTPS?_//; + $c->req->headers->header( $field => $value ); + } +} -Sets up cookies. +=item $self->prepare_path($c) =cut -sub prepare_cookies { shift->req->cookies( { CGI::Cookie->fetch } ) } +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 = $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; + } + + 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_headers +=item $self->prepare_query_parameters($c) =cut -sub prepare_headers { - my $c = shift; - $c->req->method( $c->cgi->request_method ); - for my $header ( $c->cgi->http ) { - ( my $field = $header ) =~ s/^HTTPS?_//; - $c->req->headers->header( $field => $c->cgi->http($header) ); +sub prepare_query_parameters { + my ( $self, $c ) = @_; + local(*ENV) = $self->env || \%ENV; + + if ( $ENV{QUERY_STRING} ) { + $self->SUPER::prepare_query_parameters( $c, $ENV{QUERY_STRING} ); } } -=item $c->prepare_parameters +=item $self->prepare_request($c, (env => \%env)) =cut -sub prepare_parameters { - my $c = shift; - my %vars = $c->cgi->Vars; - while ( my ( $key, $value ) = each %vars ) { - my @values = split "\0", $value; - $vars{$key} = @values <= 1 ? $values[0] : \@values; +sub prepare_request { + my ( $self, $c, %args ) = @_; + + if ( $args{env} ) { + $self->env( $args{env} ); } - $c->req->parameters( {%vars} ); } -=item $c->prepare_path +=item $self->prepare_write($c) + +Enable autoflush on the output handle for CGI-based engines. =cut -sub prepare_path { - my $c = shift; - $c->req->path( $c->cgi->url( -absolute => 1, -path_info => 1 ) ); - my $loc = $c->cgi->url( -absolute => 1 ); - no warnings 'uninitialized'; - $c->req->{path} =~ s/^($loc)?\///; - $c->req->{path} .= '/' if $c->req->path eq $loc; - my $base = $c->cgi->url; - if ( $ENV{CATALYST_TEST} ) { - my $script = $c->cgi->script_name; - $base =~ s/$script$//i; - } - $base = URI->new($base); - $base->path('/') if ( $ENV{CATALYST_TEST} || !$base->path ); - $c->req->base( $base->as_string ); +sub prepare_write { + my ( $self, $c ) = @_; + + # Set the output handle to autoflush + *STDOUT->autoflush(1); + + $self->NEXT::prepare_write($c); } -=item $c->prepare_request +=item $self->read_chunk($c, $buffer, $length) =cut -sub prepare_request { shift->cgi( CGI::Simple->new ) } +sub read_chunk { shift; shift; *STDIN->sysread(@_); } -=item $c->prepare_uploads +=item $self->run =cut -sub prepare_uploads { - my $c = shift; - for my $name ( $c->cgi->upload ) { - $c->req->uploads->{$name} = { - fh => $c->cgi->upload($name), - size => $c->cgi->upload_info( $name, 'size' ), - type => $c->cgi->upload_info( $name, 'mime' ) - }; - } -} - -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