From bd87fdf7b60cd026bb25b0fe710dd479703be8f4 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 16 Apr 2018 23:22:04 +0200
Subject: [PATCH 1/2] security/acme-client: add support for ClouDNS, closes
 #574

---
 .../AcmeClient/forms/dialogValidation.xml     | 20 +++++++++++++++++++
 .../models/OPNsense/AcmeClient/AcmeClient.xml | 10 ++++++++++
 .../OPNsense/AcmeClient/certhelper.php        |  5 +++++
 3 files changed, 35 insertions(+)

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 692fa72d2..f4245fb18 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
@@ -149,6 +149,26 @@
         <label>CF Key</label>
         <type>text</type>
     </field>
+    <field>
+        <label>ClouDNS</label>
+        <type>header</type>
+        <style>table_dns table_dns_cloudns</style>
+    </field>
+    <field>
+        <id>validation.dns_cloudns_auth_id</id>
+        <label>Auth ID</label>
+        <type>text</type>
+    </field>
+    <field>
+        <id>validation.dns_cloudns_sub_auth_id</id>
+        <label>Sub Auth ID</label>
+        <type>text</type>
+    </field>
+    <field>
+        <id>validation.dns_cloudns_auth_password</id>
+        <label>Auth Password</label>
+        <type>text</type>
+    </field>
     <field>
         <label>CloudXNS</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 f179a0fd7..650914bd8 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
@@ -331,6 +331,7 @@
                         <dns_ali>aliyun.com API</dns_ali>
                         <dns_aws>AWS Route 53</dns_aws>
                         <dns_cf>CloudFlare.com API</dns_cf>
+                        <dns_cloudns>ClouDNS API</dns_cloudns>
                         <dns_cx>CloudXNS.com API</dns_cx>
                         <dns_cyon>cyon.ch API</dns_cyon>
                         <dns_dgon>DigitalOcean API</dns_dgon>
@@ -387,6 +388,15 @@
                 <dns_cf_key type="TextField">
                     <Required>N</Required>
                 </dns_cf_key>
+                <dns_cloudns_auth_id type="TextField">
+                    <Required>N</Required>
+                </dns_cloudns_auth_id>
+                <dns_cloudns_sub_auth_id type="TextField">
+                    <Required>N</Required>
+                </dns_cloudns_sub_auth_id>
+                <dns_cloudns_auth_password type="TextField">
+                    <Required>N</Required>
+                </dns_cloudns_auth_password>
                 <dns_cx_key type="TextField">
                     <Required>N</Required>
                 </dns_cx_key>
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 4485350a1..7dab7c2a8 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -603,6 +603,11 @@ function run_acme_validation($certObj, $valObj, $acctObj)
                 $proc_env['CF_Key'] = (string)$valObj->dns_cf_key;
                 $proc_env['CF_Email'] = (string)$valObj->dns_cf_email;
                 break;
+            case 'dns_cloudns':
+                $proc_env['CLOUDNS_AUTH_ID'] = (string)$valObj->dns_cloudns_auth_id;
+                $proc_env['CLOUDNS_SUB_AUTH_ID'] = (string)$valObj->dns_cloudns_sub_auth_id;
+                $proc_env['CLOUDNS_AUTH_PASSWORD'] = (string)$valObj->dns_cloudns_auth_password;
+                break;
             case 'dns_cx':
                 $proc_env['CX_Key'] = (string)$valObj->dns_cx_key;
                 $proc_env['CX_Secret'] = (string)$valObj->dns_cx_secret;

From 62446ff3379576bc98ed7392515654073b6a9378 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 16 Apr 2018 23:25:21 +0200
Subject: [PATCH 2/2] security/acme-client: bump version

---
 security/acme-client/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile
index eaca2e5f6..27fae6158 100644
--- a/security/acme-client/Makefile
+++ b/security/acme-client/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		acme-client
-PLUGIN_VERSION=		1.13
+PLUGIN_VERSION=		1.14
 PLUGIN_COMMENT=		Let's Encrypt client
 PLUGIN_MAINTAINER=	opnsense@moov.de
 PLUGIN_DEPENDS=		acme.sh bind911