From a087b1a135cf1298e934ab1947b95dab017ac258 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sat, 30 Dec 2023 17:10:48 +0100
Subject: [PATCH] security/acme-client: fix 2FA support in Synology deployhook,
 closes #3627

---
 security/acme-client/pkg-descr                              | 3 +++
 .../controllers/OPNsense/AcmeClient/forms/dialogAction.xml  | 6 ++++++
 .../OPNsense/AcmeClient/LeAutomation/AcmeSynologyDsm.php    | 5 ++++-
 .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml       | 5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index a9b8d6429..422324153 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -15,6 +15,9 @@ Added:
 * add support for DNSExit
 * add World4You DNS API (#3722)
 
+Fixed:
+* fix 2FA support in Synology deployhook (#3627)
+
 Removed:
 * remove automation: Highwinds CDN (#3626)
 
diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAction.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAction.xml
index c05efa983..5fa9e700d 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAction.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAction.xml
@@ -219,6 +219,12 @@
         <type>text</type>
         <help>If Synology DSM has OTP enabled, then the device ID has to be provided so that no OTP is required when running the automation.</help>
     </field>
+    <field>
+        <id>action.acme_synology_dsm_devicename</id>
+        <label>Device Name</label>
+        <type>text</type>
+        <help>If Synology DSM has OTP enabled, then the device name has to be provided so that no OTP is required when running the automation.</help>
+    </field>
     <field>
         <id>action.acme_synology_dsm_create</id>
         <label>Create certificates</label>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/AcmeSynologyDsm.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/AcmeSynologyDsm.php
index c1fb58a0a..3194f5745 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/AcmeSynologyDsm.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/AcmeSynologyDsm.php
@@ -48,7 +48,10 @@ class AcmeSynologyDsm extends Base implements LeAutomationInterface
             $this->acme_env['SYNO_Create'] = (string)$this->config->acme_synology_dsm_create;
         }
         if (!empty((string)$this->config->acme_synology_dsm_deviceid)) {
-            $this->acme_env['SYNO_DID'] = (string)$this->config->acme_synology_dsm_deviceid;
+            $this->acme_env['SYNO_Device_ID'] = (string)$this->config->acme_synology_dsm_deviceid;
+        }
+        if (!empty((string)$this->config->acme_synology_dsm_devicename)) {
+            $this->acme_env['SYNO_Device_Name'] = (string)$this->config->acme_synology_dsm_devicename;
         }
         $this->acme_args[] = '--deploy-hook synology_dsm';
         return true;
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 f4f434d5e..b5339d938 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
@@ -1380,6 +1380,11 @@
                     <mask>/^.{1,1024}$/u</mask>
                     <ValidationMessage>Should be a string between 1 and 1024 characters.</ValidationMessage>
                 </acme_synology_dsm_deviceid>
+                <acme_synology_dsm_devicename type="TextField">
+                    <Required>N</Required>
+                    <mask>/^.{1,1024}$/u</mask>
+                    <ValidationMessage>Should be a string between 1 and 1024 characters.</ValidationMessage>
+                </acme_synology_dsm_devicename>
                 <acme_fritzbox_url type="TextField">
                     <Required>N</Required>
                     <mask>/^.{1,1024}$/u</mask>