From ade618396d90942eb2565a80de7cdd55d8f7dc14 Mon Sep 17 00:00:00 2001 From: andre Date: Mon, 5 May 2014 11:02:29 +0000 Subject: [PATCH] Add two more regression tests to relayd, these cover "digest" and "file" keywords. ok reyk --- .../relayd/args-http-filter-url-digest.pl | 31 +++++++++++++++++++ usr.sbin/relayd/args-http-filter-url-file.in | 2 ++ usr.sbin/relayd/args-http-filter-url-file.pl | 29 +++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 usr.sbin/relayd/args-http-filter-url-digest.pl create mode 100644 usr.sbin/relayd/args-http-filter-url-file.in create mode 100644 usr.sbin/relayd/args-http-filter-url-file.pl diff --git a/usr.sbin/relayd/args-http-filter-url-digest.pl b/usr.sbin/relayd/args-http-filter-url-digest.pl new file mode 100644 index 00000000000..c3739a80178 --- /dev/null +++ b/usr.sbin/relayd/args-http-filter-url-digest.pl @@ -0,0 +1,31 @@ +use strict; +use warnings; + +our %args = ( + client => { + func => \&http_client, + path => "a/b/c/d/e/f/gindex.html", + loggrep => [ + qr/403 Forbidden/, + qr/Server: OpenBSD relayd/, + qr/Connection: close/, + ], + httpnok => 1, + }, + relayd => { + protocol => [ "http", + 'return error', + 'url filter digest 0ac8ccfc03317891ae2820de10ee2167d31ebd16 log', + ], + loggrep => { + qr/rejecting request \(403 Forbidden\)/ => 1, + qr/\[0ac8ccfc03317891ae2820de10ee2167d31ebd16:/ => 1, + }, + }, + server => { + noserver => 1, + nocheck => 1, + }, +); + +1; diff --git a/usr.sbin/relayd/args-http-filter-url-file.in b/usr.sbin/relayd/args-http-filter-url-file.in new file mode 100644 index 00000000000..20fd8269428 --- /dev/null +++ b/usr.sbin/relayd/args-http-filter-url-file.in @@ -0,0 +1,2 @@ +/3 +/0 diff --git a/usr.sbin/relayd/args-http-filter-url-file.pl b/usr.sbin/relayd/args-http-filter-url-file.pl new file mode 100644 index 00000000000..a048563a1ad --- /dev/null +++ b/usr.sbin/relayd/args-http-filter-url-file.pl @@ -0,0 +1,29 @@ +use strict; +use warnings; + +my @lengths = (1, 2, 4, 0, 3); +our %args = ( + client => { + func => sub { eval { http_client(@_) }; warn $@ }, + lengths => \@lengths, + loggrep => qr/Forbidden/, + }, + relayd => { + protocol => [ "http", + 'return error', + 'label test_reject_label', + 'path filter file args-http-filter-url-file.in log', + 'no label', + ], + loggrep => { + qr/rejecting request/ => 1, + qr/\[test_reject_label\, \/0\:/ => 1 + }, + }, + server => { + func => \&http_server, + lengths => (1, 2, 4), + }, +); + +1; -- 2.20.1