firmware: plugin detection via configd

(cherry picked from commit 99c71c85)
(cherry picked from commit 9d73770c)

plist

@@ -545,6 +545,7 @@
 /usr/local/opnsense/scripts/firmware/launcher.sh
 /usr/local/opnsense/scripts/firmware/license.sh
 /usr/local/opnsense/scripts/firmware/lock.sh
+/usr/local/opnsense/scripts/firmware/plugin.sh
 /usr/local/opnsense/scripts/firmware/reinstall.sh
 /usr/local/opnsense/scripts/firmware/remove.sh
 /usr/local/opnsense/scripts/firmware/running.sh

src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php

@@ -519,9 +519,9 @@ class FirmwareController extends ApiControllerBase
                 /* figure out local and remote plugins */
                 $plugin = explode('-', $translated['name']);
                 if (count($plugin)) {
-                    if ($plugin[0] == 'os' || ($type == 'local' && $plugin[0] == 'ospriv') ||
-                        ($devel && $type == 'remote' && $plugin[0] == 'ospriv')) {
-                        if ($devel || (count($plugin) < 3 || end($plugin) != 'devel')) {
+                    if ($plugin[0] == 'os') {
+                        if ($type == 'local' || ($type == 'remote' &&
+                            ($devel || end($plugin) != 'devel'))) {
                             $plugins[$translated['name']] = $translated;
                         }
                     }

src/opnsense/scripts/firmware/plugin.sh

+#!/bin/sh
+
+# Copyright (c) 2017 Franco Fichtner <franco@opnsense.org>
+#
+# 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 BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+
+PLUGIN=${1}
+PREFIX="os-"
+SUFFIX="-devel"
+RETURN="0"
+
+# Return "1" if the plugin is installed.  It will fuzzy-match the
+# development version, unless specifically given the development
+# version (os-plugin-devel-devel doesn't match obviously).
+
+if pkg query %n "${PREFIX}${PLUGIN}" > /dev/null; then
+	RETURN="1"
+elif pkg query %n "${PREFIX}${PLUGIN}${SUFFIX}" > /dev/null; then
+	RETURN="1"
+fi
+
+echo ${RETURN}

src/opnsense/service/conf/actions.d/actions_firmware.conf

@@ -89,6 +89,12 @@ parameters:%s
 type:script
 message:issued firmware hotfix for %s
 
+[plugin]
+command: /usr/local/opnsense/scripts/firmware/plugin.sh
+parameters:%s
+type:script_output
+message:Tested for presence of plugin %s
+
 [status]
 command: /usr/bin/touch /tmp/pkg_upgrade.progress 2>&1; /bin/cat /tmp/pkg_upgrade.progress 2>&1
 parameters:

src/www/status_dhcp_leases.php

@@ -76,8 +76,8 @@ function remove_duplicate($array, $field)
 
 $interfaces = legacy_config_get_interfaces(array('virtual' => false));
 $leasesfile = services_dhcpd_leasesfile();
-/* Check if WOL plugin is installed */
-$plugin_installed = count(plugins_scan('wol'));
+
+$wol_installed = trim(configd_run('firmware plugin wol'));
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $awk = "/usr/bin/awk";
@@ -420,7 +420,7 @@ include("head.inc");?>
                   <td><?=$data['ip'];?></td>
                   <td>
 <?php
-                      if ($plugin_installed): ?>
+                      if ($wol_installed): ?>
                       <a href="services_wol.php?if=<?=$data['if'];?>&amp;mac=<?=$data['mac'];?>" title="<?=gettext("send Wake on LAN packet to this MAC address");?>">
                         <?=$data['mac'];?>
                       </a>
@@ -447,7 +447,7 @@ include("head.inc");?>
 <?php
                     endif;?>
 <?php
-                    if ($plugin_installed): ?>
+                    if ($wol_installed): ?>
                     <a class="btn btn-default btn-xs" href="services_wol_edit.php?if=<?=$data['if'];?>&amp;mac=<?=$data['mac'];?>&amp;descr=<?=$data['hostname'];?>">
                       <span class="glyphicon glyphicon-flash" data-toggle="tooltip"  title="<?=gettext("add a Wake on LAN mapping for this MAC address");?>" alt="add"></span>
                     </a>