@indigoai-us/hq-cloud 6.18.22 → 6.18.23

package/dist/kms10-etag-safe-pull.d.ts

@@ -0,0 +1,20 @@
+export declare const KMS10_COPY_MARKER_META_KEY = "hq-kms10-reencrypt-current";
+export declare const KMS10_COPY_ORIGINAL_KEY_HASH_META_KEY = "hq-kms10-original-key-sha256";
+export declare function kms10OriginalKeyHash(key: string): string;
+export interface Kms10RemoteRevision {
+    etag: string;
+    size: number;
+}
+export interface Kms10HeadRevision {
+    etag: string;
+    size: number;
+    metadata?: Record<string, string>;
+}
+/**
+ * Prove that a changed ETag is only the re-encryption copy. The marker alone
+ * is insufficient: require the listed revision, byte count, and persisted
+ * content hash to match the prior journal baseline, or the source ETag to
+ * match the prior journal revision for older files without hash metadata.
+ */
+export declare function isKms10CopyOfJournalBase(listed: Kms10RemoteRevision, head: Kms10HeadRevision | null, journalHash: string, journalEtag: string, expectedKey: string): boolean;
+//# sourceMappingURL=kms10-etag-safe-pull.d.ts.map

package/dist/kms10-etag-safe-pull.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"kms10-etag-safe-pull.d.ts","sourceRoot":"","sources":["../src/kms10-etag-safe-pull.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AACvE,eAAO,MAAM,qCAAqC,iCAAiC,CAAC;AAEpF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,iBAAiB,GAAG,IAAI,EAC9B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAgBT"}

package/dist/kms10-etag-safe-pull.js

@@ -0,0 +1,37 @@
+import { createHash } from "node:crypto";
+import { normalizeEtag } from "./journal.js";
+import { contentHashMatchesRawSha256 } from "./sync/content-hash.js";
+export const KMS10_COPY_MARKER_META_KEY = "hq-kms10-reencrypt-current";
+export const KMS10_COPY_ORIGINAL_KEY_HASH_META_KEY = "hq-kms10-original-key-sha256";
+export function kms10OriginalKeyHash(key) {
+    return createHash("sha256").update(key, "utf8").digest("hex");
+}
+/**
+ * Prove that a changed ETag is only the re-encryption copy. The marker alone
+ * is insufficient: require the listed revision, byte count, and persisted
+ * content hash to match the prior journal baseline, or the source ETag to
+ * match the prior journal revision for older files without hash metadata.
+ */
+export function isKms10CopyOfJournalBase(listed, head, journalHash, journalEtag, expectedKey) {
+    if (!head || !journalHash)
+        return false;
+    if (head.metadata?.[KMS10_COPY_MARKER_META_KEY] !== "true")
+        return false;
+    // S3 copies source metadata by default. A later legitimate CopyObject to a
+    // different key can inherit the KMS-10 marker, so only accept the marker at
+    // the key the migration copied in place.
+    if (head.metadata?.[KMS10_COPY_ORIGINAL_KEY_HASH_META_KEY] !== kms10OriginalKeyHash(expectedKey))
+        return false;
+    if (normalizeEtag(head.etag) !== normalizeEtag(listed.etag))
+        return false;
+    if (head.size !== listed.size)
+        return false;
+    const copiedHash = head.metadata?.["hq-content-sha256"];
+    if (copiedHash !== undefined) {
+        // Older writers persist raw SHA-256 in S3 metadata; newer event envelopes
+        // use the tagged wire form accepted by contentHashMatchesRawSha256.
+        return copiedHash === journalHash || contentHashMatchesRawSha256(copiedHash, journalHash);
+    }
+    return normalizeEtag(head.metadata?.["hq-kms10-original-etag"] ?? "") === normalizeEtag(journalEtag);
+}
+//# sourceMappingURL=kms10-etag-safe-pull.js.map

package/dist/kms10-etag-safe-pull.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kms10-etag-safe-pull.js","sourceRoot":"","sources":["../src/kms10-etag-safe-pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAErE,MAAM,CAAC,MAAM,0BAA0B,GAAG,4BAA4B,CAAC;AACvE,MAAM,CAAC,MAAM,qCAAqC,GAAG,8BAA8B,CAAC;AAEpF,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAChE,CAAC;AAaD;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,MAA2B,EAC3B,IAA8B,EAC9B,WAAmB,EACnB,WAAmB,EACnB,WAAmB;IAEnB,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,0BAA0B,CAAC,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IACzE,2EAA2E;IAC3E,4EAA4E;IAC5E,yCAAyC;IACzC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,qCAAqC,CAAC,KAAK,oBAAoB,CAAC,WAAW,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/G,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1E,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,mBAAmB,CAAC,CAAC;IACxD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,0EAA0E;QAC1E,oEAAoE;QACpE,OAAO,UAAU,KAAK,WAAW,IAAI,2BAA2B,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC5F,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,wBAAwB,CAAC,IAAI,EAAE,CAAC,KAAK,aAAa,CAAC,WAAW,CAAC,CAAC;AACvG,CAAC"}

package/dist/kms10-etag-safe-pull.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=kms10-etag-safe-pull.test.d.ts.map

package/dist/kms10-etag-safe-pull.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"kms10-etag-safe-pull.test.d.ts","sourceRoot":"","sources":["../src/kms10-etag-safe-pull.test.ts"],"names":[],"mappings":""}

package/dist/kms10-etag-safe-pull.test.js

@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+import { isKms10CopyOfJournalBase, kms10OriginalKeyHash } from "./kms10-etag-safe-pull.js";
+const HASH = "a".repeat(64);
+const REMOTE = { etag: '"after-copy"', size: 12 };
+const HEAD = {
+    etag: '"after-copy"',
+    size: 12,
+    metadata: {
+        "hq-kms10-reencrypt-current": "true",
+        "hq-kms10-original-key-sha256": kms10OriginalKeyHash("docs/a.md"),
+        "hq-content-sha256": `sha256:${HASH}`,
+        "hq-kms10-original-etag": "before-copy",
+    },
+};
+describe("KMS-10 ETag-only copy detection", () => {
+    it("recognizes a marked copy whose bytes match the journal baseline", () => {
+        expect(isKms10CopyOfJournalBase(REMOTE, HEAD, HASH, "before-copy", "docs/a.md")).toBe(true);
+    });
+    it("accepts the raw SHA-256 value persisted in S3 user metadata", () => {
+        expect(isKms10CopyOfJournalBase(REMOTE, {
+            ...HEAD,
+            metadata: { ...HEAD.metadata, "hq-content-sha256": HASH },
+        }, HASH, "before-copy", "docs/a.md")).toBe(true);
+    });
+    it("does not trust a marker inherited by a copy to a different key", () => {
+        expect(isKms10CopyOfJournalBase(REMOTE, HEAD, HASH, "before-copy", "docs/other.md")).toBe(false);
+    });
+    it("does not suppress an ordinary write without the migration marker", () => {
+        expect(isKms10CopyOfJournalBase(REMOTE, {
+            ...HEAD,
+            metadata: { "hq-content-sha256": `sha256:${HASH}` },
+        }, HASH, "before-copy", "docs/a.md")).toBe(false);
+    });
+    it("does not suppress a copy whose bytes differ from the journal baseline", () => {
+        expect(isKms10CopyOfJournalBase(REMOTE, {
+            ...HEAD,
+            metadata: { ...HEAD.metadata, "hq-content-sha256": `sha256:${"b".repeat(64)}` },
+        }, HASH, "before-copy", "docs/a.md")).toBe(false);
+    });
+    it("does not trust a HEAD result for a different listed revision", () => {
+        expect(isKms10CopyOfJournalBase(REMOTE, { ...HEAD, etag: '"newer-write"' }, HASH, "before-copy", "docs/a.md")).toBe(false);
+    });
+    it("does not suppress a size mismatch", () => {
+        expect(isKms10CopyOfJournalBase(REMOTE, { ...HEAD, size: 13 }, HASH, "before-copy", "docs/a.md")).toBe(false);
+    });
+    it("uses the original ETag identity when legacy files have no content hash metadata", () => {
+        const { ["hq-content-sha256"]: _hash, ...legacyMetadata } = HEAD.metadata;
+        const legacyHead = { ...HEAD, metadata: legacyMetadata };
+        expect(isKms10CopyOfJournalBase(REMOTE, legacyHead, HASH, "before-copy", "docs/a.md")).toBe(true);
+        expect(isKms10CopyOfJournalBase(REMOTE, legacyHead, HASH, "different-baseline", "docs/a.md")).toBe(false);
+    });
+});
+//# sourceMappingURL=kms10-etag-safe-pull.test.js.map

package/dist/kms10-etag-safe-pull.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kms10-etag-safe-pull.test.js","sourceRoot":"","sources":["../src/kms10-etag-safe-pull.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cloud",
-  "version": "6.18.22",
+  "version": "6.18.23",
   "description": "HQ by Indigo cloud sync engine — bidirectional S3 sync for mobile access",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",