X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Ffwhosts.cgi;h=042fdde0c5339b1f39c7e20450d442e393ef362f;hp=67e8dc8271dc9f546665ad879e06e85f22339885;hb=a72ae687c6779a280fe2da176550471b8b3b1771;hpb=1dd6ae72d95ee2d6ab2ad67bb7f01a05af17d4be diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 67e8dc827..042fdde0c 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -21,7 +21,8 @@ use strict; # enable only the following on debugging purpose -use warnings; +#use warnings; + use Sort::Naturally; use CGI::Carp 'fatalsToBrowser'; no warnings 'uninitialized'; @@ -48,7 +49,7 @@ my %fwfwd=(); my %fwinp=(); my %fwout=(); my %ovpnsettings=(); - +my %netsettings=(); my $errormessage; my $hint; @@ -80,7 +81,7 @@ unless (-e $configsrvgrp) { system("touch $configsrvgrp"); } &General::readhash("$configovpn", \%ovpnsettings); &General::readhasharray("$configipsec", \%ipsecconf); &General::readhash("$configipsecrw", \%ipsecsettings); - +&General::readhash("/var/ipfire/ethernet/settings", \%netsettings); &Header::getcgihash(\%fwhostsettings); &Header::showhttpheaders(); @@ -1211,12 +1212,12 @@ sub addgrp print< - $Lang::tr{'fwhost addgrpname'} -
+ $Lang::tr{'fwhost addgrpname'} + - $Lang::tr{'remark'}: - + $Lang::tr{'remark'}: +
@@ -1225,17 +1226,17 @@ sub addgrp END }else{ print< + - - + + - - + +
$Lang::tr{'fwhost addgrpname'}$Lang::tr{'fwhost addgrpname'}
$Lang::tr{'remark'}:


@@ -1246,8 +1247,16 @@ END
- - -
- -
$Lang::tr{'fwhost stdnet'} + + + "; if (! -z $confignet){ - print" + "; } if (! -z $confighost){ - print" +
+ + +
$Lang::tr{'fwhost cust net'}: + + +
$Lang::tr{'fwhost cust addr'}: + + +
"; #Inner table right - print"		"; + print"
"; #OVPN networks if (! -z $configccdnet){ - print" + "; } #OVPN clients + my @ovpn_clients=(); foreach my $key (sort { ncmp($ccdhost{$a}[0],$ccdhost{$b}[0]) } keys %ccdhost) { if ($ccdhost{$key}[33] ne ''){ - print"";} + if ($show eq '1'){ + $show=''; + print< + + + "; + } #OVPN n2n networks + my @OVPN_N2N=(); foreach my $key (sort { ncmp($ccdhost{$a}[1],$ccdhost{$b}[1]) } keys %ccdhost) { if($ccdhost{$key}[3] eq 'net'){ - print" + "; } - if ($show eq '1'){$show='';print"";} #IPsec networks + my @IPSEC_N2N=(); foreach my $key (sort { ncmp($ipsecconf{$a}[0],$ipsecconf{$b}[0]) } keys %ipsecconf) { if ($ipsecconf{$key}[3] eq 'net'){ - print" + ";} + print""; print"
$Lang::tr{'fwhost ccdnet'} + $Lang::tr{'fwhost ccdnet'} + + +
$Lang::tr{'fwhost ccdhost'}
+
$Lang::tr{'fwhost ovpn_n2n'}: + $Lang::tr{'fwhost ovpn_n2n'}: + + +
$Lang::tr{'fwhost ipsec net'} + $Lang::tr{'fwhost ipsec net'} + + +
"; print"
"; print"

"; } print""; - print"
"; + print"
"; &Header::closebox(); } sub addservice @@ -1414,9 +1500,28 @@ END print<
$Lang::tr{'fwhost addgrpname'}
$Lang::tr{'remark'}:

