Skip to content

Remove PostgreSQL 12 support. #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwsteele merged 2 commits into from
May 22, 2025
Merged

Remove PostgreSQL 12 support. #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6195b34
Remove PG12 support.
dwsteele May 21, 2025
86dceb7
Merge branch 'integration' into dev-remove-pg12
dwsteele May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

# Test all supported versions
matrix:
pgver: [12, 13, 14, 15, 16, 17]
pgver: [13, 14, 15, 16, 17]

steps:
- name: Checkout Code
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ memory before their implementations can access them.

### Requirements

* PostgreSQL 9.4 or higher.
* PostgreSQL 13 or higher.

### Compile and Install

Expand Down
92 changes: 3 additions & 89 deletions src/compatibility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,102 +73,16 @@
standard_ProcessUtility(pstmt, queryString, context, params, queryEnv, dest, qc)
#endif

#define TABLEOPEN

#endif /* 13+ */

/*
* PostgreSQL version 12+
*
* - Removes OID column
*/
#if PG_VERSION_NUM >= 120000

#ifndef _PU_HOOK
#define _PU_HOOK \
static void PU_hook(PlannedStmt *pstmt, const char *queryString, \
ProcessUtilityContext context, ParamListInfo params, \
QueryEnvironment *queryEnv, \
DestReceiver *dest, char *completionTag)

#define _prev_hook \
prev_hook(pstmt, queryString, context, params, queryEnv, dest, completionTag)

#define _standard_ProcessUtility \
standard_ProcessUtility(pstmt, queryString, context, params, queryEnv, dest, completionTag)

#endif

#include "utils/varlena.h"
#define parsetree ((Node *) pstmt->utilityStmt)

#define HEAP_TUPLE_GET_OID

/*
* _heap_tuple_get_oid
*
* Return the oid of the tuple based on the provided catalogID.
*/
static inline Oid
_heap_tuple_get_oid(HeapTuple tuple, Oid catalogID)
{
switch (catalogID)
{
case ProcedureRelationId:
return ((Form_pg_proc) GETSTRUCT(tuple))->oid;
break;
case AuthIdRelationId:
return ((Form_pg_authid) GETSTRUCT(tuple))->oid;
break;
default:
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("set_user: invalid relation ID provided")));
return 0;
}
}


#include "access/table.h"
#define OBJECTADDRESS

/*
* _scan_key_init
*
* Initialize entry based on the catalogID provided.
*/
static inline void
_scan_key_init(ScanKey entry,
Oid catalogID,
StrategyNumber strategy,
RegProcedure procedure,
Datum argument)
{
switch (catalogID)
{
case ProcedureRelationId:
ScanKeyInit(entry, Anum_pg_proc_oid, strategy, procedure, argument);
break;
default:
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("set_user: invalid relation ID provided")));
}
}

// Introduces two-argument GetUserNameFromId
#define GETUSERNAMEFROMID(ouserid) GetUserNameFromId(ouserid, false)

#ifndef INITSESSIONUSER
#define INITSESSIONUSER
#define _InitializeSessionUserId(name,ouserid) InitializeSessionUserId(name,ouserid)

#endif

#endif /* 12+ */
#endif /* 13+ */

#if !defined(PG_VERSION_NUM) || PG_VERSION_NUM < 120000
#error "This extension only builds with PostgreSQL 12 or later"
#if !defined(PG_VERSION_NUM) || PG_VERSION_NUM < 130000
#error "This extension only builds with PostgreSQL 13 or later"
#endif

/* Use our version-specific static declaration here */
Expand Down
48 changes: 37 additions & 11 deletions src/set_user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
#include "catalog/indexing.h"
#include "catalog/objectaccess.h"
Expand All @@ -49,6 +50,7 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/rel.h"
#include "utils/varlena.h"

#include "set_user.h"

Expand Down Expand Up @@ -166,7 +168,7 @@ check_user_allowlist(Oid userId, const char *allowlist)
}
else
{
if (pg_strcasecmp(elem, GETUSERNAMEFROMID(userId)) == 0)
if (pg_strcasecmp(elem, GetUserNameFromId(userId, false)) == 0)
result = true;
else if(pg_strcasecmp(elem, ALLOWLIST_WILDCARD) == 0)
/* No explicit usernames intermingled with wildcard. */
Expand All @@ -182,6 +184,30 @@ check_user_allowlist(Oid userId, const char *allowlist)
return result;
}

/*
* Return the oid of the tuple based on the provided catalogID
*/
static Oid
heap_tuple_get_oid(HeapTuple tuple, Oid catalogID)
{
switch (catalogID)
{
case ProcedureRelationId:
return ((Form_pg_proc) GETSTRUCT(tuple))->oid;
break;

case AuthIdRelationId:
return ((Form_pg_authid) GETSTRUCT(tuple))->oid;
break;

default:
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("set_user: invalid relation ID provided")));
return 0;
}
}

