chore(*): add check of get_request() and the missing ';' (#51)

Reason of adding this check: Although it's indeed redundent given our phase
check. but it gives us extra protection because this a private API from
openresty, it doesn't guaranteeded to be unchanged in the future.
And also given the severity when it happens, it will likely cause a segfault,
instead of a lua vm crach.

Author: catbro666

lualib/resty/kong/grpc.lua

@@ -30,14 +30,24 @@ int ngx_http_lua_kong_ffi_set_grpc_authority(ngx_http_request_t *r,
 local error = error
 local type = type
 local C = ffi.C
-local get_request = base.get_request
+local orig_get_request = base.get_request
 local get_phase = ngx.get_phase
 
 
 local NGX_OK = ngx.OK
 local NGX_ERROR = ngx.ERROR
 
 
+local function get_request()
+    local r = orig_get_request()
+
+    if not r then
+        error("no request found")
+    end
+
+    return r
+end
+
 do
     local ALLOWED_PHASES = {
         ['rewrite'] = true,

lualib/resty/kong/tag.lua

@@ -4,7 +4,7 @@ local base = require "resty.core.base"
 
 local C = ffi.C
 local ffi_str = ffi.string
-local get_request = base.get_request
+local orig_get_request = base.get_request
 local subsystem = ngx.config.subsystem
 
 
@@ -29,13 +29,19 @@ elseif subsystem == "stream" then
 
 end
 
-local function get()
-    local r = get_request()
+local function get_request()
+    local r = orig_get_request()
 
     if not r then
         error("no request found")
     end
 
+    return r
+end
+
+local function get()
+    local r = get_request()
+
     local tag = ngx_lua_kong_get_static_tag(r)
 
     if tag and tag.len > 0 then

lualib/resty/kong/tls.lua

@@ -55,7 +55,7 @@ local C = ffi.C
 local ffi_string = ffi.string
 local get_string_buf = base.get_string_buf
 local size_ptr = base.get_size_ptr()
-local get_request = base.get_request
+local orig_get_request = base.get_request
 
 
 local DEFAULT_CERT_CHAIN_SIZE = 10240
@@ -66,15 +66,23 @@ local NGX_DECLINED = ngx.DECLINED
 local NGX_ABORT = -6
 
 
+local function get_request()
+    local r = orig_get_request()
+
+    if not r then
+        error("no request found")
+    end
+
+    return r
+end
+
 if ngx.config.subsystem == "http" then
     function _M.request_client_certificate(no_session_reuse)
         if get_phase() ~= 'ssl_cert' then
             error("API disabled in the current context")
         end
 
         local r = get_request()
-        -- no need to check if r is nil as phase check above
-        -- already ensured it
 
         local errmsg = C.ngx_http_lua_kong_ffi_request_client_certificate(r)
         if errmsg == nil then

lualib/resty/kong/var.lua

@@ -12,7 +12,7 @@ local assert = assert
 local tostring = tostring
 local tonumber = tonumber
 local getmetatable = getmetatable
-local get_request = base.get_request
+local orig_get_request = base.get_request
 local get_size_ptr = base.get_size_ptr
 local get_phase = ngx.get_phase
 local subsystem = ngx.config.subsystem
@@ -56,6 +56,16 @@ local value_ptr = ffi_new("unsigned char *[1]")
 local errmsg = base.get_errmsg_ptr()
 
 
+local function get_request()
+    local r = orig_get_request()
+
+    if not r then
+        error("no request found")
+    end
+
+    return r
+end
+
 local function load_indexes()
     if get_phase() ~= "init" then
         error("load_indexes can only be called in init phase")
@@ -87,9 +97,6 @@ end
 
 local function var_get_by_index(index)
     local r = get_request()
-    if not r then
-        error("no request found")
-    end
 
     local value_len = get_size_ptr()
 
@@ -114,9 +121,6 @@ end
 
 local function var_set_by_index(index, value)
     local r = get_request()
-    if not r then
-        error("no request found")
-    end
 
     local value_len
     if value == nil then

src/ngx_http_lua_kong_ssl.c

@@ -141,7 +141,7 @@ ngx_http_lua_kong_ffi_disable_session_reuse(ngx_http_request_t *r)
     return NULL;
 
 #else
-    return "TLS support is not enabled in Nginx build"
+    return "TLS support is not enabled in Nginx build";
 #endif
 }
 
@@ -174,7 +174,7 @@ ngx_http_lua_kong_ffi_request_client_certificate(ngx_http_request_t *r)
     return NULL;
 
 #else
-    return "TLS support is not enabled in Nginx build"
+    return "TLS support is not enabled in Nginx build";
 #endif
 }