###############################################################################
use strict;
+use experimental 'smartmatch';
use Net::IPv4Addr qw( :all );
use Switch;
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+require "${General::swroot}/location-functions.pl";
my $colour_multicast = "#A0A0A0";
}
}
+# 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::colourgreen} );
# Add Green Routes to Array
-my @routes = `/sbin/route -n | /bin/grep $netsettings{'GREEN_DEV'}`;
+my @routes = grep (/$netsettings{'GREEN_DEV'}/, @all_routes);
foreach my $route (@routes) {
chomp($route);
my @temp = split(/[\t ]+/, $route);
push(@colour, ${Header::colourblue} );
# Add Blue Routes to Array
- @routes = `/sbin/route -n | /bin/grep $netsettings{'BLUE_DEV'}`;
+ @routes = grep(/$netsettings{'BLUE_DEV'}/, @all_routes);
foreach my $route (@routes) {
chomp($route);
my @temp = split(/[\t ]+/, $route);
push(@masklen, $netsettings{'ORANGE_NETMASK'} );
push(@colour, ${Header::colourorange} );
# Add Orange Routes to Array
- @routes = `/sbin/route -n | /bin/grep $netsettings{'ORANGE_DEV'}`;
+ @routes = grep(/$netsettings{'ORANGE_DEV'}/, @all_routes);
foreach my $route (@routes) {
chomp($route);
my @temp = split(/[\t ]+/, $route);
}
}
+# Add OpenVPN net for custom OVPNs
+if (-e "${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);
+ push(@masklen, $mask);
+ push(@colour, ${Header::colourovpn});
+ }
+}
+
open(IPSEC, "${General::swroot}/vpn/config");
my @ipsec = <IPSEC>;
close(IPSEC);
foreach my $line (@ipsec) {
my @vpn = split(',', $line);
- my ($network, $mask) = split("/", $vpn[12]);
- if (!&General::validip($mask)) {
- $mask = ipv4_cidr2msk($mask);
- }
+ my @subnets = split(/\|/, $vpn[12]);
+ for my $subnet (@subnets) {
+ my ($network, $mask) = split("/", $subnet);
+
+ if (!&General::validip($mask)) {
+ $mask = ipv4_cidr2msk($mask);
+ }
- push(@network, $network);
- push(@masklen, $mask);
- push(@colour, ${Header::colourvpn});
+ push(@network, $network);
+ push(@masklen, $mask);
+ push(@colour, ${Header::colourvpn});
+ }
}
if (-e "${General::swroot}/ovpn/n2nconf") {
# Print legend.
print <<END;
- <table width='100%'>
+ <table style='width:100%'>
<tr>
- <td align='center'>
- <b>$Lang::tr{'legend'} : </b>
+ <td style='text-align:center;'>
+ <b>$Lang::tr{'legend'} :</b>
</td>
- <td align='center' bgcolor='${Header::colourgreen}'>
- <b><font color='#FFFFFF'>$Lang::tr{'lan'}</font></b>
+ <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourgreen}; font-weight:bold;'>
+ <b>$Lang::tr{'lan'}</b>
</td>
- <td align='center' bgcolor='${Header::colourred}'>
- <b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b>
+ <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourred};'>
+ <b>$Lang::tr{'internet'}</b>
</td>
- <td align='center' bgcolor='${Header::colourorange}'>
- <b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b>
+ <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourorange};'>
+ <b>$Lang::tr{'dmz'}</b>
</td>
- <td align='center' bgcolor='${Header::colourblue}'>
- <b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b>
+ <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourblue};'>
+ <b>$Lang::tr{'wireless'}</b>
</td>
- <td align='center' bgcolor='${Header::colourfw}'>
- <b><font color='#FFFFFF'>IPFire</font></b>
+ <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourfw};'>
+ <b>IPFire</b>
</td>
- <td align='center' bgcolor='${Header::colourvpn}'>
- <b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b>
+ <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourvpn};'>
+ <b>$Lang::tr{'vpn'}</b>
</td>
- <td align='center' bgcolor='${Header::colourovpn}'>
- <b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b>
+ <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourovpn};'>
+ <b>$Lang::tr{'OpenVPN'}</b>
</td>
- <td align='center' bgcolor='$colour_multicast'>
- <b><font color='#FFFFFF'>Multicast</font></b>
+ <td style='text-align:center; color:#FFFFFF; background-color:$colour_multicast;'>
+ <b>Multicast</b>
</td>
</tr>
</table>
# Print table header.
print <<END;
- <table width='100%'>
- <tr valign="top"">
- <th align='center'>
- <a href="?sort_field=5&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
- <a href="?sort_field=5&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+ <table style='width:100%'>
+ <tr>
+ <th style='text-align:center'>
+ <a href="?sort_field=5&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+ <a href="?sort_field=5&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
</th>
- <th align='center' colspan="2">
- <a href="?sort_field=1&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
- <a href="?sort_field=1&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+ <th style='text-align:center' colspan='2'>
+ <a href="?sort_field=1&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+ <a href="?sort_field=1&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
- <a href="?sort_field=3&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
- <a href="?sort_field=3&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+ <a href="?sort_field=3&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+ <a href="?sort_field=3&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
</th>
- <th align='center' colspan="2">
- <a href="?sort_field=2&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
- <a href="?sort_field=2&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+ <th> </th>
+ <th style='text-align:center' colspan='2'>
+ <a href="?sort_field=2&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+ <a href="?sort_field=2&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
- <a href="?sort_field=4&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
- <a href="?sort_field=4&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+ <a href="?sort_field=4&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+ <a href="?sort_field=4&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
</th>
- <th align='center'>
- <a href="?sort_field=8&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
- <a href="?sort_field=8&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+ <th> </th>
+ <th style='text-align:center'>
+ <a href="?sort_field=8&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+ <a href="?sort_field=8&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
- <a href="?sort_field=9&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
- <a href="?sort_field=9&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+ <a href="?sort_field=9&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+ <a href="?sort_field=9&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
</th>
- <th align='center'>
- <a href="?sort_field=6&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
- <a href="?sort_field=6&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+ <th style='text-align:center'>
+ <a href="?sort_field=6&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+ <a href="?sort_field=6&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
</th>
- <th align='center'>
- <a href="?sort_field=7&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
- <a href="?sort_field=7&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+ <th style='text-align:center'>
+ <a href="?sort_field=7&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+ <a href="?sort_field=7&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
</th>
</tr>
- <tr valign="top"">
- <th align='center'>
+ <tr>
+ <th style='text-align:center'>
$Lang::tr{'protocol'}
</th>
- <th align='center' colspan="2">
+ <th style='text-align:center' colspan='2'>
$Lang::tr{'source ip and port'}
</th>
- <th align='center' colspan="2">
+ <th style='text-align:center'>
+ $Lang::tr{'country'}
+ </th>
+ <th style='text-align:center' colspan='2'>
$Lang::tr{'dest ip and port'}
</th>
- <th align='center'>
+ <th style='text-align:center'>
+ $Lang::tr{'country'}
+ </th>
+ <th style='text-align:center'>
$Lang::tr{'download'} /
<br>$Lang::tr{'upload'}
</th>
- <th align='center'>
+ <th style='text-align:center'>
$Lang::tr{'connection'}<br>$Lang::tr{'status'}
</th>
- <th align='center'>
+ <th style='text-align:center'>
$Lang::tr{'expires'}<br>($Lang::tr{'seconds'})
</th>
</tr>
}
my $sip_colour = ipcolour($sip);
- my $dip_colour = ipcolour($dip);
+ # use colour of destination network for DNAT
+ my $dip_colour = $dip ne $dip_ret ? ipcolour($dip_ret) : ipcolour($dip);
my $sserv = '';
if ($sport < 1024) {
my $bytes_in = format_bytes($bytes[0]);
my $bytes_out = format_bytes($bytes[1]);
+ # 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);
my $sip_extra;
- if ($sip ne $sip_ret) {
- $sip_extra = "<font color='#FFFFFF'>></font> ";
+ if ($sip_ret && $sip ne $sip_ret) {
+ $sip_extra = "<span style='color:#FFFFFF;'>></span> ";
$sip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$sip_ret'>";
- $sip_extra .= " <font color='#FFFFFF'>$sip_ret</font>";
+ $sip_extra .= " <span style='color:#FFFFFF;'>$sip_ret</span>";
$sip_extra .= "</a>";
}
my $dip_extra;
- if ($dip ne $dip_ret) {
- $dip_extra = "<font color='#FFFFFF'>></font> ";
+ if ($dip_ret && $dip ne $dip_ret) {
+ $dip_extra = "<span style='color:#FFFFFF;'>></span> ";
$dip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$dip_ret'>";
- $dip_extra .= " <font color='#FFFFFF'>$dip_ret</font>";
+ $dip_extra .= " <span style='color:#FFFFFF;'>$dip_ret</span>";
$dip_extra .= "</a>";
}
$sserv_ret = uc(getservbyport($sport_ret, lc($l4proto)));
}
- $sport_extra = "<font color='#FFFFFF'>></font> ";
+ $sport_extra = "<span style='color:#FFFFFF;'>></span> ";
$sport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$sport_ret' target='top' title='$sserv_ret'>";
- $sport_extra .= " <font color='#FFFFFF'>$sport_ret</font>";
+ $sport_extra .= " <span style='color:#FFFFFF;'>$sport_ret</span>";
$sport_extra .= "</a>";
}
$dserv_ret = uc(getservbyport($dport_ret, lc($l4proto)));
}
- $dport_extra = "<font color='#FFFFFF'>></font> ";
+ $dport_extra = "<span style='color:#FFFFFF;'>></span> ";
$dport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$dport_ret' target='top' title='$dserv_ret'>";
- $dport_extra .= " <font color='#FFFFFF'>$dport_ret</font>";
+ $dport_extra .= " <span style='color:#FFFFFF;'>$dport_ret</span>";
$dport_extra .= "</a>";
}
print <<END;
<tr>
- <td align='center'>$l4proto</td>
- <td align='center' bgcolor='$sip_colour'>
+ <td style='text-align:center'>$l4proto</td>
+ <td style='text-align:center; background-color:$sip_colour;'>
<a href='/cgi-bin/ipinfo.cgi?ip=$sip'>
- <font color='#FFFFFF'>$sip</font>
+ <span style='color:#FFFFFF;'>$sip</span>
</a>
$sip_extra
</td>
- <td align='center' bgcolor='$sip_colour'>
+ <td style='text-align:center; background-color:$sip_colour;'>
<a href='http://isc.sans.org/port_details.php?port=$sport' target='top' title='$sserv'>
- <font color='#FFFFFF'>$sport</font>
+ <span style='color:#FFFFFF;'>$sport</span>
</a>
$sport_extra
</td>
- <td align='center' bgcolor='$dip_colour'>
+ <td style='text-align:center; background-color:$sip_colour;'>
+ <a href='country.cgi#$srcccode'><img src='$src_flag_icon' border='0' align='absmiddle' alt='$srcccode' title='$srcccode' /></a>
+ </td>
+ <td style='text-align:center; background-color:$dip_colour;'>
<a href='/cgi-bin/ipinfo.cgi?ip=$dip'>
- <font color='#FFFFFF'>$dip</font>
+ <span style='color:#FFFFFF;'>$dip</span>
</a>
$dip_extra
</td>
- <td align='center' bgcolor='$dip_colour'>
+ <td style='text-align:center; background-color:$dip_colour;'>
<a href='http://isc.sans.org/port_details.php?port=$dport' target='top' title='$dserv'>
- <font color='#FFFFFF'>$dport</font>
+ <span style='color:#FFFFFF;'>$dport</span>
</a>
$dport_extra
</td>
- <td align='center'>
+ <td style='text-align:center; background-color:$sip_colour;'>
+ <a href='country.cgi#$dstccode'><img src='$dst_flag_icon' border='0' align='absmiddle' alt='$dstccode' title='$dstccode' /></a>
+ </td>
+ <td style='text-align:center'>
$bytes_in / $bytes_out
</td>
- <td align='center'>$state</td>
- <td align='center'>$ttl</td>
+ <td style='text-align:center'>$state</td>
+ <td style='text-align:center'>$ttl</td>
</tr>
END
}
my ($ip) = $_[0];
my $found = 0;
- foreach my $line (@network) {
- if ($network[$id] eq '') {
- $id++;
- } else {
- if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
- $found = 1;
- $colour = $colour[$id];
+ if ($ip) {
+ foreach my $line (@network) {
+ if ($network[$id] eq '') {
+ $id++;
+ } else {
+ if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
+ $found = 1;
+ $colour = $colour[$id];
+ }
+ $id++;
}
- $id++;
}
}