diff options
Diffstat (limited to 'src/main')
4 files changed, 129 insertions, 66 deletions
diff --git a/src/main/java/org/onap/dcae/ApplicationSettings.java b/src/main/java/org/onap/dcae/ApplicationSettings.java index 5164f878..1e9ae698 100644 --- a/src/main/java/org/onap/dcae/ApplicationSettings.java +++ b/src/main/java/org/onap/dcae/ApplicationSettings.java @@ -3,7 +3,7 @@ * PROJECT * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2018 Nokia. All rights reserved.s + * Copyright (C) 2018 - 2019 Nokia. All rights reserved.s * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,31 +21,21 @@ package org.onap.dcae; -import static io.vavr.API.Tuple; -import static java.lang.String.format; -import static java.nio.file.Files.readAllBytes; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jackson.JsonLoader; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; import com.google.common.annotations.VisibleForTesting; +import com.networknt.schema.JsonSchema; import io.vavr.Function1; -import io.vavr.Tuple2; import io.vavr.collection.HashMap; import io.vavr.collection.List; import io.vavr.collection.Map; -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; -import javax.annotation.Nullable; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; -import org.json.JSONObject; import org.onap.dcae.common.configuration.AuthMethodType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; +import java.nio.file.Path; +import java.nio.file.Paths; +import static java.lang.String.format; /** * Abstraction over application configuration. @@ -58,6 +48,7 @@ public class ApplicationSettings { private final String appInvocationDir; private final String configurationFileLocation; private final PropertiesConfiguration properties = new PropertiesConfiguration(); + private final JSonSchemasSupplier jSonSchemasSupplier = new JSonSchemasSupplier(); private final Map<String, JsonSchema> loadedJsonSchemas; public ApplicationSettings(String[] args, Function1<String[], Map<String, String>> argsParser) { @@ -71,7 +62,9 @@ public class ApplicationSettings { configurationFileLocation = findOutConfigurationFileLocation(parsedArgs); loadPropertiesFromFile(); parsedArgs.filterKeys(k -> !"c".equals(k)).forEach(this::addOrUpdate); - loadedJsonSchemas = loadJsonSchemas(); + String collectorSchemaFile = properties.getString("collector.schema.file", + format("{\"%s\":\"etc/CommonEventFormat_28.4.1.json\"}", FALLBACK_VES_VERSION)); + loadedJsonSchemas = jSonSchemasSupplier.loadJsonSchemas(collectorSchemaFile); } public void reloadProperties() { @@ -187,24 +180,6 @@ public class ApplicationSettings { return prependWithUserDirOnRelative(parsedArgs.get("c").getOrElse("etc/collector.properties")); } - private Map<String, JsonSchema> loadJsonSchemas() { - return jsonSchema().toMap().entrySet().stream() - .map(this::readSchemaForVersion) - .collect(HashMap.collector()); - } - - private Tuple2<String, JsonSchema> readSchemaForVersion(java.util.Map.Entry<String, Object> versionToFilePath) { - try { - String schemaContent = new String( - readAllBytes(Paths.get(versionToFilePath.getValue().toString()))); - JsonNode schemaNode = JsonLoader.fromString(schemaContent); - JsonSchema schema = JsonSchemaFactory.byDefault().getJsonSchema(schemaNode); - return Tuple(versionToFilePath.getKey(), schema); - } catch (IOException | ProcessingException e) { - throw new ApplicationException("Could not read schema from path: " + versionToFilePath.getValue(), e); - } - } - private Map<String, String> prepareUsersMap(@Nullable String allowedUsers) { return allowedUsers == null ? HashMap.empty() : List.of(allowedUsers.split("\\|")) @@ -212,11 +187,6 @@ public class ApplicationSettings { .toMap(t-> t[0].trim(), t -> t[1].trim()); } - private JSONObject jsonSchema() { - return new JSONObject(properties.getString("collector.schema.file", - format("{\"%s\":\"etc/CommonEventFormat_28.4.1.json\"}", FALLBACK_VES_VERSION))); - } - private Map<String, String[]> convertDMaaPStreamsPropertyToMap(String streamIdsProperty) { java.util.HashMap<String, String[]> domainToStreamIdsMapping = new java.util.HashMap<>(); String[] topics = streamIdsProperty.split("\\|"); diff --git a/src/main/java/org/onap/dcae/JSonSchemasSupplier.java b/src/main/java/org/onap/dcae/JSonSchemasSupplier.java new file mode 100644 index 00000000..d7cd5663 --- /dev/null +++ b/src/main/java/org/onap/dcae/JSonSchemasSupplier.java @@ -0,0 +1,58 @@ +/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019 Nokia. All rights reserved.s
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcae;
+
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.JsonSchemaFactory;
+import io.vavr.Tuple2;
+import io.vavr.collection.HashMap;
+import io.vavr.collection.Map;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.nio.file.Paths;
+
+import static io.vavr.API.Tuple;
+import static java.nio.file.Files.readAllBytes;
+
+class JSonSchemasSupplier {
+
+ public Map<String, JsonSchema> loadJsonSchemas(String collectorSchemaFile) {
+ JSONObject jsonObject = new JSONObject(collectorSchemaFile);
+ return jsonObject.toMap().entrySet().stream()
+ .map(JSonSchemasSupplier::readSchemaForVersion)
+ .collect(HashMap.collector());
+ }
+
+
+ private static Tuple2<String, JsonSchema> readSchemaForVersion(java.util.Map.Entry<String, Object> versionToFilePath) {
+ try {
+ String schemaContent = new String(
+ readAllBytes(Paths.get(versionToFilePath.getValue().toString())));
+ JsonSchemaFactory factory = JsonSchemaFactory.getInstance();
+ JsonSchema schema = factory.getSchema(schemaContent);
+
+ return Tuple(versionToFilePath.getKey(), schema);
+ } catch (IOException e) {
+ throw new ApplicationException("Could not read schema from path: " + versionToFilePath.getValue(), e);
+ }
+ }
+}
diff --git a/src/main/java/org/onap/dcae/restapi/EventValidator.java b/src/main/java/org/onap/dcae/restapi/EventValidator.java index f119b507..009247c0 100644 --- a/src/main/java/org/onap/dcae/restapi/EventValidator.java +++ b/src/main/java/org/onap/dcae/restapi/EventValidator.java @@ -20,23 +20,15 @@ */ package org.onap.dcae.restapi; -import static java.util.stream.StreamSupport.stream; - -import com.github.fge.jackson.JsonLoader; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import java.util.Optional; import org.json.JSONObject; -import org.onap.dcae.ApplicationException; import org.onap.dcae.ApplicationSettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.ResponseEntity; - +import java.util.Optional; public class EventValidator { - private static final Logger log = LoggerFactory.getLogger(EventValidator.class); - + private final SchemaValidator schemaValidator = new SchemaValidator(); private ApplicationSettings applicationSettings; public EventValidator(ApplicationSettings applicationSettings) { @@ -46,7 +38,7 @@ public class EventValidator { public Optional<ResponseEntity<String>> validate(JSONObject jsonObject, String type, String version){ if (applicationSettings.jsonSchemaValidationEnabled()) { if (jsonObject.has(type)) { - if (!conformsToSchema(jsonObject, version)) { + if (!schemaValidator.conformsToSchema(jsonObject, applicationSettings.jsonSchema(version))) { return errorResponse(ApiException.SCHEMA_VALIDATION_FAILED); } } else { @@ -56,21 +48,6 @@ public class EventValidator { return Optional.empty(); } - private boolean conformsToSchema(JSONObject payload, String version) { - try { - JsonSchema schema = applicationSettings.jsonSchema(version); - ProcessingReport report = schema.validate(JsonLoader.fromString(payload.toString())); - if (report.isSuccess()) { - return true; - } - log.warn("Schema validation failed for event: " + payload); - stream(report.spliterator(), false).forEach(e -> log.warn(e.getMessage())); - return false; - } catch (Exception e) { - throw new ApplicationException("Unable to validate against schema", e); - } - } - private Optional<ResponseEntity<String>> errorResponse(ApiException noServerResources) { return Optional.of(ResponseEntity.status(noServerResources.httpStatusCode) .body(noServerResources.toJSON().toString())); diff --git a/src/main/java/org/onap/dcae/restapi/SchemaValidator.java b/src/main/java/org/onap/dcae/restapi/SchemaValidator.java new file mode 100644 index 00000000..94638071 --- /dev/null +++ b/src/main/java/org/onap/dcae/restapi/SchemaValidator.java @@ -0,0 +1,58 @@ +/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019 Nokia. All rights reserved.s
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcae.restapi;
+
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.ValidationMessage;
+import org.json.JSONObject;
+import org.onap.dcae.ApplicationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Set;
+
+class SchemaValidator {
+ public static final Logger log = LoggerFactory.getLogger(SchemaValidator.class);
+
+ public boolean conformsToSchema(JSONObject payload, JsonSchema schema) {
+ try {
+ ObjectMapper mapper = new ObjectMapper();
+
+ String content = payload.toString();
+ JsonNode node = mapper.readTree(content);
+ Set<ValidationMessage> messageSet = schema.validate(node);
+
+ if (messageSet.isEmpty()) {
+ return true;
+ }
+
+ log.warn("Schema validation failed for event: " + payload);
+ messageSet.stream().forEach(it->log.warn(it.getMessage()) );
+
+ return false;
+ } catch (Exception e) {
+ throw new ApplicationException("Unable to validate against schema", e);
+ }
+ }
+}
|