diff --git a/Makefile.am b/Makefile.am index 9cf1aab9..acc3ba29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -193,6 +193,7 @@ EXTRA_DIST = \ test/conf/hmac_cmd_open_close_cycle_access.conf \ test/conf/hmac_cmd_open_close_cycle_access2.conf \ test/conf/hmac_cmd_open_close_cycle_access3.conf \ + test/conf/hmac_cmd_open_close_cycle_access4.conf \ test/conf/hmac_get_key_access.conf \ test/conf/hmac_no_b64_access.conf \ test/conf/hmac_equal_keys_access.conf \ diff --git a/test/test-fwknop.pl b/test/test-fwknop.pl index cc6f07c9..eb1846bd 100755 --- a/test/test-fwknop.pl +++ b/test/test-fwknop.pl @@ -432,6 +432,7 @@ our %cf = ( 'hmac_cmd_open_close_cycle_access' => "$conf_dir/hmac_cmd_open_close_cycle_access.conf", 'hmac_cmd_open_close_cycle_access2' => "$conf_dir/hmac_cmd_open_close_cycle_access2.conf", 'hmac_cmd_open_close_cycle_access3' => "$conf_dir/hmac_cmd_open_close_cycle_access3.conf", + 'hmac_cmd_open_close_cycle_access4' => "$conf_dir/hmac_cmd_open_close_cycle_access4.conf", 'spa_destination' => "$conf_dir/destination_rule_fwknopd.conf", "${fw_conf_prefix}_spa_dst_snat" => "$conf_dir/${fw_conf_prefix}_spa_dst_snat_fwknopd.conf", 'hmac_spa_destination_access' => "$conf_dir/hmac_spa_destination_access.conf", diff --git a/test/tests/rijndael_hmac_cmd_open_close.pl b/test/tests/rijndael_hmac_cmd_open_close.pl index 210b5767..56b569e8 100644 --- a/test/tests/rijndael_hmac_cmd_open_close.pl +++ b/test/tests/rijndael_hmac_cmd_open_close.pl @@ -12,6 +12,7 @@ 'cmd_cycle_open_file' => '/tmp/127.0.0.2', 'cmd_cycle_close_file' => '/tmp/2127.0.0.2', 'key_file' => $cf{'rc_hmac_b64_key'}, + 'server_positive_output_matches' => [qr/Timer expired/], }, { 'category' => 'Rijndael+HMAC', @@ -25,6 +26,7 @@ 'cmd_cycle_open_file' => '/tmp/127.0.0.2_22_6TEST', 'cmd_cycle_close_file' => '/tmp/2127.0.0.2_22_6TEST', 'key_file' => $cf{'rc_hmac_b64_key'}, + 'server_positive_output_matches' => [qr/Timer expired/], }, { 'category' => 'Rijndael+HMAC', @@ -38,6 +40,21 @@ 'cmd_cycle_open_file' => '/tmp/127.0.0.2_127.0.0.2', 'cmd_cycle_close_file' => '/tmp/2127.0.0.2_127.0.0.2', 'key_file' => $cf{'rc_hmac_b64_key'}, + 'server_positive_output_matches' => [qr/Timer expired/], + }, + { + 'category' => 'Rijndael+HMAC', + 'subcategory' => 'client+server', + 'detail' => 'cmd open/close cycle (4)', + 'function' => \&spa_cmd_open_close_exec_cycle, + 'cmdline' => $default_client_hmac_args, + 'fwknopd_cmdline' => "$fwknopdCmd -c $cf{'def'} -a $cf{'hmac_cmd_open_close_cycle_access4'} " . + "-d $default_digest_file -p $default_pid_file $intf_str", + 'fw_rule_created' => $REQUIRE_NO_NEW_RULE, + 'cmd_cycle_open_file' => '/tmp/127.0.0.2_127.0.0.1', + 'cmd_cycle_close_file' => '/tmp/2127.0.0.1_127.0.0.2', + 'key_file' => $cf{'rc_hmac_b64_key'}, + 'server_positive_output_matches' => [qr/Timer expired/], }, );