mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
Diagnose incompatible OpenLDAP versions during build and test.
With OpenLDAP versions 2.4.24 through 2.4.31, inclusive, PostgreSQL backends can crash at exit. Raise a warning during "configure" based on the compile-time OpenLDAP version number, and test the crash scenario in the dblink test suite. Back-patch to 9.0 (all supported versions).
This commit is contained in:
@ -9,7 +9,9 @@ SHLIB_PREREQS = submake-libpq
|
||||
EXTENSION = dblink
|
||||
DATA = dblink--1.1.sql dblink--1.0--1.1.sql dblink--unpackaged--1.0.sql
|
||||
|
||||
REGRESS = dblink
|
||||
REGRESS = paths dblink
|
||||
REGRESS_OPTS = --dlpath=$(top_builddir)/src/test/regress
|
||||
EXTRA_CLEAN = sql/paths.sql expected/paths.out
|
||||
|
||||
# the db name is hard-coded in the tests
|
||||
override USE_MODULE_DB =
|
||||
|
1
contrib/dblink/expected/.gitignore
vendored
Normal file
1
contrib/dblink/expected/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
/paths.out
|
@ -103,6 +103,33 @@ SELECT *
|
||||
FROM dblink('SELECT * FROM foo') AS t(a int, b text, c text[])
|
||||
WHERE t.a > 7;
|
||||
ERROR: connection not available
|
||||
-- The first-level connection's backend will crash on exit given OpenLDAP
|
||||
-- [2.4.24, 2.4.31]. We won't see evidence of any crash until the victim
|
||||
-- process terminates and the postmaster responds. If process termination
|
||||
-- entails writing a core dump, that can take awhile. Wait for the process to
|
||||
-- vanish. At that point, the postmaster has called waitpid() on the crashed
|
||||
-- process, and it will accept no new connections until it has reinitialized
|
||||
-- the cluster. (We can't exploit pg_stat_activity, because the crash happens
|
||||
-- after the backend updates shared memory to reflect its impending exit.)
|
||||
DO $pl$
|
||||
DECLARE
|
||||
detail text;
|
||||
BEGIN
|
||||
PERFORM wait_pid(crash_pid)
|
||||
FROM dblink('dbname=contrib_regression', $$
|
||||
SELECT pg_backend_pid() FROM dblink(
|
||||
'service=test_ldap dbname=contrib_regression',
|
||||
-- This string concatenation is a hack to shoehorn a
|
||||
-- set_pgservicefile call into the SQL statement.
|
||||
'SELECT 1' || set_pgservicefile('pg_service.conf')
|
||||
) t(c int)
|
||||
$$) AS t(crash_pid int);
|
||||
EXCEPTION WHEN OTHERS THEN
|
||||
GET STACKED DIAGNOSTICS detail = PG_EXCEPTION_DETAIL;
|
||||
-- Expected error in a non-LDAP build.
|
||||
IF NOT detail LIKE 'syntax error in service file%' THEN RAISE; END IF;
|
||||
END
|
||||
$pl$;
|
||||
-- create a persistent connection
|
||||
SELECT dblink_connect('dbname=contrib_regression');
|
||||
dblink_connect
|
||||
|
14
contrib/dblink/input/paths.source
Normal file
14
contrib/dblink/input/paths.source
Normal file
@ -0,0 +1,14 @@
|
||||
-- Initialization that requires path substitution.
|
||||
|
||||
CREATE FUNCTION putenv(text)
|
||||
RETURNS void
|
||||
AS '@libdir@/regress@DLSUFFIX@', 'regress_putenv'
|
||||
LANGUAGE C STRICT;
|
||||
|
||||
CREATE FUNCTION wait_pid(int)
|
||||
RETURNS void
|
||||
AS '@libdir@/regress@DLSUFFIX@'
|
||||
LANGUAGE C STRICT;
|
||||
|
||||
CREATE FUNCTION set_pgservicefile(text) RETURNS void LANGUAGE SQL
|
||||
AS $$SELECT putenv('PGSERVICEFILE=@abs_srcdir@/' || $1)$$;
|
11
contrib/dblink/output/paths.source
Normal file
11
contrib/dblink/output/paths.source
Normal file
@ -0,0 +1,11 @@
|
||||
-- Initialization that requires path substitution.
|
||||
CREATE FUNCTION putenv(text)
|
||||
RETURNS void
|
||||
AS '@libdir@/regress@DLSUFFIX@', 'regress_putenv'
|
||||
LANGUAGE C STRICT;
|
||||
CREATE FUNCTION wait_pid(int)
|
||||
RETURNS void
|
||||
AS '@libdir@/regress@DLSUFFIX@'
|
||||
LANGUAGE C STRICT;
|
||||
CREATE FUNCTION set_pgservicefile(text) RETURNS void LANGUAGE SQL
|
||||
AS $$SELECT putenv('PGSERVICEFILE=@abs_srcdir@/' || $1)$$;
|
7
contrib/dblink/pg_service.conf
Normal file
7
contrib/dblink/pg_service.conf
Normal file
@ -0,0 +1,7 @@
|
||||
# pg_service.conf for minimally exercising libpq use of LDAP.
|
||||
|
||||
# Having failed to reach an LDAP server, libpq essentially ignores the
|
||||
# "service=test_ldap" in its connection string. Contact the "discard"
|
||||
# service; the test works whether or not it answers.
|
||||
[test_ldap]
|
||||
ldap://127.0.0.1:9/base?attribute?one?filter
|
1
contrib/dblink/sql/.gitignore
vendored
Normal file
1
contrib/dblink/sql/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
/paths.sql
|
@ -65,6 +65,34 @@ SELECT *
|
||||
FROM dblink('SELECT * FROM foo') AS t(a int, b text, c text[])
|
||||
WHERE t.a > 7;
|
||||
|
||||
-- The first-level connection's backend will crash on exit given OpenLDAP
|
||||
-- [2.4.24, 2.4.31]. We won't see evidence of any crash until the victim
|
||||
-- process terminates and the postmaster responds. If process termination
|
||||
-- entails writing a core dump, that can take awhile. Wait for the process to
|
||||
-- vanish. At that point, the postmaster has called waitpid() on the crashed
|
||||
-- process, and it will accept no new connections until it has reinitialized
|
||||
-- the cluster. (We can't exploit pg_stat_activity, because the crash happens
|
||||
-- after the backend updates shared memory to reflect its impending exit.)
|
||||
DO $pl$
|
||||
DECLARE
|
||||
detail text;
|
||||
BEGIN
|
||||
PERFORM wait_pid(crash_pid)
|
||||
FROM dblink('dbname=contrib_regression', $$
|
||||
SELECT pg_backend_pid() FROM dblink(
|
||||
'service=test_ldap dbname=contrib_regression',
|
||||
-- This string concatenation is a hack to shoehorn a
|
||||
-- set_pgservicefile call into the SQL statement.
|
||||
'SELECT 1' || set_pgservicefile('pg_service.conf')
|
||||
) t(c int)
|
||||
$$) AS t(crash_pid int);
|
||||
EXCEPTION WHEN OTHERS THEN
|
||||
GET STACKED DIAGNOSTICS detail = PG_EXCEPTION_DETAIL;
|
||||
-- Expected error in a non-LDAP build.
|
||||
IF NOT detail LIKE 'syntax error in service file%' THEN RAISE; END IF;
|
||||
END
|
||||
$pl$;
|
||||
|
||||
-- create a persistent connection
|
||||
SELECT dblink_connect('dbname=contrib_regression');
|
||||
|
||||
|
Reference in New Issue
Block a user