mod_websocket: Fire pre-session-close event (fixes #1800)
This event was added in a7c183bb4e64 and is required to make mod_smacks know
that a session was intentionally closed and shouldn't be hibernated (see
fcea4d9e7502).
Because this was missing from mod_websocket's session.close(), mod_smacks
would always attempt to hibernate websocket sessions even if they closed
cleanly.
That mod_websocket has its own copy of session.close() is something to fix
another day (probably not in the stable branch). So for now this commit makes
the minimal change to get things working again.
Thanks to Damian and the Jitsi team for reporting.
# #1535 Let MUCs respond to presence probes
[Client] Romeo
jid: user@localhost
password: password
[Client] Juliet
jid: user2@localhost
password: password
[Client] Mercutio
jid: user3@localhost
password: password
-----
Romeo connects
# Romeo joins the MUC
Romeo sends:
<presence to="room@conference.localhost/Romeo">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
Romeo receives:
<presence from='room@conference.localhost/Romeo'>
<x xmlns='http://jabber.org/protocol/muc#user'>
<status code='201'/>
<item jid="${Romeo's full JID}" affiliation='owner' role='moderator'/>
<status code='110'/>
</x>
</presence>
Romeo receives:
<message type='groupchat' from='room@conference.localhost'><subject/></message>
# Disable presences for non-mods
Romeo sends:
<iq id='config1' to='room@conference.localhost' type='set'>
<query xmlns='http://jabber.org/protocol/muc#owner'>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE'>
<value>http://jabber.org/protocol/muc#roomconfig</value>
</field>
<field var='muc#roomconfig_presencebroadcast'>
<value>moderator</value>
</field>
</x>
</query>
</iq>
Romeo receives:
<iq id="config1" from="room@conference.localhost" type="result">
</iq>
# Romeo probes himself
Romeo sends:
<presence to="room@conference.localhost/Romeo" type="probe">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
Romeo receives:
<presence from='room@conference.localhost/Romeo'>
<x xmlns='http://jabber.org/protocol/muc#user'>
<item jid="${Romeo's full JID}" affiliation='owner' role='moderator'/>
</x>
</presence>
# Juliet tries to probe Romeo before joining the room
Juliet connects
Juliet sends:
<presence to="room@conference.localhost/Romeo" type="probe">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
Juliet receives:
<presence from="room@conference.localhost/Romeo" type="error">
<error type="cancel">
<not-acceptable xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/>
</error>
</presence>
# Juliet tries to probe Mercutio (who's not in the MUC) before joining the room
Juliet sends:
<presence to="room@conference.localhost/Mercutio" type="probe">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
Juliet receives:
<presence from="room@conference.localhost/Mercutio" type="error">
<error type="cancel">
<not-acceptable xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/>
</error>
</presence>
# Juliet joins the room
Juliet sends:
<presence to="room@conference.localhost/Juliet">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
Juliet receives:
<presence from="room@conference.localhost/Romeo" />
Juliet receives:
<presence from="room@conference.localhost/Juliet" />
# Romeo probes Juliet
Romeo sends:
<presence to="room@conference.localhost/Juliet" type="probe">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
Romeo receives:
<presence from='room@conference.localhost/Juliet'>
<x xmlns='http://jabber.org/protocol/muc#user'>
<item jid="${Juliet's full JID}" affiliation='none' role='participant'/>
</x>
</presence>
# Mercutio tries to probe himself in a MUC before joining
Mercutio connects
Mercutio sends:
<presence to="room@conference.localhost/Mercutio" type="probe">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
Mercutio receives:
<presence from="room@conference.localhost/Mercutio" type="error">
<error type="cancel">
<not-acceptable xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/>
</error>
</presence>
# Romeo makes Mercutio a member and registers his nickname
Romeo sends:
<iq id='member1' to='room@conference.localhost' type='set'>
<query xmlns='http://jabber.org/protocol/muc#admin'>
<item affiliation='member' jid="${Mercutio's JID}" nick="Mercutio"/>
</query>
</iq>
Romeo receives:
<message from='room@conference.localhost'>
<x xmlns='http://jabber.org/protocol/muc#user'>
<item jid="${Mercutio's JID}" affiliation='member' />
</x>
</message>
Romeo receives:
<iq from='room@conference.localhost' id='member1' type='result'/>
# Romeo probes Mercutio, even though he's unavailable
Romeo sends:
<presence to="room@conference.localhost/Mercutio" type="probe">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
Romeo receives:
<presence from='room@conference.localhost/Mercutio' type="unavailable">
<x xmlns='http://jabber.org/protocol/muc#user'>
<item nick="Mercutio" affiliation='member' role='none' jid="${Mercutio's JID}" />
</x>
</presence>