/*
* Similar to SET ROLE but with added logging and some additional
* control over allowed actions
Expand Down Expand Up @@ -294,7 +320,7 @@ set_user(PG_FUNCTION_ARGS)
if (!HeapTupleIsValid(roleTup))
elog(ERROR, "role \"%s\" does not exist", pending_state->username);

pending_state->userid = _heap_tuple_get_oid(roleTup, AuthIdRelationId);
pending_state->userid = heap_tuple_get_oid(roleTup, AuthIdRelationId);
pending_state->is_superuser = ((Form_pg_authid) GETSTRUCT(roleTup))->rolsuper;
ReleaseSysCache(roleTup);

Expand Down Expand Up @@ -329,7 +355,7 @@ set_user(PG_FUNCTION_ARGS)
curr_state->log_prefix = pstrdup(GetConfigOption("log_line_prefix", true, false));
curr_state->reset_token = pending_state->reset_token;
curr_state->userid = GetUserId();
curr_state->username = GETUSERNAMEFROMID(curr_state->userid);
curr_state->username = GetUserNameFromId(curr_state->userid, false);
curr_state->is_superuser = superuser_arg(curr_state->userid);
}

Expand Down Expand Up @@ -391,7 +417,7 @@ set_user(PG_FUNCTION_ARGS)

/* store old state as pending */
pending_state->userid = prev_state->userid;
pending_state->username = GETUSERNAMEFROMID(prev_state->userid);
pending_state->username = GetUserNameFromId(prev_state->userid, false);
pending_state->log_statement = prev_state->log_statement;
pending_state->log_prefix = prev_state->log_prefix;
pending_state->is_superuser = superuser_arg(prev_state->userid);
Expand Down Expand Up @@ -550,7 +576,7 @@ _PU_HOOK
/* if set_user has been used to transition, enforce set_user GUCs */
if (curr_state != NULL && curr_state->userid != InvalidOid)
{
switch (nodeTag(parsetree))
switch (nodeTag((Node *) pstmt->utilityStmt))
{
case T_AlterSystemStmt:
if (Block_AS)
Expand All @@ -559,29 +585,29 @@ _PU_HOOK
errmsg("ALTER SYSTEM blocked by set_user config")));
break;
case T_CopyStmt:
if (((CopyStmt *) parsetree)->is_program && Block_CP)
if (((CopyStmt *)pstmt->utilityStmt)->is_program && Block_CP)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("COPY PROGRAM blocked by set_user config")));
break;
case T_VariableSetStmt:
if ((strcmp(((VariableSetStmt *) parsetree)->name,
if ((strcmp(((VariableSetStmt *)pstmt->utilityStmt)->name,
"log_statement") == 0) &&
Block_LS)
{
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("\"SET log_statement\" blocked by set_user config")));
}
else if ((strcmp(((VariableSetStmt *) parsetree)->name,
else if ((strcmp(((VariableSetStmt *)pstmt->utilityStmt)->name,
"role") == 0))
{
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("\"SET/RESET ROLE\" blocked by set_user"),
errhint("Use \"SELECT set_user();\" or \"SELECT reset_user();\" instead.")));
}
else if ((strcmp(((VariableSetStmt *) parsetree)->name,
else if ((strcmp(((VariableSetStmt *)pstmt->utilityStmt)->name,
"session_authorization") == 0))
{
ereport(ERROR,
Expand Down Expand Up @@ -781,7 +807,7 @@ set_user_check_proc(HeapTuple procTup, Relation rel)
Oid procoid;

/* For function metadata (Oid) */
procoid = _heap_tuple_get_oid(procTup, ProcedureRelationId);
procoid = heap_tuple_get_oid(procTup, ProcedureRelationId);

/* Figure out the underlying function */
prosrcdatum = heap_getattr(procTup, Anum_pg_proc_prosrc, RelationGetDescr(rel), &isnull);
Expand Down Expand Up @@ -847,7 +873,7 @@ set_user_cache_proc(Oid functionId)
indexOk = true;
snapshot = SnapshotSelf;
nkeys = 1;
_scan_key_init(&skey, ProcedureRelationId, BTEqualStrategyNumber, F_OIDEQ, ObjectIdGetDatum(functionId));
ScanKeyInit(&skey, Anum_pg_proc_oid, BTEqualStrategyNumber, F_OIDEQ, ObjectIdGetDatum(functionId));
}
else if (set_config_oid_cache != NIL)
{
Expand Down