[test suite] WGET_CMD and RESOLVE_HTTP_ONLY fwknoprc test coverage

This commit is contained in:
Michael Rash 2014-07-27 22:31:49 -04:00
parent 7f830e0239
commit 655abf6f0b
5 changed files with 40 additions and 0 deletions

View File

@ -173,6 +173,7 @@ EXTRA_DIST = \
test/conf/fwknoprc_hmac_time_offset_days \
test/conf/fwknoprc_hmac_http_resolve \
test/conf/fwknoprc_hmac_https_resolve \
test/conf/fwknoprc_hmac_http_only_resolve \
test/conf/fwknoprc_gpg_hmac_sha512_key \
test/conf/gpg_hmac_sha512_access.conf \
test/conf/fwknoprc_hmac_sha512_base64_key \

View File

@ -0,0 +1,22 @@
[default]
ACCESS tcp/22
SPA_SERVER 127.0.0.1
ALLOW_IP resolve
USE_HMAC Y
HMAC_DIGEST_TYPE sha256
KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
DIGEST_TYPE sha256
SPA_SERVER_PROTO udp
SPA_SERVER_PORT 62201
SPOOF_USER mbrtest
VERBOSE Y
TIME_OFFSET -1s
ENCRYPTION_MODE CBC
USE_GPG N
USE_GPG_AGENT N
RESOLVE_IP_HTTPS Y
RESOLVE_HTTP_ONLY Y
HTTP_USER_AGENT FwknopTestSuite/2.6
WGET_CMD wget
RESOLVE_URL http://www.cipherdyne.org/cgi-bin/myip

View File

@ -17,4 +17,5 @@ USE_GPG N
USE_GPG_AGENT N
RESOLVE_IP_HTTPS Y
HTTP_USER_AGENT FwknopTestSuite/2.6
WGET_CMD wget
RESOLVE_URL https://www.cipherdyne.org/cgi-bin/myip

View File

@ -154,6 +154,7 @@ our %cf = (
'rc_hmac_defaults' => "$conf_dir/fwknoprc_hmac_defaults",
'rc_hmac_http_resolve' => "$conf_dir/fwknoprc_hmac_http_resolve",
'rc_hmac_https_resolve' => "$conf_dir/fwknoprc_hmac_https_resolve",
'rc_hmac_http_only_resolve' => "$conf_dir/fwknoprc_hmac_http_only_resolve",
'rc_hmac_nat_rand_b64_key' => "$conf_dir/fwknoprc_hmac_nat_rand_base64_key",
'rc_hmac_spoof_src_b64_key' => "$conf_dir/fwknoprc_hmac_spoof_src_base64_key",
'rc_hmac_sha512_b64_key' => "$conf_dir/fwknoprc_hmac_sha512_base64_key",
@ -591,6 +592,9 @@ our $client_hmac_rc_http_resolve = "$lib_view_str $valgrind_str " .
our $client_hmac_rc_https_resolve = "$lib_view_str $valgrind_str " .
"$fwknopCmd --no-save-args --rc-file $cf{'rc_hmac_https_resolve'}";
our $client_hmac_rc_http_only_resolve = "$lib_view_str $valgrind_str " .
"$fwknopCmd --no-save-args --rc-file $cf{'rc_hmac_http_only_resolve'}";
our $client_ip_resolve_args = "$lib_view_str $valgrind_str " .
"$fwknopCmd -A tcp/22 -R -D $loopback_ip --get-key " .
"$local_key_file $verbose_str";

View File

@ -713,6 +713,18 @@
'fw_rule_removed' => $NEW_RULE_REMOVED,
'key_file' => $cf{'rc_hmac_https_resolve'},
},
{
'category' => 'Rijndael+HMAC',
'subcategory' => 'client+server',
'detail' => 'client IP resolve rc file (3)',
'function' => \&spa_cycle,
'cmdline' => $client_hmac_rc_http_only_resolve,
'no_ip_check' => 1,
'fwknopd_cmdline' => "$fwknopdCmd $default_server_hmac_conf_args $intf_str",
'fw_rule_created' => $NEW_RULE_REQUIRED,
'fw_rule_removed' => $NEW_RULE_REMOVED,
'key_file' => $cf{'rc_hmac_http_only_resolve'},
},
{
'category' => 'Rijndael+HMAC',