fix: required changes for 3.1 compatibility

internal/vm/vm.go

@@ -11,11 +11,13 @@ import (
 	"github.com/kong/goks"
 	"github.com/kong/goks/internal/fs"
 	"github.com/kong/goks/lualibs/go/cjson/safe"
+	"github.com/kong/goks/lualibs/go/hex"
 	"github.com/kong/goks/lualibs/go/ipmatcher"
 	"github.com/kong/goks/lualibs/go/jsonschema"
 	"github.com/kong/goks/lualibs/go/lyaml"
 	"github.com/kong/goks/lualibs/go/ngx"
 	"github.com/kong/goks/lualibs/go/rand"
+	"github.com/kong/goks/lualibs/go/sha256"
 	"github.com/kong/goks/lualibs/go/uuid"
 	"github.com/kong/goks/lualibs/go/x509"
 	json "github.com/layeh/gopher-json"
@@ -63,6 +65,8 @@ func New(opts Opts) (*VM, error) {
 	l.PreloadModule("go.jsonschema", jsonschema.Loader)
 	l.PreloadModule("cjson.safe", safe.Loader)
 	l.PreloadModule("lyaml", lyaml.Loader)
+	l.PreloadModule("sha256", sha256.Loader)
+	l.PreloadModule("hex", hex.Loader)
 	ngx.LoadNgx(l)
 
 	if err := setup(l); err != nil {

lua-tree/share/lua/5.1/kong/db/schema/init.lua

@@ -1,7 +1,6 @@
 local tablex       = require "pl.tablex"
 local pretty       = require "pl.pretty"
 local utils        = require "kong.tools.utils"
-local nkeys        = require "table.nkeys"
 
 local cjson        = { array_mt = {} } --- TODO(hbagdi) XXX analyze the impact
 local is_reference = function(value) return false end
@@ -55,6 +54,23 @@ do
   end
 end
 
+-- `table.nkeys()` is a LuaJIT function and is not available to the Lua VM that goks uses.
+local nkeys
+do
+  local ok
+  ok, nkeys = pcall(require, "table.nkeys")
+  if not ok then
+    nkeys = function (tab)
+      local count = 0
+      for _, v in pairs(tab) do
+        if v ~= nil then
+          count = count + 1
+        end
+      end
+      return count
+    end
+  end
+end
 
 local validation_errors = {
   -- general message

lua-tree/share/lua/5.1/kong/tools/utils.lua

@@ -1267,7 +1267,7 @@ _M.yield = function() return end
 local try_decode_base64
 do
   local decode_base64    = ngx.decode_base64
-  local decode_base64url = require "ngx.base64".decode_base64url
+  local decode_base64url = ngx.decode_base64url
 
   local function decode_base64_str(str)
     if type(str) == "string" then
@@ -1299,42 +1299,15 @@ end
 _M.try_decode_base64 = try_decode_base64
 
 
-local sha256_bin
-do
-  local digest = require "resty.openssl.digest"
-  local sha256_digest
-
-  function sha256_bin(key)
-    local _, bin, err
-    if not sha256_digest then
-      sha256_digest, err = digest.new("sha256")
-      if err then
-        return nil, err
-      end
-    end
-
-    bin, err = sha256_digest:final(key)
-    if err then
-      sha256_digest = nil
-      return nil, err
-    end
-
-    _, err = sha256_digest:reset()
-    if err then
-      sha256_digest = nil
-    end
-
-    return bin
-  end
-end
+local sha256_bin = require "sha256".sha256_bin
 _M.sha256_bin = sha256_bin
 
 
 local sha256_hex, sha256_base64, sha256_base64url
 do
-  local to_hex       = require "resty.string".to_hex
+  local to_hex       = require "hex".to_hex
   local to_base64    = ngx.encode_base64
-  local to_base64url = require "ngx.base64".encode_base64url
+  local to_base64url = ngx.encode_base64url
 
   local function sha256_encode(encode_alg, key)
     local bin, err = sha256_bin(key)

lualibs/go/hex/api.go

@@ -0,0 +1,20 @@
+package hex
+
+import (
+	"encoding/hex"
+
+	lua "github.com/yuin/gopher-lua"
+)
+
+// Encode encodes input string into hex bytes. It is a wrapper around
+// encoding/hex.Encode and replaces resty.string.to_hex.
+// See: https://github.com/openresty/lua-resty-string/blob/master/lib/resty/string.lua
+func Encode(l *lua.LState) int {
+	input := l.CheckString(1)
+
+	dst := make([]byte, hex.EncodedLen(len(input)))
+	hex.Encode(dst, []byte(input))
+
+	l.Push(lua.LString(dst))
+	return 1
+}

lualibs/go/hex/loader.go

@@ -0,0 +1,14 @@
+package hex
+
+import lua "github.com/yuin/gopher-lua"
+
+func Loader(l *lua.LState) int {
+	t := l.NewTable()
+	l.SetFuncs(t, api)
+	l.Push(t)
+	return 1
+}
+
+var api = map[string]lua.LGFunction{
+	"to_hex": Encode,
+}

lualibs/go/sha256/api.go

@@ -0,0 +1,16 @@
+package sha256
+
+import (
+	"crypto/sha256"
+
+	lua "github.com/yuin/gopher-lua"
+)
+
+func BinarySha256(l *lua.LState) int {
+	input := l.CheckString(1)
+	h := sha256.New()
+	h.Write([]byte(input))
+	l.Push(lua.LString(h.Sum(nil)))
+	h.Reset()
+	return 1
+}

lualibs/go/sha256/loader.go

@@ -0,0 +1,14 @@
+package sha256
+
+import lua "github.com/yuin/gopher-lua"
+
+func Loader(l *lua.LState) int {
+	t := l.NewTable()
+	l.SetFuncs(t, api)
+	l.Push(t)
+	return 1
+}
+
+var api = map[string]lua.LGFunction{
+	"sha256_bin": BinarySha256,
+}