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

Merge 0.9->0.10

Browse source
This commit is contained in:
Matthew Wild 2014-01-12 06:19:37 -05:00
commit e60a10abca
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_s2s/mod_s2s.lua
View file

@ -366,7 +366,7 @@ function stream_callbacks.streamopened(session, attr)
if to then
hosts[to].events.fire_event("s2s-stream-features", { origin = session, features = features });
else
(session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or "unknown host");
(session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or session.ip or "unknown host");
end
log("debug", "Sending stream features: %s", tostring(features));
@ -467,7 +467,7 @@ local function session_close(session, reason, remote_reason)
end
if reason then -- nil == no err, initiated by us, false == initiated by remote
if type(reason) == "string" then -- assume stream error
log("debug", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, reason);
log("debug", "Disconnecting %s[%s], <stream:error> is: %s", session.host or session.ip or "(unknown host)", session.type, reason);
session.sends2s(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' }));
elseif type(reason) == "table" then
if reason.condition then
@ -478,7 +478,7 @@ local function session_close(session, reason, remote_reason)
if reason.extra then
stanza:add_child(reason.extra);
end
log("debug", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, tostring(stanza));
log("debug", "Disconnecting %s[%s], <stream:error> is: %s", session.host or session.ip or "(unknown host)", session.type, tostring(stanza));
session.sends2s(stanza);
elseif reason.name then -- a stanza
log("debug", "Disconnecting %s->%s[%s], <stream:error> is: %s", session.from_host or "(unknown host)", session.to_host or "(unknown host)", session.type, tostring(reason));
@ -660,7 +660,7 @@ function check_auth_policy(event)
end
if must_secure and (session.cert_chain_status ~= "valid" or session.cert_identity_status ~= "valid") then
module:log("warn", "Forbidding insecure connection to/from %s", host);
module:log("warn", "Forbidding insecure connection to/from %s", host or session.ip or "(unknown host)");
if session.direction == "incoming" then
session:close({ condition = "not-authorized", text = "Your server's certificate is invalid, expired, or not trusted by "..session.to_host });
else -- Close outgoing connections without warning

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

@ -13,6 +13,7 @@ local next = next;
local pairs = pairs;
local json = require "util.json";
local os_getenv = os.getenv;
local error = error;
prosody = {};
local dm = require "util.datamanager"
@ -95,15 +96,18 @@ function reader(input)
local iter = mtools.sorted {
reader = function()
local x = iter();
if x then
while x do
dm.set_data_path(path);
local err;
x.data, err = dm.load(x.user, x.host, x.store);
if x.data == nil and err then
error(("Error loading data at path %s for %s@%s (%s store)")
:format(path, x.user or "<nil>", x.host or "<nil>", x.store or "<nil>"), 0);
local p = dm.getpath(x.user, x.host, x.store);
print(("Error loading data at path %s for %s@%s (%s store): %s")
:format(p, x.user or "<nil>", x.host or "<nil>", x.store or "<nil>", err or "<nil>"));
else
return x;
end
return x;
x = iter();
end
end;
sorter = function(a, b)