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

Start using the new utility for monitoring dns hostnames used in aliases.

Browse Source
This commit is contained in:
Ermal Lui 2009-12-17 16:08:01 +00:00
parent e5ac67edfd
commit bdf81ce304
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
etc/inc/filter.inc
View File

@ -50,6 +50,9 @@ $time_based_rules = false;
/* Used to hold the interface list that will be used on ruleset creation. */
$FilterIflist = array();
/* Used for the hostname dns resolver */
$filterdns = "";
function flowtable_configure() {
global $config, $g;
return;
@ -147,11 +150,12 @@ function delete_states_for_down_gateways() {
/* reload filter sync */
function filter_configure_sync() {
global $config, $g, $after_filter_configure_run, $FilterIflist, $GatewaysList, $GatewayGroupsList;
global $time_based_rules;
global $time_based_rules, $filterdns;
/* Use config lock to not allow recursion and config changes during this run. */
$filterlck = lock('config');
filter_pflog_start();
update_filter_reload_status("Initializing");
@ -305,6 +309,16 @@ function filter_configure_sync() {
update_filter_reload_status("Starting up layer7 daemon");
layer7_start_l7daemon();
if (!empty($filterdns)) {
$filterdnsfd = fopen("{$g['varetc_path']}/filterdns.conf", "w");
if ($filterdnsfd) {
fwrite($filterdns);
fclose($filterdnsfd);
}
killbypid(trim(file_get_contents("{$g['tmp_path']}/filterdns.pid"), " \n"));
mwexec("/usr/local/sbin/filterdns {$g['tmp_path']}/filterdns.pid 300 {$g['varetc_path']}/filterdns.conf");
}
/* run items scheduled for after filter configure run */
$fda = fopen("{$g['tmp_path']}/commands.txt", "w");
if ($fda) {
@ -336,7 +350,6 @@ function filter_configure_sync() {
if ($g['booting'] == true)
echo ".";
find_dns_aliases();
update_filter_reload_status("Processing down interface states");
delete_states_for_down_gateways();
@ -379,7 +392,7 @@ function filter_generate_scrubing()
}
function filter_generate_nested_alias($name, $alias, &$aliasnesting, &$aliasaddrnesting) {
global $aliastable;
global $aliastable, $filterdns;
$addresses = split(" ", $alias);
$finallist = "";
@ -392,6 +405,10 @@ function filter_generate_nested_alias($name, $alias, &$aliasnesting, &$aliasaddr
if (!isset($aliasnesting[$address]))
$tmpline = filter_generate_nested_alias($address, $aliastable[$address], $aliasnesting, $aliasaddrnesting);
} else if (!isset($aliasaddrnesting[$address])) {
if (!is_ipaddr($address) && !is_subnet($address)) {
$filterdns .= "{$address} = {$name}\n";
continue;
}
$aliasaddrnesting[$address] = $address;
$tmpline = " $address";
}
@ -426,7 +443,12 @@ function filter_generate_aliases() {
$aliasaddrnesting = array();
$addrlist = filter_generate_nested_alias($aliased['name'], $aliased['address'], $aliasnesting, $aliasaddrnesting);
if ($aliased['type'] == "host" || $aliased['type'] == "network") {
$aliases .= "table <{$aliased['name']}> { {$addrlist}{$extralias} } \n";
$tableaddrs = "{$addrlist}{$extralias}";
if (empty($tableaddrs))
$aliases .= "table <{$aliased['name']}> persist\n";
else
$aliases .= "table <{$aliased['name']}> { {$addrlist}{$extralias} } \n";
$aliases .= "{$aliased['name']} = \"<{$aliased['name']}>\"\n";
} else if ($aliased['type'] == "openvpn") {
$openvpncfg = array();

18
etc/inc/pfsense-utils.inc
View File

@ -1395,24 +1395,6 @@ function add_hostname_to_watch($hostname) {
}
}
function find_dns_aliases() {
global $config, $g;
foreach((array) $config['aliases']['alias'] as $alias) {
$alias_value = $alias['address'];
$alias_name = $alias['name'];
if(stristr($alias_value, " ")) {
$alias_split = split(" ", $alias_value);
foreach($alias_split as $as) {
if(is_fqdn($as))
add_hostname_to_watch($as);
}
} else {
if(is_fqdn($alias_value))
add_hostname_to_watch($alias_value);
}
}
}
function is_fqdn($fqdn) {
$hostname = false;
if(preg_match("/[-A-Z0-9\.]+\.[-A-Z0-9\.]+/i", $fqdn)) {