From 0a3e429f5e662b0fd5d3df7d05458955a42333fc Mon Sep 17 00:00:00 2001
From: TuEye <tueye@freenet.de>
Date: Sun, 9 Dec 2018 16:25:25 +0100
Subject: [PATCH 1/4] Add support for ACME DNS

---
 .../AcmeClient/forms/dialogValidation.xml     | 26 +++++++++++++++++++
 .../models/OPNsense/AcmeClient/AcmeClient.xml | 15 ++++++++++-
 .../OPNsense/AcmeClient/certhelper.php        |  8 +++++-
 3 files changed, 47 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 e07d394ca..b7b664733 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
@@ -750,4 +750,30 @@
         <label>API Key</label>
         <type>text</type>
     </field>
+	<field>
+        <label>ACME DNS</label>
+        <type>header</type>
+        <style>table_dns table_dns_acmedns</style>
+	</field>
+    <field>
+        <id>validation.dns_acmedns_user</id>
+        <label>User</label>
+        <type>text</type>
+    </field>
+    <field>
+        <id>validation.dns_acmedns_password</id>
+        <label>Password</label>
+        <type>password</type>
+    </field>
+    <field>
+        <id>validation.dns_acmedns_subdomain</id>
+        <label>Subdomain</label>
+        <type>text</type>
+    </field>
+    <field>
+        <id>validation.dns_acmedns_updateurl</id>
+        <label>Update URL</label>
+        <type>text</type>
+		<help>Specify the custom ACME DNS Update URL, i.e. https://auth.acme-dns.io/update (optional)</help>
+    </field> 
 </form>
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 f3a6dd373..e40b3cea4 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
@@ -383,6 +383,7 @@
                         <dns_yandex>Yandex PDD API</dns_yandex>
                         <dns_zilore>Zilore DNS API</dns_zilore>
                         <dns_zonomi>zonomi.com domain API</dns_zonomi>
+						<dns_acmedns>ACME DNS API</dns_acmedns>
                     </OptionValues>
                 </dns_service>
                 <dns_sleep type="IntegerField">
@@ -654,7 +655,19 @@
                 </dns_zilore_key>
                 <dns_zm_key type="TextField">
                     <Required>N</Required>
-                </dns_zm_key>
+                </dns_zm_key>	
+				<dns_acmedns_user type="TextField">
+                   <Required>N</Required>
+                </dns_acmedns_user>
+                <dns_acmedns_password type="TextField">
+                   <Required>N</Required>
+                </dns_acmedns_password>
+				<dns_acmedns_subdomain type="TextField">
+                   <Required>N</Required>
+                </dns_acmedns_subdomain>
+				<dns_acmedns_updateurl type="TextField">
+                   <Required>N</Required>
+                </dns_acmedns_updateurl>
             </validation>
         </validations>
         <actions>
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 ba27fb519..cc7d8303b 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -776,7 +776,13 @@ function run_acme_validation($certObj, $valObj, $acctObj)
                 break;
             case 'dns_zonomi':
                 $proc_env['ZM_Key'] = (string)$valObj->dns_zm_key;
-                break;
+                break;	
+			case 'dns_acmedns':
+                $proc_env['ACMEDNS_USERNAME'] = (string)$valObj->dns_acmedns_user;
+                $proc_env['ACMEDNS_PASSWORD'] = (string)$valObj->dns_acmedns_password;
+				$proc_env['ACMEDNS_SUBDOMAIN'] = (string)$valObj->dns_acmedns_subdomain;
+				$proc_env['ACMEDNS_UPDATE_URL'] = (string)$valObj->dns_acmedns_updateurl;
+				break;			
             default:
                 log_error("AcmeClient: invalid DNS-01 service specified: " . (string)$valObj->dns_service);
                 return(1);

From 4c79ea02b9c4dbad60b358160453afc74d36a955 Mon Sep 17 00:00:00 2001
From: TuEye <tueye@freenet.de>
Date: Sun, 9 Dec 2018 16:31:48 +0100
Subject: [PATCH 2/4] Add support for ACME DNS + Cleanup

---
 .../OPNsense/AcmeClient/forms/dialogValidation.xml        | 2 +-
 .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml     | 8 ++++----
 .../opnsense/scripts/OPNsense/AcmeClient/certhelper.php   | 6 +++---
 3 files changed, 8 insertions(+), 8 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 b7b664733..b23b74ca7 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
@@ -774,6 +774,6 @@
         <id>validation.dns_acmedns_updateurl</id>
         <label>Update URL</label>
         <type>text</type>
