mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: lua: reset lua transaction between http requests

Browse Source 
Previously LUA code would maintain the transaction state between http
requests, resulting in things like txn:get_priv() retrieving data from
a previous request. This addresses the issue by ensuring the LUA state
is reset between requests.

Co-authored-by: Tim Dsterhus <tim@bastelstu.be>
This commit is contained in:
Patrick Hemmer 2018-08-22 10:02:00 -04:00 committed by Willy Tarreau
parent afbfa2a23f
commit e3faf02581
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
reg-tests/lua/h00001.lua Normal file
View File

@ -0,0 +1,15 @@
core.register_action("bug", { "http-res" }, function(txn)
data = txn:get_priv()
if not data then
data = 0
end
data = data + 1
print(string.format("set to %d", data))
txn.http:res_set_status(200 + data)
txn:set_priv(data)
end)
core.register_service("fakeserv", "http", function(applet)
applet:set_status(200)
applet:start_response()
end)

31
reg-tests/lua/h00001.vtc Normal file
View File

@ -0,0 +1,31 @@
varnishtest "Lua: txn:get_priv() scope"
feature ignore_unknown_macro
haproxy h1 -conf {
global
lua-load ${testdir}/h00001.lua
frontend fe1
mode http
bind "fd@${fe1}"
default_backend b1
http-response lua.bug
backend b1
mode http
http-request use-service lua.fakeserv
} -start
client c0 -connect ${h1_fe1_sock} {
txreq -url "/"
rxresp
expect resp.status == 201
txreq -url "/"
rxresp
expect resp.status == 201
}
client c0 -start
client c0 -wait

4
src/proto_http.c
View File

@ -62,6 +62,7 @@
#include <proto/h1.h> #include <proto/h1.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/hdr_idx.h> #include <proto/hdr_idx.h>
#include <proto/hlua.h>
#include <proto/pattern.h> #include <proto/pattern.h>
#include <proto/proto_tcp.h> #include <proto/proto_tcp.h>
#include <proto/proto_http.h> #include <proto/proto_http.h>
@ -4460,6 +4461,9 @@ void http_end_txn_clean_session(struct stream *s)
s->flags &= ~(SF_CURR_SESS|SF_REDIRECTABLE|SF_SRV_REUSED); s->flags &= ~(SF_CURR_SESS|SF_REDIRECTABLE|SF_SRV_REUSED);
s->flags &= ~(SF_ERR_MASK|SF_FINST_MASK|SF_REDISP); s->flags &= ~(SF_ERR_MASK|SF_FINST_MASK|SF_REDISP);
hlua_ctx_destroy(s->hlua);
s->hlua = NULL;
s->txn->meth = 0; s->txn->meth = 0;
http_reset_txn(s); http_reset_txn(s);
s->txn->flags |= TX_NOT_FIRST | TX_WAIT_NEXT_RQ; s->txn->flags |= TX_NOT_FIRST | TX_WAIT_NEXT_RQ;