Cleanup

Author: tobyhede

sql/010-core.sql

@@ -14,6 +14,21 @@ BEGIN
 END
 $$;
 
+
+-- Should include a kind field
+DROP FUNCTION IF EXISTS _cs_encrypted_check_k(jsonb);
+CREATE FUNCTION _cs_encrypted_check_k(val jsonb)
+  RETURNS boolean
+AS $$
+	BEGIN
+    IF (val->>'k' = ANY('{ct, sv}')) THEN
+      RETURN true;
+    END IF;
+    RAISE 'Invalid kind (%) in Encrypted column. Kind should be one of {ct, sv}', val;
+  END;
+$$ LANGUAGE plpgsql;
+
+
 --
 -- CT payload should include a c field
 --
@@ -26,12 +41,13 @@ AS $$
       IF (val ? 'c') THEN
         RETURN true;
       END IF;
-      RAISE 'Encrypted kind (k) of "ct" missing data field (c):  %', val;
+      RAISE 'Encrypted column kind (k) of "ct" missing data field (c):  %', val;
     END IF;
     RETURN true;
   END;
 $$ LANGUAGE plpgsql;
 
+
 --
 -- SV payload should include an sv field
 --
@@ -44,7 +60,7 @@ AS $$
       IF (val ? 'sv') THEN
         RETURN true;
       END IF;
-      RAISE 'Encrypted kind (k) of "sv" missing data field (sv):  %', val;
+      RAISE 'Encrypted column kind (k) of "sv" missing data field (sv):  %', val;
     END IF;
     RETURN true;
   END;
@@ -60,7 +76,7 @@ AS $$
     IF NOT val ? 'p' THEN
       RETURN true;
     END IF;
-    RAISE 'Encrypted includes plaintext (p) field: %', val;
+    RAISE 'Encrypted column includes plaintext (p) field: %', val;
   END;
 $$ LANGUAGE plpgsql;
 
@@ -73,7 +89,7 @@ AS $$
     IF val ? 'i' THEN
       RETURN true;
     END IF;
-    RAISE 'Encrypted missing ident (i) field: %', val;
+    RAISE 'Encrypted column missing ident (i) field: %', val;
   END;
 $$ LANGUAGE plpgsql;
 
@@ -86,7 +102,7 @@ AS $$
     IF (val->'i' ?& array['t', 'c']) THEN
       RETURN true;
     END IF;
-    RAISE 'Encrypted ident (i) missing table (t) or column (c) fields: %', val;
+    RAISE 'Encrypted column ident (i) missing table (t) or column (c) fields: %', val;
   END;
 $$ LANGUAGE plpgsql;
 
@@ -99,7 +115,7 @@ AS $$
     IF (val ? 'v') THEN
       RETURN true;
     END IF;
-    RAISE 'Encrypted missing version (v) field: %', val;
+    RAISE 'Encrypted column missing version (v) field: %', val;
   END;
 $$ LANGUAGE plpgsql;
 
@@ -113,6 +129,7 @@ BEGIN ATOMIC
     RETURN (
       _cs_encrypted_check_v(val) AND
       _cs_encrypted_check_i(val) AND
+      _cs_encrypted_check_k(val) AND
       _cs_encrypted_check_k_ct(val) AND
       _cs_encrypted_check_k_sv(val) AND
       _cs_encrypted_check_p(val)

sql/020-config-schema.sql

@@ -77,7 +77,7 @@ CREATE FUNCTION _cs_config_check_tables(val jsonb)
   RETURNS boolean
 AS $$
 	BEGIN
-    IF (val ? 'tables') AND (val->'tables' <> '{"A":"a"}'::jsonb) THEN
+    IF (val ? 'tables') AND (val->'tables' <> '{}'::jsonb) THEN
       RETURN true;
     END IF;
     RAISE 'Configuration missing tables (tables) field: %', val;

tests/core.sql

@@ -84,7 +84,7 @@ INSERT INTO users (name_encrypted) VALUES (
   }'::jsonb
 );
 
--- no source detauils
+-- no ident details
 INSERT INTO users (name_encrypted) VALUES (
   '{
     "v": 1,
@@ -93,6 +93,35 @@ INSERT INTO users (name_encrypted) VALUES (
   }'::jsonb
 );
 
+-- npo kind
+INSERT INTO users (name_encrypted) VALUES (
+  '{
+    "v": 1,
+    "c": "ciphertext",
+    "i": {
+      "t": "users",
+      "c": "name"
+    }
+  }'::jsonb
+);
+
+
+
+-- bad kind
+INSERT INTO users (name_encrypted) VALUES (
+  '{
+    "v": 1,
+    "k": "vtha",
+    "c": "ciphertext",
+    "i": {
+      "t": "users",
+      "c": "name"
+    }
+  }'::jsonb
+);
+
+
+
 -- pt
 INSERT INTO users (name_encrypted) VALUES (
   '{