-		<help>Specify the custom ACME DNS Update URL, i.e. https://auth.acme-dns.io/update (optional)</help>
+        <help>Specify the custom ACME DNS Update URL, i.e. https://auth.acme-dns.io/update (optional)</help>
     </field> 
 </form>
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 e40b3cea4..ae32503e3 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
@@ -383,7 +383,7 @@
                         <dns_yandex>Yandex PDD API</dns_yandex>
                         <dns_zilore>Zilore DNS API</dns_zilore>
                         <dns_zonomi>zonomi.com domain API</dns_zonomi>
-						<dns_acmedns>ACME DNS API</dns_acmedns>
+                        <dns_acmedns>ACME DNS API</dns_acmedns>
                     </OptionValues>
                 </dns_service>
                 <dns_sleep type="IntegerField">
@@ -656,16 +656,16 @@
                 <dns_zm_key type="TextField">
                     <Required>N</Required>
                 </dns_zm_key>	
-				<dns_acmedns_user type="TextField">
+                    <dns_acmedns_user type="TextField">
                    <Required>N</Required>
                 </dns_acmedns_user>
                 <dns_acmedns_password type="TextField">
                    <Required>N</Required>
                 </dns_acmedns_password>
-				<dns_acmedns_subdomain type="TextField">
+                   <dns_acmedns_subdomain type="TextField">
                    <Required>N</Required>
                 </dns_acmedns_subdomain>
-				<dns_acmedns_updateurl type="TextField">
+                   <dns_acmedns_updateurl type="TextField">
                    <Required>N</Required>
                 </dns_acmedns_updateurl>
             </validation>
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 cc7d8303b..dfed6ed1e 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -777,11 +777,11 @@ function run_acme_validation($certObj, $valObj, $acctObj)
             case 'dns_zonomi':
                 $proc_env['ZM_Key'] = (string)$valObj->dns_zm_key;
                 break;	
-			case 'dns_acmedns':
+            case 'dns_acmedns':
                 $proc_env['ACMEDNS_USERNAME'] = (string)$valObj->dns_acmedns_user;
                 $proc_env['ACMEDNS_PASSWORD'] = (string)$valObj->dns_acmedns_password;
-				$proc_env['ACMEDNS_SUBDOMAIN'] = (string)$valObj->dns_acmedns_subdomain;
-				$proc_env['ACMEDNS_UPDATE_URL'] = (string)$valObj->dns_acmedns_updateurl;
+                $proc_env['ACMEDNS_SUBDOMAIN'] = (string)$valObj->dns_acmedns_subdomain;
+                $proc_env['ACMEDNS_UPDATE_URL'] = (string)$valObj->dns_acmedns_updateurl;
 				break;			
             default:
                 log_error("AcmeClient: invalid DNS-01 service specified: " . (string)$valObj->dns_service);

From b285807da28a4d49d349fccf58e917b31f336d33 Mon Sep 17 00:00:00 2001
From: TuEye <tueye@freenet.de>
Date: Sun, 9 Dec 2018 16:34:19 +0100
Subject: [PATCH 3/4] Add support for ACME DNS + Cleanup

---
 .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 ae32503e3..d0e10fd6a 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
@@ -656,16 +656,16 @@
                 <dns_zm_key type="TextField">
                     <Required>N</Required>
                 </dns_zm_key>	
-                    <dns_acmedns_user type="TextField">
+                <dns_acmedns_user type="TextField">
                    <Required>N</Required>
                 </dns_acmedns_user>
                 <dns_acmedns_password type="TextField">
                    <Required>N</Required>
                 </dns_acmedns_password>
-                   <dns_acmedns_subdomain type="TextField">
+                <dns_acmedns_subdomain type="TextField">
                    <Required>N</Required>
                 </dns_acmedns_subdomain>
-                   <dns_acmedns_updateurl type="TextField">
+                <dns_acmedns_updateurl type="TextField">
                    <Required>N</Required>
                 </dns_acmedns_updateurl>
             </validation>

From a19baf62e7aa9c47e32af0003a4dd6a2f2fe8c70 Mon Sep 17 00:00:00 2001
From: TuEye <tueye@freenet.de>
Date: Sun, 9 Dec 2018 16:42:24 +0100
Subject: [PATCH 4/4] Add Support for ACME DNS + Cleanup

---
 .../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 dfed6ed1e..18a39060f 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -782,7 +782,7 @@ function run_acme_validation($certObj, $valObj, $acctObj)
                 $proc_env['ACMEDNS_PASSWORD'] = (string)$valObj->dns_acmedns_password;
                 $proc_env['ACMEDNS_SUBDOMAIN'] = (string)$valObj->dns_acmedns_subdomain;
                 $proc_env['ACMEDNS_UPDATE_URL'] = (string)$valObj->dns_acmedns_updateurl;
-				break;			
+                break;			
             default:
                 log_error("AcmeClient: invalid DNS-01 service specified: " . (string)$valObj->dns_service);
                 return(1);