NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4cc1c76

committed

Document PG_TEST_EXTRA=libpq_encryption and also check 'kerberos'

In the libpq encryption negotiation tests, don't run the GSSAPI testsunless PG_TEST_EXTRA='kerberos' is also set. That makes it possible tostill run most of the tests when GSSAPI support is compiled in, butthere's no MIT Kerberos installation.

1 parent65dfe9d commit4cc1c76Copy full SHA for 4cc1c76

File tree

2 files changed

+23

-5

lines changed

doc/src/sgml
- regress.sgml
src/interfaces/libpq/t
- 005_negotiate_encryption.pl

2 files changed

+23

-5

lines changed

`‎doc/src/sgml/regress.sgml`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ make check-world -j8 >/dev/null`
`259`	`259`	`variable <varname>PG_TEST_EXTRA</varname> to a whitespace-separated list,`
`260`	`260`	`for example:`
`261`	`261`	`<programlisting>`
`262`		`-make check-world PG_TEST_EXTRA='kerberos ldap ssl load_balance'`
	`262`	`+make check-world PG_TEST_EXTRA='kerberos ldap ssl load_balance libpq_encryption'`
`263`	`263`	`</programlisting>`
`264`	`264`	`The following values are currently supported:`
`265`	`265`	`<variablelist>`
`@@ -304,6 +304,18 @@ make check-world PG_TEST_EXTRA='kerberos ldap ssl load_balance'`
`304`	`304`	`</listitem>`
`305`	`305`	`</varlistentry>`
`306`	`306`
	`307`	`+ <varlistentry>`
	`308`	`+ <term><literal>libpq_encryption</literal></term>`
	`309`	`+ <listitem>`
	`310`	`+ <para>`
	`311`	`+ Runs the test <filename>src/interfaces/libpq/t/005_negotiate_encryption.pl</filename>.`
	`312`	`+ This opens TCP/IP listen sockets. If <varname>PG_TEST_EXTRA</varname>`
	`313`	`+ also includes <literal>kerberos</literal>, additional tests that require`
	`314`	`+ an MIT Kerberos installation are enabled.`
	`315`	`+ </para>`
	`316`	`+ </listitem>`
	`317`	`+ </varlistentry>`
	`318`	`+`
`307`	`319`	`<varlistentry>`
`308`	`320`	`<term><literal>wal_consistency_checking</literal></term>`
`309`	`321`	`<listitem>`

`‎src/interfaces/libpq/t/005_negotiate_encryption.pl`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,11 @@`
`83`	`83`	`'Potentially unsafe test libpq_encryption not enabled in PG_TEST_EXTRA';`
`84`	`84`	`}`
`85`	`85`
`86`		`-my$ssl_supported =$ENV{with_ssl}eq'openssl';`
	`86`	`+# Only run the GSSAPI tests when compiled with GSSAPI support and`
	`87`	`+# PG_TEST_EXTRA includes 'kerberos'`
`87`	`88`	`my$gss_supported =$ENV{with_gssapi}eq'yes';`
	`89`	`+my$kerberos_enabled =$ENV{PG_TEST_EXTRA} &&$ENV{PG_TEST_EXTRA} =~/\bkerberos\b/;`
	`90`	`+my$ssl_supported =$ENV{with_ssl}eq'openssl';`
`88`	`91`
`89`	`92`	`###`
`90`	`93`	`### Prepare test server for GSSAPI and SSL authentication, with a few`
`@@ -118,7 +121,7 @@`
`118`	`121`
`119`	`122`	`my$krb;`
`120`	`123`
`121`		`-if ($gss_supported != 0)`
	`124`	`+if ($gss_supported != 0 &&$kerberos_enabled != 0)`
`122`	`125`	`{`
`123`	`126`	`note"setting up Kerberos";`
`124`	`127`
`@@ -197,7 +200,7 @@ BEGIN`
`197`	`200`
`198`	`201`	`print$hbaqq{`
`199`	`202`	`hostgssenc postgres gssuser$servercidr trust`
`200`		`-}if ($gss_supported != 0);`
	`203`	`+}if ($gss_supported != 0 &&$kerberos_enabled != 0);`
`201`	`204`	`close$hba;`
`202`	`205`	`$node->reload;`
`203`	`206`
`@@ -331,6 +334,7 @@ BEGIN`
`331`	`334`	`SKIP:`
`332`	`335`	`{`
`333`	`336`	`skip"GSSAPI/Kerberos not supported by this build"if$gss_supported == 0;`
	`337`	`+skip"kerberos not enabled in PG_TEST_EXTRA"if$kerberos_enabled == 0;`
`334`	`338`
`335`	`339`	`$krb->create_principal('gssuser',$gssuser_password);`
`336`	`340`	`$krb->create_ticket('gssuser',$gssuser_password);`
`@@ -413,7 +417,9 @@ BEGIN`
`413`	`417`	`###`
`414`	`418`	`SKIP:`
`415`	`419`	`{`
`416`		`-skip"GSSAPI/Kerberos or SSL not supported by this build"unless ($ssl_supported &&$gss_supported);`
	`420`	`+skip"SSL not supported by this build"if$ssl_supported == 0;`
	`421`	`+skip"GSSAPI/Kerberos not supported by this build"if$gss_supported == 0;`
	`422`	`+skip"kerberos not enabled in PG_TEST_EXTRA"if$kerberos_enabled == 0;`
`417`	`423`
`418`	`424`	`# Sanity check that GSSAPI is still enabled from previous test.`
`419`	`425`	`connect_test($node,'user=testuser gssencmode=prefer sslmode=prefer','connect, gssaccept, authok -> gss');`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4cc1c76

File tree

2 files changed

2 files changed

`‎doc/src/sgml/regress.sgml`

`‎src/interfaces/libpq/t/005_negotiate_encryption.pl`

0 commit comments