diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-03-18 14:03:35 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-03-18 14:03:35 +0000 |
| commit | 8c0392226672520d8a4a59e7f2544a2d4297d739 (patch) | |
| tree | cc8a353f9fd1d39993e99256dd784e813d0e4153 /plugins | |
| parent | 401fde4ef607e993432c50ee2b23e6b34a5746ea (diff) | |
| parent | 3b6bbde55c734ea709db7dbb3d7e293fa6440220 (diff) | |
| download | prosody-8c0392226672520d8a4a59e7f2544a2d4297d739.tar.gz prosody-8c0392226672520d8a4a59e7f2544a2d4297d739.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_component.lua | 8 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua index a5136f6c..eebaaf3e 100644 --- a/plugins/mod_component.lua +++ b/plugins/mod_component.lua @@ -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 diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 7e9b0720..bb36600b 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -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; |