Kong · omegabytes · Dec 8, 2022 · Dec 8, 2022 · Dec 8, 2022 · Dec 8, 2022
diff --git a/internal/vm/vm.go b/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("go.sha256", sha256.Loader)
+	l.PreloadModule("go.hex", hex.Loader)
 	ngx.LoadNgx(l)
 
 	if err := setup(l); err != nil {

diff --git a/lua-tree/share/lua/5.1/kong/constants.lua b/lua-tree/share/lua/5.1/kong/constants.lua
@@ -218,25 +218,6 @@ local constants = {
 
   KEY_FORMATS_MAP = key_formats_map,
   KEY_FORMATS = key_formats,
-
-  LOG_LEVELS = {
-    debug = ngx.DEBUG,
-    info = ngx.INFO,
-    notice = ngx.NOTICE,
-    warn = ngx.WARN,
-    error = ngx.ERR,
-    crit = ngx.CRIT,
-    alert = ngx.ALERT,
-    emerg = ngx.EMERG,
-    [ngx.DEBUG] = "debug",
-    [ngx.INFO] = "info",
-    [ngx.NOTICE] = "notice",
-    [ngx.WARN] = "warn",
-    [ngx.ERR] = "error",
-    [ngx.CRIT] = "crit",
-    [ngx.ALERT] = "alert",
-    [ngx.EMERG] = "emerg",
-  },
 }
 
 for _, v in ipairs(constants.CLUSTERING_SYNC_STATUS) do

diff --git a/lua-tree/share/lua/5.1/kong/db/schema/entities/routes.lua b/lua-tree/share/lua/5.1/kong/db/schema/entities/routes.lua
@@ -1,8 +1,6 @@
 local typedefs = require("kong.db.schema.typedefs")
 local deprecation = require("kong.deprecation")
 
-local CACHED_SCHEMA = require("kong.router.atc").schema
-
 -- ATC router is incompatible with goks
 local kong_router_flavor = "traditional"
 
@@ -48,13 +46,6 @@ if kong_router_flavor == "expressions" then
       { custom_entity_check = {
         field_sources = { "expression", "id", },
         fn = function(entity)
-          local r = router.new(CACHED_SCHEMA)
-
-          local res, err = r:add_matcher(0, entity.id, entity.expression)
-          if not res then
-            return nil, "Router Expression failed validation: " .. err
-          end
-
           return true
         end,
       } },

diff --git a/lua-tree/share/lua/5.1/kong/db/schema/init.lua b/lua-tree/share/lua/5.1/kong/db/schema/init.lua
@@ -1,7 +1,8 @@
 local tablex       = require "pl.tablex"
 local pretty       = require "pl.pretty"
 local utils        = require "kong.tools.utils"
-local nkeys        = require "table.nkeys"
+local nkeys        = utils.nkeys
+local new_tab      = utils.new_tab
 
 local cjson        = { array_mt = {} } --- TODO(hbagdi) XXX analyze the impact
 local is_reference = function(value) return false end
@@ -43,19 +44,6 @@ Schema.__index     = Schema
 local _cache = {}
 local _workspaceable = {}
 
--- `table.new()` is a LuaJIT function and is not available to the Lua VM that goks uses.
-local new_tab
-do
-  local ok
-  ok, new_tab = pcall(require, "table.new")
-  if not ok then
-    new_tab = function(narr, nrec)
-      return {}
-    end
-  end
-end
-
-
 local validation_errors = {
   -- general message
   ERROR                     = "Validation error: %s",

diff --git a/lua-tree/share/lua/5.1/kong/pdk/node.lua b/lua-tree/share/lua/5.1/kong/pdk/node.lua
@@ -1,283 +1 @@
---- Node-level utilities.
---
--- @module kong.node
-
-local utils = require "kong.tools.utils"
-local ffi = require "ffi"
-local private_node = require "kong.pdk.private.node"
-
-
-local floor = math.floor
-local lower = string.lower
-local match = string.match
-local gsub = string.gsub
-local sort = table.sort
-local insert = table.insert
-local ngx = ngx
-local shared = ngx.shared
-local C             = ffi.C
-local ffi_new       = ffi.new
-local ffi_str       = ffi.string
-
-local NODE_ID_KEY = "kong:node_id"
-
-
-local node_id
-local shms = {}
-local n_workers = ngx.worker.count()
-
-
-for shm_name, shm in pairs(shared) do
-  insert(shms, {
-    zone = shm,
-    name = shm_name,
-    capacity = shm:capacity(),
-  })
-end
-
-
-local function convert_bytes(bytes, unit, scale)
-  if not unit or lower(unit) == "b" then
-    return floor(bytes)
-  end
-
-  return utils.bytes_to_str(bytes, unit, scale)
-end
-
-
-local function sort_pid_asc(a, b)
-  return a.pid < b.pid
-end
-
-
-local function new(self)
-  local _NODE = {}
-
-
-  ---
-  -- Returns the ID used by this node to describe itself.
-  --
-  -- @function kong.node.get_id
-  -- @treturn string The v4 UUID used by this node as its ID.
-  -- @usage
-  -- local id = kong.node.get_id()
-  function _NODE.get_id()
-    if node_id then
-      return node_id
-    end
-
-    local shm = ngx.shared.kong
-
-    local ok, err = shm:safe_add(NODE_ID_KEY, utils.uuid())
-    if not ok and err ~= "exists" then
-      error("failed to set 'node_id' in shm: " .. err)
-    end
-
-    node_id, err = shm:get(NODE_ID_KEY)
-    if err then
-      error("failed to get 'node_id' in shm: " .. err)
-    end
-
-    if not node_id then
-      error("no 'node_id' set in shm")
-    end
-
-    return node_id
-  end
-
-
-  ---
-  -- Returns memory usage statistics about this node.
-  --
-  -- @function kong.node.get_memory_stats
-  -- @tparam[opt] string unit The unit that memory is reported in. Can be
-  -- any of `b/B`, `k/K`, `m/M`, or `g/G` for bytes, kibibytes, mebibytes,
-  -- or gibibytes, respectively. Defaults to `b` (bytes).
-  -- @tparam[opt] number scale The number of digits to the right of the decimal
-  -- point. Defaults to 2.
-  -- @treturn table A table containing memory usage statistics for this node.
-  -- If `unit` is `b/B` (the default), reported values are Lua numbers.
-  -- Otherwise, reported values are strings with the unit as a suffix.
-  -- @usage
-  -- local res = kong.node.get_memory_stats()
-  -- -- res will have the following structure:
-  -- {
-  --   lua_shared_dicts = {
-  --     kong = {
-  --       allocated_slabs = 12288,
-  --       capacity = 24576
-  --     },
-  --     kong_db_cache = {
-  --       allocated_slabs = 12288,
-  --       capacity = 12288
-  --     }
-  --   },
-  --   workers_lua_vms = {
-  --     {
-  --       http_allocated_gc = 1102,
-  --       pid = 18004
-  --     },
-  --     {
-  --       http_allocated_gc = 1102,
-  --       pid = 18005
-  --     }
-  --   }
-  -- }
-  --
-  -- local res = kong.node.get_memory_stats("k", 1)
-  -- -- res will have the following structure:
-  -- {
-  --   lua_shared_dicts = {
-  --     kong = {
-  --       allocated_slabs = "12.0 KiB",
-  --       capacity = "24.0 KiB",
-  --     },
-  --     kong_db_cache = {
-  --       allocated_slabs = "12.0 KiB",
-  --       capacity = "12.0 KiB",
-  --     }
-  --   },
-  --   workers_lua_vms = {
-  --     {
-  --       http_allocated_gc = "1.1 KiB",
-  --       pid = 18004
-  --     },
-  --     {
-  --       http_allocated_gc = "1.1 KiB",
-  --       pid = 18005
-  --     }
-  --   }
-  -- }
-  function _NODE.get_memory_stats(unit, scale)
-    -- validate arguments
-
-    do
-      unit = unit or "b"
-      scale = scale or 2
-
-      local pok, perr = pcall(utils.bytes_to_str, 0, unit, scale)
-      if not pok then
-        error(perr, 2)
-      end
-    end
-
-    local res = {
-      workers_lua_vms = self.table.new(n_workers, 0),
-      lua_shared_dicts = self.table.new(0, #shms),
-    }
-
-    -- get workers Lua VM allocated memory
-
-    do
-      if not shared.kong then
-        goto lua_shared_dicts
-      end
-
-      local keys, err = shared.kong:get_keys()
-      if not keys then
-        res.workers_lua_vms.err = "could not get kong shm keys: " .. err
-        goto lua_shared_dicts
-      end
-
-      if #keys == 1024 then
-        -- Preventive warning log for future Kong developers, in case 'kong'
-        -- shm becomes mis-used or over-used.
-        ngx.log(ngx.WARN, "ngx.shared.kong:get_keys() returned 1024 keys, ",
-                          "but it may have more")
-      end
-
-      for i = 1, #keys do
-        local pid = match(keys[i], "kong:mem:(%d+)")
-        if not pid then
-          goto continue
-        end
-
-        local w = self.table.new(0, 2)
-        w.pid = tonumber(pid)
-
-        local count, err = shared.kong:get("kong:mem:" .. pid)
-        if err then
-          w.err = "could not get worker's HTTP Lua VM memory (pid: " ..
-                  pid .. "): " .. err
-
-        elseif type(count) ~= "number" then
-          w.err = "could not get worker's HTTP Lua VM memory (pid: " ..
-                  pid .. "): reported value is corrupted"
-
-        else
-          count = count * 1024 -- reported value is in kb
-          w.http_allocated_gc = convert_bytes(count, unit, scale)
-        end
-
-        insert(res.workers_lua_vms, w)
-
-        ::continue::
-      end
-
-      sort(res.workers_lua_vms, sort_pid_asc)
-    end
-
-    -- get lua_shared_dicts allocated slabs
-    ::lua_shared_dicts::
-
-    for _, shm in ipairs(shms) do
-      local allocated = shm.capacity - shm.zone:free_space()
-
-      res.lua_shared_dicts[shm.name] = {
-        capacity = convert_bytes(shm.capacity, unit, scale),
-        allocated_slabs = convert_bytes(allocated, unit, scale),
-      }
-    end
-
-    return res
-  end
-
-
-  ---
-  -- Returns the name used by the local machine.
-  --
-  -- @function kong.node.get_hostname
-  -- @treturn string The local machine hostname.
-  -- @usage
-  -- local hostname = kong.node.get_hostname()
-  function _NODE.get_hostname()
-    local SIZE = 253 -- max number of chars for a hostname
-
-    local buf = ffi_new("unsigned char[?]", SIZE)
-    local res = C.gethostname(buf, SIZE)
-
-    if res == 0 then
-      local hostname = ffi_str(buf, SIZE)
-      return gsub(hostname, "%z+$", "")
-    end
-
-    local f = io.popen("/bin/hostname")
-    local hostname = f:read("*a") or ""
-    f:close()
-    return gsub(hostname, "\n$", "")
-  end
-
-
-  local prefix = self and self.configuration and self.configuration.prefix
-  if prefix and self.configuration.role == "data_plane" then
-    local id, err = private_node.load_node_id(prefix)
-    if id then
-      node_id = id
-      ngx.log(ngx.DEBUG, "restored node_id from the filesystem: ", node_id)
-
-    else
-      id = _NODE.get_id()
-      if err then
-        ngx.log(ngx.WARN, "failed to restore node_id from the filesystem: ",
-                err, ", so a new one was generated: ", id)
-      end
-    end
-  end
-
-  return _NODE
-end
-
-
-return {
-  new = new,
-}
+-- not used in koko at this time