From: Daniel Gustafsson <daniel@yesql.se>
Message-Id: <3116E7C6-3580-49FC-899F-5E4727DB6CFA@yesql.se>
Content-Type: multipart/mixed;
	boundary="Apple-Mail=_9032F6FC-A3F0-4182-97EE-09930D339D9F"
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3776.700.51.11.1\))
Subject: Re: [PoC] Federated Authn/z with OAUTHBEARER
Date: Mon, 24 Feb 2025 00:45:32 +0100
In-Reply-To: <BDCDB76F-E683-440B-9480-AD9A32F161A4@yesql.se>
Cc: Jacob Champion <jacob.champion@enterprisedb.com>,
 Peter Eisentraut <peter@eisentraut.org>,
 Antonin Houska <ah@cybertec.at>,
 PostgreSQL Hackers <pgsql-hackers@postgresql.org>
To: Tom Lane <tgl@sss.pgh.pa.us>
References: <d1b467a78e0e36ed85a09adf979d04cf124a9d4b.camel@vmware.com>
 <CAOYmi+kHXMG2Z2KR7y36Cbsop_7t-YugrpfCnOXuXz8BpfaXaw@mail.gmail.com>
 <6bde5f56-9e7a-4148-b81c-eb6532cb3651@eisentraut.org>
 <CAOYmi+=ee8H=GaGNH_gZvBE+YPtmK9eqUdXqemk=zKDnO8YXRw@mail.gmail.com>
 <CAOYmi+kLTJ1wZ6gxRbgtR52E=EyiCpmp6J3mmSvtc1a6i7sZ3Q@mail.gmail.com>
 <CAOYmi+=ceXepXOrQXsxca-u57GxM+x_q34fpyNJ8PLmbUWPwEQ@mail.gmail.com>
 <9B417838-B872-453D-BBFB-99FA957EB723@yesql.se>
 <CAOYmi+=vJQ8EUiVf-iHYBwz4-tLHLrvp8rYDoNicB2yJrBKraw@mail.gmail.com>
 <CAOYmi+=FzVg+C-pQHCwjW0qU-POHmzZaD2z3CdsACj==14H8kQ@mail.gmail.com>
 <b09bc106-32f2-4e71-8c35-4db8608776a1@eisentraut.org>
 <CAOYmi+kjPLfT7iFqNMVV44sAUJ9m10TfrSMRPUYU2OgH5j0AYg@mail.gmail.com>
 <effc7572-c7ce-4ff2-9066-91d084401e1c@eisentraut.org>
 <CAOYmi+kn0_FioLpDqctn97a_W8n90XLt_OmU1xL6ZdK8DP8ufA@mail.gmail.com>
 <54c008ad-1c23-47d8-ba6c-bed98a39c31c@eisentraut.org>
 <CAOYmi+mEkXu9Jfg9v-5z9DmBCRCMS2dt43Z=TCbgVkbrqJXxRg@mail.gmail.com>
 <06102deb-00ef-431d-a3ea-65afb24! 6700a@eisentraut.org>
 <CAOYmi+kZAka0sdxCOBxsQc2ozEZGZKHWU_9nrPXg3sG1NJ-zJw@mail.gmail.com>
 <CE4D545A-7583-4FA9-98DD-57388CCC006F@yesql.se>
 <CAOYmi+kQFrKGmC0=Um-QryU1fvCAOC2bpjcz-4rxgLrp69mSOg@mail.gmail.com>
 <39A09EC8-2D72-4130-8C3E-8F3D1CC69A12@yesql.se>
 <CAOYmi+=K3BBRXwvJpt5D_4nK_EimCJBj7a42maACszsQC3=t9w@mail.gmail.com>
 <55EA9E76-9866-486C-9C7F-C5E8B071C50E@yesql.se>
 <CAOYmi+kJqzo6XsR9TEhvVfeVNQ-TyFM5LATypm9yoQVYk=4Wrw@mail.gmail.com>
 <35CBB6AD-B847-4C26-9A7B-019279F280C8@yesql.se>
 <9F184CFE-ED8D-4B86-9529-F07821108C93@yesql.se>
 <CAOYmi+nHG7oy+ybHH72WjiXAQG3tE6v_at-K9ebRy2oqo92V+A@mail.gmail.com>
 <C35FE624-DEF8-4359-9C7E-ED974A10CC29@yesql.se>
 <CAOYmi+mFZsExAYWy-bS9=yki_fWC+MC0MufpEZ_SycrbCAJrEg@mail.gmail.com>
 <83C44AB4-24B0-437F-B139-B5CBC5821BB1@yesql.se>
 <CAOYmi+=zgJinCoqdQ70fvKmvyrLekd9-supkuj57Poa1FmX8bw@mail.gmail.com>
 <2A1511A0-C04B-47E4-B1C3-54C2A1C765B8@yesql.se>
 <CAOYmi+=1_AqPL0Y7qdqg1ER0-bBjCUKUZfrLcgob5bHjzSsvbA@mail.gmail.com>
 <CAOYmi+nP8AM9xm+xUW5kDz7XDF7M! KBjuDnQ4LjMEm07tpwDgrg@mail.gmail.com>
 <AACF415F-894A-434F-9FE2-272ED8FA4981@yesql.se>
 <13F329B6-86BC-40A5-96F4-102784A0357A@yesql.se>
 <912516.1740329361@sss.pgh.pa.us>
 <BDCDB76F-E683-440B-9480-AD9A32F161A4@yesql.se>
