ids-functions.pl: Use GET method to fetch Header data of a file

[ipfire-2.x.git] / config / cfgroot / ids-functions.pl

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index a7c1585228bad394e927a32525e6ff612786fc3f..afccf43263d813289e663bda433675f9f2e2b03d 100644 (file)
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -211,7 +211,7 @@ sub downloadruleset {
        }
 
        # Pass the requrested url to the downloader.
-       my $request = HTTP::Request->new(HEAD => $url);
+       my $request = HTTP::Request->new(GET => $url);
 
        # Accept the html header.
        $request->header('Accept' => 'text/html');
@@ -222,7 +222,7 @@ sub downloadruleset {
        # Check if there was any error.
        unless ($response->is_success) {
                # Obtain error.
-               my $error = $response->content;
+               my $error = $response->status_line();
 
                # Log error message.
                &_log_to_syslog("Unable to download the ruleset. \($error\)");
@@ -232,7 +232,7 @@ sub downloadruleset {
        }
 
        # Assign the fetched header object.
-       my $header = $response->headers;
+       my $header = $response->headers();
 
        # Grab the remote file size from the object and store it in the
        # variable.
@@ -597,31 +597,20 @@ sub generate_home_net_file() {
 
        # Loop through the array of available network zones.
        foreach my $zone (@network_zones) {
-               # Convert current zone name into upper case.
-               $zone = uc($zone);
-
-               # Generate key to access the required data from the netsettings hash.
-               my $zone_netaddress = $zone . "_NETADDRESS";
-               my $zone_netmask = $zone . "_NETMASK";
-
-               # Obtain the settings from the netsettings hash.
-               my $netaddress = $netsettings{$zone_netaddress};
-               my $netmask = $netsettings{$zone_netmask};
-
-               # Convert the subnetmask into prefix notation.
-               my $prefix = &Network::convert_netmask2prefix($netmask);
+               # Check if the current processed zone is red.
+               if($zone eq "red") {
+                       # Grab the IP-address of the red interface.
+                       my $red_address = &get_red_address();
 
-               # Generate full network string.
-               my $network = join("/", $netaddress,$prefix);
+                       # Check if an address has been obtained.
+                       if ($red_address) {
+                               # Generate full network string.
+                               my $red_network = join("/", $red_address, "32");
 
-               # Check if the network is valid.
-               if(&Network::check_subnet($network)) {
-                       # Add the generated network to the array of networks.
-                       push(@networks, $network);
-               }
+                               # Add the red network to the array of networks.
+                               push(@networks, $red_network);
+                       }
 
-               # Check if the current processed zone is red.
-               if($zone eq "RED") {
                        # Check if the configured RED_TYPE is static.
                        if ($netsettings{'RED_TYPE'} eq "STATIC") {
                                # Get configured and enabled aliases.
@@ -636,6 +625,30 @@ sub generate_home_net_file() {
                                        push(@networks, $network);
                                }
                        }
+               # Process remaining network zones.
+               } else {
+                       # Convert current zone name into upper case.
+                       $zone = uc($zone);
+
+                       # Generate key to access the required data from the netsettings hash.
+                       my $zone_netaddress = $zone . "_NETADDRESS";
+                       my $zone_netmask = $zone . "_NETMASK";
+
+                       # Obtain the settings from the netsettings hash.
+                       my $netaddress = $netsettings{$zone_netaddress};
+                       my $netmask = $netsettings{$zone_netmask};
+
+                       # Convert the subnetmask into prefix notation.
+                       my $prefix = &Network::convert_netmask2prefix($netmask);
+
+                       # Generate full network string.
+                       my $network = join("/", $netaddress,$prefix);
+
+                       # Check if the network is valid.
+                       if(&Network::check_subnet($network)) {
+                               # Add the generated network to the array of networks.
+                               push(@networks, $network);
+                       }
                }
        }
 
@@ -901,5 +914,36 @@ sub get_aliases() {
        return @aliases;
 }
 
+#
+## Function to grab the current assigned IP-address on red.
+#
+sub get_red_address() {
+       # File, which contains the current IP-address of the red interface.
+       my $file = "${General::swroot}/red/local-ipaddress";
+
+       # Check if the file exists.
+       if (-e $file) {
+               # Open the given file.
+               open(FILE, "$file") or die "Could not open $file.";
+
+               # Obtain the address from the first line of the file.
+               my $address = <FILE>;
+
+               # Close filehandle
+               close(FILE);
+
+               # Remove newlines.
+               chomp $address;
+
+               # Check if the grabbed address is valid.
+               if (&General::validip($address)) {
+                       # Return the address.
+                       return $address;
+               }
+       }
+
+       # Return nothing.
+       return;
+}
 
 1;