From 8ed07a052bb9ffe82daf8311131cd9a136b7463b Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 16 Apr 2023 15:05:14 +0200
Subject: [PATCH] Interfaces: Diagnostics - replace
 `empty($result['validations'])` for `$result['result'] != 'failed'` as failed
 calls to setAction() are not guaranteed to contain validation errors. (for
 example when not calling via POST)

---
 .../OPNsense/Diagnostics/Api/DnsDiagnosticsController.php       | 2 +-
 .../OPNsense/Diagnostics/Api/PacketCaptureController.php        | 2 +-
 .../app/controllers/OPNsense/Diagnostics/Api/PingController.php | 2 +-
 .../OPNsense/Diagnostics/Api/PortprobeController.php            | 2 +-
 .../OPNsense/Diagnostics/Api/TracerouteController.php           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/DnsDiagnosticsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/DnsDiagnosticsController.php
index fdbc5c225..42e2fd44e 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/DnsDiagnosticsController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/DnsDiagnosticsController.php
@@ -41,7 +41,7 @@ class DnsDiagnosticsController extends ApiMutableModelControllerBase
     public function setAction()
     {
         $result = parent::setAction();
-        if (empty($result['validations'])) {
+        if ($result['result'] != 'failed') {
             // field validation passed, execute query
             $mdl = $this->getModel();
             $result['result'] = 'ok';
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PacketCaptureController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PacketCaptureController.php
index 69cb63515..9bcf417b7 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PacketCaptureController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PacketCaptureController.php
@@ -46,7 +46,7 @@ class PacketCaptureController extends ApiMutableModelControllerBase
     public function setAction()
     {
         $result = parent::setAction();
-        if (empty($result['validations'])) {
+        if ($result['result'] != 'failed') {
             $mdl = $this->getModel();
             $result['result'] = 'ok';
             $result['uuid'] = $mdl->settings->generateUUID();
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PingController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PingController.php
index c9c4638b7..50464c558 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PingController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PingController.php
@@ -43,7 +43,7 @@ class PingController extends ApiMutableModelControllerBase
     public function setAction()
     {
         $result = parent::setAction();
-        if (empty($result['validations'])) {
+        if ($result['result'] != 'failed') {
             $mdl = $this->getModel();
             $result['result'] = 'ok';
             $result['uuid'] = $mdl->settings->generateUUID();
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PortprobeController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PortprobeController.php
index 31d7ba74e..709505ff0 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PortprobeController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/PortprobeController.php
@@ -39,7 +39,7 @@ class PortprobeController extends ApiMutableModelControllerBase
     public function setAction()
     {
         $result = parent::setAction();
-        if (empty($result['validations'])) {
+        if ($result['result'] != 'failed') {
             // field validation passed, execute query
             $mdl = $this->getModel();
             $result['result'] = 'ok';
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TracerouteController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TracerouteController.php
index b6f485781..4cced4141 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TracerouteController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TracerouteController.php
@@ -39,7 +39,7 @@ class TracerouteController extends ApiMutableModelControllerBase
     public function setAction()
     {
         $result = parent::setAction();
-        if (empty($result['validations'])) {
+        if ($result['result'] != 'failed') {
             // field validation passed, execute query
             $mdl = $this->getModel();
             $result['result'] = 'ok';