database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-18 05:01:01 +03:00
Code Activity

libpq: Align oauth_json_set_error() with other NLS patterns

Browse Source 
Now that the prior commits have fixed missing OAuth translations, pull
the bespoke usage of libpq_gettext() for OAUTHBEARER parsing into
oauth_json_set_error() itself, and make that a gettext trigger as well,
to better match what the other sites are doing. Add an _internal()
variant to handle the existing untranslated case.

Suggested-by: Daniel Gustafsson <daniel@yesql.se>
Reviewed-by: Álvaro Herrera <alvherre@kurilemu.de>
Discussion: https://postgr.es/m/0EEBCAA8-A5AC-4E3B-BABA-0BA7A08C361B%40yesql.se
Backpatch-through: 18
This commit is contained in:
Jacob Champion
2025-12-15 13:22:04 -08:00
parent 301a1dcf00
commit f7fbd02d32
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/interfaces/libpq/fe-auth-oauth.c
View File

@@ -183,7 +183,14 @@ struct json_ctx
#define oauth_json_has_error(ctx) \ #define oauth_json_has_error(ctx) \
(PQExpBufferDataBroken((ctx)->errbuf) || (ctx)->errmsg) (PQExpBufferDataBroken((ctx)->errbuf) || (ctx)->errmsg)
#define oauth_json_set_error(ctx, ...) \ #define oauth_json_set_error(ctx, fmt, ...) \
do { \
appendPQExpBuffer(&(ctx)->errbuf, libpq_gettext(fmt), ##__VA_ARGS__); \
(ctx)->errmsg = (ctx)->errbuf.data; \
} while (0)
/* An untranslated version of oauth_json_set_error(). */
#define oauth_json_set_error_internal(ctx, ...) \
do { \ do { \
appendPQExpBuffer(&(ctx)->errbuf, __VA_ARGS__); \ appendPQExpBuffer(&(ctx)->errbuf, __VA_ARGS__); \
(ctx)->errmsg = (ctx)->errbuf.data; \ (ctx)->errmsg = (ctx)->errbuf.data; \
@@ -199,13 +206,13 @@ oauth_json_object_start(void *state)
Assert(ctx->nested == 1); Assert(ctx->nested == 1);
oauth_json_set_error(ctx, oauth_json_set_error(ctx,
libpq_gettext("field \"%s\" must be a string"), "field \"%s\" must be a string",
ctx->target_field_name); ctx->target_field_name);
} }
++ctx->nested; ++ctx->nested;
if (ctx->nested > MAX_SASL_NESTING_LEVEL) if (ctx->nested > MAX_SASL_NESTING_LEVEL)
oauth_json_set_error(ctx, libpq_gettext("JSON is too deeply nested")); oauth_json_set_error(ctx, "JSON is too deeply nested");
return oauth_json_has_error(ctx) ? JSON_SEM_ACTION_FAILED : JSON_SUCCESS; return oauth_json_has_error(ctx) ? JSON_SEM_ACTION_FAILED : JSON_SUCCESS;
} }
@@ -254,20 +261,20 @@ oauth_json_array_start(void *state)
if (!ctx->nested) if (!ctx->nested)
{ {
ctx->errmsg = libpq_gettext("top-level element must be an object"); oauth_json_set_error(ctx, "top-level element must be an object");
} }
else if (ctx->target_field) else if (ctx->target_field)
{ {
Assert(ctx->nested == 1); Assert(ctx->nested == 1);
oauth_json_set_error(ctx, oauth_json_set_error(ctx,
libpq_gettext("field \"%s\" must be a string"), "field \"%s\" must be a string",
ctx->target_field_name); ctx->target_field_name);
} }
++ctx->nested; ++ctx->nested;
if (ctx->nested > MAX_SASL_NESTING_LEVEL) if (ctx->nested > MAX_SASL_NESTING_LEVEL)
oauth_json_set_error(ctx, libpq_gettext("JSON is too deeply nested")); oauth_json_set_error(ctx, "JSON is too deeply nested");
return oauth_json_has_error(ctx) ? JSON_SEM_ACTION_FAILED : JSON_SUCCESS; return oauth_json_has_error(ctx) ? JSON_SEM_ACTION_FAILED : JSON_SUCCESS;
} }
@@ -288,7 +295,7 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
if (!ctx->nested) if (!ctx->nested)
{ {
ctx->errmsg = libpq_gettext("top-level element must be an object"); oauth_json_set_error(ctx, "top-level element must be an object");
return JSON_SEM_ACTION_FAILED; return JSON_SEM_ACTION_FAILED;
} }
@@ -301,7 +308,7 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
* Assert and don't continue any further for production builds. * Assert and don't continue any further for production builds.
*/ */
Assert(false); Assert(false);
oauth_json_set_error(ctx, oauth_json_set_error_internal(ctx,
"internal error: target scalar found at nesting level %d during OAUTHBEARER parsing", "internal error: target scalar found at nesting level %d during OAUTHBEARER parsing",
ctx->nested); ctx->nested);
return JSON_SEM_ACTION_FAILED; return JSON_SEM_ACTION_FAILED;
@@ -314,7 +321,7 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
if (*ctx->target_field) if (*ctx->target_field)
{ {
oauth_json_set_error(ctx, oauth_json_set_error(ctx,
libpq_gettext("field \"%s\" is duplicated"), "field \"%s\" is duplicated",
ctx->target_field_name); ctx->target_field_name);
return JSON_SEM_ACTION_FAILED; return JSON_SEM_ACTION_FAILED;
} }
@@ -323,7 +330,7 @@ oauth_json_scalar(void *state, char *token, JsonTokenType type)
if (type != JSON_TOKEN_STRING) if (type != JSON_TOKEN_STRING)
{ {
oauth_json_set_error(ctx, oauth_json_set_error(ctx,
libpq_gettext("field \"%s\" must be a string"), "field \"%s\" must be a string",
ctx->target_field_name); ctx->target_field_name);
return JSON_SEM_ACTION_FAILED; return JSON_SEM_ACTION_FAILED;
} }

2
src/interfaces/libpq/nls.mk
View File

@@ -22,6 +22,7 @@ GETTEXT_TRIGGERS = actx_error:2 \
libpq_append_error:2 \ libpq_append_error:2 \
libpq_gettext \ libpq_gettext \
libpq_ngettext:1,2 \ libpq_ngettext:1,2 \
oauth_json_set_error:2 \
oauth_parse_set_error:2 \ oauth_parse_set_error:2 \
pqInternalNotice:2 pqInternalNotice:2
GETTEXT_FLAGS = actx_error:2:c-format \ GETTEXT_FLAGS = actx_error:2:c-format \
@@ -30,5 +31,6 @@ GETTEXT_FLAGS = actx_error:2:c-format \
libpq_gettext:1:pass-c-format \ libpq_gettext:1:pass-c-format \
libpq_ngettext:1:pass-c-format \ libpq_ngettext:1:pass-c-format \
libpq_ngettext:2:pass-c-format \ libpq_ngettext:2:pass-c-format \
oauth_json_set_error:2:c-format \
oauth_parse_set_error:2:c-format \ oauth_parse_set_error:2:c-format \
pqInternalNotice:2:c-format pqInternalNotice:2:c-format