mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unbound: Added ability to disable automatically added host entries

Browse Source
This commit is contained in:
Robbert Rijkse 2017-05-06 15:23:34 -04:00
parent 1ba646755d
commit 409165fde8
2 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/etc/inc/unbound.inc
View File

@ -539,31 +539,39 @@ function unbound_add_domain_overrides($pvt_rev="", $cfgsubdir = "") {
function unbound_add_host_entries($cfgsubdir = "") {
global $config, $g;
// Make sure the config setting is a valid unbound local zone type. If not use "transparent".
if (array_key_exists($config['unbound']['system_domain_local_zone_type'], unbound_local_zone_types())) {
$system_domain_local_zone_type = $config['unbound']['system_domain_local_zone_type'];
} else {
$system_domain_local_zone_type = "transparent";
}
$unbound_entries = "local-zone: \"{$config['system']['domain']}\" {$system_domain_local_zone_type}\n";
$hosts = system_hosts_entries($config['unbound']);
$added_ptr = array();
foreach ($hosts as $host) {
if (is_ipaddrv4($host['ipaddr'])) {
$type = 'A';
} else if (is_ipaddrv6($host['ipaddr'])) {
$type = 'AAAA';
// Check if auto add host entries is not set
if (!isset($config['unbound']['disable_auto_added_host_entries'])) {
// Make sure the config setting is a valid unbound local zone type. If not use "transparent".
if (array_key_exists($config['unbound']['system_domain_local_zone_type'], unbound_local_zone_types())) {
$system_domain_local_zone_type = $config['unbound']['system_domain_local_zone_type'];
} else {
continue;
$system_domain_local_zone_type = "transparent";
}
if (!$added_ptr[$host['ipaddr']]) {
$unbound_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['fqdn']}\"\n";
$added_ptr[$host['ipaddr']] = true;
$unbound_entries = "local-zone: \"{$config['system']['domain']}\" {$system_domain_local_zone_type}\n";
$hosts = system_hosts_entries($config['unbound']);
$added_ptr = array();
foreach ($hosts as $host) {
if (is_ipaddrv4($host['ipaddr'])) {
$type = 'A';
} else if (is_ipaddrv6($host['ipaddr'])) {
$type = 'AAAA';
} else {
continue;
}
if (!$added_ptr[$host['ipaddr']]) {
$unbound_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['fqdn']}\"\n";
$added_ptr[$host['ipaddr']] = true;
}
$unbound_entries .= "local-data: \"{$host['fqdn']} {$type} {$host['ipaddr']}\"\n";
}
$unbound_entries .= "local-data: \"{$host['fqdn']} {$type} {$host['ipaddr']}\"\n";
}
else {
// Adds a comment to the file to make it clear it's there for a reason and to clear the file
// when the user enables this option.
$unbound_entries = "# Empty since file generation has been disabled in the options.";
}
// Write out entries

18
src/usr/local/www/services_unbound_advanced.php
View File

@ -71,6 +71,10 @@ if (isset($config['unbound']['disable_auto_added_access_control'])) {
$pconfig['disable_auto_added_access_control'] = true;
}
if (isset($config['unbound']['disable_auto_host_entries'])) {
$pconfig['disable_auto_added_host_entries'] = true;
}
if (isset($config['unbound']['use_caps'])) {
$pconfig['use_caps'] = true;
}
@ -171,6 +175,12 @@ if ($_POST) {
unset($config['unbound']['disable_auto_added_access_control']);
}
if (isset($_POST['disable_auto_added_host_entries'])) {
$config['unbound']['disable_auto_added_host_entries'] = true;
} else {
unset($config['unbound']['disable_auto_added_host_entries']);
}
if (isset($_POST['use_caps'])) {
$config['unbound']['use_caps'] = true;
} else {
@ -349,6 +359,14 @@ $section->addInput(new Form_Checkbox(
))->setHelp('By default, IPv4 and IPv6 networks residing on internal interfaces of this system are permitted. ' .
'Allowed networks must be manually configured on the Access Lists tab if the auto-added entries are disabled.');
$section->addInput(new Form_Checkbox(
'disable_auto_added_host_entries',
'Disable Auto-added Host Entries',
'Disable the automatically-added host entries',
$pconfig['disable_auto_added_host_entries']
))->setHelp('By default, the primary IPv4 and IPv6 addresses of the pfsense machine are added as records for the pfSense system domain (System | General Setup | Domain). ' .
'This disables the auto generation of these entries.');
$section->addInput(new Form_Checkbox(
'use_caps',
'Experimental Bit 0x20 Support',