@gadicc/loom 1.24.0 → 1.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -88,7 +88,20 @@ documented in [`docs/project-tooling.md`](docs/project-tooling.md).
88
88
  DB dependencies and tasks to their recorded configs, rewrites the standard
89
89
  `neon.ts` / `neonFull.ts` / `drizzle.config.ts` / PGlite test harness files
90
90
  into Loom-managed thin wrappers, scaffolds the app-local fixture script
91
- entrypoint, and enables the `loom-db` skill link.
91
+ entrypoint, and enables the `loom-db` skill link. `neonFull` verifies remote
92
+ TLS certificates and hostnames even when the selected URL contains
93
+ `sslmode=require`. Private remote CAs must be trusted explicitly, for example
94
+ with process-start `NODE_EXTRA_CA_CERTS`; invalid certificates fail instead of
95
+ falling back. The existing plaintext exceptions for `db.localtest.me`,
96
+ `localhost` and `127.0.0.1` remain, including their existing override of URL
97
+ TLS settings. Database URL precedence is unchanged. TLS verification does not
98
+ add SCRAM channel-binding support to the underlying driver. Remote IPv4
99
+ certificates must contain a matching IP subject alternative name. DNS-only
100
+ multi-host URLs retain the driver's per-host verification. Empty or escaped
101
+ hosts, extra unescaped `@` signs or fragments in the authority, IP-containing
102
+ multi-host URLs and bracketed IPv6 hosts are rejected because the runtime
103
+ cannot reliably bind their current driver routing to certificate identity; use
104
+ an explicit DNS host or single IPv4 address.
92
105
  - `loom add files` activates the shared files schema contract after the DB
93
106
  feature is active. It materializes the Loom-managed Drizzle schema blueprint
94
107
  into an app-local committed schema file, records the blueprint version and
@@ -0,0 +1,42 @@
1
+ import { isIP } from "node:net";
2
+
3
+ /**
4
+ * Preserve the existing plaintext local development endpoints; require native
5
+ * certificate and hostname verification for every other runtime database.
6
+ * postgres.js's "require" mode encrypts but disables certificate verification.
7
+ * @param {string} databaseUrl Selected runtime database URL.
8
+ * @returns {false | { rejectUnauthorized: true, host?: string }} Explicit TLS option.
9
+ */
10
+ export function resolveRuntimeDatabaseTls(databaseUrl) {
11
+ const hostname = new URL(databaseUrl).hostname;
12
+ // The driver starts userinfo at the first raw @ and does not stop authority
13
+ // parsing at #. WHATWG uses the last @ and recognizes fragments instead.
14
+ const authority = databaseUrl.slice(databaseUrl.indexOf("://") + 3)
15
+ .split(/[?/]/)[0];
16
+ if (
17
+ authority.indexOf("@") !== authority.lastIndexOf("@") ||
18
+ authority.includes("#")
19
+ ) {
20
+ throw new Error("Unsupported runtime database host configuration");
21
+ }
22
+ // postgres.js decodes multi-host authorities differently from WHATWG URL, and
23
+ // an empty authority inherits PGHOST. Do not guess the effective destination.
24
+ if (!hostname || /[%\[\]]/.test(hostname)) {
25
+ throw new Error("Unsupported runtime database host configuration");
26
+ }
27
+ const hosts = hostname.split(",");
28
+ if (
29
+ hosts.some((host) => !host) ||
30
+ (hosts.length > 1 && hosts.some((host) => isIP(host)))
31
+ ) {
32
+ throw new Error("Unsupported runtime database host configuration");
33
+ }
34
+ const isLocal = hostname === "db.localtest.me" || hostname === "localhost" ||
35
+ hostname === "127.0.0.1";
36
+ if (isLocal) return false;
37
+ // The driver omits SNI for IPs. Supplying TLS's public host option prevents
38
+ // native certificate verification from falling back to "localhost".
39
+ return isIP(hostname)
40
+ ? { rejectUnauthorized: true, host: hostname }
41
+ : { rejectUnauthorized: true };
42
+ }
@@ -0,0 +1,171 @@
1
+ import { expect } from "@std/expect";
2
+ import { describe, it } from "@std/testing/bdd";
3
+ import postgres from "postgres";
4
+ import { resolveRuntimeDatabaseTls } from "./databaseTls.js";
5
+ import { resolveRuntimeDatabaseUrl } from "./databaseUrl.js";
6
+
7
+ /** The real driver parses options without connecting; tests have no net grant. */
8
+ async function effectiveTls(databaseUrl: string) {
9
+ const sql = postgres(databaseUrl, {
10
+ ssl: resolveRuntimeDatabaseTls(databaseUrl),
11
+ });
12
+ try {
13
+ return sql.options.ssl;
14
+ } finally {
15
+ await sql.end();
16
+ }
17
+ }
18
+
19
+ describe("runtime database TLS", () => {
20
+ for (
21
+ const hostname of [
22
+ "ep-runtime.example.test",
23
+ "ep-runtime-pooler.example.test",
24
+ "db.localtest.me.example.test",
25
+ "localhost.example.test",
26
+ "first.example,second.example",
27
+ ]
28
+ ) {
29
+ it(`verifies nonlocal ${hostname}`, async () => {
30
+ expect(await effectiveTls(`postgresql://test:test@${hostname}/test`))
31
+ .toEqual({ rejectUnauthorized: true });
32
+ });
33
+ }
34
+
35
+ it("binds native verification to the explicit remote IPv4 address", async () => {
36
+ expect(await effectiveTls("postgresql://test:test@192.0.2.1/test"))
37
+ .toEqual({ rejectUnauthorized: true, host: "192.0.2.1" });
38
+ });
39
+
40
+ it("preserves escaped credentials while validating only host routing", async () => {
41
+ const url =
42
+ "postgresql://test%40user:synthetic%3Apass%40word@remote.example/test";
43
+ const sql = postgres(url, { ssl: resolveRuntimeDatabaseTls(url) });
44
+ try {
45
+ expect(sql.options.user).toBe("test@user");
46
+ expect(sql.options.pass).toBe("synthetic:pass@word");
47
+ expect(sql.options.host).toEqual(["remote.example"]);
48
+ expect(sql.options.ssl).toEqual({ rejectUnauthorized: true });
49
+ } finally {
50
+ await sql.end();
51
+ }
52
+ });
53
+
54
+ for (
55
+ const authority of [
56
+ "",
57
+ "%31%39%32.0.2.1",
58
+ "remote.example,%31%39%32.0.2.1",
59
+ "remote.example%2C192.0.2.1",
60
+ "remote.example,192.0.2.1",
61
+ "192.0.2.1,remote.example",
62
+ "192.0.2.1,192.0.2.2",
63
+ "remote.example,",
64
+ "[::1]",
65
+ "[2001:db8::1]",
66
+ ]
67
+ ) {
68
+ it(`refuses unverifiable host routing ${authority || "(empty)"}`, () => {
69
+ expect(() => resolveRuntimeDatabaseTls(`postgresql://${authority}/test`))
70
+ .toThrow("Unsupported runtime database host configuration");
71
+ });
72
+ }
73
+
74
+ it("refuses an empty authority instead of inheriting PGHOST", () => {
75
+ const previous = Deno.env.get("PGHOST");
76
+ Deno.env.set("PGHOST", "192.0.2.1");
77
+ try {
78
+ expect(() => resolveRuntimeDatabaseTls("postgresql:///test"))
79
+ .toThrow("Unsupported runtime database host configuration");
80
+ } finally {
81
+ if (previous === undefined) Deno.env.delete("PGHOST");
82
+ else Deno.env.set("PGHOST", previous);
83
+ }
84
+ });
85
+
86
+ for (
87
+ const url of [
88
+ "postgres://user:pw@192.0.2.1,remote.example@safe.example/db",
89
+ "postgres://user:pw@192.0.2.1%2Cremote.example@safe.example/db",
90
+ "postgres://safe.example#ignored,192.0.2.1/db",
91
+ "postgres://safe.example#ignored%2C192.0.2.1",
92
+ "postgres://localhost#ignored,192.0.2.1",
93
+ "postgres://remote.example#@192.0.2.1,other.example",
94
+ ]
95
+ ) {
96
+ it("rejects authority syntax with different driver routing", () => {
97
+ expect(() => resolveRuntimeDatabaseTls(url))
98
+ .toThrow("Unsupported runtime database host configuration");
99
+ });
100
+ }
101
+
102
+ for (
103
+ const query of [
104
+ "sslmode=require",
105
+ "sslmode=verify-full",
106
+ "sslmode=disable",
107
+ "sslmode=prefer",
108
+ "ssl=false",
109
+ "sslrootcert=system",
110
+ ]
111
+ ) {
112
+ it(`keeps explicit remote verification with ${query}`, async () => {
113
+ expect(
114
+ await effectiveTls(
115
+ `postgresql://test:test@remote.example/test?${query}`,
116
+ ),
117
+ ).toEqual({ rejectUnauthorized: true });
118
+ });
119
+ }
120
+
121
+ for (const hostname of ["db.localtest.me", "localhost", "127.0.0.1"]) {
122
+ for (const query of ["", "?sslmode=verify-full"]) {
123
+ it(`preserves local plaintext for ${hostname}${query}`, async () => {
124
+ expect(
125
+ await effectiveTls(`postgresql://test:test@${hostname}/test${query}`),
126
+ ).toBe(false);
127
+ });
128
+ }
129
+ }
130
+
131
+ for (const ambient of ["disable", "prefer", "require", "false"]) {
132
+ it(`does not inherit PGSSL=${ambient}`, async () => {
133
+ const previous = Deno.env.get("PGSSL");
134
+ Deno.env.set("PGSSL", ambient);
135
+ try {
136
+ expect(await effectiveTls("postgresql://test:test@remote.example/test"))
137
+ .toEqual({ rejectUnauthorized: true });
138
+ expect(await effectiveTls("postgresql://test:test@localhost/test"))
139
+ .toBe(false);
140
+ } finally {
141
+ if (previous === undefined) Deno.env.delete("PGSSL");
142
+ else Deno.env.set("PGSSL", previous);
143
+ }
144
+ });
145
+ }
146
+
147
+ it("uses the selected runtime URL without changing precedence", async () => {
148
+ const env = {
149
+ DATABASE_URL_DIRECT: "postgresql://test:test@localhost/direct",
150
+ DATABASE_URL_UNPOOLED: "postgresql://test:test@unpooled.example/primary",
151
+ DATABASE_URL: "postgresql://test:test@pooler.example/fallback",
152
+ };
153
+ const local = resolveRuntimeDatabaseUrl(env);
154
+ expect(local.envName).toBe("DATABASE_URL_DIRECT");
155
+ expect(await effectiveTls(local.url)).toBe(false);
156
+ const remote = resolveRuntimeDatabaseUrl({
157
+ ...env,
158
+ DATABASE_URL_DIRECT: "",
159
+ });
160
+ expect(remote.envName).toBe("DATABASE_URL_UNPOOLED");
161
+ expect(await effectiveTls(remote.url)).toEqual({
162
+ rejectUnauthorized: true,
163
+ });
164
+ });
165
+
166
+ it("does not share mutable TLS options across clients", () => {
167
+ const first = resolveRuntimeDatabaseTls("postgresql://remote.example/db");
168
+ const second = resolveRuntimeDatabaseTls("postgresql://remote.example/db");
169
+ expect(first).not.toBe(second);
170
+ });
171
+ });
package/db/neonFull.js CHANGED
@@ -3,15 +3,13 @@ import { drizzle } from "drizzle-orm/postgres-js";
3
3
  import postgres from "postgres";
