mirror of
https://github.com/postgres/postgres.git
synced 2025-10-29 22:49:41 +03:00
Extensive code review for GSSAPI encryption mechanism.
Fix assorted bugs in handling of non-blocking I/O when using GSSAPI encryption. The encryption layer could return the wrong status information to its caller, resulting in effectively dropping some data (or possibly in aborting a not-broken connection), or in a "livelock" situation where data remains to be sent but the upper layers think transmission is done and just go to sleep. There were multiple small thinkos contributing to that, as well as one big one (failure to think through what to do when a send fails after having already transmitted data). Note that these errors could cause failures whether the client application asked for non-blocking I/O or not, since both libpq and the backend always run things in non-block mode at this level. Also get rid of use of static variables for GSSAPI inside libpq; that's entirely not okay given that multiple connections could be open at once inside a single client process. Also adjust a bunch of random small discrepancies between the frontend and backend versions of the send/receive functions -- except for error handling, they should be identical, and now they are. Also extend the Kerberos TAP tests to exercise cases where nontrivial amounts of data need to be pushed through encryption. Before, those tests didn't provide any useful coverage at all for the cases of interest here. (They still might not, depending on timing, but at least there's a chance.) Per complaint from pmc@citylink and subsequent investigation. Back-patch to v12 where this code was introduced. Discussion: https://postgr.es/m/20200109181822.GA74698@gate.oper.dinoex.org
This commit is contained in:
@@ -493,6 +493,23 @@ struct pg_conn
|
||||
bool try_gss; /* GSS attempting permitted */
|
||||
bool gssenc; /* GSS encryption is usable */
|
||||
gss_cred_id_t gcred; /* GSS credential temp storage. */
|
||||
|
||||
/* GSS encryption I/O state --- see fe-secure-gssapi.c */
|
||||
char *gss_SendBuffer; /* Encrypted data waiting to be sent */
|
||||
int gss_SendLength; /* End of data available in gss_SendBuffer */
|
||||
int gss_SendNext; /* Next index to send a byte from
|
||||
* gss_SendBuffer */
|
||||
int gss_SendConsumed; /* Number of *unencrypted* bytes consumed
|
||||
* for current contents of gss_SendBuffer */
|
||||
char *gss_RecvBuffer; /* Received, encrypted data */
|
||||
int gss_RecvLength; /* End of data available in gss_RecvBuffer */
|
||||
char *gss_ResultBuffer; /* Decryption of data in gss_RecvBuffer */
|
||||
int gss_ResultLength; /* End of data available in
|
||||
* gss_ResultBuffer */
|
||||
int gss_ResultNext; /* Next index to read a byte from
|
||||
* gss_ResultBuffer */
|
||||
uint32 gss_MaxPktSize; /* Maximum size we can encrypt and fit the
|
||||
* results into our output buffer */
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SSPI
|
||||
|
||||
Reference in New Issue
Block a user