From c9c4f8d4d8a8b84a949cdd5b907889e5d6c3c1b6 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 8 Aug 2023 13:04:35 +0200 Subject: [PATCH] net/relayd - sync with OpenBSD (#3527) * net/relayd - sync with OpenBSD (https://github.com/freebsd/freebsd-ports/commit/c9ba90c07ddc5b9f4232f831cf301fdc939303f3) * net/relayd - sync with OpenBSD [2] missing "check send" ssl as reported by @fbrendel --- net/relayd/Makefile | 2 +- .../OPNsense/Relayd/Api/StatusController.php | 12 +++--- .../OPNsense/Relayd/Migrations/M1_0_5.php | 43 +++++++++++++++++++ .../mvc/app/models/OPNsense/Relayd/Relayd.xml | 4 +- .../templates/OPNsense/Relayd/relayd.conf | 9 ++-- 5 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Migrations/M1_0_5.php diff --git a/net/relayd/Makefile b/net/relayd/Makefile index 93bb7a3fd..f82673488 100644 --- a/net/relayd/Makefile +++ b/net/relayd/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= relayd -PLUGIN_VERSION= 2.7 +PLUGIN_VERSION= 2.8 PLUGIN_DEPENDS= relayd PLUGIN_COMMENT= Relayd Load Balancer PLUGIN_MAINTAINER= frank.brendel@eurolog.com diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/StatusController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/StatusController.php index 8f1037643..879bd2211 100644 --- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/StatusController.php +++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/StatusController.php @@ -47,13 +47,13 @@ class StatusController extends ApiControllerBase */ public function sumAction($wait = 0) { - $result = array("result" => "failed"); + $result = ["result" => "failed"]; $backend = new Backend(); $relaydMdl = new Relayd(); // when $wait is set, try for max 10 seconds to receive a sensible status (wait for unknowns to resolve) $max_tries = !empty($wait) ? 10 : 1; - $output = array(); + $output = []; for ($i = 0; $i < $max_tries; $i++) { $output = explode("\n", trim($backend->configdRun('relayd summary'))); $unknowns = 0; @@ -75,8 +75,8 @@ class StatusController extends ApiControllerBase $virtualServerId = 0; $virtualServerType = ''; $tableId = 0; - $virtualserver = array(); - $rows = array(); + $virtualserver = []; + $rows = []; foreach ($output as $line) { $words = array_map('trim', explode("\t", $line)); $id = $words[0]; @@ -138,7 +138,7 @@ class StatusController extends ApiControllerBase $virtualserver['id'] = $id; $virtualserver['type'] = $type; $virtualserver['name'] = $words[2]; - $virtualserver['status'] = $words[4]; + $virtualserver['status'] = $words[4] ?? null; $objs = $relaydMdl->getObjectsByAttribute("virtualserver", "name", $virtualserver['name']); if (count($objs) > 0) { $obj = $objs[0]; @@ -200,7 +200,7 @@ class StatusController extends ApiControllerBase */ public function toggleAction($nodeType = null, $id = null, $action = null) { - $result = array("result" => "failed", "function" => "toggle"); + $result = ["result" => "failed", "function" => "toggle"]; if ($this->request->isPost()) { $this->sessionClose(); $backend = new Backend(); diff --git a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Migrations/M1_0_5.php b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Migrations/M1_0_5.php new file mode 100644 index 000000000..7c4664ae9 --- /dev/null +++ b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Migrations/M1_0_5.php @@ -0,0 +1,43 @@ +tablecheck->iterateItems() as $tablecheck) { + if ($tablecheck->type == 'ssl') { + $tablecheck->type = 'tls'; + } + } + } +} diff --git a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml index 985f0e23d..258669c37 100644 --- a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml +++ b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml @@ -1,6 +1,6 @@ //OPNsense/relayd - 1.0.4 + 1.0.5 Relayd settings @@ -113,7 +113,7 @@ ICMP TCP - SSL + TLS SEND HTTP diff --git a/net/relayd/src/opnsense/service/templates/OPNsense/Relayd/relayd.conf b/net/relayd/src/opnsense/service/templates/OPNsense/Relayd/relayd.conf index b4d3fb121..bd25e9810 100644 --- a/net/relayd/src/opnsense/service/templates/OPNsense/Relayd/relayd.conf +++ b/net/relayd/src/opnsense/service/templates/OPNsense/Relayd/relayd.conf @@ -7,7 +7,10 @@ interval {{ OPNsense.relayd.general.interval }} {% endif %} {% if helpers.exists('OPNsense.relayd.general.log') %} -log {{ OPNsense.relayd.general.log }} +log state changes +{% if OPNsense.relayd.general.log == 'all' %} +log host checks +{% endif %} {% endif %} {% if helpers.exists('OPNsense.relayd.general.prefork') %} prefork {{ OPNsense.relayd.general.prefork }} @@ -107,7 +110,7 @@ disable {% elif tablecheck.type == 'send' and tablecheck.expect is defined %} {% set _tablecheck = 'check ' ~ tablecheck.type ~ ' "' ~ tablecheck.data ~ '" expect "' ~ tablecheck.expect ~ '"' %} {% if tablecheck.ssl|default('0') == '1' %} -{% set _tablecheck = _tablecheck ~ ' ssl' %} +{% set _tablecheck = _tablecheck ~ ' tls' %} {% endif %} {% else %} {% set _tablecheck = 'check ' ~ tablecheck.type %} @@ -142,7 +145,7 @@ disable {% elif backuptablecheck.type == 'send' and backuptablecheck.expect is defined %} {% set _backuptablecheck = 'check ' ~ backuptablecheck.type ~ ' "' ~ backuptablecheck.data ~ '" expect "' ~ backuptablecheck.expect ~ '"' %} {% if backuptablecheck.ssl|default('0') == '1' %} -{% set _backuptablecheck = _backuptablecheck ~ ' ssl' %} +{% set _backuptablecheck = _backuptablecheck ~ ' tls' %} {% endif %} {% else %} {% set _backuptablecheck = 'check ' ~ backuptablecheck.type %}