From e197ce3b3af2931d67a7b7b01e993bb3a0741b7a Mon Sep 17 00:00:00 2001
From: Jeremy Gutierrez <Jeremy.gutierrez@markt.de>
Date: Tue, 2 May 2023 15:06:55 +0200
Subject: [PATCH] security/acme: Add DNS.Services API for dns challenge type,
 closes #3399

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

diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index f00176d56..b38dd12cc 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -7,6 +7,10 @@ WWW: https://github.com/acmesh-official/acme.sh
 
 Plugin Changelog
 ================
+3.17
+
+Added:
+* add DNS.net DNS API (#3399)
 
 3.16
 
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 8317542bd..6c0fe2666 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
@@ -367,6 +367,21 @@
         <type>text</type>
         <help>Note that this is the account token not the user token.</help>
     </field>
+    <field>
+        <label>DNS.Services</label>
+        <type>header</type>
+        <style>table_dns table_dns_dnsservices</style>
+    </field>
+    <field>
+        <id>validation.dns_dnsservices_user</id>
+        <label>User</label>
+        <type>text</type>
+    </field>
+    <field>
+        <id>validation.dns_dnsservices_password</id>
+        <label>Password</label>
+        <type>password</type>
+    </field>
     <field>
         <label>Domain-Offensive LetsEncrypt</label>
         <type>header</type>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsDnsservices.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsDnsservices.php
new file mode 100644
index 000000000..b0ffed203
--- /dev/null
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsDnsservices.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * Copyright (C) 2023 Jeremy Gutierrez
+ * 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;
+
+/**
+ * DNS.Services API
+ * @package OPNsense\AcmeClient
+ */
+class DnsDnsservices extends Base implements LeValidationInterface
+{
+    public function prepare()
+    {
+        $this->acme_env['DnsServices_Username'] = (string)$this->config->dns_dnsservices_user;
+        $this->acme_env['DnsServices_Password'] = (string)$this->config->dns_dnsservices_password;
+    }
+}
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 aa86eb9e6..6c92b6a75 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
@@ -440,6 +440,7 @@
                         <dns_dgon>DigitalOcean</dns_dgon>
                         <dns_da>DirectAdmin</dns_da>
                         <dns_dnsimple>DNSimple</dns_dnsimple>
+                        <dns_dnsservices>DNS.Services</dns_dnsservices>
                         <dns_domeneshop>Domeneshop</dns_domeneshop>
                         <dns_me>DNSMadeEasy.com</dns_me>
                         <dns_dp>DNSPod.cn</dns_dp>
@@ -606,6 +607,12 @@
                 <dns_dnsimple_token type="TextField">
                     <Required>N</Required>
                 </dns_dnsimple_token>
+                <dns_dnsservices_user type="TextField">
+                    <Required>N</Required>
+                </dns_dnsservices_user>
+                <dns_dnsservices_password type="TextField">
+                    <Required>N</Required>
+                </dns_dnsservices_password>
                 <dns_doapi_token type="TextField">
                     <Required>N</Required>
                 </dns_doapi_token>