bugfix: passing the wrong chunkname argument to luaL_loadbuffer. (#2010)

The total length of the chunkname is 60. The format is "=tag(file:line)".
So the space left for the tag, file and line is only 56 chars.

Author: zhuizhuhaomeng

src/ngx_http_lua_directive.c

@@ -32,7 +32,10 @@
 #include "ngx_http_lua_log.h"
 
 
-#define LJ_CHUNKNAME_MAX_LEN 42
+/* the max length is 60, after deducting the fixed four characters "=(:)"
+ * only 56 left.
+ */
+#define LJ_CHUNKNAME_MAX_LEN 56
 
 
 typedef struct ngx_http_lua_block_parser_ctx_s
@@ -1369,7 +1372,7 @@ ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
     ngx_str_t   *filename;
     u_char      *filename_end;
     const char  *pre_str = "";
-    ngx_uint_t   start_line_len;
+    ngx_uint_t   reserve_len;
 
     ngx_http_lua_main_conf_t    *lmcf;
 
@@ -1385,7 +1388,7 @@ ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
     start_line = lmcf->directive_line > 0
         ? lmcf->directive_line : cf->conf_file->line;
     p = ngx_snprintf(out, len, "%d", start_line);
-    start_line_len = p - out;
+    reserve_len = tag_len + p - out;
 
     filename = &cf->conf_file->file.name;
     filename_end = filename->data + filename->len;
@@ -1407,8 +1410,8 @@ ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
                           filename->data, conf_prefix->len) == 0)
         {
             /* files in conf_prefix directory, use the relative path */
-            if (filename_end - p + start_line_len > LJ_CHUNKNAME_MAX_LEN) {
-                p = filename_end - LJ_CHUNKNAME_MAX_LEN + start_line_len + 3;
+            if (filename_end - p + reserve_len > LJ_CHUNKNAME_MAX_LEN) {
+                p = filename_end - LJ_CHUNKNAME_MAX_LEN + reserve_len + 3;
                 pre_str = "...";
             }
 
@@ -1418,11 +1421,11 @@ ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
 
     p = filename->data;
 
-    if (filename->len + start_line_len <= LJ_CHUNKNAME_MAX_LEN) {
+    if (filename->len + reserve_len <= LJ_CHUNKNAME_MAX_LEN) {
         goto found;
     }
 
-    p = filename_end - LJ_CHUNKNAME_MAX_LEN + start_line_len + 3;
+    p = filename_end - LJ_CHUNKNAME_MAX_LEN + reserve_len + 3;
     pre_str = "...";
 
 found:

src/ngx_http_lua_exitworkerby.c

@@ -97,18 +97,18 @@ ngx_http_lua_exit_worker_by_inline(ngx_log_t *log,
     int         status;
     const char *chunkname;
 
-    status = luaL_loadbuffer(L, (char *) lmcf->exit_worker_src.data,
-                             lmcf->exit_worker_src.len, "=exit_worker_by_lua")
-             || ngx_http_lua_do_call(log, L);
-
     if (lmcf->exit_worker_chunkname == NULL) {
-        chunkname = "exit_worker_by_lua";
+        chunkname = "=exit_worker_by_lua";
 
     } else {
         chunkname = (const char *) lmcf->exit_worker_chunkname;
     }
 
-    return ngx_http_lua_report(log, L, status, chunkname);
+    status = luaL_loadbuffer(L, (char *) lmcf->exit_worker_src.data,
+                             lmcf->exit_worker_src.len, chunkname)
+             || ngx_http_lua_do_call(log, L);
+
+    return ngx_http_lua_report(log, L, status, "exit_worker_by_lua");
 }
 
 

src/ngx_http_lua_initby.c

@@ -21,18 +21,18 @@ ngx_http_lua_init_by_inline(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
     const char *chunkname;
 
 
-    status = luaL_loadbuffer(L, (char *) lmcf->init_src.data,
-                             lmcf->init_src.len, "=init_by_lua")
-             || ngx_http_lua_do_call(log, L);
-
     if (lmcf->init_chunkname == NULL) {
-        chunkname = "init_by_lua";
+        chunkname = "=init_by_lua";
 
     } else {
         chunkname = (const char *) lmcf->init_chunkname;
     }
 
-    return ngx_http_lua_report(log, L, status, chunkname);
+    status = luaL_loadbuffer(L, (char *) lmcf->init_src.data,
+                             lmcf->init_src.len, chunkname)
+             || ngx_http_lua_do_call(log, L);
+
+    return ngx_http_lua_report(log, L, status, "init_by_lua");
 }
 
 

src/ngx_http_lua_initworkerby.c

@@ -319,18 +319,18 @@ ngx_http_lua_init_worker_by_inline(ngx_log_t *log,
     int         status;
     const char *chunkname;
 
-    status = luaL_loadbuffer(L, (char *) lmcf->init_worker_src.data,
-                             lmcf->init_worker_src.len, "=init_worker_by_lua")
-             || ngx_http_lua_do_call(log, L);
-
     if (lmcf->init_worker_chunkname == NULL) {
-        chunkname = "init_worker_by_lua";
+        chunkname = "=init_worker_by_lua";
 
     } else {
         chunkname = (const char *) lmcf->init_worker_chunkname;
     }
 
-    return ngx_http_lua_report(log, L, status, chunkname);
+    status = luaL_loadbuffer(L, (char *) lmcf->init_worker_src.data,
+                             lmcf->init_worker_src.len, chunkname)
+             || ngx_http_lua_do_call(log, L);
+
+    return ngx_http_lua_report(log, L, status, "init_worker_by_lua");
 }
 
 

t/041-header-filter.t

@@ -849,3 +849,27 @@ GET /lua
 failed to load inlined Lua code: header_filter_by_lua(nginx.conf:49):2: unexpected symbol near ''for end''
 --- no_error_log
 no_such_error
+
+
+
+=== TEST 44: syntax error in /tmp/12345678901234567890123456789012345.conf
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say("Hello world")
+        }
+
+        include /tmp/12345678901234567890123456789012345.conf;
+    }
+--- user_files
+>>> /tmp/12345678901234567890123456789012345.conf
+    header_filter_by_lua_block {
+        'for end';
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+failed to load inlined Lua code: header_filter_by_lua(...901234567890123456789012345.conf:1):2: unexpected symbol near ''for end''
+--- no_error_log
+[alert]

t/086-init-by.t

@@ -339,7 +339,7 @@ failed to init
     }
 --- must_die
 --- error_log
-=init_by_lua(nginx.conf:25) error: init_by_lua:4: ')' expected (to close '(' at line 3) near 'ngx'
+init_by_lua error: init_by_lua(nginx.conf:25):4: ')' expected (to close '(' at line 3) near 'ngx'
 --- no_error_log
 no_such_error_log
 

t/089-phase.t

@@ -198,6 +198,6 @@ GET /lua
 ok
 --- shutdown_error_log eval
 [
-qr/exit_worker_by_lua:\d+: exit_worker/,
+qr/exit_worker_by_lua\(nginx\.conf:\d+\):\d+: exit_worker/,
 qr/exiting now$/,
 ]

t/091-coroutine.t

@@ -1713,9 +1713,9 @@ GET /t
 --- config
 
 --- must_die
---- grep_error_log eval: qr/init_by_lua\(nginx.conf:25\) error: .*? something went wrong/
+--- grep_error_log eval: qr/init_by_lua\(nginx.conf:25\).*? something went wrong/
 --- grep_error_log_out
-init_by_lua(nginx.conf:25) error: init_by_lua:7: init_by_lua:4: something went wrong
+init_by_lua(nginx.conf:25):7: init_by_lua(nginx.conf:25):4: something went wrong
 
 
 

t/124-init-worker.t

@@ -996,7 +996,7 @@ start privileged agent process
 --- response_body
 hello world
 --- error_log
-=init_worker_by_lua(nginx.conf:25) error: init_worker_by_lua:4: ')' expected (to close '(' at line 3) near 'ngx'
+init_worker_by_lua error: init_worker_by_lua(nginx.conf:25):4: ')' expected (to close '(' at line 3) near 'ngx'
 --- no_error_log
 no_such_error_log
 

t/162-exit-worker.t

@@ -215,7 +215,7 @@ qr/hello from exit worker by lua, process type: worker/,
 --- response_body
 hello world
 --- shutdown_error_log
-=exit_worker_by_lua(nginx.conf:25) error: exit_worker_by_lua:4: ')' expected (to close '(' at line 3) near 'ngx'
+exit_worker_by_lua error: exit_worker_by_lua(nginx.conf:25):4: ')' expected (to close '(' at line 3) near 'ngx'