Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP more WS_Overflowed() checks #4235

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

WIP more WS_Overflowed() checks #4235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33c9573
WIP more WS_Overflowed() checks
nigoroll Nov 25, 2024
52c8a31
WIP add stevendore's regression test, modified
nigoroll Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions bin/varnishd/cache/cache_backend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,10 @@ vbe_dir_gethdrs(VRT_CTX, VCL_BACKEND d)
http_PrintfHeader(bo->bereq, "Host: %s", bp->hosthdr);

do {
if (WS_Overflowed(bo->ws)) {
VSLb(bo->vsl, SLT_FetchError, "workspace_backend overflow");
return (-1);
}
if (bo->htc != NULL)
CHECK_OBJ_NOTNULL(bo->htc->doclose, STREAM_CLOSE_MAGIC);
pfd = vbe_dir_getfd(ctx, wrk, d, bp, extrachance == 0 ? 1 : 0);
Expand Down
12 changes: 12 additions & 0 deletions bin/varnishd/cache/cache_req_fsm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ cnt_deliver(struct worker *wrk, struct req *req)

assert(req->restarts <= cache_param->max_restarts);

if (WS_Overflowed(req->ws))
wrk->vpi->handling = VCL_RET_FAIL;
if (wrk->vpi->handling != VCL_RET_DELIVER) {
HSH_Cancel(wrk, req->objcore, NULL);
(void)HSH_DerefObjCore(wrk, &req->objcore, HSH_RUSH_POLICY);
Expand Down Expand Up @@ -648,6 +650,8 @@ cnt_lookup(struct worker *wrk, struct req *req)

VCL_hit_method(req->vcl, wrk, req, NULL, NULL);

if (WS_Overflowed(req->ws))
wrk->vpi->handling = VCL_RET_FAIL;
switch (wrk->vpi->handling) {
case VCL_RET_DELIVER:
if (busy != NULL) {
Expand Down Expand Up @@ -710,6 +714,8 @@ cnt_miss(struct worker *wrk, struct req *req)
CHECK_OBJ_ORNULL(req->stale_oc, OBJCORE_MAGIC);

VCL_miss_method(req->vcl, wrk, req, NULL, NULL);
if (WS_Overflowed(req->ws))
wrk->vpi->handling = VCL_RET_FAIL;
switch (wrk->vpi->handling) {
case VCL_RET_FETCH:
wrk->stats->cache_miss++;
Expand Down Expand Up @@ -755,6 +761,8 @@ cnt_pass(struct worker *wrk, struct req *req)
AZ(req->stale_oc);

VCL_pass_method(req->vcl, wrk, req, NULL, NULL);
if (WS_Overflowed(req->ws))
wrk->vpi->handling = VCL_RET_FAIL;
switch (wrk->vpi->handling) {
case VCL_RET_FAIL:
req->req_step = R_STP_VCLFAIL;
Expand Down Expand Up @@ -1029,6 +1037,8 @@ cnt_recv(struct worker *wrk, struct req *req)
assert(wrk->vpi->handling == VCL_RET_LOOKUP);
VSHA256_Final(req->digest, &sha256ctx);

if (WS_Overflowed(req->ws))
recv_handling = VCL_RET_FAIL;
switch (recv_handling) {
case VCL_RET_VCL:
VSLb(req->vsl, SLT_VCL_Error,
Expand Down Expand Up @@ -1111,6 +1121,8 @@ cnt_purge(struct worker *wrk, struct req *req)
AZ(HSH_DerefObjCore(wrk, &boc, 1));

VCL_purge_method(req->vcl, wrk, req, NULL, NULL);
if (WS_Overflowed(req->ws))
wrk->vpi->handling = VCL_RET_FAIL;
switch (wrk->vpi->handling) {
case VCL_RET_RESTART:
req->req_step = R_STP_RESTART;
Expand Down
4 changes: 3 additions & 1 deletion bin/varnishd/http1/cache_http1_fetch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ V1F_SendReq(struct worker *wrk, struct busyobj *bo, uint64_t *ctr_hdrbytes,
cl = 0;

VDP_Init(vdc, wrk, bo->vsl, NULL, bo, &cl);
if (bo->vdp_filter_list != NULL &&
if (WS_Overflowed(bo->ws))
err = "workspace_backend overflow";
else if (bo->vdp_filter_list != NULL &&
VCL_StackVDP(vdc, bo->vcl, bo->vdp_filter_list, NULL, bo))
err = "Failure to push processors";
else if ((v1l = V1L_Open(wrk->aws, htc->rfd, bo->vsl, nan(""), 0)) == NULL) {
Expand Down
61 changes: 61 additions & 0 deletions bin/varnishtest/tests/r04232.vtc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
varnishtest "Workspace overflow through LostHeader"

server s1 {} -start

varnish v1 -cliok "param.set http_max_hdr 32"

varnish v1 -vcl+backend {
sub vcl_recv {
if (req.url == "/1") {
set req.http.make-overflow = "some value";
}
}
} -start

logexpect l1 -v v1 {
# expect * 1001 LostHeader "make-overflow: some value"
# expect * 1001 Error "out of workspace"
# expect * 1001 RespStatus "200"
# expect * 1001 VCL_return "deliver"
# expect * 1001 Error "workspace_client overflow"

# expect * 1005 Error "out of workspace"
# expect * 1005 LostHeader "Accept-Encoding"
# expect * 1005 Error "out of workspace"
# expect * 1005 LostHeader "X-Varnish: 1005"
# expect * 1005 BerespStatus "200"
} -start

# 1. Trigger client workspace overflow through LostHeader in vcl_recv
# 2. Go to vcl_backend_fetch and cause a backend workspace overflow and
# still return a 200
# 3. Notice a workspace overflow after vcl_deliver and give client 500 response
client c1 {
txreq -url "/1" -hdr "h1: 1" -hdr "h2: 2" \
-hdr "h3: 3" -hdr "h4: 4" -hdr "h5: 5" \
-hdr "h6: 6" -hdr "h7: 7" -hdr "h8: 8" \
-hdr "h9: 9" -hdr "h10: 10" -hdr "h11: 11" \
-hdr "h12: 12" -hdr "h13: 13" -hdr "h14: 14" \
-hdr "h15: 15" -hdr "h16: 16" -hdr "h17: 17" \
-hdr "h18: 18" -hdr "h19: 19" -hdr "h20: 20" \
-hdr "h21: 21" -hdr "h22: 22" -hdr "h23: 23"
rxresp
expect resp.status == 503
} -run

# 1. Trigger backend workspace overflow through LostHeader in vcl_backend_fetch
# 2. Get and deliver 200 from backend, send 200 to client
client c2 {
txreq -url "/2" -hdr "h1: 1" -hdr "h2: 2" \
-hdr "h3: 3" -hdr "h4: 4" -hdr "h5: 5" \
-hdr "h6: 6" -hdr "h7: 7" -hdr "h8: 8" \
-hdr "h9: 9" -hdr "h10: 10" -hdr "h11: 11" \
-hdr "h12: 12" -hdr "h13: 13" -hdr "h14: 14" \
-hdr "h15: 15" -hdr "h16: 16" -hdr "h17: 17" \
-hdr "h18: 18" -hdr "h19: 19" -hdr "h20: 20" \
-hdr "h21: 21" -hdr "h22: 22" -hdr "h23: 23"
rxresp
expect resp.status == 503
} -run

logexpect l1 -wait