NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8e6f134

committed

Fix bugs in libpq's management of GSS encryption state.

GSS-related resources should be cleaned up in pqDropConnection,not freePGconn, else the wrong things happen when resettinga connection or trying to switch to a different server.It's also critical to reset conn->gssenc there.During connection setup, initialize conn->try_gss at the correctplace, else switching to a different server won't work right.Remove now-redundant cleanup of GSS resources around one (and, forsome reason, only one) pqDropConnection call in connectDBStart.Per report from Kyotaro Horiguchi that psql would freeze up,rather than successfully resetting a GSS-encrypted connectionafter a server restart.This is YA oversight in commitb0b39f7, so back-patch to v12.Discussion:https://postgr.es/m/20200710.173803.435804731896516388.horikyota.ntt@gmail.com

1 parentae29005 commit8e6f134Copy full SHA for 8e6f134

File tree

1 file changed

-28

lines changed

src/interfaces/libpq
- fe-connect.c

1 file changed

-28

lines changed

`‎src/interfaces/libpq/fe-connect.c`

Lines changed: 9 additions & 28 deletions

Original file line number	Diff line number	Diff line change
`@@ -477,6 +477,11 @@ pqDropConnection(PGconn *conn, bool flushInput)`
`477`	`477`	`{`
`478`	`478`	`OM_uint32min_s;`
`479`	`479`
	`480`	`+if (conn->gcred!=GSS_C_NO_CREDENTIAL)`
	`481`	`+{`
	`482`	`+gss_release_cred(&min_s,&conn->gcred);`
	`483`	`+conn->gcred=GSS_C_NO_CREDENTIAL;`
	`484`	`+}`
`480`	`485`	`if (conn->gctx)`
`481`	`486`	`gss_delete_sec_context(&min_s,&conn->gctx,GSS_C_NO_BUFFER);`
`482`	`487`	`if (conn->gtarg_nam)`
`@@ -496,6 +501,7 @@ pqDropConnection(PGconn *conn, bool flushInput)`
`496`	`501`	`free(conn->gss_ResultBuffer);`
`497`	`502`	`conn->gss_ResultBuffer=NULL;`
`498`	`503`	`}`
	`504`	`+conn->gssenc= false;`
`499`	`505`	`}`
`500`	`506`	`#endif`
`501`	`507`	`#ifdefENABLE_SSPI`
`@@ -2023,11 +2029,6 @@ connectDBStart(PGconn *conn)`
`2023`	`2029`	`*/`
`2024`	`2030`	`resetPQExpBuffer(&conn->errorMessage);`
`2025`	`2031`
`2026`		`-#ifdefENABLE_GSS`
`2027`		`-if (conn->gssencmode[0]=='d')/* "disable" */`
`2028`		`-conn->try_gss= false;`
`2029`		`-#endif`
`2030`		`-`
`2031`	`2032`	`/*`
`2032`	`2033`	`* Set up to try to connect to the first host. (Setting whichhost = -1 is`
`2033`	`2034`	`* a bit of a cheat, but PQconnectPoll will advance it to 0 before`
`@@ -2464,6 +2465,9 @@ PQconnectPoll(PGconn *conn)`
`2464`	`2465`	`conn->allow_ssl_try= (conn->sslmode[0]!='d');/* "disable" */`
`2465`	`2466`	`conn->wait_ssl_try= (conn->sslmode[0]=='a');/* "allow" */`
`2466`	`2467`	`#endif`
	`2468`	`+#ifdefENABLE_GSS`
	`2469`	`+conn->try_gss= (conn->gssencmode[0]!='d');/* "disable" */`
	`2470`	`+#endif`
`2467`	`2471`
`2468`	`2472`	`reset_connection_state_machine= false;`
`2469`	`2473`	`need_new_connection= true;`
`@@ -3345,12 +3349,8 @@ PQconnectPoll(PGconn *conn)`
`3345`	`3349`	`*/`
`3346`	`3350`	`if (conn->gssenc&&conn->gssencmode[0]=='p')`
`3347`	`3351`	`{`
`3348`		`-OM_uint32minor;`
`3349`		`-`
`3350`	`3352`	`/* postmaster expects us to drop the connection */`
`3351`	`3353`	`conn->try_gss= false;`
`3352`		`-conn->gssenc= false;`
`3353`		`-gss_delete_sec_context(&minor,&conn->gctx,NULL);`
`3354`	`3354`	`pqDropConnection(conn, true);`
`3355`	`3355`	`conn->status=CONNECTION_NEEDED;`
`3356`	`3356`	`gotokeep_going;`
`@@ -3902,9 +3902,6 @@ makeEmptyPGconn(void)`
`3902`	`3902`	`conn->verbosity=PQERRORS_DEFAULT;`
`3903`	`3903`	`conn->show_context=PQSHOW_CONTEXT_ERRORS;`
`3904`	`3904`	`conn->sock=PGINVALID_SOCKET;`
`3905`		`-#ifdefENABLE_GSS`
`3906`		`-conn->try_gss= true;`
`3907`		`-#endif`
`3908`	`3905`
`3909`	`3906`	`/*`
`3910`	`3907`	`* We try to send at least 8K at a time, which is the usual size of pipe`
`@@ -4061,22 +4058,6 @@ freePGconn(PGconn *conn)`
`4061`	`4058`	`free(conn->gsslib);`
`4062`	`4059`	`if (conn->connip)`
`4063`	`4060`	`free(conn->connip);`
`4064`		`-#ifdefENABLE_GSS`
`4065`		`-if (conn->gcred!=GSS_C_NO_CREDENTIAL)`
`4066`		`-{`
`4067`		`-OM_uint32minor;`
`4068`		`-`
`4069`		`-gss_release_cred(&minor,&conn->gcred);`
`4070`		`-conn->gcred=GSS_C_NO_CREDENTIAL;`
`4071`		`-}`
`4072`		`-if (conn->gctx)`
`4073`		`-{`
`4074`		`-OM_uint32minor;`
`4075`		`-`
`4076`		`-gss_delete_sec_context(&minor,&conn->gctx,GSS_C_NO_BUFFER);`
`4077`		`-conn->gctx=NULL;`
`4078`		`-}`
`4079`		`-#endif`
`4080`	`4061`	`/* Note that conn->Pfdebug is not ours to close or free */`
`4081`	`4062`	`if (conn->last_query)`
`4082`	`4063`	`free(conn->last_query);`

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!

Commit8e6f134

File tree

1 file changed

1 file changed

`‎src/interfaces/libpq/fe-connect.c`

0 commit comments