diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-22 15:16:43 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-22 15:16:43 +0000 |
| commit | bcd8f33f5be7555e0c7863b76e950bd9d156afe0 (patch) | |
| tree | 405a0afb10ef1d47dfd38bb35f78b22d3f98864b | |
| parent | a2dec278161293bdb918050f2ef7c4f67ecec5b2 (diff) | |
| parent | b1ce27375d21ac9d8fd923b9766b19cc938165d6 (diff) | |
| download | prosody-bcd8f33f5be7555e0c7863b76e950bd9d156afe0.tar.gz prosody-bcd8f33f5be7555e0c7863b76e950bd9d156afe0.zip | |
Merge 0.9->trunk
| -rw-r--r-- | core/s2smanager.lua | 4 | ||||
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index b034fcae..5777cb8e 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -8,7 +8,7 @@ -local hosts = hosts; +local hosts = prosody.hosts; local tostring, pairs, getmetatable, newproxy, setmetatable = tostring, pairs, getmetatable, newproxy, setmetatable; @@ -38,7 +38,7 @@ function new_incoming(conn) return session; end -function new_outgoing(from_host, to_host, connect) +function new_outgoing(from_host, to_host) local host_session = { to_host = to_host, from_host = from_host, host = from_host, notopen = true, type = "s2sout_unauthed", direction = "outgoing" }; hosts[from_host].s2sout[to_host] = host_session; diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 512c9037..ec969cc3 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -423,7 +423,6 @@ local listener = {}; --- Session methods local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; -local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" }; local function session_close(session, reason, remote_reason) local log = session.log or log; if session.conn then @@ -611,14 +610,15 @@ end function check_auth_policy(event) local host, session = event.host, event.session; - - if not secure_auth and secure_domains[host] then - secure_auth = true; - elseif secure_auth and insecure_domains[host] then - secure_auth = false; + local must_secure = secure_auth; + + if not must_secure and secure_domains[host] then + must_secure = true; + elseif must_secure and insecure_domains[host] then + must_secure = false; end - if secure_auth and not session.cert_identity_status then + if must_secure and not session.cert_identity_status then module:log("warn", "Forbidding insecure connection to/from %s", host); session:close(false); return false; |