os-firewall: add support for "cancelation tokens" apply endpoint can request a rollback point, which will be reverted to if there's no call on cancelRollback with the same timestamp within 60 seconds.

for https://github.com/opnsense/plugins/issues/1720

net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php

@@ -66,15 +66,28 @@ class FilterController extends ApiMutableModelControllerBase
         return $this->toggleBase("rules.rule", $uuid, $enabled);
     }
 
-    public function applyAction()
+    public function applyAction($rollback_revision = null)
     {
         if ($this->request->isPost()) {
+            if ($rollback_revision != null) {
+                // background rollback timer
+                (new Backend())->configdpRun('pfplugin rollback_timer', [$rollback_revision], true);
+            }
             return array("status" => (new Backend())->configdRun('filter reload'));
         } else {
             return array("status" => "error");
         }
     }
 
+    public function cancelRollbackAction($rollback_revision)
+    {
+        if ($this->request->isPost()) {
+            return array("status" => (new Backend())->configdpRun('pfplugin cancel_rollback', [$rollback_revision]));
+        } else {
+            return array("status" => "error");
+        }
+    }
+
     public function savepointAction()
     {
         if ($this->request->isPost()) {

net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php

@@ -88,6 +88,7 @@ class Filter extends BaseModel
      * Rollback this model to a previous version.
      * Make sure to remove this object afterwards, since its contents won't be updated.
      * @param $revision float|string revision number
+     * @return bool action performed (backup revision existed)
      */
     public function rollback($revision)
     {
@@ -102,7 +103,9 @@ class Filter extends BaseModel
                 $node = $targetdom->ownerDocument->importNode($sourcedom, TRUE);
                 $targetdom->parentNode->replaceChild($node, $targetdom);
                 Config::getInstance()->save();
+                return true;
             }
         }
+        return false;
     }
-}
+}

net/firewall/src/opnsense/scripts/pfplugin/rollback_cancel

@@ -0,0 +1,40 @@
+#!/usr/local/bin/php
+<?php
+
+/*
+ *    Copyright (C) 2020 Deciso B.V.
+ *    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.
+ */
+
+if (count($argv) >= 2) {
+    $revision = preg_replace("/[^0-9.]/", "", $argv[1]);
+    if (!empty($revision)) {
+        $lckfile = "/tmp/pfplugin_{$revision}.lock";
+        if (file_exists($lckfile)) {
+            unlink($lckfile);
+            exit(0);
+        }
+    }
+}
+exit(1);

net/firewall/src/opnsense/scripts/pfplugin/rollback_timer

@@ -0,0 +1,54 @@
+#!/usr/local/bin/php
+<?php
+
+/*
+ *    Copyright (C) 2020 Deciso B.V.
+ *    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('script/load_phalcon.php');
+
+if (count($argv) >= 2) {
+    $revision = preg_replace("/[^0-9.]/", "", $argv[1]);
+    if (!empty($revision)) {
+        $lckfile = "/tmp/pfplugin_{$revision}.lock";
+        file_put_contents($lckfile, "");
+        // give the api 60 seconds to callback
+        for ($i=0; $i < 60 ; ++$i) {
+            if (!file_exists($lckfile)) {
+                // got feedback
+                exit(0);
+            }
+            sleep(1);
+        }
+        @unlink($lckfile);
+        // no feedback, revert
+        $mdlFilter = new OPNsense\Firewall\Filter();
+        if ($mdlFilter->rollback($revision)) {
+            (new OPNsense\Core\Backend())->configdRun('filter reload');
+        } else {
+            syslog(LOG_WARNING, "unable to revert to unexisting revision : {$revision}");
+        }
+    }
+}

net/firewall/src/opnsense/service/conf/actions.d/actions_pfplugin.conf

@@ -0,0 +1,11 @@
+[rollback_timer]
+command:/usr/local/bin/flock -n -E 0 -o /tmp/pfplugin_rollback_timer.lock /usr/local/opnsense/scripts/pfplugin/rollback_timer
+parameters: %s
+type:script
+message:wait for api feedback or revert to previous filter plugin config
+
+[cancel_rollback]
+command: /usr/local/opnsense/scripts/pfplugin/rollback_cancel
+parameters: %s
+type:script_output
+message:cancel pfplugin rollback