@fedify/fedify 2.5.0-dev.2332 → 2.5.0-dev.2355

package/dist/sig/proof.test.mjs

@@ -11,10 +11,10 @@ import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { a as verificationObservation } from "../verification-Dpfcw8ml.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { a as signObject, c as verifyPortableObjectProof, d as verifyProof, i as hasProofLike, o as verifyMapLocalProof, r as createProof, s as verifyObject } from "../proof-DJEy_0Hi.mjs";
-import { f as verifyRequest } from "../http-CV-U1gzt.mjs";
+import { a as signObject, c as verifyPortableObjectProof, d as verifyProof, i as hasProofLike, o as verifyMapLocalProof, r as createProof, s as verifyObject } from "../proof-DaG_j0Bu.mjs";
+import { f as verifyRequest } from "../http-C5xWwbV0.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-RGQuuAB3.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-kq9Chx_S.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place, Translation } from "@fedify/vocab";
 import { decodeMultibase, encodeMultibase, exportDidKey, exportMultibaseKey, formatIri, importMultibaseKey, parseIri } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -2265,6 +2265,85 @@ test("signObject() preserves FEP-22cd contexts through proof verification", asyn
 	assertInstanceOf(verified, Note);
 	assertEquals(verified.translations[0].language?.baseName, "ko");
 });