+ +
+ + $Lang::tr{'remark'}: + + + + + + + + + + + + + +
+ + + +
END } if($fwhostsettings{'updatesrvgrp'} eq 'on'){ @@ -1464,6 +1569,7 @@ sub viewtablenet &General::readhasharray("$fwconfigfwd", \%fwfwd); &General::readhasharray("$fwconfiginp", \%fwinp); &General::readhasharray("$fwconfigout", \%fwout); + if (!keys %customnetwork) { print "
$Lang::tr{'fwhost empty'}"; @@ -1490,9 +1596,9 @@ END } my $colnet="$customnetwork{$key}[1]/".&General::subtocidr($customnetwork{$key}[2]); my $netcount=&getnetcount($customnetwork{$key}[0]); - print"
$customnetwork{$key}[0]".&Header::colorize($colnet)."$customnetwork{$key}[3]$netcount x"; + print"$customnetwork{$key}[0]".&getcolor($colnet)."$customnetwork{$key}[3]$netcount x"; print< + @@ -1502,7 +1608,7 @@ END END if($netcount == '0') { - print""; + print"
"; }else{ print""; } @@ -1516,50 +1622,79 @@ END sub getcolor { my $c=shift; + my $sip; + my $scidr; + #Check if MAC + if (&General::validmac($c)){ return $c;} + + #Check if we got a full IP with subnet then split it + if($c =~ /^(.*?)\/(.*?)$/){ + ($sip,$scidr) = split ("/",$c); + }else{ + $sip=$c; + } + + #Now check if IP is part of ORANGE,BLUE or GREEN + if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){ + $tdcolor="$c"; + return $tdcolor; + } + if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){ + $tdcolor="$c"; + return $tdcolor; + } + if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){ + $tdcolor="$c"; + return $tdcolor; + } + #Check if IP is part of OpenVPN N2N subnet foreach my $key (sort keys %ccdhost){ if ($ccdhost{$key}[3] eq 'net'){ my ($a,$b) = split("/",$ccdhost{$key}[11]); - if (&General::IpInSubnet($c,$a,$b)){ - $tdcolor="style='color:$Header::colourovpn ;'"; + if (&General::IpInSubnet($sip,$a,$b)){ + $tdcolor="$c"; return $tdcolor; } } } + #Check if IP is part of OpenVPN dynamic subnet my ($a,$b) = split("/",$ovpnsettings{'DOVPN_SUBNET'}); - if (&General::IpInSubnet($c,$a,$b)){ - $tdcolor="style='color: $Header::colourovpn;'"; + if (&General::IpInSubnet($sip,$a,$b)){ + $tdcolor="$c"; return $tdcolor; } + #Check if IP is part of OpenVPN static subnet foreach my $key (sort keys %ccdnet){ my ($a,$b) = split("/",$ccdnet{$key}[1]); $b =&General::iporsubtodec($b); - if (&General::IpInSubnet($c,$a,$b)){ - $tdcolor="style='color: $Header::colourovpn;'"; + if (&General::IpInSubnet($sip,$a,$b)){ + $tdcolor="$c"; return $tdcolor; } } + #Check if IP is part of IPsec RW network if ($ipsecsettings{'RW_NET'} ne ''){ my ($a,$b) = split("/",$ipsecsettings{'RW_NET'}); $b=&General::iporsubtodec($b); - if (&General::IpInSubnet($c,$a,$b)){ - $tdcolor="style='color: $Header::colourvpn;'"; + if (&General::IpInSubnet($sip,$a,$b)){ + $tdcolor="$c"; return $tdcolor; } } + #Check if IP is part of a IPsec N2N network foreach my $key (sort keys %ipsecconf){ my ($a,$b) = split("/",$ipsecconf{$key}[11]); - if (&General::IpInSubnet($c,$a,$b)){ - $tdcolor="style='color: $Header::colourvpn;'"; + if (&General::IpInSubnet($sip,$a,$b)){ + $tdcolor="$c"; return $tdcolor; } } - $tdcolor=''; - return $tdcolor; + return "$c"; } sub viewtablehost { @@ -1598,9 +1733,9 @@ END $customhost{$key}[4]=~s/\s+//g; my $hostcount=0; $hostcount=&gethostcount($customhost{$key}[0]); - print"$customhost{$key}[0]".&Header::colorize($ip)."$customhost{$key}[3]$hostcount x"; + print"$customhost{$key}[0]".&getcolor($ip)."$customhost{$key}[3]$hostcount x"; print<
+ @@ -1610,7 +1745,7 @@ END END if($hostcount == '0') { - print"
"; + print"
"; }else{ print""; } @@ -1677,9 +1812,9 @@ sub viewtablegrp print "$Lang::tr{'used'}: $netgrpcount x"; if($netgrpcount == '0') { - print"
"; + print"
"; } - print"
"; + print"
"; print""; } my $col=''; @@ -1709,10 +1844,10 @@ sub viewtablegrp }else{ my ($colip,$colsub) = split("/",$ip); $ip="$colip/".&General::subtocidr($colsub) if ($colsub); - print" - "; + print""; }else{ print""; } @@ -1844,9 +1979,9 @@ sub viewtableservicegrp print "  $Lang::tr{'used'}: $grpcount x"; if($grpcount == '0') { - print""; + print""; } - print""; + print""; print"
$Lang::tr{'name'}$Lang::tr{'fwhost ip_mac'}$Lang::tr{'fwhost type'}
".&Header::colorize($ip)."$customgrp{$key}[3]
"; + print"
".&getcolor($ip)."$customgrp{$key}[3]"; } if ($delflag > 0 && $ip ne ''){ - print""; + print""; #check if this group has only one entry foreach my $key2 (keys %hash) { if ($hash{$key2}<2 && $key2 eq $customgrp{$key}[0]){ @@ -1770,7 +1905,7 @@ END elsif($customservice{$key}[3] ne 'BLANK'){print $customservice{$key}[3];} print<$srvcount x + @@ -1778,7 +1913,7 @@ END END if ($srvcount eq '0') { - print"
"; } if( $fwhostsettings{'SRVGRP_NAME'} eq $customservicegrp{$key}[0]) { @@ -1885,7 +2020,7 @@ sub viewtableservicegrp print"
Name$Lang::tr{'port'}$Lang::tr{'fwhost prot'}
$port$protocol
"; if ($delflag gt '0'){ if ($customservicegrp{$key}[2] ne $Lang::tr{'fwhost err emptytable'}){ - print""; + print""; } #check if this group has only one entry foreach my $key2 (keys %hash) { @@ -1920,7 +2055,7 @@ sub checkname } sub checkgroup { - &General::readhasharray("$configsrvgrp", \%customservicegrp ); + &General::readhasharray("$configgrp", \%customgrp ); my $name=shift; foreach my $key (keys %customservicegrp) { if($customservicegrp{$key}[0] eq $name){