diff options
| author | Daniel Gustafsson <dgustafsson@postgresql.org> | 2024-10-23 16:10:27 +0200 |
|---|---|---|
| committer | Daniel Gustafsson <dgustafsson@postgresql.org> | 2024-10-23 16:10:27 +0200 |
| commit | 6d16f9debae0a09a7db91d7f204bda043d04792c (patch) | |
| tree | cd956bb5b9cd0c447da688e7f35fa09fb366feac /src | |
| parent | 17b4aa77c3a161a9d0e7b08bd9931fe9fd051540 (diff) | |
| download | postgresql-6d16f9debae0a09a7db91d7f204bda043d04792c.tar.gz postgresql-6d16f9debae0a09a7db91d7f204bda043d04792c.zip | |
Make SASL max message length configurable
The proposed OAUTHBEARER SASL mechanism will need to allow larger
messages in the exchange, since tokens are sent directly by the
client. Move this limit into the pg_be_sasl_mech struct so that
it can be changed per-mechanism.
Author: Jacob Champion <jacob.champion@enterprisedb.com>
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Discussion: https://postgr.es/m/CAOYmi+nqX_5=Se0W0Ynrr55Fha3CMzwv_R9P3rkpHb=1kG7ZTQ@mail.gmail.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/auth-sasl.c | 10 | ||||
| -rw-r--r-- | src/backend/libpq/auth-scram.c | 4 | ||||
| -rw-r--r-- | src/include/libpq/sasl.h | 13 |
3 files changed, 16 insertions, 11 deletions
diff --git a/src/backend/libpq/auth-sasl.c b/src/backend/libpq/auth-sasl.c index 08b24d90b4b..4039e7fa3e9 100644 --- a/src/backend/libpq/auth-sasl.c +++ b/src/backend/libpq/auth-sasl.c @@ -21,14 +21,6 @@ #include "libpq/sasl.h" /* - * Maximum accepted size of SASL messages. - * - * The messages that the server or libpq generate are much smaller than this, - * but have some headroom. - */ -#define PG_MAX_SASL_MESSAGE_LENGTH 1024 - -/* * Perform a SASL exchange with a libpq client, using a specific mechanism * implementation. * @@ -103,7 +95,7 @@ CheckSASLAuth(const pg_be_sasl_mech *mech, Port *port, char *shadow_pass, /* Get the actual SASL message */ initStringInfo(&buf); - if (pq_getmessage(&buf, PG_MAX_SASL_MESSAGE_LENGTH)) + if (pq_getmessage(&buf, mech->max_message_length)) { /* EOF - pq_getmessage already logged error */ pfree(buf.data); diff --git a/src/backend/libpq/auth-scram.c b/src/backend/libpq/auth-scram.c index 56df870e9ef..8c5b6d9c67e 100644 --- a/src/backend/libpq/auth-scram.c +++ b/src/backend/libpq/auth-scram.c @@ -113,7 +113,9 @@ static int scram_exchange(void *opaq, const char *input, int inputlen, const pg_be_sasl_mech pg_be_scram_mech = { scram_get_mechanisms, scram_init, - scram_exchange + scram_exchange, + + PG_MAX_SASL_MESSAGE_LENGTH }; /* diff --git a/src/include/libpq/sasl.h b/src/include/libpq/sasl.h index 7a1f970ccae..0e8fa848304 100644 --- a/src/include/libpq/sasl.h +++ b/src/include/libpq/sasl.h @@ -27,7 +27,15 @@ #define PG_SASL_EXCHANGE_FAILURE 2 /* - * Backend SASL mechanism callbacks. + * Maximum accepted size of SASL messages. + * + * The messages that the server or libpq generate are much smaller than this, + * but have some headroom. + */ +#define PG_MAX_SASL_MESSAGE_LENGTH 1024 + +/* + * Backend SASL mechanism callbacks and metadata. * * To implement a backend mechanism, declare a pg_be_sasl_mech struct with * appropriate callback implementations. Then pass the mechanism to @@ -127,6 +135,9 @@ typedef struct pg_be_sasl_mech const char *input, int inputlen, char **output, int *outputlen, const char **logdetail); + + /* The maximum size allowed for client SASLResponses. */ + int max_message_length; } pg_be_sasl_mech; /* Common implementation for auth.c */ |