RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-03 02:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: lua: Fix IPv6 with separate port support for Socket.connect

Browse Source 
The `socket.tcp.connect` method of Lua requires at least two parameters:
The host and the port. The `Socket.connect` method of haproxy requires
only one when a host with a combined port is provided. This stems from
the fact that `str2sa_range` is used internally in `hlua_socket_connect`.
This very fact unfortunately causes a diversion in the behaviour of
Lua's socket class and haproxy's for IPv6 addresses:

  sock:connect("::1", "80")

works fine with Lua, but fails with:

  connect: cannot parse destination address '::1'

in haproxy, because `str2sa_range` parses the trailing `:1` as the port.

This patch forcefully adds a `:` to the end of the address iff a port
number greater than `0` is given as the second parameter.

Technically this breaks backwards compatibility, because the docs state:

> The syntax "127.0.0.1:1234" is valid. in this case, the
> parameter *port* is ignored.

But: The connect() call can only succeed if the second parameter is left
out (which causes no breakage) or if the second parameter is an integer
or a numeric string.

It seems unlikely that someone would provide an address with a port number
and would also provide a second parameter containing a number other than
zero. Thus I feel this breakage is warranted to fix the mismatch between
haproxy's socket class and Lua's one.

This commit should be backported to haproxy 1.8 only, because of the
possible breakage of existing Lua scripts.
This commit is contained in:
Tim Duesterhus 2018-01-06 19:04:45 +01:00 committed by Willy Tarreau
parent b33754ce86
commit 6edab865f6
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/lua-api/index.rst
View File

@ -1769,7 +1769,7 @@ Socket class
"abns@", and finaly a filedescriotr can be passed with the prefix "fd@".
The prefix "ipv4@", "ipv6@" and "unix@" are also supported. The port can be
passed int the string. The syntax "127.0.0.1:1234" is valid. in this case, the
parameter *port* is ignored.
parameter *port* must not be set.
.. js:function:: Socket.connect_ssl(socket, address, port)

15
src/hlua.c
View File

@ -2333,9 +2333,22 @@ __LJMP static int hlua_socket_connect(struct lua_State *L)
WILL_LJMP(luaL_error(L, "connect: cannot use socket on other thread"));
ip = MAY_LJMP(luaL_checkstring(L, 2));
if (lua_gettop(L) >= 3)
if (lua_gettop(L) >= 3) {
luaL_Buffer b;
port = MAY_LJMP(luaL_checkinteger(L, 3));
/* Force the ip to end with a colon, to support IPv6 addresses
* that are not enclosed within square brackets.
*/
if (port > 0) {
luaL_buffinit(L, &b);
luaL_addstring(&b, ip);
luaL_addchar(&b, ':');
luaL_pushresult(&b);
ip = lua_tolstring(L, lua_gettop(L), NULL);
}
}
/* check for connection break. If some data where read, return it. */
peer = xref_get_peer_and_lock(&socket->xref);
if (!peer) {