Software / code / prosody
Changeset
8847:74526c425dec
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 30 May 2018 22:43:45 +0100 |
| parents | 8843:041ddc670934 (current diff) 8846:7ec098b68042 (diff) |
| children | 8848:402d8febfa43 |
| files | plugins/mod_c2s.lua |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed May 30 21:40:00 2018 +0100 +++ b/.hgtags Wed May 30 22:43:45 2018 +0100 @@ -63,3 +63,4 @@ 39966cbc29f46d7ae9660edca8683d5121c82edf 0.10.0 082d127286451eb55420c36424dd321e8d9bceee 0.9.13 4ae8dd415e9431924ad4aa0b57bcee8a4a9272f8 0.10.1 +29c6d2681bad9f67d8bd548bb3a7973473bae91e 0.9.14
--- a/plugins/mod_c2s.lua Wed May 30 21:40:00 2018 +0100 +++ b/plugins/mod_c2s.lua Wed May 30 22:43:45 2018 +0100 @@ -56,12 +56,19 @@ function stream_callbacks.streamopened(session, attr) local send = session.send; - session.host = nameprep(attr.to); - if not session.host then + local host = nameprep(attr.to); + if not host then session:close{ condition = "improper-addressing", text = "A valid 'to' attribute is required on stream headers" }; return; end + if not session.host then + session.host = host; + elseif session.host ~= host then + session:close{ condition = "not-authorized", + text = "The 'to' attribute must remain the same across stream restarts" }; + return; + end session.version = tonumber(attr.version) or 0; session.streamid = uuid_generate(); (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host);
