@@ -84,10 +84,21 @@ def __init__(
8484 rate = 1 / 30 ,
8585 )
8686 self ._refresh_in_progress = asyncio .locks .Event ()
87+ self ._iam_principals : list [tuple [str , str ]] = []
8788 self ._current : asyncio .Task = self ._schedule_refresh (0 )
8889 self ._next : asyncio .Task = self ._current
8990 self ._closed = False
9091
92+ def record_principal (self , user : str , database : str ) -> None :
93+ """Records a PostgreSQL (user, database) pair observed on an IAM connection."""
94+ if not user :
95+ return
96+ if not database :
97+ database = user
98+ pair = (user , database )
99+ if pair not in self ._iam_principals :
100+ self ._iam_principals .append (pair )
101+
91102 @property
92103 def conn_name (self ) -> ConnectionName :
93104 return self ._conn_name
@@ -175,37 +186,69 @@ async def _probe_connection(self, conn_info: ConnectionInfo) -> None:
175186 )
176187 return
177188
178- for target in targets :
179- try :
180- logger .debug (
181- f"['{ self ._conn_name } ']: Probing IAM token refresh on { target } :{ port } "
182- )
183- _ , writer = await asyncio .wait_for (
184- asyncio .open_connection (
185- host = target ,
186- port = port ,
187- ssl = ssl_context ,
188- server_hostname = (
189- self ._conn_name .domain_name
190- if self ._conn_name .domain_name
191- else None
189+ principals : list [tuple [str , str ] | None ] = []
190+ if (
191+ conn_info .database_version .startswith ("POSTGRES" )
192+ and self ._iam_principals
193+ ):
194+ principals .extend (self ._iam_principals )
195+ else :
196+ principals .append (None )
197+
198+ all_succeeded = True
199+ for principal in principals :
200+ probed_principal = False
201+ for target in targets :
202+ try :
203+ logger .debug (
204+ f"['{ self ._conn_name } ']: Probing IAM token refresh on { target } :{ port } "
205+ )
206+ reader , writer = await asyncio .wait_for (
207+ asyncio .open_connection (
208+ host = target ,
209+ port = port ,
210+ ssl = ssl_context ,
211+ server_hostname = (
212+ self ._conn_name .domain_name
213+ if self ._conn_name .domain_name
214+ else None
215+ ),
192216 ),
193- ),
194- timeout = float (self ._timeout ),
195- )
196- writer .close ()
197- await writer .wait_closed ()
198- logger .debug (
199- f"['{ self ._conn_name } ']: Proactive IAM token refresh probe successful"
200- )
201- return
202- except Exception as e : # noqa: BLE001
203- logger .debug (
204- f"['{ self ._conn_name } ']: Probing IAM token refresh on { target } :{ port } failed: { e !s} "
205- )
206- logger .debug (
207- f"['{ self ._conn_name } ']: Proactive IAM token refresh probe encountered error across all targets"
208- )
217+ timeout = float (self ._timeout ),
218+ )
219+ try :
220+ if principal is not None :
221+ user , database = principal
222+ writer .write (
223+ _build_postgres_startup_packet (user , database )
224+ )
225+ await writer .drain ()
226+ await asyncio .wait_for (
227+ reader .read (1024 ),
228+ timeout = float (self ._timeout ),
229+ )
230+ writer .write (b"X\x00 \x00 \x00 \x04 " )
231+ await writer .drain ()
232+ finally :
233+ writer .close ()
234+ await writer .wait_closed ()
235+ probed_principal = True
236+ break
237+ except Exception as e : # noqa: BLE001
238+ logger .debug (
239+ f"['{ self ._conn_name } ']: Probing IAM token refresh on { target } :{ port } failed: { e !s} "
240+ )
241+ if not probed_principal :
242+ all_succeeded = False
243+
244+ if all_succeeded :
245+ logger .debug (
246+ f"['{ self ._conn_name } ']: Proactive IAM token refresh probe successful"
247+ )
248+ else :
249+ logger .debug (
250+ f"['{ self ._conn_name } ']: Proactive IAM token refresh probe encountered error across all targets"
251+ )
209252
210253 def _schedule_refresh (self , delay : int ) -> asyncio .Task :
211254 """
@@ -292,3 +335,18 @@ async def close(self) -> None:
292335 tasks = asyncio .gather (self ._current , self ._next , return_exceptions = True )
293336 await asyncio .wait_for (tasks , timeout = 2.0 )
294337 self ._closed = True
338+
339+
340+ def _build_postgres_startup_packet (user : str , database : str ) -> bytes :
341+ """Builds a PostgreSQL v3.0 StartupMessage for (user, database)."""
342+ if not database :
343+ database = user
344+ body = (
345+ b"user\x00 "
346+ + user .encode ("utf-8" )
347+ + b"\x00 database\x00 "
348+ + database .encode ("utf-8" )
349+ + b"\x00 \x00 "
350+ )
351+ total_len = 8 + len (body )
352+ return total_len .to_bytes (4 , byteorder = "big" ) + b"\x00 \x03 \x00 \x00 " + body
0 commit comments