X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fservices.cgi;h=26ab4f3143fff36434287ec085aaa47993726ff1;hb=f93238725f2f73975dff1a2c67820d9480a100e6;hp=123c3258792ddab8da3350c2c9600dca3132d483;hpb=afffb56a11db3456e574c292beb048ea21ac91d1;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 123c325879..26ab4f3143 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -49,13 +49,14 @@ my %servicenames =(
 	$Lang::tr{'dhcp server'} => 'dhcpd',
 	$Lang::tr{'web server'} => 'httpd',
 	$Lang::tr{'cron server'} => 'fcron',
-	$Lang::tr{'dns proxy server'} => 'dnsmasq',
+	$Lang::tr{'dns proxy server'} => 'unbound',
 	$Lang::tr{'logging server'} => 'syslogd',
 	$Lang::tr{'kernel logging server'} => 'klogd',
 	$Lang::tr{'ntp server'} => 'ntpd',
 	$Lang::tr{'secure shell server'} => 'sshd',
-	$Lang::tr{'vpn'} => 'pluto',
+	$Lang::tr{'vpn'} => 'charon',
 	$Lang::tr{'web proxy'} => 'squid',
+	$Lang::tr{'intrusion detection system'} => 'suricata',
 	'OpenVPN' => 'openvpn'
 );
 
@@ -71,30 +72,15 @@ my %link =(
 	$Lang::tr{'vpn'} => "<a href=\'vpnmain.cgi\'>$Lang::tr{'vpn'}</a>",
 	$Lang::tr{'web proxy'} => "<a href=\'proxy.cgi\'>$Lang::tr{'web proxy'}</a>",
 	'OpenVPN' => "<a href=\'ovpnmain.cgi\'>OpenVPN</a>",
-	"$Lang::tr{'intrusion detection system'} (GREEN)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (GREEN)</a>",
-	"$Lang::tr{'intrusion detection system'} (RED)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (RED)</a>",
-	"$Lang::tr{'intrusion detection system'} (ORANGE)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (ORANGE)</a>",
-	"$Lang::tr{'intrusion detection system'} (BLUE)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (BLUE)</a>"
+	"$Lang::tr{'intrusion detection system'}" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'}</a>",
 );
 
-my $lines=0; # Used to count the outputlines to make different bgcolor
-
-my $iface = '';
-if (open(FILE, "${General::swroot}/red/iface")){
-	$iface = <FILE>;
-	close FILE;
-	chomp $iface;
-}
-
-$servicenames{"$Lang::tr{'intrusion detection system'} (RED)"}   = "snort_${iface}";
-$servicenames{"$Lang::tr{'intrusion detection system'} (GREEN)"} = "snort_$netsettings{'GREEN_DEV'}";
+# Hash to overwrite the process name of a process if it differs fromt the launch command.
+my %overwrite_exename_hash = (
+	"suricata" => "Suricata-Main"
+);
 
-if ($netsettings{'ORANGE_DEV'} ne ''){
-	$servicenames{"$Lang::tr{'intrusion detection system'} (ORANGE)"} = "snort_$netsettings{'ORANGE_DEV'}";
-}
-if ($netsettings{'BLUE_DEV'} ne ''){
-	$servicenames{"$Lang::tr{'intrusion detection system'} (BLUE)"} = "snort_$netsettings{'BLUE_DEV'}";
-}
+my $lines=0; # Used to count the outputlines to make different bgcolor
 
 my @querry = split(/\?/,$ENV{'QUERY_STRING'});
 $querry[0] = '' unless defined $querry[0];
@@ -116,25 +102,33 @@ if ( $querry[0] =~ "processescpu"){
 	&Header::openbox('100%', 'left', $Lang::tr{'services'});
 	print <<END
 <div align='center'>
-<table width='80%' cellspacing='1' border='0'>
-<tr bgcolor='$color{'color20'}'><td align='left'><b>$Lang::tr{'services'}</b></td><td align='center' ><b>$Lang::tr{'status'}</b></td><td align='center'><b>PID</b></td><td align='center'><b>$Lang::tr{'memory'}</b></td></tr>
+<table width='80%' cellspacing='1' class='tbl'>
+<tr>
+	<th align='left'><b>$Lang::tr{'services'}</b></th>
+	<th align='center' ><b>$Lang::tr{'status'}</b></th>
+	<th align='center'><b>PID</b></th>
+	<th align='center'><b>$Lang::tr{'memory'}</b></th>
+</tr>
 END
 ;
 	my $key = '';
+	my $col="";
 	foreach $key (sort keys %servicenames){
 		$lines++;
 		if ($lines % 2){
-			print "<tr bgcolor='$color{'color22'}'>\n<td align='left'>";
-			print %link->{$key};
-			print "</td>\n";
+			$col="bgcolor='$color{'color22'}'";
+			print "<tr><td align='left' $col>";
+			print $link{$key};
+			print "</td>";
 		}else{
-			print "<tr bgcolor='$color{'color20'}'>\n<td align='left'>";
-			print %link->{$key};
-			print "</td>\n";
+			$col="bgcolor='$color{'color20'}'";
+			print "<tr><td align='left' $col>";
+			print $link{$key};
+			print "</td>";
 		}
 
 		my $shortname = $servicenames{$key};
-		my $status = &isrunning($shortname);
+		my $status = &isrunning($shortname,$col);
 
 	 	print "$status\n";
 		print "</tr>\n";
@@ -152,14 +146,14 @@ END
 
 	print <<END
 <div align='center'>
-<table width='80%' cellspacing='1' border='0'>
-<tr bgcolor='$color{'color20'}'>
-<td align='center'><b>Addon</b></td>
-<td align='center'><b>Boot</b></td>
-<td align='center' colspan=2><b>$Lang::tr{'action'}</b></td>
-<td align='center'><b>$Lang::tr{'status'}</b></td>
-<td align='center'><b>PID</b></td>
-<td align='center'><b>$Lang::tr{'memory'}</b></td>
+<table width='80%' cellspacing='1' class='tbl'>
+<tr>
+	<th align='center'><b>Addon</b></th>
+	<th align='center'><b>Boot</b></th>
+	<th align='center' colspan=2><b>$Lang::tr{'action'}</b></th>
+	<th align='center'><b>$Lang::tr{'status'}</b></th>
+	<th align='center'><b>PID</b></th>
+	<th align='center'><b>$Lang::tr{'memory'}</b></th>
 </tr>
 END
 ;
@@ -180,19 +174,24 @@ END
 			# mdadm should not stopped with webif because this could crash the system
 			#
 			chomp($_);
+			if ( $_ eq 'squid' ) {
+				next;
+			}
 			if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
 				$lines++;
 				if ($lines % 2){
-					print "<tr bgcolor='$color{'color22'}'>";
+					print "<tr>";
+					$col="bgcolor='$color{'color22'}'";
 				}else{
-					print "<tr bgcolor='$color{'color20'}'>";
+					print "<tr>";
+					$col="bgcolor='$color{'color20'}'";
 				}
-				print "<td align='left'>$_</td> ";
-				my $status = isautorun($_);
+				print "<td align='left' $col width='31%'>$_</td> ";
+				my $status = isautorun($_,$col);
 				print "$status ";
-				print "<td align='center'><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>";
-				print "<td align='center'><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> ";
-				my $status = &isrunningaddon($_);
+				print "<td align='center' $col width='8%'><a href='services.cgi?$_!start'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
+				print "<td align='center' $col width='8%'><a href='services.cgi?$_!stop'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> ";
+				my $status = &isrunningaddon($_,$col);
 		 		$status =~ s/\\[[0-1]\;[0-9]+m//g;
 
 				chomp($status);
@@ -219,16 +218,17 @@ END
 
 sub isautorun{
 	my $cmd = $_[0];
-	my $status = "<td align='center'></td>";
+	my $col = $_[1];
+	my $status = "<td align='center' $col></td>";
 	my $init = `find /etc/rc.d/rc3.d/S??${cmd} 2>/dev/null`;
 	chomp ($init);
 	if ($init ne ''){
-		$status = "<td align='center'><A HREF=services.cgi?$_!disable><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></A></td>";
+		$status = "<td align='center' $col><a href='services.cgi?$_!disable'><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></a></td>";
 	}
 	$init = `find /etc/rc.d/rc3.d/off/S??${cmd} 2>/dev/null`;
 	chomp ($init);
 	if ($init ne ''){
-		$status = "<td align='center'><A HREF=services.cgi?$_!enable><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></A></td>";
+		$status = "<td align='center' $col><a href='services.cgi?$_!enable'><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></a></td>";
 	}
 
 	return $status;
@@ -236,14 +236,28 @@ sub isautorun{
 
 sub isrunning{
 	my $cmd = $_[0];
-	my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";
+	my $col = $_[1];
+	my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
 	my $pid = '';
 	my $testcmd = '';
 	my $exename;
 	my $memory;
 
 	$cmd =~ /(^[a-z]+)/;
-	$exename = $1;
+
+	# Check if the exename needs to be overwritten.
+	# This happens if the expected process name string
+	# differs from the real one. This may happened if
+	# a service uses multiple processes or threads.
+	if (exists($overwrite_exename_hash{$1})) {
+		# Grab the string which will be reported by
+		# the process from the corresponding hash.
+		$exename = $overwrite_exename_hash{$1};
+	} else {
+		# Directly expect the launched command as
+		# process name.
+		$exename = $1;
+	}
 
 	if (open(FILE, "/var/run/${cmd}.pid")){
 		$pid = <FILE>; chomp $pid;
@@ -267,7 +281,7 @@ sub isrunning{
 			close(FILE);
 		}
 		if ($testcmd =~ /$exename/){
-			$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory</td>";
+			$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center' $col>$pid</td><td align='center' $col>$memory</td>";
 		}
 	}
 	return $status;
@@ -275,7 +289,8 @@ sub isrunning{
 
 sub isrunningaddon{
 	my $cmd = $_[0];
-	my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";
+	my $col = $_[1];
+	my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
 	my $pid = '';
 	my $testcmd = '';
 	my $exename;
@@ -293,7 +308,7 @@ sub isrunningaddon{
 		$testcmd =~ s///gi;
 
 		my @pid = split(/\s/,$testcmd);
-		$status .="<td align='center'>$pid[0]</td>";
+		$status .="<td align='center' $col>$pid[0]</td>";
 
 		my $memory = 0;
 
@@ -305,9 +320,9 @@ sub isrunningaddon{
 			}
 			$memory+=$memory[0];
 		}
-		$status .="<td align='center'>$memory KB</td>";
+		$status .="<td align='center' $col>$memory KB</td>";
 	}else{
-		$status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";
+		$status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
 	}
 	return $status;
 }