From 834a0dfa55fb608e6126c1536db8a9070227154a Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 18 Sep 2023 10:28:01 +0200 Subject: [PATCH] security/acme-client: avoid including interfaces.inc in MVC, use proper function/flow --- security/acme-client/Makefile | 1 + .../OPNsense/AcmeClient/LeValidation/HttpOpnsense.php | 9 ++++----- .../OPNsense/AcmeClient/LeValidation/TlsalpnAcme.php | 9 ++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile index 00a0327de..1f3eaf6ce 100644 --- a/security/acme-client/Makefile +++ b/security/acme-client/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= acme-client PLUGIN_VERSION= 3.19 +PLUGIN_REVISION= 1 PLUGIN_COMMENT= ACME Client PLUGIN_MAINTAINER= opnsense@moov.de PLUGIN_DEPENDS= acme.sh py${PLUGIN_PYTHON}-dns-lexicon diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/HttpOpnsense.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/HttpOpnsense.php index 3b2d7a3c9..c7a1672e3 100644 --- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/HttpOpnsense.php +++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/HttpOpnsense.php @@ -28,8 +28,6 @@ namespace OPNsense\AcmeClient\LeValidation; -require_once("interfaces.inc"); - use OPNsense\AcmeClient\LeValidationInterface; use OPNsense\AcmeClient\LeUtils; use OPNsense\Core\Config; @@ -74,9 +72,10 @@ class HttpOpnsense extends Base implements LeValidationInterface // Add IP address from chosen interface if (!empty((string)$this->config->http_opn_interface)) { - $interface_ip = get_interface_ip((string)$this->config->http_opn_interface); - if (!empty($interface_ip)) { - $iplist[] = $interface_ip; + $backend = new \OPNsense\Core\Backend(); + $response = $backend->configdpRun('interface address', [(string)$this->config->http_opn_interface]); + if (!empty($response['address'])) { + $iplist[] = $response['address']; } } diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/TlsalpnAcme.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/TlsalpnAcme.php index db8466892..f849ffd40 100644 --- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/TlsalpnAcme.php +++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/TlsalpnAcme.php @@ -28,8 +28,6 @@ namespace OPNsense\AcmeClient\LeValidation; -require_once("interfaces.inc"); - use OPNsense\AcmeClient\LeValidationInterface; use OPNsense\AcmeClient\LeUtils; use OPNsense\Core\Config; @@ -75,9 +73,10 @@ class TlsalpnAcme extends Base implements LeValidationInterface // Add IP address from chosen interface if (!empty((string)$this->config->tlsalpn_acme_interface)) { - $interface_ip = get_interface_ip((string)$this->config->tlsalpn_acme_interface); - if (!empty($interface_ip)) { - $iplist[] = $interface_ip; + $backend = new \OPNsense\Core\Backend(); + $response = $backend->configdpRun('interface address', [(string)$this->config->tlsalpn_acme_interface]); + if (!empty($response['address'])) { + $iplist[] = $response['address']; } }