+async function signLicensedNote(license, context = []) {
+	return await signPortableJsonLd({
+		"@context": [...portableContext, ...context],
+		id: `ap+ef61://${portableDid}/objects/licensed`,
+		type: "Note",
+		attributedTo: `ap+ef61://${portableDid}/actor`,
+		content: "A licensed note",
+		...license
+	});
+}
+const licenseVerifyOptions = {
+	documentLoader() {
+		throw new Error("No document fetch expected");
+	},
+	contextLoader: mockDocumentLoader
+};
+test("verifyObject() keeps FEP-6757 license synonyms of a parsed object", async () => {
+	const license = "https://creativecommons.org/licenses/by/4.0/";
+	const signed = await signLicensedNote({ "schema:license": license }, [{ schema: "https://schema.org/" }]);
+	const verified = await verifyObject(Note, signed, licenseVerifyOptions);
+	assertInstanceOf(verified, Note);
+	assertEquals(verified.licenses, [new URL(license)]);
+	const json = await (await Note.fromJsonLd(signed, licenseVerifyOptions)).toJsonLd();
+	assertEquals(json, signed);
+	assertFalse("license" in json);
+	assertInstanceOf(await verifyObject(Note, json, licenseVerifyOptions), Note);
+});
+test("signObject() signs FEP-6757 licenses", async () => {
+	const license = new URL("https://creativecommons.org/licenses/by/4.0/");
+	const signed = await signObject(new Note({
+		id: parseIri(`ap://${portableDid}/objects/licensed`),
+		attribution: parseIri(`ap://${portableDid}/actor`),
+		content: "A licensed note",
+		licenses: [license]
+	}), ed25519PrivateKey, portableKeyId, { contextLoader: mockDocumentLoader });
+	const json = await signed.toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader
+	});
+	assertEquals(json.license, license.href);
+	assert(json["@context"].includes("https://w3id.org/fep/6757"));
+	const verified = await verifyObject(Note, json, licenseVerifyOptions);
+	assertInstanceOf(verified, Note);
+	assertEquals(verified.licenses, [license]);
+	const create = await new Create({
+		actor: parseIri(`ap://${portableDid}/actor`),
+		object: signed
+	}).toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(create.object, json);
+	assertInstanceOf(await verifyObject(Note, create.object, licenseVerifyOptions), Note);
+	const relicensed = signed.clone({ licenses: [new URL("https://creativecommons.org/publicdomain/zero/1.0/")] });
+	assertEquals(await verifyObject(Note, await relicensed.toJsonLd({ contextLoader: mockDocumentLoader }), licenseVerifyOptions), null);
+	assertInstanceOf(await verifyObject(Note, await (await signObject(relicensed.clone({ proofs: [] }), ed25519PrivateKey, portableKeyId, { contextLoader: mockDocumentLoader })).toJsonLd({ contextLoader: mockDocumentLoader }), licenseVerifyOptions), Note);
+});
+test("verifyObject() and FEP-6757 licenses that cannot be preserved", async () => {
+	const license = "https://creativecommons.org/licenses/by/4.0/";
+	const contexts = ["https://w3id.org/fep/6757"];
+	const aliased = await signLicensedNote({ "schema:license": license }, [{ schema: "https://schema.org/" }]);
+	const create = await new Create({
+		actor: parseIri(`ap://${portableDid}/actor`),
+		object: await Note.fromJsonLd(aliased, licenseVerifyOptions)
+	}).toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader
+	});
+	const object = create.object;
+	assertEquals(object.license, license);
+	assertEquals(await verifyObject(Note, {
+		...object,
+		"@context": create["@context"]
+	}, licenseVerifyOptions), null);
+	const invalid = await signLicensedNote({ license: ["CC-BY-4.0", license] }, contexts);
+	const verified = await verifyObject(Note, invalid, licenseVerifyOptions);
+	assertInstanceOf(verified, Note);
+	assertEquals(verified.licenses, [new URL(license)]);
+	const json = await (await Note.fromJsonLd(invalid, licenseVerifyOptions)).toJsonLd();
+	assertEquals(json.license, license);
+	assertEquals(await verifyObject(Note, json, licenseVerifyOptions), null);
+});
 test("verifyObject() rejects a key that claims a forged controller", async () => {
 	const keyId = new URL("https://attacker.example/multikey");
 	const impersonated = "https://example.com/person2";

package/dist/sig/tootik-request-interop.test.mjs

@@ -5,10 +5,10 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { c as verifyPortableObjectProof } from "../proof-DJEy_0Hi.mjs";
-import { p as verifyRequestDetailed } from "../http-CV-U1gzt.mjs";
-import { o as createFederation } from "../middleware-CZ3h4285.mjs";
-import { t as doesActorOwnKey } from "../owner-CWP8TJYf.mjs";
+import { c as verifyPortableObjectProof } from "../proof-DaG_j0Bu.mjs";
+import { p as verifyRequestDetailed } from "../http-C5xWwbV0.mjs";
+import { o as createFederation } from "../middleware-BYr3Msfi.mjs";
+import { t as doesActorOwnKey } from "../owner-nshRE6qk.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { encodeHex } from "byte-encodings/hex";

package/dist/sig/tootik-send-interop.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { c as verifyPortableObjectProof } from "../proof-DJEy_0Hi.mjs";
-import { p as verifyRequestDetailed } from "../http-CV-U1gzt.mjs";
-import { t as doesActorOwnKey } from "../owner-CWP8TJYf.mjs";
+import { c as verifyPortableObjectProof } from "../proof-DaG_j0Bu.mjs";
+import { p as verifyRequestDetailed } from "../http-C5xWwbV0.mjs";
+import { t as doesActorOwnKey } from "../owner-nshRE6qk.mjs";
 import { Create } from "@fedify/vocab";
 import { decodeMultibase, importDidKey } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/sig/verification.test.mjs

@@ -2,9 +2,9 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { a as verificationObservation } from "../verification-Dpfcw8ml.mjs";
-import { h as verifyJsonLd, p as signJsonLd } from "../ld-xCF3uib3.mjs";
-import { a as signObject, s as verifyObject } from "../proof-DJEy_0Hi.mjs";
-import { l as signRequest, p as verifyRequestDetailed } from "../http-CV-U1gzt.mjs";
+import { h as verifyJsonLd, p as signJsonLd } from "../ld-BV-KJnt5.mjs";
+import { a as signObject, s as verifyObject } from "../proof-DaG_j0Bu.mjs";
+import { l as signRequest, p as verifyRequestDetailed } from "../http-C5xWwbV0.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
 import { Activity, Create, CryptographicKey, Multikey } from "@fedify/vocab";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{temporal-DfSP6Egi.mjs → temporal-B2lL-04X.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-xCF3uib3.mjs";
+import { c as getNormalizationContextLoader } from "./ld-BV-KJnt5.mjs";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/federation/temporal.ts
 function isPlainObject(value) {

package/dist/testing/kv.test.mjs

@@ -6,7 +6,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as ManualClockKvStore } from "../kv-DBRWVx3Q.mjs";
 import { n as baseOptions, o as stringSchema, t as MockQueue } from "../tasks-IG3pHfvZ.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
-import { o as createFederation } from "../middleware-CZ3h4285.mjs";
+import { o as createFederation } from "../middleware-BYr3Msfi.mjs";
 //#region src/testing/kv.test.ts
 test("ManualClockKvStore keeps an entry at its exact expiration instant", async () => {
 	const kv = new ManualClockKvStore();

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { f as verifyRequest } from "../http-CV-U1gzt.mjs";
+import { f as verifyRequest } from "../http-C5xWwbV0.mjs";
 import { i as rsaPrivateKey2 } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-RGQuuAB3.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-kq9Chx_S.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/utils/kv-cache.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as kvCache, t as MockKvStore } from "../kv-cache-B92sMeCi.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-D1Ch4Ju7.mjs";
 import { preloadedContexts } from "@fedify/vocab-runtime";
 import { deepStrictEqual, throws } from "node:assert";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/utils/mod.cjs

@@ -1,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-BrkL2HsF.cjs");
+const require_kv_cache = require("../kv-cache-CrFiG0QG.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-DcyE1x0o.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-CKyL3Ut3.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.5.0-dev.2332+d4e3f91f",
+  "version": "2.5.0-dev.2355+c92a1cb1",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -151,10 +151,10 @@
     "structured-field-values": "^2.0.4",
     "temporal-polyfill": "^1.0.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/uri-template": "2.5.0-dev.2332+d4e3f91f",
-    "@fedify/vocab-runtime": "2.5.0-dev.2332+d4e3f91f",
-    "@fedify/vocab": "2.5.0-dev.2332+d4e3f91f",
-    "@fedify/webfinger": "2.5.0-dev.2332+d4e3f91f"
+    "@fedify/uri-template": "2.5.0-dev.2355+c92a1cb1",
+    "@fedify/vocab": "2.5.0-dev.2355+c92a1cb1",
+    "@fedify/vocab-runtime": "2.5.0-dev.2355+c92a1cb1",
+    "@fedify/webfinger": "2.5.0-dev.2355+c92a1cb1"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -166,8 +166,8 @@
     "tsx": "^4.21.0",
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
-    "@fedify/vocab-tools": "^2.5.0-dev.2332+d4e3f91f",
-    "@fedify/fixture": "2.0.0"
+    "@fedify/fixture": "2.0.0",
+    "@fedify/vocab-tools": "^2.5.0-dev.2355+c92a1cb1"
   },
   "scripts": {
     "build:self": "tsdown",