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.
# MUC: Members-only rooms kick members who lose affiliation
[Client] Romeo
jid: user@localhost
password: password
[Client] Juliet
jid: user2@localhost
password: password
-----
Romeo connects
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>
# Submit config form, set the room to members-only
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_membersonly'>
<value>1</value>
</field>
</x>
</query>
</iq>
Romeo receives:
<iq id="config1" from="room@conference.localhost" type="result">
</iq>
# Romeo adds Juliet to the member list
Romeo sends:
<iq id='member1' to='room@conference.localhost' type='set'>
<query xmlns='http://jabber.org/protocol/muc#admin'>
<item affiliation='member' jid="${Juliet's JID}" />
</query>
</iq>
Romeo receives:
<message from='room@conference.localhost'>
<x xmlns='http://jabber.org/protocol/muc#user'>
<item jid="${Juliet's JID}" affiliation='member' />
</x>
</message>
Romeo receives:
<iq from='room@conference.localhost' id='member1' type='result'/>
# Juliet connects, and joins the room
Juliet connects
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" />
Juliet receives:
<message type='groupchat' from='room@conference.localhost'><subject/></message>
Romeo receives:
<presence from="room@conference.localhost/Juliet" />
# Romeo removes Juliet's membership status
Romeo sends:
<iq id='member2' to='room@conference.localhost' type='set'>
<query xmlns='http://jabber.org/protocol/muc#admin'>
<item affiliation='none' jid="${Juliet's JID}" />
</query>
</iq>
# As a non-member, Juliet must now be removed from the room
Romeo receives:
<presence type='unavailable' from='room@conference.localhost/Juliet'>
<x xmlns='http://jabber.org/protocol/muc#user'>
<status code='321'/>
<item role='none' jid="${Juliet's full JID}" affiliation='none'>
<actor nick='Romeo' jid="${Romeo's full JID}"/>
</item>
</x>
</presence>
Romeo receives:
<iq id='member2' type='result'/>
Romeo disconnects
Juliet disconnects