From 089d8c3fb0a277351a55371dff8c2b27bd3f4ed5 Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Wed, 17 Apr 2019 07:56:27 +0200 Subject: Security TC op2 Change-Id: I247c1223b5731c8dbea1480ca88db1cff78cb633 Issue-ID: VNFSDK-342 Signed-off-by: Zebek Bogumil --- .../java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java') diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java index d879ff3..bd771e0 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java @@ -16,20 +16,24 @@ package org.onap.cvc.csar.cc; -import java.util.ArrayList; -import java.util.List; - import org.onap.cli.fw.cmd.OnapCommand; import org.onap.cli.fw.error.OnapCommandException; import org.onap.cli.fw.error.OnapCommandExecutionFailed; import org.onap.cvc.csar.CSARArchive; import org.onap.cvc.csar.CSARArchive.CSARError; +import org.onap.cvc.csar.FileArchive; +import org.onap.cvc.csar.ZipFileContentValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; + public abstract class VTPValidateCSARBase extends OnapCommand { protected static final Logger LOG = LoggerFactory.getLogger(VTPValidateCSARBase.class); + private final ZipFileContentValidator zipFileContentValidator = new ZipFileContentValidator(); + protected abstract void validateCSAR(CSARArchive csar) throws Exception; protected abstract String getVnfReqsNo(); @@ -43,7 +47,14 @@ public abstract class VTPValidateCSARBase extends OnapCommand { //execute try (CSARArchive csar = this.createArchiveInstance()){ + csar.init(path); + + FileArchive.Workspace workspace = csar.getWorkspace(); + if(workspace.isZip()) { + errors.addAll(zipFileContentValidator.validate(workspace)); + } + csar.parse(); errors.addAll(csar.getErrors()); -- cgit 1.2.3-korg