@coffre/db 0.8.2 → 0.10.0

package/dist/migrations/sqlite/meta/_journal.json

@@ -71,6 +71,41 @@
       "when": 1792281880190,
       "tag": "0009_handles",
       "breakpoints": true
+    },
+    {
+      "idx": 10,
+      "version": "6",
+      "when": 1792315000277,
+      "tag": "0010_handle_places",
+      "breakpoints": true
+    },
+    {
+      "idx": 11,
+      "version": "6",
+      "when": 1792317461299,
+      "tag": "0011_plain_values",
+      "breakpoints": true
+    },
+    {
+      "idx": 12,
+      "version": "6",
+      "when": 1792340920098,
+      "tag": "0012_sensitive_values",
+      "breakpoints": true
+    },
+    {
+      "idx": 13,
+      "version": "6",
+      "when": 1792343374795,
+      "tag": "0013_contributor_role",
+      "breakpoints": true
+    },
+    {
+      "idx": 14,
+      "version": "6",
+      "when": 1792345777255,
+      "tag": "0014_custom_roles",
+      "breakpoints": true
     }
   ]
 }

package/dist/portable.d.ts

@@ -1,5 +1,5 @@
-import { m as schema_d_exports } from "./schema-BZRkBJQZ.js";
-import { t as Database } from "./database-BEnexh-3.js";
+import { m as schema_d_exports } from "./schema-NBVA9q-s.js";
+import { t as Database } from "./database-BFnO2b2P.js";
 import { t as schema_sqlite_d_exports } from "./schema-sqlite.js";
 import { LibSQLDatabase } from "drizzle-orm/libsql";
 //#region src/portable.d.ts

package/dist/{schema-BZRkBJQZ.d.ts → schema-NBVA9q-s.d.ts}

@@ -714,6 +714,40 @@ declare const secretVersions: import("drizzle-orm/pg-core").PgTableWithColumns<{
       identity: undefined;
       generated: undefined;
     }, {}, {}>;
+    plaintext: import("drizzle-orm/pg-core").PgColumn<{
+      name: "plaintext";
+      tableName: "secret_versions";
+      dataType: "string";
+      columnType: "PgText";
+      data: string;
+      driverParam: string;
+      notNull: false;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}, {}>;
+    sensitive: import("drizzle-orm/pg-core").PgColumn<{
+      name: "sensitive";
+      tableName: "secret_versions";
+      dataType: "boolean";
+      columnType: "PgBoolean";
+      data: boolean;
+      driverParam: boolean;
+      notNull: true;
+      hasDefault: true;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: undefined;
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}, {}>;
   };
   dialect: "pg";
 }>;
@@ -3298,6 +3332,23 @@ declare const credentials: import("drizzle-orm/pg-core").PgTableWithColumns<{
       identity: undefined;
       generated: undefined;
     }, {}, {}>;
+    places: import("drizzle-orm/pg-core").PgColumn<{
+      name: "places";
+      tableName: "credentials";
+      dataType: "string";
+      columnType: "PgText";
+      data: string;
+      driverParam: string;
+      notNull: false;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}, {}>;
     label: import("drizzle-orm/pg-core").PgColumn<{
       name: "label";
       tableName: "credentials";

package/dist/schema-sqlite.d.ts

@@ -756,6 +756,42 @@ export declare const secretVersions: import("drizzle-orm/sqlite-core").SQLiteTab
     }, {}, {
       length: number | undefined;
     }>;
+    plaintext: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: "plaintext";
+      tableName: "secret_versions";
+      dataType: "string";
+      columnType: "SQLiteText";
+      data: string;
+      driverParam: string;
+      notNull: false;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}, {
+      length: undefined;
+    }>;
+    sensitive: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: string;
+      tableName: "secret_versions";
+      dataType: "boolean";
+      columnType: "SQLiteBoolean";
+      data: boolean;
+      driverParam: number;
+      notNull: true;
+      hasDefault: true;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: undefined;
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}, {}>;
   };
   dialect: "sqlite";
 }>;
