Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions static/schemas/Builder.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"default": [
{
"name": "c2pa-rs",
"version": "0.73.2"
"version": "0.74.0"
}
]
},
Expand Down Expand Up @@ -59,7 +59,7 @@
"instance_id": {
"description": "Instance ID from `xmpMM:InstanceID` in XMP metadata.",
"type": "string",
"default": "xmp:iid:6468db43-823a-4403-8bca-45011fad1a44"
"default": "xmp:iid:9ef776b1-e266-4872-8e21-1e98d1a6e26c"
},
"thumbnail": {
"description": "An optional ResourceRef to a thumbnail image that represents the asset that was signed.\nMust be available when the manifest is signed.",
Expand Down
4 changes: 2 additions & 2 deletions static/schemas/ManifestDefinition.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"default": [
{
"name": "c2pa-rs",
"version": "0.73.2"
"version": "0.74.0"
}
]
},
Expand Down Expand Up @@ -59,7 +59,7 @@
"instance_id": {
"description": "Instance ID from `xmpMM:InstanceID` in XMP metadata.",
"type": "string",
"default": "xmp:iid:6dda3e2c-cdf0-456b-a1e3-fdfbd2fdd1c5"
"default": "xmp:iid:8be74177-b089-4949-92b6-cb659a3a7b57"
},
"thumbnail": {
"description": "An optional ResourceRef to a thumbnail image that represents the asset that was signed.\nMust be available when the manifest is signed.",
Expand Down
5 changes: 2 additions & 3 deletions static/schemas/Reader.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"instance_id": {
"description": "Instance ID from `xmpMM:InstanceID` in XMP metadata.",
"type": "string",
"default": "xmp:iid:ef78f579-c1d8-4e9f-958a-0e90b8b0c503"
"default": "xmp:iid:5b3a16fa-7fb7-4d70-9332-ff5b8731e21e"
},
"thumbnail": {
"anyOf": [
Expand All @@ -127,8 +127,7 @@
"type": "array",
"items": {
"$ref": "#/$defs/Ingredient"
},
"default": []
}
},
"credentials": {
"description": "A List of verified credentials",
Expand Down
29 changes: 27 additions & 2 deletions static/schemas/Settings.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"type": "boolean"
},
"allowed_network_hosts": {
"description": "<div class=\"warning\">\nThe CAWG identity assertion does not currently respect this setting.\nSee <a href=\"https://github.com/contentauth/c2pa-rs/issues/1645\">issue #1645</a>.\n</div>\n\nList of host patterns that are allowed for network requests.\n\nEach pattern may include:\n- A scheme (e.g. `https://` or `http://`)\n- A hostname or IP address (e.g. `contentauthenticity.org` or `192.0.2.1`)\n - The hostname may contain a single leading wildcard (e.g. `*.contentauthenticity.org`)\n- An optional port (e.g. `contentauthenticity.org:443` or `192.0.2.1:8080`)\n\nMatching is case-insensitive. A wildcard pattern such as `*.contentauthenticity.org` matches\n`sub.contentauthenticity.org`, but does not match `contentauthenticity.org` or `fakecontentauthenticity.org`.\nIf a scheme is present in the pattern, only URIs using the same scheme are considered a match. If the scheme\nis omitted, any scheme is allowed as long as the host matches.\n\nThe behavior is as follows:\n- `None` (default) no filtering enabled.\n- `Some(vec)` where `vec` is empty, all traffic is blocked.\n- `Some(vec)` with at least one pattern, filtering enabled for only those patterns.\n\n# Examples\n\nPattern: `*.contentauthenticity.org`\n- Does match:\n - `https://sub.contentauthenticity.org`\n - `http://api.contentauthenticity.org`\n- Does **not** match:\n - `https://contentauthenticity.org` (no subdomain)\n - `https://sub.fakecontentauthenticity.org` (different host)\n\nPattern: `http://192.0.2.1:8080`\n- Does match:\n - `http://192.0.2.1:8080`\n- Does **not** match:\n - `https://192.0.2.1:8080` (scheme mismatch)\n - `http://192.0.2.1` (port omitted)\n - `http://192.0.2.2:8080` (different IP address)\n\nThese settings are consumed by [`RestrictedResolver`]. For information on when the SDK might perform a\nnetwork requests, see [\"When do network requests occur?\"]\n\n[\"When do network requests occur?\"]: crate::http#when-do-network-requests-occur\n[`HostPattern`]: crate::http::restricted::HostPattern\n[`RestrictedResolver`]: crate::http::restricted::RestrictedResolver",
"description": "<div class=\"warning\">\nThe CAWG identity assertion does not currently respect this setting.\nSee <a href=\"https://github.com/contentauth/c2pa-rs/issues/1645\">issue #1645</a>.\n</div>\n\nList of host patterns that are allowed for network requests.\n\nEach pattern may include:\n- A scheme (e.g. `https://` or `http://`)\n- A hostname or IP address (e.g. `contentauthenticity.org` or `192.0.2.1`)\n - The hostname may contain a single leading wildcard (e.g. `*.contentauthenticity.org`)\n- An optional port (e.g. `contentauthenticity.org:443` or `192.0.2.1:8080`)\n\nMatching is case-insensitive. A wildcard pattern such as `*.contentauthenticity.org` matches\n`sub.contentauthenticity.org`, but does not match `contentauthenticity.org` or `fakecontentauthenticity.org`.\nIf a scheme is present in the pattern, only URIs using the same scheme are considered a match. If the scheme\nis omitted, any scheme is allowed as long as the host matches.\n\nThe behavior is as follows:\n- `None` (default) no filtering enabled.\n- `Some(vec)` where `vec` is empty, all traffic is blocked.\n- `Some(vec)` with at least one pattern, filtering enabled for only those patterns.\n\n# Examples\n\nPattern: `*.contentauthenticity.org`\n- Does match:\n - `https://sub.contentauthenticity.org`\n - `http://api.contentauthenticity.org`\n- Does **not** match:\n - `https://contentauthenticity.org` (no subdomain)\n - `https://sub.fakecontentauthenticity.org` (different host)\n\nPattern: `http://192.0.2.1:8080`\n- Does match:\n - `http://192.0.2.1:8080`\n- Does **not** match:\n - `https://192.0.2.1:8080` (scheme mismatch)\n - `http://192.0.2.1` (port omitted)\n - `http://192.0.2.2:8080` (different IP address)\n\nThese settings are applied by the SDK's HTTP resolvers to restrict network requests.\nWhen network requests occur depends on the operations being performed (reading manifests,\nvalidating credentials, timestamping, etc.).",
"type": [
"array",
"null"
Expand Down Expand Up @@ -178,7 +178,7 @@
"type": "boolean"
},
"remote_manifest_fetch": {
"description": "Whether to fetch remote manifests in the following scenarios:\n- Constructing a [`Reader`]\n- Constructing an [`Ingredient`]\n- Adding an [`Ingredient`] to the [`Builder`]\n\nThe default value is true.\n\n<div class=\"warning\">\nThis setting is only applicable if the crate is compiled with the `fetch_remote_manifests` feature.\n</div>\n\n[`Reader`]: crate::Reader\n[`Ingredient`]: crate::Ingredient\n[`Builder`]: crate::Builder",
"description": "Whether to fetch remote manifests in the following scenarios:\n- Constructing a [`Reader`]\n- Adding an [`Ingredient`] to the [`Builder`]\n\nThe default value is true.\n\n<div class=\"warning\">\nThis setting is only applicable if the crate is compiled with the `fetch_remote_manifests` feature.\n</div>\n\n[`Reader`]: crate::Reader\n[`Ingredient`]: crate::Ingredient\n[`Builder`]: crate::Builder",
"type": "boolean"
},
"skip_ingredient_conflict_resolution": {
Expand All @@ -205,6 +205,13 @@
"description": "Settings for the [Builder][crate::Builder].",
"type": "object",
"properties": {
"vendor": {
"description": "The name of the vendor creating the content credential.",
"type": [
"string",
"null"
]
},
"claim_generator_info": {
"description": "Claim generator info that is automatically added to the builder.\n\nNote that this information will prepend any claim generator info\nprovided explicitly to the builder.",
"anyOf": [
Expand Down Expand Up @@ -818,6 +825,15 @@
"items": {
"type": "string"
}
},
"roles": {
"type": [
"array",
"null"
],
"items": {
"type": "string"
}
}
},
"required": [
Expand Down Expand Up @@ -862,6 +878,15 @@
"items": {
"type": "string"
}
},
"roles": {
"type": [
"array",
"null"
],
"items": {
"type": "string"
}
}
},
"required": [
Expand Down