http/client: Throw error if bind address is non-matching family

Author: daurnimator

http/client.lua

@@ -122,6 +122,11 @@ local function dns_lookup(records, dns_resolver, host, query_type, filter_type,
 end
 
 local function connect(options, timeout)
+	local family = options.family
+	if family == nil then
+		family = cs.AF_UNSPEC
+	end
+
 	local bind = options.bind
 	if bind ~= nil then
 		assert(type(bind) == "string")
@@ -133,22 +138,32 @@ local function connect(options, timeout)
 		end
 		local ipv6 = bind_address:match("^%[([:%x]+)%]$")
 		if ipv6 then
+			if family == cs.AF_UNSPEC then
+				family = cs.AF_INET6
+			elseif family ~= cs.AF_INET6 then
+				error("cannot bind local IPv6 address when using other address family")
+			end
 			bind_address = ipv6
+		else
+			if family == cs.AF_UNSPEC then
+				family = cs.AF_INET
+			elseif family ~= cs.AF_INET then
+				error("cannot bind local IPv4 address when using other address family")
+			end
 		end
 		bind = {
 			address = bind_address;
 			port = bind_port;
 		}
 	end
 
-	local family = options.family
 	local path = options.path
 	local host = options.host
 	if not path and not http_util.is_ip(host) then
 		local dns_resolver = options.dns_resolver or cqueues_dns.getpool()
 		local deadline = timeout and monotime()+timeout
 		local records = {}
-		if family == nil or family == cs.AF_UNSPEC then
+		if family == cs.AF_UNSPEC then
 			dns_lookup(records, dns_resolver, host, cqueues_dns_record.AAAA, nil, timeout)
 			dns_lookup(records, dns_resolver, host, cqueues_dns_record.A, nil, deadline and deadline-monotime())
 		elseif family == cs.AF_INET then

spec/client_spec.lua

@@ -15,6 +15,14 @@ describe("http.client module", function()
 	local openssl_pkey = require "openssl.pkey"
 	local openssl_ctx = require "openssl.ssl.context"
 	local openssl_x509 = require "openssl.x509"
+	it("throws error on invalid family+bind combination", function()
+		assert.has.errors(function()
+			client.connect{family = cs.AF_INET, host = "example.com", port = 80, bind = "::1" }
+		end)
+		assert.has.errors(function()
+			client.connect{family = cs.AF_INET6, host = "example.com", port = 80, bind = "127.0.0.1" }
+		end)
+	end)
 	it("invalid network parameters return nil, err, errno", function()
 		-- Invalid network parameters will return nil, err, errno
 		local ok, err, errno = client.connect{host="127.0.0.1", port="invalid"}