From aeed8323f7c1cf3c69f85432b0118b6932e79ce4 Mon Sep 17 00:00:00 2001 From: Michael Rash Date: Tue, 10 Dec 2013 21:31:03 -0600 Subject: [PATCH] [test suite] multi-packet pcap test for pcap_dispatch() validation This commit adds a new pcap file to the test suite with an SPA packet after 99 other garbage packets. This can be used for pcap_dispatch() testing, though this is not meant to be super instensive - it is just to ensure that if a PCAP_DISPATCH_COUNT of, say, 10 is selected that the SPA is still seen by fwknopd. This commit is in support of #110. --- Makefile.am | 1 + test/conf/multi_pkts.pcap | Bin 0 -> 46890 bytes test/test-fwknop.pl | 3 ++- test/tests/rijndael.pl | 2 +- test/tests/rijndael_hmac.pl | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 test/conf/multi_pkts.pcap diff --git a/Makefile.am b/Makefile.am index 89e4a4d7..da2f0c83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -188,6 +188,7 @@ 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/multi_pkts.pcap \ test/conf/fwknoprc_default_hmac_base64_key \ test/conf/fwknoprc_hmac_key2 \ test/conf/fwknoprc_gpg_hmac_key \ diff --git a/test/conf/multi_pkts.pcap b/test/conf/multi_pkts.pcap new file mode 100644 index 0000000000000000000000000000000000000000..69c4f67186acdf690a04928b3a559cdb9b06b621 GIT binary patch literal 46890 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 literal 0 HcmV?d00001 diff --git a/test/test-fwknop.pl b/test/test-fwknop.pl index e36a0400..b13352bd 100755 --- a/test/test-fwknop.pl +++ b/test/test-fwknop.pl @@ -30,7 +30,8 @@ my $test_suite_path = 'test-fwknop.pl'; my $gpg_dir_orig_tar = 'gpg_dirs_orig.tar.gz'; our $gpg_client_home_dir = "$conf_dir/client-gpg"; our $gpg_client_home_dir_no_pw = "$conf_dir/client-gpg-no-pw"; -our $replay_pcap_file = "$conf_dir/spa_replay.pcap"; +our $replay_pcap_file = "$conf_dir/spa_replay.pcap"; +our $multi_pkts_pcap_file = "$conf_dir/multi_pkts.pcap"; our $lib_dir = '../lib/.libs'; diff --git a/test/tests/rijndael.pl b/test/tests/rijndael.pl index a4260f06..efd9e609 100644 --- a/test/tests/rijndael.pl +++ b/test/tests/rijndael.pl @@ -956,7 +956,7 @@ ### --pcap-file { 'category' => 'Rijndael', - 'subcategory' => 'client+server', + 'subcategory' => 'server', 'detail' => '--pcap-file processing', 'function' => \&process_pcap_file_directly, 'cmdline' => '', diff --git a/test/tests/rijndael_hmac.pl b/test/tests/rijndael_hmac.pl index c3003d15..65718600 100644 --- a/test/tests/rijndael_hmac.pl +++ b/test/tests/rijndael_hmac.pl @@ -106,6 +106,20 @@ 'server_positive_output_matches' => [qr/Args\scontain\sinvalid\sdata/], }, + { + 'category' => 'Rijndael+HMAC', + 'subcategory' => 'server', + 'detail' => '--pcap-file processing', + 'function' => \&process_pcap_file_directly, + 'cmdline' => '', + 'fwknopd_cmdline' => "$fwknopdCmd -c $cf{'def'} -a $cf{'hmac_access'} " . + "-d $default_digest_file -p $default_pid_file " . + "--pcap-file $multi_pkts_pcap_file --foreground $verbose_str " . + "--verbose --verbose --verbose", + 'fw_rule_created' => $NEW_RULE_REQUIRED, + 'fw_rule_removed' => $NEW_RULE_REMOVED, + }, + { 'category' => 'Rijndael+HMAC', 'subcategory' => 'client+server',