From f6422ce2f66fdc14bafbfa5a24a5d2fe00ff9d39 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Mon, 8 Apr 2024 23:33:04 +0200 Subject: [PATCH 1/2] security/acme-client: fix PHP deprecation warnings, closes #3892 --- .../OPNsense/AcmeClient/Api/SettingsController.php | 4 ++-- .../models/OPNsense/AcmeClient/Migrations/M1_6_0.php | 12 ++++++------ .../models/OPNsense/AcmeClient/Migrations/M4_0_0.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php index d91f9cfd3..f631fb8bb 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php @@ -347,14 +347,14 @@ class SettingsController extends ApiMutableModelControllerBase // Link to ACME Action is currently missing: add it! if (!empty((string)$_actions)) { // Extend existing string. - $_actions .= ",${action_ref}"; + $_actions .= ",{$action_ref}"; } else { // First linked Action for this frontend. $_actions = $action_ref; } // Add modified list of linked Actions to frontend. $frontend->linkedActions = $_actions; - $this->getLogger()->error("AcmeClient: HAProxy integration: updating frontend ${_frontend}"); + $this->getLogger()->error("AcmeClient: HAProxy integration: updating frontend {$_frontend}"); // We need to write changes to config. $integration_changes = true; } diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php index f6982d236..f2718c91f 100644 --- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php +++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php @@ -44,26 +44,26 @@ class M1_6_0 extends BaseModelMigration foreach ($model->getNodeByReference('accounts.account')->iterateItems() as $account) { $account_id = (string)$account->id; $account_dir = $dir . $account_id; - $new_account_dir = "${dir}${account_id}_${env}"; + $new_account_dir = "{$dir}{$account_id}_{$env}"; // Check if account directory exists // Accounts that haven't been used yet don't need to be migrated. if (is_dir($account_dir)) { // Check if account configuration can be found. - $account_file = "${account_dir}/account.conf"; + $account_file = "{$account_dir}/account.conf"; if (is_file($account_file)) { // Parse config file and modify path information $account_conf = parse_ini_file($account_file); foreach ($account_conf as $key => $value) { switch ($key) { case 'ACCOUNT_KEY_PATH': - $account_conf[$key] = "${new_account_dir}/account.key"; + $account_conf[$key] = "{$new_account_dir}/account.key"; break; case 'ACCOUNT_JSON_PATH': - $account_conf[$key] = "${new_account_dir}/account.json"; + $account_conf[$key] = "{$new_account_dir}/account.json"; break; case 'CA_CONF': - $account_conf[$key] = "${new_account_dir}/ca.conf"; + $account_conf[$key] = "{$new_account_dir}/ca.conf"; break; } } @@ -71,7 +71,7 @@ class M1_6_0 extends BaseModelMigration // Convert array back to ini file format $new_account_conf = array(); foreach ($account_conf as $key => $value) { - $new_account_conf[] = "${key}='${value}'"; + $new_account_conf[] = "{$key}='{$value}'"; } // Write changes back to file diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M4_0_0.php b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M4_0_0.php index 2a776cbe9..51b381770 100644 --- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M4_0_0.php +++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M4_0_0.php @@ -54,7 +54,7 @@ class M4_0_0 extends BaseModelMigration // Convert array back to ini file format $new_account_conf = array(); foreach ($account_conf as $key => $value) { - $new_account_conf[] = "${key}='${value}'"; + $new_account_conf[] = "{$key}='{$value}'"; } // Write changes back to file From 0262a19125ca67c540d342cdfed3255c4618cd59 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Mon, 8 Apr 2024 23:37:26 +0200 Subject: [PATCH 2/2] security/acme-client: bump version, update changelog --- security/acme-client/Makefile | 2 +- security/acme-client/pkg-descr | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile index 3bc52eb06..b95b60012 100644 --- a/security/acme-client/Makefile +++ b/security/acme-client/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= acme-client -PLUGIN_VERSION= 4.1 +PLUGIN_VERSION= 4.2 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 537abdbc8..fb222939b 100644 --- a/security/acme-client/pkg-descr +++ b/security/acme-client/pkg-descr @@ -8,6 +8,15 @@ WWW: https://github.com/acmesh-official/acme.sh Plugin Changelog ================ +4.2 + +Added: +* add ArtFiles DNS API (#3866) +* add dnsHome DNS API (#3882) + +Fixed: +* fix PHP deprecation messages (#3892) + 4.1 Fixed: