postgresai 0.14.0-dev.14 → 0.14.0-dev.15

package/test/init.test.cjs

@@ -4,6 +4,7 @@ const assert = require("node:assert/strict");
 // These tests intentionally import the compiled JS output.
 // Run via: npm --prefix cli test
 const init = require("../dist/lib/init.js");
+const DEFAULT_MONITORING_USER = init.DEFAULT_MONITORING_USER;
 
 function runCli(args, env = {}) {
   const { spawnSync } = require("node:child_process");
@@ -37,41 +38,89 @@ test("parseLibpqConninfo supports quoted values", () => {
   assert.equal(cfg.host, "local host");
 });
 
-test("buildInitPlan includes create user when role does not exist", async () => {
+test("buildInitPlan includes a race-safe role DO block", async () => {
   const plan = await init.buildInitPlan({
     database: "mydb",
-    monitoringUser: "postgres_ai_mon",
+    monitoringUser: DEFAULT_MONITORING_USER,
     monitoringPassword: "pw",
     includeOptionalPermissions: false,
-    roleExists: false,
   });
 
   assert.equal(plan.database, "mydb");
   const roleStep = plan.steps.find((s) => s.name === "01.role");
   assert.ok(roleStep);
+  assert.match(roleStep.sql, /do\s+\$\$/i);
   assert.match(roleStep.sql, /create\s+user/i);
+  assert.match(roleStep.sql, /alter\s+user/i);
   assert.ok(!plan.steps.some((s) => s.optional));
 });
 
-test("buildInitPlan includes role step when roleExists is omitted", async () => {
+test("buildInitPlan handles special characters in monitoring user and database identifiers", async () => {
+  const monitoringUser = 'user "with" quotes ✓';
+  const database = 'db name "with" quotes ✓';
   const plan = await init.buildInitPlan({
-    database: "mydb",
-    monitoringUser: "postgres_ai_mon",
+    database,
+    monitoringUser,
     monitoringPassword: "pw",
     includeOptionalPermissions: false,
   });
+
   const roleStep = plan.steps.find((s) => s.name === "01.role");
   assert.ok(roleStep);
-  assert.match(roleStep.sql, /do\s+\$\$/i);
+  // Double quotes inside identifiers must be doubled.
+  assert.match(roleStep.sql, /create\s+user\s+"user ""with"" quotes ✓"/i);
+  assert.match(roleStep.sql, /alter\s+user\s+"user ""with"" quotes ✓"/i);
+
+  const permStep = plan.steps.find((s) => s.name === "02.permissions");
+  assert.ok(permStep);
+  assert.match(permStep.sql, /grant connect on database "db name ""with"" quotes ✓" to "user ""with"" quotes ✓"/i);
+});
+
+test("buildInitPlan keeps backslashes in passwords (no unintended escaping)", async () => {
+  const pw = String.raw`pw\with\backslash`;
+  const plan = await init.buildInitPlan({
+    database: "mydb",
+    monitoringUser: DEFAULT_MONITORING_USER,
+    monitoringPassword: pw,
+    includeOptionalPermissions: false,
+  });
+  const roleStep = plan.steps.find((s) => s.name === "01.role");
+  assert.ok(roleStep);
+  assert.ok(roleStep.sql.includes(`password '${pw}'`));
+});
+
+test("buildInitPlan rejects identifiers with null bytes", async () => {
+  await assert.rejects(
+    () =>
+      init.buildInitPlan({
+        database: "mydb",
+        monitoringUser: "bad\0user",
+        monitoringPassword: "pw",
+        includeOptionalPermissions: false,
+      }),
+    /Identifier cannot contain null bytes/
+  );
+});
+
+test("buildInitPlan rejects literals with null bytes", async () => {
+  await assert.rejects(
+    () =>
+      init.buildInitPlan({
+        database: "mydb",
+        monitoringUser: DEFAULT_MONITORING_USER,
+        monitoringPassword: "pw\0bad",
+        includeOptionalPermissions: false,
+      }),
+    /Literal cannot contain null bytes/
+  );
 });
 
 test("buildInitPlan inlines password safely for CREATE/ALTER ROLE grammar", async () => {
   const plan = await init.buildInitPlan({
     database: "mydb",
-    monitoringUser: "postgres_ai_mon",
+    monitoringUser: DEFAULT_MONITORING_USER,
     monitoringPassword: "pa'ss",
     includeOptionalPermissions: false,
-    roleExists: false,
   });
   const step = plan.steps.find((s) => s.name === "01.role");
   assert.ok(step);
@@ -79,18 +128,13 @@ test("buildInitPlan inlines password safely for CREATE/ALTER ROLE grammar", asyn
   assert.equal(step.params, undefined);
 });
 
-test("buildInitPlan includes alter user when role exists", async () => {
+test("buildInitPlan includes optional steps when enabled", async () => {
   const plan = await init.buildInitPlan({
     database: "mydb",
-    monitoringUser: "postgres_ai_mon",
+    monitoringUser: DEFAULT_MONITORING_USER,
     monitoringPassword: "pw",
     includeOptionalPermissions: true,
-    roleExists: true,
   });
-
-  const roleStep = plan.steps.find((s) => s.name === "01.role");
-  assert.ok(roleStep);
-  assert.match(roleStep.sql, /alter\s+user/i);
   assert.ok(plan.steps.some((s) => s.optional));
 });
 
@@ -130,17 +174,125 @@ test("cli: init with missing connection prints init help/options", () => {
   assert.match(r.stderr, /--monitoring-user/);
 });
 
-test("print-sql redaction regex matches password literal with embedded quotes", async () => {
+test("resolveMonitoringPassword auto-generates a strong, URL-safe password by default", async () => {
+  const r = await init.resolveMonitoringPassword({ monitoringUser: DEFAULT_MONITORING_USER });
+  assert.equal(r.generated, true);
+  assert.ok(typeof r.password === "string" && r.password.length >= 30);
+  assert.match(r.password, /^[A-Za-z0-9_-]+$/);
+});
+
+test("applyInitPlan preserves Postgres error fields on step failures", async () => {
+  const plan = {
+    monitoringUser: DEFAULT_MONITORING_USER,
+    database: "mydb",
+    steps: [{ name: "01.role", sql: "select 1" }],
+  };
+
+  const pgErr = Object.assign(new Error("permission denied to create role"), {
+    code: "42501",
+    detail: "some detail",
+    hint: "some hint",
+    schema: "pg_catalog",
+    table: "pg_roles",
+    constraint: "some_constraint",
+    routine: "aclcheck_error",
+  });
+
+  const calls = [];
+  const client = {
+    query: async (sql) => {
+      calls.push(sql);
+      if (sql === "begin;") return { rowCount: 1 };
+      if (sql === "rollback;") return { rowCount: 1 };
+      if (sql === "select 1") throw pgErr;
+      throw new Error(`unexpected sql: ${sql}`);
+    },
+  };
+
+  await assert.rejects(
+    () => init.applyInitPlan({ client, plan }),
+    (e) => {
+      assert.ok(e instanceof Error);
+      assert.match(e.message, /Failed at step "01\.role":/);
+      assert.equal(e.code, "42501");
+      assert.equal(e.detail, "some detail");
+      assert.equal(e.hint, "some hint");
+      assert.equal(e.schema, "pg_catalog");
+      assert.equal(e.table, "pg_roles");
+      assert.equal(e.constraint, "some_constraint");
+      assert.equal(e.routine, "aclcheck_error");
+      return true;
+    }
+  );
+
+  assert.deepEqual(calls, ["begin;", "select 1", "rollback;"]);
+});
+
+test("verifyInitSetup runs inside a repeatable read snapshot and rolls back", async () => {
+  const calls = [];
+  const client = {
+    query: async (sql, params) => {
+      calls.push(String(sql));
+
+      if (String(sql).toLowerCase().startsWith("begin isolation level repeatable read")) {
+        return { rowCount: 1, rows: [] };
+      }
+      if (String(sql).toLowerCase() === "rollback;") {
+        return { rowCount: 1, rows: [] };
+      }
+      if (String(sql).includes("select rolconfig")) {
+        return { rowCount: 1, rows: [{ rolconfig: ['search_path="$user", public, pg_catalog'] }] };
+      }
+      if (String(sql).includes("from pg_catalog.pg_roles")) {
+        return { rowCount: 1, rows: [] };
+      }
+      if (String(sql).includes("has_database_privilege")) {
+        return { rowCount: 1, rows: [{ ok: true }] };
+      }
+      if (String(sql).includes("pg_has_role")) {
+        return { rowCount: 1, rows: [{ ok: true }] };
+      }
+      if (String(sql).includes("has_table_privilege") && String(sql).includes("pg_catalog.pg_index")) {
+        return { rowCount: 1, rows: [{ ok: true }] };
+      }
+      if (String(sql).includes("to_regclass('public.pg_statistic')")) {
+        return { rowCount: 1, rows: [{ ok: true }] };
+      }
+      if (String(sql).includes("has_table_privilege") && String(sql).includes("public.pg_statistic")) {
+        return { rowCount: 1, rows: [{ ok: true }] };
+      }
+      if (String(sql).includes("has_schema_privilege")) {
+        return { rowCount: 1, rows: [{ ok: true }] };
+      }
+
+      throw new Error(`unexpected sql: ${sql} params=${JSON.stringify(params)}`);
+    },
+  };
+
+  const r = await init.verifyInitSetup({
+    client,
+    database: "mydb",
+    monitoringUser: DEFAULT_MONITORING_USER,
+    includeOptionalPermissions: false,
+  });
+  assert.equal(r.ok, true);
+  assert.equal(r.missingRequired.length, 0);
+
+  assert.ok(calls.length > 2);
+  assert.match(calls[0].toLowerCase(), /^begin isolation level repeatable read/);
+  assert.equal(calls[calls.length - 1].toLowerCase(), "rollback;");
+});
+
+test("redactPasswordsInSql redacts password literals with embedded quotes", async () => {
   const plan = await init.buildInitPlan({
     database: "mydb",
-    monitoringUser: "postgres_ai_mon",
+    monitoringUser: DEFAULT_MONITORING_USER,
     monitoringPassword: "pa'ss",
     includeOptionalPermissions: false,
-    roleExists: false,
   });
   const step = plan.steps.find((s) => s.name === "01.role");
   assert.ok(step);
-  const redacted = step.sql.replace(/password\s+'(?:''|[^'])*'/gi, "password '<redacted>'");
+  const redacted = init.redactPasswordsInSql(step.sql);
   assert.match(redacted, /password '<redacted>'/i);
 });
 
@@ -148,7 +300,7 @@ test("cli: init --print-sql works without connection (offline mode)", () => {
   const r = runCli(["init", "--print-sql", "-d", "mydb", "--password", "monpw"]);
   assert.equal(r.status, 0, r.stderr || r.stdout);
   assert.match(r.stdout, /SQL plan \(offline; not connected\)/);
-  assert.match(r.stdout, /grant connect on database "mydb" to "postgres_ai_mon"/i);
+  assert.match(r.stdout, new RegExp(`grant connect on database "mydb" to "${DEFAULT_MONITORING_USER}"`, "i"));
 });