@@ -3427,6 +3463,25 @@ export declare const credentials: import("drizzle-orm/sqlite-core").SQLiteTableW
     }, {}, {
       length: undefined;
     }>;
+    places: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: "places";
+      tableName: "credentials";
+      dataType: "string";
+      columnType: "SQLiteText";
+      data: string;
+      driverParam: string;
+      notNull: false;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}, {
+      length: undefined;
+    }>;
     label: import("drizzle-orm/sqlite-core").SQLiteColumn<{
       name: "label";
       tableName: "credentials";

package/dist/schema-sqlite.js

@@ -1,7 +1,6 @@
 import { n as relationsOf, t as ACTIVE_SUBJECT } from "./relations-BfR3JjT1.js";
 import { asPostgres } from "./portable.js";
 import { sql } from "drizzle-orm";
-import { ROLE_NAMES, assignableToEnvironment } from "@coffre/core/access";
 import { blob, check, customType, foreignKey, index, integer, primaryKey, sqliteTable, text, unique, uniqueIndex } from "drizzle-orm/sqlite-core";
 //#region src/schema.sqlite.ts
 /**
@@ -124,7 +123,9 @@ const secretVersions = sqliteTable("secret_versions", {
 	createdBy: text("created_by").notNull(),
 	recipe: text(),
 	pairId: text("pair_id"),
-	pairHalf: text("pair_half")
+	pairHalf: text("pair_half"),
+	plaintext: text(),
+	sensitive: flag("sensitive").notNull().default(false)
 }, (table) => [
 	unique("secret_versions_secret_id_version_key").on(table.secretId, table.version),
 	check("secret_versions_version_check", sql`${table.version} > 0`),
@@ -156,8 +157,6 @@ const dismissedKeys = sqliteTable("dismissed_keys", {
 		foreignColumns: [environments.id]
 	}).onDelete("restrict")
 ]);
-const ROLES = sql.raw(ROLE_NAMES.map((role) => `'${role}'`).join(", "));
-const ENVIRONMENT_ROLES = sql.raw(ROLE_NAMES.filter(assignableToEnvironment).map((role) => `'${role}'`).join(", "));
 const vaultMembers = sqliteTable("vault_members", {
 	principal: text().primaryKey(),
 	status: text().notNull(),
@@ -194,8 +193,7 @@ const vaultGrants = sqliteTable("vault_grants", {
 }, (table) => [
 	check("vault_grants_one_place", sql`((${table.projectId} IS NULL) <> (${table.environmentId} IS NULL) AND ${table.environmentSlug} IS NULL) OR (${table.projectId} IS NULL AND ${table.environmentId} IS NULL)`),
 	check("vault_grants_environment_slug_check", sql`${table.environmentSlug} IS NULL OR (${isSlug(table.environmentSlug, 63)})`),
-	check("vault_grants_role_check", sql`${table.role} IN (${ROLES})`),
-	check("vault_grants_environment_role_check", sql`(${table.environmentId} IS NULL AND ${table.environmentSlug} IS NULL) OR ${table.role} IN (${ENVIRONMENT_ROLES})`),
+	check("vault_grants_role_check", sql`length(${table.role}) BETWEEN 2 AND 32 AND ${table.role} GLOB '[a-z]*' AND ${table.role} NOT GLOB '*[^a-z0-9-]*'`),
 	unique("vault_grants_on_project").on(table.principal, table.projectId),
 	unique("vault_grants_on_environment").on(table.principal, table.environmentId),
 	unique("vault_grants_on_environment_slug").on(table.principal, table.environmentSlug),
@@ -487,6 +485,7 @@ const credentials = sqliteTable("credentials", {
 	principal: text().notNull(),
 	identityId: text("identity_id"),
 	scope: text(),
+	places: text(),
 	label: text(),
 	createdAt: createdAt(),
 	createdBy: text("created_by").notNull(),

package/dist/schema-version.d.ts

@@ -1,4 +1,4 @@
-import { i as Queryable } from "./database-BEnexh-3.js";
+import { i as Queryable } from "./database-BFnO2b2P.js";
 import { Engine } from "./dialect.js";
 //#region src/schema-version.d.ts
 /**

package/dist/schema-version.js

@@ -78,6 +78,41 @@ const KNOWN_MIGRATIONS = {
 			"when": 1792281879553,
 			"tag": "0009_handles",
 			"breakpoints": true
+		},
+		{
+			"idx": 10,
+			"version": "7",
+			"when": 1792314999425,
+			"tag": "0010_handle_places",
+			"breakpoints": true
+		},
+		{
+			"idx": 11,
+			"version": "7",
+			"when": 1792317460399,
+			"tag": "0011_plain_values",
+			"breakpoints": true
+		},
+		{
+			"idx": 12,
+			"version": "7",
+			"when": 1792340919452,
+			"tag": "0012_sensitive_values",
+			"breakpoints": true
+		},
+		{
+			"idx": 13,
+			"version": "7",
+			"when": 1792343374226,
+			"tag": "0013_contributor_role",
+			"breakpoints": true
+		},
+		{
+			"idx": 14,
+			"version": "7",
+			"when": 1792345776262,
+			"tag": "0014_custom_roles",
+			"breakpoints": true
 		}
 	].map((entry) => entry.tag),
 	sqlite: [
@@ -150,6 +185,41 @@ const KNOWN_MIGRATIONS = {
 			"when": 1792281880190,
 			"tag": "0009_handles",
 			"breakpoints": true
+		},
+		{
+			"idx": 10,
+			"version": "6",
+			"when": 1792315000277,
+			"tag": "0010_handle_places",
+			"breakpoints": true
+		},
+		{
+			"idx": 11,
+			"version": "6",
+			"when": 1792317461299,
+			"tag": "0011_plain_values",
+			"breakpoints": true
+		},
+		{
+			"idx": 12,
+			"version": "6",
+			"when": 1792340920098,
+			"tag": "0012_sensitive_values",
+			"breakpoints": true
+		},
+		{
+			"idx": 13,
+			"version": "6",
+			"when": 1792343374795,
+			"tag": "0013_contributor_role",
+			"breakpoints": true
+		},
+		{
+			"idx": 14,
+			"version": "6",
+			"when": 1792345777255,
+			"tag": "0014_custom_roles",
+			"breakpoints": true
 		}
 	].map((entry) => entry.tag)
 };

package/dist/schema.d.ts

@@ -1,2 +1,2 @@
-import { _ as secrets, a as deviceAuthorizations, b as vaultGrants, c as environmentsRelations, d as mcpConnections, f as oauthClients, g as secretVersions, h as secretReferences, i as credentials, l as identities, n as auditLog, o as dismissedKeys, p as projects, r as consumedTokens, s as environments, t as auditChainHead, u as mcpApprovals, v as secretsRelations, x as vaultMembers, y as serviceBindings } from "./schema-BZRkBJQZ.js";
+import { _ as secrets, a as deviceAuthorizations, b as vaultGrants, c as environmentsRelations, d as mcpConnections, f as oauthClients, g as secretVersions, h as secretReferences, i as credentials, l as identities, n as auditLog, o as dismissedKeys, p as projects, r as consumedTokens, s as environments, t as auditChainHead, u as mcpApprovals, v as secretsRelations, x as vaultMembers, y as serviceBindings } from "./schema-NBVA9q-s.js";
 export { auditChainHead, auditLog, consumedTokens, credentials, deviceAuthorizations, dismissedKeys, environments, environmentsRelations, identities, mcpApprovals, mcpConnections, oauthClients, projects, secretReferences, secretVersions, secrets, secretsRelations, serviceBindings, vaultGrants, vaultMembers };

package/dist/schema.js

@@ -1,7 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { n as relationsOf, t as ACTIVE_SUBJECT } from "./relations-BfR3JjT1.js";
 import { sql } from "drizzle-orm";
-import { ROLE_NAMES, assignableToEnvironment } from "@coffre/core/access";
 import { bigint, boolean, check, customType, foreignKey, index, integer, pgTable, primaryKey, text, timestamp, unique, uniqueIndex, uuid } from "drizzle-orm/pg-core";
 //#region src/schema.ts
 var schema_exports = /* @__PURE__ */ __exportAll({
@@ -129,7 +128,9 @@ const secretVersions = pgTable("secret_versions", {
 	createdBy: text("created_by").notNull(),
 	recipe: text(),
 	pairId: uuid("pair_id"),
-	pairHalf: text("pair_half")
+	pairHalf: text("pair_half"),
+	plaintext: text(),
+	sensitive: boolean().notNull().default(false)
 }, (table) => [
 	unique("secret_versions_secret_id_version_key").on(table.secretId, table.version),
 	check("secret_versions_version_check", sql`${table.version} > 0`),
@@ -168,9 +169,6 @@ const dismissedKeys = pgTable("dismissed_keys", {
 		foreignColumns: [environments.id]
 	}).onDelete("restrict")
 ]);
-/** The role catalogue, as SQL: every role, and those an environment may be granted. */
-const ROLES = sql.raw(ROLE_NAMES.map((role) => `'${role}'`).join(", "));
-const ENVIRONMENT_ROLES = sql.raw(ROLE_NAMES.filter(assignableToEnvironment).map((role) => `'${role}'`).join(", "));
 /**
 * The vault's member directory: everyone it has admitted, written by the
 * vault alone, read by both. A principal with no row is no member.
@@ -219,8 +217,7 @@ const vaultGrants = pgTable("vault_grants", {
 }, (table) => [
 	check("vault_grants_one_place", sql`((${table.projectId} IS NULL) <> (${table.environmentId} IS NULL) AND ${table.environmentSlug} IS NULL) OR (${table.projectId} IS NULL AND ${table.environmentId} IS NULL)`),
 	check("vault_grants_environment_slug_check", sql`${table.environmentSlug} IS NULL OR ${table.environmentSlug} ~ '^[a-z0-9][a-z0-9-]{0,62}$'`),
-	check("vault_grants_role_check", sql`${table.role} IN (${ROLES})`),
-	check("vault_grants_environment_role_check", sql`(${table.environmentId} IS NULL AND ${table.environmentSlug} IS NULL) OR ${table.role} IN (${ENVIRONMENT_ROLES})`),
+	check("vault_grants_role_check", sql`${table.role} ~ '^[a-z][a-z0-9-]{1,31}$'`),
 	unique("vault_grants_on_project").on(table.principal, table.projectId),
 	unique("vault_grants_on_environment").on(table.principal, table.environmentId),
 	unique("vault_grants_on_environment_slug").on(table.principal, table.environmentSlug),
@@ -553,6 +550,7 @@ const credentials = pgTable("credentials", {
 	principal: text().notNull(),
 	identityId: uuid("identity_id"),
 	scope: text(),
+	places: text(),
 	label: text(),
 	createdAt: createdAt(),
 	createdBy: text("created_by").notNull(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffre/db",
-  "version": "0.8.2",
+  "version": "0.10.0",
   "description": "coffre's database: the schema, its migrations and the connections, on Postgres or SQLite.",
   "license": "MIT",
   "repository": {
@@ -79,7 +79,7 @@
     "drizzle-orm": "0.45.2",
     "pg": "8.16.3",
     "pg-connection-string": "2.14.0",
-    "@coffre/core": "0.8.2"
+    "@coffre/core": "0.10.0"
   },
   "devDependencies": {
     "@types/node": "26.1.1",

package/src/grants.ts

@@ -9,6 +9,7 @@ import {
   type Conversion,
   type ConversionInput,
   type InstanceRole,
+  type BuiltinRole,
   type Role,
   type Scope,
 } from '@coffre/core/access';
@@ -129,10 +130,10 @@ export function everyProjectConversion(
     role: person ? role : 'member',
     everyProject: live
       .filter((grant) => grant.projectId === null && grant.environmentId === null)
-      .map((grant) => ({ environmentSlug: grant.environmentSlug, role: grant.role as Role, expiresAt: grant.expiresAt })),
+      .map((grant) => ({ environmentSlug: grant.environmentSlug, role: grant.role as BuiltinRole, expiresAt: grant.expiresAt })),
     grants: live
       .filter((grant) => grant.projectId !== null)
-      .map((grant) => ({ projectId: grant.projectId, environmentId: grant.environmentId, role: grant.role as Role, expiresAt: grant.expiresAt })),
+      .map((grant) => ({ projectId: grant.projectId, environmentId: grant.environmentId, role: grant.role as BuiltinRole, expiresAt: grant.expiresAt })),
     projects,
   });
 }

package/src/log.ts

@@ -283,6 +283,22 @@ export async function newestVaultEntries(db: Queryable, action: string, limit: n
   return rows as StoredEntry[];
 }
 
+/**
+ * The number of the newest entry in the vault's name, allowed, of one
+ * `action`, or null for none: whether one was appended since, and nothing
+ * of what it says, so its MAC is not checked. One indexed read.
+ */
+export async function newestVaultSeq(db: Queryable, action: string): Promise<bigint | null> {
+  const { auditLog } = tablesOf(db);
+  const [row] = await db
+    .select({ seq: auditLog.seq })
+    .from(auditLog)
+    .where(and(eq(auditLog.author, 'vault'), eq(auditLog.action, action), eq(auditLog.decision, 'allow')))
+    .orderBy(desc(auditLog.seq))
+    .limit(1);
+  return (row?.seq as bigint | undefined) ?? null;
+}
+
 /** How many entries in its name the vault reads back, a page at a time, for its own newest of a kind (`newestAuthentic`). */
 export const LOOK_BACK = { page: 32, pages: 32 };
 

package/src/migrations/postgres/0010_handle_places.sql

@@ -0,0 +1,2 @@
+-- A handle's places (0.9): the environments it was made for, by id and whether as @me, which the proxy's stable URL resolves to. A nullable column the release before neither reads nor writes; the app sets it when it makes a handle, and never after (no UPDATE grant).
+ALTER TABLE "credentials" ADD COLUMN "places" text;

package/src/migrations/postgres/0011_plain_values.sql

@@ -0,0 +1,19 @@
+-- Plain values (0.9): a version of a key marked not secret holds its value in the clear too. Nullable, so the release before writes on as it did.
+ALTER TABLE "secret_versions" ADD COLUMN "plaintext" text;--> statement-breakpoint
+-- A version is still only ever erased, and an erased one holds no value, in the clear or not.
+CREATE OR REPLACE FUNCTION secret_versions_erase_only() RETURNS trigger LANGUAGE plpgsql AS $$
+BEGIN
+    IF octet_length(NEW.ciphertext) <> 0 OR octet_length(NEW.wrapped_dek) <> 0 OR NEW.plaintext IS NOT NULL
+       OR (NEW.id, NEW.secret_id, NEW.version, NEW.envelope_version, NEW.iv, NEW.auth_tag,
+           NEW.kek_provider, NEW.kek_id, NEW.kek_version, NEW.created_at, NEW.created_by,
+           NEW.recipe, NEW.pair_id, NEW.pair_half)
+          IS DISTINCT FROM
+          (OLD.id, OLD.secret_id, OLD.version, OLD.envelope_version, OLD.iv, OLD.auth_tag,
+           OLD.kek_provider, OLD.kek_id, OLD.kek_version, OLD.created_at, OLD.created_by,
+           OLD.recipe, OLD.pair_id, OLD.pair_half) THEN
+        RAISE EXCEPTION 'a secret version is only ever erased' USING ERRCODE = 'insufficient_privilege';
+    END IF;
+    RETURN NEW;
+END
+$$;--> statement-breakpoint
+GRANT UPDATE (plaintext) ON secret_versions TO coffre_app;

package/src/migrations/postgres/0012_sensitive_values.sql

@@ -0,0 +1,18 @@
+-- Sensitive values (0.10): a version never handed back to a person, which the vault's wrap of its data key binds. Defaults to false, so the release before writes on as it did.
+ALTER TABLE "secret_versions" ADD COLUMN "sensitive" boolean DEFAULT false NOT NULL;--> statement-breakpoint
+-- A version is still only ever erased: its sensitivity with the rest of it.
+CREATE OR REPLACE FUNCTION secret_versions_erase_only() RETURNS trigger LANGUAGE plpgsql AS $$
+BEGIN
+    IF octet_length(NEW.ciphertext) <> 0 OR octet_length(NEW.wrapped_dek) <> 0 OR NEW.plaintext IS NOT NULL
+       OR (NEW.id, NEW.secret_id, NEW.version, NEW.envelope_version, NEW.iv, NEW.auth_tag,
+           NEW.kek_provider, NEW.kek_id, NEW.kek_version, NEW.created_at, NEW.created_by,
+           NEW.recipe, NEW.pair_id, NEW.pair_half, NEW.sensitive)
+          IS DISTINCT FROM
+          (OLD.id, OLD.secret_id, OLD.version, OLD.envelope_version, OLD.iv, OLD.auth_tag,
+           OLD.kek_provider, OLD.kek_id, OLD.kek_version, OLD.created_at, OLD.created_by,
+           OLD.recipe, OLD.pair_id, OLD.pair_half, OLD.sensitive) THEN
+        RAISE EXCEPTION 'a secret version is only ever erased' USING ERRCODE = 'insufficient_privilege';
+    END IF;
+    RETURN NEW;
+END
+$$;

package/src/migrations/postgres/0013_contributor_role.sql

@@ -0,0 +1,5 @@
+-- The Contributor role (0.10): use and write, never read. The role checks widen to it, which the release before never grants.
+ALTER TABLE "vault_grants" DROP CONSTRAINT "vault_grants_role_check";--> statement-breakpoint
+ALTER TABLE "vault_grants" DROP CONSTRAINT "vault_grants_environment_role_check";--> statement-breakpoint
+ALTER TABLE "vault_grants" ADD CONSTRAINT "vault_grants_role_check" CHECK ("vault_grants"."role" IN ('viewer', 'contributor', 'developer', 'maintainer', 'access-manager', 'auditor', 'owner'));--> statement-breakpoint
+ALTER TABLE "vault_grants" ADD CONSTRAINT "vault_grants_environment_role_check" CHECK (("vault_grants"."environment_id" IS NULL AND "vault_grants"."environment_slug" IS NULL) OR "vault_grants"."role" IN ('viewer', 'contributor', 'developer', 'auditor'));

package/src/migrations/postgres/0014_custom_roles.sql

@@ -0,0 +1,4 @@
+-- Roles an Owner makes (0.10): a grant names a role by its id, which the vault's policy defines; which of them an environment may be granted, the vault decides. The checks widen: the release before grants only the roles it ships.
+ALTER TABLE "vault_grants" DROP CONSTRAINT "vault_grants_environment_role_check";--> statement-breakpoint
+ALTER TABLE "vault_grants" DROP CONSTRAINT "vault_grants_role_check";--> statement-breakpoint
+ALTER TABLE "vault_grants" ADD CONSTRAINT "vault_grants_role_check" CHECK ("vault_grants"."role" ~ '^[a-z][a-z0-9-]{1,31}$');