@fedify/fedify 2.0.0-dev.1604 → 2.0.0-dev.161

package/dist/{proof-VPikK_0V.js → proof-C-751PeN.js}

@@ -1,15 +1,15 @@
 
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-    
-import { deno_default, getDocumentLoader } from "./docloader-CkASOfZ5.js";
-import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, getTypeId, isActor } from "./actor-BC3XtGTj.js";
-import { fetchKey, validateCryptoKey } from "./key-Bif4eMj7.js";
+          import { Temporal } from "@js-temporal/polyfill";
+          import { URLPattern } from "urlpattern-polyfill";
+        
+import { deno_default, fetchKey, validateCryptoKey } from "./http-3fEbsHa0.js";
 import { getLogger } from "@logtape/logtape";
-import { SpanStatusCode, trace } from "@opentelemetry/api";
-import jsonld from "jsonld";
-import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
+import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, getTypeId, isActor } from "@fedify/vocab";
+import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { encodeHex } from "byte-encodings/hex";
+import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
+import { getDocumentLoader } from "@fedify/vocab-runtime";
+import jsonld from "jsonld";
 import serialize from "json-canon";
 
 //#region src/sig/ld.ts
@@ -275,11 +275,47 @@ async function hashJsonLd(jsonLd, contextLoader) {
 * @returns Whether the actor is the owner of the key.
 */
 async function doesActorOwnKey(activity, key, options) {
-	if (key.ownerId != null) return key.ownerId.href === activity.actorId?.href;
-	const actor = await activity.getActor(options);
-	if (actor == null || !isActor(actor)) return false;
-	for (const publicKeyId of actor.publicKeyIds) if (key.id != null && publicKeyId.href === key.id.href) return true;
-	return false;
+	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
+	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
+	return await tracer.startActiveSpan("activitypub.verify_key_ownership", {
+		kind: SpanKind.INTERNAL,
+		attributes: {
+			"activitypub.actor.id": activity.actorId?.href ?? "",
+			"activitypub.key.id": key.id?.href ?? ""
+		}
+	}, async (span) => {
+		try {
+			if (key.ownerId != null) {
+				const owns = key.ownerId.href === activity.actorId?.href;
+				span.setAttribute("activitypub.key_ownership.verified", owns);
+				span.setAttribute("activitypub.key_ownership.method", "owner_id");
+				return owns;
+			}
+			const actor = await activity.getActor(options);
+			if (actor == null || !isActor(actor)) {
+				span.setAttribute("activitypub.key_ownership.verified", false);
+				span.setAttribute("activitypub.key_ownership.method", "actor_fetch");
+				return false;
+			}
+			for (const publicKeyId of actor.publicKeyIds) if (key.id != null && publicKeyId.href === key.id.href) {
+				span.setAttribute("activitypub.key_ownership.verified", true);
+				span.setAttribute("activitypub.key_ownership.method", "actor_fetch");
+				return true;
+			}
+			span.setAttribute("activitypub.key_ownership.verified", false);
+			span.setAttribute("activitypub.key_ownership.method", "actor_fetch");
+			return false;
+		} catch (error) {
+			span.recordException(error);
+			span.setStatus({
+				code: SpanStatusCode.ERROR,
+				message: String(error)
+			});
+			throw error;
+		} finally {
+			span.end();
+		}
+	});
 }
 /**
 * Gets the actor that owns the specified key.  Returns `null` if the key has no

package/dist/{proof-CScVkkIT.js → proof-CFwktc0B.js}

@@ -3,9 +3,10 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, DataIntegrityProof, Multikey, deno_default, getTypeId } from "./type-CAteiET0.js";
-import { fetchKey, validateCryptoKey } from "./key-BOzqiGbl.js";
+import { deno_default } from "./deno-DIwNGswC.js";
+import { fetchKey, validateCryptoKey } from "./key-Bdc11xlQ.js";
 import { getLogger } from "@logtape/logtape";
+import { Activity, DataIntegrityProof, Multikey, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { encodeHex } from "byte-encodings/hex";
 import serialize from "json-canon";