Skip to content

test(postgres): pin CVE-2026-2004 operator superuser-gate #2166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
utkarash2991 wants to merge 1 commit into
base: pg-17-10-update
Choose a base branch
from
+108 −0
Draft

test(postgres): pin CVE-2026-2004 operator superuser-gate #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions nix/tests/expected/operator_breaking_change.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
-- Pin CVE-2026-2004 behaviour: attaching a non-built-in selectivity estimator
-- to an operator requires superuser. Verified against both RESTRICT and JOIN.
--
-- Upstream commits: b764b26f (PG 15.16), bbf5bcf5 (PG 17.8). The check fires in
-- both ValidateRestrictionEstimator() and ValidateJoinEstimator() in
-- src/backend/commands/operatorcmds.c.
--
-- Refs: PSQL-1110, PSQL-1234.
BEGIN;
-- Build a non-built-in restriction estimator and a non-built-in join estimator.
CREATE FUNCTION public.fake_restrict_sel(internal, oid, internal, integer)
RETURNS float8 LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
AS $$ SELECT 0.5::float8 $$;
CREATE FUNCTION public.fake_join_sel(internal, oid, internal, smallint, internal)
RETURNS float8 LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
AS $$ SELECT 0.5::float8 $$;
-- Trivial procedure for the operator definition.
CREATE FUNCTION public.fake_op_proc(_int4, _int4)
RETURNS bool LANGUAGE sql IMMUTABLE
AS $$ SELECT true $$;
-- Switch to a non-superuser role.
SET ROLE postgres;
-- 1) RESTRICT = non-built-in should be rejected.
SAVEPOINT before_restrict;
CREATE OPERATOR public.@@@ (
LEFTARG = _int4, RIGHTARG = _int4,
PROCEDURE = public.fake_op_proc,
RESTRICT = public.fake_restrict_sel
);
ERROR: must be superuser to specify a non-built-in restriction estimator function
ROLLBACK TO SAVEPOINT before_restrict;
-- 2) JOIN = non-built-in should be rejected.
SAVEPOINT before_join;
CREATE OPERATOR public.@@@ (
LEFTARG = _int4, RIGHTARG = _int4,
PROCEDURE = public.fake_op_proc,
JOIN = public.fake_join_sel
);
ERROR: must be superuser to specify a non-built-in join estimator function
ROLLBACK TO SAVEPOINT before_join;
-- 3) Sanity check: built-in selectivity estimators still work for non-superusers.
CREATE OPERATOR public.@@@ (
LEFTARG = _int4, RIGHTARG = _int4,
PROCEDURE = public.fake_op_proc,
RESTRICT = eqsel,
JOIN = eqjoinsel
);
DROP OPERATOR public.@@@ (_int4, _int4);
RESET ROLE;
ROLLBACK;
58 changes: 58 additions & 0 deletions nix/tests/sql/operator_breaking_change.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
-- Pin CVE-2026-2004 behaviour: attaching a non-built-in selectivity estimator
-- to an operator requires superuser. Verified against both RESTRICT and JOIN.
--
-- Upstream commits: b764b26f (PG 15.16), bbf5bcf5 (PG 17.8). The check fires in
-- both ValidateRestrictionEstimator() and ValidateJoinEstimator() in
-- src/backend/commands/operatorcmds.c.
--
-- Refs: PSQL-1110, PSQL-1234.

BEGIN;

-- Build a non-built-in restriction estimator and a non-built-in join estimator.
CREATE FUNCTION public.fake_restrict_sel(internal, oid, internal, integer)
RETURNS float8 LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
AS $$ SELECT 0.5::float8 $$;

CREATE FUNCTION public.fake_join_sel(internal, oid, internal, smallint, internal)
RETURNS float8 LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
AS $$ SELECT 0.5::float8 $$;

-- Trivial procedure for the operator definition.
CREATE FUNCTION public.fake_op_proc(_int4, _int4)
RETURNS bool LANGUAGE sql IMMUTABLE
AS $$ SELECT true $$;

-- Switch to a non-superuser role.
SET ROLE postgres;

-- 1) RESTRICT = non-built-in should be rejected.
SAVEPOINT before_restrict;
CREATE OPERATOR public.@@@ (
LEFTARG = _int4, RIGHTARG = _int4,
PROCEDURE = public.fake_op_proc,
RESTRICT = public.fake_restrict_sel
);
ROLLBACK TO SAVEPOINT before_restrict;

-- 2) JOIN = non-built-in should be rejected.
SAVEPOINT before_join;
CREATE OPERATOR public.@@@ (
LEFTARG = _int4, RIGHTARG = _int4,
PROCEDURE = public.fake_op_proc,
JOIN = public.fake_join_sel
);
ROLLBACK TO SAVEPOINT before_join;

-- 3) Sanity check: built-in selectivity estimators still work for non-superusers.
CREATE OPERATOR public.@@@ (
LEFTARG = _int4, RIGHTARG = _int4,
PROCEDURE = public.fake_op_proc,
RESTRICT = eqsel,
JOIN = eqjoinsel
);

DROP OPERATOR public.@@@ (_int4, _int4);

RESET ROLE;
ROLLBACK;
Loading