Archived-At: <https://www.postgresql.org/message-id/3116E7C6-3580-49FC-899F-5E4727DB6CFA%40yesql.se>
Precedence: bulk


--Apple-Mail=_9032F6FC-A3F0-4182-97EE-09930D339D9F
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii

>> IMO, the set of cases where it's legitimate to mark individual struct
>> fields as const is negligibly small, and this doesn't seem to be one
>> of them.
> 
> Thanks for the report, will fix.
> 
>> BTW, as another nitpicky style matter: why do PGoauthBearerRequest
>> etc. spell their struct tag names differently from their typedef names
>> (that is, with/without an underscore)?  That is not our project style
>> anywhere else, and I'm failing to detect a good reason to do it here.
> 
> Indeed it isn't, the only explanation is that I missed it. Will fix.

The attached diff passes CI and works for me, will revisit in the morning.

--
Daniel Gustafsson


--Apple-Mail=_9032F6FC-A3F0-4182-97EE-09930D339D9F
Content-Disposition: attachment;
	filename=structfixups.diff
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="structfixups.diff"
Content-Transfer-Encoding: 7bit

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index ddb3596df83..8fa0515c6a0 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -10318,21 +10318,21 @@ typedef struct _PGpromptOAuthDevice
          of <symbol>PGoauthBearerRequest</symbol>, which should be filled in
          by the implementation:
 <synopsis>
-typedef struct _PGoauthBearerRequest
+typedef struct PGoauthBearerRequest
 {
     /* Hook inputs (constant across all calls) */
-    const char *const openid_configuration; /* OIDC discovery URL */
-    const char *const scope;                /* required scope(s), or NULL */
+    const char *openid_configuration; /* OIDC discovery URL */
+    const char *scope;                /* required scope(s), or NULL */
 
     /* Hook outputs */
 
     /* Callback implementing a custom asynchronous OAuth flow. */
     PostgresPollingStatusType (*async) (PGconn *conn,
-                                        struct _PGoauthBearerRequest *request,
+                                        struct PGoauthBearerRequest *request,
                                         SOCKTYPE *altsock);
 
     /* Callback to clean up custom allocations. */
-    void        (*cleanup) (PGconn *conn, struct _PGoauthBearerRequest *request);
+    void        (*cleanup) (PGconn *conn, struct PGoauthBearerRequest *request);
 
     char       *token;   /* acquired Bearer token */
     void       *user;    /* hook-defined allocated data */
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index b7399dee58e..34ddfdb1831 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -745,11 +745,11 @@ typedef struct _PGpromptOAuthDevice
 #define SOCKTYPE int
 #endif
 
-typedef struct _PGoauthBearerRequest
+typedef struct PGoauthBearerRequest
 {
 	/* Hook inputs (constant across all calls) */
-	const char *const openid_configuration; /* OIDC discovery URI */
-	const char *const scope;	/* required scope(s), or NULL */
+	const char *openid_configuration;	/* OIDC discovery URI */
+	const char *scope;			/* required scope(s), or NULL */
 
 	/* Hook outputs */
 
@@ -770,7 +770,7 @@ typedef struct _PGoauthBearerRequest
 	 * request->token must be set by the hook.
 	 */
 	PostgresPollingStatusType (*async) (PGconn *conn,
-										struct _PGoauthBearerRequest *request,
+										struct PGoauthBearerRequest *request,
 										SOCKTYPE * altsock);
 
 	/*
@@ -780,7 +780,7 @@ typedef struct _PGoauthBearerRequest
 	 * This is technically optional, but highly recommended, because there is
 	 * no other indication as to when it is safe to free the token.
 	 */
-	void		(*cleanup) (PGconn *conn, struct _PGoauthBearerRequest *request);
+	void		(*cleanup) (PGconn *conn, struct PGoauthBearerRequest *request);
 
 	/*
 	 * The hook should set this to the Bearer token contents for the

--Apple-Mail=_9032F6FC-A3F0-4182-97EE-09930D339D9F--