From 4c79d89c8f07b78eb2bca955b67ead727c67406f Mon Sep 17 00:00:00 2001
From: Maarten den Braber <m@mdbraber.com>
Date: Sat, 16 May 2020 23:36:37 +0200
Subject: [PATCH 1/3] Add Acmeproxy DNS provider dialogs

---
 .../AcmeClient/forms/dialogValidation.xml     | 20 +++++++++++++++++++
 .../models/OPNsense/AcmeClient/AcmeClient.xml | 12 ++++++++++-
 .../OPNsense/AcmeClient/certhelper.php        |  7 ++++++-
 3 files changed, 37 insertions(+), 2 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 3b2f618ef..25d472bfb 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
@@ -1008,6 +1008,26 @@
         <type>text</type>
         <help>Specify the custom ACME DNS Update URL, i.e. https://auth.acme-dns.io/update (optional)</help>
     </field>
+    <field>
+        <label>acmeproxy</label>
+        <type>header</type>
+        <style>table_dns table_dns_acmeproxy</style>
+    </field>
+    <field>
+        <id>validation.dns_acmeproxy_endpoint</id>
+        <label>Endpoint</label>
+        <type>text</type>
+        <help>Specify the acmeproxy endpoint URL, i.e. https://acmeproxy.examp
+    </field>                                                                      <field>
+        <id>validation.dns_acmeproxy_username</id>
+        <label>User</label>
+        <type>text</type>
+    </field>
+    <field>
+        <id>validation.dns_acmeproxy_password</id>
+        <label>Password</label>
+        <type>password</type>
+    </field>
     <field>
         <label>Variomedia</label>
         <type>header</type>
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 4bf12717f..3b4228b3a 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
@@ -358,6 +358,7 @@
                     <default>dns_nsupdate</default>
                     <OptionValues>
                         <dns_acmedns>ACME DNS API</dns_acmedns>
+                        <dns_acmeproxy>Acmeproxy API</dns_acmeproxy>
                         <dns_ad>Alwaysdata.com API</dns_ad>
                         <dns_ali>aliyun.com API</dns_ali>
                         <dns_autodns>AutoDNS (InterNetX) API</dns_autodns>
@@ -847,7 +848,16 @@
                 <dns_acmedns_updateurl type="TextField">
                     <Required>N</Required>
                 </dns_acmedns_updateurl>
-                <dns_variomedia_key type="TextField">
+                <dns_acmeproxy_endpoint type="TextField">
+                    <Required>N</Required>
+                </dns_acmeproxy_endpoint>
+                <dns_acmeproxy_username type="TextField">
+                    <Required>N</Required>
+                </dns_acmeproxy_username>
+                <dns_acmeproxy_password type="TextField">
+                    <Required>N</Required>
+                </dns_acmeproxy_password>
+		<dns_variomedia_key type="TextField">
                     <Required>N</Required>
                 </dns_variomedia_key>
                 <dns_schlundtech_user type="TextField">
diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
index 9abdd32e8..d297b4ade 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -653,7 +653,12 @@ function run_acme_validation($certObj, $valObj, $acctObj)
                 $proc_env['ACMEDNS_SUBDOMAIN'] = (string)$valObj->dns_acmedns_subdomain;
                 $proc_env['ACMEDNS_UPDATE_URL'] = (string)$valObj->dns_acmedns_updateurl;
                 break;
-            case 'dns_ad':
+            case 'dns_acmeproxy':
+                $proc_env['ACMEPROXY_ENDPOINT'] = (string)$valObj->dns_acmeproxy_endpoint;
+                $proc_env['ACMEPROXY_USERNAME'] = (string)$valObj->dns_acmeproxy_username;
+                $proc_env['ACMEPROXY_PASSWORD'] = (string)$valObj->dns_acmeproxy_password;
+                break;
+	    case 'dns_ad':
                 $proc_env['AD_API_KEY'] = (string)$valObj->dns_ad_key;
                 break;
             case 'dns_ali':

From ce5c6be647bc171fffa65c03b50b28650f656f6c Mon Sep 17 00:00:00 2001
From: Maarten den Braber <m@mdbraber.com>
Date: Sat, 16 May 2020 23:38:14 +0200
Subject: [PATCH 2/3] Fix formatting issue

---
 .../src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
index d297b4ade..e5a2657ff 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -658,7 +658,7 @@ function run_acme_validation($certObj, $valObj, $acctObj)
                 $proc_env['ACMEPROXY_USERNAME'] = (string)$valObj->dns_acmeproxy_username;
                 $proc_env['ACMEPROXY_PASSWORD'] = (string)$valObj->dns_acmeproxy_password;
                 break;
-	    case 'dns_ad':
+            case 'dns_ad':
                 $proc_env['AD_API_KEY'] = (string)$valObj->dns_ad_key;
                 break;
             case 'dns_ali':

From 6628f93fc11570cb0c5b35b24651fb738bba3274 Mon Sep 17 00:00:00 2001
From: Maarten den Braber <m@mdbraber.com>
Date: Sat, 16 May 2020 23:39:28 +0200
Subject: [PATCH 3/3] Tabs to spaces

---
 .../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 3b4228b3a..e093a3494 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
@@ -857,7 +857,7 @@
                 <dns_acmeproxy_password type="TextField">
                     <Required>N</Required>
                 </dns_acmeproxy_password>
-		<dns_variomedia_key type="TextField">
+                <dns_variomedia_key type="TextField">
                     <Required>N</Required>
                 </dns_variomedia_key>
                 <dns_schlundtech_user type="TextField">