projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ff6d5e8
)
mod_tls: Don't offer TLS on hosts that don't have any certs
author
Matthew Wild
<mwild1@gmail.com>
Fri, 12 Feb 2010 21:33:22 +0000
(21:33 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Fri, 12 Feb 2010 21:33:22 +0000
(21:33 +0000)
plugins/mod_tls.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_tls.lua
b/plugins/mod_tls.lua
index 47b92d7377dab4a54e21a65d011402115c55465e..3e3bd5545cf8a3a4727e4d934c82c90a10912d94 100644
(file)
--- a/
plugins/mod_tls.lua
+++ b/
plugins/mod_tls.lua
@@
-22,6
+22,8
@@
if secure_s2s_only then s2s_feature:tag("required"):up(); end
local global_ssl_ctx = prosody.global_ssl_ctx;
local global_ssl_ctx = prosody.global_ssl_ctx;
+local host = hosts[module.host];
+
-- Hook <starttls/>
module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
local origin = event.origin;
-- Hook <starttls/>
module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
local origin = event.origin;
@@
-44,13
+46,13
@@
end);
-- Advertize stream feature
module:hook("stream-features", function(event)
local origin, features = event.origin, event.features;
-- Advertize stream feature
module:hook("stream-features", function(event)
local origin, features = event.origin, event.features;
- if not origin.username and origin.conn.starttls then
+ if not origin.username and origin.conn.starttls
and host.ssl_ctx_in
then
features:add_child(c2s_feature);
end
end);
module:hook("s2s-stream-features", function(event)
local origin, features = event.origin, event.features;
features:add_child(c2s_feature);
end
end);
module:hook("s2s-stream-features", function(event)
local origin, features = event.origin, event.features;
- if origin.to_host and origin.type ~= "s2sin" and origin.conn.starttls then
+ if origin.to_host and origin.type ~= "s2sin" and origin.conn.starttls
and host.ssl_ctx_in
then
features:add_child(s2s_feature);
end
end);
features:add_child(s2s_feature);
end
end);