refactor trigger generation so that there is one trigger per encrypte…

…d column. (#54)

META.json

@@ -2,7 +2,7 @@
     "name": "pgsodium",
     "abstract": "Postgres extension for libsodium functions",
     "description": "pgsodium is a PostgreSQL extension that exposes modern libsodium based cryptographic functions to SQL.",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "maintainer": [
         "Michel Pelletier <pelletier.michel@gmail.com>"
     ],
@@ -13,7 +13,7 @@
             "abstract": "Postgres extension for libsodium functions",
             "file": "src/pgsodium.h",
             "docfile": "README.md",
-            "version": "3.1.0"
+            "version": "3.1.1"
         }
     },
     "prereqs": {

pgsodium.control

@@ -1,5 +1,5 @@
 # pgsodium extension
 comment = 'Postgres extension for libsodium functions'
-default_version = '3.1.0'
+default_version = '3.1.1'
 relocatable = false
 schema = pgsodium

sql/pgsodium--3.1.0--3.1.1.sql

@@ -0,0 +1,179 @@
+
+CREATE OR REPLACE FUNCTION pgsodium.encrypted_column(relid OID, m record)
+RETURNS TEXT AS
+$$
+DECLARE
+    expression TEXT;
+    comma TEXT;
+BEGIN
+  expression := '';
+  comma := E'        ';
+  expression := expression || comma;
+  IF m.format_type = 'text' THEN
+	  expression := expression || format(
+		$f$%s = CASE WHEN %s IS NULL THEN NULL ELSE
+			CASE WHEN %s IS NULL THEN NULL ELSE pg_catalog.encode(
+			  pgsodium.crypto_aead_det_encrypt(
+				pg_catalog.convert_to(%s, 'utf8'),
+				pg_catalog.convert_to((%s)::text, 'utf8'),
+				%s::uuid,
+				%s
+			  ),
+				'base64') END END$f$,
+			'new.' || quote_ident(m.attname),
+			'new.' || quote_ident(m.attname),
+			COALESCE('new.' || quote_ident(m.key_id_column), quote_literal(m.key_id)),
+			'new.' || quote_ident(m.attname),
+			COALESCE(pgsodium.quote_assoc(m.associated_columns, true), quote_literal('')),
+			COALESCE('new.' || quote_ident(m.key_id_column), quote_literal(m.key_id)),
+			COALESCE('new.' || quote_ident(m.nonce_column), 'NULL')
+	  );
+  ELSIF m.format_type = 'bytea' THEN
+	  expression := expression || format(
+		$f$%s = CASE WHEN %s IS NULL THEN NULL ELSE
+			CASE WHEN %s IS NULL THEN NULL ELSE
+					pgsodium.crypto_aead_det_encrypt(%s::bytea, pg_catalog.convert_to((%s)::text, 'utf8'),
+			%s::uuid,
+			%s
+		  ) END END$f$,
+			'new.' || quote_ident(m.attname),
+			'new.' || quote_ident(m.attname),
+			COALESCE('new.' || quote_ident(m.key_id_column), quote_literal(m.key_id)),
+			'new.' || quote_ident(m.attname),
+			COALESCE(pgsodium.quote_assoc(m.associated_columns, true), quote_literal('')),
+			COALESCE('new.' || quote_ident(m.key_id_column), quote_literal(m.key_id)),
+			COALESCE('new.' || quote_ident(m.nonce_column), 'NULL')
+	  );
+  END IF;
+  comma := E';\n        ';
+  RETURN expression;
+END
+$$
+  LANGUAGE plpgsql
+  VOLATILE
+  SET search_path=''
+  ;
+
+
+CREATE OR REPLACE FUNCTION pgsodium.create_mask_view(relid oid, subid integer, debug boolean = false)
+    RETURNS void AS
+  $$
+DECLARE
+  m record;
+  body text;
+  source_name text;
+  view_owner regrole = session_user;
+  rule pgsodium.masking_rule;
+BEGIN
+  SELECT * INTO STRICT rule FROM pgsodium.masking_rule WHERE attrelid = relid and attnum = subid ;
+
+  source_name := relid::regclass;
+
+  body = format(
+    $c$
+    DROP VIEW IF EXISTS %s;
+    CREATE VIEW %s AS SELECT %s
+    FROM %s;
+    ALTER VIEW %s OWNER TO %s;
+    $c$,
+    rule.view_name,
+    rule.view_name,
+    pgsodium.decrypted_columns(relid),
+    source_name,
+    rule.view_name,
+    view_owner
+  );
+  IF debug THEN
+    RAISE NOTICE '%', body;
+  END IF;
+  EXECUTE body;
+
+  FOR m IN SELECT * FROM pgsodium.mask_columns where attrelid = relid LOOP
+	IF m.key_id IS NULL AND m.key_id_column is NULL THEN
+	  CONTINUE;
+	ELSE
+	  body = format(
+		$c$
+		DROP FUNCTION IF EXISTS %s."%s_encrypt_secret_%s"() CASCADE;
+
+		CREATE OR REPLACE FUNCTION %s."%s_encrypt_secret_%s"()
+		  RETURNS TRIGGER
+		  LANGUAGE plpgsql
+		  AS $t$
+		BEGIN
+		%s;
+		RETURN new;
+		END;
+		$t$;
+
+		ALTER FUNCTION  %s."%s_encrypt_secret_%s"() OWNER TO %s;
+
+		DROP TRIGGER IF EXISTS "%s_encrypt_secret_trigger_%s" ON %s;
+
+		CREATE TRIGGER "%s_encrypt_secret_trigger_%s"
+		  BEFORE INSERT OR UPDATE OF "%s" ON %s
+		  FOR EACH ROW
+		  EXECUTE FUNCTION %s."%s_encrypt_secret_%s" ();
+		  $c$,
+		rule.relnamespace,
+		rule.relname,
+		m.attname,
+		rule.relnamespace,
+		rule.relname,
+		m.attname,
+		pgsodium.encrypted_column(relid, m),
+		rule.relnamespace,
+		rule.relname,
+		m.attname,
+		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
+		RAISE NOTICE '%', body;
+	  END IF;
+	  EXECUTE body;
+	END IF;
+  END LOOP;
+
+  PERFORM pgsodium.mask_role(oid::regrole, source_name, rule.view_name)
+  FROM pg_roles WHERE pgsodium.has_mask(oid::regrole, source_name);
+
+  RETURN;
+END
+  $$
+  LANGUAGE plpgsql
+  VOLATILE
+  SET search_path='pg_catalog'
+;
+
+CREATE OR REPLACE FUNCTION pgsodium.update_masks(debug boolean = false)
+RETURNS void AS
+  $$
+BEGIN
+  PERFORM pgsodium.update_mask(objoid, debug)
+    FROM pg_catalog.pg_seclabel sl
+    JOIN pg_catalog.pg_class cl ON (cl.oid = sl.objoid)
+    WHERE label ilike 'ENCRYPT%'
+       AND cl.relowner = session_user::regrole::oid
+       AND provider = 'pgsodium'
+	   AND objoid::regclass != 'pgsodium.key'::regclass
+	;
+  RETURN;
+END
+$$
+  LANGUAGE plpgsql
+  SET search_path=''
+;
+
+DROP TRIGGER key_encrypt_secret_trigger ON pgsodium.key;
+DROP FUNCTION pgsodium.key_encrypt_secret();
+SELECT pgsodium.update_mask('pgsodium.key'::regclass::oid);

test/tce.sql

@@ -125,7 +125,7 @@ COMMIT;
 \c - bobo
 
 BEGIN;
-SELECT plan(15);
+SELECT plan(17);
 
 SELECT pgsodium.crypto_aead_det_noncegen() nonce \gset
 SELECT pgsodium.crypto_aead_det_noncegen() nonce2 \gset
@@ -150,8 +150,8 @@ SELECT results_eq($$SELECT decrypted_secret = 'sp00n' from private.decrypted_foo
 
 SELECT lives_ok(
     $test$
-    INSERT INTO private.other_bar (secret2, associated2)
-    VALUES ('s3kr3t', 'bob was here');
+    INSERT INTO private.other_bar (secret, secret2, associated2)
+    VALUES ('s3kr3t', 's3kr3t2', 'bob was here 2');
     $test$,
     'can insert into other bar');
 
@@ -163,8 +163,19 @@ SELECT lives_ok(
     'can insert into quoted private bar');
 
 SELECT results_eq(
-    $$SELECT decrypted_secret2 = 's3kr3t' FROM private.other_bar$$,
-    $$VALUES (true)$$,
+    $$SELECT decrypted_secret = 's3kr3t', decrypted_secret2 = 's3kr3t2' FROM private.other_bar$$,
+    $$VALUES (true, true)$$,
+    'can select from masking view');
+
+SELECT lives_ok(
+    $test$
+    UPDATE private.other_bar SET secret = 'fooz';
+    $test$,
+    'can update one secret without effecting the other');
+
+SELECT results_eq(
+    $$SELECT decrypted_secret = 'fooz', decrypted_secret2 = 's3kr3t2' FROM private.other_bar$$,
+    $$VALUES (true, true)$$,
     'can select from masking view');
 
 SELECT results_eq(
@@ -181,7 +192,7 @@ SELECT lives_ok(
     $test$, :'another_secret_key_id'),
     'can update key id with rotation into decrypted view');
 
-SELECT results_eq($$SELECT decrypted_secret2 = 's3kr3t' from private.other_bar$$,
+SELECT results_eq($$SELECT decrypted_secret2 = 's3kr3t2' from private.other_bar$$,
     $$VALUES (true)$$,
     'can see updated key id in decrypted view');