RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MAJOR: session: repair tcp-request connection rules 

Since recent commit f79c817 (MAJOR: connection: add two new flags to
indicate readiness of control/transport) and the surrounding commits,
the session initialization has been slightly delayed and the control
layer of the connection is not yet initialized when processing the
rules.

We need to move that minimal initialization a bit above.

The bug was introduced with latest changes, no backport is needed.
This commit is contained in:
Willy Tarreau 2013-12-16 02:16:50 +01:00
parent 566226b9d7
commit 59e3ff4549
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/session.c
View File

@ -131,6 +131,18 @@ int session_accept(struct listener *l, int cfd, struct sockaddr_storage *addr)
* to abort right here as soon as possible, we check the rules before
* even initializing the stream interfaces.
*/
memset(&s->si[0], 0x55, sizeof(s->si[0]));
/* Add the minimum callbacks to prepare the connection's control layer.
* We need this so that we can safely execute the ACLs used by the
* "tcp-request connection" ruleset. We also carefully attach the
* connection to the stream interface without initializing the rest,
* so that ACLs can use si[0]->end.
*/
si_attach_conn(&s->si[0], cli_conn);
conn_attach(cli_conn, s, &sess_conn_cb);
conn_ctrl_init(cli_conn);
if ((l->options & LI_O_TCP_RULES) && !tcp_exec_req_rules(s)) {
/* let's do a no-linger now to close with a single RST. */
setsockopt(cfd, SOL_SOCKET, SO_LINGER, (struct linger *) &nolinger, sizeof(struct linger));
@ -187,15 +199,10 @@ int session_accept(struct listener *l, int cfd, struct sockaddr_storage *addr)
t->nice = l->nice;
s->task = t;
/* Add the various callbacks. Right now the transport layer is present
/* Finish setting the callbacks. Right now the transport layer is present
* but not initialized. Also note we need to be careful as the stream
* int is not initialized yet.
*/
conn_attach(cli_conn, s, &sess_conn_cb);
/* finish initialization of the accepted file descriptor */
conn_ctrl_init(cli_conn);
conn_data_want_recv(cli_conn);
if (conn_xprt_init(cli_conn) < 0)
goto out_free_task;