suricata: Fix ownership and file permissions of files inside /var/lib/suricata.

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

diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
index 9d5f29a76a1e5a1b34c6628d0b0e372b7cd46532..77c69cddb1faa906d378aec14666ff95479324ea 100755 (executable)
--- a/html/cgi-bin/netovpnsrv.cgi
+++ b/html/cgi-bin/netovpnsrv.cgi
@@ -35,8 +35,20 @@ my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
+my %vpnsettings = ();
+&General::readhasharray("${General::swroot}/vpn/config", \%vpnsettings);
+
 my @vpns=();
 
+# Make list of all IPsec graphs
+my %ipsecgraphs = ();
+foreach my $key (sort {$vpnsettings{$a}[1] <=> $vpnsettings{$b}[1]} keys %vpnsettings) {
+       my $interface_mode = $vpnsettings{$key}[36];
+       next unless ($interface_mode);
+
+       $ipsecgraphs{$vpnsettings{$key}[1]} = "${interface_mode}${key}";
+}
+
 my @querry = split(/\?/,$ENV{'QUERY_STRING'});
 $querry[0] = '' unless defined $querry[0];
 $querry[1] = 'week' unless defined $querry[1];
@@ -44,23 +56,37 @@ $querry[1] = 'week' unless defined $querry[1];
 if ( $querry[0] ne ""){
        print "Content-type: image/png\n\n";
        binmode(STDOUT);
-       &Graphs::updatevpnn2ngraph($querry[0],$querry[1]);
+       if (grep { $_ eq $querry[0] } values %ipsecgraphs) {
+               &Graphs::updateifgraph($querry[0],$querry[1]);
+       } else {
+               &Graphs::updatevpnn2ngraph($querry[0],$querry[1]);
+       }
 }else{
        &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'openvpn server'}, 1, '');
+       &Header::openpage($Lang::tr{'vpn statistic n2n'}, 1, '');
        &Header::openbigbox('100%', 'left');
 
-       my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*-n2n/ -not  -path *openvpn-UNDEF* -name *traffic.rrd|sort`;
+       my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*-n2n/ -not  -path *openvpn-UNDEF* -name *traffic.rrd 2>/dev/null|sort`;
        foreach (@vpngraphs){
-               $_ =~ /(.*)\/openvpn-(.*)\/if_octets-traffic.rrd/;
-               push(@vpns,$2);
-       }
-       foreach (@vpns) {
-               &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
-               &Graphs::makegraphbox("netovpnsrv.cgi",$_,"week");
-               &Header::closebox();
+               if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive-traffic.rrd/){
+                       push(@vpns,$2);
+               }
        }
+       if (@vpns || %ipsecgraphs) {
+               foreach my $name (sort keys %ipsecgraphs) {
+                       &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
+                       &Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
+                       &Header::closebox();
+               }
 
+               foreach (@vpns) {
+                       &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
+                       &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day");
+                       &Header::closebox();
+               }
+       }else{
+               print "<center>".$Lang::tr{'no data'}."</center>";
+       }
        my $output = '';
 
        &Header::closebigbox();