From 0c9fe83bb574a59569370f94346890782a0f2f8f Mon Sep 17 00:00:00 2001 From: Soner Tari Date: Sat, 18 Sep 2021 01:01:47 +0300 Subject: [PATCH] Update unit tests with master and cert log actions --- NEWS.md | 28 ++++++++++++++-------------- tests/check/opts.t.c | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NEWS.md b/NEWS.md index 4508f56..7b05a9b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,20 +3,20 @@ - Add filtering rules: - (Divert|Split|Pass|Block|Match) - ([from ( - user (username|*) [desc keyword]| - ip (clientaddr|*)| - *)] - [to ( - sni (servername[*]|*)| - cn (commonname[*]|*)| - host (host[*]|*)| - uri (uri[*]|*)| - ip (serveraddr|*)| - *)] - [log ([connect] [master] [cert] [content] [pcap] [mirror]|*)] - |*) + (Divert|Split|Pass|Block|Match) + ([from ( + user (username|*) [desc keyword]| + ip (clientaddr|*)| + *)] + [to ( + sni (servername[*]|*)| + cn (commonname[*]|*)| + host (host[*]|*)| + uri (uri[*]|*)| + ip (serveraddr|*)| + *)] + [log ([connect] [master] [cert] [content] [pcap] [mirror]|*)] + |*) - Add -Q test config option. diff --git a/tests/check/opts.t.c b/tests/check/opts.t.c index aadcbae..dd169d2 100644 --- a/tests/check/opts.t.c +++ b/tests/check/opts.t.c @@ -700,9 +700,9 @@ START_TEST(opts_set_passsite_01) ps = filter_rule_str(opts->filter_rules); #ifndef WITHOUT_USERAUTH - fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=, user=, keyword=, all=conns||, action=||pass||, log=|||, apply to=|sni|cn||"), "failed parsing passite example.com: %s", ps); + fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=, user=, keyword=, all=conns||, action=||pass||, log=|||||, apply to=|sni|cn||"), "failed parsing passite example.com: %s", ps); #else /* WITHOUT_USERAUTH */ - fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=, all=conns|, action=||pass||, log=|||, apply to=|sni|cn||"), "failed parsing passite example.com: %s", ps); + fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=, all=conns|, action=||pass||, log=|||||, apply to=|sni|cn||"), "failed parsing passite example.com: %s", ps); #endif /* WITHOUT_USERAUTH */ free(ps); @@ -730,9 +730,9 @@ START_TEST(opts_set_passsite_02) ps = filter_rule_str(opts->filter_rules); #ifndef WITHOUT_USERAUTH - fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=192.168.0.1, user=, keyword=, all=||, action=||pass||, log=|||, apply to=|sni|cn||"), "failed parsing passite example.com 192.168.0.1: %s", ps); + fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=192.168.0.1, user=, keyword=, all=||, action=||pass||, log=|||||, apply to=|sni|cn||"), "failed parsing passite example.com 192.168.0.1: %s", ps); #else /* WITHOUT_USERAUTH */ - fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=192.168.0.1, all=|, action=||pass||, log=|||, apply to=|sni|cn||"), "failed parsing passite example.com 192.168.0.1: %s", ps); + fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=192.168.0.1, all=|, action=||pass||, log=|||||, apply to=|sni|cn||"), "failed parsing passite example.com 192.168.0.1: %s", ps); #endif /* !WITHOUT_USERAUTH */ free(ps); @@ -760,7 +760,7 @@ START_TEST(opts_set_passsite_03) fail_unless(!opts->filter_rules->next, "next set"); ps = filter_rule_str(opts->filter_rules); - fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=, user=root, keyword=, all=||, action=||pass||, log=|||, apply to=|sni|cn||"), "failed parsing passite example.com root: %s", ps); + fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=, user=root, keyword=, all=||, action=||pass||, log=|||||, apply to=|sni|cn||"), "failed parsing passite example.com root: %s", ps); free(ps); opts_free(opts); @@ -787,7 +787,7 @@ START_TEST(opts_set_passsite_04) fail_unless(!opts->filter_rules->next, "next set"); ps = filter_rule_str(opts->filter_rules); - fail_unless(!strcmp(ps, "filter rule 0: site=*.google.com, exact, ip=, user=, keyword=android, all=|users|, action=||pass||, log=|||, apply to=|sni|cn||"), "failed parsing passite *.google.com * android: %s", ps); + fail_unless(!strcmp(ps, "filter rule 0: site=*.google.com, exact, ip=, user=, keyword=android, all=|users|, action=||pass||, log=|||||, apply to=|sni|cn||"), "failed parsing passite *.google.com * android: %s", ps); free(ps); opts_free(opts); @@ -842,17 +842,17 @@ START_TEST(opts_set_passsite_05) fail_unless(opts->filter_rules->next->next->next, "next->next->next not set"); fail_unless(opts->filter_rules->next->next->next->next, "next->next->next->next not set"); fail_unless(!opts->filter_rules->next->next->next->next->next, "next->next->next->next->next set"); - fail_unless(!strcmp(ps, "filter rule 0: site=*.google.com, exact, ip=, user=, keyword=android, all=|users|, action=||pass||, log=|||, apply to=|sni|cn||\n" - "filter rule 1: site=example.com, exact, ip=, user=root, keyword=, all=||, action=||pass||, log=|||, apply to=|sni|cn||\n" - "filter rule 2: site=example.com, exact, ip=192.168.0.1, user=, keyword=, all=||, action=||pass||, log=|||, apply to=|sni|cn||\n" - "filter rule 3: site=example.com, exact, ip=, user=, keyword=, all=|users|, action=||pass||, log=|||, apply to=|sni|cn||\n" - "filter rule 4: site=example.com, exact, ip=, user=, keyword=, all=conns||, action=||pass||, log=|||, apply to=|sni|cn||"), + fail_unless(!strcmp(ps, "filter rule 0: site=*.google.com, exact, ip=, user=, keyword=android, all=|users|, action=||pass||, log=|||||, apply to=|sni|cn||\n" + "filter rule 1: site=example.com, exact, ip=, user=root, keyword=, all=||, action=||pass||, log=|||||, apply to=|sni|cn||\n" + "filter rule 2: site=example.com, exact, ip=192.168.0.1, user=, keyword=, all=||, action=||pass||, log=|||||, apply to=|sni|cn||\n" + "filter rule 3: site=example.com, exact, ip=, user=, keyword=, all=|users|, action=||pass||, log=|||||, apply to=|sni|cn||\n" + "filter rule 4: site=example.com, exact, ip=, user=, keyword=, all=conns||, action=||pass||, log=|||||, apply to=|sni|cn||"), "failed parsing multiple passites: %s", ps); #else /* WITHOUT_USERAUTH */ fail_unless(!opts->filter_rules->next->next->next, "next->next->next set"); - fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=192.168.0.1, all=|, action=||pass||, log=|||, apply to=|sni|cn||\n" - "filter rule 1: site=example.com, exact, ip=, all=conns|, action=||pass||, log=|||, apply to=|sni|cn||\n" - "filter rule 2: site=example.com, exact, ip=, all=conns|, action=||pass||, log=|||, apply to=|sni|cn||"), + fail_unless(!strcmp(ps, "filter rule 0: site=example.com, exact, ip=192.168.0.1, all=|, action=||pass||, log=|||||, apply to=|sni|cn||\n" + "filter rule 1: site=example.com, exact, ip=, all=conns|, action=||pass||, log=|||||, apply to=|sni|cn||\n" + "filter rule 2: site=example.com, exact, ip=, all=conns|, action=||pass||, log=|||||, apply to=|sni|cn||"), "failed parsing multiple passites: %s", ps); #endif /* WITHOUT_USERAUTH */ free(ps);