Changeset 29307

Timestamp:

01/30/09 21:26:18 (4 years ago)

Author:

dann

Message:

changed implementation based on new HTTP::Engine::Middleware interface

Location:

lang/perl/HTTP-Engine-Middleware/branches/declare

Files:

• lib/HTTP/Engine/Middleware/ReverseProxy.pm (modified) (1 diff)
• t/200_middlewares/reverseproxy.t (modified) (2 diffs)

lang/perl/HTTP-Engine-Middleware/branches/declare/lib/HTTP/Engine/Middleware/ReverseProxy.pm

@@ -1 +1 @@
 package HTTP::Engine::Middleware::ReverseProxy;
-use Moose;
+use HTTP::Engine::Middleware;
 
-sub wrap {
-    my ($class, $next) = @_;
+before_handle {
+    my ( $c, $self, $req ) = @_;
+    my $env = $req->_connection->{env} || {};
 
-    sub {
-        my $req = shift;
+    # in apache httpd.conf (RequestHeader set X-Forwarded-HTTPS %{HTTPS}s)
+    $env->{HTTPS} = $req->headers->{'x-forwarded-https'}
+        if $req->headers->{'x-forwarded-https'};
+    $env->{HTTPS} = 'ON' if $req->headers->{'x-forwarded-proto'};    # Pound
+    $req->secure(1) if $env->{HTTPS} && uc $env->{HTTPS} eq 'ON';
 
-        my $env = $req->_connection->{env} || {};
-        # in apache httpd.conf (RequestHeader set X-Forwarded-HTTPS %{HTTPS}s)
-        $env->{HTTPS} = $req->headers->{'x-forwarded-https'} if $req->headers->{'x-forwarded-https'};
-        $env->{HTTPS} = 'ON'                         if $req->headers->{'x-forwarded-proto'}; # Pound
-        $req->secure(1) if $env->{HTTPS} && uc $env->{HTTPS} eq 'ON';
+    # 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)
+    if ( $req->headers->{'x-forwarded-for'} ) {
+        my ( $ip, ) = $req->headers->{'x-forwarded-for'} =~ /([^,\s]+)$/;
+        $req->address($ip);
+    }
 
-        # 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)
-        if ($req->headers->{'x-forwarded-for'}) {
-            my ($ip, ) = $req->headers->{'x-forwarded-for'} =~ /([^,\s]+)$/;
-            $req->address($ip);
+    if ( $req->headers->{'x-forwarded-host'} ) {
+        my $host = $req->headers->{'x-forwarded-host'};
+        if ( $host =~ /^(.+):(\d+)$/ ) {
+            $host = $1;
+            $env->{SERVER_PORT} = $2;
         }
+        elsif ( $req->headers->{'x-forwarded-port'} ) {
 
-        if ($req->headers->{'x-forwarded-host'}) {
-            my $host = $req->headers->{'x-forwarded-host'};
-            if ($host =~ /^(.+):(\d+)$/ ) {
-                $host = $1;
-                $env->{SERVER_PORT} = $2;
-            } elsif ($req->headers->{'x-forwarded-port'}) {
-                # in apache httpd.conf (RequestHeader set X-Forwarded-Port 8443)
-                $env->{SERVER_PORT} = $req->headers->{'x-forwarded-port'};
-            }
-            $env->{HTTP_HOST} = $host;
+            # in apache httpd.conf (RequestHeader set X-Forwarded-Port 8443)
+            $env->{SERVER_PORT} = $req->headers->{'x-forwarded-port'};
+        }
+        $env->{HTTP_HOST} = $host;
 
-            $req->headers->header( 'Host' => $env->{HTTP_HOST} );
-        }
-        $req->_connection->{env} = $env;
+        $req->headers->header( 'Host' => $env->{HTTP_HOST} );
+    }
+    $req->_connection->{env} = $env;
 
-        for my $attr (qw/uri base/) {
-            my $scheme = $req->secure ? 'https' : 'http';
-            my $host = $env->{HTTP_HOST} || $env->{SERVER_NAME};
-            my $port = $env->{SERVER_PORT} || ( $req->secure ? 443 : 80 );
-            # my $path_info = $env->{PATH_INFO} || '/';
+    for my $attr (qw/uri base/) {
+        my $scheme = $req->secure ? 'https' : 'http';
+        my $host = $env->{HTTP_HOST} || $env->{SERVER_NAME};
+        my $port = $env->{SERVER_PORT} || ( $req->secure ? 443 : 80 );
 
-            $req->$attr->scheme($scheme);
-            $req->$attr->host($host);
-            $req->$attr->port($port);
-            # $req->$attr->path($path_info);
-            # $req->$attr( $req->$attr->canonical );
-        }
-        $next->($req);
-    };
-}
+        # my $path_info = $env->{PATH_INFO} || '/';
 
-1;
+        $req->$attr->scheme($scheme);
+        $req->$attr->host($host);
+        $req->$attr->port($port);
+
+        # $req->$attr->path($path_info);
+        # $req->$attr( $req->$attr->canonical );
+    }
+    $req;
+};
+
+__MIDDLEWARE__
+
+__END__
+

lang/perl/HTTP-Engine-Middleware/branches/declare/t/200_middlewares/reverseproxy.t

@@ -3 +3 @@
 use Test::Base;
 use HTTP::Engine;
-use HTTP::Engine::Middleware::ReverseProxy;
+use HTTP::Engine::Middleware;
 use HTTP::Request;
 use HTTP::Headers;
@@ -20 +20 @@
     $ENV{QUERY_STRING}   = 'foo=bar';
 
+    my $mw = HTTP::Engine::Middleware->new;
+    $mw->install( 'HTTP::Engine::Middleware::ReverseProxy', );
+
     my $headers = HTTP::Headers->new;
-    $headers->header(%{ $block->input });
+    $headers->header( %{ $block->input } );
+
     # $headers->header(HOST => 'example.com:80');
     HTTP::Engine->new(
         interface => {
-            module => 'Test',
-            request_handler => HTTP::Engine::Middleware::ReverseProxy->wrap(sub {
-                my $req = shift;
+            module          => 'Test',
+            request_handler => $mw->handler(
+                sub {
+                    my $req = shift;
 
-                for my $attr ( qw/secure address/ ) {
-                    if ( $block->$attr ) {
-                      is($req->$attr, $block->$attr, $block->name . " of $attr");
+                    for my $attr (qw/secure address/) {
+                        if ( $block->$attr ) {
+                            is( $req->$attr, $block->$attr,
+                                $block->name . " of $attr" );
+                        }
                     }
+                    for my $url (qw/uri base /) {
+                        if ( $block->$url ) {
+                            is( $req->$url->as_string, $block->$url,
+                                $block->name . " of $url" );
+                        }
+                    }
+
+                    HTTP::Engine::Response->new( body => 'OK' );
                 }
-                for my $url ( qw/uri base / ) {
-                  if ( $block->$url ) {
-                    is($req->$url->as_string, $block->$url, $block->name . " of $url");
-                  }
-                }
-
-                HTTP::Engine::Response->new(body  => 'OK');
-            }),
+            ),
         },
-    )->run(HTTP::Request->new(GET => 'http://example.com/?foo=bar', $headers),env => \%ENV);
+        )->run(
+        HTTP::Request->new( GET => 'http://example.com/?foo=bar', $headers ),
+        env => \%ENV
+        );
 };