aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-11 07:59:52 -0300
committerRenato Botelho <renato@netgate.com>2015-08-11 07:59:52 -0300
commit7691c517b4098bd7dd481607a09f54e0e9db2721 (patch)
tree473ff8ab5e7192e32fa92924039e3a1c9dc35c06 /config
parentd2733796fd53dbd08d018aca763148b358a6a669 (diff)
parent839ee37e431b4d01b80fa86aaa554a21ea65235a (diff)
downloadpfsense-packages-7691c517b4098bd7dd481607a09f54e0e9db2721.tar.gz
pfsense-packages-7691c517b4098bd7dd481607a09f54e0e9db2721.tar.bz2
pfsense-packages-7691c517b4098bd7dd481607a09f54e0e9db2721.zip
Merge pull request #967 from doktornotor/patch-13
Diffstat (limited to 'config')
-rw-r--r--config/widget-antivirus/antivirus_status.widget.php260
-rw-r--r--config/widget-antivirus/widget-antivirus.xml71
2 files changed, 152 insertions, 179 deletions
diff --git a/config/widget-antivirus/antivirus_status.widget.php b/config/widget-antivirus/antivirus_status.widget.php
index 6bca68a2..9c18d3f6 100644
--- a/config/widget-antivirus/antivirus_status.widget.php
+++ b/config/widget-antivirus/antivirus_status.widget.php
@@ -1,108 +1,96 @@
<?php
/*
- $Id: antivirus_statistics.widget.php
- Copyright (C) 2010 Serg Dvoriancev <dv_serg@mail.ru>.
- Part of pfSense widgets (www.pfsense.org)
- originally based on m0n0wall (http://m0n0.ch/wall)
-
- Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>
- and Jonathan Watt <jwatt@jwatt.org>.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+ antivirus_status.widget.php
+ part of pfSense (https://www.pfSense.org/)
+ Copyright (C) 2010 Serg Dvoriancev <dv_serg@mail.ru>
+ Copyright (C) 2015 ESF, LLC
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
*/
-
require_once("guiconfig.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
-define('PATH_CLAMDB', '/var/db/clamav');
-$pfSversion = str_replace("\s", "", file_get_contents("/etc/version"));
-if(preg_match("/^2.0/",$pfSversion))
- define('PATH_HAVPLOG', '/var/log/havp/access.log');
-else
- define('PATH_HAVPLOG', '/var/log/access.log');
-
+define('PATH_CLAMDB', '/var/db/clamav');
+define('PATH_HAVPLOG', '/var/log/access.log');
define('PATH_AVSTATUS', '/var/tmp/havp.status');
-
-if (file_exists("/usr/local/pkg/havp.inc"))
- require_once("/usr/local/pkg/havp.inc");
-else echo "No havp.inc found";
-
-function havp_avdb_info($filename)
-{
- $stl = "style='padding-top: 0px; padding-bottom: 0px; padding-left: 4px; padding-right: 4px; border-left: 1px solid #999999;'";
- $r = '';
- $path = PATH_CLAMDB . "/{$filename}";
- if (file_exists($path)) {
- $handle = '';
- if ($handle = fopen($path, "r")) {
- $s = fread($handle, 1024);
- $s = explode(':', $s);
-
- # datetime
- $dt = explode(" ", $s[1]);
- $s[1] = strftime("%Y.%m.%d", strtotime("{$dt[0]} {$dt[1]} {$dt[2]}"));
- if ($s[0] == 'ClamAV-VDB')
- $r .= "<tr class='listr'><td>{$filename}</td><td $stl>{$s[1]}</td><td $stl>{$s[2]}</td><td $stl>{$s[7]}</td></tr>";
- }
- fclose($handle);
- }
- return $r;
+if (file_exists("/usr/local/pkg/havp.inc")) {
+ require_once("/usr/local/pkg/havp.inc");
+} else {
+ echo "No havp.inc found. You must have HAVP package installed to use this widget.";
}
-function dwg_avbases_info()
-{
- $db = '<table width="100%" border="0" cellspacing="0" cellpadding="1" ><tbody>';
- $db .= '<tr class="vncellt" ><td>Database</td><td>Date</td><td>Ver.</td><td>Builder</td></tr>';
- $db .= havp_avdb_info("daily.cld");
- $db .= havp_avdb_info("daily.cvd");
- $db .= havp_avdb_info("bytecode.cld");
- $db .= havp_avdb_info("bytecode.cvd");
- $db .= havp_avdb_info("main.cld");
- $db .= havp_avdb_info("main.cvd");
- $db .= havp_avdb_info("safebrowsing.cld");
- $db .= havp_avdb_info("safebrowsing.cvd");
- $db .= '</tbody></table>';
- return $db;
+function havp_avdb_info($filename) {
+ $stl = "style='padding-top: 0px; padding-bottom: 0px; padding-left: 4px; padding-right: 4px; border-left: 1px solid #999999;'";
+ $r = '';
+ $path = PATH_CLAMDB . "/{$filename}";
+ if (file_exists($path)) {
+ $handle = '';
+ if ($handle = fopen($path, "r")) {
+ $s = fread($handle, 1024);
+ $s = explode(':', $s);
+ # datetime
+ $dt = explode(" ", $s[1]);
+ $s[1] = strftime("%Y.%m.%d", strtotime("{$dt[0]} {$dt[1]} {$dt[2]}"));
+ if ($s[0] == 'ClamAV-VDB') {
+ $r .= "<tr class='listr'><td>{$filename}</td><td $stl>{$s[1]}</td><td $stl>{$s[2]}</td><td $stl>{$s[7]}</td></tr>";
+ }
+ fclose($handle);
+ }
+ return $r;
+ }
}
-function avupdate_status()
-{
- $s = "Not found.";
- if (HVDEF_UPD_STATUS_FILE && file_exists(HVDEF_UPD_STATUS_FILE))
- $s = file_get_contents(HVDEF_UPD_STATUS_FILE);
- return str_replace( "\n", "<br>", $s );
+function dwg_avbases_info() {
+ $db = '<table width="100%" border="0" cellspacing="0" cellpadding="1"><tbody>';
+ $db .= '<tr class="vncellt" ><td>Database</td><td>Date</td><td>Ver.</td><td>Builder</td></tr>';
+ $db .= havp_avdb_info("daily.cld");
+ $db .= havp_avdb_info("daily.cvd");
+ $db .= havp_avdb_info("bytecode.cld");
+ $db .= havp_avdb_info("bytecode.cvd");
+ $db .= havp_avdb_info("main.cld");
+ $db .= havp_avdb_info("main.cvd");
+ $db .= havp_avdb_info("safebrowsing.cld");
+ $db .= havp_avdb_info("safebrowsing.cvd");
+ $db .= '</tbody></table>';
+ return $db;
}
-function dwg_av_statistic()
-{
- $s = "Unknown.";
- if (file_exists(PATH_HAVPLOG)) {
- $log = file_get_contents(PATH_HAVPLOG);
+function avupdate_status() {
+ $s = "Not found.";
+ if (HVDEF_UPD_STATUS_FILE && file_exists(HVDEF_UPD_STATUS_FILE)) {
+ $s = file_get_contents(HVDEF_UPD_STATUS_FILE);
+ return str_replace( "\n", "<br />", $s );
+ }
+}
-$count = substr_count(strtolower($log), "virus clamd:");
-$s = "Found $count viruses (total).";
+function dwg_av_statistic() {
+ $s = "Unknown.";
+ if (file_exists(PATH_HAVPLOG)) {
+ $log = file_get_contents(PATH_HAVPLOG);
+ $count = substr_count(strtolower($log), "virus clamd:");
+ $s = "Found $count viruses (total).";
/*
# slowly worked - need apply cache or preparse stat
@@ -123,59 +111,49 @@ $s = "Found $count viruses (total).";
$s .= "<tr align='center'><td>0</td><td>0</td><td>0</td><td>$count</td></tr>";
$s .= "</tbody></table>";
*/
- }
-
- return $s;
+ }
+ return $s;
}
?>
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tbody>
- <tr>
- <td class="vncellt">HTTP Scanner</td>
- <td class="listr" width=75%>
- <?php
- # havp version
- echo exec("pkg_info | grep \"[h]avp\"");
- ?>
- </td>
- </tr>
- <tr>
- <td class="vncellt">Antivirus Scanner</td>
- <td class="listr" width=75%>
- <?php
- # Clamd version
- echo exec("clamd -V");
- ?>
- </td>
- </tr>
- <tr>
- <td class="vncellt">Antivirus Bases</td>
- <td class="listr" width=75%>
- <?php
- # Antivirus bases
- if (function_exists("dwg_avbases_info"))
- echo dwg_avbases_info();
- ?>
- </td>
- </tr>
- <tr>
- <td class="vncellt">Last Update</td>
- <td class="listr" width=75%>
- <?php
- echo avupdate_status();
- ?>
- </td>
- </tr>
- <tr>
- <td class="vncellt">Statistic</td>
- <td class="listr" width=75%>
- <?php
- echo dwg_av_statistic();
- ?>
- </td>
- </tr>
- </tbody>
- </table>
-
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr>
+ <td class="vncellt">HTTP Scanner</td>
+ <td class="listr" width="75%">
+ <?php
+ // HAVP version; note - obviously broken now
+ echo exec("pkg_info | grep \"[h]avp\"");
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="vncellt">Antivirus Scanner</td>
+ <td class="listr" width="75%">
+ <?php
+ // ClamD version
+ echo exec("clamd -V");
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="vncellt">Antivirus Bases</td>
+ <td class="listr" width="75%">
+ <?php echo dwg_avbases_info(); ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="vncellt">Last Update</td>
+ <td class="listr" width="75%">
+ <?php echo avupdate_status(); ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="vncellt">Statistics</td>
+ <td class="listr" width="75%">
+ <?php echo dwg_av_statistic(); ?>
+ </td>
+ </tr>
+ </tbody>
+</table>
diff --git a/config/widget-antivirus/widget-antivirus.xml b/config/widget-antivirus/widget-antivirus.xml
index 468baf13..91a6a392 100644
--- a/config/widget-antivirus/widget-antivirus.xml
+++ b/config/widget-antivirus/widget-antivirus.xml
@@ -4,64 +4,59 @@
<packagegui>
<copyright>
<![CDATA[
-/* $Id$ */
-/* ========================================================================== */
+/* $Id$ */
+/* ====================================================================================== */
/*
- widget-antivirus.xml
- part of pfSense (http://www.pfSense.com)
- Copyright (C) 2009 Jim Pingle
- All rights reserved.
-
- Based on m0n0wall (http://m0n0.ch/wall)
- Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
- All rights reserved.
- */
-/* ========================================================================== */
+ widget-antivirus.xml
+ part of pfSense (https://www.pfSense.org/)
+ Copyright (C) 2009 Jim Pingle
+ Copyright (C) 2015 ESF, LLC
+ All rights reserved.
+*/
+/* ====================================================================================== */
/*
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
- */
-/* ========================================================================== */
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ====================================================================================== */
]]>
</copyright>
- <description>Antivirus status widget add-on for Dashboard package and HAVP</description>
- <requirements>Dashboard package and HAVP</requirements>
- <faq>Currently there are no FAQ items provided.</faq>
+ <description>Antivirus status widget add-on for HAVP</description>
+ <requirements>HAVP package</requirements>
<name>widget-antivirus</name>
- <version>0.1</version>
+ <version>0.1.1</version>
<title>Widget - Antivirus Status</title>
<include_file>/usr/local/pkg/widget-antivirus.inc</include_file>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
- <chmod>077</chmod>
<item>https://packages.pfsense.org/packages/config/widget-antivirus/widget-antivirus.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/widgets/include/</prefix>
- <chmod>0644</chmod>
<item>https://packages.pfsense.org/packages/config/widget-antivirus/antivirus_status.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/widgets/widgets/</prefix>
- <chmod>0644</chmod>
<item>https://packages.pfsense.org/packages/config/widget-antivirus/antivirus_status.widget.php</item>
</additional_files_needed>
<custom_php_deinstall_command>