From 8e55bd608f5e21aa8531148609dd41c8ed0e9694 Mon Sep 17 00:00:00 2001
From: peterv99 <opnsense@peter-vos.net>
Date: Fri, 3 Jan 2025 11:47:15 +0100
Subject: [PATCH 1/2] Add support for mijn.host DNS challenge.

---
 .../AcmeClient/forms/dialogValidation.xml     | 10 +++++
 .../AcmeClient/LeValidation/DnsMijnHost.php   | 44 +++++++++++++++++++
 .../models/OPNsense/AcmeClient/AcmeClient.xml |  4 ++
 3 files changed, 58 insertions(+)
 create mode 100644 security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnHost.php

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 702aa67c94..48f0547b1a 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
@@ -1924,4 +1924,14 @@
         <label>Token</label>
         <type>password</type>
     </field>
+    <field>
+        <label>mijn.host</label>
+        <type>header</type>
+        <style>table_dns table_dns_mijnhost</style>
+    </field>
+    <field>
+        <id>validation.dns_mijnhost_api_key</id>
+        <label>API Key</label>
+        <type>text</type>
+    </field>
 </form>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnHost.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnHost.php
new file mode 100644
index 0000000000..64a63056f1
--- /dev/null
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnHost.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * Copyright (C) 2022 Nikolaj Brinch Jørgensen
+ * 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;
+
+/**
+ * mijn.hosty DNS API
+ * @package OPNsense\AcmeClient
+ */
+class DnsMijnHost extends Base implements LeValidationInterface
+{
+    public function prepare()
+    {
+        $this->acme_env['MIJNHOST_API_KEY'] = (string)$this->config->dns_mijnhost_api_key;
+    }
+}
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 ab94015e5e..f060d56fc2 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
@@ -529,6 +529,7 @@
                         <dns_zilore>Zilore</dns_zilore>
                         <dns_zone>Zone.eu</dns_zone>
                         <dns_zonomi>zonomi.com</dns_zonomi>
+                        <dns_mijnhost>mijn.host</dns_mijnhost>
                     </OptionValues>
                 </dns_service>
                 <dns_sleep type="IntegerField">
@@ -1307,6 +1308,9 @@
                 <dns_rage4_user type="TextField">
                     <Required>N</Required>
                 </dns_rage4_user>
+                <dns_mijnhost_api_key type="TextField">
+                    <Required>N</Required>
+                </dns_mijnhost_api_key>
             </validation>
         </validations>
         <actions>

From f0d57605b035876a69198243162076af66983e3f Mon Sep 17 00:00:00 2001
From: peterv99 <opnsense@peter-vos.net>
Date: Mon, 6 Jan 2025 16:53:00 +0100
Subject: [PATCH 2/2] As requested in review - alphabetic order maintained in
 security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
 - file renamed - Class renamed to DnsMijnhost and copyright corrected in
 security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml

---
 .../OPNsense/AcmeClient/forms/dialogValidation.xml          | 1 +
 .../LeValidation/{DnsMijnHost.php => DnsMijnhost.php}       | 6 +++---
 .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/{DnsMijnHost.php => DnsMijnhost.php} (92%)

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 48f0547b1a..0455fc474a 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
@@ -1933,5 +1933,6 @@
         <id>validation.dns_mijnhost_api_key</id>
         <label>API Key</label>
         <type>text</type>
+        <help><![CDATA[Please refer to the <a href="https://mijn.host/api/doc/">API documentation</a> for further information.]]></help>
     </field>
 </form>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnHost.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnhost.php
similarity index 92%
rename from security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnHost.php
rename to security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnhost.php
index 64a63056f1..f077995c25 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnHost.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMijnhost.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2022 Nikolaj Brinch Jørgensen
+ * Copyright (C) 2025 Peter Vos
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,10 +32,10 @@
 use OPNsense\Core\Config;
 
 /**
- * mijn.hosty DNS API
+ * mijn.host DNS API
  * @package OPNsense\AcmeClient
  */
-class DnsMijnHost extends Base implements LeValidationInterface
+class DnsMijnhost extends Base implements LeValidationInterface
 {
     public function prepare()
     {
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 f060d56fc2..3ff262661c 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
@@ -491,6 +491,7 @@
                         <dns_loopia>Loopia</dns_loopia>
                         <dns_lua>LuaDNS.com</dns_lua>
                         <dns_miab>MailinaBox</dns_miab>
+                        <dns_mijnhost>mijn.host</dns_mijnhost>
                         <dns_mydnsjp>MyDNS.JP</dns_mydnsjp>
                         <dns_mythic_beasts>Mythic Beasts</dns_mythic_beasts>
                         <dns_namecom>Name.com</dns_namecom>
@@ -529,7 +530,6 @@
                         <dns_zilore>Zilore</dns_zilore>
                         <dns_zone>Zone.eu</dns_zone>
                         <dns_zonomi>zonomi.com</dns_zonomi>
-                        <dns_mijnhost>mijn.host</dns_mijnhost>
                     </OptionValues>
                 </dns_service>
                 <dns_sleep type="IntegerField">