wire-mesh-core 1.33.0 → 1.35.0

package/dist/domain/group-key.cjs

@@ -84,10 +84,28 @@ async function encryptNoticeContent(contentKey, plaintext) {
 async function decryptNoticeContent(contentKey, ciphertext) {
 	return aesGcmDecrypt(await importContentKey(contentKey), ciphertext);
 }
+/** The literal content-type suffix marking a room-notice's content as AES-256-GCM-encrypted under a room.rekey epoch's content key (room.cddl's own key-epoch obligation comment) -- the same suffix convention MIME structured syntaxes like `application/jose+json` already use, so a reader without the key still learns the notice's true underlying kind. */
+const ENCRYPTED_CONTENT_TYPE_SUFFIX = "+aes256gcm";
+/** The notice's own TRUE content-type, with the encryption suffix appended -- never a separate generic sentinel, so the true type stays visible without decrypting anything. Idempotent: an already-suffixed type is returned unchanged. */
+function encryptedContentType(plaintextContentType_) {
+	return isEncryptedContentType(plaintextContentType_) ? plaintextContentType_ : `${plaintextContentType_}${ENCRYPTED_CONTENT_TYPE_SUFFIX}`;
+}
+/** Strips the encryption suffix back off, recovering the plaintext content-type the sender originally had. A content-type carrying no suffix is returned unchanged. */
+function plaintextContentType(encryptedContentType_) {
+	return isEncryptedContentType(encryptedContentType_) ? encryptedContentType_.slice(0, encryptedContentType_.length - 10) : encryptedContentType_;
+}
+/** Whether a content-type names encrypted content (and therefore that the notice carrying it MUST also name its key-epoch -- room.cddl obligation 7). */
+function isEncryptedContentType(contentType) {
+	return contentType.endsWith(ENCRYPTED_CONTENT_TYPE_SUFFIX);
+}
 //#endregion
+exports.ENCRYPTED_CONTENT_TYPE_SUFFIX = ENCRYPTED_CONTENT_TYPE_SUFFIX;
 exports.decryptNoticeContent = decryptNoticeContent;
 exports.deriveWrappingKey = deriveWrappingKey;
 exports.encryptNoticeContent = encryptNoticeContent;
+exports.encryptedContentType = encryptedContentType;
 exports.generateContentKey = generateContentKey;
+exports.isEncryptedContentType = isEncryptedContentType;
+exports.plaintextContentType = plaintextContentType;
 exports.unwrapContentKey = unwrapContentKey;
 exports.wrapContentKey = wrapContentKey;

package/dist/domain/group-key.d.cts

@@ -21,4 +21,12 @@ export declare function unwrapContentKey(wrappingKey: CryptoKey, wrapped: Uint8A
 export declare function encryptNoticeContent(contentKey: Uint8Array, plaintext: Uint8Array): Promise<Uint8Array<ArrayBuffer>>;
 /** Decrypts a room-notice's own `content`, given the content-encryption key for the epoch its key-epoch field names. Rejects on a wrong key or tampered ciphertext, same as unwrapContentKey. */
 export declare function decryptNoticeContent(contentKey: Uint8Array, ciphertext: Uint8Array): Promise<Uint8Array<ArrayBuffer>>;
+/** The literal content-type suffix marking a room-notice's content as AES-256-GCM-encrypted under a room.rekey epoch's content key (room.cddl's own key-epoch obligation comment) -- the same suffix convention MIME structured syntaxes like `application/jose+json` already use, so a reader without the key still learns the notice's true underlying kind. */
+export declare const ENCRYPTED_CONTENT_TYPE_SUFFIX = "+aes256gcm";
+/** The notice's own TRUE content-type, with the encryption suffix appended -- never a separate generic sentinel, so the true type stays visible without decrypting anything. Idempotent: an already-suffixed type is returned unchanged. */
+export declare function encryptedContentType(plaintextContentType_: string): string;
+/** Strips the encryption suffix back off, recovering the plaintext content-type the sender originally had. A content-type carrying no suffix is returned unchanged. */
+export declare function plaintextContentType(encryptedContentType_: string): string;
+/** Whether a content-type names encrypted content (and therefore that the notice carrying it MUST also name its key-epoch -- room.cddl obligation 7). */
+export declare function isEncryptedContentType(contentType: string): boolean;
 //#endregion

package/dist/domain/group-key.d.mts

@@ -21,4 +21,12 @@ export declare function unwrapContentKey(wrappingKey: CryptoKey, wrapped: Uint8A
 export declare function encryptNoticeContent(contentKey: Uint8Array, plaintext: Uint8Array): Promise<Uint8Array<ArrayBuffer>>;
 /** Decrypts a room-notice's own `content`, given the content-encryption key for the epoch its key-epoch field names. Rejects on a wrong key or tampered ciphertext, same as unwrapContentKey. */
 export declare function decryptNoticeContent(contentKey: Uint8Array, ciphertext: Uint8Array): Promise<Uint8Array<ArrayBuffer>>;
+/** The literal content-type suffix marking a room-notice's content as AES-256-GCM-encrypted under a room.rekey epoch's content key (room.cddl's own key-epoch obligation comment) -- the same suffix convention MIME structured syntaxes like `application/jose+json` already use, so a reader without the key still learns the notice's true underlying kind. */
+export declare const ENCRYPTED_CONTENT_TYPE_SUFFIX = "+aes256gcm";
+/** The notice's own TRUE content-type, with the encryption suffix appended -- never a separate generic sentinel, so the true type stays visible without decrypting anything. Idempotent: an already-suffixed type is returned unchanged. */
+export declare function encryptedContentType(plaintextContentType_: string): string;
+/** Strips the encryption suffix back off, recovering the plaintext content-type the sender originally had. A content-type carrying no suffix is returned unchanged. */
+export declare function plaintextContentType(encryptedContentType_: string): string;
+/** Whether a content-type names encrypted content (and therefore that the notice carrying it MUST also name its key-epoch -- room.cddl obligation 7). */
+export declare function isEncryptedContentType(contentType: string): boolean;
 //#endregion

package/dist/domain/group-key.mjs

@@ -83,5 +83,19 @@ async function encryptNoticeContent(contentKey, plaintext) {
 async function decryptNoticeContent(contentKey, ciphertext) {
 	return aesGcmDecrypt(await importContentKey(contentKey), ciphertext);
 }
+/** The literal content-type suffix marking a room-notice's content as AES-256-GCM-encrypted under a room.rekey epoch's content key (room.cddl's own key-epoch obligation comment) -- the same suffix convention MIME structured syntaxes like `application/jose+json` already use, so a reader without the key still learns the notice's true underlying kind. */
+const ENCRYPTED_CONTENT_TYPE_SUFFIX = "+aes256gcm";
+/** The notice's own TRUE content-type, with the encryption suffix appended -- never a separate generic sentinel, so the true type stays visible without decrypting anything. Idempotent: an already-suffixed type is returned unchanged. */
+function encryptedContentType(plaintextContentType_) {
+	return isEncryptedContentType(plaintextContentType_) ? plaintextContentType_ : `${plaintextContentType_}${ENCRYPTED_CONTENT_TYPE_SUFFIX}`;
+}
+/** Strips the encryption suffix back off, recovering the plaintext content-type the sender originally had. A content-type carrying no suffix is returned unchanged. */
+function plaintextContentType(encryptedContentType_) {
+	return isEncryptedContentType(encryptedContentType_) ? encryptedContentType_.slice(0, encryptedContentType_.length - 10) : encryptedContentType_;
+}
+/** Whether a content-type names encrypted content (and therefore that the notice carrying it MUST also name its key-epoch -- room.cddl obligation 7). */
+function isEncryptedContentType(contentType) {
+	return contentType.endsWith(ENCRYPTED_CONTENT_TYPE_SUFFIX);
+}
 //#endregion
-export { decryptNoticeContent, deriveWrappingKey, encryptNoticeContent, generateContentKey, unwrapContentKey, wrapContentKey };
+export { ENCRYPTED_CONTENT_TYPE_SUFFIX, decryptNoticeContent, deriveWrappingKey, encryptNoticeContent, encryptedContentType, generateContentKey, isEncryptedContentType, plaintextContentType, unwrapContentKey, wrapContentKey };

package/dist/domain/room.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_generated_protocol = require("../generated/protocol.cjs");
+const require_domain_group_key = require("./group-key.cjs");
 const require_domain_room_token_verification = require("./room-token-verification.cjs");
 let cbor2 = require("cbor2");
 //#region src/domain/room.ts
@@ -91,6 +92,11 @@ async function verifyRoomNotice(notice, options) {
 		ok: false,
 		reason: "content_expired"
 	};
+	const keyEpoch = claims["key-epoch"];
+	if (require_domain_group_key.isEncryptedContentType(claims["content-type"]) !== (keyEpoch !== void 0)) return {
+		ok: false,
+		reason: "key_epoch_mismatch"
+	};
 	const tokenVerdict = await require_domain_room_token_verification.verifyRoomToken(claims.token, {
 		identity: options.identity,
 		clock: options.clock,
@@ -130,7 +136,8 @@ async function createRoomNotice(options) {
 		"content-type": options.contentType,
 		content: options.content,
 		...options.refs !== void 0 ? { refs: [...options.refs] } : {},
-		...options.validUntil !== void 0 ? { "valid-until": options.validUntil } : {}
+		...options.validUntil !== void 0 ? { "valid-until": options.validUntil } : {},
+		...options.keyEpoch !== void 0 ? { "key-epoch": options.keyEpoch } : {}
 	});
 	const protectedHeader = protectedHeaderFor(options.identity);
 	return [

package/dist/domain/room.d.cts

@@ -4,7 +4,7 @@ import { t as Clock } from "../clock-DiSx-WKM.cjs";
 import { a as RevocationCheck } from "../tokens-C9Kwy0Gk.cjs";
 import { RoomTokenVerdictReason } from "./room-token-verification.cjs";
 //#region src/domain/room.d.ts
-export type RoomNoticeVerdictReason = "malformed" | "wrong_room" | "bad_signature" | "wrong_poster" | "content_expired" | RoomTokenVerdictReason;
+export type RoomNoticeVerdictReason = "malformed" | "wrong_room" | "bad_signature" | "wrong_poster" | "content_expired" | "key_epoch_mismatch" | RoomTokenVerdictReason;
 export type RoomNoticeVerdict = {
   ok: true;
   claims: RoomNoticeClaims;
@@ -45,6 +45,8 @@ export interface CreateRoomNoticeOptions {
   content: Uint8Array<ArrayBuffer>;
   refs?: readonly MessageRef[];
   validUntil?: number;
+  /** Which room.rekey epoch content is encrypted under (wire-mesh#141), present iff content-type names an encrypted content-type -- see room-notice-claims' own obligation 7 comment in room.cddl. This function does not itself encrypt content: the caller encrypts via group-key.ts's encryptNoticeContent beforehand and passes the resulting ciphertext as content, exactly as it would pass any other opaque bytes. */
+  keyEpoch?: number;
 }
 /**
  * Mints one self-certifying room-notice as `identity` -- the counterpart to verifyRoomNotice above, producing exactly what it accepts. `posted-at` is always stamped from the injected clock, never caller-supplied, matching obligation 4's own requirement that a poster's own log stay non-decreasing: a caller backdating its own posted-at would be indistinguishable from a clock bug at mint time, so this function simply doesn't expose the field to override.

package/dist/domain/room.d.mts

@@ -4,7 +4,7 @@ import { t as Clock } from "../clock-DiSx-WKM.mjs";
 import { a as RevocationCheck } from "../tokens-k172l0Iy.mjs";
 import { RoomTokenVerdictReason } from "./room-token-verification.mjs";
 //#region src/domain/room.d.ts
-export type RoomNoticeVerdictReason = "malformed" | "wrong_room" | "bad_signature" | "wrong_poster" | "content_expired" | RoomTokenVerdictReason;
+export type RoomNoticeVerdictReason = "malformed" | "wrong_room" | "bad_signature" | "wrong_poster" | "content_expired" | "key_epoch_mismatch" | RoomTokenVerdictReason;
 export type RoomNoticeVerdict = {
   ok: true;
   claims: RoomNoticeClaims;
@@ -45,6 +45,8 @@ export interface CreateRoomNoticeOptions {
   content: Uint8Array<ArrayBuffer>;
   refs?: readonly MessageRef[];
   validUntil?: number;
+  /** Which room.rekey epoch content is encrypted under (wire-mesh#141), present iff content-type names an encrypted content-type -- see room-notice-claims' own obligation 7 comment in room.cddl. This function does not itself encrypt content: the caller encrypts via group-key.ts's encryptNoticeContent beforehand and passes the resulting ciphertext as content, exactly as it would pass any other opaque bytes. */
+  keyEpoch?: number;
 }
 /**
  * Mints one self-certifying room-notice as `identity` -- the counterpart to verifyRoomNotice above, producing exactly what it accepts. `posted-at` is always stamped from the injected clock, never caller-supplied, matching obligation 4's own requirement that a poster's own log stay non-decreasing: a caller backdating its own posted-at would be indistinguishable from a clock bug at mint time, so this function simply doesn't expose the field to override.

package/dist/domain/room.mjs

@@ -1,4 +1,5 @@
 import { roomNoticeClaimsSchema } from "../generated/protocol.mjs";
+import { isEncryptedContentType } from "./group-key.mjs";
 import { verifyRoomToken } from "./room-token-verification.mjs";
 import { cdeDecodeOptions, cdeEncodeOptions, decode, encode } from "cbor2";
 //#region src/domain/room.ts
@@ -90,6 +91,11 @@ async function verifyRoomNotice(notice, options) {
 		ok: false,
 		reason: "content_expired"
 	};
+	const keyEpoch = claims["key-epoch"];
+	if (isEncryptedContentType(claims["content-type"]) !== (keyEpoch !== void 0)) return {
+		ok: false,
+		reason: "key_epoch_mismatch"
+	};
 	const tokenVerdict = await verifyRoomToken(claims.token, {
 		identity: options.identity,
 		clock: options.clock,
@@ -129,7 +135,8 @@ async function createRoomNotice(options) {
 		"content-type": options.contentType,
 		content: options.content,
 		...options.refs !== void 0 ? { refs: [...options.refs] } : {},
-		...options.validUntil !== void 0 ? { "valid-until": options.validUntil } : {}
+		...options.validUntil !== void 0 ? { "valid-until": options.validUntil } : {},
+		...options.keyEpoch !== void 0 ? { "key-epoch": options.keyEpoch } : {}
 	});
 	const protectedHeader = protectedHeaderFor(options.identity);
 	return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wire-mesh-core",
-  "version": "1.33.0",
+  "version": "1.35.0",
   "type": "module",
   "packageManager": "pnpm@12.4.1+sha512.2e81e399d73fe8390dab25e06aa788ab7a5908248d2f5a370f82b481147a6a7a367bf8048f9a6fdb6460f21a66f0542dedb8b94ca2c8723596741920b1656d4c",
   "repository": {