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:
Matthew Wild 2016-03-18 14:03:35 +00:00
commit c7e80a8b01
6 changed files with 98 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_component.lua
View file

@ -40,7 +40,7 @@ function module.add_host(module)
local send;
local function on_destroy(session, err)
local function on_destroy(session, err) --luacheck: ignore 212/err
env.connected = false;
env.session = false;
send = nil;
@ -149,7 +149,7 @@ local stream_callbacks = { default_ns = xmlns_component };
local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
function stream_callbacks.error(session, error, data, data2)
function stream_callbacks.error(session, error, data)
if session.destroyed then return; end
module:log("warn", "Error processing component stream: %s", tostring(error));
if error == "no-stream" then
@ -295,7 +295,7 @@ function listener.onconnect(conn)
session.stream:reset();
end
function session.data(conn, data)
function session.data(_, data)
local ok, err = stream:feed(data);
if ok then return; end
module:log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
@ -314,6 +314,7 @@ function listener.ondisconnect(conn, err)
local session = sessions[conn];
if session then
(session.log or log)("info", "component disconnected: %s (%s)", tostring(session.host), tostring(err));
module:fire_event("component-disconnected", { session = session, reason = err });
if session.on_destroy then session:on_destroy(err); end
sessions[conn] = nil;
for k in pairs(session) do
@ -322,7 +323,6 @@ function listener.ondisconnect(conn, err)
end
end
session.destroyed = true;
session = nil;
end
end

2
plugins/mod_saslauth.lua
View file

@ -19,7 +19,7 @@ local tostring = tostring;
local secure_auth_only = module:get_option_boolean("c2s_require_encryption", module:get_option_boolean("require_encryption", false));
local allow_unencrypted_plain_auth = module:get_option_boolean("allow_unencrypted_plain_auth", false)
local insecure_mechanisms = module:get_option_set("insecure_sasl_mechanisms", allow_unencrypted_plain_auth and {} or {"PLAIN", "LOGIN"});
local disabled_mechanisms = module:get_option_set("disable_sasl_mechanisms", {});
local disabled_mechanisms = module:get_option_set("disable_sasl_mechanisms", { "DIGEST-MD5" });
local log = module._log;

8
prosody
View file

@ -11,10 +11,10 @@
-- Will be modified by configure script if run --
CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
CFG_DATADIR=os.getenv("PROSODY_DATADIR");
CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --

8
prosodyctl
View file

@ -11,10 +11,10 @@
-- Will be modified by configure script if run --
CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
CFG_DATADIR=os.getenv("PROSODY_DATADIR");
CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --

70
tests/test_util_jid.lua
View file

@ -71,3 +71,73 @@ function compare(compare)
assert_equal(compare("user@other-host", "host"), false, "host should not match");
assert_equal(compare("user@other-host", "user@host"), false, "host should not match");
end
function node(node)
local function test(jid, expected_node)
assert_equal(node(jid), expected_node, "Unexpected node for "..tostring(jid));
end
test("example.com", nil);
test("foo.example.com", nil);
test("foo.example.com/resource", nil);
test("foo.example.com/some resource", nil);
test("foo.example.com/some@resource", nil);
test("foo@foo.example.com/some@resource", "foo");
test("foo@example/some@resource", "foo");
test("foo@example/@resource", "foo");
test("foo@example@resource", nil);
test("foo@example", "foo");
test("foo", nil);
test(nil, nil);
end
function host(host)
local function test(jid, expected_host)
assert_equal(host(jid), expected_host, "Unexpected host for "..tostring(jid));
end
test("example.com", "example.com");
test("foo.example.com", "foo.example.com");
test("foo.example.com/resource", "foo.example.com");
test("foo.example.com/some resource", "foo.example.com");
test("foo.example.com/some@resource", "foo.example.com");
test("foo@foo.example.com/some@resource", "foo.example.com");
test("foo@example/some@resource", "example");
test("foo@example/@resource", "example");
test("foo@example@resource", nil);
test("foo@example", "example");
test("foo", "foo");
test(nil, nil);
end
function resource(resource)
local function test(jid, expected_resource)
assert_equal(resource(jid), expected_resource, "Unexpected resource for "..tostring(jid));
end
test("example.com", nil);
test("foo.example.com", nil);
test("foo.example.com/resource", "resource");
test("foo.example.com/some resource", "some resource");
test("foo.example.com/some@resource", "some@resource");
test("foo@foo.example.com/some@resource", "some@resource");
test("foo@example/some@resource", "some@resource");
test("foo@example/@resource", "@resource");
test("foo@example@resource", nil);
test("foo@example", nil);
test("foo", nil);
test("/foo", nil);
test("@x/foo", nil);
test("@/foo", nil);
test(nil, nil);
end

15
util/jid.lua
View file

@ -93,6 +93,18 @@ local function compare(jid, acl)
return false
end
local function node(jid)
return (select(1, split(jid)));
end
local function host(jid)
return (select(2, split(jid)));
end
local function resource(jid)
return (select(3, split(jid)));
end
local function escape(s) return s and (s:gsub(".", escapes)); end
local function unescape(s) return s and (s:gsub("\\%x%x", unescapes)); end
@ -103,6 +115,9 @@ return {
join = join;
prep = prep;
compare = compare;
node = node;
host = host;
resource = resource;
escape = escape;
unescape = unescape;
};