Software / code / prosody
Changeset
1144:fbd65e966316
Merge with 0.4
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 13 May 2009 16:55:20 +0100 |
| parents | 1142:0e02b3301e80 (current diff) 1143:5bab3eb566ad (diff) |
| children | 1145:06051191913d |
| files | core/stanza_router.lua |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/stanza_router.lua Sat May 09 19:43:11 2009 +0100 +++ b/core/stanza_router.lua Wed May 13 16:55:20 2009 +0100 @@ -80,16 +80,21 @@ if to then node, host, resource = jid_prepped_split(to); if not host then - error("Invalid to JID"); + log("warn", "Received stanza with invalid destination JID: %s", to); + origin.send(st.error_reply(stanza, "modify", "jid-malformed", "The destination address is invalid: "..to)); + return; end to_bare = node and (node.."@"..host) or host; -- bare JID if resource then to = to_bare.."/"..resource; else to = to_bare; end stanza.attr.to = to; end if from then + -- We only stamp the 'from' on c2s stanzas, so we still need to check validity from_node, from_host, from_resource = jid_prepped_split(from); if not from_host then - error("Invalid from JID"); + log("warn", "Received stanza with invalid source JID: %s", from); + origin.send(st.error_reply(stanza, "modify", "jid-malformed", "The source address is invalid: "..from)); + return; end from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID if from_resource then from = from_bare.."/"..from_resource; else from = from_bare; end
