Mercurial > lxmppd-hg-xmllex / changeset
changeset
Automated merge with http://waqas.ath.cx:8000/
Thu, 25 Dec 2008 01:37:13 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Thu, 25 Dec 2008 01:37:13 +0000
- changeset 644
- e1b3a472ca00
- parent 643
- 8ff454831f7d (diff)
- parent 639
- 38cb21431257 (current diff)
- child 645
- d0a8ff9ba3e0
Automated merge with http://waqas.ath.cx:8000/
--- a/core/presencemanager.lua Wed Dec 24 23:19:48 2008 +0000 +++ b/core/presencemanager.lua Thu Dec 25 01:37:13 2008 +0000 @@ -103,7 +103,14 @@ end origin.priority = 0; if stanza.attr.type == "unavailable" then - origin.presence = nil; + origin.presence = nil; + if origin.directed then + for _, jid in ipairs(origin.directed) do + stanza.attr.to = jid; + core_route_stanza(origin, stanza); + end + origin.directed = nil; + end else origin.presence = stanza; local priority = stanza:child_with_name("priority");
--- a/core/stanza_router.lua Wed Dec 24 23:19:48 2008 +0000 +++ b/core/stanza_router.lua Thu Dec 25 01:37:13 2008 +0000 @@ -99,9 +99,9 @@ core_handle_stanza(origin, stanza); elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); - elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server + elseif hosts[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource component_handle_stanza(origin, stanza); - elseif hosts[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource + elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server component_handle_stanza(origin, stanza); elseif hosts[host] and hosts[host].type == "component" then -- directed at a component component_handle_stanza(origin, stanza); @@ -110,6 +110,10 @@ elseif origin.type ~= "c2s" and stanza.name == "iq" and not resource then -- directed at bare JID core_handle_stanza(origin, stanza); else + if origin.type == "c2s" and stanza.name == "presence" and to ~= nil and not(origin.roster[to_bare] and (origin.roster[to_bare].subscription == "both" or origin.roster[to_bare].subscription == "from")) then + origin.directed = origin.directed or {}; + t_insert(origin.directed, to); -- FIXME does it make more sense to add to_bare rather than to? + end core_route_stanza(origin, stanza); end else @@ -225,7 +229,7 @@ else -- TODO send unavailable presence or unsubscribed end - elseif stanza.name == "message" then + elseif stanza.name == "message" then -- FIXME if full jid, then send out to resources with highest priority if stanza.attr.type == "chat" or stanza.attr.type == "normal" or not stanza.attr.type then offlinemanager.store(node, host, stanza); -- FIXME don't store messages with only chat state notifications @@ -233,12 +237,13 @@ -- TODO allow configuration of offline storage -- TODO send error if not storing offline elseif stanza.name == "iq" then - -- TODO send IQ error + origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); end else -- user does not exist -- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses? if stanza.name == "presence" then - if stanza.attr.type == "probe" then + local t = stanza.attr.type; + if t == "subscribe" or t == "probe" then origin.send(st.presence({from = to_bare, to = from_bare, type = "unsubscribed"})); end -- else ignore
--- a/prosody Wed Dec 24 23:19:48 2008 +0000 +++ b/prosody Thu Dec 25 01:37:13 2008 +0000 @@ -108,30 +108,6 @@ local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; require "util.datamanager".set_data_path(data_path); - -local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end -local _mkdir = {} -function mkdir(path) - path = path:gsub("/", path_separator); - local x = io.popen("mkdir \""..path.."\" 2>&1"):read("*a"); -end -function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end -function mkdirs(host) - if not _mkdir[host] then - local host_dir = string.format("%s/%s", data_path, encode(host)); - mkdir(host_dir); - mkdir(host_dir.."/accounts"); - mkdir(host_dir.."/vcard"); - mkdir(host_dir.."/roster"); - mkdir(host_dir.."/private"); - mkdir(host_dir.."/offline"); - _mkdir[host] = true; - end -end -mkdir(data_path); - -eventmanager.add_event_hook("host-activated", mkdirs); - ----------- End of out-of-place code -------------- eventmanager.fire_event("server-starting");
--- a/tools/ejabberd2prosody.lua Wed Dec 24 23:19:48 2008 +0000 +++ b/tools/ejabberd2prosody.lua Thu Dec 25 01:37:13 2008 +0000 @@ -27,40 +27,7 @@ local st = require "util.stanza"; package.loaded["util.logger"] = {init = function() return function() end; end} local dm = require "util.datamanager" -local data_path = "data"; -dm.set_data_path(data_path); - -local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end -local _mkdir = {} -function mkdir(path) - path = path:gsub("/", path_separator); - --print("mkdir",path); - local x = io.popen("mkdir "..path.." 2>&1"):read("*a"); -end -function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end -function getpath(username, host, datastore, ext) - ext = ext or "dat"; - if username then - return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext); - elseif host then - return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext); - else - return format("%s/%s.%s", data_path, datastore, ext); - end -end -function mkdirs(host) - if not _mkdir[host] then - local host_dir = string.format("%s/%s", data_path, encode(host)); - mkdir(host_dir); - mkdir(host_dir.."/accounts"); - mkdir(host_dir.."/vcard"); - mkdir(host_dir.."/roster"); - mkdir(host_dir.."/private"); - mkdir(host_dir.."/offline"); - _mkdir[host] = true; - end -end -mkdir(data_path); +dm.set_data_path("data"); function build_stanza(tuple, stanza) if tuple[1] == "xmlelement" then @@ -83,31 +50,26 @@ end function vcard(node, host, stanza) - mkdirs(host); local ret, err = dm.store(node, host, "vcard", st.preserialize(stanza)); print("["..(err or "success").."] vCard: "..node.."@"..host); end function password(node, host, password) - mkdirs(host); local ret, err = dm.store(node, host, "accounts", {password = password}); print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password); end function roster(node, host, jid, item) - mkdirs(host); local roster = dm.load(node, host, "roster") or {}; roster[jid] = item; local ret, err = dm.store(node, host, "roster", roster); print("["..(err or "success").."] roster: " ..node.."@"..host.." - "..jid); end function private_storage(node, host, xmlns, stanza) - mkdirs(host); local private = dm.load(node, host, "private") or {}; private[xmlns] = st.preserialize(stanza); local ret, err = dm.store(node, host, "private", private); print("["..(err or "success").."] private: " ..node.."@"..host.." - "..xmlns); end function offline_msg(node, host, t, stanza) - mkdirs(host); stanza.attr.stamp = os.date("!%Y-%m-%dT%H:%M:%SZ", t); stanza.attr.stamp_legacy = os.date("!%Y%m%dT%H:%M:%S", t); local ret, err = dm.list_append(node, host, "offline", st.preserialize(stanza));
--- a/util/datamanager.lua Wed Dec 24 23:19:48 2008 +0000 +++ b/util/datamanager.lua Thu Dec 25 01:37:13 2008 +0000 @@ -26,11 +26,13 @@ local log = require "util.logger".init("datamanager"); local io_open = io.open; local os_remove = os.remove; +local io_popen = io.popen; local tostring, tonumber = tostring, tonumber; local error = error; local next = next; local t_insert = table.insert; local append = require "util.serialization".append; +local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end module "datamanager" @@ -48,21 +50,37 @@ end end +local _mkdir = {}; +local function mkdir(path) + path = path:gsub("/", path_separator); -- TODO as an optimization, do this during path creation rather than here + if not _mkdir[path] then + local x = io_popen("mkdir \""..path.."\" 2>&1"):read("*a"); + _mkdir[path] = true; + end + return path; +end + +local data_path = "data"; + ------- API ------------- -local data_path = "data"; function set_data_path(path) log("info", "Setting data path to %s", path); data_path = path; end -function getpath(username, host, datastore, ext) +function getpath(username, host, datastore, ext, create) ext = ext or "dat"; + host = host and encode(host); + username = username and encode(username); if username then - return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext); + if create then mkdir(mkdir(mkdir(data_path).."/"..host).."/"..datastore); end + return format("%s/%s/%s/%s.%s", data_path, host, datastore, username, ext); elseif host then - return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext); + if create then mkdir(mkdir(data_path).."/"..host); end + return format("%s/%s/%s.%s", data_path, host, datastore, ext); else + if create then mkdir(data_path); end return format("%s/%s.%s", data_path, datastore, ext); end end @@ -87,7 +105,7 @@ data = {}; end -- save the datastore - local f, msg = io_open(getpath(username, host, datastore), "w+"); + local f, msg = io_open(getpath(username, host, datastore, nil, true), "w+"); if not f then log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil")); return; @@ -106,7 +124,7 @@ function list_append(username, host, datastore, data) if not data then return; end -- save the datastore - local f, msg = io_open(getpath(username, host, datastore, "list"), "a+"); + local f, msg = io_open(getpath(username, host, datastore, "list", true), "a+"); if not f then log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil")); return; @@ -123,7 +141,7 @@ data = {}; end -- save the datastore - local f, msg = io_open(getpath(username, host, datastore, "list"), "w+"); + local f, msg = io_open(getpath(username, host, datastore, "list", true), "w+"); if not f then log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil")); return;
