From 2689644b739474af57b76fc1da0f58d218e18ff2 Mon Sep 17 00:00:00 2001 From: kulikov-a <36099472+kulikov-a@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:04:30 +0300 Subject: [PATCH] http/tlsapln libs typos json_decode backend response before use; strict type --- .../OPNsense/AcmeClient/LeValidation/HttpOpnsense.php | 8 ++++---- .../OPNsense/AcmeClient/LeValidation/TlsalpnAcme.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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 c7a1672e3..7c133f44b 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 @@ -50,7 +50,7 @@ class HttpOpnsense extends Base implements LeValidationInterface $iplist = array(); // Add IP addresses from auto-discovery feature - if ($this->config->http_opn_autodiscovery == 1) { + if ($this->config->http_opn_autodiscovery == '1') { $dnslist = explode(',', $this->cert_altnames); $dnslist[] = $this->cert_name; foreach ($dnslist as $fqdn) { @@ -73,9 +73,9 @@ class HttpOpnsense extends Base implements LeValidationInterface // Add IP address from chosen interface if (!empty((string)$this->config->http_opn_interface)) { $backend = new \OPNsense\Core\Backend(); - $response = $backend->configdpRun('interface address', [(string)$this->config->http_opn_interface]); - if (!empty($response['address'])) { - $iplist[] = $response['address']; + $response = json_decode($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 f849ffd40..d0fbbfd9c 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 @@ -51,7 +51,7 @@ class TlsalpnAcme extends Base implements LeValidationInterface $iplist = array(); // Add IP addresses from auto-discovery feature - if ($this->config->tlsalpn_acme_autodiscovery == 1) { + if ($this->config->tlsalpn_acme_autodiscovery == '1') { $dnslist = explode(',', $this->cert_altnames); $dnslist[] = $this->cert_name; foreach ($dnslist as $fqdn) { @@ -74,9 +74,9 @@ class TlsalpnAcme extends Base implements LeValidationInterface // Add IP address from chosen interface if (!empty((string)$this->config->tlsalpn_acme_interface)) { $backend = new \OPNsense\Core\Backend(); - $response = $backend->configdpRun('interface address', [(string)$this->config->tlsalpn_acme_interface]); - if (!empty($response['address'])) { - $iplist[] = $response['address']; + $response = json_decode($backend->configdpRun('interface address', [(string)$this->config->tlsalpn_acme_interface])); + if (!empty($response->address)) { + $iplist[] = $response->address; } }