mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
d978558809
The installer recognises cups and cups-filters both as cups and puts two instances of cups in the add-on services table. Based on input from Michael Tremer this patch replaces the command returning the second element between hyphens with one that takes what comes after "meta-" using Perl code rather than a shell command. The second find command was changed as per Michael's suggestion. Tested in my ipfire test bed system and only results in one cups entry. Signed-off-by: Adolf Belka <ahb.ipfire@gmail.com> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
330 lines
11 KiB
Perl
330 lines
11 KiB
Perl
#!/usr/bin/perl
|
||
###############################################################################
|
||
# #
|
||
# IPFire.org - A linux based firewall #
|
||
# Copyright (C) 2005-2010 IPFire Team #
|
||
# #
|
||
# 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 #
|
||
# the Free Software Foundation, either version 3 of the License, or #
|
||
# (at your option) any later version. #
|
||
# #
|
||
# This program is distributed in the hope that it will be useful, #
|
||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||
# GNU General Public License for more details. #
|
||
# #
|
||
# You should have received a copy of the GNU General Public License #
|
||
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
||
# #
|
||
###############################################################################
|
||
|
||
use strict;
|
||
|
||
# enable only the following on debugging purpose
|
||
#use warnings;
|
||
#use CGI::Carp 'fatalsToBrowser';
|
||
|
||
require '/var/ipfire/general-functions.pl';
|
||
require "${General::swroot}/lang.pl";
|
||
require "${General::swroot}/header.pl";
|
||
require "${General::swroot}/graphs.pl";
|
||
|
||
my %color = ();
|
||
my %mainsettings = ();
|
||
my %netsettings=();
|
||
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
|
||
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
|
||
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
|
||
|
||
#workaround to suppress a warning when a variable is used only once
|
||
my @dummy = ( ${Header::colourred} );
|
||
undef (@dummy);
|
||
|
||
|
||
my %cgiparams=();
|
||
# Maps a nice printable name to the changing part of the pid file, which
|
||
# is also the name of the program
|
||
my %servicenames =(
|
||
$Lang::tr{'dhcp server'} => 'dhcpd',
|
||
$Lang::tr{'web server'} => 'httpd',
|
||
$Lang::tr{'cron server'} => 'fcron',
|
||
$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'} => 'charon',
|
||
$Lang::tr{'web proxy'} => 'squid',
|
||
$Lang::tr{'intrusion detection system'} => 'suricata',
|
||
'OpenVPN' => 'openvpn'
|
||
);
|
||
|
||
my %link =(
|
||
$Lang::tr{'dhcp server'} => "<a href=\'dhcp.cgi\'>$Lang::tr{'dhcp server'}</a>",
|
||
$Lang::tr{'web server'} => $Lang::tr{'web server'},
|
||
$Lang::tr{'cron server'} => $Lang::tr{'cron server'},
|
||
$Lang::tr{'dns proxy server'} => $Lang::tr{'dns proxy server'},
|
||
$Lang::tr{'logging server'} => $Lang::tr{'logging server'},
|
||
$Lang::tr{'kernel logging server'} => $Lang::tr{'kernel logging server'},
|
||
$Lang::tr{'ntp server'} => "<a href=\'time.cgi\'>$Lang::tr{'ntp server'}</a>",
|
||
$Lang::tr{'secure shell server'} => "<a href=\'remote.cgi\'>$Lang::tr{'secure shell server'}</a>",
|
||
$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'}" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'}</a>",
|
||
);
|
||
|
||
# Hash to overwrite the process name of a process if it differs fromt the launch command.
|
||
my %overwrite_exename_hash = (
|
||
"suricata" => "Suricata-Main"
|
||
);
|
||
|
||
my $lines=0; # Used to count the outputlines to make different bgcolor
|
||
|
||
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
|
||
$querry[0] = '' unless defined $querry[0];
|
||
$querry[1] = 'hour' unless defined $querry[1];
|
||
|
||
if ( $querry[0] =~ "processescpu"){
|
||
print "Content-type: image/png\n\n";
|
||
binmode(STDOUT);
|
||
&Graphs::updateprocessescpugraph($querry[1]);
|
||
}elsif ( $querry[0] =~ "processesmemory"){
|
||
print "Content-type: image/png\n\n";
|
||
binmode(STDOUT);
|
||
&Graphs::updateprocessesmemorygraph($querry[1]);
|
||
}else{
|
||
&Header::showhttpheaders();
|
||
&Header::openpage($Lang::tr{'status information'}, 1, '');
|
||
&Header::openbigbox('100%', 'left');
|
||
|
||
&Header::openbox('100%', 'left', $Lang::tr{'services'});
|
||
print <<END
|
||
<div align='center'>
|
||
<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){
|
||
$col="bgcolor='$color{'color22'}'";
|
||
print "<tr><td align='left' $col>";
|
||
print $link{$key};
|
||
print "</td>";
|
||
}else{
|
||
$col="bgcolor='$color{'color20'}'";
|
||
print "<tr><td align='left' $col>";
|
||
print $link{$key};
|
||
print "</td>";
|
||
}
|
||
|
||
my $shortname = $servicenames{$key};
|
||
my $status = &isrunning($shortname,$col);
|
||
|
||
print "$status\n";
|
||
print "</tr>\n";
|
||
}
|
||
|
||
print "</table></div>\n";
|
||
&Header::closebox();
|
||
|
||
&Header::openbox('100%', 'left', "Addon - $Lang::tr{services}");
|
||
my $paramstr=$ENV{QUERY_STRING};
|
||
my @param=split(/!/, $paramstr);
|
||
if ($param[1] ne ''){
|
||
system("/usr/local/bin/addonctrl @param[0] @param[1] > /dev/null 2>&1");
|
||
}
|
||
|
||
print <<END
|
||
<div align='center'>
|
||
<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
|
||
;
|
||
|
||
my $lines=0; # Used to count the outputlines to make different bgcolor
|
||
|
||
# Generate list of installed addon pak's
|
||
opendir (DIR, "/opt/pakfire/db/installed") || die "Cannot opendir /opt/pakfire/db/installed/: $!";
|
||
my @pak = sort readdir DIR;
|
||
foreach (@pak){
|
||
chomp($_);
|
||
next unless (m/^meta-/);
|
||
s/^meta-//;
|
||
|
||
# Check which of the paks are services
|
||
if (-e "/etc/init.d/$_") {
|
||
# blacklist some packages
|
||
#
|
||
# alsa has trouble with the volume saving and was not really stopped
|
||
# mdadm should not stopped with webif because this could crash the system
|
||
#
|
||
if ( $_ eq 'squid' ) {
|
||
next;
|
||
}
|
||
if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
|
||
$lines++;
|
||
if ($lines % 2){
|
||
print "<tr>";
|
||
$col="bgcolor='$color{'color22'}'";
|
||
}else{
|
||
print "<tr>";
|
||
$col="bgcolor='$color{'color20'}'";
|
||
}
|
||
print "<td align='left' $col width='31%'>$_</td> ";
|
||
my $status = isautorun($_,$col);
|
||
print "$status ";
|
||
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);
|
||
print "$status";
|
||
print "</tr>";
|
||
}
|
||
}
|
||
}
|
||
|
||
print "</table></div>\n";
|
||
&Header::closebox();
|
||
|
||
&Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'graph'}");
|
||
&Graphs::makegraphbox("services.cgi","processescpu","day");
|
||
&Header::closebox();
|
||
|
||
&Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'memory'} $Lang::tr{'graph'}");
|
||
&Graphs::makegraphbox("services.cgi","processesmemory","day");
|
||
&Header::closebox();
|
||
|
||
&Header::closebigbox();
|
||
&Header::closepage();
|
||
}
|
||
|
||
sub isautorun{
|
||
my $cmd = $_[0];
|
||
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' $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' $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;
|
||
}
|
||
|
||
sub isrunning{
|
||
my $cmd = $_[0];
|
||
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]+)/;
|
||
|
||
# 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;
|
||
close FILE;
|
||
if (open(FILE, "/proc/${pid}/status")){
|
||
while (<FILE>){
|
||
if (/^Name:\W+(.*)/) {
|
||
$testcmd = $1;
|
||
}
|
||
}
|
||
close FILE;
|
||
}
|
||
if (open(FILE, "/proc/${pid}/status")) {
|
||
while (<FILE>) {
|
||
my ($key, $val) = split(":", $_, 2);
|
||
if ($key eq 'VmRSS') {
|
||
$memory = $val;
|
||
last;
|
||
}
|
||
}
|
||
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' $col>$pid</td><td align='center' $col>$memory</td>";
|
||
}
|
||
}
|
||
return $status;
|
||
}
|
||
|
||
sub isrunningaddon{
|
||
my $cmd = $_[0];
|
||
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;
|
||
|
||
my $testcmd = `/usr/local/bin/addonctrl $_ status 2>/dev/null`;
|
||
|
||
if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
|
||
$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
|
||
$testcmd =~ s/.* //gi;
|
||
$testcmd =~ s/[a-z_]//gi;
|
||
$testcmd =~ s/\[[0-1]\;[0-9]+//gi;
|
||
$testcmd =~ s/[\(\)\.]//gi;
|
||
$testcmd =~ s/ //gi;
|
||
$testcmd =~ s///gi;
|
||
|
||
my @pid = split(/\s/,$testcmd);
|
||
$status .="<td align='center' $col>$pid[0]</td>";
|
||
|
||
my $memory = 0;
|
||
|
||
foreach (@pid){
|
||
chomp($_);
|
||
if (open(FILE, "/proc/$_/statm")){
|
||
my $temp = <FILE>;
|
||
@memory = split(/ /,$temp);
|
||
}
|
||
$memory+=$memory[0];
|
||
}
|
||
$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' $col></td>";
|
||
}
|
||
return $status;
|
||
}
|