mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-04-10 23:16:13 +02:00
commit 8a9dd05b08
5 changed files with 80 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/mod_presence.lua
View file

@ -36,18 +36,15 @@ function handle_normal_presence(origin, stanza)
local priority = stanza:get_child("priority"); local priority = stanza:get_child("priority");
if priority and priority[1] ~= "0" then if priority and priority[1] ~= "0" then
for i=#priority.tags,1,-1 do priority.tags[i] = nil; end for i=#priority.tags,1,-1 do priority.tags[i] = nil; end
for i=#priority,1,-1 do priority[i] = nil; end for i=#priority,2,-1 do priority[i] = nil; end
priority[1] = "0"; priority[1] = "0";
end end
end end
local priority = stanza:get_child("priority"); local priority = stanza:get_child_text("priority");
if priority and #priority > 0 then if priority and s_find(priority, "^[+-]?[0-9]+$") then
priority = t_concat(priority); priority = tonumber(priority);
if s_find(priority, "^[+-]?[0-9]+$") then if priority < -128 then priority = -128 end
priority = tonumber(priority); if priority > 127 then priority = 127 end
if priority < -128 then priority = -128 end
if priority > 127 then priority = 127 end
else priority = 0; end
else priority = 0; end else priority = 0; end
if full_sessions[origin.full_jid] then -- if user is still connected if full_sessions[origin.full_jid] then -- if user is still connected
origin.send(stanza); -- reflect their presence back to them origin.send(stanza); -- reflect their presence back to them

4
plugins/mod_register.lua
View file

