Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
128 changes: 128 additions & 0 deletions nix/ext/patches/pgsodium-create-mask-view-quoting.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
diff --git a/sql/pgsodium--3.1.4--3.1.5.sql b/sql/pgsodium--3.1.4--3.1.5.sql
index c64d7ae..af43b60 100644
--- a/sql/pgsodium--3.1.4--3.1.5.sql
+++ b/sql/pgsodium--3.1.4--3.1.5.sql
@@ -63,47 +63,35 @@ BEGIN
ELSE
body = format(
$c$
- DROP FUNCTION IF EXISTS %s."%s_encrypt_secret_%s"() CASCADE;
+ DROP FUNCTION IF EXISTS %1$s.%2$I() CASCADE;

- CREATE OR REPLACE FUNCTION %s."%s_encrypt_secret_%s"()
+ CREATE OR REPLACE FUNCTION %1$s.%2$I()
RETURNS TRIGGER
LANGUAGE plpgsql
- AS $t$
- BEGIN
- %s;
- RETURN new;
- END;
- $t$;
+ AS %4$L;

- ALTER FUNCTION %s."%s_encrypt_secret_%s"() OWNER TO %s;
+ ALTER FUNCTION %1$s.%2$I() OWNER TO %5$s;

- DROP TRIGGER IF EXISTS "%s_encrypt_secret_trigger_%s" ON %s;
+ DROP TRIGGER IF EXISTS %3$I ON %6$s;

- CREATE TRIGGER "%s_encrypt_secret_trigger_%s"
- BEFORE INSERT OR UPDATE OF "%s" ON %s
+ CREATE TRIGGER %3$I
+ BEFORE INSERT OR UPDATE OF %7$I ON %6$s
FOR EACH ROW
- EXECUTE FUNCTION %s."%s_encrypt_secret_%s" ();
+ EXECUTE FUNCTION %1$s.%2$I ();
$c$,
rule.relnamespace,
- rule.relname,
- m.attname,
- rule.relnamespace,
- rule.relname,
- m.attname,
- pgsodium.encrypted_column(relid, m),
- rule.relnamespace,
- rule.relname,
- m.attname,
+ rule.relname || '_encrypt_secret_' || m.attname,
+ rule.relname || '_encrypt_secret_trigger_' || m.attname,
+ format(
+ $t$
+ BEGIN
+ %s;
+ RETURN new;
+ END;
+ $t$,
+ pgsodium.encrypted_column(relid, m)),
view_owner,
- rule.relname,
- m.attname,
- source_name,
- rule.relname,
- m.attname,
- m.attname,
source_name,
- rule.relnamespace,
- rule.relname,
m.attname
);
if debug THEN
diff --git a/sql/pgsodium--3.1.6--3.1.7.sql b/sql/pgsodium--3.1.6--3.1.7.sql
index 6dd97c9..64d5c7c 100644
--- a/sql/pgsodium--3.1.6--3.1.7.sql
+++ b/sql/pgsodium--3.1.6--3.1.7.sql
@@ -133,33 +133,36 @@ BEGIN
ELSE
body = format(
$c$
- DROP FUNCTION IF EXISTS %1$s."%2$s_encrypt_secret_%3$s"() CASCADE;
+ DROP FUNCTION IF EXISTS %1$s.%2$I() CASCADE;

- CREATE OR REPLACE FUNCTION %1$s."%2$s_encrypt_secret_%3$s"()
+ CREATE OR REPLACE FUNCTION %1$s.%2$I()
RETURNS TRIGGER
LANGUAGE plpgsql
- AS $t$
- BEGIN
- %4$s;
- RETURN new;
- END;
- $t$;
+ AS %4$L;

- ALTER FUNCTION %1$s."%2$s_encrypt_secret_%3$s"() OWNER TO %5$s;
+ ALTER FUNCTION %1$s.%2$I() OWNER TO %5$s;

- DROP TRIGGER IF EXISTS "%2$s_encrypt_secret_trigger_%3$s" ON %6$s;
+ DROP TRIGGER IF EXISTS %3$I ON %6$s;

- CREATE TRIGGER "%2$s_encrypt_secret_trigger_%3$s"
- BEFORE INSERT OR UPDATE OF "%3$s" ON %6$s
+ CREATE TRIGGER %3$I
+ BEFORE INSERT OR UPDATE OF %7$I ON %6$s
FOR EACH ROW
- EXECUTE FUNCTION %1$s."%2$s_encrypt_secret_%3$s" ();
+ EXECUTE FUNCTION %1$s.%2$I ();
$c$,
rule.relnamespace,
- rule.relname,
- m.attname,
- pgsodium.encrypted_column(relid, m),
+ rule.relname || '_encrypt_secret_' || m.attname,
+ rule.relname || '_encrypt_secret_trigger_' || m.attname,
+ format(
+ $t$
+ BEGIN
+ %s;
+ RETURN new;
+ END;
+ $t$,
+ pgsodium.encrypted_column(relid, m)),
view_owner,
- source_name
+ source_name,
+ m.attname
);
if debug THEN
RAISE NOTICE '%', body;
4 changes: 4 additions & 0 deletions nix/ext/pgsodium.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ let
inherit hash;
};

