This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new e986a016229 [create-pull-request] automated change
e986a016229 is described below
commit e986a016229f5b275055c35817b0b1f5a792cd1e
Author: oscerd <osc...@users.noreply.github.com>
AuthorDate: Wed Dec 28 01:03:23 2022 +0000
[create-pull-request] automated change
---
.../camel/springboot/catalog/dataformats/jaxb.json | 1 +
.../camel-jaxb-starter/src/main/docs/jaxb.json | 7 +++++++
.../jaxb/springboot/JaxbDataFormatConfiguration.java | 18 ++++++++++++++++++
3 files changed, 26 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
index 9ec8debacb1..e7c8a97dda7 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
@@ -35,6 +35,7 @@
"noNamespaceSchemaLocation": { "kind": "attribute", "displayName": "No
Namespace Schema Location", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "To define the location of the
namespaceless schema" },
"jaxbProviderProperties": { "kind": "attribute", "displayName": "Jaxb
Provider Properties", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Refers to a custom java.util.Map to lookup in
the registry containing custom JAXB provider properties to be used with the
JAXB marshaller." },
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type
Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether the data format should set the Content-Type header with
the type from the data format. For example application\/xml for data formats
marshalling to XML, or application\/json for data formats marshalling to JSON"
},
+ "accessExternalSchemaProtocols": { "kind": "attribute", "displayName":
"Access External Schema Protocols", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "false", "description":
"Only in use if schema validation has been enabled. Restrict access to the
protocols specified for external reference set by the schemaLocation attribute,
Import and Include element. Examples o [...]
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git a/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json
b/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json
index 0ea2ade1923..66a19355799 100644
--- a/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json
+++ b/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json
@@ -13,6 +13,13 @@
}
],
"properties": [
+ {
+ "name": "camel.dataformat.jaxb.access-external-schema-protocols",
+ "type": "java.lang.String",
+ "description": "Only in use if schema validation has been enabled.
Restrict access to the protocols specified for external reference set by the
schemaLocation attribute, Import and Include element. Examples of protocols are
file, http, jar:file. false or none to deny all access to external references;
a specific protocol, such as file, to give permission to only the protocol; the
keyword all to grant permission to all protocols.",
+ "sourceType":
"org.apache.camel.converter.jaxb.springboot.JaxbDataFormatConfiguration",
+ "defaultValue": "false"
+ },
{
"name": "camel.dataformat.jaxb.content-type-header",
"type": "java.lang.Boolean",
diff --git
a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
index 9b3a05a164c..586b9b7ed3b 100644
---
a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
+++
b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
@@ -141,6 +141,15 @@ public class JaxbDataFormatConfiguration
* JSON
*/
private Boolean contentTypeHeader = true;
+ /**
+ * Only in use if schema validation has been enabled. Restrict access to
the
+ * protocols specified for external reference set by the schemaLocation
+ * attribute, Import and Include element. Examples of protocols are file,
+ * http, jar:file. false or none to deny all access to external references;
+ * a specific protocol, such as file, to give permission to only the
+ * protocol; the keyword all to grant permission to all protocols.
+ */
+ private String accessExternalSchemaProtocols = "false";
public String getContextPath() {
return contextPath;
@@ -293,4 +302,13 @@ public class JaxbDataFormatConfiguration
public void setContentTypeHeader(Boolean contentTypeHeader) {
this.contentTypeHeader = contentTypeHeader;
}
+
+ public String getAccessExternalSchemaProtocols() {
+ return accessExternalSchemaProtocols;
+ }
+
+ public void setAccessExternalSchemaProtocols(
+ String accessExternalSchemaProtocols) {
+ this.accessExternalSchemaProtocols = accessExternalSchemaProtocols;
+ }
}
\ No newline at end of file
