From 0fe2422fa0a76248ba7c358cb170d31a7c894c65 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 13 Dec 2020 12:53:06 +0100 Subject: [PATCH] security/acme-client: remove all hardcoded DNS sleep times The report in #2121 made it clear that it was never a good idea to use a hardcoded value in the first place. It is very likely a breaking change for some users, so I've added notes to the GUI and the plugin changelog. --- security/acme-client/pkg-descr | 4 ++++ .../AcmeClient/forms/dialogValidation.xml | 20 +++++++++++++++++++ .../AcmeClient/LeValidation/DnsLexicon.php | 5 ----- .../AcmeClient/LeValidation/DnsLinode.php | 2 -- .../AcmeClient/LeValidation/DnsLinodeV4.php | 2 -- .../AcmeClient/LeValidation/DnsNetcup.php | 2 -- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr index df3044f38..549689228 100644 --- a/security/acme-client/pkg-descr +++ b/security/acme-client/pkg-descr @@ -12,6 +12,10 @@ Plugin Changelog Changed: * BREAKING: use configured DNS sleep time for Namesilo instead of hardcoded value (#2121) +* BREAKING: use configured DNS sleep time for Lexicon/Namesilo instead of hardcoded value +* BREAKING: use configured DNS sleep time for Linode instead of hardcoded value +* BREAKING: use configured DNS sleep time for Linode v4 instead of hardcoded value +* BREAKING: use configured DNS sleep time for Netcup instead of hardcoded value 2.1 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 4ad41e7ea..00ca5e203 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 @@ -603,6 +603,11 @@ header + + + header + + validation.dns_lexicon_provider @@ -623,6 +628,11 @@ header + + + header + + validation.dns_linode_key @@ -633,6 +643,11 @@ header + + + header + + validation.dns_linode_v4_key @@ -767,6 +782,11 @@ header + + + header + + validation.dns_netcup_cid diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLexicon.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLexicon.php index 2ffc6d1ec..0173baa30 100644 --- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLexicon.php +++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLexicon.php @@ -46,10 +46,5 @@ class DnsLexicon extends Base implements LeValidationInterface $this->acme_env['PROVIDER'] = $provider; $this->acme_env[$env_user] = (string)$this->config->dns_lexicon_user; $this->acme_env[$env_token] = (string)$this->config->dns_lexicon_token; - - if ((string)$this->config->dns_lexicon_provider == 'namesilo') { - // Namesilo applies changes to DNS records only every 15 minutes. - $this->acme_args[] = '--dnssleep 960'; - } } } diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinode.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinode.php index 2b2453b8b..e641fa483 100644 --- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinode.php +++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinode.php @@ -40,7 +40,5 @@ class DnsLinode extends Base implements LeValidationInterface public function prepare() { $this->acme_env['LINODE_API_KEY'] = (string)$this->config->dns_linode_key; - // Linode can take up to 15 to update DNS records - $this->acme_args[] = '--dnssleep 960'; } } diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinodeV4.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinodeV4.php index c69293a24..2bad2738a 100644 --- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinodeV4.php +++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinodeV4.php @@ -40,7 +40,5 @@ class DnsLinodeV4 extends Base implements LeValidationInterface public function prepare() { $this->acme_env['LINODE_V4_API_KEY'] = (string)$this->config->dns_linode_v4_key; - // Linode can take up to 15 to update DNS records - $this->acme_args[] = '--dnssleep 960'; } } diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNetcup.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNetcup.php index b4afca6cb..3c9955eda 100644 --- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNetcup.php +++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNetcup.php @@ -42,7 +42,5 @@ class DnsNetcup extends Base implements LeValidationInterface $this->acme_env['NC_CID'] = (string)$this->config->dns_netcup_cid; $this->acme_env['NC_Apikey'] = (string)$this->config->dns_netcup_key; $this->acme_env['NC_Apipw'] = (string)$this->config->dns_netcup_pw; - // netcup applies changes to DNS records only every 10 minutes. - $this->acme_args[] = '--dnssleep 600'; } }