DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

[test suite] NAT DNS test coverage fix

Browse Source
This commit is contained in:
Michael Rash 2016-05-28 04:39:04 -07:00
parent 8366e118e2
commit 3a10ccff4d
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -138,7 +138,8 @@ EXTRA_DIST = \
test/conf/default_fwknopd.conf \ test/conf/default_fwknopd.conf \
test/conf/portrange_fwknopd.conf \ test/conf/portrange_fwknopd.conf \
test/conf/prepend_fwknopd.conf \ test/conf/prepend_fwknopd.conf \
test/conf/no_nat_dns_fwknopd.conf \ test/conf/firewd_no_nat_dns_fwknopd.conf \
test/conf/ipt_no_nat_dns_fwknopd.conf \
test/conf/ipt_custom_input_chain_fwknopd.conf \ test/conf/ipt_custom_input_chain_fwknopd.conf \
test/conf/firewd_custom_input_chain_fwknopd.conf \ test/conf/firewd_custom_input_chain_fwknopd.conf \
test/conf/ipt_custom_nat_chain_fwknopd.conf \ test/conf/ipt_custom_nat_chain_fwknopd.conf \

1
test/conf/no_nat_dns_fwknopd.conf → test/conf/firewd_no_nat_dns_fwknopd.conf
View File

@ -1,3 +1,4 @@
# default config - no variables set to allow defaults to be preserved # default config - no variables set to allow defaults to be preserved
ENABLE_FIREWD_FORWARDING Y;
ENABLE_NAT_DNS N; ENABLE_NAT_DNS N;

4
test/conf/ipt_no_nat_dns_fwknopd.conf Normal file
View File

@ -0,0 +1,4 @@
# default config - no variables set to allow defaults to be preserved
ENABLE_FIREWD_FORWARDING Y;
ENABLE_NAT_DNS N;

2
test/test-fwknop.pl
View File

@ -435,7 +435,7 @@ our %cf = (
'include_def_hmac_access' => "$conf_dir/include_def_hmac_access.conf", 'include_def_hmac_access' => "$conf_dir/include_def_hmac_access.conf",
'include_keys1_hmac_access' => "$conf_dir/include_keys1_hmac_access.conf", 'include_keys1_hmac_access' => "$conf_dir/include_keys1_hmac_access.conf",
'prepend_fwknopd' => "$conf_dir/prepend_fwknopd.conf", 'prepend_fwknopd' => "$conf_dir/prepend_fwknopd.conf",
'no_nat_dns_fwknopd' => "$conf_dir/no_nat_dns_fwknopd.conf", "${fw_conf_prefix}_no_nat_dns_fwknopd" => "$conf_dir/${fw_conf_prefix}_no_nat_dns_fwknopd.conf",
'hmac_cmd_access' => "$conf_dir/hmac_cmd_access.conf", 'hmac_cmd_access' => "$conf_dir/hmac_cmd_access.conf",
'hmac_cmd_setuid_access' => "$conf_dir/hmac_cmd_setuid_access.conf", 'hmac_cmd_setuid_access' => "$conf_dir/hmac_cmd_setuid_access.conf",
'hmac_cmd_giduid_access' => "$conf_dir/hmac_cmd_giduid_access.conf", 'hmac_cmd_giduid_access' => "$conf_dir/hmac_cmd_giduid_access.conf",

7
test/tests/rijndael_hmac.pl
View File

@ -1629,13 +1629,14 @@
'function' => \&spa_cycle, 'function' => \&spa_cycle,
'cmdline' => "$default_client_args_no_get_key --rc-file " . 'cmdline' => "$default_client_args_no_get_key --rc-file " .
"$cf{'rc_hmac_b64_key'} -N somehost:22", "$cf{'rc_hmac_b64_key'} -N somehost:22",
'fwknopd_cmdline' => qq/$fwknopdCmd -c $cf{'no_nat_dns_fwknopd'} -a $cf{'hmac_open_ports_access'} / . 'fwknopd_cmdline' => qq/$fwknopdCmd -c $cf{"${fw_conf_prefix}_no_nat_dns_fwknopd"} -a $cf{'hmac_open_ports_access'} / .
"-d $default_digest_file -p $default_pid_file $intf_str", "-d $default_digest_file -p $default_pid_file $intf_str",
'server_positive_output_matches' => [ 'server_positive_output_matches' => [
qr/requested NAT.*\snot enabled/], qr/NAT SPA message, but hostname is disabled/
],
'fw_rule_created' => $REQUIRE_NO_NEW_RULE, 'fw_rule_created' => $REQUIRE_NO_NEW_RULE,
'key_file' => $cf{'rc_hmac_b64_key'}, 'key_file' => $cf{'rc_hmac_b64_key'},
'server_conf' => $cf{'no_nat_dns_fwknopd'} 'server_conf' => $cf{"${fw_conf_prefix}_no_nat_dns_fwknopd"}
}, },
{ {