From 6e94bd8709d3a4d2b7d6eff11de65ce095659f9f Mon Sep 17 00:00:00 2001
From: Awalon <awalon@users.noreply.github.com>
Date: Tue, 11 Oct 2022 13:55:30 +0200
Subject: [PATCH] acme.sh: Support for public DNS checks (remove --dnssleep
 option on 0s) (#3079)

---
 .../OPNsense/AcmeClient/forms/dialogValidation.xml          | 6 ++++--
 .../app/library/OPNsense/AcmeClient/LeValidation/Base.php   | 4 +++-
 .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml       | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
index 890240560..ad1d54aae 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
@@ -126,9 +126,11 @@
     </field>
     <field>
         <id>validation.dns_sleep</id>
-        <label>Sleep Time</label>
+        <label>DNS Sleep Time</label>
         <type>text</type>
-        <help>The time in seconds to wait for all the TXT records to take effect after adding them to the DNS API. Defaults to 120 seconds.</help>
+        <help>The time in seconds to wait for all the TXT records to take effect after adding them to the DNS API. Defaults to 120 seconds.
+            For public DNS validation each 10 seconds up to 20 minutes, instead of fixed DNS sleep time set value to 0.</help>
+        <hint>0 for public DNS check or 1-84600s</hint>
     </field>
     <field>
         <label>Active24</label>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/Base.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/Base.php
index c0289569e..b516343d6 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/Base.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/Base.php
@@ -80,7 +80,9 @@ abstract class Base extends \OPNsense\AcmeClient\LeCommon
         switch ((string)$this->config->method) {
             case 'dns01':
                 $this->acme_args[] = LeUtils::execSafe('--dns %s', (string)$this->config->dns_service);
-                $this->acme_args[] = LeUtils::execSafe('--dnssleep %s', (string)$this->config->dns_sleep);
+                if (! (string)$this->config->dns_sleep == '0') {
+                    $this->acme_args[] = LeUtils::execSafe('--dnssleep %s', (string)$this->config->dns_sleep);
+                }
                 break;
             case 'http01':
                 $this->acme_args[] = '--webroot ' . self::ACME_WEBROOT;
diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
index 5fd41ff30..4222cc253 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
@@ -505,10 +505,10 @@
                     </OptionValues>
                 </dns_service>
                 <dns_sleep type="IntegerField">
-                    <MinimumValue>1</MinimumValue>
+                    <MinimumValue>0</MinimumValue>
                     <MaximumValue>84600</MaximumValue>
                     <default>120</default>
-                    <ValidationMessage>Please specify a value between 1 and 84600.</ValidationMessage>
+                    <ValidationMessage>Please specify a value between 0 and 84600 seconds.</ValidationMessage>
                     <Required>Y</Required>
                 </dns_sleep>
                 <dns_active24_token type="TextField">