From eacf72504cec9122f6134e920c08c7c1cb22ecf5 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 19 Mar 2025 16:13:32 +0100 Subject: [PATCH 1/3] mod_storage_sql: Fix indentation Off-by-one in autoindent after `if not success then` since 3ec48555b773 --- plugins/mod_storage_sql.lua | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index ff44adba3..5f80fad71 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -866,38 +866,38 @@ local function upgrade_table(engine, params, apply_changes) -- luacheck: ignore success,err = engine:transaction(function() return engine:execute(check_encoding_query, params.database, engine.charset, engine.charset.."_bin"); - end); - if not success then - module:log("error", "Failed to check/upgrade database encoding: %s", err or "unknown error"); - return false; + end); + if not success then + module:log("error", "Failed to check/upgrade database encoding: %s", err or "unknown error"); + return false; + end + else + local indices = {}; + engine:transaction(function () + if params.driver == "SQLite3" then + for row in engine:select [[SELECT "name" FROM "sqlite_schema" WHERE "type"='index' AND "tbl_name"='prosody' AND "name"='prosody_index';]] do + indices[row[1]] = true; + end + elseif params.driver == "PostgreSQL" then + for row in engine:select [[SELECT "indexname" FROM "pg_indexes" WHERE "tablename"='prosody' AND "indexname"='prosody_index';]] do + indices[row[1]] = true; + end end - else - local indices = {}; - engine:transaction(function () - if params.driver == "SQLite3" then - for row in engine:select [[SELECT "name" FROM "sqlite_schema" WHERE "type"='index' AND "tbl_name"='prosody' AND "name"='prosody_index';]] do - indices[row[1]] = true; - end - elseif params.driver == "PostgreSQL" then - for row in engine:select [[SELECT "indexname" FROM "pg_indexes" WHERE "tablename"='prosody' AND "indexname"='prosody_index';]] do - indices[row[1]] = true; - end - end - end) - if indices["prosody_index"] then - if apply_changes then - local success = engine:transaction(function () - return assert(engine:execute([[DROP INDEX "prosody_index";]])); - end); - if not success then - module:log("error", "Failed to delete obsolete index \"prosody_index\""); - return false; - end - else - changes = true; + end) + if indices["prosody_index"] then + if apply_changes then + local success = engine:transaction(function () + return assert(engine:execute([[DROP INDEX "prosody_index";]])); + end); + if not success then + module:log("error", "Failed to delete obsolete index \"prosody_index\""); + return false; end + else + changes = true; end end + end return changes; end From 0ed2d38edf5154c4a892ba1e0f6caf645ec302de Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 19 Mar 2025 16:15:52 +0100 Subject: [PATCH 2/3] core.storagemanager: Fix tests by removing an assert that upset luarocks Not sure why but this assert() caused a stack overflow in luarocks --- spec/core_storagemanager_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/core_storagemanager_spec.lua b/spec/core_storagemanager_spec.lua index f1adcd500..32a8d6f0b 100644 --- a/spec/core_storagemanager_spec.lua +++ b/spec/core_storagemanager_spec.lua @@ -63,7 +63,7 @@ describe("storagemanager", function () end assert(hm.activate(test_host, {})); sm.initialize_host(test_host); - assert(mm.load(test_host, "storage_"..backend_config.storage)); + mm.load(test_host, "storage_"..backend_config.storage); describe("key-value stores", function () -- These tests rely on being executed in order, disable any order From 6959547703da2b8137005e391863e7e6399109a6 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 22 Mar 2025 11:53:15 +0100 Subject: [PATCH 3/3] core.usermanager: Fix COMPAT layer for legacy is_admin() function Thanks ctrlaltca Fixes #1912 --- core/usermanager.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/usermanager.lua b/core/usermanager.lua index c179e21b7..beac547da 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -307,7 +307,8 @@ local function is_admin(jid, host) end log("warn", "Usage of legacy is_admin() API, which will be disabled in a future build: %s", debug.traceback()); log("warn", "See https://prosody.im/doc/developers/permissions about the new permissions API"); - return legacy_admin_roles[get_jid_role(jid, host)] or false; + local role = get_jid_role(jid, host); + return role and legacy_admin_roles[role.name] or false; end local function get_users_with_role(role, host)