{#if manifestData.signatureInfo?.common_name || manifestData.signatureInfo?.issuer}
{/if}
diff --git a/src/routes/verify/components/DetailedInfo/AboutSection/IssuedBySection.svelte b/src/routes/verify/components/DetailedInfo/AboutSection/IssuedBySection.svelte
index 21159186c..9f9d060e7 100644
--- a/src/routes/verify/components/DetailedInfo/AboutSection/IssuedBySection.svelte
+++ b/src/routes/verify/components/DetailedInfo/AboutSection/IssuedBySection.svelte
@@ -22,6 +22,7 @@
if (issuer) params.set('o', issuer);
if (organizationalUnit) params.set('ou', organizationalUnit);
if (country) params.set('c', country);
+
return `https://spec.c2pa.org/conformance-explorer/?${params.toString()}`;
})();
@@ -71,6 +72,7 @@
{#if showTooltip}
(showTooltip = !showTooltip)}
>
+
{@html $_('sidebar.verify.about.issuedby.tooltip')}
diff --git a/src/routes/verify/components/TreeView/TreeL1.svelte b/src/routes/verify/components/TreeView/TreeL1.svelte
index 94e0e6902..f8d110f7a 100644
--- a/src/routes/verify/components/TreeView/TreeL1.svelte
+++ b/src/routes/verify/components/TreeView/TreeL1.svelte
@@ -32,7 +32,6 @@
$: removeL1 = transformScale === 0.125 ? true : false;
$: scale = 0.5 / transformScale;
$: L1margin = transformScale >= 0.25 ? 0.5 : transformScale / 0.25;
- $: trustSource = $assetStore.trustSource;
;
export type ReadableSource = Readable;
export interface C2paReaderStore extends Readable {
- read: (source: Blob | File) => Promise;
+ read: (source: Blob | File | string) => Promise;
clear: () => void;
}
@@ -33,32 +33,11 @@ const mimeTypeCorrections = {
'image/dng': 'image/x-adobe-dng',
};
-import { legacyToCrJson, type CrJson } from '$lib/crjson';
-
-// Helper to extract all manifest labels that failed trust validation in a given crJSON store
-function getUntrustedManifestLabels(store: CrJson): Set {
- const untrustedLabels = new Set();
- const isTrustError = (s: any) => s.code.includes('signingCredential');
-
- // 1. Check Root
- const rootFailures = store.validationResults?.activeManifest?.failure || [];
- const activeLabel = store.manifests[0]?.label;
- if (activeLabel && rootFailures.some(isTrustError)) {
- untrustedLabels.add(activeLabel);
- }
-
- // 2. Check EVERY manifest in the store (Active + Ingredients)
- for (const manifest of store.manifests) {
- // Check the manifest object itself
- const mFailures = manifest.validationResults?.failure || [];
- const mStatuses = manifest.validationStatus || [];
- if (mFailures.some(isTrustError) || mStatuses.some(isTrustError)) {
- untrustedLabels.add(manifest.label);
- }
- }
-
- return untrustedLabels;
-}
+type ValidationStatus = { code: string };
+type TrustSource = 'official' | 'legacy' | 'none';
+type TrustedIngredient = { trust_source?: TrustSource; active_manifest?: string; validation_status?: ValidationStatus[] };
+type TrustedManifest = { trust_source?: TrustSource; ingredients?: TrustedIngredient[] };
+type ValidationDelta = { ingredientAssertionURI?: string; validationDeltas?: { failure?: ValidationStatus[] } };
export function createC2paReader(): C2paReaderStore {
let dispose: () => void;
@@ -66,11 +45,16 @@ export function createC2paReader(): C2paReaderStore {
return {
subscribe,
- read: async (source: Blob | File) => {
+ read: async (source: Blob | File | string) => {
set({ state: 'loading' });
dispose?.();
try {
+ if (typeof source === 'string') {
+ const response = await fetch(source);
+ source = await response.blob();
+ }
+
const sdk = await getSdk();
const sourceType = source instanceof Blob ? source.type : '';
const normalizedSourceType = sourceType.toLowerCase().trim();
@@ -112,7 +96,7 @@ export function createC2paReader(): C2paReaderStore {
// PASS 1: Validate against Official Trust List
const officialSettings = await getOfficialToolkitSettings();
- let reader = await sdk.reader.fromBlob(source.type || 'application/octet-stream', source, officialSettings);
+ const reader = await sdk.reader.fromBlob(source.type || 'application/octet-stream', source, officialSettings);
if (!reader) {
throw new Error('No C2PA manifest found in this file');
@@ -130,108 +114,112 @@ export function createC2paReader(): C2paReaderStore {
if (needsLegacyPass) {
const legacySettings = await getLegacyToolkitSettings();
const legacyReader = await sdk.reader.fromBlob(source.type || 'application/octet-stream', source, legacySettings);
- const legacyStore = await legacyReader.manifestStore();
-
- // 3. ONLY ADOPT Pass 2 if it actually solved the problem (State is now Trusted/Valid)
- if (legacyStore.validation_state === 'Trusted' || legacyStore.validation_state === 'Valid') {
- finalStore = legacyStore;
-
- reader.free();
- currentReader = legacyReader;
-
- const isTrustError = (s: any) => s.code.includes('signingCredential.untrusted') || s.code.includes('signingCredential.invalid');
- const isCryptoValid = (s: any) => s.code.includes('signingCredential.trusted') || s.code.includes('claimSignature.validated');
-
- // 4a. Tag the Active Manifest
- const p1ActiveV3 = rawManifestStore.validation_results?.activeManifest?.failure || [];
- const p1ActiveV2 = rawManifestStore.manifests?.[rawManifestStore.active_manifest || '']?.validation_status || [];
- const wasActiveUntrusted = p1ActiveV3.some(isTrustError) || p1ActiveV2.some(isTrustError);
- const isFinalTrusted = finalStore.validation_state === 'Trusted';
-
- if (finalStore.manifests && finalStore.active_manifest && finalStore.manifests[finalStore.active_manifest]) {
- const activeMan = finalStore.manifests[finalStore.active_manifest];
+
+ if (legacyReader) {
+ const legacyStore = await legacyReader.manifestStore();
+
+ // 3. ONLY ADOPT Pass 2 if it actually solved the problem (State is now Trusted/Valid)
+ if (legacyStore.validation_state === 'Trusted' || legacyStore.validation_state === 'Valid') {
+ finalStore = legacyStore;
- // If the root is Trusted, default to official, then downgrade if Pass 1 failed.
- if (isFinalTrusted) {
- activeMan.trust_source = wasActiveUntrusted ? 'legacy' : 'official';
- } else {
- activeMan.trust_source = 'none';
- }
- }
+ reader.free();
+ currentReader = legacyReader;
+
+ const isTrustError = (s: ValidationStatus) => s.code.includes('signingCredential.untrusted') || s.code.includes('signingCredential.invalid');
- // 4b. Tag ALL Ingredients across the entire provenance tree
- const p1Deltas = rawManifestStore.validation_results?.ingredientDeltas || [];
-
- Object.entries(finalStore.manifests || {}).forEach(([label, manifest]: [string, any]) => {
- const p1Manifest = rawManifestStore.manifests?.[label];
+ // 4a. Tag the Active Manifest
+ const p1ActiveV3 = (rawManifestStore.validation_results?.activeManifest?.failure || []) as ValidationStatus[];
+ const p1ActiveV2 = (rawManifestStore.manifests?.[rawManifestStore.active_manifest || '']?.validation_status || []) as ValidationStatus[];
+ const wasActiveUntrusted = p1ActiveV3.some(isTrustError) || p1ActiveV2.some(isTrustError);
+ const isFinalTrusted = finalStore.validation_state === 'Trusted';
- if (manifest.ingredients && p1Manifest?.ingredients) {
- manifest.ingredients.forEach((ingredient: any, index: number) => {
- // ZERO TRUST DEFAULT: Unverified assets get no trust credentials
- ingredient.trust_source = 'none';
-
- if (ingredient.active_manifest) {
- const p1Ing = p1Manifest.ingredients[index];
- const subLabel = ingredient.active_manifest;
- const p1SubManifest = subLabel ? rawManifestStore.manifests?.[subLabel] : null;
-
- // 1. Check the Ingredient Pointer (V2 standard)
- const p1V2_ing = p1Ing?.validation_status || [];
-
- // 2. Check the actual Sub-Manifest directly (V2 + V3 standards)
- // NOTE: In V3, the sub-manifest's own results are stored under .activeManifest
- const p1V2_sub = p1SubManifest?.validation_status || [];
- const p1V3_sub = p1SubManifest?.validation_results?.activeManifest?.failure || [];
-
- // 3. Check the Root Deltas (V3 standard)
- const p1Delta = p1Deltas.find((d: any) =>
- d.ingredientAssertionURI?.includes(label) &&
- d.ingredientAssertionURI?.includes('c2pa.ingredient')
- );
- const p1V3_delta = p1Delta?.validationDeltas?.failure || [];
-
- // AGGREGATE: Did ANY layer in the sub-manifest chain fail Trust in Pass 1?
- const hasTrustError =
- p1V3_delta.some(isTrustError) ||
- p1V2_ing.some(isTrustError) ||
- p1V2_sub.some(isTrustError) ||
- p1V3_sub.some(isTrustError);
-
- if (isFinalTrusted) {
- // If the Root is trusted, the chain is intact.
- // It only earns 'Official' if it explicitly cleared the local error gauntlet.
- ingredient.trust_source = hasTrustError ? 'legacy' : 'official';
- }
- }
- });
+ if (finalStore.manifests && finalStore.active_manifest && finalStore.manifests[finalStore.active_manifest]) {
+ const activeMan = finalStore.manifests[finalStore.active_manifest] as unknown as TrustedManifest;
+
+ // If the root is Trusted, default to official, then downgrade if Pass 1 failed.
+ if (isFinalTrusted) {
+ activeMan.trust_source = wasActiveUntrusted ? 'legacy' : 'official';
+ } else {
+ activeMan.trust_source = 'none';
+ }
}
- });
- } else {
- legacyReader.free();
-
- // Fallback: If root is Trusted, entire tree is official.
- const isTrusted = finalStore.validation_state === 'Trusted';
- Object.entries(finalStore.manifests || {}).forEach(([label, manifest]: [string, any]) => {
- if (label === finalStore.active_manifest) {
- manifest.trust_source = isTrusted ? 'official' : 'none';
- }
- if (manifest.ingredients) {
- manifest.ingredients.forEach((ing: any) => {
- ing.trust_source = (isTrusted && ing.active_manifest) ? 'official' : 'none';
- });
- }
- });
+ // 4b. Tag ALL Ingredients across the entire provenance tree
+ const p1Deltas = (rawManifestStore.validation_results?.ingredientDeltas || []) as ValidationDelta[];
+
+ (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
+ const p1Manifest = rawManifestStore.manifests?.[label];
+
+ if (manifest.ingredients && p1Manifest?.ingredients) {
+ manifest.ingredients.forEach((ingredient, index) => {
+ // ZERO TRUST DEFAULT: Unverified assets get no trust credentials
+ ingredient.trust_source = 'none';
+
+ if (ingredient.active_manifest) {
+ const p1Ing = p1Manifest.ingredients?.[index];
+ const subLabel = ingredient.active_manifest;
+ const p1SubManifest = (subLabel ? rawManifestStore.manifests?.[subLabel] : null) as Record | null;
+
+ // 1. Check the Ingredient Pointer (V2 standard)
+ const p1V2_ing = (p1Ing?.validation_status || []) as ValidationStatus[];
+
+ // 2. Check the actual Sub-Manifest directly (V2 + V3 standards)
+ // NOTE: In V3, the sub-manifest's own results are stored under .activeManifest
+ const p1V2_sub = (p1SubManifest?.validation_status || []) as ValidationStatus[];
+ const p1V3_sub = ((p1SubManifest?.validation_results as Record | undefined)?.activeManifest as Record | undefined)?.failure as ValidationStatus[] | undefined || [];
+
+ // 3. Check the Root Deltas (V3 standard)
+ const p1Delta = p1Deltas.find((d) =>
+ d.ingredientAssertionURI?.includes(label) &&
+ d.ingredientAssertionURI?.includes('c2pa.ingredient')
+ );
+ const p1V3_delta = p1Delta?.validationDeltas?.failure || [];
+
+ // AGGREGATE: Did ANY layer in the sub-manifest chain fail Trust in Pass 1?
+ const hasTrustError =
+ p1V3_delta.some(isTrustError) ||
+ p1V2_ing.some(isTrustError) ||
+ p1V2_sub.some(isTrustError) ||
+ p1V3_sub.some(isTrustError);
+
+ if (isFinalTrusted) {
+ // If the Root is trusted, the chain is intact.
+ // It only earns 'Official' if it explicitly cleared the local error gauntlet.
+ ingredient.trust_source = hasTrustError ? 'legacy' : 'official';
+ }
+ }
+ });
+ }
+ });
+
+ } else {
+ legacyReader.free();
+
+ // Fallback: If root is Trusted, entire tree is official.
+ const isTrusted = finalStore.validation_state === 'Trusted';
+ (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
+ if (label === finalStore.active_manifest) {
+ manifest.trust_source = isTrusted ? 'official' : 'none';
+ }
+
+ if (manifest.ingredients) {
+ manifest.ingredients.forEach((ing) => {
+ ing.trust_source = (isTrusted && ing.active_manifest) ? 'official' : 'none';
+ });
+ }
+ });
+ }
}
} else {
// Pass 1 had no trust issues (Could be Trusted or Hard Invalid)
const isTrusted = finalStore.validation_state === 'Trusted';
- Object.entries(finalStore.manifests || {}).forEach(([label, manifest]: [string, any]) => {
+ (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
if (label === finalStore.active_manifest) {
manifest.trust_source = isTrusted ? 'official' : 'none';
}
+
if (manifest.ingredients) {
- manifest.ingredients.forEach((ing: any) => {
+ manifest.ingredients.forEach((ing) => {
ing.trust_source = (isTrusted && ing.active_manifest) ? 'official' : 'none';
});
}
@@ -239,7 +227,8 @@ export function createC2paReader(): C2paReaderStore {
}
const { assetMap, dispose: assetMapDisposer } =
- await resultToAssetMap({ manifestStore: finalStore, source });
+ await resultToAssetMap({ manifestStore: finalStore, source });
+
dispose = () => {
assetMapDisposer();
currentReader.free();
@@ -258,6 +247,7 @@ export function createC2paReader(): C2paReaderStore {
toast.trigger(unsupportedFileType());
} else if (
(errName === 'C2pa(PrereleaseError)' || errStr.includes('Prerelease')) &&
+ typeof source !== 'string' &&
(await hasLegacyCredentials(source))
) {
openModal(LegacyCredentialModal);
@@ -279,5 +269,6 @@ export function createC2paReader(): C2paReaderStore {
async function hasLegacyCredentials(source: Blob | File): Promise {
const legacySdk = await getLegacySdk();
const legacyResult = await legacySdk.processImage(source);
+
return legacyResult.exists;
}
diff --git a/vite.config.js b/vite.config.js
index 5a29118a2..ed52a5904 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -18,6 +18,11 @@ const config = {
allow: ['assets', 'locales'],
},
},
+ resolve: {
+ alias: {
+ 'intl-messageformat': path.resolve(__dirname, 'node_modules/intl-messageformat/intl-messageformat.esm.js'),
+ },
+ },
build: {
minify: 'terser',
sourcemap: true,
@@ -29,7 +34,7 @@ const config = {
},
},
ssr: {
- noExternal: ['svelte-i18n'],
+ noExternal: ['svelte-i18n', 'intl-messageformat'],
},
define: {
__SUPPORTED_LOCALES__: JSON.stringify(getSupportedLocales()),