Software / code / prosody
Annotate
plugins/mod_saslauth.lua @ 4754:449a78f91f0e
mod_saslauth: Remove unused declaration of xmlns_stanzas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 28 Apr 2012 03:05:35 +0100 |
| parent | 4506:6643c9753453 |
| child | 4939:0545a574667b |
| rev | line source |
|---|---|
|
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1486
diff
changeset
|
1 -- Prosody IM |
|
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2877
diff
changeset
|
2 -- Copyright (C) 2008-2010 Matthew Wild |
|
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2877
diff
changeset
|
3 -- Copyright (C) 2008-2010 Waqas Hussain |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
449
diff
changeset
|
4 -- |
| 758 | 5 -- This project is MIT/X11 licensed. Please see the |
| 6 -- COPYING file in the source package for more information. | |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
449
diff
changeset
|
7 -- |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
449
diff
changeset
|
8 |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
449
diff
changeset
|
9 |
| 38 | 10 |
| 11 local st = require "util.stanza"; | |
|
46
d6b3f9dbb624
Resource binding, XMPP sessions (whatever they're for...)
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
12 local sm_bind_resource = require "core.sessionmanager".bind_resource; |
|
1042
a3d77353c18a
mod_*: Fix a load of global accesses
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
13 local sm_make_authenticated = require "core.sessionmanager".make_authenticated; |
| 3651 | 14 local s2s_make_authenticated = require "core.s2smanager".make_authenticated; |
|
447
c0dae734d3bf
Stopped using the lbase64 library
Waqas Hussain <waqas20@gmail.com>
parents:
438
diff
changeset
|
15 local base64 = require "util.encodings".base64; |
| 38 | 16 |
|
3733
26571a99f6e6
core.s2smanager, mod_console, mod_saslauth, util.certverification: rename util.certverification to util.x509
Kim Alvefur <zash@zash.se>
parents:
3651
diff
changeset
|
17 local cert_verify_identity = require "util.x509".verify_identity; |
| 3651 | 18 |
|
3188
c690e3c5105c
mod_saslauth: Updated to use usermanager.get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents:
3178
diff
changeset
|
19 local usermanager_get_sasl_handler = require "core.usermanager".get_sasl_handler; |
| 38 | 20 local tostring = tostring; |
| 21 | |
|
2415
eb383f58624b
mod_saslauth: Use module:get_option()
Paul Aurich <paul@darkrain42.org>
parents:
2414
diff
changeset
|
22 local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption"); |
|
3417
53e854b52110
mod_saslauth: Check for unencrypted PLAIN auth in mod_saslauth instead of the SASL handler (makes it work for Cyrus SASL).
Waqas Hussain <waqas20@gmail.com>
parents:
3416
diff
changeset
|
23 local allow_unencrypted_plain_auth = module:get_option("allow_unencrypted_plain_auth") |
|
3066
5e5137057b5f
mod_saslauth: Split out cyrus SASL config options into locals, and add support for cyrus_application_name (default: 'prosody')
Matthew Wild <mwild1@gmail.com>
parents:
3064
diff
changeset
|
24 |
|
1071
216f9a9001f1
mod_saslauth: Use module logger instead of creating a new one
Matthew Wild <mwild1@gmail.com>
parents:
1042
diff
changeset
|
25 local log = module._log; |
| 38 | 26 |
| 27 local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl'; | |
|
46
d6b3f9dbb624
Resource binding, XMPP sessions (whatever they're for...)
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
28 local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind'; |
| 38 | 29 |
|
292
33175ad2f682
Started using realm in password hashing, and added support for error message replies from sasl
Waqas Hussain <waqas20@gmail.com>
parents:
291
diff
changeset
|
30 local function build_reply(status, ret, err_msg) |
|
281
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
31 local reply = st.stanza(status, {xmlns = xmlns_sasl}); |
|
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
32 if status == "challenge" then |
|
2860
ad534f89c758
mod_saslauth: Don't print raw SASL data to avoid logging passwords unnecessarily
Matthew Wild <mwild1@gmail.com>
parents:
2014
diff
changeset
|
33 --log("debug", "CHALLENGE: %s", ret or ""); |
|
293
b446de4e258e
base64 encode the sasl responses
Waqas Hussain <waqas20@gmail.com>
parents:
292
diff
changeset
|
34 reply:text(base64.encode(ret or "")); |
|
281
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
35 elseif status == "failure" then |
|
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
36 reply:tag(ret):up(); |
|
293
b446de4e258e
base64 encode the sasl responses
Waqas Hussain <waqas20@gmail.com>
parents:
292
diff
changeset
|
37 if err_msg then reply:tag("text"):text(err_msg); end |
|
281
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
38 elseif status == "success" then |
|
2860
ad534f89c758
mod_saslauth: Don't print raw SASL data to avoid logging passwords unnecessarily
Matthew Wild <mwild1@gmail.com>
parents:
2014
diff
changeset
|
39 --log("debug", "SUCCESS: %s", ret or ""); |
|
293
b446de4e258e
base64 encode the sasl responses
Waqas Hussain <waqas20@gmail.com>
parents:
292
diff
changeset
|
40 reply:text(base64.encode(ret or "")); |
|
281
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
41 else |
|
1073
7c20373d4451
mod_saslauth: Remove 2 instances of raising errors and replacing with more graceful handling
Matthew Wild <mwild1@gmail.com>
parents:
1072
diff
changeset
|
42 module:log("error", "Unknown sasl status: %s", status); |
|
281
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
43 end |
|
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
44 return reply; |
|
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
45 end |
|
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
46 |
|
3062
892c49869293
mod_saslauth: Add return value and error message to the Cyrus SASL handle_status callback
Matthew Wild <mwild1@gmail.com>
parents:
3061
diff
changeset
|
47 local function handle_status(session, status, ret, err_msg) |
|
281
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
48 if status == "failure" then |
|
4361
605045b77bc6
mod_saslauth: Fire authentication-success and authentication-failure events (thanks scitor)
Matthew Wild <mwild1@gmail.com>
parents:
4078
diff
changeset
|
49 module:fire_event("authentication-failure", { session = session, condition = ret, text = err_msg }); |
|
2251
18079ede5b62
mod_saslauth: Fix typo in variable name
Matthew Wild <mwild1@gmail.com>
parents:
2242
diff
changeset
|
50 session.sasl_handler = session.sasl_handler:clean_clone(); |
|
281
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
51 elseif status == "success" then |
|
3468
d50e2c937717
mod_saslauth, mod_auth_cyrus, util.sasl_cyrus: Moved cyrus account provisioning check out of mod_saslauth.
Waqas Hussain <waqas20@gmail.com>
parents:
3464
diff
changeset
|
52 local ok, err = sm_make_authenticated(session, session.sasl_handler.username); |
|
d50e2c937717
mod_saslauth, mod_auth_cyrus, util.sasl_cyrus: Moved cyrus account provisioning check out of mod_saslauth.
Waqas Hussain <waqas20@gmail.com>
parents:
3464
diff
changeset
|
53 if ok then |
|
4504
55b61221ecb8
mod_saslauth: Move authentication-success event to after session has been made authenticated.
Kim Alvefur <zash@zash.se>
parents:
4492
diff
changeset
|
54 module:fire_event("authentication-success", { session = session }); |
|
3468
d50e2c937717
mod_saslauth, mod_auth_cyrus, util.sasl_cyrus: Moved cyrus account provisioning check out of mod_saslauth.
Waqas Hussain <waqas20@gmail.com>
parents:
3464
diff
changeset
|
55 session.sasl_handler = nil; |
|
d50e2c937717
mod_saslauth, mod_auth_cyrus, util.sasl_cyrus: Moved cyrus account provisioning check out of mod_saslauth.
Waqas Hussain <waqas20@gmail.com>
parents:
3464
diff
changeset
|
56 session:reset_stream(); |
|
3064
596303990c7c
usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required)
Matthew Wild <mwild1@gmail.com>
parents:
3062
diff
changeset
|
57 else |
|
3468
d50e2c937717
mod_saslauth, mod_auth_cyrus, util.sasl_cyrus: Moved cyrus account provisioning check out of mod_saslauth.
Waqas Hussain <waqas20@gmail.com>
parents:
3464
diff
changeset
|
58 module:log("warn", "SASL succeeded but username was invalid"); |
|
4505
b1e10c327d66
mod_saslauth: Fire authentication-failure if make_authenticated() failed.
Kim Alvefur <zash@zash.se>
parents:
4504
diff
changeset
|
59 module:fire_event("authentication-failure", { session = session, condition = "not-authorized", text = err }); |
|
3064
596303990c7c
usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required)
Matthew Wild <mwild1@gmail.com>
parents:
3062
diff
changeset
|
60 session.sasl_handler = session.sasl_handler:clean_clone(); |
|
3468
d50e2c937717
mod_saslauth, mod_auth_cyrus, util.sasl_cyrus: Moved cyrus account provisioning check out of mod_saslauth.
Waqas Hussain <waqas20@gmail.com>
parents:
3464
diff
changeset
|
61 return "failure", "not-authorized", "User authenticated successfully, but username was invalid"; |
|
3064
596303990c7c
usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required)
Matthew Wild <mwild1@gmail.com>
parents:
3062
diff
changeset
|
62 end |
|
281
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
63 end |
|
3062
892c49869293
mod_saslauth: Add return value and error message to the Cyrus SASL handle_status callback
Matthew Wild <mwild1@gmail.com>
parents:
3061
diff
changeset
|
64 return status, ret, err_msg; |
|
281
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
65 end |
|
826308c07627
mod_saslauth updated for digest-md5
Waqas Hussain <waqas20@gmail.com>
parents:
120
diff
changeset
|
66 |
|
3551
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
67 local function sasl_process_cdata(session, stanza) |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
68 local text = stanza[1]; |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
69 if text then |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
70 text = base64.decode(text); |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
71 --log("debug", "AUTH: %s", text:gsub("[%z\001-\008\011\012\014-\031]", " ")); |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
72 if not text then |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
73 session.sasl_handler = nil; |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
74 session.send(build_reply("failure", "incorrect-encoding")); |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
75 return true; |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
76 end |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
77 end |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
78 local status, ret, err_msg = session.sasl_handler:process(text); |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
79 status, ret, err_msg = handle_status(session, status, ret, err_msg); |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
80 local s = build_reply(status, ret, err_msg); |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
81 log("debug", "sasl reply: %s", tostring(s)); |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
82 session.send(s); |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
83 return true; |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
84 end |
|
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
85 |
| 3651 | 86 module:hook_stanza(xmlns_sasl, "success", function (session, stanza) |
| 87 if session.type ~= "s2sout_unauthed" or session.external_auth ~= "attempting" then return; end | |
| 88 module:log("debug", "SASL EXTERNAL with %s succeeded", session.to_host); | |
| 89 session.external_auth = "succeeded" | |
| 90 session:reset_stream(); | |
| 91 | |
| 92 local default_stream_attr = {xmlns = "jabber:server", ["xmlns:stream"] = "http://etherx.jabber.org/streams", | |
| 93 ["xmlns:db"] = 'jabber:server:dialback', version = "1.0", to = session.to_host, from = session.from_host}; | |
| 94 session.sends2s("<?xml version='1.0'?>"); | |
| 95 session.sends2s(st.stanza("stream:stream", default_stream_attr):top_tag()); | |
| 96 | |
| 97 s2s_make_authenticated(session, session.to_host); | |
| 98 return true; | |
| 99 end) | |
| 100 | |
| 101 module:hook_stanza(xmlns_sasl, "failure", function (session, stanza) | |
| 102 if session.type ~= "s2sout_unauthed" or session.external_auth ~= "attempting" then return; end | |
| 103 | |
| 104 module:log("info", "SASL EXTERNAL with %s failed", session.to_host) | |
| 105 -- TODO: Log the failure reason | |
| 106 session.external_auth = "failed" | |
| 107 end, 500) | |
| 108 | |
| 109 module:hook_stanza(xmlns_sasl, "failure", function (session, stanza) | |
| 110 -- TODO: Dialback wasn't loaded. Do something useful. | |
| 111 end, 90) | |
| 112 | |
| 113 module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza) | |
| 114 if session.type ~= "s2sout_unauthed" or not session.secure then return; end | |
| 115 | |
| 116 local mechanisms = stanza:get_child("mechanisms", xmlns_sasl) | |
| 117 if mechanisms then | |
| 118 for mech in mechanisms:childtags() do | |
| 119 if mech[1] == "EXTERNAL" then | |
| 120 module:log("debug", "Initiating SASL EXTERNAL with %s", session.to_host); | |
| 121 local reply = st.stanza("auth", {xmlns = xmlns_sasl, mechanism = "EXTERNAL"}); | |
| 122 reply:text(base64.encode(session.from_host)) | |
| 123 session.sends2s(reply) | |
| 124 session.external_auth = "attempting" | |
| 125 return true | |
| 126 end | |
| 127 end | |
| 128 end | |
| 129 end, 150); | |
| 130 | |
| 131 local function s2s_external_auth(session, stanza) | |
| 132 local mechanism = stanza.attr.mechanism; | |
| 133 | |
| 134 if not session.secure then | |
| 135 if mechanism == "EXTERNAL" then | |
| 136 session.sends2s(build_reply("failure", "encryption-required")) | |
| 137 else | |
| 138 session.sends2s(build_reply("failure", "invalid-mechanism")) | |
| 139 end | |
| 140 return true; | |
| 141 end | |
| 142 | |
| 143 if mechanism ~= "EXTERNAL" or session.cert_chain_status ~= "valid" then | |
| 144 session.sends2s(build_reply("failure", "invalid-mechanism")) | |
| 145 return true; | |
| 146 end | |
| 147 | |
| 148 local text = stanza[1] | |
| 149 if not text then | |
| 150 session.sends2s(build_reply("failure", "malformed-request")) | |
| 151 return true | |
| 152 end | |
| 153 | |
| 154 -- Either the value is "=" and we've already verified the external | |
| 155 -- cert identity, or the value is a string and either matches the | |
| 156 -- from_host ( | |
| 157 | |
| 158 text = base64.decode(text) | |
| 159 if not text then | |
| 160 session.sends2s(build_reply("failure", "incorrect-encoding")) | |
| 161 return true; | |
| 162 end | |
| 163 | |
| 164 if session.cert_identity_status == "valid" then | |
| 165 if text ~= "" and text ~= session.from_host then | |
| 166 session.sends2s(build_reply("failure", "invalid-authzid")) | |
| 167 return true | |
| 168 end | |
| 169 else | |
| 170 if text == "" then | |
| 171 session.sends2s(build_reply("failure", "invalid-authzid")) | |
| 172 return true | |
| 173 end | |
| 174 | |
| 175 local cert = session.conn:socket():getpeercertificate() | |
| 176 if (cert_verify_identity(text, "xmpp-server", cert)) then | |
| 177 session.cert_identity_status = "valid" | |
| 178 else | |
| 179 session.cert_identity_status = "invalid" | |
| 180 session.sends2s(build_reply("failure", "invalid-authzid")) | |
| 181 return true | |
| 182 end | |
| 183 end | |
| 184 | |
| 185 session.external_auth = "succeeded" | |
| 186 | |
| 187 if not session.from_host then | |
| 188 session.from_host = text; | |
| 189 end | |
| 190 session.sends2s(build_reply("success")) | |
|
4492
0a4781f165e3
mod_saslauth: "" ~= nil (thanks, Zash!)
Paul Aurich <paul@darkrain42.org>
parents:
4395
diff
changeset
|
191 |
|
0a4781f165e3
mod_saslauth: "" ~= nil (thanks, Zash!)
Paul Aurich <paul@darkrain42.org>
parents:
4395
diff
changeset
|
192 local domain = text ~= "" and text or session.from_host; |
|
0a4781f165e3
mod_saslauth: "" ~= nil (thanks, Zash!)
Paul Aurich <paul@darkrain42.org>
parents:
4395
diff
changeset
|
193 module:log("info", "Accepting SASL EXTERNAL identity from %s", domain); |
|
0a4781f165e3
mod_saslauth: "" ~= nil (thanks, Zash!)
Paul Aurich <paul@darkrain42.org>
parents:
4395
diff
changeset
|
194 s2s_make_authenticated(session, domain); |
| 3651 | 195 session:reset_stream(); |
| 196 return true | |
| 197 end | |
| 198 | |
|
3552
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
199 module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:auth", function(event) |
|
3535
b953b0c0f203
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3524
diff
changeset
|
200 local session, stanza = event.origin, event.stanza; |
| 3651 | 201 if session.type == "s2sin_unauthed" then |
| 202 return s2s_external_auth(session, stanza) | |
| 203 end | |
| 204 | |
|
3535
b953b0c0f203
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3524
diff
changeset
|
205 if session.type ~= "c2s_unauthed" then return; end |
|
b953b0c0f203
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3524
diff
changeset
|
206 |
|
3553
1f0af8572f15
mod_saslauth: Allow restarting SASL negotiation from scratch.
Waqas Hussain <waqas20@gmail.com>
parents:
3552
diff
changeset
|
207 if session.sasl_handler and session.sasl_handler.selected then |
|
1f0af8572f15
mod_saslauth: Allow restarting SASL negotiation from scratch.
Waqas Hussain <waqas20@gmail.com>
parents:
3552
diff
changeset
|
208 session.sasl_handler = nil; -- allow starting a new SASL negotiation before completing an old one |
|
1f0af8572f15
mod_saslauth: Allow restarting SASL negotiation from scratch.
Waqas Hussain <waqas20@gmail.com>
parents:
3552
diff
changeset
|
209 end |
|
1f0af8572f15
mod_saslauth: Allow restarting SASL negotiation from scratch.
Waqas Hussain <waqas20@gmail.com>
parents:
3552
diff
changeset
|
210 if not session.sasl_handler then |
|
4051
d343a76431cf
mod_saslauth: Remove special handling for SASL ANONYMOUS, and let mod_auth_anonymous handle it.
Waqas Hussain <waqas20@gmail.com>
parents:
4049
diff
changeset
|
211 session.sasl_handler = usermanager_get_sasl_handler(module.host); |
|
3553
1f0af8572f15
mod_saslauth: Allow restarting SASL negotiation from scratch.
Waqas Hussain <waqas20@gmail.com>
parents:
3552
diff
changeset
|
212 end |
|
3552
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
213 local mechanism = stanza.attr.mechanism; |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
214 if not session.secure and (secure_auth_only or (mechanism == "PLAIN" and not allow_unencrypted_plain_auth)) then |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
215 session.send(build_reply("failure", "encryption-required")); |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
216 return true; |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
217 end |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
218 local valid_mechanism = session.sasl_handler:select(mechanism); |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
219 if not valid_mechanism then |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
220 session.send(build_reply("failure", "invalid-mechanism")); |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
221 return true; |
|
295
bb078eb1f1de
mod_saslauth: Code cleanup
Waqas Hussain <waqas20@gmail.com>
parents:
293
diff
changeset
|
222 end |
|
3551
4fba723ab235
mod_saslauth: Moved SASL mechanism selection and CDATA handling into separate functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3548
diff
changeset
|
223 return sasl_process_cdata(session, stanza); |
|
3552
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
224 end); |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
225 module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:response", function(event) |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
226 local session = event.origin; |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
227 if not(session.sasl_handler and session.sasl_handler.selected) then |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
228 session.send(build_reply("failure", "not-authorized", "Out of order SASL element")); |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
229 return true; |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
230 end |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
231 return sasl_process_cdata(session, event.stanza); |
|
8ad09efc19cc
mod_saslauth: Separated processing of <auth/> and <response/> elements, and return proper error on out-of-order <response/> elements.
Waqas Hussain <waqas20@gmail.com>
parents:
3551
diff
changeset
|
232 end); |
|
3548
cd8d1cacc65b
mod_saslauth: Handle SASL <abort/> properly.
Waqas Hussain <waqas20@gmail.com>
parents:
3535
diff
changeset
|
233 module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:abort", function(event) |
|
cd8d1cacc65b
mod_saslauth: Handle SASL <abort/> properly.
Waqas Hussain <waqas20@gmail.com>
parents:
3535
diff
changeset
|
234 local session = event.origin; |
|
cd8d1cacc65b
mod_saslauth: Handle SASL <abort/> properly.
Waqas Hussain <waqas20@gmail.com>
parents:
3535
diff
changeset
|
235 session.sasl_handler = nil; |
|
cd8d1cacc65b
mod_saslauth: Handle SASL <abort/> properly.
Waqas Hussain <waqas20@gmail.com>
parents:
3535
diff
changeset
|
236 session.send(build_reply("failure", "aborted")); |
|
cd8d1cacc65b
mod_saslauth: Handle SASL <abort/> properly.
Waqas Hussain <waqas20@gmail.com>
parents:
3535
diff
changeset
|
237 return true; |
|
cd8d1cacc65b
mod_saslauth: Handle SASL <abort/> properly.
Waqas Hussain <waqas20@gmail.com>
parents:
3535
diff
changeset
|
238 end); |
|
284
4f540755260c
mod_saslauth: Added base64 decoding, encoding check, and cleaned the code up.
Waqas Hussain <waqas20@gmail.com>
parents:
281
diff
changeset
|
239 |
|
357
17bcecb06420
Use a stanza for c2s stream features instead of an array of strings. Removes a FIXME.
Matthew Wild <mwild1@gmail.com>
parents:
313
diff
changeset
|
240 local mechanisms_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-sasl' }; |
|
17bcecb06420
Use a stanza for c2s stream features instead of an array of strings. Removes a FIXME.
Matthew Wild <mwild1@gmail.com>
parents:
313
diff
changeset
|
241 local bind_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-bind' }; |
|
17bcecb06420
Use a stanza for c2s stream features instead of an array of strings. Removes a FIXME.
Matthew Wild <mwild1@gmail.com>
parents:
313
diff
changeset
|
242 local xmpp_session_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-session' }; |
|
2612
475552b04151
mod_saslauth: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2451
diff
changeset
|
243 module:hook("stream-features", function(event) |
|
475552b04151
mod_saslauth: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2451
diff
changeset
|
244 local origin, features = event.origin, event.features; |
|
475552b04151
mod_saslauth: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2451
diff
changeset
|
245 if not origin.username then |
|
475552b04151
mod_saslauth: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2451
diff
changeset
|
246 if secure_auth_only and not origin.secure then |
|
2451
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
247 return; |
|
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
248 end |
|
4051
d343a76431cf
mod_saslauth: Remove special handling for SASL ANONYMOUS, and let mod_auth_anonymous handle it.
Waqas Hussain <waqas20@gmail.com>
parents:
4049
diff
changeset
|
249 origin.sasl_handler = usermanager_get_sasl_handler(module.host); |
|
4395
d322c4553f97
mod_saslauth: Never send empty <mechanisms/>, for real this time.
Waqas Hussain <waqas20@gmail.com>
parents:
4392
diff
changeset
|
250 local mechanisms = st.stanza("mechanisms", mechanisms_attr); |
|
d322c4553f97
mod_saslauth: Never send empty <mechanisms/>, for real this time.
Waqas Hussain <waqas20@gmail.com>
parents:
4392
diff
changeset
|
251 for mechanism in pairs(origin.sasl_handler:mechanisms()) do |
|
3417
53e854b52110
mod_saslauth: Check for unencrypted PLAIN auth in mod_saslauth instead of the SASL handler (makes it work for Cyrus SASL).
Waqas Hussain <waqas20@gmail.com>
parents:
3416
diff
changeset
|
252 if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then |
|
4395
d322c4553f97
mod_saslauth: Never send empty <mechanisms/>, for real this time.
Waqas Hussain <waqas20@gmail.com>
parents:
4392
diff
changeset
|
253 mechanisms:tag("mechanism"):text(mechanism):up(); |
|
3417
53e854b52110
mod_saslauth: Check for unencrypted PLAIN auth in mod_saslauth instead of the SASL handler (makes it work for Cyrus SASL).
Waqas Hussain <waqas20@gmail.com>
parents:
3416
diff
changeset
|
254 end |
|
2451
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
255 end |
|
4395
d322c4553f97
mod_saslauth: Never send empty <mechanisms/>, for real this time.
Waqas Hussain <waqas20@gmail.com>
parents:
4392
diff
changeset
|
256 if mechanisms[1] then features:add_child(mechanisms); end |
|
2451
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
257 else |
|
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
258 features:tag("bind", bind_attr):tag("required"):up():up(); |
|
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
259 features:tag("session", xmpp_session_attr):tag("optional"):up():up(); |
|
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
260 end |
|
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
261 end); |
|
1584
ffe8a9296e04
mod_saslauth, usermanager: Fetch list of mechanisms from usermanager
Nick Thomas
parents:
1523
diff
changeset
|
262 |
| 3651 | 263 module:hook("s2s-stream-features", function(event) |
| 264 local origin, features = event.origin, event.features; | |
| 265 if origin.secure and origin.type == "s2sin_unauthed" then | |
| 266 -- Offer EXTERNAL if chain is valid and either we didn't validate | |
| 267 -- the identity or it passed. | |
| 268 if origin.cert_chain_status == "valid" and origin.cert_identity_status ~= "invalid" then --TODO: Configurable | |
| 269 module:log("debug", "Offering SASL EXTERNAL") | |
| 270 features:tag("mechanisms", { xmlns = xmlns_sasl }) | |
| 271 :tag("mechanism"):text("EXTERNAL") | |
| 272 :up():up(); | |
| 273 end | |
| 274 end | |
| 275 end); | |
| 276 | |
|
3523
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
277 module:hook("iq/self/urn:ietf:params:xml:ns:xmpp-bind:bind", function(event) |
|
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
278 local origin, stanza = event.origin, event.stanza; |
|
2451
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
279 local resource; |
|
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
280 if stanza.attr.type == "set" then |
|
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
281 local bind = stanza.tags[1]; |
|
3523
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
282 resource = bind:child_with_name("resource"); |
|
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
283 resource = resource and #resource.tags == 0 and resource[1] or nil; |
|
2451
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
284 end |
|
3523
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
285 local success, err_type, err, err_msg = sm_bind_resource(origin, resource); |
|
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
286 if success then |
|
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
287 origin.send(st.reply(stanza) |
|
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
288 :tag("bind", { xmlns = xmlns_bind }) |
|
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
289 :tag("jid"):text(origin.full_jid)); |
|
3524
d206b4e0a9f3
mod_saslauth: Improved logging a bit.
Waqas Hussain <waqas20@gmail.com>
parents:
3523
diff
changeset
|
290 origin.log("debug", "Resource bound: %s", origin.full_jid); |
|
2451
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
291 else |
|
3523
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
292 origin.send(st.error_reply(stanza, err_type, err, err_msg)); |
|
3524
d206b4e0a9f3
mod_saslauth: Improved logging a bit.
Waqas Hussain <waqas20@gmail.com>
parents:
3523
diff
changeset
|
293 origin.log("debug", "Resource bind failed: %s", err_msg or err); |
|
2451
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
294 end |
|
3523
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
295 return true; |
|
2451
d2f747920eaf
mod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain <waqas20@gmail.com>
parents:
2450
diff
changeset
|
296 end); |
|
1584
ffe8a9296e04
mod_saslauth, usermanager: Fetch list of mechanisms from usermanager
Nick Thomas
parents:
1523
diff
changeset
|
297 |
|
4029
fb027b2811c2
mod_saslauth: Handle session bind requests to the host, fixes OneTeam login
Matthew Wild <mwild1@gmail.com>
parents:
3553
diff
changeset
|
298 local function handle_legacy_session(event) |
|
3523
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
299 event.origin.send(st.reply(event.stanza)); |
|
32a0c3816d73
mod_saslauth: Updated to use the new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
3468
diff
changeset
|
300 return true; |
|
4029
fb027b2811c2
mod_saslauth: Handle session bind requests to the host, fixes OneTeam login
Matthew Wild <mwild1@gmail.com>
parents:
3553
diff
changeset
|
301 end |
|
fb027b2811c2
mod_saslauth: Handle session bind requests to the host, fixes OneTeam login
Matthew Wild <mwild1@gmail.com>
parents:
3553
diff
changeset
|
302 |
|
fb027b2811c2
mod_saslauth: Handle session bind requests to the host, fixes OneTeam login
Matthew Wild <mwild1@gmail.com>
parents:
3553
diff
changeset
|
303 module:hook("iq/self/urn:ietf:params:xml:ns:xmpp-session:session", handle_legacy_session); |
|
fb027b2811c2
mod_saslauth: Handle session bind requests to the host, fixes OneTeam login
Matthew Wild <mwild1@gmail.com>
parents:
3553
diff
changeset
|
304 module:hook("iq/host/urn:ietf:params:xml:ns:xmpp-session:session", handle_legacy_session); |