@ -255,7 +255,7 @@ module:hook("stanza/iq/jabber:iq:register:query", function(event)
session.send(st.error_reply(stanza, "modify", "not-acceptable", "The requested username is invalid.")); session.send(st.error_reply(stanza, "modify", "not-acceptable", "The requested username is invalid."));
return true; return true;
end end
local user = { username = username , host = host, allowed = true } local user = { username = username , host = host, additional = data, allowed = true }
module:fire_event("user-registering", user); module:fire_event("user-registering", user);
if not user.allowed then if not user.allowed then
log("debug", "Registration disallowed by module"); log("debug", "Registration disallowed by module");
@ -268,7 +268,7 @@ module:hook("stanza/iq/jabber:iq:register:query", function(event)
local error_reply = st.error_reply(stanza, "wait", "internal-server-error", "Failed to write data to disk."); local error_reply = st.error_reply(stanza, "wait", "internal-server-error", "Failed to write data to disk.");
if usermanager_create_user(username, password, host) then if usermanager_create_user(username, password, host) then
data.registered = os.time(); data.registered = os.time();
if next(data) and not account_details:set(username, data) then if not account_details:set(username, data) then
log("debug", "Could not store extra details"); log("debug", "Could not store extra details");
usermanager_delete_user(username, host); usermanager_delete_user(username, host);
session.send(error_reply); session.send(error_reply);

108
plugins/mod_storage_sql.lua
View file

@ -58,9 +58,9 @@ local function keyval_store_get()
local haveany; local haveany;
local result = {}; local result = {};
local select_sql = [[ local select_sql = [[
SELECT `key`,`type`,`value` SELECT "key","type","value"
FROM `prosody` FROM "prosody"
WHERE `host`=? AND `user`=? AND `store`=?; WHERE "host"=? AND "user"=? AND "store"=?;
]] ]]
for row in engine:select(select_sql, host, user or "", store) do for row in engine:select(select_sql, host, user or "", store) do
haveany = true; haveany = true;
@ -80,14 +80,14 @@ local function keyval_store_get()
end end
local function keyval_store_set(data) local function keyval_store_set(data)
local delete_sql = [[ local delete_sql = [[
DELETE FROM `prosody` DELETE FROM "prosody"
WHERE `host`=? AND `user`=? AND `store`=? WHERE "host"=? AND "user"=? AND "store"=?
]]; ]];
engine:delete(delete_sql, host, user or "", store); engine:delete(delete_sql, host, user or "", store);
local insert_sql = [[ local insert_sql = [[
INSERT INTO `prosody` INSERT INTO "prosody"
(`host`,`user`,`store`,`key`,`type`,`value`) ("host","user","store","key","type","value")
VALUES (?,?,?,?,?,?); VALUES (?,?,?,?,?,?);
]] ]]
if data and next(data) ~= nil then if data and next(data) ~= nil then
@ -130,9 +130,9 @@ end
function keyval_store:users() function keyval_store:users()
local ok, result = engine:transaction(function() local ok, result = engine:transaction(function()
local select_sql = [[ local select_sql = [[
SELECT DISTINCT `user` SELECT DISTINCT "user"
FROM `prosody` FROM "prosody"
WHERE `host`=? AND `store`=?; WHERE "host"=? AND "store"=?;
]]; ]];
return engine:select(select_sql, host, self.store); return engine:select(select_sql, host, self.store);
end); end);
@ -149,9 +149,9 @@ map_store.remove = {};
function map_store:get(username, key) function map_store:get(username, key)
local ok, result = engine:transaction(function() local ok, result = engine:transaction(function()
local query = [[ local query = [[
SELECT `type`, `value` SELECT "type", "value"
FROM `prosody` FROM "prosody"
WHERE `host`=? AND `user`=? AND `store`=? AND `key`=? WHERE "host"=? AND "user"=? AND "store"=? AND "key"=?
LIMIT 1 LIMIT 1
]]; ]];
local data; local data;
@ -177,18 +177,18 @@ end
function map_store:set_keys(username, keydatas) function map_store:set_keys(username, keydatas)
local ok, result = engine:transaction(function() local ok, result = engine:transaction(function()
local delete_sql = [[ local delete_sql = [[
DELETE FROM `prosody` DELETE FROM "prosody"
WHERE `host`=? AND `user`=? AND `store`=? AND `key`=?; WHERE "host"=? AND "user"=? AND "store"=? AND "key"=?;
]]; ]];
local insert_sql = [[ local insert_sql = [[
INSERT INTO `prosody` INSERT INTO "prosody"
(`host`,`user`,`store`,`key`,`type`,`value`) ("host","user","store","key","type","value")
VALUES (?,?,?,?,?,?); VALUES (?,?,?,?,?,?);
]]; ]];
local select_extradata_sql = [[ local select_extradata_sql = [[
SELECT `type`, `value` SELECT "type", "value"
FROM `prosody` FROM "prosody"
WHERE `host`=? AND `user`=? AND `store`=? AND `key`=? WHERE "host"=? AND "user"=? AND "store"=? AND "key"=?
LIMIT 1; LIMIT 1;
]]; ]];
for key, data in pairs(keydatas) do for key, data in pairs(keydatas) do
@ -227,12 +227,12 @@ function archive_store:append(username, key, value, when, with)
with = with or ""; with = with or "";
local ok, ret = engine:transaction(function() local ok, ret = engine:transaction(function()
local delete_sql = [[ local delete_sql = [[
DELETE FROM `prosodyarchive` DELETE FROM "prosodyarchive"
WHERE `host`=? AND `user`=? AND `store`=? AND `key`=?; WHERE "host"=? AND "user"=? AND "store"=? AND "key"=?;
]]; ]];
local insert_sql = [[ local insert_sql = [[
INSERT INTO `prosodyarchive` INSERT INTO "prosodyarchive"
(`host`, `user`, `store`, `when`, `with`, `key`, `type`, `value`) ("host", "user", "store", "when", "with", "key", "type", "value")
VALUES (?,?,?,?,?,?,?,?); VALUES (?,?,?,?,?,?,?,?);
]]; ]];
if key then if key then
@ -253,27 +253,27 @@ local function archive_where(query, args, where)
-- Time range, inclusive -- Time range, inclusive
if query.start then if query.start then
args[#args+1] = query.start args[#args+1] = query.start
where[#where+1] = "`when` >= ?" where[#where+1] = "\"when\" >= ?"
end end
if query["end"] then if query["end"] then
args[#args+1] = query["end"]; args[#args+1] = query["end"];
if query.start then if query.start then
where[#where] = "`when` BETWEEN ? AND ?" -- is this inclusive? where[#where] = "\"when\" BETWEEN ? AND ?" -- is this inclusive?
else else
where[#where+1] = "`when` <= ?" where[#where+1] = "\"when\" <= ?"
end end
end end
-- Related name -- Related name
if query.with then if query.with then
where[#where+1] = "`with` = ?"; where[#where+1] = "\"with\" = ?";
args[#args+1] = query.with args[#args+1] = query.with
end end
-- Unique id -- Unique id
if query.key then if query.key then
where[#where+1] = "`key` = ?"; where[#where+1] = "\"key\" = ?";
args[#args+1] = query.key args[#args+1] = query.key
end end
end end
@ -282,11 +282,11 @@ local function archive_where_id_range(query, args, where)
-- Before or after specific item, exclusive -- Before or after specific item, exclusive
if query.after then -- keys better be unique! if query.after then -- keys better be unique!
where[#where+1] = [[ where[#where+1] = [[
`sort_id` > COALESCE( "sort_id" > COALESCE(
( (
SELECT `sort_id` SELECT "sort_id"
FROM `prosodyarchive` FROM "prosodyarchive"
WHERE `key` = ? AND `host` = ? AND `user` = ? AND `store` = ? WHERE "key" = ? AND "host" = ? AND "user" = ? AND "store" = ?
LIMIT 1 LIMIT 1
), 0) ), 0)
]]; ]];
@ -295,16 +295,16 @@ local function archive_where_id_range(query, args, where)
end end
if query.before then if query.before then
where[#where+1] = [[ where[#where+1] = [[
`sort_id` < COALESCE( "sort_id" < COALESCE(
( (
SELECT `sort_id` SELECT "sort_id"
FROM `prosodyarchive` FROM "prosodyarchive"
WHERE `key` = ? AND `host` = ? AND `user` = ? AND `store` = ? WHERE "key" = ? AND "host" = ? AND "user" = ? AND "store" = ?
LIMIT 1 LIMIT 1
), ),
( (
SELECT MAX(`sort_id`)+1 SELECT MAX("sort_id")+1
FROM `prosodyarchive` FROM "prosodyarchive"
) )
) )
]] ]]
@ -318,19 +318,19 @@ function archive_store:find(username, query)
local total; local total;
local ok, result = engine:transaction(function() local ok, result = engine:transaction(function()
local sql_query = [[ local sql_query = [[
SELECT `key`, `type`, `value`, `when`, `with` SELECT "key", "type", "value", "when", "with"
FROM `prosodyarchive` FROM "prosodyarchive"
WHERE %s WHERE %s
ORDER BY `sort_id` %s%s; ORDER BY "sort_id" %s%s;
]]; ]];
local args = { host, user or "", store, }; local args = { host, user or "", store, };
local where = { "`host` = ?", "`user` = ?", "`store` = ?", }; local where = { "\"host\" = ?", "\"user\" = ?", "\"store\" = ?", };
archive_where(query, args, where); archive_where(query, args, where);
-- Total matching -- Total matching
if query.total then if query.total then
local stats = engine:select("SELECT COUNT(*) FROM `prosodyarchive` WHERE " local stats = engine:select("SELECT COUNT(*) FROM \"prosodyarchive\" WHERE "
.. t_concat(where, " AND "), unpack(args)); .. t_concat(where, " AND "), unpack(args));
if stats then if stats then
for row in stats do for row in stats do
@ -365,9 +365,9 @@ function archive_store:delete(username, query)
query = query or {}; query = query or {};
local user,store = username,self.store; local user,store = username,self.store;
local ok, stmt = engine:transaction(function() local ok, stmt = engine:transaction(function()
local sql_query = "DELETE FROM `prosodyarchive` WHERE %s;"; local sql_query = "DELETE FROM \"prosodyarchive\" WHERE %s;";
local args = { host, user or "", store, }; local args = { host, user or "", store, };
local where = { "`host` = ?", "`user` = ?", "`store` = ?", }; local where = { "\"host\" = ?", "\"user\" = ?", "\"store\" = ?", };
if user == true then if user == true then
table.remove(args, 2); table.remove(args, 2);
table.remove(where, 2); table.remove(where, 2);
@ -401,7 +401,7 @@ function driver:open(store, typ)
end end
function driver:stores(username) function driver:stores(username)
local query = "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`" .. local query = "SELECT DISTINCT \"store\" FROM \"prosody\" WHERE \"host\"=? AND \"user\"" ..
(username == true and "!=?" or "=?"); (username == true and "!=?" or "=?");
if username == true or not username then if username == true or not username then
username = ""; username = "";
@ -415,7 +415,7 @@ end
function driver:purge(username) function driver:purge(username)
return engine:transaction(function() return engine:transaction(function()
local stmt,err = engine:delete("DELETE FROM `prosody` WHERE `host`=? AND `user`=?", host, username); local stmt,err = engine:delete("DELETE FROM \"prosody\" WHERE \"host\"=? AND \"user\"=?", host, username);
return true, err; return true, err;
end); end);
end end
@ -467,7 +467,7 @@ local function upgrade_table(engine, params, apply_changes) -- luacheck: ignore
changes = true; changes = true;
if apply_changes then if apply_changes then
module:log("info", "Upgrading database schema..."); module:log("info", "Upgrading database schema...");
engine:execute("ALTER TABLE prosody MODIFY COLUMN `value` MEDIUMTEXT"); engine:execute("ALTER TABLE prosody MODIFY COLUMN \"value\" MEDIUMTEXT");
module:log("info", "Database table automatically upgraded"); module:log("info", "Database table automatically upgraded");
end end
end end
@ -482,9 +482,9 @@ local function upgrade_table(engine, params, apply_changes) -- luacheck: ignore
-- COMPAT w/pre-0.10: Upgrade table to UTF-8 if not already -- COMPAT w/pre-0.10: Upgrade table to UTF-8 if not already
local check_encoding_query = [[ local check_encoding_query = [[
SELECT `COLUMN_NAME`,`COLUMN_TYPE`,`TABLE_NAME` SELECT "COLUMN_NAME","COLUMN_TYPE","TABLE_NAME"
FROM `information_schema`.`columns` FROM "information_schema"."columns"
WHERE `TABLE_NAME` LIKE 'prosody%%' AND ( `CHARACTER_SET_NAME`!='%s' OR `COLLATION_NAME`!='%s_bin' ); WHERE "TABLE_NAME" LIKE 'prosody%%' AND ( "CHARACTER_SET_NAME"!='%s' OR "COLLATION_NAME"!='%s_bin' );
]]; ]];
check_encoding_query = check_encoding_query:format(engine.charset, engine.charset); check_encoding_query = check_encoding_query:format(engine.charset, engine.charset);
-- FIXME Is it ok to ignore the return values from this? -- FIXME Is it ok to ignore the return values from this?
@ -495,8 +495,8 @@ local function upgrade_table(engine, params, apply_changes) -- luacheck: ignore
changes = true; changes = true;
if apply_changes then if apply_changes then
module:log("warn", "Found %d columns in prosody table requiring encoding change, updating now...", n_bad_columns); module:log("warn", "Found %d columns in prosody table requiring encoding change, updating now...", n_bad_columns);
local fix_column_query1 = "ALTER TABLE `%s` CHANGE `%s` `%s` BLOB;"; local fix_column_query1 = "ALTER TABLE \"%s\" CHANGE \"%s\" \"%s\" BLOB;";
local fix_column_query2 = "ALTER TABLE `%s` CHANGE `%s` `%s` %s CHARACTER SET '%s' COLLATE '%s_bin';"; local fix_column_query2 = "ALTER TABLE \"%s\" CHANGE \"%s\" \"%s\" %s CHARACTER SET '%s' COLLATE '%s_bin';";
for row in result:rows() do for row in result:rows() do
local column_name, column_type, table_name = unpack(row); local column_name, column_type, table_name = unpack(row);
module:log("debug", "Fixing column %s in table %s", column_name, table_name); module:log("debug", "Fixing column %s in table %s", column_name, table_name);

12
tools/migration/migrator/prosody_sql.lua
View file

@ -92,9 +92,9 @@ local function needs_upgrade(engine, params)
-- COMPAT w/pre-0.10: Upgrade table to UTF-8 if not already -- COMPAT w/pre-0.10: Upgrade table to UTF-8 if not already
local check_encoding_query = [[ local check_encoding_query = [[
SELECT `COLUMN_NAME`,`COLUMN_TYPE`,`TABLE_NAME` SELECT "COLUMN_NAME","COLUMN_TYPE","TABLE_NAME"
FROM `information_schema`.`columns` FROM "information_schema"."columns"
WHERE `TABLE_NAME` LIKE 'prosody%%' AND ( `CHARACTER_SET_NAME`!='%s' OR `COLLATION_NAME`!='%s_bin' ); WHERE "TABLE_NAME" LIKE 'prosody%%' AND ( "CHARACTER_SET_NAME"!='%s' OR "COLLATION_NAME"!='%s_bin' );
]]; ]];
check_encoding_query = check_encoding_query:format(engine.charset, engine.charset); check_encoding_query = check_encoding_query:format(engine.charset, engine.charset);
local result = engine:execute(check_encoding_query); local result = engine:execute(check_encoding_query);
@ -116,7 +116,7 @@ local function reader(input)
end)); end));
local keys = {"host", "user", "store", "key", "type", "value"}; local keys = {"host", "user", "store", "key", "type", "value"};
assert(engine:connect()); assert(engine:connect());
local f,s,val = assert(engine:select("SELECT `host`, `user`, `store`, `key`, `type`, `value` FROM `prosody`;")); local f,s,val = assert(engine:select("SELECT \"host\", \"user\", \"store\", \"key\", \"type\", \"value\" FROM \"prosody\";"));
-- get SQL rows, sorted -- get SQL rows, sorted
local iter = mtools.sorted { local iter = mtools.sorted {
reader = function() val = f(s, val); return val; end; reader = function() val = f(s, val); return val; end;
@ -157,8 +157,8 @@ local function writer(output, iter)
create_table(engine); create_table(engine);
end)); end));
assert(engine:connect()); assert(engine:connect());
assert(engine:delete("DELETE FROM prosody")); assert(engine:delete("DELETE FROM \"prosody\""));
local insert_sql = "INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)"; local insert_sql = "INSERT INTO \"prosody\" (\"host\",\"user\",\"store\",\"key\",\"type\",\"value\") VALUES (?,?,?,?,?,?)";
return function(item) return function(item)
if not item then assert(engine.conn:commit()) return end -- end of input if not item then assert(engine.conn:commit()) return end -- end of input

26
util/sql.lua
View file

@ -128,8 +128,8 @@ function engine:onconnect()
end end
function engine:prepquery(sql) function engine:prepquery(sql)
if self.params.driver == "PostgreSQL" then if self.params.driver == "MySQL" then
sql = sql:gsub("`", "\""); sql = sql:gsub("\"", "`");
end end
return sql; return sql;
end end
@ -242,27 +242,26 @@ function engine:transaction(...)
return ok, ret; return ok, ret;
end end
function engine:_create_index(index) function engine:_create_index(index)
local sql = "CREATE INDEX `"..index.name.."` ON `"..index.table.."` ("; local sql = "CREATE INDEX \""..index.name.."\" ON \""..index.table.."\" (";
for i=1,#index do for i=1,#index do
sql = sql.."`"..index[i].."`"; sql = sql.."\""..index[i].."\"";
if i ~= #index then sql = sql..", "; end if i ~= #index then sql = sql..", "; end
end end
sql = sql..");" sql = sql..");"
if self.params.driver == "PostgreSQL" then if self.params.driver == "MySQL" then
sql = sql:gsub("`", "\""); sql = sql:gsub("\"([,)])", "\"(20)%1");
elseif self.params.driver == "MySQL" then
sql = sql:gsub("`([,)])", "`(20)%1");
end end
if index.unique then if index.unique then
sql = sql:gsub("^CREATE", "CREATE UNIQUE"); sql = sql:gsub("^CREATE", "CREATE UNIQUE");
end end
sql = self:prepquery(sql);
if self._debug then if self._debug then
debugquery("create", sql); debugquery("create", sql);
end end
return self:execute(sql); return self:execute(sql);
end end
function engine:_create_table(table) function engine:_create_table(table)
local sql = "CREATE TABLE `"..table.name.."` ("; local sql = "CREATE TABLE \""..table.name.."\" (";
for i,col in ipairs(table.c) do for i,col in ipairs(table.c) do
local col_type = col.type; local col_type = col.type;
if col_type == "MEDIUMTEXT" and self.params.driver ~= "MySQL" then if col_type == "MEDIUMTEXT" and self.params.driver ~= "MySQL" then
@ -271,7 +270,7 @@ function engine:_create_table(table)
if col.auto_increment == true and self.params.driver == "PostgreSQL" then if col.auto_increment == true and self.params.driver == "PostgreSQL" then
col_type = "BIGSERIAL"; col_type = "BIGSERIAL";
end end
sql = sql.."`"..col.name.."` "..col_type; sql = sql.."\""..col.name.."\" "..col_type;
if col.nullable == false then sql = sql.." NOT NULL"; end if col.nullable == false then sql = sql.." NOT NULL"; end
if col.primary_key == true then sql = sql.." PRIMARY KEY"; end if col.primary_key == true then sql = sql.." PRIMARY KEY"; end
if col.auto_increment == true then if col.auto_increment == true then
@ -284,11 +283,10 @@ function engine:_create_table(table)
if i ~= #table.c then sql = sql..", "; end if i ~= #table.c then sql = sql..", "; end
end end
sql = sql.. ");" sql = sql.. ");"
if self.params.driver == "PostgreSQL" then if self.params.driver == "MySQL" then
sql = sql:gsub("`", "\"");
elseif self.params.driver == "MySQL" then
sql = sql:gsub(";$", (" CHARACTER SET '%s' COLLATE '%s_bin';"):format(self.charset, self.charset)); sql = sql:gsub(";$", (" CHARACTER SET '%s' COLLATE '%s_bin';"):format(self.charset, self.charset));
end end
sql = self:prepquery(sql);
if self._debug then if self._debug then
debugquery("create", sql); debugquery("create", sql);
end end
@ -316,7 +314,7 @@ function engine:set_encoding() -- to UTF-8
local charset = "utf8"; local charset = "utf8";
if driver == "MySQL" then if driver == "MySQL" then
self:transaction(function() self:transaction(function()
for row in self:select"SELECT `CHARACTER_SET_NAME` FROM `information_schema`.`CHARACTER_SETS` WHERE `CHARACTER_SET_NAME` LIKE 'utf8%' ORDER BY MAXLEN DESC LIMIT 1;" do for row in self:select"SELECT \"CHARACTER_SET_NAME\" FROM \"information_schema\".\"CHARACTER_SETS\" WHERE \"CHARACTER_SET_NAME\" LIKE 'utf8%' ORDER BY MAXLEN DESC LIMIT 1;" do
charset = row and row[1] or charset; charset = row and row[1] or charset;
end end
end); end);