bugfix: nginx crash when resolve an not exist domain. (#266)

Author: zhuizhuhaomeng

src/ngx_stream_lua_socket_tcp.c

@@ -172,8 +172,6 @@ static void ngx_stream_lua_socket_free_pool(ngx_log_t *log,
 static int ngx_stream_lua_socket_shutdown_pool(lua_State *L);
 static void ngx_stream_lua_socket_shutdown_pool_helper(
     ngx_stream_lua_socket_pool_t *spool);
-static void
-    ngx_stream_lua_socket_empty_resolve_handler(ngx_resolver_ctx_t *ctx);
 static int ngx_stream_lua_socket_prepare_error_retvals(
     ngx_stream_lua_request_t *r, ngx_stream_lua_socket_tcp_upstream_t *u,
     lua_State *L, ngx_uint_t ft_type);
@@ -1136,13 +1134,6 @@ ngx_stream_lua_socket_tcp_connect(lua_State *L)
 }
 
 
-static void
-ngx_stream_lua_socket_empty_resolve_handler(ngx_resolver_ctx_t *ctx)
-{
-    /* do nothing */
-}
-
-
 static void
 ngx_stream_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
 {
@@ -6174,10 +6165,8 @@ ngx_stream_lua_tcp_resolve_cleanup(void *data)
         return;
     }
 
-    /* just to be safer */
-    rctx->handler = ngx_stream_lua_socket_empty_resolve_handler;
-
-    ngx_resolve_name_done(rctx);
+    /* postpone free the rctx in the handler */
+    rctx->handler = ngx_resolve_name_done;
 }
 
 

src/ngx_stream_lua_socket_udp.c

@@ -1673,7 +1673,8 @@ ngx_stream_lua_udp_resolve_cleanup(void *data)
         return;
     }
 
-    ngx_resolve_name_done(rctx);
+    /* postpone free the rctx in the handler */
+    rctx->handler = ngx_resolve_name_done;
 }
 
 

t/014-bugs.t

@@ -156,3 +156,203 @@ my $s = "ngx.say('ok')\n";
 ok
 --- no_error_log
 [error]
+
+
+
+=== TEST 6: tcp: nginx crash when resolve an not exist domain in ngx.thread.spawn
+https://github.com/openresty/lua-nginx-module/issues/1915
+--- stream_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+--- stream_server_config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    content_by_lua_block {
+        local function tcp(host, port)
+            local sock = ngx.socket.tcp()
+            local ok,err = sock:connect(host, port)
+            if not ok then
+                ngx.log(ngx.WARN, "failed: ", err)
+                sock:close()
+                return false
+            end
+
+            sock:close()
+            return true
+        end
+
+        local host = "www.notexistdomain.com"
+        local port = 80
+
+        local threads = {}
+        for i = 1, 3 do
+            threads[i] = ngx.thread.spawn(tcp, host, port)
+        end
+
+        local ok, res = ngx.thread.wait(threads[1],threads[2],threads[3])
+        if not ok then
+            ngx.say("failed to wait thread")
+            return
+        end
+
+        ngx.say("res: ", res)
+
+        for i = 1, 3 do
+            ngx.thread.kill(threads[i])
+        end
+    }
+
+--- request
+GET /t
+--- response_body
+res: false
+--- error_log
+www.notexistdomain.com could not be resolved
+
+
+
+=== TEST 7: domain exists with tcp socket
+https://github.com/openresty/lua-nginx-module/issues/1915
+--- stream_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+--- stream_server_config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    content_by_lua_block {
+        local function tcp(host, port)
+            local sock = ngx.socket.tcp()
+            local ok,err = sock:connect(host, port)
+            if not ok then
+                ngx.log(ngx.WARN, "failed: ", err)
+                sock:close()
+                return false
+            end
+
+            sock:close()
+            return true
+        end
+
+        local host = "www.openresty.org"
+        local port = 80
+
+        local threads = {}
+        for i = 1, 3 do
+            threads[i] = ngx.thread.spawn(tcp, host, port)
+        end
+
+        local ok, res = ngx.thread.wait(threads[1],threads[2],threads[3])
+        if not ok then
+            ngx.say("failed to wait thread")
+            return
+        end
+
+        ngx.say("res: ", res)
+
+        for i = 1, 3 do
+            ngx.thread.kill(threads[i])
+        end
+    }
+
+--- request
+GET /t
+--- response_body
+res: true
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: domain exists with udp socket
+https://github.com/openresty/lua-nginx-module/issues/1915
+--- stream_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+--- stream_server_config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    content_by_lua_block {
+        local function udp(host, port)
+            local sock = ngx.socket.udp()
+            local ok,err = sock:setpeername(host, port)
+            if not ok then
+                ngx.log(ngx.WARN, "failed: ", err)
+                sock:close()
+                return false
+            end
+
+            sock:close()
+            return true
+        end
+
+        local host = "www.notexistdomain.com"
+        local port = 80
+
+        local threads = {}
+        for i = 1, 3 do
+            threads[i] = ngx.thread.spawn(udp, host, port)
+        end
+
+        local ok, res = ngx.thread.wait(threads[1],threads[2],threads[3])
+        if not ok then
+            ngx.say("failed to wait thread")
+            return
+        end
+
+        ngx.say("res: ", res)
+
+        for i = 1, 3 do
+            ngx.thread.kill(threads[i])
+        end
+    }
+
+--- request
+GET /t
+--- response_body
+res: false
+--- error_log
+www.notexistdomain.com could not be resolved
+
+
+
+=== TEST 9: udp: nginx crash when resolve an not exist domain in ngx.thread.spawn
+https://github.com/openresty/lua-nginx-module/issues/1915
+--- stream_config eval
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+--- stream_server_config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    content_by_lua_block {
+        local function udp(host, port)
+            local sock = ngx.socket.udp()
+            local ok,err = sock:setpeername(host, port)
+            if not ok then
+                ngx.log(ngx.WARN, "failed: ", err)
+                sock:close()
+                return false
+            end
+
+            sock:close()
+            return true
+        end
+
+        local host = "www.openresty.org"
+        local port = 80
+
+        local threads = {}
+        for i = 1, 3 do
+            threads[i] = ngx.thread.spawn(udp, host, port)
+        end
+
+        local ok, res = ngx.thread.wait(threads[1],threads[2],threads[3])
+        if not ok then
+            ngx.say("failed to wait thread")
+            return
+        end
+
+        ngx.say("res: ", res)
+
+        for i = 1, 3 do
+            ngx.thread.kill(threads[i])
+        end
+    }
+
+--- request
+GET /t
+--- response_body
+res: true
+--- no_error_log
+[error]

t/127-uthread-kill.t

@@ -7,7 +7,7 @@ our $StapScript = $t::StapThread::StapScript;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 5 + 2);
+plan tests => repeat_each() * (blocks() * 5 + 1);
 
 $ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
@@ -171,7 +171,6 @@ killed
 [error]
 --- error_log
 lua tcp socket abort resolver
-resolve name done: -2