ci: install luasodium; accept sodium/luasodium in checks

Author: jaine

.github/workflows/ci.yml

@@ -20,9 +20,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y lua5.4 lua5.4-dev luarocks libsodium-dev
 
-      - name: "Install required rocks (Lua 5.4: lua-cjson/luv/lsqlite3/luaossl/sodium)"
+      - name: "Install required rocks (Lua 5.4: lua-cjson/luv/lsqlite3/luaossl/luasodium)"
         run: |
-          rocks=(lua-cjson luv lsqlite3 luaossl sodium)
+          rocks=(lua-cjson luv lsqlite3 luaossl luasodium)
           for rock in "${rocks[@]}"; do
             luarocks --lua-version=5.4 install --local "$rock" || exit 1
           done
@@ -48,7 +48,7 @@ jobs:
 
       - name: Install gitleaks
         run: |
-          curl -sSfL https://raw.githubusercontent.com/gitleaks/gitleaks/master/install.sh | bash -s -- -b /usr/local/bin
+          curl -sSfL https://raw.githubusercontent.com/gitleaks/gitleaks/main/install.sh | bash -s -- -b /usr/local/bin
 
       - name: Preflight (schemas + Lua syntax + deps)
         env:

ao/shared/arweave.lua

@@ -28,6 +28,9 @@ local cjson = cjson_safe or require("cjson") -- required dependency
 local schema = require("ao.shared.schema")
 local openssl_ok, openssl = pcall(require, "openssl")
 local sodium_ok, sodium = pcall(require, "sodium")
+if not sodium_ok then
+  sodium_ok, sodium = pcall(require, "luasodium")
+end
 
 local function next_tx()
   counter = counter + 1

ao/shared/auth.lua

@@ -23,6 +23,9 @@ local DEVICE_TOKEN = os.getenv("AUTH_DEVICE_TOKEN")
 local REQUIRE_DEVICE = os.getenv("AUTH_REQUIRE_DEVICE_TOKEN") == "1"
 local openssl_ok, openssl = pcall(require, "openssl")
 local sodium_ok, sodium = pcall(require, "sodium")
+if not sodium_ok then
+  sodium_ok, sodium = pcall(require, "luasodium")
+end
 local ed25519_ok, ed25519 = pcall(require, "ed25519") -- pure-lua (MIT) if installed
 local sqlite_ok, sqlite = pcall(require, "lsqlite3")
 local SHELL_FALLBACK = os.getenv("AUTH_ALLOW_SHELL_FALLBACK") == "1" -- default now off

scripts/verify/deps_check.lua

@@ -1,9 +1,9 @@
 local deps = {
-  { name = "luv", mod = "luv" },
-  { name = "lsqlite3", mod = "lsqlite3" },
-  { name = "cjson", mod = "cjson.safe" },
-  { name = "luaossl", mod = "openssl" },
-  { name = "sodium", mod = "sodium" },
+  { name = "luv", mods = { "luv" } },
+  { name = "lsqlite3", mods = { "lsqlite3" } },
+  { name = "cjson", mods = { "cjson.safe", "cjson" } },
+  { name = "luaossl", mods = { "openssl" } },
+  { name = "sodium", mods = { "sodium", "luasodium" } },
 }
 
 local function require_any(label, modules)
@@ -20,11 +20,11 @@ end
 
 -- core deps
 for _, d in ipairs(deps) do
-  if not require_any(d.name, { d.mod }) then os.exit(1) end
+  if not require_any(d.name, d.mods) then os.exit(1) end
 end
 
 -- Ed25519 signer: allow either ed25519 rock or sodium providing crypto_sign_* API
-local ed25519_ok = require_any("ed25519", { "ed25519", "sodium" })
+local ed25519_ok = require_any("ed25519", { "ed25519", "sodium", "luasodium" })
 if not ed25519_ok then os.exit(1) end
 
 -- Fail-closed if signatures required and no sodium available (used for ed25519)

scripts/verify/libsodium_strict.sh

@@ -1,9 +1,33 @@
 #!/usr/bin/env bash
 set -euo pipefail
-python3 - <<'PY'
-import importlib
-mods = ["sodium", "ed25519"]
-missing = [m for m in mods if importlib.util.find_spec(m) is None]
-if missing:
-    raise SystemExit(f"Missing modules: {missing}")
-PY
+
+lua_versions=(lua5.4 lua)
+found_lua=""
+for l in "${lua_versions[@]}"; do
+  if command -v "$l" >/dev/null 2>&1; then
+    found_lua="$l"
+    break
+  fi
+done
+
+if [ -z "$found_lua" ]; then
+  echo "Lua interpreter not found for libsodium check" >&2
+  exit 1
+fi
+
+"$found_lua" - <<'LUA'
+local function require_any(mods)
+  for _, m in ipairs(mods) do
+    local ok, mod = pcall(require, m)
+    if ok then return true end
+  end
+  return false
+end
+
+local sodium_ok = require_any({ "sodium", "luasodium" })
+local ed_ok = require_any({ "ed25519", "sodium", "luasodium" })
+
+if not sodium_ok or not ed_ok then
+  error(string.format("Missing sodium/ed25519 (sodium:%s ed25519:%s)", tostring(sodium_ok), tostring(ed_ok)))
+end
+LUA