summaryrefslogtreecommitdiffstats
path: root/security-utils
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-05-15 10:13:19 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-05-18 13:22:52 +0200
commitafe2dd742a70bf7a1cbbc5b8bd391f8a4070a07d (patch)
treee0a321c7bd28de1a2451a78a4386a9fb8d5b10ce /security-utils
parent73fa58e682c278b190ad89f7c74919b5e70b1d24 (diff)
Ignore unknown fields in subclasses as well
Diffstat (limited to 'security-utils')
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsEntity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsEntity.java b/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsEntity.java
index ae2f39fff68..83742950dbc 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsEntity.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsEntity.java
@@ -23,12 +23,14 @@ class TransportSecurityOptionsEntity {
@JsonProperty("accepted-ciphers") @JsonInclude(NON_EMPTY) List<String> acceptedCiphers;
@JsonProperty("disable-hostname-validation") @JsonInclude(NON_NULL) Boolean isHostnameValidationDisabled;
+ @JsonIgnoreProperties(ignoreUnknown = true)
static class Files {
@JsonProperty("private-key") String privateKeyFile;
@JsonProperty("certificates") String certificatesFile;
@JsonProperty("ca-certificates") String caCertificatesFile;
}
+ @JsonIgnoreProperties(ignoreUnknown = true)
static class AuthorizedPeer {
@JsonProperty("required-credentials") List<RequiredCredential> requiredCredentials;
@JsonProperty("name") String name;
@@ -36,6 +38,7 @@ class TransportSecurityOptionsEntity {
@JsonProperty("roles") @JsonInclude(NON_EMPTY) List<String> roles;
}
+ @JsonIgnoreProperties(ignoreUnknown = true)
static class RequiredCredential {
@JsonProperty("field") CredentialField field;
@JsonProperty("must-match") String matchExpression;