lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

dnsmasq: repair the dns_ports validation

Browse Source
This commit is contained in:
Franco Fichtner 2025-02-20 10:34:27 +01:00
parent ef39fdde85
commit 1581bcd87c
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/etc/inc/plugins.inc.d/dnsmasq.inc
View File

@ -47,17 +47,19 @@ function dnsmasq_configure()
function dnsmasq_services()
{
global $config;
$services = [];
if (!dnsmasq_enabled() && !isvalidpid('/var/run/dnsmasq.pid')) {
return $services;
}
$mdl = new \OPNsense\Dnsmasq\Dnsmasq();
$pconfig = [];
$pconfig['name'] = 'dnsmasq';
$pconfig['dns_ports'] = [$config['dnsmasq']['port'] ?? '53'];
if (!empty((string)$mdl->dns_port)) {
$pconfig['dns_ports'] = [ (string)$mdl->dns_port ];
}
$pconfig['description'] = gettext('Dnsmasq DNS');
$pconfig['php']['restart'] = ['dnsmasq_configure_do'];
$pconfig['php']['start'] = ['dnsmasq_configure_do'];

32
src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Dnsmasq.php
View File

@ -30,6 +30,7 @@ namespace OPNsense\Dnsmasq;
use OPNsense\Base\BaseModel;
use OPNsense\Base\Messages\Message;
use OPNsense\Core\Backend;
/**
* Class Dnsmasq
@ -37,13 +38,12 @@ use OPNsense\Base\Messages\Message;
*/
class Dnsmasq extends BaseModel
{
/**
* {@inheritdoc}
*/
protected function init()
{
$this->dns_port = !empty((string)$this->port) ? (string)$this->port : '53'; /* port defaults */
$this->dns_port = strlen($this->port) ? (string)$this->port : '53'; /* port defaults */
}
/**
@ -51,8 +51,10 @@ class Dnsmasq extends BaseModel
*/
public function performValidation($validateFullModel = false)
{
$this->dns_port = !empty((string)$this->port) ? (string)$this->port : '53'; /* port defaults */
$this->dns_port = strlen($this->port) ? (string)$this->port : '53'; /* port defaults */
$messages = parent::performValidation($validateFullModel);
foreach ($this->hosts->iterateItems() as $host) {
if (!$validateFullModel && !$host->isFieldChanged()) {
continue;
@ -92,6 +94,28 @@ class Dnsmasq extends BaseModel
}
}
if (
($validateFullModel || $this->enable->isFieldChanged() || $this->port->isFieldChanged()) &&
!empty((string)$this->enable)
) {
foreach (json_decode((new Backend())->configdpRun('service list'), true) as $service) {
if (empty($service['dns_ports'])) {
continue;
}
if (!is_array($service['dns_ports'])) {
syslog(LOG_ERR, sprintf('Service %s (%s) reported a faulty "dns_ports" entry.', $service['description'], $service['name']));
continue;
}
if ($service['name'] != 'dnsmasq' && in_array((string)$this->dns_port, $service['dns_ports'])) {
$messages->appendMessage(new Message(
sprintf(gettext('%s is currently using this port.'), $service['description']),
$this->port->getInternalXMLTagName()
));
break;
}
}
}
return $messages;
}
@ -104,7 +128,7 @@ class Dnsmasq extends BaseModel
$exclude[] = $item;
}
foreach (explode(',', $this->interface) as $item) {
if (!empty($item) && !in_array($item, $exclude)){
if (!empty($item) && !in_array($item, $exclude)) {
$result[] = $item;
}
}