feat: supautils.extension_custom_scripts_path

Also deprecate `supautils.privileged_extensions_custom_scripts_path`

Author: soedirgo

README.md

@@ -169,18 +169,20 @@ This also works for updating and dropping privileged extensions.
 
 If you don't want to enable this functionality, simply leave `supautils.privileged_extensions` empty. Extensions **not** in `supautils.privileged_extensions` would behave normally, i.e. created using the current role.
 
-supautils also lets you set custom scripts per privileged extension that gets run at certain events. Currently supported scripts are `before-create` and `after-create`.
+### Extension Custom Scripts
+
+supautils also lets you set custom scripts per extension that gets run at certain events. Currently supported scripts are `before-create` and `after-create`.
 
 To make this work, configure the setting below:
 
 ```
-supautils.privileged_extensions_custom_scripts_path = '/opt/postgresql/privileged_extensions_custom_scripts'
+supautils.extension_custom_scripts_path = '/some/path/extension-custom-scripts'
 ```
 
 Then put the scripts inside the path, e.g.:
 
 ```sql
--- /opt/postgresql/privileged_extensions_custom_scripts/hstore/after-create.sql
+-- /some/path/extension-custom-scripts/hstore/after-create.sql
 grant all on type hstore to non_superuser_role;
 ```
 

src/supautils.c

@@ -39,7 +39,7 @@ static char *placeholders_disallowed_values            = NULL;
 static char *empty_placeholder                         = NULL;
 static char *privileged_extensions                     = NULL;
 static char *supautils_superuser                       = NULL;
-static char *privileged_extensions_custom_scripts_path = NULL;
+static char *extension_custom_scripts_path             = NULL;
 static char *privileged_role                           = NULL; // the privileged_role is a proxy role for the `supautils.superuser` role
 static char *privileged_role_allowed_configs           = NULL;
 
@@ -452,9 +452,9 @@ static void supautils_hook(PROCESS_UTILITY_PARAMS) {
 
       switch_to_superuser(supautils_superuser, &already_switched_to_superuser);
 
-      run_global_before_create_script(stmt->extname, stmt->options, privileged_extensions_custom_scripts_path);
+      run_global_before_create_script(stmt->extname, stmt->options, extension_custom_scripts_path);
 
-      run_ext_before_create_script(stmt->extname, stmt->options, privileged_extensions_custom_scripts_path);
+      run_ext_before_create_script(stmt->extname, stmt->options, extension_custom_scripts_path);
 
       override_create_ext_statement(stmt, total_epos, epos);
 
@@ -471,7 +471,7 @@ static void supautils_hook(PROCESS_UTILITY_PARAMS) {
           run_process_utility_hook(prev_hook);
       }
 
-      run_ext_after_create_script(stmt->extname, stmt->options, privileged_extensions_custom_scripts_path);
+      run_ext_after_create_script(stmt->extname, stmt->options, extension_custom_scripts_path);
 
       if (!already_switched_to_superuser) {
           switch_to_original_role();
@@ -1267,10 +1267,20 @@ void _PG_init(void) {
                              NULL,
                              NULL);
 
+  DefineCustomStringVariable("supautils.extension_custom_scripts_path",
+                             "Path to load extension custom scripts from",
+                             NULL,
+                             &extension_custom_scripts_path,
+                             NULL,
+                             PGC_SIGHUP, 0,
+                             NULL,
+                             NULL,
+                             NULL);
+
   DefineCustomStringVariable("supautils.privileged_extensions_custom_scripts_path",
-                             "Path to load privileged extensions' custom scripts from",
+                             "Path to load privileged extensions' custom scripts from. Deprecated: use supautils.extension_custom_scripts_path instead.",
                              NULL,
-                             &privileged_extensions_custom_scripts_path,
+                             &extension_custom_scripts_path,
                              NULL,
                              PGC_SIGHUP, 0,
                              NULL,

test/init.conf.in

@@ -15,4 +15,4 @@ supautils.placeholders_disallowed_values='"content-type","x-special-header",spec
 supautils.extensions_parameter_overrides='{"sslinfo":{"schema":"pg_catalog"}}'
 supautils.drop_trigger_grants='{"privileged_role":["allow_drop_triggers.my_table"]}'
 supautils.policy_grants='{"privileged_role":["allow_policies.my_table","allow_policies.nonexistent_table"]}'
-supautils.privileged_extensions_custom_scripts_path='@TMPDIR@/privileged_extensions_custom_scripts'
+supautils.extension_custom_scripts_path='@TMPDIR@/extension-custom-scripts'

test/init.sh

@@ -1,5 +1,5 @@
 # print notice when creating an extension
-mkdir -p "$TMPDIR/privileged_extensions_custom_scripts"
+mkdir -p "$TMPDIR/extension-custom-scripts"
 echo "do \$\$
       begin
         if not (@extname@ = ANY(ARRAY['dict_xsyn', 'insert_username'])) then
@@ -8,12 +8,12 @@ echo "do \$\$
         if exists (select from pg_available_extensions where name = @extname@) then
           raise notice 'extname: %, extschema: %, extversion: %, extcascade: %', @extname@, @extschema@, @extversion@, @extcascade@;
         end if;
-      end \$\$;" > "$TMPDIR/privileged_extensions_custom_scripts/before-create.sql"
+      end \$\$;" > "$TMPDIR/extension-custom-scripts/before-create.sql"
 
-mkdir -p "$TMPDIR/privileged_extensions_custom_scripts/autoinc"
-echo 'create extension citext;' > "$TMPDIR/privileged_extensions_custom_scripts/autoinc/after-create.sql"
+mkdir -p "$TMPDIR/extension-custom-scripts/autoinc"
+echo 'create extension citext;' > "$TMPDIR/extension-custom-scripts/autoinc/after-create.sql"
 
 # assert both before-create and after-create scripts are run
-mkdir -p "$TMPDIR/privileged_extensions_custom_scripts/hstore"
-echo 'create table t1();' > "$TMPDIR/privileged_extensions_custom_scripts/hstore/before-create.sql"
-echo 'drop table t1; create table t2 as values (1);' > "$TMPDIR/privileged_extensions_custom_scripts/hstore/after-create.sql"
+mkdir -p "$TMPDIR/extension-custom-scripts/hstore"
+echo 'create table t1();' > "$TMPDIR/extension-custom-scripts/hstore/before-create.sql"
+echo 'drop table t1; create table t2 as values (1);' > "$TMPDIR/extension-custom-scripts/hstore/after-create.sql"