Software /
code /
prosody
File
spec/util_pubsub_spec.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 | 13549:3b357ab6b6eb |
line wrap: on
line source
local pubsub; setup(function () pubsub = require "util.pubsub"; end); --[[TODO: Retract Purge auto-create/auto-subscribe Item store/node store resize on max_items change service creation config provides alternative node_defaults get subscriptions ]] describe("util.pubsub", function () describe("simple node creation and deletion", function () randomize(false); -- These tests are ordered -- Roughly a port of scansion/scripts/pubsub_createdelete.scs local service = pubsub.new(); describe("#create", function () randomize(false); -- These tests are ordered it("creates a new node", function () assert.truthy(service:create("princely_musings", true)); end); it("fails to create the same node again", function () assert.falsy(service:create("princely_musings", true)); end); end); describe("#delete", function () randomize(false); -- These tests are ordered it("deletes the node", function () assert.truthy(service:delete("princely_musings", true)); end); it("can't delete an already deleted node", function () assert.falsy(service:delete("princely_musings", true)); end); end); end); describe("simple publishing", function () randomize(false); -- These tests are ordered local notified; local broadcaster = spy.new(function (notif_type, node_name, subscribers, item) -- luacheck: ignore 212 notified = subscribers; end); local service = pubsub.new({ broadcaster = broadcaster; }); it("creates a node", function () assert.truthy(service:create("node", true)); end); it("lets someone subscribe", function () assert.truthy(service:add_subscription("node", true, "someone")); end); it("publishes an item", function () assert.truthy(service:publish("node", true, "1", "item 1")); assert.truthy(notified["someone"]); end); it("called the broadcaster", function () assert.spy(broadcaster).was_called(); end); it("should return one item", function () local ok, ret = service:get_items("node", true); assert.truthy(ok); assert.same({ "1", ["1"] = "item 1" }, ret); end); it("lets someone unsubscribe", function () assert.truthy(service:remove_subscription("node", true, "someone")); end); it("does not send notifications after subscription is removed", function () assert.truthy(service:publish("node", true, "1", "item 1")); assert.is_nil(notified["someone"]); end); end); describe("publish with config", function () randomize(false); -- These tests are ordered local broadcaster = spy.new(function (notif_type, node_name, subscribers, item) -- luacheck: ignore 212 end); local service = pubsub.new({ broadcaster = broadcaster; autocreate_on_publish = true; }); it("automatically creates node with requested config", function () assert(service:publish("node", true, "1", "item 1", { myoption = true })); local ok, config = assert(service:get_node_config("node", true)); assert.truthy(ok); assert.equals(true, config.myoption); end); it("fails to publish to a node with differing config", function () local ok, err = service:publish("node", true, "1", "item 2", { myoption = false }); assert.falsy(ok); assert.equals("precondition-not-met", err); end); it("allows to publish to a node with differing config when only defaults are suggested", function () assert(service:publish("node", true, "1", "item 2", { _defaults_only = true, myoption = false })); end); end); describe("#issue1082", function () randomize(false); -- These tests are ordered local service = pubsub.new(); it("creates a node with max_items = 1", function () assert.truthy(service:create("node", true, { max_items = 1 })); end); it("changes max_items to 2", function () assert.truthy(service:set_node_config("node", true, { max_items = 2 })); end); it("publishes one item", function () assert.truthy(service:publish("node", true, "1", "item 1")); end); it("should return one item", function () local ok, ret = service:get_items("node", true); assert.truthy(ok); assert.same({ "1", ["1"] = "item 1" }, ret); end); it("publishes another item", function () assert.truthy(service:publish("node", true, "2", "item 2")); end); it("should return two items", function () local ok, ret = service:get_items("node", true); assert.truthy(ok); assert.same({ "2", "1", ["1"] = "item 1", ["2"] = "item 2", }, ret); end); it("publishes yet another item", function () assert.truthy(service:publish("node", true, "3", "item 3")); end); it("should still return only two items", function () local ok, ret = service:get_items("node", true); assert.truthy(ok); assert.same({ "3", "2", ["2"] = "item 2", ["3"] = "item 3", }, ret); end); it("has a default max_items", function () assert.truthy(service.config.max_items); end) it("changes max_items to max", function () assert.truthy(service:set_node_config("node", true, { max_items = "max" })); end); it("publishes some more items", function() for i = 4, service.config.max_items + 5 do assert.truthy(service:publish("node", true, tostring(i), "item " .. tostring(i))); end end); it("should still return only two items", function () local ok, ret = service:get_items("node", true); assert.truthy(ok); assert.same(service.config.max_items, #ret); end); end); describe("the thing", function () randomize(false); -- These tests are ordered local service = pubsub.new(); it("creates a node with some items", function () assert.truthy(service:create("node", true, { max_items = 3 })); assert.truthy(service:publish("node", true, "1", "item 1")); assert.truthy(service:publish("node", true, "2", "item 2")); assert.truthy(service:publish("node", true, "3", "item 3")); end); it("should return the requested item", function () local ok, ret = service:get_items("node", true, "1"); assert.truthy(ok); assert.same({ "1", ["1"] = "item 1" }, ret); end); it("should return multiple requested items", function () local ok, ret = service:get_items("node", true, { "1", "2" }); assert.truthy(ok); assert.same({ "1", "2", ["1"] = "item 1", ["2"] = "item 2", }, ret); end); end); describe("node config", function () local service; before_each(function () service = pubsub.new(); service:create("test", true); end); it("access is forbidden for unaffiliated entities", function () local ok, err = service:get_node_config("test", "stranger"); assert.is_falsy(ok); assert.equals("forbidden", err); end); it("returns an error for nodes that do not exist", function () local ok, err = service:get_node_config("nonexistent", true); assert.is_falsy(ok); assert.equals("item-not-found", err); end); end); describe("access model", function () describe("open", function () local service; before_each(function () service = pubsub.new(); -- Do not supply any config, 'open' should be default service:create("test", true); end); it("should be the default", function () local ok, config = service:get_node_config("test", true); assert.truthy(ok); assert.equal("open", config.access_model); end); it("should allow anyone to subscribe", function () local ok = service:add_subscription("test", "stranger", "stranger"); assert.is_true(ok); end); it("should still reject outcast-affiliated entities", function () assert(service:set_affiliation("test", true, "enemy", "outcast")); local ok, err = service:add_subscription("test", "enemy", "enemy"); assert.is_falsy(ok); assert.equal("forbidden", err); end); end); describe("whitelist", function () local service; before_each(function () service = assert(pubsub.new()); assert.is_true(service:create("test", true, { access_model = "whitelist" })); end); it("should be present in the configuration", function () local ok, config = service:get_node_config("test", true); assert.truthy(ok); assert.equal("whitelist", config.access_model); end); it("should not allow anyone to subscribe", function () local ok, err = service:add_subscription("test", "stranger", "stranger"); assert.is_false(ok); assert.equals("forbidden", err); end); end); describe("change", function () local service; before_each(function () service = pubsub.new(); service:create("test", true, { access_model = "open" }); end); it("affects existing subscriptions", function () do local ok = service:add_subscription("test", "stranger", "stranger"); assert.is_true(ok); end do local ok, sub = service:get_subscription("test", "stranger", "stranger"); assert.is_true(ok); assert.is_true(sub); end assert(service:set_node_config("test", true, { access_model = "whitelist" })); do local ok, sub = service:get_subscription("test", "stranger", "stranger"); assert.is_true(ok); assert.is_nil(sub); end end); end); end); describe("publish model", function () describe("publishers", function () local service; before_each(function () service = pubsub.new(); -- Do not supply any config, 'publishers' should be default service:create("test", true); end); it("should be the default", function () local ok, config = service:get_node_config("test", true); assert.truthy(ok); assert.equal("publishers", config.publish_model); end); it("should not allow anyone to publish", function () assert.is_true(service:add_subscription("test", "stranger", "stranger")); local ok, err = service:publish("test", "stranger", "item1", "foo"); assert.is_falsy(ok); assert.equals("forbidden", err); end); it("should allow publishers to publish", function () assert(service:set_affiliation("test", true, "mypublisher", "publisher")); -- luacheck: ignore 211/err local ok, err = service:publish("test", "mypublisher", "item1", "foo"); assert.is_true(ok); end); it("should allow owners to publish", function () assert(service:set_affiliation("test", true, "myowner", "owner")); local ok = service:publish("test", "myowner", "item1", "foo"); assert.is_true(ok); end); end); describe("open", function () local service; before_each(function () service = pubsub.new(); service:create("test", true, { publish_model = "open" }); end); it("should allow anyone to publish", function () local ok = service:publish("test", "stranger", "item1", "foo"); assert.is_true(ok); end); end); describe("subscribers", function () local service; before_each(function () service = pubsub.new(); service:create("test", true, { publish_model = "subscribers" }); end); it("should not allow non-subscribers to publish", function () local ok, err = service:publish("test", "stranger", "item1", "foo"); assert.is_falsy(ok); assert.equals("forbidden", err); end); it("should allow subscribers to publish without an affiliation", function () assert.is_true(service:add_subscription("test", "stranger", "stranger")); local ok = service:publish("test", "stranger", "item1", "foo"); assert.is_true(ok); end); it("should allow publishers to publish without a subscription", function () assert(service:set_affiliation("test", true, "mypublisher", "publisher")); -- luacheck: ignore 211/err local ok, err = service:publish("test", "mypublisher", "item1", "foo"); assert.is_true(ok); end); it("should allow owners to publish without a subscription", function () assert(service:set_affiliation("test", true, "myowner", "owner")); local ok = service:publish("test", "myowner", "item1", "foo"); assert.is_true(ok); end); end); end); describe("item API", function () local service; before_each(function () service = pubsub.new(); service:create("test", true, { publish_model = "subscribers" }); end); describe("get_last_item()", function () it("succeeds with nil on empty nodes", function () local ok, id, item = service:get_last_item("test", true); assert.is_true(ok); assert.is_nil(id); assert.is_nil(item); end); it("succeeds and returns the last item", function () service:publish("test", true, "one", "hello world"); service:publish("test", true, "two", "hello again"); service:publish("test", true, "three", "hey"); service:publish("test", true, "one", "bye"); local ok, id, item = service:get_last_item("test", true); assert.is_true(ok); assert.equal("one", id); assert.equal("bye", item); end); end); describe("get_items()", function () it("fails on non-existent nodes", function () local ok, err = service:get_items("no-node", true); assert.is_falsy(ok); assert.equal("item-not-found", err); end); it("returns no items on an empty node", function () local ok, items = service:get_items("test", true); assert.is_true(ok); assert.equal(0, #items); assert.is_nil(next(items)); end); it("returns no items on an empty node", function () local ok, items = service:get_items("test", true); assert.is_true(ok); assert.equal(0, #items); assert.is_nil((next(items))); end); it("returns all published items", function () service:publish("test", true, "one", "hello world"); service:publish("test", true, "two", "hello again"); service:publish("test", true, "three", "hey"); service:publish("test", true, "one", "bye"); local ok, items = service:get_items("test", true); assert.is_true(ok); assert.same({ "one", "three", "two", two = "hello again", three = "hey", one = "bye" }, items); end); end); end); describe("restoring data from nodestore", function () local nodestore = { data = { test = { name = "test"; config = {}; affiliations = {}; subscribers = { ["someone"] = true; }; } } }; function nodestore:users() return pairs(self.data) end function nodestore:get(key) return self.data[key]; end local service = pubsub.new({ nodestore = nodestore; }); it("subscriptions", function () local ok, ret = service:get_subscriptions(nil, true, nil) assert.is_true(ok); assert.same({ { node = "test", jid = "someone", subscription = true, } }, ret); end); end); describe("node config checking", function () local service; before_each(function () service = pubsub.new({ check_node_config = function (node, actor, config) -- luacheck: ignore 212 return config["max_items"] <= 20; end; }); end); it("defaults, then configure", function () local ok, err = service:create("node", true); assert.is_true(ok, err); local ok, err = service:set_node_config("node", true, { max_items = 10 }); assert.is_true(ok, err); local ok, err = service:set_node_config("node", true, { max_items = 100 }); assert.falsy(ok, err); assert.equals(err, "not-acceptable"); end); it("create with ok config, then configure", function () local ok, err = service:create("node", true, { max_items = 10 }); assert.is_true(ok, err); local ok, err = service:set_node_config("node", true, { max_items = 100 }); assert.falsy(ok, err); local ok, err = service:set_node_config("node", true, { max_items = 10 }); assert.is_true(ok, err); end); it("create with unacceptable config", function () local ok, err = service:create("node", true, { max_items = 100 }); assert.falsy(ok, err); end); end); describe("subscriber filter", function () it("works", function () local filter = spy.new(function (subs) -- luacheck: ignore 212/subs return {["modified"] = true}; end); local broadcaster = spy.new(function (notif_type, node_name, subscribers, item) -- luacheck: ignore 212 end); local service = pubsub.new({ subscriber_filter = filter; broadcaster = broadcaster; }); local ok = service:create("node", true); assert.truthy(ok); local ok = service:add_subscription("node", true, "someone"); assert.truthy(ok); local ok = service:publish("node", true, "1", "item"); assert.truthy(ok); -- TODO how to match table arguments? assert.spy(filter).was_called(); assert.spy(broadcaster).was_called(); end); end); describe("persist_items", function() it("can be disabled", function() local broadcaster = spy.new(function(notif_type, node_name, subscribers, item) -- luacheck: ignore 212 end); local service = pubsub.new { node_defaults = { persist_items = false }, broadcaster = broadcaster } local ok = service:create("node", true) assert.truthy(ok); local ok = service:publish("node", true, "1", "item"); assert.truthy(ok); assert.spy(broadcaster).was_called(); local ok, items = service:get_items("node", true); assert.not_truthy(ok); assert.equal(items, "persistent-items-unsupported"); end); end) describe("max_items", function () it("works", function () local service = pubsub.new { }; local ok = service:create("node", true) assert.truthy(ok); for i = 1, 20 do assert.truthy(service:publish("node", true, "item"..tostring(i), "data"..tostring(i))); end do local ok, items = service:get_items("node", true, nil, { max = 3 }); assert.truthy(ok, items); assert.equal(3, #items); assert.same({ "item20", "item19", "item18", item20 = "data20", item19 = "data19", item18 = "data18", }, items, "items should be ordered by oldest first"); end do local ok, items = service:get_items("node", true, nil, { max = 10 }); assert.truthy(ok, items); assert.equal(10, #items); assert.same({ "item20", "item19", "item18", "item17", "item16", "item15", "item14", "item13", "item12", "item11", item20 = "data20", item19 = "data19", item18 = "data18", item17 = "data17", item16 = "data16", item15 = "data15", item14 = "data14", item13 = "data13", item12 = "data12", item11 = "data11", }, items, "items should be ordered by oldest first"); end end); end) describe("metadata", function() it("works", function() local service = pubsub.new { metadata_subset = { "title" } }; assert.truthy(service:create("node", true, { title = "Hello", secret = "hidden" })) local ok, meta = service:get_node_metadata("node", "nobody"); assert.truthy(ok, meta); assert.same({ title = "Hello" }, meta); end) end); end);