make Net::Netmask optional

git-svn-id: http://code.sixapart.com/svn/perlbal/trunk@316 6caf28e9-730f-0410-b62b-a31386fe13fb

CHANGES

@@ -1,3 +1,5 @@
+    -- make Net::Netmask optional
+
     -- byte range support for both webserver mode and reproxy-file mode
        Giao Phan <giao@guba.com>.  so clients can resume large transfers.
 

Makefile.PL

@@ -24,10 +24,8 @@ WriteMakefile(
     ),
 
     PREREQ_PM               => {
-        'Linux::AIO'  => '1.3',
-        'Danga::Socket' => '1.36',
+        'Danga::Socket' => '1.43',
         'BSD::Resource' => 0,
-        'Net::Netmask' => 0,
         'Test::More' => 0,
         'File::Find' => 0,
     },

lib/Perlbal/BackendHTTP.pm

@@ -176,11 +176,7 @@ sub assign_client {
     $hds->header("X-Proxy-Capabilities", "reproxy-file");
 
     # decide whether we trust the upstream or not
-    my $trust = $self->{service}->{always_trusted}; # set to default auto-trust level
-    if ($self->{service} && $self->{service}->{trusted_upstreams}) {
-        $trust = 1
-            if $self->{service}->{trusted_upstreams}->match($client->peer_ip_string);
-    }
+    my $trust = $self->{service}->trusted_ip($client->peer_ip_string);
 
     # if we're not going to trust the upstream, reset these for security reasons
     unless ($trust) {

lib/Perlbal/Service.pm

@@ -6,8 +6,6 @@ package Perlbal::Service;
 use strict;
 use warnings;
 
-use Net::Netmask;
-
 use Perlbal::BackendHTTP;
 
 use fields (
@@ -552,6 +550,21 @@ sub role {
     return $self->{role};
 }
 
+# called by BackendHTTP to ask if a client's IP is in our trusted list
+sub trusted_ip {
+    my Perlbal::Service $self = shift;
+    my $ip = shift;
+
+    return 1 if $self->{'always_trusted'};
+
+    my $tmap = $self->{trusted_upstreams};
+    return 0 unless $tmap;
+
+    # try to use it as a Net::Netmask object
+    return 1 if eval { $tmap->match($ip); };
+    return 0;
+}
+
 # manage some header stuff
 sub header_management {
     my Perlbal::Service $self = shift;
@@ -646,6 +659,9 @@ sub set {
     };
 
     if ($key eq 'trusted_upstream_proxies') {
+        my $loaded = eval { require Net::Netmask; 1; };
+        return $err->("Net::Netmask not installed") unless $loaded;
+
         if ($self->{trusted_upstreams} = Net::Netmask->new2($val)) {
             # set, all good
             return $ok->();