From 43dc040cfb0b11784ebbc691ea18f1c006e054cb Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 6 Oct 2026 09:54:49 +0200
Subject: [PATCH] VPN: OpenVPN: Instances - improve keepalive validation,
 mentioned in https://github.com/opnsense/core/pull/10174

---
 src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php | 5 +++++
 src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
index 7dbfba2e5c..277ff96854 100644
--- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
+++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
@@ -189,6 +189,11 @@ class OpenVPN extends BaseModel
                     gettext('Timeout must be at least twice the interval value.'),
                     $key . ".keepalive_timeout"
                 ));
+            } elseif ($instance->keepalive_interval->isEmpty() xor $instance->keepalive_timeout->isEmpty()) {
+                $messages->appendMessage(new Message(
+                    gettext('To configure keepalive, both interval and timout need to be specified.'),
+                    $key . ".keepalive_timeout"
+                ));
             }
 
             if ($instance->dev_type == 'ovpn' && strpos($instance->proto, 'udp') === false) {
diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
index a67b43b695..b64710907b 100644
--- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
@@ -359,7 +359,7 @@
                     <MinimumValue>0</MinimumValue>
                 </keepalive_interval>
                 <keepalive_timeout type="IntegerField">
-                    <MinimumValue>0</MinimumValue>
+                    <MinimumValue>1</MinimumValue>
                 </keepalive_timeout>
                 <reneg-sec type="IntegerField">
                     <MinimumValue>0</MinimumValue>