Software /
code /
prosody
File
plugins/mod_roster.lua @ 13652:a08065207ef0
net.server_epoll: Call :shutdown() on TLS sockets when supported
Comment from Matthew:
This fixes a potential issue where the Prosody process gets blocked on sockets
waiting for them to close. Unlike non-TLS sockets, closing a TLS socket sends
layer 7 data, and this can cause problems for sockets which are in the process
of being cleaned up.
This depends on LuaSec changes which are not yet upstream.
From Martijn's original email:
So first my analysis of luasec. in ssl.c the socket is put into blocking
mode right before calling SSL_shutdown() inside meth_destroy(). My best
guess to why this is is because meth_destroy is linked to the __close
and __gc methods, which can't exactly be called multiple times and
luasec does want to make sure that a tls session is shutdown as clean
as possible.
I can't say I disagree with this reasoning and don't want to change this
behaviour. My solution to this without changing the current behaviour is
to introduce a shutdown() method. I am aware that this overlaps in a
conflicting way with tcp's shutdown method, but it stays close to the
OpenSSL name. This method calls SSL_shutdown() in the current
(non)blocking mode of the underlying socket and returns a boolean
whether or not the shutdown is completed (matching SSL_shutdown()'s 0
or 1 return values), and returns the familiar ssl_ioerror() strings on
error with a false for completion. This error can then be used to
determine if we have wantread/wantwrite to finalize things. Once
meth_shutdown() has been called once a shutdown flag will be set, which
indicates to meth_destroy() that the SSL_shutdown() has been handled
by the application and it shouldn't be needed to set the socket to
blocking mode. I've left the SSL_shutdown() call in the
LSEC_STATE_CONNECTED to prevent TOCTOU if the application reaches a
timeout for the shutdown code, which might allow SSL_shutdown() to
clean up anyway at the last possible moment.
Another thing I've changed to luasec is the call to socket_setblocking()
right before calling close(2) in socket_destroy() in usocket.c.
According to the latest POSIX[0]:
Note that the requirement for close() on a socket to block for up to
the current linger interval is not conditional on the O_NONBLOCK
setting.
Which I read to mean that removing O_NONBLOCK on the socket before close
doesn't impact the behaviour and only causes noise in system call
tracers. I didn't touch the windows bits of this, since I don't do
windows.
For the prosody side of things I've made the TLS shutdown bits resemble
interface:onwritable(), and put it under a combined guard of self._tls
and self.conn.shutdown. The self._tls bit is there to prevent getting
stuck on this condition, and self.conn.shutdown is there to prevent the
code being called by instances where the patched luasec isn't deployed.
The destroy() method can be called from various places and is read by
me as the "we give up" error path. To accommodate for these unexpected
entrypoints I've added a single call to self.conn:shutdown() to prevent
the socket being put into blocking mode. I have no expectations that
there is any other use here. Same as previous, the self.conn.shutdown
check is there to make sure it's not called on unpatched luasec
deployments and self._tls is there to make sure we don't call shutdown()
on tcp sockets.
I wouldn't recommend logging of the conn:shutdown() error inside
close(), since a lot of clients simply close the connection before
SSL_shutdown() is done.
author | Martijn van Duren <martijn@openbsd.org> |
---|---|
date | Thu, 06 Feb 2025 15:04:38 +0000 |
parent | 13584:0f265142117a |
line wrap: on
line source
-- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- local st = require "prosody.util.stanza" local jid_split = require "prosody.util.jid".split; local jid_resource = require "prosody.util.jid".resource; local jid_prep = require "prosody.util.jid".prep; local tonumber = tonumber; local pairs = pairs; local rostermanager = require "prosody.core.rostermanager"; local rm_load_roster = rostermanager.load_roster; local rm_remove_from_roster = rostermanager.remove_from_roster; local rm_add_to_roster = rostermanager.add_to_roster; local rm_roster_push = rostermanager.roster_push; module:add_feature("jabber:iq:roster"); local rosterver_stream_feature = st.stanza("ver", {xmlns="urn:xmpp:features:rosterver"}); module:hook("stream-features", function(event) local origin, features = event.origin, event.features; if origin.username then features:add_child(rosterver_stream_feature); end end); module:hook("iq/self/jabber:iq:roster:query", function(event) local session, stanza = event.origin, event.stanza; if stanza.attr.type == "get" then local roster = st.reply(stanza); local client_ver = tonumber(stanza.tags[1].attr.ver); local server_ver = tonumber(session.roster[false].version or 1); if not (client_ver and server_ver) or client_ver ~= server_ver then roster:query("jabber:iq:roster"); -- Client does not support versioning, or has stale roster for jid, item in pairs(session.roster) do if jid then roster:tag("item", { jid = jid, subscription = item.subscription, ask = item.ask, name = item.name, }); for group in pairs(item.groups) do roster:text_tag("group", group); end roster:up(); -- move out from item end end roster.tags[1].attr.ver = tostring(server_ver); end session.send(roster); session.interested = true; -- resource is interested in roster updates else -- stanza.attr.type == "set" local query = stanza.tags[1]; if #query.tags == 1 and query.tags[1].name == "item" and query.tags[1].attr.xmlns == "jabber:iq:roster" and query.tags[1].attr.jid then local item = query.tags[1]; local from_node, from_host = jid_split(stanza.attr.from); local jid = jid_prep(item.attr.jid); if jid and not jid_resource(jid) then if jid ~= from_node.."@"..from_host then if item.attr.subscription == "remove" then local roster = session.roster; local r_item = roster[jid]; if r_item then module:fire_event("roster-item-removed", { username = from_node, jid = jid, item = r_item, origin = session, roster = roster, }); local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid); if success then session.send(st.reply(stanza)); rm_roster_push(from_node, from_host, jid); else session.send(st.error_reply(stanza, err_type, err_cond, err_msg)); end else session.send(st.error_reply(stanza, "modify", "item-not-found")); end else local r_item = {name = item.attr.name, groups = {}}; if r_item.name == "" then r_item.name = nil; end if session.roster[jid] then r_item.subscription = session.roster[jid].subscription; r_item.ask = session.roster[jid].ask; else r_item.subscription = "none"; end for group in item:childtags("group") do local text = group:get_text(); if text then r_item.groups[text] = true; end end local success, err_type, err_cond, err_msg = rm_add_to_roster(session, jid, r_item); if success then -- Ok, send success session.send(st.reply(stanza)); -- and push change to all resources rm_roster_push(from_node, from_host, jid); else -- Adding to roster failed session.send(st.error_reply(stanza, err_type, err_cond, err_msg)); end end else -- Trying to add self to roster session.send(st.error_reply(stanza, "cancel", "not-allowed")); end else -- Invalid JID added to roster session.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME what's the correct error? end else -- Roster set didn't include a single item, or its name wasn't 'item' session.send(st.error_reply(stanza, "modify", "bad-request")); end end return true; end); module:hook_global("user-deleted", function(event) local username, host = event.username, event.host; local origin = event.origin or prosody.hosts[host]; if host ~= module.host then return end local roster = rm_load_roster(username, host); for jid, item in pairs(roster) do if jid then module:fire_event("roster-item-removed", { username = username, jid = jid, item = item, roster = roster, origin = origin, }); else for pending_jid in pairs(item.pending) do module:fire_event("roster-item-removed", { username = username, jid = pending_jid, roster = roster, origin = origin, }); end end end end, 300); -- API/commands -- Make a *one-way* subscription. User will see when contact is online, -- contact will not see when user is online. function subscribe(user_jid, contact_jid) local user_username, user_host = jid_split(user_jid); local contact_username, contact_host = jid_split(contact_jid); -- Update user's roster to say subscription request is pending. Bare hosts (e.g. components) don't have rosters. if user_username ~= nil then rostermanager.set_contact_pending_out(user_username, user_host, contact_jid); end if prosody.hosts[contact_host] then -- Sending to a local host? -- Update contact's roster to say subscription request is pending... rostermanager.set_contact_pending_in(contact_username, contact_host, user_jid); -- Update contact's roster to say subscription request approved... rostermanager.subscribed(contact_username, contact_host, user_jid); -- Update user's roster to say subscription request approved. Bare hosts (e.g. components) don't have rosters. if user_username ~= nil then rostermanager.process_inbound_subscription_approval(user_username, user_host, contact_jid); end else -- Send a subscription request local sub_request = st.presence({ from = user_jid, to = contact_jid, type = "subscribe" }); module:send(sub_request); end return true; end -- Make a mutual subscription between jid1 and jid2. Each JID will see -- when the other one is online. function subscribe_both(jid1, jid2) local ok1, err1 = subscribe(jid1, jid2); local ok2, err2 = subscribe(jid2, jid1); return ok1 and ok2, err1 or err2; end -- Unsubscribes user from contact (not contact from user, if subscribed). function unsubscribe(user_jid, contact_jid) local user_username, user_host = jid_split(user_jid); local contact_username, contact_host = jid_split(contact_jid); -- Update user's roster to say subscription is cancelled... rostermanager.unsubscribe(user_username, user_host, contact_jid); if prosody.hosts[contact_host] then -- Local host? -- Update contact's roster to say subscription is cancelled... rostermanager.unsubscribed(contact_username, contact_host, user_jid); end return true; end -- Cancel any subscription in either direction. function unsubscribe_both(jid1, jid2) local ok1 = unsubscribe(jid1, jid2); local ok2 = unsubscribe(jid2, jid1); return ok1 and ok2; end module:add_item("shell-command", { section = "roster"; section_desc = "View and manage user rosters (contact lists)"; name = "show"; desc = "Show a user's current roster"; args = { { name = "jid", type = "string" }; { name = "sub", type = "string" }; }; host_selector = "jid"; handler = function(self, jid, sub) --luacheck: ignore 212/self local print = self.session.print; local it = require "prosody.util.iterators"; local roster = assert(rm_load_roster(jid_split(jid))); local function sort_func(a, b) if type(a) == "string" and type(b) == "string" then return a < b; else return a == false; end end local count = 0; if sub == "pending" then local pending_subs = roster[false].pending or {}; for pending_jid in it.sorted_pairs(pending_subs) do print(pending_jid); end else for contact, item in it.sorted_pairs(roster, sort_func) do if contact and (not sub or sub == item.subscription) then count = count + 1; print(contact, ("sub=%s\task=%s"):format(item.subscription or "none", item.ask or "none")); end end end return true, ("Showing %d entries"):format(count); end; }); module:add_item("shell-command", { section = "roster"; section_desc = "View and manage user rosters (contact lists)"; name = "subscribe"; desc = "Subscribe a user to another JID"; args = { { name = "jid", type = "string" }; { name = "contact", type = "string" }; }; host_selector = "jid"; handler = function(self, jid, contact) --luacheck: ignore 212/self return subscribe(jid, contact); end; }); module:add_item("shell-command", { section = "roster"; section_desc = "View and manage user rosters (contact lists)"; name = "subscribe_both"; desc = "Subscribe a user and a contact JID to each other"; args = { { name = "jid", type = "string" }; { name = "contact", type = "string" }; }; host_selector = "jid"; handler = function(self, jid, contact) --luacheck: ignore 212/self return subscribe_both(jid, contact); end; }); module:add_item("shell-command", { section = "roster"; section_desc = "View and manage user rosters (contact lists)"; name = "unsubscribe"; desc = "Unsubscribe a user from another JID"; args = { { name = "jid", type = "string" }; { name = "contact", type = "string" }; }; host_selector = "jid"; handler = function(self, jid, contact) --luacheck: ignore 212/self return unsubscribe(jid, contact); end; }); module:add_item("shell-command", { section = "roster"; section_desc = "View and manage user rosters (contact lists)"; name = "unsubscribe_both"; desc = "Unubscribe a user and a contact JID from each other"; args = { { name = "jid", type = "string" }; { name = "contact", type = "string" }; }; host_selector = "jid"; handler = function(self, jid, contact) --luacheck: ignore 212/self return unsubscribe_both(jid, contact); end; });