mympd: remove create config start

[ipfire-2.x.git] / html / cgi-bin / connections.cgi

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index c27ff2ef761a70bebb550fd49e029ced97355cb9..24702980c8f4eebe04a5921bd5f3677299cd69b9 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ use Switch;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-require "${General::swroot}/geoip-functions.pl";
+require "${General::swroot}/location-functions.pl";
 
 my $colour_multicast = "#A0A0A0";
 
@@ -57,7 +57,7 @@ if (length ($ENV{'QUERY_STRING'}) > 0){
                ($name, $value) = split(/=/, $pair);
                $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; # e.g. "%20" => " "
                $value =~ s/[^a-zA-Z0-9]*//g; # a-Z 0-9 will pass
-               $cgiin{$name} = $value; 
+               $cgiin{$name} = $value;
        }
 }
 
@@ -86,9 +86,6 @@ if ( $debug ){
 my @dummy = ( ${Header::table1colour} );
 undef (@dummy);
 
-# Init libloc database connection.
-my $libloc_db_handle = &GeoIP::init();
-
 # check sorting arguments
 if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) {
        $SORT_FIELD = $cgiin{'sort_field'};
@@ -99,8 +96,8 @@ if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) {
 }
 
 # Read and sort the connection tracking table
-# do sorting 
-if ($SORT_FIELD and $SORT_ORDER) { 
+# do sorting
+if ($SORT_FIELD and $SORT_ORDER) {
        # field sorting when sorting arguments are sane
        open(CONNTRACK, "/usr/local/bin/getconntracktable | /usr/local/bin/consort.sh $SORT_FIELD $SORT_ORDER |") or die "Unable to read conntrack table";
 } else {
@@ -149,24 +146,29 @@ if ($netsettings{'RED_DEV'}) {
        }
 }
 
+# Call safe system_output function to get all available routes.
+my @all_routes = &General::system_output("/sbin/route", "-n");
+
 # Add Green Firewall Interface
 push(@network, $netsettings{'GREEN_ADDRESS'});
 push(@masklen, "255.255.255.255" );
 push(@colour, ${Header::colourfw} );
 
-# Add Green Network to Array
-push(@network, $netsettings{'GREEN_NETADDRESS'});
-push(@masklen, $netsettings{'GREEN_NETMASK'} );
-push(@colour, ${Header::colourgreen} );
-
-# Add Green Routes to Array
-my @routes = `/sbin/route -n | /bin/grep $netsettings{'GREEN_DEV'}`;
-foreach my $route (@routes) {
-       chomp($route);
-       my @temp = split(/[\t ]+/, $route);
-       push(@network, $temp[0]);
-       push(@masklen, $temp[2]);
+if ($netsettings{'GREEN_DEV'}) {
+       # Add Green Network to Array
+       push(@network, $netsettings{'GREEN_NETADDRESS'});
+       push(@masklen, $netsettings{'GREEN_NETMASK'} );
        push(@colour, ${Header::colourgreen} );
+
+       # Add Green Routes to Array
+       my @routes = grep (/$netsettings{'GREEN_DEV'}/, @all_routes);
+       foreach my $route (@routes) {
+               chomp($route);
+               my @temp = split(/[\t ]+/, $route);
+               push(@network, $temp[0]);
+               push(@masklen, $temp[2]);
+               push(@colour, ${Header::colourgreen} );
+       }
 }
 
 # Add Blue Firewall Interface
@@ -181,7 +183,7 @@ if ($netsettings{'BLUE_DEV'}) {
        push(@colour, ${Header::colourblue} );
 
        # Add Blue Routes to Array
-       @routes = `/sbin/route -n | /bin/grep $netsettings{'BLUE_DEV'}`;
+       my @routes = grep(/$netsettings{'BLUE_DEV'}/, @all_routes);
        foreach my $route (@routes) {
                chomp($route);
                my @temp = split(/[\t ]+/, $route);
@@ -202,7 +204,7 @@ if ($netsettings{'ORANGE_DEV'}) {
        push(@masklen, $netsettings{'ORANGE_NETMASK'} );
        push(@colour, ${Header::colourorange} );
        # Add Orange Routes to Array
-       @routes = `/sbin/route -n | /bin/grep $netsettings{'ORANGE_DEV'}`;
+       my @routes = grep(/$netsettings{'ORANGE_DEV'}/, @all_routes);
        foreach my $route (@routes) {
                chomp($route);
                my @temp = split(/[\t ]+/, $route);
@@ -245,13 +247,13 @@ if (-e "${General::swroot}/ovpn/settings") {
 
 # Add OpenVPN net for custom OVPNs
 if (-e "${General::swroot}/ovpn/ccd.conf") {
-       open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf");      
+       open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf");
        my @ovpnsub = <OVPNSUB>;
        close(OVPNSUB);
 
        foreach (@ovpnsub) {
                my ($network, $mask) = split '/', (split ',', $_)[2];
-               
+
                $mask = ipv4_cidr2msk($mask) unless &General::validip($mask);
 
                push(@network, $network);
@@ -350,7 +352,7 @@ if ($SORT_FIELD and $SORT_ORDER) {
                $Lang::tr{'destination port'},
                $Lang::tr{'protocol'},
                $Lang::tr{'connection'}.' '.$Lang::tr{'status'},
-               $Lang::tr{'expires'}.' ('.$Lang::tr{'seconds'}.')',
+               $Lang::tr{'expires'}.' ('.$Lang::tr{'hours:minutes:seconds'}.')',
                $Lang::tr{'download'},
                $Lang::tr{'upload'}
        );
@@ -433,7 +435,7 @@ print <<END;
                                $Lang::tr{'connection'}<br>$Lang::tr{'status'}
                        </th>
                        <th style='text-align:center'>
-                               $Lang::tr{'expires'}<br>($Lang::tr{'seconds'})
+                               $Lang::tr{'expires'}<br>($Lang::tr{'hours:minutes:seconds'})
                        </th>
                </tr>
 END
@@ -553,11 +555,11 @@ foreach my $line (@conntrack) {
        my $bytes_in = format_bytes($bytes[0]);
        my $bytes_out = format_bytes($bytes[1]);
 
-       # enumerate GeoIP information
-       my $srcccode = &GeoIP::lookup_country_code($libloc_db_handle, $sip_ret);
-       my $src_flag_icon = &GeoIP::get_flag_icon($srcccode);
-       my $dstccode = &GeoIP::lookup_country_code($libloc_db_handle, $dip_ret);
-       my $dst_flag_icon = &GeoIP::get_flag_icon($dstccode);
+       # enumerate location information
+       my $srcccode = &Location::Functions::lookup_country_code($sip_ret);
+       my $src_flag_icon = &Location::Functions::get_flag_icon($srcccode);
+       my $dstccode = &Location::Functions::lookup_country_code($dip_ret);
+       my $dst_flag_icon = &Location::Functions::get_flag_icon($dstccode);
 
        # Format TTL
        $ttl = format_time($ttl);
@@ -587,7 +589,7 @@ foreach my $line (@conntrack) {
                }
 
                $sport_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
-               $sport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$sport_ret' target='top' title='$sserv_ret'>";
+               $sport_extra .= "<a href='https://isc.sans.edu/port.html?port=$sport_ret' target='top' title='$sserv_ret'>";
                $sport_extra .= " <span style='color:#FFFFFF;'>$sport_ret</span>";
                $sport_extra .= "</a>";
        }
@@ -600,7 +602,7 @@ foreach my $line (@conntrack) {
                }
 
                $dport_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
-               $dport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$dport_ret' target='top' title='$dserv_ret'>";
+               $dport_extra .= "<a href='https://isc.sans.edu/port.html?port=$dport_ret' target='top' title='$dserv_ret'>";
                $dport_extra .= " <span style='color:#FFFFFF;'>$dport_ret</span>";
                $dport_extra .= "</a>";
        }
@@ -615,7 +617,7 @@ foreach my $line (@conntrack) {
                        $sip_extra
                </td>
                <td style='text-align:center; background-color:$sip_colour;'>
-                       <a href='http://isc.sans.org/port_details.php?port=$sport' target='top' title='$sserv'>
+                       <a href='https://isc.sans.edu/port.html?port=$sport' target='top' title='$sserv'>
                                <span style='color:#FFFFFF;'>$sport</span>
                        </a>
                        $sport_extra
@@ -630,7 +632,7 @@ foreach my $line (@conntrack) {
                        $dip_extra
                </td>
                <td style='text-align:center; background-color:$dip_colour;'>
-                       <a href='http://isc.sans.org/port_details.php?port=$dport' target='top' title='$dserv'>
+                       <a href='https://isc.sans.edu/port.html?port=$dport' target='top' title='$dserv'>
                                <span style='color:#FFFFFF;'>$dport</span>
                        </a>
                        $dport_extra