summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Baker <warren@decoy.co.za>2013-02-14 19:50:24 +0200
committerWarren Baker <warren@decoy.co.za>2013-02-14 19:50:24 +0200
commit950c9a182eaacfbb6c48a6371affe7852ffb13ba (patch)
tree52a3fef2f33bfb4806a33c45354cd9ddab12f71b
parent03e96afb7d6e4c2a14f925014d011cfc7bad1437 (diff)
downloadpfsense-950c9a182eaacfbb6c48a6371affe7852ffb13ba.zip
pfsense-950c9a182eaacfbb6c48a6371affe7852ffb13ba.tar.gz
Backout Unbound for now bring back in 2.2. Fixes #2817
-rw-r--r--etc/inc/globals.inc1
-rw-r--r--etc/inc/services.inc48
-rw-r--r--etc/inc/system.inc4
-rw-r--r--etc/inc/unbound.inc521
-rw-r--r--etc/master.passwd1
-rw-r--r--etc/passwd1
-rw-r--r--usr/local/www/services_unbound.php399
-rw-r--r--usr/local/www/services_unbound_acls.php377
-rw-r--r--usr/local/www/services_unbound_advanced.php354
9 files changed, 3 insertions, 1703 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index 1df2afe..8c3ba2a 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -47,7 +47,6 @@ $g = array(
"factory_shipped_password" => "pfsense",
"upload_path" => "/root",
"dhcpd_chroot_path" => "/var/dhcpd",
- "unbound_chroot_path" => "/var/unbound",
"varrun_path" => "/var/run",
"varetc_path" => "/var/etc",
"vardb_path" => "/var/db",
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index dd33e7c..abe18b7 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -34,7 +34,7 @@
pfSense_BUILDER_BINARIES: /usr/bin/killall /bin/pgrep /bin/sh /usr/local/sbin/dhcpd /usr/local/sbin/igmpproxy
pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/sbin/arp /sbin/ifconfig /usr/local/sbin/dnsmasq
pfSense_BUILDER_BINARIES: /usr/sbin/bsnmpd /sbin/route
- pfSense_BUILDER_BINARIES: /usr/local/sbin/miniupnpd /usr/sbin/radvd /usr/local/sbin/unbound
+ pfSense_BUILDER_BINARIES: /usr/local/sbin/miniupnpd /usr/sbin/radvd
pfSense_BUILDER_BINARIES: /usr/local/sbin/dhcleases6
pfSense_MODULE: utils
*/
@@ -1577,52 +1577,6 @@ function services_dnsmasq_configure() {
return $return;
}
-function services_unbound_configure() {
- global $config, $g;
- $return = 0;
-
- if(isset($config['system']['developerspew'])) {
- $mt = microtime();
- echo "services_unbound_configure() being called $mt\n";
- }
-
- /* kill any running unbound */
- sigkillbypid("{$g['varrun_path']}/unbound.pid", "TERM");
-
- if (isset($config['unbound']['enable'])) {
-
- if ($g['booting'])
- echo "Starting Unbound DNS...";
- else
- sleep(1);
-
- /* Setup Unbound DHCP Chroot environment */
- $fd = fopen("{$g['tmp_path']}/unbound.sh","w");
- $status = `/sbin/mount | /usr/bin/grep "{$g['unbound_chroot_path']}/dev"`;
- fwrite($fd, "mkdir -p {$g['unbound_chroot_path']}\n");
- fwrite($fd, "mkdir -p {$g['unbound_chroot_path']}/dev\n");
- fwrite($fd, "mkdir -p {$g['unbound_chroot_path']}/etc\n");
- if(!trim($status))
- fwrite($fd, "mount -t devfs devfs {$g['unbound_chroot_path']}/dev\n");
- fclose($fd);
- mwexec("/bin/sh {$g['tmp_path']}/unbound.sh");
-
- /* generate Unbound config file */
- if(unbound_generate_config()!=0) {
- log_error("Problem generating Unbound configuration.");
- $return = 1;
- }
-
- /* run Unbound */
- mwexec("/usr/local/sbin/unbound -c {$g['unbound_chroot_path']}/etc/unbound.conf");
-
- if ($g['booting'])
- echo "done.\n";
- }
-
- return $return;
-}
-
function services_snmpd_configure() {
global $config, $g;
if(isset($config['system']['developerspew'])) {
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index de3d197..a0777f6 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -569,7 +569,7 @@ function system_syslogd_start() {
}
if (isset($syslogcfg)) {
- $separatelogfacilities = array('ntp','ntpd','ntpdate','racoon','openvpn','pptps','poes','l2tps','relayd','hostapd','dnsmasq','unbound','dhcpd','dhcrelay','apinger','radvd','routed','olsrd','zebra','ospfd','bgpd');
+ $separatelogfacilities = array('ntp','ntpd','ntpdate','racoon','openvpn','pptps','poes','l2tps','relayd','hostapd','dnsmasq','dhcpd','dhcrelay','apinger','radvd','routed','olsrd','zebra','ospfd','bgpd');
$syslogconf = "";
if($config['installedpackages']['package']) {
foreach($config['installedpackages']['package'] as $package) {
@@ -623,7 +623,7 @@ function system_syslogd_start() {
if (isset($syslogcfg['apinger']))
$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
- $syslogconf .= "!dnsmasq,unbound\n";
+ $syslogconf .= "!dnsmasq\n";
if (!isset($syslogcfg['disablelocallogging']))
$syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/resolver.log\n";
if (isset($syslogcfg['apinger']))
diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc
deleted file mode 100644
index 94e899b..0000000
--- a/etc/inc/unbound.inc
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-/* $Id$ */
-/*
- unbound.inc
- part of the pfSense project (http://www.pfsense.com)
- Copyright (C) 2011 Warren Baker
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- pfSense_BUILDER_BINARIES: /usr/local/sbin/unbound /usr/local/sbin/unbound-anchor
- pfSense_BUILDER_BINARIES: /usr/local/sbin/unbound-checkconf /usr/local/sbin/unbound-control
- pfSense_BUILDER_BINARIES: /usr/local/sbin/unbound-control-setup /usr/local/sbin/unbound-host
-*/
-
-
-/* Handle Domain overrides and DNS Rebinding domains */
-function unbound_add_domain_overrides($pvt=false) {
- global $config, $g;
-
- $domains = $config['unbound']['domainoverrides'];
-
- $sorted_domains = msort($domains, "domain");
- $result = array();
- foreach($sorted_domains as $domain) {
- $domain_key = current($domain);
- if(!isset($result[$domain_key])) {
- $result[$domain_key] = array();
- }
- $result[$domain_key][] = $domain['ip'];
- }
-
- // Domain overrides that have multiple entries need multiple stub-addr: added
- $domain_entries = "";
- foreach($result as $domain=>$ips) {
- if($pvt == true) {
- $domain_entries .= "private-domain: \"$domain\"\n";
- $domain_entries .= "domain-insecure: \"$domain\"\n";
- } else {
- $domain_entries .= "stub-zone:\n";
- $domain_entries .= "\tname: \"$domain\"\n";
- foreach($ips as $ip) {
- $domain_entries .= "\tstub-addr: $ip\n";
- }
- $domain_entries .= "\tstub-prime: no\n";
- }
- }
- if($pvt == true)
- return $domain_entries;
- else
- file_put_contents("{$g['unbound_chroot_path']}/etc/domainoverrides.conf", $domain_entries);
-}
-
-/* Optimize Unbound for environment */
-function unbound_optimization() {
- global $config;
-
- $optimization_settings = array();
-
- /* Set the number of threads equal to number of CPUs.
- * Use 1 to disable threading, if for some reason this sysctl fails.
- */
- $numprocs = intval(trim(`/sbin/sysctl kern.smp.cpus | /usr/bin/cut -d" " -f2`));
- if($numprocs > 0)
- $optimization['number_threads'] = "num-threads: {$numprocs}";
- else
- $optimization['number_threads'] = "num-threads: 1";
-
- /* Slabs to help reduce lock contention. */
- if ($numprocs > 4) {
- $optimization['msg_cache_slabs'] = "msg-cache-slabs: {$numprocs}";
- $optimization['rrset_cache_slabs'] = "rrset-cache-slabs: {$numprocs}";
- $optimization['infra_cache_slabs'] = "infra-cache-slabs: {$numprocs}";
- $optimization['key_cache_slabs'] = "key-cache-slabs: {$numprocs}";
- } else {
- $optimization['msg_cache_slabs'] = "msg-cache-slabs: 4";
- $optimization['rrset_cache_slabs'] = "rrset-cache-slabs: 4";
- $optimization['infra_cache_slabs'] = "infra-cache-slabs: 4";
- $optimization['key_cache_slabs'] = "key-cache-slabs: 4";
- }
-
- /* Memory usage default of 4MB */
- $optimization['msg_cache_size'] = "msg-cache-size: 4m";
- $optimization['rrset_cache_size'] = "rrset-cache-size: 8m";
-
- /* More outgoing connections per thread otherwise assign a default of 4096 for a single thread */
- if($numprocs > 0) {
- $or = (1024/$numprocs) - 50;
- $optimization['outgoing_range'] = "outgoing-range: {$or}";
- } else {
- $optimization['outgoing_range'] = "outgoing-range: {4096}";
- }
-
- /* Larger socket buffer for busy servers
- * Check that it is set to 4MB (by default the OS has it configured to 4MB)
- */
- foreach ($config['sysctl']['item'] as $tunable) {
- if ($tunable['tunable'] == 'kern.ipc.maxsockbuf') {
- $so = floor(($tunable['value']/1024/1024)-1);
- // Check to ensure that the number is not a negative
- if ($so > 0)
- $optimization['so_rcvbuf'] = "so-rcvbuf: {$so}m";
- else
- unset($optimization['so_rcvbuf']);
- }
- }
- /* Safety check in case kern.ipc.maxsockbuf is not available. */
- if(!isset($optimization['so_rcvbuf']))
- $optimization['so_rcvbuf'] = "#so-rcvbuf: 4m";
-
- return $optimization;
-}
-
-/* Fetch root name servers hints file */
-function unbound_fetch_root_hints_using_dig() {
- global $g;
-
- $hints = "{$g['unbound_chroot_path']}/etc/root.hints";
- if (@filesize($hints) == 0) {
- $returnvar = mwexec("/usr/bin/dig +tcp +nocmd +answer +time=1 +tries=1 +retry=1 @`/usr/bin/dig +nocmd +noall +answer +short +time=1 +tries=1 +retry=1 . NS | /usr/bin/head -1` . NS > {$hints}");
-
- if ($returnvar != 0) {
- mwexec("/bin/rm -f {$hints}");
- return false;
- } else
- return true;
- } else
- return true;
-}
-
-/* Fetch root name servers hints file */
-function unbound_fetch_root_hints() {
- global $g;
-
- $destination_file = "{$g['unbound_chroot_path']}/etc/root.hints";
- if (@filesize($destination_file) == 0 ) {
- $fout = fopen($destination_file, "w");
- $url = "ftp://ftp.internic.net/domain/named.cache";
-
- $ch = curl_init();
- curl_setopt($ch, CURLOPT_URL, $url);
- curl_setopt($ch,CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, '5');
- $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
- $data = curl_exec($ch);
- curl_close($ch);
-
- fwrite($fout, $data);
- fclose($fout);
-
- return ($http_code == 200) ? true : $http_code;
- } else
- return false;
-}
-
-/* Configure initial anchor to support DNSSEC */
-function unbound_anchor_setup() {
- global $g;
-
- $conf = <<<EOD
-. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
-EOD;
-
- file_put_contents("{$g['unbound_chroot_path']}/etc/root-trust-anchor", $conf);
- @chown("{$g['unbound_chroot_path']}/etc/root-trust-anchor", "unbound");
- @chgrp("{$g['unbound_chroot_path']}/etc/root-trust-anchor", "wheel");
- @chmod("{$g['unbound_chroot_path']}/etc/root-trust-anchor", 0600);
- mwexec("/usr/local/sbin/unbound-anchor -a {$g['unbound_chroot_path']}/etc/root-trust-anchor", true);
-}
-
-/* Setup Unbound Remote Control SSL keys */
-function unbound_keys_setup() {
- global $g;
-
- if (!file_exists("{$g['unbound_chroot_path']}/unbound_control.key")) {
- mwexec("/usr/local/sbin/unbound-control-setup -d {$g['unbound_chroot_path']}/etc");
- @chown("{$g['unbound_chroot_path']}/etc/unbound_*", "unbound");
- @chgrp("{$g['unbound_chroot_path']}/etc/unbound_*", "wheel");
- }
-}
-
-/* Generation of Unbound statistics */
-function unbound_statistics() {
- global $config;
-
- /* XXX To do - add RRD graphs */
- $stats = <<<EOF
-# Unbound Statistics
-statistics-interval: {$config['unbound']['stats_interval']}
-extended-statistics: yes
-statistics-cumulative: yes
-
-EOF;
-
- return $stats;
-}
-
-/* Generate Unbound configuration */
-function unbound_generate_config() {
- global $config, $g;
-
- $unboundcfg = $config['unbound'];
-
- /* Setup optimization */
- $optimization = unbound_optimization();
-
- /* Setup DNSSEC support */
- if(isset($unboundcfg['dnssec_status'])) {
- $module_config = "validator iterator";
- $anchor_file = "auto-trust-anchor-file: /etc/root-trust-anchor";
- } else
- $module_config = "iterator";
-
- /* Setup DNS Rebinding */
- if(!isset($config['system']['webgui']['nodnsrebindcheck'])) {
- // Private-addresses for DNS Rebinding
- $private_addr = <<<EOF
-# For DNS Rebinding prevention
-private-address: 10.0.0.0/8
-private-address: 172.16.0.0/12
-private-address: 192.168.0.0/16
-private-address: 192.254.0.0/16
-private-address: fd00::/8
-private-address: fe80::/10
-EOF;
- }
-
- /* Allow DNS Rebind for forwarded domains */
- if (isset($unboundcfg['domainoverrides']) && is_array($unboundcfg['domainoverrides'])) {
- if(!isset($config['system']['webgui']['nodnsrebindcheck'])) {
- $private_domains = "# Set private domains in case authoritative name server returns a Private IP address";
- $private_domains .= unbound_add_domain_overrides(true);
- }
- }
-
- /* Configure static Host entries */
- $host_entries = unbound_add_host_entries();
-
- /* Configure Domain Overrides */
- $domain_overrides = unbound_add_domain_overrides();
-
- /* Configure Unbound statistics */
- $statistics = unbound_statistics();
-
- /* Add custom Unbound options */
- if ($unboundcfg['custom_options']) {
- $custom_option = "# Unbound custom option";
- foreach (preg_split('/\s+/', $unboundcfg['custom_options']) as $ent)
- $custom_option .= $ent."\n";
- }
-
- $unboundconf = <<<EOD
-##########################
-# Unbound Configuration
-##########################
-
-##
-# Server configuration
-##
-server:
-chroot: {$g['unbound_chroot_path']}
-username: "unbound"
-directory: "{$g['unbound_chroot_path']}/etc"
-root-hints: "root.hints"
-pidfile: "/var/run/unbound.pid"
-use-syslog: yes
-port: 53
-verbosity: {$unboundcfg['loglevel']}
-harden-referral-path: no
-do-ip4: yes
-do-ip6: yes
-do-udp: yes
-do-tcp: yes
-do-daemonize: yes
-module-config: "{$module_config}"
-unwanted-reply-threshold: 0
-num-queries-per-thread: 1024
-jostle-timeout: 200
-infra-host-ttl: 900
-infra-lame-ttl: 900
-infra-cache-numhosts: 10000
-outgoing-num-tcp: 10
-incoming-num-tcp: 10
-edns-buffer-size: 4096
-cache-max-ttl: {$unboundcfg['cache_max_ttl']}
-cache-min-ttl: {$unboundcfg['cache_min_ttl']}
-harden-dnssec-stripped: yes
-{$optimization['number_threads']}
-{$optimization['msg_cache_slabs']}
-{$optimization['rrset_cache_slabs']}
-{$optimization['infra_cache_slabs']}
-{$optimization['key_cache_slabs']}
-{$optimization['msg_cache_size']}
-{$optimization['rrset_cache_size']}
-{$optimization['outgoing_range']}
-{$optimization['so_rcvbuf']}
-{$anchor_file}
-prefetch: {$unboundcfg['prefetch']}
-prefetch-key: {$unboundcfg['prefetch_key']}
-# Statistics
-{$statistics}
-# Interface IP(s) to bind to
-interface: 0.0.0.0
-interface: ::0
-
-# DNS Rebinding
-{$private_addr}
-{$private_domains}
-
-# Static host entries
-include: {$g['unbound_chroot_path']}/etc/host_entries.conf
-
-# Domain overrides
-include: {$g['unbound_chroot_path']}/etc/domainoverrides.conf
-
-{$custom_options}
-
-###
-# Remote Control Config
-###
-include: {$g['unbound_chroot_path']}/etc/remotecontrol.conf
-
-EOD;
-
- file_put_contents("{$g['unbound_chroot_path']}/etc/unbound.conf", $unboundconf);
-
- return 0;
-}
-
-function unbound_remote_control_setup() {
- global $g;
-
- if(!file_exists("{$g['unbound_chroot_path']}/etc/remotecontrol.conf")) {
- $remotcfg = <<<EOF
-remote-control:
-control-enable: yes
-control-interface: 127.0.0.1
-control-port: 953
-server-key-file: "{$g['unbound_chroot_path']}/etc/unbound_server.key"
-server-cert-file: "{$g['unbound_chroot_path']}/etc/unbound_server.pem"
-control-key-file: "{$g['unbound_chroot_path']}/etc/unbound_control.key"
-control-cert-file: "{$g['unbound_chroot_path']}/etc/unbound_control.pem"
-EOF;
-
- file_put_contents("{$g['unbound_chroot_path']}/etc/remotecontrol.conf", $remotcfg);
- }
-}
-
-function unbound_add_host_entries() {
- global $config, $g;
-
- /* XXX: break this out into a separate config file and make use of include */
- $syscfg = $config['system'];
- $dnscfg = $config['unbound'];
-
- $dns_entries = "local-zone: \"{$syscfg['domain']}\" transparent\n";
- // IPv4 entries
- $dns_entries .= "local-data-ptr: \"127.0.0.1 localhost\"\n";
- $dns_entries .= "local-data: \"localhost A 127.0.0.1\"\n";
- $dns_entries .= "local-data: \"localhost.{$syscfg['domain']} A 127.0.0.1\"\n";
- // IPv6 entries
- $dns_entries .= "local-data-ptr: \"::1 localhost\"\n";
- $dns_entries .= "local-data: \"localhost AAAA ::1\"\n";
- $dns_entries .= "local-data: \"localhost.{$syscfg['domain']} AAAA ::1\"\n";
-
- /*if ($config['interfaces']['lan']) {
- $cfgip = get_interface_ip("lan");
- if (is_ipaddr($cfgip)) {
- $unbound_entries .= "local-data-ptr: \"{$cfgip} {$syscfg['hostname']}.{$syscfg['domain']}\"\n";
- $unbound_entries .= "local-data: \"{$syscfg['hostname']}.{$syscfg['domain']} A {$cfgip}\"\n";
- $unbound_entries .= "local-data: \"{$syscfg['hostname']} A {$cfgip}\"\n";
- }
- } else {
- $sysiflist = get_configured_interface_list();
- foreach ($sysiflist as $sysif) {
- if (!interface_has_gateway($sysif)) {
- $cfgip = get_interface_ip($sysif);
- if (is_ipaddr($cfgip)) {
- $unbound_entries .= "local-data-ptr: \"{$cfgip} {$syscfg['hostname']}.{$syscfg['domain']}\"\n";
- $unbound_entries .= "local-data: \"{$syscfg['hostname']}.{$syscfg['domain']} A {$cfgip}\"\n";
- $unbound_entries .= "local-data: \"{$syscfg['hostname']} A {$cfgip}\"\n";
- break;
- }
- }
- }
- }*/
-
- /* Static Host entries */
- if (isset($dnscfg['hosts'])) {
- $hosts = $dnscfg['hosts'];
- $host_entries = "";
- $added_item = array();
- foreach ($hosts as $host) {
- $current_host = $host['host'];
- if ($host['host'] != "")
- $host['host'] = $host['host'].".";
- if(!$added_item[$current_host]) {
- $host_entries .= "local-data-ptr: \"{$host['ip']} {$host['host']}{$host['domain']}\"\n";
- if (is_ipaddrv6($host['ip']))
- $host_entries .= "local-data: \"{$host['host']}{$host['domain']} IN AAAA {$host['ip']}\"\n";
- else
- $host_entries .= "local-data: \"{$host['host']}{$host['domain']} IN A {$host['ip']}\"\n";
- if (!empty($host['descr']) && $dnscfg['txtsupport'] == 'on')
- $host_entries .= "local-data: '{$host['host']}{$host['domain']} TXT \"".addslashes($host['descr'])."\"'\n";
-
- // Do not add duplicate entries
- $added_item[$current_host] = true;
- }
- }
- $unbound_entries .= $host_entries;
- }
- // Static DHCP entries
- $host_entries = "";
- if (isset($dnscfg['regdhcpstatic']) && is_array($config['dhcpd'])) {
- foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf)
- if(is_array($dhcpifconf['staticmap']) && isset($dhcpifconf['enable']))
- foreach ($dhcpifconf['staticmap'] as $host)
- if ($host['ipaddr'] && $host['hostname']) {
- $host_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['hostname']}.{$syscfg['domain']}\"\n";
- $host_entries .= "local-data: \"{$host['hostname']}.{$syscfg['domain']} IN A {$host['ipaddr']}\"\n";
- if (!empty($host['descr']) && $unboundcfg['txtsupport'] == 'on')
- $host_entries .= "local-data: '{$host['hostname']}.{$syscfg['domain']} TXT \"".addslashes($host['descr'])."\"'\n";
- }
- $unbound_entries .= $host_entries;
- }
-
- // Handle DHCPLeases added host entries
- $dhcplcfg = read_hosts();
- $host_entries = "";
- if(is_array($dhcplcfg)) {
- foreach($dhcplcfg as $key=>$host) {
- $host_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['fqdn']}\"\n";
- $host_entries .= "local-data: \"{$host['fqdn']} IN A {$host['ipaddr']}\"\n";
- if (!empty($host['name'])) {
- $host_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['name']}\"\n";
- $host_entries .= "local-data: \"{$host['name']} IN A {$host['ipaddr']}\"\n";
- }
- }
- $unbound_entries .= $host_entries;
- }
-
- /* Write out entries */
- file_put_contents("{$g['unbound_chroot_path']}/etc/host_entries.conf", $unbound_entries);
-}
-
-/* Read /etc/hosts */
-function read_hosts() {
-
- /* Open /etc/hosts and extract the only dhcpleases info
- * XXX - to convert to an unbound C library which reads /etc/hosts automatically
- */
- $etc_hosts = array();
- foreach (file('/etc/hosts') as $line) {
- $d = preg_split('/\s/', $line, -1, PREG_SPLIT_NO_EMPTY);
- if (empty($d) || substr(reset($d), 0, 1) == "#")
- continue;
- if ($d[3] == "#") {
- $ip = array_shift($d);
- $fqdn = array_shift($d);
- $name = array_shift($d);
- if ($fqdn != "empty") {
- if ($name != "empty")
- array_push($etc_hosts, array(ipaddr => "$ip", fqdn => "$fqdn", name => "$name"));
- else
- array_push($etc_hosts, array(ipaddr => "$ip", fqdn => "$fqdn"));
- }
- }
- }
- return $etc_hosts;
-}
-
-function unbound_setup() {
- global $config, $g;
-
- unbound_anchor_setup();
- unbound_remote_control_setup();
- unbound_keys_setup();
- unbound_fetch_root_hints();
- unbound_resync_config();
-}
-
-function unbound_acl_id_used($id) {
- global $config;
-
- if (is_array($config['installedpackages']['unboundacls']['config']))
- foreach ($config['installedpackages']['unboundacls']['config'] as & $acls)
- if ($id == $acls['aclid'])
- return true;
-
- return false;
-}
-
-function unbound_get_next_id() {
- $aclid = 0;
- while(unbound_acl_id_used($aclid))
- $aclid++;
- return $aclid;
-}
-
-?> \ No newline at end of file
diff --git a/etc/master.passwd b/etc/master.passwd
index d521beb..8c82243 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -26,4 +26,3 @@ uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp
pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
_ntp:*:123:123::0:0:NTP daemon:/var/empty:/sbin/nologin
_relayd:*:913:913::0:0:Relay Daemon:/var/empty:/usr/sbin/nologin
-unbound:*:59:1::0:0:unbound dns resolver:/nonexistent:/usr/sbin/nologin
diff --git a/etc/passwd b/etc/passwd
index 94fc831..7dbbbd6 100644
--- a/etc/passwd
+++ b/etc/passwd
@@ -23,4 +23,3 @@ dhcpd:*:1002:1002:DHCP Daemon:/nonexistent:/sbin/nologin
admin:*:0:0:Admin User:/home/admin:/bin/sh
_ntp:*:123:123:NTP daemon:/var/empty:/sbin/nologin
_relayd:*:913:913:Relay Daemon:/var/empty:/usr/sbin/nologin
-unbound:*:59:1::0:0:unbound dns resolver:/nonexistent:/usr/sbin/nologin
diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php
deleted file mode 100644
index 213c2b9..0000000
--- a/usr/local/www/services_unbound.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-/* $Id$ */
-/*
- services_unbound.php
- part of the pfSense project (http://www.pfsense.com)
- Copyright (C) 2011 Warren Baker (warren@pfsense.org)
- All rights reserved.
-
- Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-*/
-/*
- pfSense_MODULE: dnscache
-*/
-
-##|+PRIV
-##|*IDENT=page-services-unbound
-##|*NAME=Services: DNS Resolver page
-##|*DESCR=Allow access to the 'Services: DNS Resolver' page.
-##|*MATCH=services_unbound.php*
-##|-PRIV
-
-require_once("guiconfig.inc");
-require_once("unbound.inc");
-
-$pconfig['enable'] = isset($config['unbound']['enable']);
-$pconfig['active_interface'] = $config['unbound']['active_interface'];
-$pconfig['outgoing_interface'] = $config['unbound']['outgoing_interface'];
-$pconfig['dnssec'] = isset($config['unbound']['dnssec']);
-$pconfig['dnssec'] = isset($config['unbound']['dnssec']);
-$pconfig['forwarding'] = isset($config['unbound']['forwarding']);
-$pconfig['regdhcp'] = isset($config['unbound']['regdhcp']);
-$pconfig['regdhcpstatic'] = isset($config['unbound']['regdhcpstatic']);
-$pconfig['dhcpfirst'] = isset($config['unbound']['dhcpfirst']);
-
-if(!is_array($config['unbound']))
- $config['unbound'] = array();
-$a_unboundcfg =& $config['unbound'];
-
-if (!is_array($config['unbound']['hosts']))
- $config['unbound']['hosts'] = array();
-$a_hosts =& $config['unbound']['hosts'];
-
-if (!is_array($config['unbound']['domainoverrides']))
- $config['unbound']['domainoverrides'] = array();
-$a_domainOverrides = &$config['unbound']['domainoverrides'];
-
-if ($_POST) {
-
- unset($input_errors);
-
- if($_POST['enable'] == "yes" && isset($config['dnsmasq']['enable']))
- $input_errors[] = "The system dns-forwarder is still active. Disable it before enabling the DNS Resolver.";
-
- if(empty($_POST['active_interface']))
- $input_errors[] = "A single network interface needs to be selected for the DNS Resolver to bind to.";
-
- if (!$input_errors) {
- $a_unboundcfg['enable'] = ($_POST['enable']) ? true : false;
- $a_unboundcfg['dnssec'] = ($_POST['dnssec']) ? true : false;
- $a_unboundcfg['forwarding'] = ($_POST['forwarding']) ? true : false;
- $a_unboundcfg['regdhcp'] = ($_POST['regdhcp']) ? true : false;
- $a_unboundcfg['regdhcpstatic'] = ($_POST['regdhcpstatic']) ? true : false;
- $a_unboundcfg['dhcpfirst'] = ($_POST['dhcpfirst']) ? true : false;
- if (is_array($_POST['active_interface']))
- $a_unboundcfg['active_interface'] = implode(",", $_POST['active_interface']);
- else
- $a_unboundcfg['active_interface'] = $_POST['active_interface'];
- if (is_array($_POST['outgoing_interface']))
- $a_unboundcfg['outgoing_interface'] = implode(",", $_POST['outgoing_interface']);
- else
- $a_unboundcfg['outgoing_interface'] = $_POST['outgoing_interface'];
-
- write_config("DNS Resolver configured.");
- $retval = 0;
- $retval = services_unbound_configure();
- $savemsg = get_std_save_message($retval);
- }
-}
-
-$pgtitle = array(gettext("Services"),gettext("DNS Resolver"));
-include_once("head.inc");
-
-?>
-
-<script language="JavaScript">
-<!--
-function enable_change(enable_over) {
- var endis;
- endis = !(document.iform.enable.checked || enable_over);
- document.iform.active_interface.disabled = endis;
- document.iform.outgoing_interface.disabled = endis;
- document.iform.dnssec.disabled = endis;
- document.iform.forwarding.disabled = endis;
- document.iform.regdhcp.disabled = endis;
- document.iform.regdhcpstatic.disabled = endis;
- document.iform.dhcpfirst.disabled = endis;
-}
-//-->
-</script>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<form action="services_unbound.php" method="post" name="iform" id="iform">
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (is_subsystem_dirty('hosts')): ?><p>
-<?php print_info_box_np(gettext("The configuration for the DNS Resolver, has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
-<?php endif; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="tabnavtbl">
- <?php
- $tab_array = array();
- $tab_array[] = array(gettext("General settings"), true, "services_unbound.php");
- $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php");
- $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php");
- display_top_tabs($tab_array, true);
- ?>
- </td>
- </tr>
- <tr>
- <td class="tabcont">
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
- <tr>
- <td colspan="2" valign="top" class="listtopic"><?=gettext("General DNS Resolver Options");?></td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td>
- <td width="78%" class="vtable"><p>
- <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] === true) echo "checked";?> onClick="enable_change(false)">
- <strong><?=gettext("Enable DNS Resolver");?><br>
- </strong></p></td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("Network interfaces");?></td>
- <td width="78%" class="vtable">
- <select name="active_interface[]" id="active_interface" multiple="true" size="3">
- <?php $iflist = get_configured_interface_with_descr();
- $active_iface = explode(",", $pconfig['active_interface']);
- $iflist['localhost'] = "Localhost";
- foreach ($iflist as $iface => $ifdescr) {
- echo "<option value='{$iface}' ";
- if (in_array($iface, $active_iface))
- echo "selected";
- echo ">{$ifdescr}</option>\n";
- }
- ?>
- </select>
- <br/><span class="vexpl">
- <?=gettext("The DNS Resolver Server will listen on the selected interfaces. To add an interface click inside the interface box and select the interface from the drop down.");?> <br/>
- </span>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("Outgoing interfaces");?></td>
- <td width="78%" class="vtable">
- <select name="outgoing_interface[]" id="outgoing_interface" multiple="true" size="3">
- <?php $iflist = get_configured_interface_with_descr();
- $outgoing_iface = explode(",", $pconfig['outgoing_interface']);
- $iflist['localhost'] = "Localhost";
- foreach ($iflist as $iface => $ifdescr) {
- echo "<option value='{$iface}' ";
- if (in_array($iface, $outgoing_iface))
- echo "selected";
- echo ">{$ifdescr}</option>\n";
- }
- ?>
- </select>
- <br/><span class="vexpl">
- <?=gettext("Utilize different network interface(s) that the DNS Resolver will use to send queries to authoritative servers and receive their replies. By default all interfaces are used.");?> <br/>
- </span>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("DNSSEC");?></td>
- <td width="78%" class="vtable"><p>
- <input name="dnssec" type="checkbox" id="dnssec" value="yes" <?php if ($pconfig['dnssec'] === true) echo "checked";?>/>
- <strong><?=gettext("Enable DNSSEC Support");?><br>
- </strong></p></td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("Forwarding");?></td>
- <td width="78%" class="vtable"><p>
- <input name="forwarding" type="checkbox" id="forwarding" value="yes" <?php if ($pconfig['forwarding'] === true) echo "checked";?>/>
- <strong><?=gettext("Enable Forwarding Mode");?><br>
- </strong></p></td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("DHCP Registration");?></td>
- <td width="78%" class="vtable"><p>
- <input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] === true) echo "checked";?>>
- <strong><?=gettext("Register DHCP leases in the DNS Resolver");?><br>
- </strong><?php printf(gettext("If this option is set, then machines that specify".
- " their hostname when requesting a DHCP lease will be registered".
- " in the DNS Resolver, so that their name can be resolved.".
- " You should also set the domain in %sSystem:".
- " General setup%s to the proper value."),'<a href="system.php">','</a>')?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("Static DHCP");?></td>
- <td width="78%" class="vtable"><p>
- <input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if ($pconfig['regdhcpstatic'] === true) echo "checked";?>>
- <strong><?=gettext("Register DHCP static mappings in the DNS Resolver");?><br>
- </strong><?php printf(gettext("If this option is set, then DHCP static mappings will ".
- "be registered in the DNS Resolver, so that their name can be ".
- "resolved. You should also set the domain in %s".
- "System: General setup%s to the proper value."),'<a href="system.php">','</a>');?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("Prefer DHCP");?></td>
- <td width="78%" class="vtable"><p>
- <input name="dhcpfirst" type="checkbox" id="dhcpfirst" value="yes" <?php if ($pconfig['dhcpfirst'] === true) echo "checked";?>>
- <strong><?=gettext("Resolve DHCP mappings first");?><br>
- </strong><?php printf(gettext("If this option is set, then DHCP mappings will ".
- "be resolved before the manual list of names below. This only ".
- "affects the name given for a reverse lookup (PTR)."));?></p>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)"/>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-
-<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
-</strong></span><?php printf(gettext("If the DNS Resolver is enabled, the DHCP".
-" service (if enabled) will automatically serve the LAN IP".
-" address as a DNS server to DHCP clients so they will use".
-" the DNS Resolver. If Forwarding, is enabled, the DNS Resolver will use the DNS servers".
-" entered in %sSystem: General setup%s".
-" or those obtained via DHCP or PPP on WAN if the &quot;Allow".
-" DNS server list to be overridden by DHCP/PPP on WAN&quot;".
-" is checked."),'<a href="system.php">','</a>');?><br>
-</span></p>
-
-&nbsp;<br>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont">
-<tr>
- <td colspan="5" valign="top" class="listtopic"><?=gettext("Host Overrides");?></td>
-</tr>
-<tr>
- <td><br/>
- <?=gettext("Entries in this section override individual results from the forwarders.");?>
- <?=gettext("Use these for changing DNS results or for adding custom DNS records.");?>
- </td>
-</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont sortable">
- <thead>
- <tr>
- <td width="20%" class="listhdrr"><?=gettext("Host");?></td>
- <td width="25%" class="listhdrr"><?=gettext("Domain");?></td>
- <td width="20%" class="listhdrr"><?=gettext("IP");?></td>
- <td width="25%" class="listhdr"><?=gettext("Description");?></td>
- <td width="10%" class="list">
- <table border="0" cellspacing="0" cellpadding="1">
- <tr>
- <td width="17"></td>
- <td valign="middle"><a href="services_unbound_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
- </tr>
- </table>
- </td>
- </tr>
- </thead>
- <tbody>
- <?php $i = 0; foreach ($a_hosts as $hostent): ?>
- <tr>
- <td class="listlr" ondblclick="document.location='services_unbound_edit.php?id=<?=$i;?>';">
- <?=strtolower($hostent['host']);?>&nbsp;
- </td>
- <td class="listr" ondblclick="document.location='services_unbound_edit.php?id=<?=$i;?>';">
- <?=strtolower($hostent['domain']);?>&nbsp;
- </td>
- <td class="listr" ondblclick="document.location='services_unbound_edit.php?id=<?=$i;?>';">
- <?=$hostent['ip'];?>&nbsp;
- </td>
- <td class="listbg" ondblclick="document.location='services_unbound_edit.php?id=<?=$i;?>';">
- <?=htmlspecialchars($hostent['descr']);?>&nbsp;
- </td>
- <td valign="middle" nowrap class="list">
- <table border="0" cellspacing="0" cellpadding="1">
- <tr>
- <td valign="middle"><a href="services_unbound_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
- <td><a href="services_unbound.php?type=host&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
- </tr>
- </table>
- </tr>
- <?php $i++; endforeach; ?>
- </tbody>
- <tfoot>
- <tr>
- <td class="list" colspan="4"></td>
- <td class="list">
- <table border="0" cellspacing="0" cellpadding="1">
- <tr>
- <td width="17"></td>
- <td valign="middle"><a href="services_unbound_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
- </tr>
- </table>
- </td>
- </tr>
- </tfoot>
-</table>
-<br/>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont">
-<tr>
- <td colspan="5" valign="top" class="listtopic"><?=gettext("Domain Overrides");?></td>
-</tr>
-<tr>
- <tr>
- <td><p><?=gettext("Entries in this area override an entire domain by specifying an".
- " authoritative DNS server to be queried for that domain.");?></p></td>
- </tr>
-</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont sortable">
- <thead>
- <tr>
- <td width="35%" class="listhdrr"><?=gettext("Domain");?></td>
- <td width="20%" class="listhdrr"><?=gettext("IP");?></td>
- <td width="35%" class="listhdr"><?=gettext("Description");?></td>
- <td width="10%" class="list">
- <table border="0" cellspacing="0" cellpadding="1">
- <tr>
- <td width="17" heigth="17"></td>
- <td><a href="services_unbound_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
- </tr>
- </table>
- </td>
- </tr>
- </thead>
- <tbody>
- <?php $i = 0; foreach ($a_domainOverrides as $doment): ?>
- <tr>
- <td class="listlr">
- <?=strtolower($doment['domain']);?>&nbsp;
- </td>
- <td class="listr">
- <?=$doment['ip'];?>&nbsp;
- </td>
- <td class="listbg">
- <?=htmlspecialchars($doment['descr']);?>&nbsp;
- </td>
- <td valign="middle" nowrap class="list"> <a href="services_unbound_domainoverride_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
- &nbsp;<a href="services_unbound.php?act=del&type=doverride&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
- </tr>
- <?php $i++; endforeach; ?>
- </tbody>
- <tfoot>
- <tr>
- <td class="list" colspan="3"></td>
- <td class="list">
- <table border="0" cellspacing="0" cellpadding="1">
- <tr>
- <td width="17" heigth="17"></td>
- <td><a href="services_unbound_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
- </tr>
- </table>
- </td>
- </tr>
- </tfoot>
-</table>
-</form>
-<script language="JavaScript">
-<!--
-enable_change(false);
-//-->
-</script>
-<?php include("fend.inc"); ?>
-</body>
-</html> \ No newline at end of file
diff --git a/usr/local/www/services_unbound_acls.php b/usr/local/www/services_unbound_acls.php
deleted file mode 100644
index 85ed71b..0000000
--- a/usr/local/www/services_unbound_acls.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-/* $Id$ */
-/*
- services_unbound_acls.php
- part of pfSense (http://www.pfsense.com/)
-
- Copyright (C) 2011 Warren Baker <warren@decoy.co.za>
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require("guiconfig.inc");
-require("unbound.inc");
-
-if (!is_array($config['unbound']['acls']))
- $config['unbound']['acls'] = array();
-
-$a_acls = &$config['unbound']['acls'];
-
-$id = $_GET['id'];
-if (isset($_POST['aclid']))
- $id = $_POST['aclid'];
-
-$act = $_GET['act'];
-if (isset($_POST['act']))
- $act = $_POST['act'];
-
-if ($act == "del") {
- if (!$a_acls[$id]) {
- pfSenseHeader("services_unbound_acls.php");
- exit;
- }
-
- unset($a_acls[$id]);
- write_config();
- unbound_reconfigure();
- $savemsg = gettext("Access List successfully deleted")."<br/>";
-}
-
-if ($act == "new") {
- $id = unbound_get_next_id();
-}
-
-if ($act == "edit") {
- if (isset($id) && $a_acls[$id]) {
- $pconfig = $a_acls[$id];
- $networkacl = $a_acls[$id]['row'];
- }
-}
-
-if ($_POST) {
-
- unset($input_errors);
- $pconfig = $_POST;
-
- /* input validation - only allow 50 entries in a single ACL*/
- for($x=0; $x<50; $x++) {
- if(isset($pconfig["acl_network{$x}"])) {
- $networkacl[$x] = array();
- $networkacl[$x]['acl_network'] = $pconfig["acl_network{$x}"];
- $networkacl[$x]['mask'] = $pconfig["mask{$x}"];
- $networkacl[$x]['description'] = $pconfig["description{$x}"];
- if (!is_ipaddr($networkacl[$x]['acl_network']))
- $input_errors[] = gettext("You must enter a valid network IP address for {$networkacl[$x]['acl_network']}.");
-
- if (is_ipaddr($networkacl[$x]['acl_network'])) {
- if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask']))
- $input_errors[] = gettext("You must enter a valid IPv4 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}.");
- } else if (function_exists("is_ipaddrv6")) {
- if (!is_ipaddrv6($networkacl[$x]['acl_network']))
- $input_errors[] = gettext("You must enter a valid IPv6 address for {$networkacl[$x]['acl_network']}.");
- else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask']))
- $input_errors[] = gettext("You must enter a valid IPv6 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}.");
- } else
- $input_errors[] = gettext("You must enter a valid IPv4 address for {$networkacl[$x]['acl_network']}.");
- }
- }
-
- if (!$input_errors) {
-
- if ($pconfig['Submit'] == gettext("Save")) {
- if(!$a_acls[$id])
- $a_acls[$id]['aclid'] = $id;
-
- if (isset($id) && $a_acls[$id]) {
- $a_acls[$id]['aclid'] = $pconfig['aclid'];
- $a_acls[$id]['aclname'] = $pconfig['aclname'];
- $a_acls[$id]['aclaction'] = $pconfig['aclaction'];
- $a_acls[$id]['description'] = $pconfig['description'];
- $a_acls[$id]['row'] = array();
- foreach ($networkacl as $acl)
- $a_acls[$id]['row'][] = $acl;
- write_config();
- mark_subsystem_dirty("unbound");
- //unbound_reconfigure();
- }
- pfSenseHeader("/services_unbound_acls.php");
- exit;
- }
-
- if ($pconfig['apply']) {
- clear_subsystem_dirty("unbound");
- $retval = 0;
- $retval = unbound_reconfigure();
- $savemsg = get_std_save_message($retval);
- }
- }
-}
-
-
-$pgtitle = "Services: DNS Resolver: Access Lists";
-include("head.inc");
-
-?>
-
-<script type="text/javascript" src="/javascript/row_helper.js">
-</script>
-
-<script type="text/javascript">
- function mask_field(fieldname, fieldsize, n) {
- return '<select name="' + fieldname + n + '" class="formselect" id="' + fieldname + n + '"><?php
- for ($i = 128; $i >= 0; $i--) {
- echo "<option value=\"$i\">$i</option>";
- }
- ?></select>';
- }
-
- rowtype[0] = "textbox";
- rowname[0] = "acl_network";
- rowsize[0] = "30";
- rowname[1] = "mask";
- rowtype[1] = mask_field;
- rowtype[2] = "textbox";
- rowname[2] = "description";
- rowsize[2] = "40";
-</script>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-
-<?php include("fbegin.inc"); ?>
-<form action="services_unbound_acls.php" method="post" name="iform" id="iform">
-<?php
-if (!$savemsg)
- $savemsg = "";
-
-if ($input_errors)
- print_input_errors($input_errors);
-
-if ($savemsg)
- print_info_box($savemsg);
-
-if (is_subsystem_dirty("unbound"))
- print_info_box_np(gettext("The settings for the DNS Resolver have changed. You must apply the configuration to take affect."));
-?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="tabnavtbl">
- <ul id="tabnav">
- <?php
- $tab_array = array();
- $tab_array[] = array(gettext("General Settings"), false, "/services_unbound.php");
- $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php");
- $tab_array[] = array(gettext("Access Lists"), true, "/services_unbound_acls.php");
- display_top_tabs($tab_array, true);
- ?>
- </ul>
- </td>
- </tr>
- <tr>
- <td class="tabcont">
-
- <?php if($act=="new" || $act=="edit"): ?>
-
-
- <input name="aclid" type="hidden" value="<?=$id;?>">
- <input name="act" type="hidden" value="<?=$act;?>">
-
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
- <tr>
- <td colspan="2" valign="top" class="listtopic"><?=ucwords(sprintf(gettext("%s Access List"),$act));?></td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("Access List name");?></td>
- <td width="78%" class="vtable">
- <input name="aclname" type="text" class="formfld" id="aclname" size="30" maxlength="30" value="<?=htmlspecialchars($pconfig['aclname']);?>">
- <br />
- <span class="vexpl"><?=gettext("Provide an Access List name.");?></span>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("Action");?></td>
- <td width="78%" class="vtable">
- <select name="aclaction" class="formselect">
- <?php $types = explode(",", "Allow,Deny,Refuse,Allow Snoop"); foreach ($types as $type): ?>
- <option value="<?=strtolower($type);?>" <?php if (strtolower($type) == strtolower($pconfig['aclaction'])) echo "selected"; ?>>
- <?=htmlspecialchars($type);?>
- </option>
- <?php endforeach; ?>
- </select>
- <br/>
- <span class="vexpl">
- <?=gettext("Choose what to do with DNS requests that match the criteria specified below.");?> <br/>
- <?=gettext("<b>Deny:</b> This action stops queries from hosts within the netblock defined below.");?> <br/>
- <?=gettext("<b>Refuse:</b> This action also stops queries from hosts within the netblock defined below, but sends a DNS rcode REFUSED error message back to the client.");?> <br/>
- <?=gettext("<b>Allow:</b> This action allows queries from hosts within the netblock defined below.");?> <br/>
- <?=gettext("<b>Allow Snoop:</b> This action allows recursive and nonrecursive access from hosts within the netblock defined below. Used for cache snooping and ideally should only be configured for your administrative host.");?> <br/>
- </span>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("Networks");?></td>
- <td width="78%" class="vtable">
- <table id="maintable">
- <tbody>
- <tr>
- <td><div id="onecolumn"><?=gettext("Network");?></div></td>
- <td><div id="twocolumn"><?=gettext("CIDR");?></div></td>
- <td><div id="threecolumn"><?=gettext("Description");?></div></td>
- </tr>
- <?php $counter = 0; ?>
- <?php
- if($networkacl)
- foreach($networkacl as $item):
- ?>
- <?php
- $network = $item['acl_network'];
- $cidr = $item['mask'];
- $description = $item['description'];
- ?>
- <tr>
- <td>
- <input autocomplete="off" name="acl_network<?=$counter;?>" type="text" class="formfld unknown" id="acl_network<?=$counter;?>" size="40" value="<?=htmlspecialchars($network);?>" />
- </td>
- <td>
- <select name="mask<?=$counter;?>" class="formselect" id="mask<?=$counter;?>">
- <?php
- for ($i = 128; $i > 0; $i--) {
- echo "<option value=\"$i\" ";
- if ($i == $cidr) echo "selected";
- echo ">" . $i . "</option>";
- }
- ?>
- </select>
- </td>
- <td>
- <input autocomplete="off" name="description<?=$counter;?>" type="text" class="listbg" id="description<?=$counter;?>" size="40" value="<?=htmlspecialchars($description);?>" />
- </td>
- <td>
- <a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" /></a>
- </td>
- </tr>
- <?php $counter++; ?>
- <?php endforeach; ?>
- </tbody>
- <tfoot>
- </tfoot>
- </table>
- <a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
- <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
- </a>
- <script type="text/javascript">
- field_counter_js = 3;
- rows = 1;
- totalrows = <?php echo $counter; ?>;
- loaded = <?php echo $counter; ?>;
- </script>
-
- </td>
- </tr>
-
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
- <td width="78%" class="vtable">
- <input name="description" type="text" class="formfld unknown" id="description" size="52" maxlength="52" value="<?=htmlspecialchars($pconfig['description']);?>">
- <br />
- <span class="vexpl"><?=gettext("You may enter a description here for your reference.");?></span>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td width="22%" valign="top">&nbsp;</td>
- <td width="78%">
- &nbsp;<br>&nbsp;
- <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"> <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
- </td>
- </tr>
- </table>
- </form>
-
- <?php else: ?>
-
- <table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
- <thead>
- <tr>
- <td width="25%" class="listhdrr"><?=gettext("Access List Name"); ?></td>
- <td width="25%" class="listhdrr"><?=gettext("Action"); ?></td>
- <td width="40%" class="listhdrr"><?=gettext("Description"); ?></td>
- <td width="10%" class="list"></td>
- </tr>
- </thead>
- <tbody>
- <?php
- $i = 0;
- foreach($a_acls as $acl):
- ?>
- <tr ondblclick="document.location='services_unbound_acls.php?act=edit&id=<?=$i;?>'">
- <td class="listlr">
- <?=$acl['aclname'];?>
- </td>
- <td class="listr">
- <?=htmlspecialchars($acl['aclaction']);?>
- </td>
- <td class="listbg">
- <?=htmlspecialchars($acl['description']);?>
- </td>
- <td valign="middle" nowrap class="list">
- <a href="services_unbound_acls.php?act=edit&id=<?=$i;?>">
- <img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit access list"); ?>" width="17" height="17" border="0">
- </a>
- &nbsp;
- <a href="services_unbound_acls.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this access list?"); ?>')">
- <img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete access list"); ?>" width="17" height="17" border="0">
- </a>
- </td>
- </tr>
- <?php
- $i++;
- endforeach;
- ?>
- </tbody>
- <tfoot>
- <tr>
- <td class="list" colspan="4"></td>
- <td class="list">
- <a href="services_unbound_acls.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("Add new Access List"); ?>" width="17" height="17" border="0">
- </a>
- </td>
- </tr>
- <tr>
- <td colspan="4">
- <p>
- <?=gettext("Access Lists to control access to the DNS Resolver can be defined here.");?>
- </p>
- </td>
- </tr>
- </tfoot>
- </table>
-
- <?php endif; ?>
-
- </td>
- </tr>
-</table>
-</body>
-<?php include("fend.inc"); ?> \ No newline at end of file
diff --git a/usr/local/www/services_unbound_advanced.php b/usr/local/www/services_unbound_advanced.php
deleted file mode 100644
index 8341930..0000000
--- a/usr/local/www/services_unbound_advanced.php
+++ /dev/null
@@ -1,354 +0,0 @@
-<?php
-/* $Id$ */
-/*
- services_unbound_advanced.php
- part of the pfSense project (http://www.pfsense.com)
- Copyright (C) 2011 Warren Baker (warren@pfsense.org)
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-*/
-/*
- pfSense_MODULE: dnscache
-*/
-
-##|+PRIV
-##|*IDENT=page-services-unbound
-##|*NAME=Services: DNS Resolver Advanced page
-##|*DESCR=Allow access to the 'Services: DNS Resolver Advanced' page.
-##|*MATCH=services_unbound.php*
-##|-PRIV
-
-require_once("guiconfig.inc");
-require_once("unbound.inc");
-
-if(!is_array($config['unbound']))
- $config['unbound'] = array();
-$a_unboundcfg =& $config['unbound'];
-
-$pconfig['hideidentity'] = isset($config['unbound']['hideidentity']);
-$pconfig['hideversion'] = isset($config['unbound']['hideversion']);
-$pconfig['prefetch'] = isset($config['unbound']['prefetch']);
-$pconfig['prefetchkey'] = isset($config['unbound']['prefetchkey']);
-$pconfig['hardenglue'] = isset($config['unbound']['hardenglue']);
-$pconfig['dnssecstripped'] = isset($config['unbound']['dnssecstripped']);
-$pconfig['msgcachesize'] = $config['unbound']['msgcachesize'];
-$pconfig['outgoing_num_tcp'] = $config['unbound']['outgoing_num_tcp'];
-$pconfig['incoming_num_tcp'] = $config['unbound']['incoming_num_tcp'];
-$pconfig['edns_buffer_size'] = $config['unbound']['edns_buffer_size'];
-$pconfig['num_queries_per_thread'] = $config['unbound']['num_queries_per_thread'];
-$pconfig['jostle_timeout'] = $config['unbound']['jostle_timeout'];
-$pconfig['cache_max_ttl'] = $config['unbound']['cache_max_ttl'];
-$pconfig['cache_min_ttl'] = $config['unbound']['cache_min_ttl'];
-$pconfig['infra_host_ttl'] = $config['unbound']['infra_host_ttl'];
-$pconfig['infra_lame_ttl'] = $config['unbound']['infra_lame_ttl'];
-$pconfig['infra_cache_numhosts'] = $config['unbound']['infra_cache_numhosts'];
-$pconfig['unwanted_reply_threshold'] = $config['unbound']['unwanted_reply_threshold'];
-$pconfig['log_verbosity'] = $config['unbound']['log_verbosity'];
-
-if ($_POST) {
-
- unset($input_errors);
-
- if (!$input_errors) {
- $a_unboundcfg['hideidentity'] = ($_POST['hideidentity']) ? true : false;
- $a_unboundcfg['hideversion'] = ($_POST['hideversion']) ? true : false;
- $a_unboundcfg['prefetch'] = ($_POST['prefetch']) ? true : false;
- $a_unboundcfg['prefetchkey'] = ($_POST['prefetchkey']) ? true : false;
- $a_unboundcfg['hardenglue'] = ($_POST['hardenglue']) ? true : false;
- $a_unboundcfg['dnssecstripped'] = ($_POST['dnssecstripped']) ? true : false;
- $a_unboundcfg['custom_options'] = str_replace("\r\n", "\n", $_POST['custom_options']);
- write_config("DNS Resolver configured.");
-
- $retval = 0;
- $retval = services_unbound_configure();
- $savemsg = get_std_save_message($retval);
- }
-}
-
-$pgtitle = array(gettext("Services"),gettext("DNS Resolver"),gettext("Advanced"));
-include_once("head.inc");
-
-?>
-
-<script language="JavaScript">
-<!--
-function enable_change(enable_over) {
- var endis;
- endis = !(document.iform.enable.checked || enable_over);
- document.iform.regdhcp.disabled = endis;
- document.iform.regdhcpstatic.disabled = endis;
- document.iform.dhcpfirst.disabled = endis;
-}
-function show_advanced_dns() {
- document.getElementById("showadvbox").innerHTML='';
- aodiv = document.getElementById('showadv');
- aodiv.style.display = "block";
-}
-//-->
-</script>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<form action="services_unbound_advanced.php" method="post" name="iform" id="iform">
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (is_subsystem_dirty('hosts')): ?><p>
-<?php print_info_box_np(gettext("The configuration of the DNS Resolver, has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
-<?php endif; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="tabnavtbl">
-<?php
- $tab_array = array();
- $tab_array[] = array(gettext("General settings"), false, "services_unbound.php");
- $tab_array[] = array(gettext("Advanced settings"), true, "services_unbound_advanced.php");
- $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php");
- display_top_tabs($tab_array, true);
-?>
- </td>
- </tr>
- <tr>
- <td class="tabcont">
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
- <tr>
- <td colspan="2" valign="top" class="listtopic"><?=gettext("Advanced Resolver Options");?></td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Hide Identity");?></td>
- <td width="78%" class="vtable">
- <p><input name="hideidentity" type="checkbox" id="hideidentity" value="yes" <?php if ($pconfig['hideidentity'] === true) echo "checked";?> onClick="enable_change(false)"><br/>
- <?=gettext("If enabled, id.server and hostname.bind queries are refused.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Hide Version");?></td>
- <td width="78%" class="vtable">
- <p><input name="enable" type="checkbox" id="hideversion" value="yes" <?php if ($pconfig['hideversion'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
- <?=gettext("If enabled, version.server and version.bind queries are refused.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Prefetch Support");?></td>
- <td width="78%" class="vtable">
- <p><input name="enable" type="checkbox" id="prefetch" value="yes" <?php if ($pconfig['prefetch'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
- <?=gettext("Message cache elements are prefetched before they expire to help keep the cache up to date. When enabled, this option can cause an increase of around 10% more DNS traffic and load on the server, but frequently requested items will not expire from the cache.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Prefetch DNS Key Support");?></td>
- <td width="78%" class="vtable">
- <p><input name="enable" type="checkbox" id="prefetchkey" value="yes" <?php if ($pconfig['prefetchkey'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
- <?=sprintf(gettext("DNSKEY's are fetched earlier in the validation process when a %sDelegation signer%s is encountered. This helps lower the latency of requests but does utilize a little more CPU."), "<a href='http://en.wikipedia.org/wiki/List_of_DNS_record_types'>", "</a>");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Harden Glue");?></td>
- <td width="78%" class="vtable">
- <p><input name="enable" type="checkbox" id="hardenglue" value="yes" <?php if ($pconfig['hardenglue'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
- <?=gettext("Only trust glue if it is within the servers authority.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Harden DNSSEC data");?></td>
- <td width="78%" class="vtable">
- <p><input name="enable" type="checkbox" id="dnssecstripped" value="yes" <?php if ($pconfig['dnssecstripped'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
- <?=gettext("DNSSEC data is required for trust-anchored zones. If such data is absent, the zone becomes bogus. If this is disabled and no DNSSEC data is received, then the zone is made insecure.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Message Cache Size");?></td>
- <td width="78%" class="vtable"><p>
- <select id="msgcachesize" name="msgcachesize">
- <option value="4">4MB</option>
- <option value="10">10MB</option>
- <option value="20">20MB</option>
- <option value="50">50MB</option>
- <option value="100">100MB</option>
- <option value="250">250MB</option>
- <option value="512">512MB</option>
- </select><br/>
- <?=gettext("Size of the message cache. The message cache stores DNS rcodes and validation statuses. The RRSet cache will automatically be set to twice this amount. The RRSet cache contains the actual RR data. The default is 4 megabytes.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Outgoing TCP Buffers");?></td>
- <td width="78%" class="vtable"><p>
- <select id="outgoing_num_tcp" name="outgoing_num_tcp">
- <option value="0">0</option>
- <option value="10">10</option>
- <option value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- </select><br/>
- <?=gettext("The number of outgoing TCP buffers to allocate per thread. The default value is 10. If 0 is selected then no TCP queries, to authoritative servers, are done.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Incoming TCP Buffers");?></td>
- <td width="78%" class="vtable"><p>
- <select id="incoming_num_tcp" name="incoming_num_tcp">
- <option value="0">0</option>
- <option value="10">10</option>
- <option value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- </select><br/>
- <?=gettext("The number of incoming TCP buffers to allocate per thread. The default value is 10. If 0 is selected then no TCP queries, from clients, are accepted.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("EDNS Buffer Size");?></td>
- <td width="78%" class="vtable"><p>
- <select id="edns_buffer_size" name="edns_buffer_size">
- <option value="512">512</option>
- <option value="1480">1480</option>
- <option value="4096">4096</option>
- </select><br/>
- <?=gettext("Number of bytes size to advertise as the EDNS reassembly buffer size. This is the value that is used in UDP datagrams sent to peers. RFC recommendation is 4096 (which is the default). If you have fragmentation reassemble problems, usually seen as timeouts, then a value of 1480 should help. The 512 value bypasses most MTU path problems, but it can generate an excessive amount of TCP fallback.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Number of queries per thread");?></td>
- <td width="78%" class="vtable"><p>
- <select id="num_queries_per_thread" name="num_queries_per_thread">
- <option value="512">512</option>
- <option value="1024">1024</option>
- <option value="2048">2048</option>
- </select><br/>
- <?=gettext("The number of queries that every thread will service simultaneously. If more queries arrive that need to be serviced, and no queries can be jostled, then these queries are dropped.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Jostle Timeout");?></td>
- <td width="78%" class="vtable"><p>
- <select id="jostle_timeout" name="jostle_timeout">
- <option value="100">100</option>
- <option value="200">200</option>
- <option value="500">500</option>
- <option value="1000">1000</option>
- </select><br/>
- <?=gettext("This timeout is used for when the server is very busy. This protects against denial of service by slow queries or high query rates. The default value is 200 milliseconds.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Maximum TTL for RRsets and messages");?></td>
- <td width="78%" class="vtable"><p>
- <input type="text" id="cache_max_ttl" name="cache_max_ttl" size=5><br/>
- <?=gettext("Configure a maximum Time to live for RRsets and messages in the cache. The default is 86400 seconds (1 day). When the internal TTL expires the cache item is expired. This can be configured to force the resolver to query for data more often and not trust (very large) TTL values.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Minimum TTL for RRsets and messages");?></td>
- <td width="78%" class="vtable"><p>
- <input type="text" id="cache_min_ttl" name="cache_min_ttl" size=5><br/>
- <?=gettext("Configure a minimum Time to live for RRsets and messages in the cache. The default is 0 seconds. If the minimum value kicks in, the data is cached for longer than the domain owner intended, and thus less queries are made to look up the data. The 0 value ensures the data in the cache is as the domain owner intended. High values can lead to trouble as the data in the cache might not match up with the actual data anymore.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("TTL for Host cache entries");?></td>
- <td width="78%" class="vtable"><p>
- <select id="infra_host_ttl" name="infra_host_ttl">
- <option value="60">1 minute</option>
- <option value="120">2 minutes</option>
- <option value="300">5 minutes</option>
- <option value="600">10 minutes</option>
- <option value="900">15 minutes</option>
- </select><br/>
- <?=gettext("Time to live for entries in the host cache. The host cache contains roundtrip timing and EDNS support information. The default is 15 minutes.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("TTL for lame delegation");?></td>
- <td width="78%" class="vtable"><p>
- <select id="infra_lame_ttl" name="infra_lame_ttl">
- <option value="60">1 minute</option>
- <option value="120">2 minutes</option>
- <option value="300">5 minutes</option>
- <option value="600">10 minutes</option>
- <option value="900">15 minutes</option>
- </select><br/>
- <?=gettext("Time to live for when a delegation is considered to be lame. The default is 15 minutes.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Number of Hosts to cache");?></td>
- <td width="78%" class="vtable"><p>
- <select id="infra_cache_numhosts" name="infra_cache_numhosts">
- <option value="1000">1000</option>
- <option value="5000">5000</option>
- <option value="10000">10 000</option>
- <option value="20000">20 000</option>
- <option value="50000">50 000</option>
- </select><br/>
- <?=gettext("Number of hosts for which information is cached. The default is 10,000.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Unwanted Reply Threshold");?></td>
- <td width="78%" class="vtable"><p>
- <select id="unwanted_reply_threshold" name="unwanted_reply_threshold">
- <option value="disabled">disabled</option>
- <option value="5000000">5 million</option>
- <option value="10000000">10 million</option>
- <option value="20000000">20 million</option>
- <option value="40000000">40 million</option>
- <option value="50000000">50 million</option>
- </select><br/>
- <?=gettext("If enabled, a total number of unwanted replies is kept track of in every thread. When it reaches the threshold, a defensive action is taken and a warning is printed to the log file. This defensive action is to clear the RRSet and message caches, hopefully flushing away any poison. The default is disabled, but if enabled a a value of 10 million is suggested.");?></p>
- </td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Log level verbosity");?></td>
- <td width="78%" class="vtable"><p>
- <select id="log_verbosity" name="log_verbosity">
- <option value="0">Level 0</option>
- <option value="1">Level 1</option>
- <option value="2">Level 2</option>
- <option value="3">Level 3</option>
- <option value="4">Level 4</option>
- <option value="5">Level 5</option>
- </select><br/>
- <?=gettext("Select the log verbosity.");?></p>
- </p>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td width="22%"></td>
- <td width="78%">
- <input type="submit" name="Save" class="formbtn" id="save" value="Save" />
- </td>
- </tr>
- </table>
- </div>
- </td>
- </tr>
-</table>
-</form>
-<?php include("fend.inc"); ?>
-</body>
-</html> \ No newline at end of file
OpenPOWER on IntegriCloud