4
4
  import process from "node:process";
5
5
  import { resolveRuntimeDatabaseUrl } from "./databaseUrl.js";
6
+ import { resolveRuntimeDatabaseTls } from "./databaseTls.js";
6
7
 
7
8
  const { direct, url: databaseUrl } = resolveRuntimeDatabaseUrl(process.env);
8
9
 
9
10
  const parsedUrl = new URL(databaseUrl);
10
- const isLocal = parsedUrl.hostname === "db.localtest.me" ||
11
- parsedUrl.hostname === "localhost" ||
12
- parsedUrl.hostname === "127.0.0.1";
13
11
  const isPooler = parsedUrl.hostname.includes("pooler");
14
- const ssl = isLocal ? false : "require";
12
+ const ssl = resolveRuntimeDatabaseTls(databaseUrl);
15
13
 
16
14
  if (isPooler && !direct) {
17
15
  console.warn(
@@ -152,4 +152,15 @@ declare global {
152
152
  }
153
153
  }
154
154
  export {};
155
+ declare global {
156
+ interface Object {
157
+ /**
158
+ * Determines whether an object has a property with the specified name.
159
+ * @param o An object.
160
+ * @param v A property name.
161
+ */
162
+ hasOwn(o: object, v: PropertyKey): boolean;
163
+ }
164
+ }
165
+ export {};
155
166
  //# sourceMappingURL=_dnt.polyfills.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"_dnt.polyfills.d.ts","sourceRoot":"","sources":["../src/_dnt.polyfills.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"_dnt.polyfills.d.ts","sourceRoot":"","sources":["../src/_dnt.polyfills.ts"],"names":[],"mappings":"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"}
@@ -161,3 +161,17 @@ if (!Uint8Array.prototype.findLast) {
161
161
  return findLast(this, callbackfn, that);
162
162
  };
163
163
  }
164
+ // https://github.com/tc39/proposal-accessible-object-hasownproperty/blob/main/polyfill.js
165
+ if (!Object.hasOwn) {
166
+ Object.defineProperty(Object, "hasOwn", {
167
+ value: function (object, property) {
168
+ if (object == null) {
169
+ throw new TypeError("Cannot convert undefined or null to object");
170
+ }
171
+ return Object.prototype.hasOwnProperty.call(Object(object), property);
172
+ },
173
+ configurable: true,
174
+ enumerable: false,
175
+ writable: true,
176
+ });
177
+ }
@@ -0,0 +1,33 @@
1
+ /** Explicit browser transport permission; it never grants public object access. */
2
+ export type FilesR2DirectUploadPolicy = {
3
+ kind: "presigned-put";
4
+ origins: Record<"production" | "preview", string[]>;
5
+ allowedHeaders: string[];
6
+ maxAgeSeconds: number;
7
+ };
8
+ type PolicyInput = {
9
+ accessMode?: unknown;
10
+ directBrowserAccess?: unknown;
11
+ directUpload?: unknown;
12
+ forcePathStyle?: unknown;
13
+ publicUrl?: unknown;
14
+ };
15
+ /** Validates untrusted manifest policy before setup or network side effects. */
16
+ export declare function filesR2PolicyIssues(provider: PolicyInput): string[];
17
+ type CorsRule = {
18
+ origins: string[];
19
+ methods: string[];
20
+ headers: string[];
21
+ exposeHeaders: string[];
22
+ maxAgeSeconds: number;
23
+ };
24
+ /**
25
+ * Wrangler 4.112 has no CORS JSON flag. Parse its complete labelled permission
26
+ * projection, rejecting unknown formats instead of treating a successful CLI
27
+ * exit as proof. Rule IDs are not rendered and have no permission semantics.
28
+ */
29
+ export declare function parseWranglerR2Cors(text: string, bucket: string): CorsRule[] | null;
30
+ /** Compares one minimal PUT rule, combining declared origins for a shared bucket. */
31
+ export declare function r2CorsMatchesPolicy(rules: CorsRule[], policy: FilesR2DirectUploadPolicy, environments: Array<"production" | "preview">): boolean;
32
+ export {};
33
+ //# sourceMappingURL=filesR2Policy.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"filesR2Policy.d.ts","sourceRoot":"","sources":["../../../src/src/cli/filesR2Policy.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,YAAY,GAAG,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;IACpD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AA2BF,gFAAgF;AAChF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,EAAE,CAuEnE;AAED,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,QAAQ,EAAE,GAAG,IAAI,CA6CnB;AAED,qFAAqF;AACrF,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,QAAQ,EAAE,EACjB,MAAM,EAAE,yBAAyB,EACjC,YAAY,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAC5C,OAAO,CAcT"}
@@ -0,0 +1,130 @@
1
+ function record(value) {
2
+ return typeof value === "object" && value !== null && !Array.isArray(value);
3
+ }
4
+ function exactKeys(value, keys) {
5
+ return Object.keys(value).length === keys.length &&
6
+ keys.every((key) => Object.hasOwn(value, key));
7
+ }
8
+ function uniqueStrings(value) {
9
+ return Array.isArray(value) && value.length > 0 &&
10
+ value.every((entry) => typeof entry === "string") &&
11
+ new Set(value).size === value.length;
12
+ }
13
+ function exactHttpsOrigin(value) {
14
+ try {
15
+ const url = new URL(value);
16
+ return url.protocol === "https:" && url.origin === value &&
17
+ !value.includes("*");
18
+ }
19
+ catch {
20
+ return false;
21
+ }
22
+ }
23
+ /** Validates untrusted manifest policy before setup or network side effects. */
24
+ export function filesR2PolicyIssues(provider) {
25
+ const issues = [];
26
+ if (provider.accessMode !== "private" || provider.publicUrl !== null) {
27
+ issues.push("Files R2 provider policy must remain private with publicUrl null.");
28
+ }
29
+ if (provider.forcePathStyle !== undefined &&
30
+ typeof provider.forcePathStyle !== "boolean") {
31
+ issues.push("Files R2 forcePathStyle must be an explicit boolean when present.");
32
+ }
33
+ if (provider.directBrowserAccess === false &&
34
+ provider.directUpload === undefined)
35
+ return issues;
36
+ if (provider.directBrowserAccess !== true) {
37
+ issues.push("Files R2 directBrowserAccess must be false, or true with an explicit presigned-put policy.");
38
+ return issues;
39
+ }
40
+ const policy = provider.directUpload;
41
+ if (!record(policy) ||
42
+ !exactKeys(policy, [
43
+ "kind",
44
+ "origins",
45
+ "allowedHeaders",
46
+ "maxAgeSeconds",
47
+ ]) || policy.kind !== "presigned-put") {
48
+ issues.push("Files R2 directUpload must be an explicit presigned-put policy with only the documented fields.");
49
+ return issues;
50
+ }
51
+ if (!record(policy.origins) ||
52
+ !exactKeys(policy.origins, ["production", "preview"]) ||
53
+ ![policy.origins.production, policy.origins.preview].every((origins) => uniqueStrings(origins) && origins.every(exactHttpsOrigin))) {
54
+ issues.push("Files R2 directUpload origins must be nonempty unique exact HTTPS origins for Production and Preview, without paths or wildcards.");
55
+ }
56
+ if (!uniqueStrings(policy.allowedHeaders) ||
57
+ !policy.allowedHeaders.every((header) => /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(header))) {
58
+ issues.push("Files R2 directUpload allowedHeaders must be unique explicit lowercase header names without wildcards.");
59
+ }
60
+ if (typeof policy.maxAgeSeconds !== "number" ||
61
+ !Number.isSafeInteger(policy.maxAgeSeconds) || policy.maxAgeSeconds < 0 ||
62
+ policy.maxAgeSeconds > 86400) {
63
+ issues.push("Files R2 directUpload maxAgeSeconds must be an integer from 0 to 86400.");
64
+ }
65
+ return issues;
66
+ }
67
+ /**
68
+ * Wrangler 4.112 has no CORS JSON flag. Parse its complete labelled permission
69
+ * projection, rejecting unknown formats instead of treating a successful CLI
70
+ * exit as proof. Rule IDs are not rendered and have no permission semantics.
71
+ */
72
+ export function parseWranglerR2Cors(text, bucket) {
73
+ const lines = text.trim().split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
74
+ if (lines.shift() !== `Listing CORS rules for bucket '${bucket}'...`) {
75
+ return null;
76
+ }
77
+ if (lines.length === 1 &&
78
+ lines[0] ===
79
+ `There is no CORS configuration defined for bucket '${bucket}'.`)
80
+ return [];
81
+ if (!lines.length || lines.length % 5)
82
+ return null;
83
+ const labels = [
84
+ "allowed_origins",
85
+ "allowed_methods",
86
+ "allowed_headers",
87
+ "exposed_headers",
88
+ "max_age_seconds",
89
+ ];
90
+ const rules = [];
91
+ for (let i = 0; i < lines.length; i += 5) {
92
+ const values = labels.map((label, offset) => {
93
+ const line = lines[i + offset];
94
+ return line.startsWith(`${label}:`)
95
+ ? line.slice(label.length + 1).trim()
96
+ : null;
97
+ });
98
+ if (values.some((value) => value === null || value === ""))
99
+ return null;
100
+ const [origins, methods, headers, exposeHeaders, maxAge] = values;
101
+ if (!/^(?:0|[1-9]\d*|\(0 seconds\))$/.test(maxAge))
102
+ return null;
103
+ const maxAgeSeconds = maxAge === "(0 seconds)" ? 0 : Number(maxAge);
104
+ if (!Number.isSafeInteger(maxAgeSeconds))
105
+ return null;
106
+ const list = (value, empty) => value === empty ? [] : value.split(", ");
107
+ rules.push({
108
+ origins: list(origins, "(no origins)"),
109
+ methods: list(methods, "(no methods)"),
110
+ headers: list(headers, "(no headers)"),
111
+ exposeHeaders: list(exposeHeaders, "(no exposed headers)"),
112
+ maxAgeSeconds,
113
+ });
114
+ }
115
+ return rules;
116
+ }
117
+ /** Compares one minimal PUT rule, combining declared origins for a shared bucket. */
118
+ export function r2CorsMatchesPolicy(rules, policy, environments) {
119
+ if (rules.length !== 1)
120
+ return false;
121
+ const rule = rules[0];
122
+ const equal = (a, b) => JSON.stringify([...a].sort()) === JSON.stringify([...b].sort());
123
+ return equal(rule.origins, [
124
+ ...new Set(environments.flatMap((environment) => policy.origins[environment])),
125
+ ]) &&
126
+ equal(rule.methods, ["PUT"]) &&
127
+ equal(rule.headers, policy.allowedHeaders) &&
128
+ rule.exposeHeaders.length === 0 &&
129
+ rule.maxAgeSeconds === policy.maxAgeSeconds;
130
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ import { createRequire } from "node:module";
6
6
  import { basename, dirname, join, relative, resolve, sep } from "node:path";
7
7
  import process from "node:process";
8
8
  import { parseArgs } from "node:util";
9
+ import { filesR2PolicyIssues, parseWranglerR2Cors, r2CorsMatchesPolicy, } from "./filesR2Policy.js";
9
10
  import { resolveProductionBranch, } from "./releaseConfig.js";
10
11
  import { DEFAULT_API_KEY_AUDIT_RETENTION } from "../apiKeys/retention.js";
11
12
  import { checkProjectSkills, getProjectSkillStatus, LOOM_EXTERNAL_SKILLS_GITIGNORE_LINE, removeLegacyNextSkillLink, setProjectSkillDisabled, syncExternalProjectSkills, syncInstalledPackageSkills, } from "./projectSkills.js";
@@ -5971,6 +5972,11 @@ export async function setupCloudflareR2(cwd, options = {}) {
5971
5972
  const dbConfig = mergeDbConfig(framework, dbFeature.config);
5972
5973
  const config = getFilesConfig(framework, dbConfig, feature.config);
5973
5974
  const existingProvider = config.storage.provider;
5975
+ if (existingProvider) {
5976
+ const policyIssues = filesR2PolicyIssues(existingProvider);
5977
+ if (policyIssues.length)
5978
+ throw new Error(policyIssues.join(" "));
5979
+ }
5974
5980
  const wranglerCommand = await detectWranglerCommand(cwd, commandRunner, env);
5975
5981
  if (!wranglerCommand) {
5976
5982
  throw new Error("Wrangler is not available. On Arch Linux install it with `sudo pacman -S wrangler`, then run `wrangler login`.");
@@ -6092,7 +6098,13 @@ export async function setupCloudflareR2(cwd, options = {}) {
6092
6098
  buckets,
6093
6099
  connectionStatus: "buckets-ready",
6094
6100
  credentialMode: "manual",
6095
- directBrowserAccess: false,
6101
+ directBrowserAccess: existingProvider?.directBrowserAccess ?? false,
6102
+ ...(existingProvider?.directUpload
6103
+ ? { directUpload: existingProvider.directUpload }
6104
+ : {}),
6105
+ ...(existingProvider?.forcePathStyle !== undefined
6106
+ ? { forcePathStyle: existingProvider.forcePathStyle }
6107
+ : {}),
6096
6108
  endpoint: cloudflareR2Endpoint(accountId, jurisdiction),
6097
6109
  jurisdiction,
6098
6110
  kind: "cloudflare-r2",
@@ -6117,6 +6129,16 @@ export async function setupCloudflareR2(cwd, options = {}) {
6117
6129
  throw new Error(`R2 bucket \`${bucket}\` exists, but Loom could not verify its private-access policy: ${privacy.detail}. Rerun after Wrangler can inspect public URL and custom-domain settings.`);
6118
6130
  }
6119
6131
  }
6132
+ if (config.storage.provider.directBrowserAccess) {
6133
+ for (const bucket of new Set(Object.values(buckets))) {
6134
+ const cors = await inspectR2BucketCors(cwd, commandRunner, providerEnv, wranglerCommand, bucket, config.storage.provider, options.cloudflareProfile);
6135
+ if (cors !== "matching") {
6136
+ throw new Error(`R2 bucket \`${bucket}\` CORS ${cors === "unknown"
6137
+ ? "could not be verified"
6138
+ : "differs from the declared presigned-PUT policy"}. Review and apply its exact CORS separately, then rerun setup; Loom never applies CORS implicitly.`);
6139
+ }
6140
+ }
6141
+ }
6120
6142
  const dependencyUpdate = await mutateProjectDependencies(cwd, tooling.dependencies, { dependencies: FILES_S3_DEPENDENCIES });
6121
6143
  if (dependencyUpdate.changed) {
6122
6144
  changedFiles.push(dependencyUpdate.config);
@@ -6136,7 +6158,9 @@ export async function setupCloudflareR2(cwd, options = {}) {
6136
6158
  const desiredLocalValues = {
6137
6159
  FILES_S3_BUCKET: localBucket,
6138
6160
  FILES_S3_ENDPOINT: localEndpoint,
6139
- FILES_S3_FORCE_PATH_STYLE: localProvider === "minio" ? "true" : "false",
6161
+ FILES_S3_FORCE_PATH_STYLE: localProvider === "minio"
6162
+ ? "true"
6163
+ : String(config.storage.provider.forcePathStyle ?? false),
6140
6164
  FILES_S3_REGION: "auto",
6141
6165
  FILES_STORAGE_PROVIDER: localProvider === "minio"
6142
6166
  ? "minio"
@@ -6184,6 +6208,7 @@ export async function setupCloudflareR2(cwd, options = {}) {
6184
6208
  FILES_S3_BUCKET: buckets[environment],
6185
6209
  FILES_S3_ENDPOINT: cloudflareR2Endpoint(accountId, jurisdiction),
6186
6210
  ...FILES_S3_NON_SECRET_ENV_VALUES,
6211
+ FILES_S3_FORCE_PATH_STYLE: String(config.storage.provider.forcePathStyle ?? false),
6187
6212
  };
6188
6213
  const existingNonSecretNames = Object.keys(nonSecretValues).filter((name) => hasExactEnvName(listing, name));
6189
6214
  if (existingNonSecretNames.length) {
@@ -7007,6 +7032,28 @@ async function inspectR2BucketPrivacy(cwd, commandRunner, env, wranglerCommand,
7007
7032
  }
7008
7033
  return { detail: "No public endpoint detected.", status: "private" };
7009
7034
  }
7035
+ async function inspectR2BucketCors(cwd, commandRunner, env, wranglerCommand, bucket, provider, cloudflareProfile) {
7036
+ const result = await commandRunner(wranglerCommand, r2BucketCommandArgs(["r2", "bucket", "cors", "list", bucket], provider, cloudflareProfile), {
7037
+ cwd,
7038
+ env: {
7039
+ ...env,
7040
+ NO_COLOR: "1",
7041
+ FORCE_COLOR: "0",
7042
+ WRANGLER_HIDE_BANNER: "true",
7043
+ },
7044
+ stdio: "pipe",
7045
+ });
7046
+ const rules = result.code === 0
7047
+ ? parseWranglerR2Cors(result.stdout, bucket)
7048
+ : null;
7049
+ if (rules === null)
7050
+ return "unknown";
7051
+ const environments = FILES_R2_ENVIRONMENTS.filter((environment) => provider.buckets[environment] === bucket);
7052
+ return provider.directUpload &&
7053
+ r2CorsMatchesPolicy(rules, provider.directUpload, environments)
7054
+ ? "matching"
7055
+ : "drift";
7056
+ }
7010
7057
  function checkFilesNetworkFeature(context) {
7011
7058
  const feature = context.manifest.features.files;
7012
7059
  if (!feature || feature.status !== "active")
@@ -7026,6 +7073,13 @@ function checkFilesNetworkFeature(context) {
7026
7073
  })),
7027
7074
  }];
7028
7075
  }
7076
+ const policyIssues = filesR2PolicyIssues(provider);
7077
+ if (policyIssues.length) {
7078
+ return [{
7079
+ label: "Cloudflare R2 private upload policy is valid",
7080
+ run: () => Promise.resolve(networkCheckResult("issue", "Invalid Files R2 policy; provider checks were not attempted.", { issues: policyIssues })),
7081
+ }];
7082
+ }
7029
7083
  const state = {
7030
7084
  accountAvailable: false,
7031
7085
  vercelCommand: null,
@@ -7145,6 +7199,33 @@ function checkFilesNetworkFeature(context) {
7145
7199
  },
7146
7200
  });
7147
7201
  }
