netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

security/acme-client: avoid including interfaces.inc in MVC, use proper function/flow

Browse Source
This commit is contained in:
Franco Fichtner
2023-09-18 10:28:01 +02:00
parent 3cbf6f1fbf
commit 834a0dfa55
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/acme-client/Makefile
+1
View File
@@ -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
security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/HttpOpnsense.php
+4 -5
View File
@@ -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'];
}
}
security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/TlsalpnAcme.php
+4 -5
View File
@@ -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'];
}
}