[test suite] multi-include non-recursive access.conf test

This commit is contained in:
Michael Rash
2015-12-12 06:23:16 -08:00
parent 66458dfa49
commit 7757929624
4 changed files with 38 additions and 0 deletions
+1
View File
@@ -158,6 +158,7 @@ EXTRA_DIST = \
test/conf/include2_hmac_access.conf \
test/conf/include3_hmac_access.conf \
test/conf/include_r1_hmac_access.conf \
test/conf/include_m1_hmac_access.conf \
test/conf/include_r2_hmac_access.conf \
test/conf/gpg_access.conf \
test/conf/gpg_hmac_access.conf \
+24
View File
@@ -0,0 +1,24 @@
### include a bunch of access.conf files to make sure they are all supported
%include conf/hmac_spa_destination2_access.conf
%include conf/hmac_spa_destination3_access.conf
%include conf/hmac_spa_destination4_access.conf
%include conf/hmac_spa_destination5_access.conf
%include conf/hmac_spa_destination_access.conf
%include conf/hmac_force_nat_access.conf
%include conf/hmac_force_nat_forward_all_access.conf
%include conf/hmac_force_snat_access.conf
%include conf/hmac_forward_all_access.conf
%include conf/hmac_forward_all_and_dnat_access.conf
%include conf/hmac_forward_all_masq_access.conf
SOURCE ANY
KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
FW_ACCESS_TIMEOUT 3
SOURCE 99.9.9.9
KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
FW_ACCESS_TIMEOUT 3
+1
View File
@@ -414,6 +414,7 @@ our %cf = (
'include2_hmac_access' => "$conf_dir/include2_hmac_access.conf",
'include_r1_hmac_access' => "$conf_dir/include_r1_hmac_access.conf",
'include_r2_hmac_access' => "$conf_dir/include_r2_hmac_access.conf",
'include_m1_hmac_access' => "$conf_dir/include_m1_hmac_access.conf",
'hmac_cmd_access' => "$conf_dir/hmac_cmd_access.conf",
'hmac_cmd_setuid_access' => "$conf_dir/hmac_cmd_setuid_access.conf",
'hmac_cmd_giduid_access' => "$conf_dir/hmac_cmd_giduid_access.conf",
+12
View File
@@ -465,6 +465,8 @@
'exec_err' => $YES,
'cmdline' => "$fwknopdCmd $default_server_conf_args --sudo-exe /etc/hosts"
},
### access.conf %include directive tests
{
'category' => 'basic operations',
'subcategory' => 'server',
@@ -475,6 +477,16 @@
"-c $cf{'def'} -d $default_digest_file -p $default_pid_file",
'positive_output_matches' => [qr/Refusing to go deeper than/],
},
{
'category' => 'basic operations',
'subcategory' => 'server',
'detail' => 'access.conf multi-include',
'function' => \&generic_exec,
'cmdline' => "$fwknopdCmd --exit-parse-config -a $cf{'include_m1_hmac_access'} " .
qq/-c $cf{"${fw_conf_prefix}_nat"} -d $default_digest_file -p $default_pid_file -v/,
'positive_output_matches' => [qr/Configs parsed/],
},
{
'category' => 'basic operations',
'subcategory' => 'server',