fix(*) not mutating tables when doing pairs to avoid missing of

iterration

Author: fffonion

lib/resty/openssl.lua

@@ -33,11 +33,14 @@ _M.bignum = _M.bn
 function _M.luaossl_compat()
   for mod, tbl in pairs(_M) do
     if type(tbl) == 'table' then
+
+      -- avoid using a same table as the iterrator will change
+      local new_tbl = {}
       -- luaossl always error() out
       for k, f in pairs(tbl) do
         if type(f) == 'function' then
           local of = f
-          tbl[k] = function(...)
+          new_tbl[k] = function(...)
             local ret = { of(...) }
             if ret and #ret > 1 and ret[#ret] then
               error(mod .. "." .. k .. "(): " .. ret[#ret])
@@ -47,6 +50,10 @@ function _M.luaossl_compat()
         end
       end
 
+      for k, f in pairs(new_tbl) do
+        tbl[k] = f
+      end
+
       setmetatable(tbl, {
         __index = function(t, k)
           local tok

lib/resty/openssl/include/x509/altname.lua

@@ -8,7 +8,7 @@ local GEN_URI = 6
 local GEN_IPADD = 7
 -- local GEN_RID = 8
 
-local types = {
+local default_types = {
   RFC822Name = GEN_EMAIL,
   RFC822 = GEN_EMAIL,
   Email = GEN_EMAIL,
@@ -29,8 +29,10 @@ local literals = {
   [GEN_IPADD] = "IP",
 }
 
-for t, gid in pairs(types) do
+local types = {}
+for t, gid in pairs(default_types) do
   types[t:lower()] = gid
+  types[t] = gid
 end
 
 return {

lib/resty/openssl/pkey.lua

@@ -324,7 +324,7 @@ local function generate_key(config)
   return ctx_ptr[0]
 end
 
-local load_key_try_funcs = {
+local _load_key_try_funcs = {
   PEM = {
     -- Note: make sure we always try load priv key first
     pr = {
@@ -351,7 +351,10 @@ local load_key_try_funcs = {
 -- populate * funcs
 local all_funcs = {}
 local typ_funcs = {}
-for fmt, ffs in pairs(load_key_try_funcs) do
+local load_key_try_funcs = {}
+for fmt, ffs in pairs(_load_key_try_funcs) do
+  load_key_try_funcs[fmt] = ffs
+
   local funcs = {}
   for typ, fs in pairs(ffs) do
     for f, arg in pairs(fs) do
@@ -370,6 +373,7 @@ load_key_try_funcs["*"]["*"] = all_funcs
 for typ, fs in pairs(typ_funcs) do
   load_key_try_funcs[typ] = fs
 end
+_load_key_try_funcs = nil
 
 local function tostring(self, is_priv, fmt)
   if fmt == "JWK" then