From edf3633b9467ea83b17bb8b0d3bf4a33e212a5b3 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 14 Apr 2020 22:08:42 +0200 Subject: [PATCH 1/4] securiy/acme-client: add support for SchlundTech, closes #1728 --- .../AcmeClient/forms/dialogValidation.xml | 15 +++++++++++++ .../models/OPNsense/AcmeClient/AcmeClient.xml | 21 ++++++++++++------- .../OPNsense/AcmeClient/certhelper.php | 4 ++++ 3 files changed, 33 insertions(+), 7 deletions(-) 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 b0f82aada..4174763c9 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 @@ -1019,4 +1019,19 @@ password You need to obtain your API key from variomedia's customer support. + + + header + + + + validation.dns_schlundtech_user + + text + + + validation.dns_schlundtech_password + + 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 052bdd530..6e2c50041 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 @@ -405,6 +405,7 @@ OVH, kimsufi, soyoustart and runabove API PowerDNS.com API Plesk XML API + SchlundTech selectel.com / selectel.ru domain API Servercow API v1 UnoEuro API @@ -827,26 +828,32 @@ N - N + N - N + N - N + N - N + N - N + N - N + N - N + N + + N + + + N + 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 9101fd639..d6704a42e 100755 --- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php +++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php @@ -909,6 +909,10 @@ function run_acme_validation($certObj, $valObj, $acctObj) $proc_env['pleskxml_pass'] = (string)$valObj->dns_pleskxml_pass; $proc_env['pleskxml_uri'] = (string)$valObj->dns_pleskxml_uri; break; + case 'dns_schlundtech': + $proc_env['SCHLUNDTECH_USER'] = (string)$valObj->dns_schlundtech_user; + $proc_env['SCHLUNDTECH_PASSWORD'] = (string)$valObj->dns_schlundtech_password; + break; case 'dns_selectel': $proc_env['SL_Key'] = (string)$valObj->dns_sl_key; break; From b539d1ff7546b06ad57358a0ccda9f4ad8038d03 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 14 Apr 2020 22:20:46 +0200 Subject: [PATCH 2/4] securiy/acme-client: add support for EUserv, closes #1779 --- .../AcmeClient/forms/dialogValidation.xml | 15 +++++++++++++++ .../app/models/OPNsense/AcmeClient/AcmeClient.xml | 7 +++++++ .../scripts/OPNsense/AcmeClient/certhelper.php | 4 ++++ 3 files changed, 26 insertions(+) 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 4174763c9..a037b8e00 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 @@ -1034,4 +1034,19 @@ password + + + header + + + + validation.dns_euserv_user + + text + + + validation.dns_euserv_password + + 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 6e2c50041..bb1fb209a 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 @@ -378,6 +378,7 @@ DuckDNS API Dyn Managed DNS API Dynu API + EUserv FreeDNS API Gandi LiveDNS API GoDaddy.com API @@ -854,6 +855,12 @@ N + + N + + + N + 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 d6704a42e..eeb35243a 100755 --- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php +++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php @@ -732,6 +732,10 @@ function run_acme_validation($certObj, $valObj, $acctObj) $proc_env['Dynu_ClientId'] = (string)$valObj->dns_dynu_clientid; $proc_env['Dynu_Secret'] = (string)$valObj->dns_dynu_secret; break; + case 'dns_euserv': + $proc_env['EUSERV_Username'] = (string)$valObj->dns_euserv_user; + $proc_env['EUSERV_Password'] = (string)$valObj->dns_euserv_password; + break; case 'dns_freedns': $proc_env['FREEDNS_User'] = (string)$valObj->dns_freedns_user; $proc_env['FREEDNS_Password'] = (string)$valObj->dns_freedns_password; From 83ae82d92926721ca4009e30e65202c430fadaea Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 14 Apr 2020 22:28:34 +0200 Subject: [PATCH 3/4] securiy/acme-client: add support for Leaseweb, closes #1670 --- .../OPNsense/AcmeClient/forms/dialogValidation.xml | 10 ++++++++++ .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml | 4 ++++ .../scripts/OPNsense/AcmeClient/certhelper.php | 3 +++ 3 files changed, 17 insertions(+) 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 a037b8e00..3b2f618ef 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 @@ -1049,4 +1049,14 @@ password + + + header + + + + validation.dns_leaseweb_key + + 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 bb1fb209a..3ac271910 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 @@ -391,6 +391,7 @@ ISPConfig 3.1+ API KingHost DNS API Knot (knsupdate) DNS API + LeaseWeb API lexicon DNS API Linode API Loopia API @@ -861,6 +862,9 @@ N + + N + 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 eeb35243a..f9a648ee5 100755 --- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php +++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php @@ -817,6 +817,9 @@ function run_acme_validation($certObj, $valObj, $acctObj) $proc_env['KNOT_SERVER'] = (string)$valObj->dns_knot_server; $proc_env['KNOT_KEY'] = (string)$valObj->dns_knot_key; break; + case 'dns_leaseweb': + $proc_env['LSW_Key'] = (string)$valObj->dns_leaseweb_key; + break; case 'dns_lexicon': $proc_env['PROVIDER'] = (string)$valObj->dns_lexicon_provider; $proc_env['LEXICON_' . strtoupper($proc_env['PROVIDER']) . '_USERNAME'] = (string)$valObj->dns_lexicon_user; From 0b835f251088d8376af1330356aad4d4864b7e37 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 14 Apr 2020 22:34:55 +0200 Subject: [PATCH 4/4] securiy/acme-client: bump version --- security/acme-client/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile index b7b4b5cf0..32c1cd94f 100644 --- a/security/acme-client/Makefile +++ b/security/acme-client/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= acme-client -PLUGIN_VERSION= 1.30 +PLUGIN_VERSION= 1.31 PLUGIN_COMMENT= Let's Encrypt client PLUGIN_MAINTAINER= opnsense@moov.de PLUGIN_DEPENDS= acme.sh py${PLUGIN_PYTHON}-dns-lexicon