7202
+ if (provider.directBrowserAccess) {
7203
+ for (const bucket of new Set(Object.values(provider.buckets))) {
7204
+ steps.push({
7205
+ label: `R2 bucket ${bucket} CORS matches the private presigned-PUT policy`,
7206
+ run: async () => {
7207
+ if (!state.wranglerCommand || !state.accountAvailable) {
7208
+ return networkCheckResult("skipped", "Skipped until Wrangler account access is verified.");
7209
+ }
7210
+ const cors = await inspectR2BucketCors(context.cwd, context.commandRunner, providerEnv, state.wranglerCommand, bucket, provider, context.cloudflareProfile);
7211
+ return cors === "matching"
7212
+ ? networkCheckResult("ok", `R2 bucket \`${bucket}\` CORS matches the declared private presigned-PUT policy.`)
7213
+ : networkCheckResult("issue", `R2 bucket \`${bucket}\` CORS is ${cors === "unknown"
7214
+ ? "unverified"
7215
+ : "different from the declared policy"}.`, {
7216
+ issues: [
7217
+ `Files R2 direct-upload CORS ${cors === "unknown"
7218
+ ? "could not be read or parsed"
7219
+ : "drift detected"}: ${bucket}.`,
7220
+ ],
7221
+ suggestions: [
7222
+ "Review the bucket's exact CORS policy using Wrangler; apply changes separately, then rerun `loom files r2 check`. Loom never applies CORS implicitly.",
7223
+ ],
7224
+ });
7225
+ },
7226
+ });
7227
+ }
7228
+ }
7148
7229
  steps.push({
7149
7230
  label: "Vercel CLI authentication and project link are available",
7150
7231
  run: async () => {
@@ -7220,6 +7301,7 @@ function checkFilesNetworkFeature(context) {
7220
7301
  FILES_S3_BUCKET: provider.buckets[environment],
7221
7302
  FILES_S3_ENDPOINT: provider.endpoint,
7222
7303
  ...FILES_S3_NON_SECRET_ENV_VALUES,
7304
+ FILES_S3_FORCE_PATH_STYLE: String(provider.forcePathStyle ?? false),
7223
7305
  };
7224
7306
  const drift = Object.entries(expectedValues).filter(([name, value]) => actualValues[name] !== value).map(([name]) => name);
7225
7307
  return drift.length
@@ -8939,10 +9021,7 @@ async function checkFilesFeature(cwd, framework, manifest, options) {
8939
9021
  if (provider.kind !== "cloudflare-r2") {
8940
9022
  issues.push("Files storage provider kind must be cloudflare-r2.");
8941
9023
  }
8942
- if (provider.accessMode !== "private" || provider.directBrowserAccess ||
8943
- provider.publicUrl !== null) {
8944
- issues.push("Files R2 provider policy must remain private unless a future explicit public-access workflow is adopted.");
8945
- }
9024
+ issues.push(...filesR2PolicyIssues(provider));
8946
9025
  if (!provider.accountId || !provider.buckets.production ||
8947
9026
  !provider.buckets.preview) {
8948
9027
  issues.push("Files R2 provider policy is missing account or bucket identifiers.");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gadicc/loom",
3
- "version": "1.24.0",
3
+ "version": "1.25.0",
4
4
  "description": "Deno-first shared helpers for extracting common Next.js app code.",
5
5
  "homepage": "https://github.com/gadicc/loom#readme",
6
6
  "repository": {
@@ -231,7 +231,7 @@
231
231
  },
232
232
  "scripts": {},
233
233
  "loom": {
234
- "gitCommit": "3a84d424bb19d3b82bd3de2263d820912670e323"
234
+ "gitCommit": "2e3c6570131f3cc234913ed72fbe945428b94d3d"
235
235
  },
236
236
  "bin": {
237
237
  "loom": "script/bin/loom.js"
@@ -152,4 +152,15 @@ declare global {
152
152
  }
153
153
  }
154
154
  export {};
155
+ declare global {
156
+ interface Object {
157
+ /**
158
+ * Determines whether an object has a property with the specified name.
159
+ * @param o An object.
160
+ * @param v A property name.
161
+ */
162
+ hasOwn(o: object, v: PropertyKey): boolean;
163
+ }
164
+ }
165
+ export {};
155
166
  //# sourceMappingURL=_dnt.polyfills.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"_dnt.polyfills.d.ts","sourceRoot":"","sources":["../src/_dnt.polyfills.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"_dnt.polyfills.d.ts","sourceRoot":"","sources":["../src/_dnt.polyfills.ts"],"names":[],"mappings":"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"}
@@ -164,3 +164,17 @@ if (!Uint8Array.prototype.findLast) {
164
164
  return findLast(this, callbackfn, that);
165
165
  };
166
166
  }
167
+ // https://github.com/tc39/proposal-accessible-object-hasownproperty/blob/main/polyfill.js
168
+ if (!Object.hasOwn) {
169
+ Object.defineProperty(Object, "hasOwn", {
170
+ value: function (object, property) {
171
+ if (object == null) {
172
+ throw new TypeError("Cannot convert undefined or null to object");
173
+ }
174
+ return Object.prototype.hasOwnProperty.call(Object(object), property);
175
+ },
176
+ configurable: true,
177
+ enumerable: false,
178
+ writable: true,
179
+ });
180
+ }
@@ -0,0 +1,33 @@
1
+ /** Explicit browser transport permission; it never grants public object access. */
2
+ export type FilesR2DirectUploadPolicy = {
3
+ kind: "presigned-put";
4
+ origins: Record<"production" | "preview", string[]>;
5
+ allowedHeaders: string[];
6
+ maxAgeSeconds: number;
7
+ };
8
+ type PolicyInput = {
9
+ accessMode?: unknown;
10
+ directBrowserAccess?: unknown;
11
+ directUpload?: unknown;
12
+ forcePathStyle?: unknown;
13
+ publicUrl?: unknown;
14
+ };
15
+ /** Validates untrusted manifest policy before setup or network side effects. */
16
+ export declare function filesR2PolicyIssues(provider: PolicyInput): string[];
17
+ type CorsRule = {
18
+ origins: string[];
19
+ methods: string[];
20
+ headers: string[];
21
+ exposeHeaders: string[];
22
+ maxAgeSeconds: number;
23
+ };
24
+ /**
25
+ * Wrangler 4.112 has no CORS JSON flag. Parse its complete labelled permission
26
+ * projection, rejecting unknown formats instead of treating a successful CLI
27
+ * exit as proof. Rule IDs are not rendered and have no permission semantics.
28
+ */
29
+ export declare function parseWranglerR2Cors(text: string, bucket: string): CorsRule[] | null;
30
+ /** Compares one minimal PUT rule, combining declared origins for a shared bucket. */
31
+ export declare function r2CorsMatchesPolicy(rules: CorsRule[], policy: FilesR2DirectUploadPolicy, environments: Array<"production" | "preview">): boolean;
32
+ export {};
33
+ //# sourceMappingURL=filesR2Policy.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"filesR2Policy.d.ts","sourceRoot":"","sources":["../../../src/src/cli/filesR2Policy.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,YAAY,GAAG,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;IACpD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AA2BF,gFAAgF;AAChF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,EAAE,CAuEnE;AAED,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,QAAQ,EAAE,GAAG,IAAI,CA6CnB;AAED,qFAAqF;AACrF,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,QAAQ,EAAE,EACjB,MAAM,EAAE,yBAAyB,EACjC,YAAY,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAC5C,OAAO,CAcT"}
@@ -0,0 +1,135 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.filesR2PolicyIssues = filesR2PolicyIssues;
4
+ exports.parseWranglerR2Cors = parseWranglerR2Cors;
5
+ exports.r2CorsMatchesPolicy = r2CorsMatchesPolicy;
6
+ function record(value) {
7
+ return typeof value === "object" && value !== null && !Array.isArray(value);
8
+ }
9
+ function exactKeys(value, keys) {
10
+ return Object.keys(value).length === keys.length &&
11
+ keys.every((key) => Object.hasOwn(value, key));
12
+ }
13
+ function uniqueStrings(value) {
14
+ return Array.isArray(value) && value.length > 0 &&
15
+ value.every((entry) => typeof entry === "string") &&
16
+ new Set(value).size === value.length;
17
+ }
18
+ function exactHttpsOrigin(value) {
19
+ try {
20
+ const url = new URL(value);
21
+ return url.protocol === "https:" && url.origin === value &&
22
+ !value.includes("*");
23
+ }
24
+ catch {
25
+ return false;
26
+ }
27
+ }
28
+ /** Validates untrusted manifest policy before setup or network side effects. */
29
+ function filesR2PolicyIssues(provider) {
30
+ const issues = [];
31
+ if (provider.accessMode !== "private" || provider.publicUrl !== null) {
32
+ issues.push("Files R2 provider policy must remain private with publicUrl null.");
33
+ }
34
+ if (provider.forcePathStyle !== undefined &&
35
+ typeof provider.forcePathStyle !== "boolean") {
36
+ issues.push("Files R2 forcePathStyle must be an explicit boolean when present.");
37
+ }
38
+ if (provider.directBrowserAccess === false &&
39
+ provider.directUpload === undefined)
40
+ return issues;
41
+ if (provider.directBrowserAccess !== true) {
42
+ issues.push("Files R2 directBrowserAccess must be false, or true with an explicit presigned-put policy.");
43
+ return issues;
44
+ }
45
+ const policy = provider.directUpload;
46
+ if (!record(policy) ||
47
+ !exactKeys(policy, [
48
+ "kind",
49
+ "origins",
50
+ "allowedHeaders",
51
+ "maxAgeSeconds",
52
+ ]) || policy.kind !== "presigned-put") {
53
+ issues.push("Files R2 directUpload must be an explicit presigned-put policy with only the documented fields.");
54
+ return issues;
55
+ }
56
+ if (!record(policy.origins) ||
57
+ !exactKeys(policy.origins, ["production", "preview"]) ||
58
+ ![policy.origins.production, policy.origins.preview].every((origins) => uniqueStrings(origins) && origins.every(exactHttpsOrigin))) {
59
+ issues.push("Files R2 directUpload origins must be nonempty unique exact HTTPS origins for Production and Preview, without paths or wildcards.");
60
+ }
61
+ if (!uniqueStrings(policy.allowedHeaders) ||
62
+ !policy.allowedHeaders.every((header) => /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(header))) {
63
+ issues.push("Files R2 directUpload allowedHeaders must be unique explicit lowercase header names without wildcards.");
64
+ }
65
+ if (typeof policy.maxAgeSeconds !== "number" ||
66
+ !Number.isSafeInteger(policy.maxAgeSeconds) || policy.maxAgeSeconds < 0 ||
67
+ policy.maxAgeSeconds > 86400) {
68
+ issues.push("Files R2 directUpload maxAgeSeconds must be an integer from 0 to 86400.");
69
+ }
70
+ return issues;
71
+ }
72
+ /**
73
+ * Wrangler 4.112 has no CORS JSON flag. Parse its complete labelled permission
74
+ * projection, rejecting unknown formats instead of treating a successful CLI
75
+ * exit as proof. Rule IDs are not rendered and have no permission semantics.
76
+ */
77
+ function parseWranglerR2Cors(text, bucket) {
78
+ const lines = text.trim().split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
79
+ if (lines.shift() !== `Listing CORS rules for bucket '${bucket}'...`) {
80
+ return null;
81
+ }
82
+ if (lines.length === 1 &&
83
+ lines[0] ===
84
+ `There is no CORS configuration defined for bucket '${bucket}'.`)
85
+ return [];
86
+ if (!lines.length || lines.length % 5)
87
+ return null;
88
+ const labels = [
89
+ "allowed_origins",
90
+ "allowed_methods",
91
+ "allowed_headers",
92
+ "exposed_headers",
93
+ "max_age_seconds",
94
+ ];
95
+ const rules = [];
96
+ for (let i = 0; i < lines.length; i += 5) {
97
+ const values = labels.map((label, offset) => {
98
+ const line = lines[i + offset];
99
+ return line.startsWith(`${label}:`)
100
+ ? line.slice(label.length + 1).trim()
101
+ : null;
102
+ });
103
+ if (values.some((value) => value === null || value === ""))
104
+ return null;
105
+ const [origins, methods, headers, exposeHeaders, maxAge] = values;
106
+ if (!/^(?:0|[1-9]\d*|\(0 seconds\))$/.test(maxAge))
107
+ return null;
108
+ const maxAgeSeconds = maxAge === "(0 seconds)" ? 0 : Number(maxAge);
109
+ if (!Number.isSafeInteger(maxAgeSeconds))
110
+ return null;
111
+ const list = (value, empty) => value === empty ? [] : value.split(", ");
112
+ rules.push({
113
+ origins: list(origins, "(no origins)"),
114
+ methods: list(methods, "(no methods)"),
115
+ headers: list(headers, "(no headers)"),
116
+ exposeHeaders: list(exposeHeaders, "(no exposed headers)"),
117
+ maxAgeSeconds,
118
+ });
119
+ }
120
+ return rules;
121
+ }
122
+ /** Compares one minimal PUT rule, combining declared origins for a shared bucket. */
123
+ function r2CorsMatchesPolicy(rules, policy, environments) {
124
+ if (rules.length !== 1)
125
+ return false;
126
+ const rule = rules[0];
127
+ const equal = (a, b) => JSON.stringify([...a].sort()) === JSON.stringify([...b].sort());
128
+ return equal(rule.origins, [
129
+ ...new Set(environments.flatMap((environment) => policy.origins[environment])),
130
+ ]) &&
131
+ equal(rule.methods, ["PUT"]) &&
132
+ equal(rule.headers, policy.allowedHeaders) &&
133
+ rule.exposeHeaders.length === 0 &&
134
+ rule.maxAgeSeconds === policy.maxAgeSeconds;
135
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"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"}
@@ -77,6 +77,7 @@ const node_module_1 = require("node:module");
77
77
  const node_path_1 = require("node:path");
78
78
  const node_process_1 = __importDefault(require("node:process"));
79
79
  const node_util_1 = require("node:util");
80
+ const filesR2Policy_js_1 = require("./filesR2Policy.js");
80
81
  const releaseConfig_js_1 = require("./releaseConfig.js");
81
82
  const retention_js_1 = require("../apiKeys/retention.js");
82
83
  const projectSkills_js_1 = require("./projectSkills.js");
@@ -6042,6 +6043,11 @@ async function setupCloudflareR2(cwd, options = {}) {
6042
6043
  const dbConfig = mergeDbConfig(framework, dbFeature.config);
6043
6044
  const config = getFilesConfig(framework, dbConfig, feature.config);
6044
6045
  const existingProvider = config.storage.provider;
6046
+ if (existingProvider) {
6047
+ const policyIssues = (0, filesR2Policy_js_1.filesR2PolicyIssues)(existingProvider);
6048
+ if (policyIssues.length)
6049
+ throw new Error(policyIssues.join(" "));
6050
+ }
6045
6051
  const wranglerCommand = await detectWranglerCommand(cwd, commandRunner, env);
6046
6052
  if (!wranglerCommand) {
6047
6053
  throw new Error("Wrangler is not available. On Arch Linux install it with `sudo pacman -S wrangler`, then run `wrangler login`.");
@@ -6163,7 +6169,13 @@ async function setupCloudflareR2(cwd, options = {}) {
6163
6169
  buckets,
6164
6170
  connectionStatus: "buckets-ready",
6165
6171
  credentialMode: "manual",
6166
- directBrowserAccess: false,
6172
+ directBrowserAccess: existingProvider?.directBrowserAccess ?? false,
6173
+ ...(existingProvider?.directUpload
6174
+ ? { directUpload: existingProvider.directUpload }
6175
+ : {}),
6176
+ ...(existingProvider?.forcePathStyle !== undefined
6177
+ ? { forcePathStyle: existingProvider.forcePathStyle }
6178
+ : {}),
6167
6179
  endpoint: cloudflareR2Endpoint(accountId, jurisdiction),
6168
6180
  jurisdiction,
6169
6181
  kind: "cloudflare-r2",
@@ -6188,6 +6200,16 @@ async function setupCloudflareR2(cwd, options = {}) {
6188
6200
  throw new Error(`R2 bucket \`${bucket}\` exists, but Loom could not verify its private-access policy: ${privacy.detail}. Rerun after Wrangler can inspect public URL and custom-domain settings.`);
6189
6201
  }
6190
6202
  }
6203
+ if (config.storage.provider.directBrowserAccess) {
6204
+ for (const bucket of new Set(Object.values(buckets))) {
6205
+ const cors = await inspectR2BucketCors(cwd, commandRunner, providerEnv, wranglerCommand, bucket, config.storage.provider, options.cloudflareProfile);
6206
+ if (cors !== "matching") {
6207
+ throw new Error(`R2 bucket \`${bucket}\` CORS ${cors === "unknown"
6208
+ ? "could not be verified"
6209
+ : "differs from the declared presigned-PUT policy"}. Review and apply its exact CORS separately, then rerun setup; Loom never applies CORS implicitly.`);
6210
+ }
6211
+ }
6212
+ }
6191
6213
  const dependencyUpdate = await (0, projectTooling_js_1.mutateProjectDependencies)(cwd, tooling.dependencies, { dependencies: FILES_S3_DEPENDENCIES });
6192
6214
  if (dependencyUpdate.changed) {
6193
6215
  changedFiles.push(dependencyUpdate.config);
@@ -6207,7 +6229,9 @@ async function setupCloudflareR2(cwd, options = {}) {
6207
6229
  const desiredLocalValues = {
6208
6230
  FILES_S3_BUCKET: localBucket,
6209
6231
  FILES_S3_ENDPOINT: localEndpoint,
6210
- FILES_S3_FORCE_PATH_STYLE: localProvider === "minio" ? "true" : "false",
6232
+ FILES_S3_FORCE_PATH_STYLE: localProvider === "minio"
6233
+ ? "true"
6234
+ : String(config.storage.provider.forcePathStyle ?? false),
6211
6235
  FILES_S3_REGION: "auto",
6212
6236
  FILES_STORAGE_PROVIDER: localProvider === "minio"
6213
6237
  ? "minio"
@@ -6255,6 +6279,7 @@ async function setupCloudflareR2(cwd, options = {}) {
6255
6279
  FILES_S3_BUCKET: buckets[environment],
6256
6280
  FILES_S3_ENDPOINT: cloudflareR2Endpoint(accountId, jurisdiction),
6257
6281
  ...FILES_S3_NON_SECRET_ENV_VALUES,
6282
+ FILES_S3_FORCE_PATH_STYLE: String(config.storage.provider.forcePathStyle ?? false),
6258
6283
  };
6259
6284
  const existingNonSecretNames = Object.keys(nonSecretValues).filter((name) => hasExactEnvName(listing, name));
6260
6285
  if (existingNonSecretNames.length) {
@@ -7078,6 +7103,28 @@ async function inspectR2BucketPrivacy(cwd, commandRunner, env, wranglerCommand,
7078
7103
  }
7079
7104
  return { detail: "No public endpoint detected.", status: "private" };
7080
7105
  }
7106
+ async function inspectR2BucketCors(cwd, commandRunner, env, wranglerCommand, bucket, provider, cloudflareProfile) {
7107
+ const result = await commandRunner(wranglerCommand, r2BucketCommandArgs(["r2", "bucket", "cors", "list", bucket], provider, cloudflareProfile), {
7108
+ cwd,
7109
+ env: {
7110
+ ...env,
7111
+ NO_COLOR: "1",
7112
+ FORCE_COLOR: "0",
7113
+ WRANGLER_HIDE_BANNER: "true",
7114
+ },
7115
+ stdio: "pipe",
7116
+ });
7117
+ const rules = result.code === 0
7118
+ ? (0, filesR2Policy_js_1.parseWranglerR2Cors)(result.stdout, bucket)
7119
+ : null;
7120
+ if (rules === null)
7121
+ return "unknown";
7122
+ const environments = FILES_R2_ENVIRONMENTS.filter((environment) => provider.buckets[environment] === bucket);
7123
+ return provider.directUpload &&
7124
+ (0, filesR2Policy_js_1.r2CorsMatchesPolicy)(rules, provider.directUpload, environments)
7125
+ ? "matching"
7126
+ : "drift";
7127
+ }
7081
7128
  function checkFilesNetworkFeature(context) {
7082
7129
  const feature = context.manifest.features.files;
7083
7130
  if (!feature || feature.status !== "active")
@@ -7097,6 +7144,13 @@ function checkFilesNetworkFeature(context) {
7097
7144
  })),
7098
7145
  }];
7099
7146
  }
7147
+ const policyIssues = (0, filesR2Policy_js_1.filesR2PolicyIssues)(provider);
7148
+ if (policyIssues.length) {
7149
+ return [{
7150
+ label: "Cloudflare R2 private upload policy is valid",
7151
+ run: () => Promise.resolve(networkCheckResult("issue", "Invalid Files R2 policy; provider checks were not attempted.", { issues: policyIssues })),
7152
+ }];
7153
+ }
7100
7154
  const state = {
7101
7155
  accountAvailable: false,
7102
7156
  vercelCommand: null,
@@ -7216,6 +7270,33 @@ function checkFilesNetworkFeature(context) {
7216
7270
  },
7217
7271
  });
7218
7272
  }
7273
+ if (provider.directBrowserAccess) {
7274
+ for (const bucket of new Set(Object.values(provider.buckets))) {
7275
+ steps.push({
7276
+ label: `R2 bucket ${bucket} CORS matches the private presigned-PUT policy`,
7277
+ run: async () => {
7278
+ if (!state.wranglerCommand || !state.accountAvailable) {
7279
+ return networkCheckResult("skipped", "Skipped until Wrangler account access is verified.");
7280
+ }
7281
+ const cors = await inspectR2BucketCors(context.cwd, context.commandRunner, providerEnv, state.wranglerCommand, bucket, provider, context.cloudflareProfile);
7282
+ return cors === "matching"
7283
+ ? networkCheckResult("ok", `R2 bucket \`${bucket}\` CORS matches the declared private presigned-PUT policy.`)
7284
+ : networkCheckResult("issue", `R2 bucket \`${bucket}\` CORS is ${cors === "unknown"
7285
+ ? "unverified"
7286
+ : "different from the declared policy"}.`, {
7287
+ issues: [
7288
+ `Files R2 direct-upload CORS ${cors === "unknown"
7289
+ ? "could not be read or parsed"
7290
+ : "drift detected"}: ${bucket}.`,
7291
+ ],
7292
+ suggestions: [
7293
+ "Review the bucket's exact CORS policy using Wrangler; apply changes separately, then rerun `loom files r2 check`. Loom never applies CORS implicitly.",
7294
+ ],
7295
+ });
7296
+ },
7297
+ });
7298
+ }
7299
+ }
7219
7300
  steps.push({
7220
7301
  label: "Vercel CLI authentication and project link are available",
7221
7302
  run: async () => {
@@ -7291,6 +7372,7 @@ function checkFilesNetworkFeature(context) {
7291
7372
  FILES_S3_BUCKET: provider.buckets[environment],
7292
7373
  FILES_S3_ENDPOINT: provider.endpoint,
7293
7374
  ...FILES_S3_NON_SECRET_ENV_VALUES,
7375
+ FILES_S3_FORCE_PATH_STYLE: String(provider.forcePathStyle ?? false),
7294
7376
  };
7295
7377
  const drift = Object.entries(expectedValues).filter(([name, value]) => actualValues[name] !== value).map(([name]) => name);
7296
7378
  return drift.length
@@ -9010,10 +9092,7 @@ async function checkFilesFeature(cwd, framework, manifest, options) {
9010
9092
  if (provider.kind !== "cloudflare-r2") {
9011
9093
  issues.push("Files storage provider kind must be cloudflare-r2.");
9012
9094
  }
9013
- if (provider.accessMode !== "private" || provider.directBrowserAccess ||
9014
- provider.publicUrl !== null) {
9015
- issues.push("Files R2 provider policy must remain private unless a future explicit public-access workflow is adopted.");
9016
- }
9095
+ issues.push(...(0, filesR2Policy_js_1.filesR2PolicyIssues)(provider));
9017
9096
  if (!provider.accountId || !provider.buckets.production ||
9018
9097
  !provider.buckets.preview) {
9019
9098
  issues.push("Files R2 provider policy is missing account or bucket identifiers.");
@@ -56,7 +56,18 @@ Use this skill when working on the shared files feature from a consuming app.
56
56
  - Keep the default separate private Production and Preview buckets unless the
57
57
  app deliberately chooses `--shared-bucket`. Do not enable public development
58
58
  URLs, custom domains, browser-direct uploads, or CORS as part of standard
59
- setup.
59
+ setup. Apps with reviewed signers/finalizers may declare private
60
+ `directBrowserAccess:true` plus `directUpload.kind:presigned-put`, exact
61
+ Production/Preview HTTPS origins, explicit lowercase allowed headers, and
62
+ `maxAgeSeconds`. Keep `accessMode:private` and `publicUrl:null`. CORS does not
63
+ grant object access; app authorization and signed size/digest/expiry bounds
64
+ remain mandatory. See `docs/files-feature.md` for the complete fragment.
65
+ - Setup preserves a valid declared direct-upload policy and optional
66
+ `forcePathStyle` (omitted defaults false). With direct uploads declared, it
67
+ stops on missing/unverified CORS after retaining the bucket records. Apply
68
+ only a separately reviewed exact policy with Wrangler, then rerun setup.
69
+ Setup/check never apply CORS or enable public endpoints. A shared bucket's
70
+ rule contains the union of its declared environment origins.
60
71
  - Create an R2 Object Read & Write API token manually and scope it only to the
61
72
  configured bucket or buckets. Use `--configure-secrets` to let Vercel prompt
62
73
  for missing Production/Preview values without exposing them to Loom. Never