patches = lib.optionals (version == latestVersion) [
./patches/pgsodium-create-mask-view-quoting.patch
];
Comment thread
mmlb marked this conversation as resolved.
Resolved

installPhase = ''
runHook preInstall

Expand Down
33 changes: 33 additions & 0 deletions nix/tests/expected/pgsodium.out
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,36 @@ from
valid
(1 row)

set client_min_messages = warning;
create table public.pgsodium_mask_quoting (
secret text,
"quo""te" text,
"dol$t$lar" text
);
security label for pgsodium on column public.pgsodium_mask_quoting.secret
is 'ENCRYPT WITH KEY ID 00000000-0000-0000-0000-000000000000';
security label for pgsodium on column public.pgsodium_mask_quoting."quo""te"
is 'ENCRYPT WITH KEY ID 00000000-0000-0000-0000-000000000000';
security label for pgsodium on column public.pgsodium_mask_quoting."dol$t$lar"
is 'ENCRYPT WITH KEY ID 00000000-0000-0000-0000-000000000000';
select
tgname,
tgfoid::regproc
from
pg_trigger
where
tgrelid = 'public.pgsodium_mask_quoting'::regclass
order by
tgname;
tgname | tgfoid
--------------------------------------------------------+--------------------------------------------------
pgsodium_mask_quoting_encrypt_secret_trigger_dol$t$lar | "pgsodium_mask_quoting_encrypt_secret_dol$t$lar"
pgsodium_mask_quoting_encrypt_secret_trigger_quo"te | "pgsodium_mask_quoting_encrypt_secret_quo""te"
pgsodium_mask_quoting_encrypt_secret_trigger_secret | pgsodium_mask_quoting_encrypt_secret_secret
(3 rows)

drop table public.pgsodium_mask_quoting cascade;
drop function public.pgsodium_mask_quoting_encrypt_secret_secret();
drop function public."pgsodium_mask_quoting_encrypt_secret_quo""te"();
drop function public."pgsodium_mask_quoting_encrypt_secret_dol$t$lar"();
reset client_min_messages;
37 changes: 37 additions & 0 deletions nix/tests/sql/pgsodium.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,40 @@ select
status
from
pgsodium.create_key();

set client_min_messages = warning;

create table public.pgsodium_mask_quoting (
secret text,
"quo""te" text,
"dol$t$lar" text
);

security label for pgsodium on column public.pgsodium_mask_quoting.secret
is 'ENCRYPT WITH KEY ID 00000000-0000-0000-0000-000000000000';

security label for pgsodium on column public.pgsodium_mask_quoting."quo""te"
is 'ENCRYPT WITH KEY ID 00000000-0000-0000-0000-000000000000';

security label for pgsodium on column public.pgsodium_mask_quoting."dol$t$lar"
is 'ENCRYPT WITH KEY ID 00000000-0000-0000-0000-000000000000';

select
tgname,
tgfoid::regproc
from
pg_trigger
where
tgrelid = 'public.pgsodium_mask_quoting'::regclass
order by
tgname;

drop table public.pgsodium_mask_quoting cascade;

drop function public.pgsodium_mask_quoting_encrypt_secret_secret();

drop function public."pgsodium_mask_quoting_encrypt_secret_quo""te"();

drop function public."pgsodium_mask_quoting_encrypt_secret_dol$t$lar"();

reset client_min_messages;
Loading