web proxy: tweak plugin code a bit

o Add license for new file by Alex
o Use the argument to pass the type of action to simplify
o Stop after squid stop for symmetry with start to retain order

Author: fichtner

LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2014-2017 Ad Schellevis <[email protected]>
+Copyright (c) 2017 Alexander Shursha <[email protected]>
 Copyright (c) 2004 Bachman Kharazmi
 Copyright (c) 2005-2008 Bill Marquette <[email protected]>
 Copyright (c) 2003-2005 Bob Zoller <[email protected]>

plist

@@ -549,6 +549,7 @@
 /usr/local/opnsense/scripts/OPNsense/CaptivePortal/set_session_restrictions.py
 /usr/local/opnsense/scripts/OPNsense/CaptivePortal/sql/init.sql
 /usr/local/opnsense/scripts/OPNsense/CaptivePortal/strip_template.py
+/usr/local/opnsense/scripts/OPNsense/Proxy/plugins.php
 /usr/local/opnsense/scripts/dhcp/get_leases.py
 /usr/local/opnsense/scripts/dns/unbound_dhcpd.py
 /usr/local/opnsense/scripts/filter/delete_table.py

src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php

@@ -1,7 +1,7 @@
 <?php
-/**
+
+/*
  *    Copyright (C) 2015 Deciso B.V.
- *
  *    All rights reserved.
  *
  *    Redistribution and use in source and binary forms, with or without
@@ -24,8 +24,8 @@
  *    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.
- *
  */
+
 namespace OPNsense\Proxy\Api;
 
 use \OPNsense\Base\ApiControllerBase;
@@ -62,8 +62,8 @@ public function stopAction()
     {
         if ($this->request->isPost()) {
             $backend = new Backend();
-            $backend->configdRun('proxy plugins stop');
             $response = $backend->configdRun("proxy stop");
+            $backend->configdRun('proxy plugins stop');
             return array("response" => $response);
         } else {
             return array("response" => array());

src/opnsense/scripts/OPNsense/Proxy/plugins.php

@@ -1,9 +1,35 @@
 #!/usr/local/bin/php
 <?php
 
+/*
+ * Copyright (C) 2017 Alexander Shursha <[email protected]>
+ * 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("config.inc");
 require_once("plugins.inc");
 
 if (isset($argv[1])) {
-    plugins_configure("webproxy_" . trim($argv[1], " \n"));
+    plugins_configure('webproxy', array(trim($argv[1], " \n")));
 }