From a4efaae149ed2fbf4d1c8e5cc9e86803a1e09800 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Fri, 9 Jul 2021 11:49:08 +0200
Subject: [PATCH 1/4] security/acme-client: change IP discovery URL, fixes
 #2419

---
 security/acme-client/pkg-descr                                 | 3 +++
 .../library/OPNsense/AcmeClient/LeValidation/DnsNamecheap.php  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index 6ae3cfff1..bebb1192f 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -19,6 +19,9 @@ Added:
 Fixed:
 * sftp update of write protected cert files with a numeric owner (#2426)
 
+Changed:
+* Namecheap: change IP discovery URL to avoid rate-limits (#2419)
+
 2.5
 
 Added:
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNamecheap.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNamecheap.php
index 5d252d3e9..43f94150f 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNamecheap.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNamecheap.php
@@ -45,7 +45,7 @@ class DnsNamecheap extends Base implements LeValidationInterface
             $this->acme_env['NAMECHEAP_SOURCEIP'] = (string)$this->config->dns_namecheap_sourceip;
         } else {
             // Use a public service to get our source IP for Namecheap API
-            $this->acme_env['NAMECHEAP_SOURCEIP'] = 'https://ifconfig.co/ip';
+            $this->acme_env['NAMECHEAP_SOURCEIP'] = 'https://ipinfo.io/ip';
         }
     }
 }

From 66ad35a410fadf13881d11c5c2d1658fde001eb3 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Fri, 9 Jul 2021 12:07:52 +0200
Subject: [PATCH 2/4] security/acme-client: add support for Domeneshop DNS API,
 fixes #2390

---
 security/acme-client/pkg-descr                |  1 +
 .../AcmeClient/forms/dialogValidation.xml     | 15 +++++++
 .../AcmeClient/LeValidation/DnsDomeneshop.php | 45 +++++++++++++++++++
 .../models/OPNsense/AcmeClient/AcmeClient.xml |  7 +++
 4 files changed, 68 insertions(+)
 create mode 100644 security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsDomeneshop.php

diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index bebb1192f..be9ada2d6 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -15,6 +15,7 @@ Added:
 * add support for DDNSS DNS API (#2415)
 * add support for Zone.eu DNS API (#2417)
 * add support for Njalla DNS API (#2446)
+* add support for Domeneshop DNS API (#2390)
 
 Fixed:
 * sftp update of write protected cert files with a numeric owner (#2426)
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 128a43efd..6fac8e3b5 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
@@ -339,6 +339,21 @@
         <label>Password</label>
         <type>password</type>
     </field>
+    <field>
+        <label>Domeneshop DNS API</label>
+        <type>header</type>
+        <style>table_dns table_dns_domeneshop</style>
+    </field>
+    <field>
+        <id>validation.dns_domeneshop_token</id>
+        <label>Token</label>
+        <type>text</type>
+    </field>
+    <field>
+        <id>validation.dns_domeneshop_secret</id>
+        <label>Secret</label>
+        <type>password</type>
+    </field>
     <field>
         <label>DNSPod</label>
         <type>header</type>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsDomeneshop.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsDomeneshop.php
new file mode 100644
index 000000000..09ca23a4f
--- /dev/null
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsDomeneshop.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * Copyright (C) 2021 Frank Wall
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\AcmeClient\LeValidation;
+
+use OPNsense\AcmeClient\LeValidationInterface;
+use OPNsense\Core\Config;
+
+/**
+ * Domeneshop API
+ * @package OPNsense\AcmeClient
+ */
+class DnsDomeneshop extends Base implements LeValidationInterface
+{
+    public function prepare()
+    {
+        $this->acme_env['DOMENESHOP_Token'] = (string)$this->config->dns_domeneshop_token;
+        $this->acme_env['DOMENESHOP_Secret'] = (string)$this->config->dns_domeneshop_secret;
+    }
+}
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 af732bdb3..1f3db5fd0 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
@@ -387,6 +387,7 @@
                         <dns_dgon>DigitalOcean API</dns_dgon>
                         <dns_da>DirectAdmin API</dns_da>
                         <dns_dnsimple>DNSimple API</dns_dnsimple>
+                        <dns_domeneshop>Domeneshop API</dns_domeneshop>
                         <dns_me>DNSMadeEasy.com API</dns_me>
                         <dns_dp>DNSPod.cn API</dns_dp>
                         <dns_doapi>Domain-Offensive LetsEncrypt API</dns_doapi>
@@ -545,6 +546,12 @@
                 <dns_do_password type="TextField">
                     <Required>N</Required>
                 </dns_do_password>
+                <dns_domeneshop_token type="TextField">
+                    <Required>N</Required>
+                </dns_domeneshop_token>
+                <dns_domeneshop_secret type="TextField">
+                    <Required>N</Required>
+                </dns_domeneshop_secret>
                 <dns_dp_id type="TextField">
                     <Required>N</Required>
                 </dns_dp_id>

From f7bdcda43cb5a2c150a9f6ee4eb2594faa6d9202 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Fri, 9 Jul 2021 12:15:06 +0200
Subject: [PATCH 3/4] security/acme-client: add support for IONOS domain API,
 fixes #2345

---
 security/acme-client/pkg-descr                |  1 +
 .../AcmeClient/forms/dialogValidation.xml     | 15 +++++++
 .../AcmeClient/LeValidation/DnsIonos.php      | 45 +++++++++++++++++++
 .../models/OPNsense/AcmeClient/AcmeClient.xml |  7 +++
 4 files changed, 68 insertions(+)
 create mode 100644 security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsIonos.php

diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index be9ada2d6..0f08eea38 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -16,6 +16,7 @@ Added:
 * add support for Zone.eu DNS API (#2417)
 * add support for Njalla DNS API (#2446)
 * add support for Domeneshop DNS API (#2390)
+* add support for IONOS domain API (#2345)
 
 Fixed:
 * sftp update of write protected cert files with a numeric owner (#2426)
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 6fac8e3b5..527601cfd 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
@@ -550,6 +550,21 @@
         <label>Password</label>
         <type>password</type>
     </field>
+    <field>
+        <label>IONOS domain API</label>
+        <type>header</type>
+        <style>table_dns table_dns_ionos</style>
+    </field>
+    <field>
+        <id>validation.dns_ionos_prefix</id>
+        <label>Prefix</label>
+        <type>text</type>
+    </field>
+    <field>
+        <id>validation.dns_ionos_secret</id>
+        <label>Secret</label>
+        <type>password</type>
+    </field>
     <field>
         <label>IPSConfig</label>
         <type>header</type>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsIonos.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsIonos.php
new file mode 100644
index 000000000..19d1b5190
--- /dev/null
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsIonos.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * Copyright (C) 2021 Frank Wall
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\AcmeClient\LeValidation;
+
+use OPNsense\AcmeClient\LeValidationInterface;
+use OPNsense\Core\Config;
+
+/**
+ * IONOS API
+ * @package OPNsense\AcmeClient
+ */
+class DnsIonos extends Base implements LeValidationInterface
+{
+    public function prepare()
+    {
+        $this->acme_env['IONOS_PREFIX'] = (string)$this->config->dns_ionos_prefix;
+        $this->acme_env['IONOS_SECRET'] = (string)$this->config->dns_ionos_secret;
+    }
+}
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 1f3db5fd0..70e5080e7 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
@@ -409,6 +409,7 @@
                         <dns_infoblox>Infoblox API</dns_infoblox>
                         <dns_infomaniak>Infomaniak API</dns_infomaniak>
                         <dns_inwx>INWX XMLRPC API</dns_inwx>
+                        <dns_ionos>IONOS domain API</dns_ionos>
                         <dns_ispconfig>ISPConfig 3.1+ API</dns_ispconfig>
                         <dns_joker>Joker API</dns_joker>
                         <dns_kinghost>KingHost DNS API</dns_kinghost>
@@ -621,6 +622,12 @@
                 <dns_inws_password type="TextField">
                     <Required>N</Required>
                 </dns_inws_password>
+                <dns_ionos_prefix type="TextField">
+                    <Required>N</Required>
+                </dns_ionos_prefix>
+                <dns_ionos_secret type="TextField">
+                    <Required>N</Required>
+                </dns_ionos_secret>
                 <dns_ispconfig_user type="TextField">
                     <Required>N</Required>
                 </dns_ispconfig_user>

From ed8ba4e67445a427b7c12c78b5232e18055890f6 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sun, 11 Jul 2021 14:43:50 +0200
Subject: [PATCH 4/4] security/acme-client: bump model version

---
 .../opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 70e5080e7..29a998e7b 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
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/AcmeClient</mount>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <description>A secure Let's Encrypt plugin</description>
     <items>
         <settings>