[test suite] FORCE_SNAT requires FORCE_NAT test

This commit is contained in:
Michael Rash 2015-04-07 08:23:55 -04:00
parent 37c9f38565
commit 3d8b524019
3 changed files with 14 additions and 0 deletions

View File

@ -216,6 +216,8 @@ EXTRA_DIST = \
test/conf/hmac_force_snat_access.conf \
test/conf/hmac_force_masq_access.conf \
test/conf/hmac_no_b64_cygwin_access.conf \
test/conf/hmac_forward_all_access.conf \
test/conf/hmac_force_masq_no_dnat_access.conf \
test/conf/multi_pkts.pcap \
test/conf/fwknoprc_default_hmac_base64_key \
test/conf/fwknoprc_hmac_nat_rand_base64_key \
@ -257,6 +259,7 @@ EXTRA_DIST = \
test/conf/fwknoprc_stanza_list \
test/conf/icmp_pcap_filter_fwknopd.conf \
test/conf/invalid_expire_access.conf \
test/conf/require_force_nat_access.conf \
test/conf/invalid_source_access.conf \
test/conf/ipt_output_chain_fwknopd.conf \
test/conf/firewd_output_chain_fwknopd.conf \

View File

@ -416,6 +416,7 @@ our %cf = (
'future_exp_access' => "$conf_dir/future_expired_stanza_access.conf",
'exp_epoch_access' => "$conf_dir/expired_epoch_stanza_access.conf",
'invalid_exp_access' => "$conf_dir/invalid_expire_access.conf",
'require_force_nat_access' => "$conf_dir/require_force_nat_access.conf",
"${fw_conf_prefix}_output_chain" => "$conf_dir/${fw_conf_prefix}_output_chain_fwknopd.conf",
"invalid_${fw_conf_prefix}_input_chain" => "$conf_dir/invalid_${fw_conf_prefix}_input_chain_fwknopd.conf",
"invalid_${fw_conf_prefix}_input_chain2" => "$conf_dir/invalid_${fw_conf_prefix}_input_chain_2_fwknopd.conf",

View File

@ -1450,6 +1450,16 @@
'server_conf' => $cf{"${fw_conf_prefix}_snat_no_translate_ip"},
'key_file' => $cf{'rc_hmac_b64_key'},
},
{
'category' => 'Rijndael+HMAC',
'subcategory' => 'server',
'detail' => 'FORCE_SNAT requires FORCE_NAT',
'function' => \&generic_exec,
'cmdline' => "$fwknopdCmd -c $cf{'ipt_nat'} -a $cf{'require_force_nat_access'} " .
"-d $default_digest_file -p $default_pid_file $intf_str",
'positive_output_matches' => [qr/implies FORCE_NAT must also be used/i],
'exec_err' => $YES,
},
{
'category' => 'Rijndael+HMAC',