Skip to content

Commit ae4f6b6

Browse files
authored
fix: pgsodium extension custom script (#454)
1 parent 2329baa commit ae4f6b6

File tree

7 files changed

+18
-11
lines changed

7 files changed

+18
-11
lines changed
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
grant execute on function pgsodium.crypto_aead_det_decrypt(bytea, bytea, uuid, bytea) to service_role;
22
grant execute on function pgsodium.crypto_aead_det_encrypt(bytea, bytea, uuid, bytea) to service_role;
33
grant execute on function pgsodium.crypto_aead_det_keygen to service_role;
4-
grant execute on function pgsodium.crypto_aead_det_noncegen to service_role;

ansible/tasks/internal/supautils.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,17 @@
4949

5050
- name: supautils - copy extension custom scripts
5151
copy:
52-
src: files/postgresql_extension_custom_scripts
52+
src: files/postgresql_extension_custom_scripts/
5353
dest: /etc/postgresql-custom/extension-custom-scripts
54-
mode: 0664
54+
become: yes
55+
56+
- name: supautils - chown extension custom scripts
57+
file:
58+
mode: 0775
5559
owner: postgres
5660
group: postgres
61+
path: /etc/postgresql-custom/extension-custom-scripts
62+
recurse: yes
5763
become: yes
5864

5965
- name: supautils - include /etc/postgresql-custom/supautils.conf in postgresql.conf

common.vars.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.1.0.17-rc1"
1+
postgres-version = "15.1.0.17-rc2"

ebssurrogate/files/unit-tests/unit-test-01.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BEGIN;
2-
SELECT plan(9);
2+
SELECT plan(8);
33

44
-- Check installed extensions
55
SELECT extensions_are(
@@ -26,7 +26,6 @@ SELECT has_schema('public');
2626
SELECT function_privs_are('pgsodium', 'crypto_aead_det_decrypt', array['bytea', 'bytea', 'uuid', 'bytea'], 'service_role', array['EXECUTE']);
2727
SELECT function_privs_are('pgsodium', 'crypto_aead_det_encrypt', array['bytea', 'bytea', 'uuid', 'bytea'], 'service_role', array['EXECUTE']);
2828
SELECT function_privs_are('pgsodium', 'crypto_aead_det_keygen', array[]::text[], 'service_role', array['EXECUTE']);
29-
SELECT function_privs_are('pgsodium', 'crypto_aead_det_noncegen', array[]::text[], 'service_role', array['EXECUTE']);
3029

3130
SELECT * from finish();
3231
ROLLBACK;

migrations/db/migrations/20221207154255_create_pgsodium_and_vault.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ grant pgsodium_keyiduser to postgres with admin option;
66
grant pgsodium_keyholder to postgres with admin option;
77
grant pgsodium_keymaker to postgres with admin option;
88

9+
grant execute on function pgsodium.crypto_aead_det_decrypt(bytea, bytea, uuid, bytea) to service_role;
10+
grant execute on function pgsodium.crypto_aead_det_encrypt(bytea, bytea, uuid, bytea) to service_role;
11+
grant execute on function pgsodium.crypto_aead_det_keygen to service_role;
12+
913
-- create extension if not exists supabase_vault;
1014

1115
-- migrate:down

migrations/tests/database/privs.sql

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ SELECT database_privs_are(
33
'postgres', 'postgres', ARRAY['CONNECT', 'TEMPORARY', 'CREATE']
44
);
55

6-
-- SELECT function_privs_are('pgsodium', 'crypto_aead_det_decrypt', array['bytea', 'bytea', 'uuid', 'bytea'], 'service_role', array['EXECUTE']);
7-
-- SELECT function_privs_are('pgsodium', 'crypto_aead_det_encrypt', array['bytea', 'bytea', 'uuid', 'bytea'], 'service_role', array['EXECUTE']);
8-
-- SELECT function_privs_are('pgsodium', 'crypto_aead_det_keygen', array[]::text[], 'service_role', array['EXECUTE']);
9-
-- SELECT function_privs_are('pgsodium', 'crypto_aead_det_noncegen', array[]::text[], 'service_role', array['EXECUTE']);
6+
SELECT function_privs_are('pgsodium', 'crypto_aead_det_decrypt', array['bytea', 'bytea', 'uuid', 'bytea'], 'service_role', array['EXECUTE']);
7+
SELECT function_privs_are('pgsodium', 'crypto_aead_det_encrypt', array['bytea', 'bytea', 'uuid', 'bytea'], 'service_role', array['EXECUTE']);
8+
SELECT function_privs_are('pgsodium', 'crypto_aead_det_keygen', array[]::text[], 'service_role', array['EXECUTE']);

migrations/tests/test.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CREATE EXTENSION IF NOT EXISTS pgtap;
22

33
BEGIN;
44

5-
SELECT plan(10);
5+
SELECT plan(13);
66

77
\ir fixtures.sql
88
\ir database/test.sql

0 commit comments

Comments
 (0)