From 4ce4450537eabe3edd0cf276ec0a63c6b0a4499a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 24 Apr 2025 08:15:41 +0200
Subject: [PATCH] openvpn: remove is_interface_assigned() so it can be removed

---
 src/www/vpn_openvpn_client.php | 22 ++++++----------------
 src/www/vpn_openvpn_server.php | 10 ++--------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index 1f07f2469..d4a602e8b 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -124,21 +124,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     }
 
     if ($act == "del") {
-        // remove client
         $response = ["status" => "failed", "message" => gettext("not found")];
-        if (isset($id)) {
-            $vpn_id = !empty($a_client[$id]) ? $a_client[$id]['vpnid'] : null;
-            if ($vpn_id !== null && is_interface_assigned("ovpnc{$vpn_id}")) {
-                $response = [
-                    "status" => "failed",
-                    "message" => gettext("This tunnel cannot be deleted because it is still being used as an interface.")
-                ];
-            } elseif ($vpn_id !== null) {
-                openvpn_delete('client', $a_client[$id]);
-                unset($a_client[$id]);
-                write_config();
-                $response = ["status" => "ok"];
-            }
+        if (isset($id) && !empty($a_client[$id])) {
+            openvpn_delete('client', $a_client[$id]);
+            unset($a_client[$id]);
+            write_config();
+            $response = ["status" => "ok"];
         }
         echo json_encode($response);
         exit;
@@ -146,8 +137,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         if (!empty($pconfig['rule']) && is_array($pconfig['rule'])) {
             foreach ($pconfig['rule'] as $rulei) {
                 $vpn_id = !empty($a_client[$rulei]) ? $a_client[$rulei]['vpnid'] : null;
-                // XXX: silently ignore entries that can't be removed, no clean option to pass messages in form result
-                if ($vpn_id !== null && !is_interface_assigned("ovpnc{$vpn_id}")) {
+                if (!empty($a_client[$rulei])) {
                     openvpn_delete('client', $a_client[$rulei]);
                     unset($a_client[$rulei]);
                 }
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index 0719c4906..39fbcba1f 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -133,14 +133,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     }
 
     if ($act == "del") {
-        // action delete
-        $vpn_id = !empty($a_server[$id]) ? $a_server[$id]['vpnid'] : null;
-        if ($vpn_id !== null && is_interface_assigned("ovpns{$vpn_id}")) {
-            $response = [
-                "status" => "failed",
-                "message" => gettext("This tunnel cannot be deleted because it is still being used as an interface.")
-            ];
-        } elseif ($vpn_id !== null) {
+        $response = ["status" => "failed", "message" => gettext("not found")];
+        if (isset($id) && !empty($a_client[$id])) {
             openvpn_delete('server', $a_server[$id]);
             unset($a_server[$id]);
             write_config();