summaryrefslogtreecommitdiffstats
path: root/reg-tests/http-messaging
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--reg-tests/http-messaging/h1_host_normalization.vtc152
-rw-r--r--reg-tests/http-messaging/h1_request_target_validation.vtc111
-rw-r--r--reg-tests/http-messaging/truncated.vtc1
3 files changed, 259 insertions, 5 deletions
diff --git a/reg-tests/http-messaging/h1_host_normalization.vtc b/reg-tests/http-messaging/h1_host_normalization.vtc
index 48174b8..909d525 100644
--- a/reg-tests/http-messaging/h1_host_normalization.vtc
+++ b/reg-tests/http-messaging/h1_host_normalization.vtc
@@ -175,22 +175,62 @@ syslog S1 -level info {
# C32
recv
- expect ~ "^.* uri: GET http:// HTTP/1.1; host: {}$"
+ expect ~ "^.* uri: GET http:/// HTTP/1.1; host: {}$"
barrier b1 sync
# C33
recv
- expect ~ "^.* uri: GET https:// HTTP/1.1; host: {}$"
+ expect ~ "^.* uri: GET https:/// HTTP/1.1; host: {}$"
barrier b1 sync
# C34
recv
- expect ~ "^.* uri: GET http:// HTTP/1.1; host: {}$"
+ expect ~ "^.* uri: GET http:/// HTTP/1.1; host: {}$"
barrier b1 sync
# C35
recv
- expect ~ "^.* uri: GET https:// HTTP/1.1; host: {}$"
+ expect ~ "^.* uri: GET https:/// HTTP/1.1; host: {}$"
+ barrier b1 sync
+
+ # C36
+ recv
+ expect ~ "^.* uri: GET http://hostname/ HTTP/1.1; host: {hostname}$"
+ barrier b1 sync
+
+ # C37
+ recv
+ expect ~ "^.* uri: GET http://hostname/ HTTP/1.1; host: {hostname}$"
+ barrier b1 sync
+
+ # C38
+ recv
+ expect ~ "^.* uri: GET http://hostname/ HTTP/1.1; host: {hostname}$"
+ barrier b1 sync
+
+ # C39
+ recv
+ expect ~ "^.* uri: GET https://hostname/ HTTP/1.1; host: {hostname}$"
+ barrier b1 sync
+
+ # C40
+ recv
+ expect ~ "^.* uri: GET https://hostname/ HTTP/1.1; host: {hostname}$"
+ barrier b1 sync
+
+ # C41
+ recv
+ expect ~ "^.* uri: GET https://hostname/ HTTP/1.1; host: {hostname}$"
+ barrier b1 sync
+
+ # C42
+ recv
+ expect ~ "^.* uri: GET http://hostname:81/ HTTP/1.1; host: {hostname:81}$"
+ barrier b1 sync
+
+ # C43
+ recv
+ expect ~ "^.* uri: GET https://hostname:444/ HTTP/1.1; host: {hostname:444}$"
} -start
@@ -759,4 +799,108 @@ client c35 -connect ${h1_fe_sock} {
expect resp.status == 200
} -run
+# Wait matching on log message
+barrier b1 sync
+
+client c36 -connect ${h1_fe_sock} {
+ txreq \
+ -req "GET" \
+ -url "http://hostname" \
+ -hdr "host: hostname"
+
+ rxresp
+ expect resp.status == 200
+} -run
+
+# Wait matching on log message
+barrier b1 sync
+
+client c37 -connect ${h1_fe_sock} {
+ txreq \
+ -req "GET" \
+ -url "http://hostname:80" \
+ -hdr "host: hostname"
+
+ rxresp
+ expect resp.status == 200
+} -run
+
+# Wait matching on log message
+barrier b1 sync
+
+client c38 -connect ${h1_fe_sock} {
+ txreq \
+ -req "GET" \
+ -url "http://hostname:" \
+ -hdr "host: hostname"
+
+ rxresp
+ expect resp.status == 200
+} -run
+
+# Wait matching on log message
+barrier b1 sync
+
+client c39 -connect ${h1_fe_sock} {
+ txreq \
+ -req "GET" \
+ -url "https://hostname" \
+ -hdr "host: hostname"
+
+ rxresp
+ expect resp.status == 200
+} -run
+
+# Wait matching on log message
+barrier b1 sync
+
+client c40 -connect ${h1_fe_sock} {
+ txreq \
+ -req "GET" \
+ -url "https://hostname:443" \
+ -hdr "host: hostname"
+
+ rxresp
+ expect resp.status == 200
+} -run
+
+# Wait matching on log message
+barrier b1 sync
+
+client c41 -connect ${h1_fe_sock} {
+ txreq \
+ -req "GET" \
+ -url "https://hostname:" \
+ -hdr "host: hostname"
+
+ rxresp
+ expect resp.status == 200
+} -run
+
+# Wait matching on log message
+barrier b1 sync
+
+client c42 -connect ${h1_fe_sock} {
+ txreq \
+ -req "GET" \
+ -url "http://hostname:81" \
+ -hdr "host: hostname:81"
+
+ rxresp
+ expect resp.status == 200
+} -run
+
+# Wait matching on log message
+barrier b1 sync
+
+client c43 -connect ${h1_fe_sock} {
+ txreq \
+ -req "GET" \
+ -url "https://hostname:444" \
+ -hdr "host: hostname:444"
+
+ rxresp
+ expect resp.status == 200
+} -run
+
syslog S1 -wait
diff --git a/reg-tests/http-messaging/h1_request_target_validation.vtc b/reg-tests/http-messaging/h1_request_target_validation.vtc
new file mode 100644
index 0000000..63e194a
--- /dev/null
+++ b/reg-tests/http-messaging/h1_request_target_validation.vtc
@@ -0,0 +1,111 @@
+varnishtest "HTTP request tests: H1 request target parsing"
+
+feature ignore_unknown_macro
+
+#REQUIRE_VERSION=3.0
+
+haproxy h1 -conf {
+ global
+ # WT: limit false-positives causing "HTTP header incomplete" due to
+ # idle server connections being randomly used and randomly expiring
+ # under us.
+ tune.idle-pool.shared off
+
+ defaults
+ mode http
+ timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+
+ listen li1
+ bind "fd@${li1}"
+ http-request return status 200
+} -start
+
+client c1 -connect ${h1_li1_sock} {
+ txreq -req "OPTIONS" -url "*"
+ rxresp
+ expect resp.status == 200
+
+} -run
+
+client c2 -connect ${h1_li1_sock} {
+ txreq -req "OPTIONS" -url "/"
+ rxresp
+ expect resp.status == 200
+
+} -run
+
+client c3 -connect ${h1_li1_sock} {
+ txreq -req "OPTIONS" -url "http://haproxy.org" \
+ -hdr "Host: haproxy.org"
+ rxresp
+ expect resp.status == 200
+
+} -run
+
+client c4 -connect ${h1_li1_sock} {
+ txreq -req "OPTIONS" -url "*/test"
+ rxresp
+ expect resp.status == 400
+} -run
+
+client c5 -connect ${h1_li1_sock} {
+ txreq -req "GET" -url "*"
+ rxresp
+ expect resp.status == 400
+} -run
+
+client c6 -connect ${h1_li1_sock} {
+ txreq -req "CONNECT" -url "haproxy.org:80" \
+ -hdr "Host: haproxy.org"
+ rxresp
+ expect resp.status == 200
+
+} -run
+
+client c7 -connect ${h1_li1_sock} {
+ txreq -req "CONNECT" -url "haproxy.org" \
+ -hdr "Host: haproxy.org"
+ rxresp
+ expect resp.status == 400
+} -run
+
+client c8 -connect ${h1_li1_sock} {
+ txreq -req "CONNECT" -url "/"
+ rxresp
+ expect resp.status == 400
+} -run
+
+client c9 -connect ${h1_li1_sock} {
+ txreq -req "CONNECT" -url "http://haproxy.org:80" \
+ -hdr "Host: haproxy.org"
+ rxresp
+ expect resp.status == 400
+} -run
+
+client c11 -connect ${h1_li1_sock} {
+ txreq -req "GET" -url "/" \
+ -hdr "Host: haproxy.org"
+ rxresp
+ expect resp.status == 200
+} -run
+
+client c12 -connect ${h1_li1_sock} {
+ txreq -req "GET" -url "haproxy.org:80" \
+ -hdr "Host: haproxy.org"
+ rxresp
+ expect resp.status == 400
+} -run
+
+client c13 -connect ${h1_li1_sock} {
+ txreq -req "GET" -url "admin"
+ rxresp
+ expect resp.status == 400
+} -run
+
+client c14 -connect ${h1_li1_sock} {
+ txreq -req "GET" -url "admin/a/b"
+ rxresp
+ expect resp.status == 400
+} -run
diff --git a/reg-tests/http-messaging/truncated.vtc b/reg-tests/http-messaging/truncated.vtc
index 7579f6d..7f262d7 100644
--- a/reg-tests/http-messaging/truncated.vtc
+++ b/reg-tests/http-messaging/truncated.vtc
@@ -1,5 +1,4 @@
varnishtest "HTTP response size tests: H2->H1 (HTX and legacy mode)"
-#REQUIRE_VERSION=1.9
feature ignore_unknown_macro
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 14:33:15 +0000