projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
231f83e
)
mod_tls: Add <required/> to stream feature when TLS is required
author
Matthew Wild
<mwild1@gmail.com>
Fri, 29 May 2009 17:17:03 +0000
(18:17 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Fri, 29 May 2009 17:17:03 +0000
(18:17 +0100)
plugins/mod_tls.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_tls.lua
b/plugins/mod_tls.lua
index 85dc6bbabaec5028da04f58eee2d75d6d433e530..dc291278e7ca267e7f18d11ec8763bad4a8cb1da 100644
(file)
--- a/
plugins/mod_tls.lua
+++ b/
plugins/mod_tls.lua
@@
-12,6
+12,9
@@
local st = require "util.stanza";
local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
+local config = require "core.configmanager";
+local secure_auth_only = config.get("*", "core", "require_encryption");
+
module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
function (session, stanza)
if session.conn.starttls then
module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
function (session, stanza)
if session.conn.starttls then
@@
-30,6
+33,11
@@
local starttls_attr = { xmlns = xmlns_starttls };
module:add_event_hook("stream-features",
function (session, features)
if session.conn.starttls then
module:add_event_hook("stream-features",
function (session, features)
if session.conn.starttls then
- features:tag("starttls", starttls_attr):up();
+ features:tag("starttls", starttls_attr);
+ if secure_auth_only then
+ features:tag("required"):up():up();
+ else
+ features:up();
+ end
end
end);
end
end);