From 861b663b0af721e50dbef22a214dc008c81c1b09 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Thu, 26 Dec 2019 23:48:28 +0100
Subject: [PATCH] security/acme-client: more CloudFlare tweaks, refs #1625

---
 .../controllers/OPNsense/AcmeClient/forms/dialogValidation.xml | 2 ++
 .../src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 ac590676f..daa521199 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
@@ -187,6 +187,7 @@
     <field>
         <label>Global API Key</label>
         <type>header</type>
+        <style>table_dns table_dns_cf</style>
     </field>
     <field>
         <id>validation.dns_cf_email</id>
@@ -202,6 +203,7 @@
     <field>
         <label>Restricted API Token</label>
         <type>header</type>
+        <style>table_dns table_dns_cf</style>
     </field>
     <field>
         <id>validation.dns_cf_account_id</id>
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 1eea44c36..539ea68ce 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -652,9 +652,10 @@ function run_acme_validation($certObj, $valObj, $acctObj)
                 $proc_env['AZUREDNS_CLIENTSECRET'] = (string)$valObj->dns_azuredns_clientsecret;
                 break;
             case 'dns_cf':
+                // Global API key (insecure)
                 $proc_env['CF_Key'] = (string)$valObj->dns_cf_key;
                 $proc_env['CF_Email'] = (string)$valObj->dns_cf_email;
-                // FIXME Only one auth method should be present in ENV
+                // Restricted API token (recommended)
                 $proc_env['CF_Token'] = (string)$valObj->dns_cf_token;
                 $proc_env['CF_Account_ID'] = (string)$valObj->dns_cf_account_id;
                 break;