From 74d625633bba00495969984190cf59be9b3666dd Mon Sep 17 00:00:00 2001
From: Jan Winkler <jan.winkler@markt.de>
Date: Mon, 8 Aug 2022 11:46:06 +0200
Subject: [PATCH 1/3] acme-client: Add Mythic Beasts API for challenge types

---
 .../AcmeClient/forms/dialogValidation.xml     | 15 +++++++
 .../LeValidation/DnsMythicbeasts.php          | 45 +++++++++++++++++++
 .../models/OPNsense/AcmeClient/AcmeClient.xml |  7 +++
 3 files changed, 67 insertions(+)
 create mode 100644 security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicbeasts.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 0d5997740..c92b00098 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
@@ -818,6 +818,21 @@
         <type>text</type>
         <help>MailinaBox Server FQDN</help>
     </field>
+    <field>
+        <label>Mythic Beasts</label>
+        <type>header</type>
+        <style>table_dns table_dns_mythic_beasts</style>
+    </field>
+    <field>
+        <id>validation.dns_mythic_beasts_key</id>
+        <label>Key</label>
+        <type>text</type>
+    </field>
+    <field>
+        <id>validation.dns_mythic_beasts_secret</id>
+        <label>Secret</label>
+        <type>text</type>
+    </field>
     <field>
         <label>Namecheap</label>
         <type>header</type>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicbeasts.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicbeasts.php
new file mode 100644
index 000000000..dc1a4d705
--- /dev/null
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicbeasts.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * Copyright (C) 2022 Jan Winkler
+ * 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;
+
+/**
+ * Mythic Beasts API
+ * @package OPNsense\AcmeClient
+ */
+class DnsMythicbeasts extends Base implements LeValidationInterface
+{
+    public function prepare()
+    {
+        $this->acme_env['MB_AK'] = (string)$this->config->dns_mythic_beasts_key;
+        $this->acme_env['MB_AS'] = (string)$this->config->dns_mythic_beasts_secret;
+    }
+}
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 8796d1a5e..6cbe74fe8 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
@@ -473,6 +473,7 @@
                         <dns_loopia>Loopia</dns_loopia>
                         <dns_lua>LuaDNS.com</dns_lua>
                         <dns_miab>MailinaBox</dns_miab>
+                        <dns_mythic_beasts>Mythic Beasts</dns_mythic_beasts>
                         <dns_namecom>Name.com</dns_namecom>
                         <dns_namecheap>Namecheap</dns_namecheap>
                         <dns_namesilo>Namesilo.com</dns_namesilo>
@@ -832,6 +833,12 @@
                 <dns_me_secret type="TextField">
                     <Required>N</Required>
                 </dns_me_secret>
+                <dns_mythic_beasts_key type="TextField">
+                    <Required>N</Required>
+                </dns_mythic_beasts_key>
+                <dns_mythic_beasts_secret type="TextField">
+                    <Required>N</Required>
+                </dns_mythic_beasts_secret>
                 <dns_namecheap_user type="TextField">
                     <Required>N</Required>
                 </dns_namecheap_user>

From 733f91870fed8ca397279eaac5a7303d4dc50108 Mon Sep 17 00:00:00 2001
From: Jan Winkler <jan.winkler@markt.de>
Date: Tue, 9 Aug 2022 12:26:43 +0200
Subject: [PATCH 2/3] security/acme-client: bump version

---
 security/acme-client/Makefile  | 2 +-
 security/acme-client/pkg-descr | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile
index 86944b5d6..ad0e59696 100644
--- a/security/acme-client/Makefile
+++ b/security/acme-client/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		acme-client
-PLUGIN_VERSION=		3.12
+PLUGIN_VERSION=		3.13
 PLUGIN_COMMENT=		ACME Client
 PLUGIN_MAINTAINER=	opnsense@moov.de
 PLUGIN_DEPENDS=		acme.sh py${PLUGIN_PYTHON}-dns-lexicon
diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index 6384141a6..6ce18d780 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -8,6 +8,11 @@ WWW: https://github.com/acmesh-official/acme.sh
 Plugin Changelog
 ================
 
+3.13
+
+Added:
+* add Mythic Beasts DNS API (#2998)
+
 3.12
 
 Added:

From 1aa3646820a32be84b1cabd0fb945de9e3883deb Mon Sep 17 00:00:00 2001
From: Jan Winkler <jan.winkler@markt.de>
Date: Tue, 9 Aug 2022 12:41:48 +0200
Subject: [PATCH 3/3] acme-client: Adjust file and class name for Mythic Beasts
 challenge types

---
 .../LeValidation/{DnsMythicbeasts.php => DnsMythicBeasts.php}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/{DnsMythicbeasts.php => DnsMythicBeasts.php} (96%)

diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicbeasts.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicBeasts.php
similarity index 96%
rename from security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicbeasts.php
rename to security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicBeasts.php
index dc1a4d705..f61b4fa68 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicbeasts.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsMythicBeasts.php
@@ -35,7 +35,7 @@ use OPNsense\Core\Config;
  * Mythic Beasts API
  * @package OPNsense\AcmeClient
  */
-class DnsMythicbeasts extends Base implements LeValidationInterface
+class DnsMythicBeasts extends Base implements LeValidationInterface
 {
     public function prepare()
     {