aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/api
diff options
context:
space:
mode:
authorandre.schmid <andre.schmid@est.tech>2019-09-19 16:14:01 +0100
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-11-03 15:41:37 +0000
commit433947b5ab5e28fc29aee447de934de89a707419 (patch)
treea485b95b2ae7716ced4825fb7b9eb2b6eeb3433b /openecomp-be/api
parentee64a64fb0705422c18608304e63a505d10d8ba1 (diff)
Centralize onboarding package validation
Change-Id: I3cc58cf15f62008e83cfc7ddb095d07ab216b82a Issue-ID: SDC-2583 Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'openecomp-be/api')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/data/PackageArchive.java163
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java112
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/data/PackageArchiveTest.java119
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImplTest.java30
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/notCsar.txt0
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-directories-in-root.zipbin290 -> 0 bytes
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-files-1-directory-with-contents-in-root.zipbin558 -> 0 bytes
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-files-1-empty-directory-in-root.zipbin420 -> 0 bytes
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-files-in-root.zipbin286 -> 0 bytes
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/csar-and-cms-in-root.zipbin304 -> 0 bytes
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/signed-package-tampered-data.zipbin4242 -> 0 bytes
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/signed-package.zipbin4242 -> 0 bytes
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java7
13 files changed, 43 insertions, 388 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/data/PackageArchive.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/data/PackageArchive.java
deleted file mode 100644
index 4f4258ad53..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/data/PackageArchive.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019, Nordix Foundation. All rights reserved.
- * ================================================================================
- * 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.openecomp.sdcrests.vsp.rest.data;
-
-import java.security.cert.CertificateException;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.openecomp.core.utilities.file.FileContentHandler;
-import org.openecomp.sdc.common.utils.CommonUtil;
-import org.openecomp.sdc.common.zip.exception.ZipException;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.vendorsoftwareproduct.security.SecurityManager;
-import org.openecomp.sdc.vendorsoftwareproduct.security.SecurityManagerException;
-
-/**
- * Class responsible for processing zip archive and verify if this package corresponds SOL004 option 2 signed package
- * format, verifies the cms signature if package is signed
- */
-public class PackageArchive {
-
- private static final Logger LOG = LoggerFactory.getLogger(PackageArchive.class);
- private static final String[] ALLOWED_ARCHIVE_EXTENSIONS = {"csar", "zip"};
- private static final String[] ALLOWED_SIGNATURE_EXTENSIONS = {"cms"};
- private static final String[] ALLOWED_CERTIFICATE_EXTENSIONS = {"cert"};
- private static final int NUMBER_OF_FILES_FOR_SIGNATURE_WITH_CERT_INSIDE = 2;
- private static final int NUMBER_OF_FILES_FOR_SIGNATURE_WITHOUT_CERT_INSIDE = 3;
- private final SecurityManager securityManager;
- private final byte[] outerPackageFileBytes;
- private Pair<FileContentHandler, List<String>> handlerPair;
- private Boolean signatureValid;
-
- public PackageArchive(Attachment uploadedFile) {
- this(uploadedFile.getObject(byte[].class));
- }
-
- public PackageArchive(byte[] outerPackageFileBytes) {
- this.outerPackageFileBytes = outerPackageFileBytes;
- this.securityManager = SecurityManager.getInstance();
- try {
- handlerPair = CommonUtil.getFileContentMapFromOrchestrationCandidateZip(
- outerPackageFileBytes);
- } catch (final ZipException exception) {
- LOG.error("Error reading files inside archive", exception);
- }
- }
-
- /**
- * Checks if package matches required format {package.csar/zip, package.cms, package.cert(optional)}
- *
- * @return true if structure matches sol004 option 2 structure
- */
- public boolean isSigned() {
- return isPackageSizeMatches() && getSignatureFileName().isPresent();
- }
-
- /**
- * Gets csar/zip package name with extension only if package is signed
- *
- * @return csar package name
- */
- public Optional<String> getArchiveFileName() {
- if (isSigned()) {
- return getFileByExtension(ALLOWED_ARCHIVE_EXTENSIONS);
- }
- return Optional.empty();
- }
-
- /**
- * Gets csar/zip package content from zip archive
- *
- * @return csar package content
- * @throws SecurityManagerException
- */
- public byte[] getPackageFileContents() throws SecurityManagerException {
- try {
- if (isSignatureValid()) {
- return handlerPair.getKey().getFiles().get(getArchiveFileName().orElseThrow(CertificateException::new));
- }
- } catch (CertificateException exception) {
- LOG.info("Error verifying signature ", exception);
- }
- return outerPackageFileBytes;
- }
-
- /**
- * Validates package signature against trusted certificates
- *
- * @return true if signature verified
- * @throws SecurityManagerException
- */
- public boolean isSignatureValid() throws SecurityManagerException {
- if (signatureValid == null) {
- final Map<String, byte[]> files = handlerPair.getLeft().getFiles();
- final Optional<String> signatureFileName = getSignatureFileName();
- final Optional<String> archiveFileName = getArchiveFileName();
- if (files.isEmpty() || !signatureFileName.isPresent() || !archiveFileName.isPresent()) {
- signatureValid = false;
- } else {
- final Optional<String> certificateFile = getCertificateFileName();
- signatureValid = securityManager.verifySignedData(files.get(signatureFileName.get()),
- certificateFile.map(files::get).orElse(null), files.get(archiveFileName.get()));
- }
-
- }
- return signatureValid;
- }
-
- private boolean isPackageSizeMatches() {
- return handlerPair.getRight().isEmpty()
- && (handlerPair.getLeft().getFiles().size() == NUMBER_OF_FILES_FOR_SIGNATURE_WITH_CERT_INSIDE
- || handlerPair.getLeft().getFiles().size() == NUMBER_OF_FILES_FOR_SIGNATURE_WITHOUT_CERT_INSIDE);
- }
-
- private Optional<String> getSignatureFileName() {
- return getFileByExtension(ALLOWED_SIGNATURE_EXTENSIONS);
- }
-
- private Optional<String> getFileByExtension(String[] extensions) {
- for (String fileName : handlerPair.getLeft().getFileList()) {
- for (String extension : extensions) {
- if (extension.equalsIgnoreCase(FilenameUtils.getExtension(fileName))) {
- return Optional.of(fileName);
- }
- }
- }
- return Optional.empty();
- }
-
- private Optional<String> getCertificateFileName() {
- Optional<String> certFileName = getFileByExtension(ALLOWED_CERTIFICATE_EXTENSIONS);
- if (!certFileName.isPresent()) {
- return Optional.empty();
- }
- String certNameWithoutExtension = FilenameUtils.removeExtension(certFileName.get());
- if (certNameWithoutExtension.equals(FilenameUtils.removeExtension(getArchiveFileName().orElse("")))) {
- return certFileName;
- }
- //cert file name should be the same as package name, e.g. vnfpackage.scar-->vnfpackage.cert
- return Optional.empty();
- }
-}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java
index 10f96e9d3b..e4262df105 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java
@@ -19,13 +19,11 @@
package org.openecomp.sdcrests.vsp.rest.services;
-import static org.openecomp.core.utilities.file.FileUtils.getFileExtension;
-import static org.openecomp.core.utilities.file.FileUtils.getNetworkPackageName;
import static org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder.getErrorWithParameters;
import java.io.IOException;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,10 +31,8 @@ import java.util.Optional;
import javax.activation.DataHandler;
import javax.inject.Named;
import javax.ws.rs.core.Response;
-import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
import org.openecomp.sdc.activitylog.ActivityLogManager;
import org.openecomp.sdc.activitylog.ActivityLogManagerFactory;
import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity;
@@ -52,8 +48,7 @@ import org.openecomp.sdc.vendorsoftwareproduct.OrchestrationTemplateCandidateMan
import org.openecomp.sdc.vendorsoftwareproduct.VendorSoftwareProductManager;
import org.openecomp.sdc.vendorsoftwareproduct.VspManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
-import org.openecomp.sdc.vendorsoftwareproduct.security.SecurityManagerException;
-import org.openecomp.sdc.vendorsoftwareproduct.types.OnboardPackage;
+import org.openecomp.sdc.vendorsoftwareproduct.impl.onboarding.OnboardingPackageProcessor;
import org.openecomp.sdc.vendorsoftwareproduct.types.OnboardPackageInfo;
import org.openecomp.sdc.vendorsoftwareproduct.types.OrchestrationTemplateActionResponse;
import org.openecomp.sdc.vendorsoftwareproduct.types.UploadFileResponse;
@@ -65,7 +60,6 @@ import org.openecomp.sdcrests.vendorsoftwareproducts.types.OrchestrationTemplate
import org.openecomp.sdcrests.vendorsoftwareproducts.types.UploadFileResponseDto;
import org.openecomp.sdcrests.vendorsoftwareproducts.types.ValidationResponseDto;
import org.openecomp.sdcrests.vsp.rest.OrchestrationTemplateCandidate;
-import org.openecomp.sdcrests.vsp.rest.data.PackageArchive;
import org.openecomp.sdcrests.vsp.rest.mapping.MapFilesDataStructureToDto;
import org.openecomp.sdcrests.vsp.rest.mapping.MapUploadFileResponseToUploadFileResponseDto;
import org.openecomp.sdcrests.vsp.rest.mapping.MapValidationResponseToDto;
@@ -89,91 +83,41 @@ public class OrchestrationTemplateCandidateImpl implements OrchestrationTemplate
public Response upload(final String vspId, final String versionId,
final Attachment fileToUpload, final String user) {
final byte[] fileToUploadBytes = fileToUpload.getObject(byte[].class);
- String fileToUploadName = "";
- String fileToUploadExtension = "";
final DataHandler dataHandler = fileToUpload.getDataHandler();
- if(dataHandler != null) {
- final String filename = dataHandler.getName();
- fileToUploadName = FilenameUtils.removeExtension(filename);
- fileToUploadExtension = FilenameUtils.getExtension(filename);
- }
- final PackageArchive archive = new PackageArchive(fileToUploadBytes);
- final Optional<UploadFileResponseDto> validatePackageArchiveResponse =
- validatePackageArchive(archive);
- if (!validatePackageArchiveResponse.isPresent()) {
- final VspDetails vspDetails = new VspDetails(vspId, new Version(versionId));
- return processOnboardPackage(fileToUpload, fileToUploadBytes, fileToUploadName,
- fileToUploadExtension, archive, vspDetails);
- } else {
- return Response.ok(validatePackageArchiveResponse.get()).build();
- }
- }
+ final String filename = dataHandler.getName();
- private Optional<UploadFileResponseDto> validatePackageArchive(final PackageArchive archive) {
- UploadFileResponseDto uploadFileResponseDto;
- try {
- if (archive.isSigned() && !archive.isSignatureValid()) {
- final ErrorMessage errorMessage = new ErrorMessage(ErrorLevel.ERROR,
- getErrorWithParameters(Messages.FAILED_TO_VERIFY_SIGNATURE.getErrorMessage(), ""));
- LOGGER.error(errorMessage.getMessage());
- uploadFileResponseDto = buildUploadResponseWithError(errorMessage);
- //returning OK as SDC UI won't show error message if NOT OK error code.
- return Optional.of(uploadFileResponseDto);
- }
- } catch (final SecurityManagerException e) {
- final ErrorMessage errorMessage = new ErrorMessage(ErrorLevel.ERROR,
- getErrorWithParameters(e.getMessage(), ""));
- LOGGER.error(errorMessage.getMessage(), e);
- uploadFileResponseDto = buildUploadResponseWithError(errorMessage);
- //returning OK as SDC UI won't show error message if NOT OK error code.
- return Optional.of(uploadFileResponseDto);
+ final OnboardingPackageProcessor onboardingPackageProcessor = new OnboardingPackageProcessor(filename, fileToUploadBytes);
+ if (onboardingPackageProcessor.hasErrors()) {
+ final UploadFileResponseDto uploadFileResponseDto =
+ buildUploadResponseWithError(onboardingPackageProcessor.getErrorMessageSet().toArray(new ErrorMessage[0]));
+ return Response.ok(uploadFileResponseDto).build();
}
- return Optional.empty();
- }
- private Response processOnboardPackage(final Attachment fileToUpload,
- final byte[] fileToUploadBytes,
- final String fileToUploadName,
- final String fileToUploadExtension,
- final PackageArchive archive,
- final VspDetails vspDetails) {
- final String filename = archive.getArchiveFileName()
- .orElse(fileToUpload.getContentDisposition().getFilename());
- UploadFileResponseDto uploadFileResponseDto;
- try {
- final String archiveFileExtension = getFileExtension(filename);
- final OnboardPackageInfo onboardPackageInfo;
- if (OnboardingTypesEnum.CSAR.toString().equalsIgnoreCase(archiveFileExtension)) {
- final OnboardPackage onboardPackage = new OnboardPackage(getNetworkPackageName(filename),
- archiveFileExtension, ByteBuffer.wrap(archive.getPackageFileContents()));
- onboardPackageInfo = new OnboardPackageInfo(fileToUploadName,
- fileToUploadExtension, ByteBuffer.wrap(fileToUploadBytes), onboardPackage);
- } else {
- onboardPackageInfo = new OnboardPackageInfo(fileToUploadName,
- fileToUploadExtension, ByteBuffer.wrap(fileToUploadBytes));
- }
- final UploadFileResponse uploadFileResponse = candidateManager
- .upload(vspDetails, onboardPackageInfo);
- uploadFileResponseDto = new MapUploadFileResponseToUploadFileResponseDto()
- .applyMapping(uploadFileResponse, UploadFileResponseDto.class);
+ final OnboardPackageInfo onboardPackageInfo = onboardingPackageProcessor.getOnboardPackageInfo().orElse(null);
- return Response.ok(uploadFileResponseDto).build();
- } catch (final SecurityManagerException e) {
- final ErrorMessage errorMessage = new ErrorMessage(ErrorLevel.ERROR,
- getErrorWithParameters(e.getMessage(), ""));
- LOGGER.error(errorMessage.getMessage(), e);
- uploadFileResponseDto = buildUploadResponseWithError(errorMessage);
- //returning OK as SDC UI won't show error message if NOT OK error code.
+ if (onboardPackageInfo == null) {
+ final UploadFileResponseDto uploadFileResponseDto = buildUploadResponseWithError(
+ new ErrorMessage(ErrorLevel.ERROR, Messages.PACKAGE_PROCESS_ERROR.formatMessage(filename)));
return Response.ok(uploadFileResponseDto).build();
}
+
+ final VspDetails vspDetails = new VspDetails(vspId, new Version(versionId));
+ return processOnboardPackage(onboardPackageInfo, vspDetails);
}
- private UploadFileResponseDto buildUploadResponseWithError(ErrorMessage errorMessage) {
- UploadFileResponseDto uploadFileResponseDto = new UploadFileResponseDto();
- Map<String, List<ErrorMessage>> errorMap = new HashMap<>();
- List<ErrorMessage> errorMessages = new ArrayList<>();
- errorMessages.add(errorMessage);
- errorMap.put(SdcCommon.UPLOAD_FILE, errorMessages);
+ private Response processOnboardPackage(final OnboardPackageInfo onboardPackageInfo, final VspDetails vspDetails) {
+ final UploadFileResponse uploadFileResponse = candidateManager.upload(vspDetails, onboardPackageInfo);
+ final UploadFileResponseDto uploadFileResponseDto = new MapUploadFileResponseToUploadFileResponseDto()
+ .applyMapping(uploadFileResponse, UploadFileResponseDto.class);
+ return Response.ok(uploadFileResponseDto).build();
+ }
+
+ private UploadFileResponseDto buildUploadResponseWithError(final ErrorMessage... errorMessages) {
+ final UploadFileResponseDto uploadFileResponseDto = new UploadFileResponseDto();
+ final Map<String, List<ErrorMessage>> errorMap = new HashMap<>();
+ final List<ErrorMessage> errorMessageList = new ArrayList<>();
+ Collections.addAll(errorMessageList, errorMessages);
+ errorMap.put(SdcCommon.UPLOAD_FILE, errorMessageList);
uploadFileResponseDto.setErrors(errorMap);
return uploadFileResponseDto;
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/data/PackageArchiveTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/data/PackageArchiveTest.java
deleted file mode 100644
index 91a20bd57f..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/data/PackageArchiveTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.openecomp.sdcrests.vsp.rest.data;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.openecomp.sdc.vendorsoftwareproduct.security.SecurityManager;
-import org.openecomp.sdc.vendorsoftwareproduct.security.SecurityManagerException;
-import org.powermock.reflect.Whitebox;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.MockitoAnnotations.initMocks;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-public class PackageArchiveTest {
- private static final String BASE_DIR = "/vspmanager.csar/";
-
- @Mock
- SecurityManager manager;
-
- @Before
- public void setUp(){
- initMocks(this);
- }
-
-
- @Test
- public void isSignedTestCheckingWrongFile() throws IOException,
- URISyntaxException {
- PackageArchive packageArchive = getArchive("notCsar.txt");
- assertFalse("2 or 3 files expected for signed package present or signature valid for " +
- "empty file", packageArchive.isSigned());
- }
-
- @Test
- public void isSignedTestWrongPackageStructure2EmptyDirInRoot() throws IOException,
- URISyntaxException {
- PackageArchive packageArchive = getArchive("signing/2-empty-directories-in-root.zip");
- assertFalse(packageArchive.isSigned());
- }
-
- @Test
- public void isSignedTestWrongPackageStructure2EmptyFilesAndEmptyDirInRoot() throws IOException,
- URISyntaxException {
- PackageArchive packageArchive = getArchive("signing/2-empty-files-1-empty-directory-in-root.zip");
- assertFalse(packageArchive.isSigned());
- }
-
- @Test
- public void isSignedTestWrongPackageStructure2EmptyFilesAndDirWithContentInRoot() throws IOException,
- URISyntaxException {
- PackageArchive packageArchive = getArchive("signing/2-empty-files-1-directory-with-contents-in-root.zip");
- assertFalse(packageArchive.isSigned());
- }
-
- @Test
- public void isSignedTestCorrectStructureNoSignature() throws IOException,
- URISyntaxException {
- PackageArchive packageArchive = getArchive("signing/2-files-in-root.zip");
- assertFalse(packageArchive.isSigned());
- }
-
- @Test
- public void isSignedTestCorrectStructureAndSignatureExists() throws IOException,
- URISyntaxException {
- PackageArchive packageArchive = getArchive("signing/csar-and-cms-in-root.zip");
- assertTrue(packageArchive.isSigned());
- }
-
- @Test
- public void isSignatureValidTestCorrectStructureAndValidSignatureExists() throws IOException,
- URISyntaxException, SecurityManagerException {
- PackageArchive packageArchive = getArchive("signing/signed-package.zip");
- Whitebox.setInternalState(packageArchive, "securityManager", manager);
- when(manager.verifySignedData(any(), any(), any())).thenReturn(true);
- assertTrue("Signature invalid for signed package",
- packageArchive.isSignatureValid());
- }
-
- @Test(expected = SecurityManagerException.class)
- public void isSignatureValidTestCorrectStructureAndNotValidSignatureExists() throws IOException,
- URISyntaxException, SecurityManagerException {
- PackageArchive packageArchive = getArchive("signing/signed-package-tampered-data.zip");
- Whitebox.setInternalState(packageArchive, "securityManager", manager);
- when(manager.verifySignedData(any(), any(), any())).thenThrow(new SecurityManagerException("error!"));
- packageArchive.isSignatureValid();
- }
-
- private PackageArchive getArchive(String path) throws URISyntaxException, IOException {
- return new PackageArchive(Files.readAllBytes(Paths.get(
- PackageArchiveTest.class.getResource(BASE_DIR + path).toURI())));
- }
-}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImplTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImplTest.java
index a9dfbb8449..589be207c1 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImplTest.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImplTest.java
@@ -27,12 +27,12 @@ import static org.mockito.MockitoAnnotations.initMocks;
import static org.powermock.api.mockito.PowerMockito.mock;
import static org.powermock.api.mockito.PowerMockito.mockStatic;
import static org.powermock.api.mockito.PowerMockito.when;
-import static org.powermock.api.mockito.PowerMockito.whenNew;
import java.io.IOException;
import java.util.Arrays;
import java.util.Optional;
import java.util.UUID;
+import javax.activation.DataHandler;
import javax.ws.rs.core.Response;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
@@ -52,7 +52,6 @@ import org.openecomp.sdc.vendorsoftwareproduct.OrchestrationTemplateCandidateMan
import org.openecomp.sdc.vendorsoftwareproduct.OrchestrationTemplateCandidateManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.VendorSoftwareProductManager;
import org.openecomp.sdc.vendorsoftwareproduct.VspManagerFactory;
-import org.openecomp.sdc.vendorsoftwareproduct.security.SecurityManagerException;
import org.openecomp.sdc.vendorsoftwareproduct.types.OrchestrationTemplateActionResponse;
import org.openecomp.sdc.vendorsoftwareproduct.types.UploadFileResponse;
import org.openecomp.sdc.vendorsoftwareproduct.types.UploadFileStatus;
@@ -62,7 +61,6 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.Module;
import org.openecomp.sdcrests.vendorsoftwareproducts.types.FileDataStructureDto;
import org.openecomp.sdcrests.vendorsoftwareproducts.types.OrchestrationTemplateActionResponseDto;
import org.openecomp.sdcrests.vendorsoftwareproducts.types.UploadFileResponseDto;
-import org.openecomp.sdcrests.vsp.rest.data.PackageArchive;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -78,8 +76,6 @@ public class OrchestrationTemplateCandidateImplTest {
@Mock
private VendorSoftwareProductManager vendorSoftwareProductManager;
@Mock
- private PackageArchive packageArchive;
- @Mock
private VspManagerFactory vspManagerFactory;
@Mock
private ActivityLogManager activityLogManager;
@@ -100,19 +96,15 @@ public class OrchestrationTemplateCandidateImplTest {
public void setUp(){
try {
initMocks(this);
- packageArchive = mock(PackageArchive.class);
mockStatic(VspManagerFactory.class);
when(VspManagerFactory.getInstance()).thenReturn(vspManagerFactory);
when(vspManagerFactory.createInterface()).thenReturn(vendorSoftwareProductManager);
mockStatic(ActivityLogManagerFactory.class);
when(ActivityLogManagerFactory.getInstance()).thenReturn(activityLogManagerFactory);
when(activityLogManagerFactory.createInterface()).thenReturn(activityLogManager);
- whenNew(PackageArchive.class).withAnyArguments().thenReturn(packageArchive);
mockStatic(OrchestrationTemplateCandidateManagerFactory.class);
when(OrchestrationTemplateCandidateManagerFactory.getInstance()).thenReturn(orchestrationTemplateCandidateManagerFactory);
when(orchestrationTemplateCandidateManagerFactory.createInterface()).thenReturn(candidateManager);
- when(packageArchive.getArchiveFileName()).thenReturn(Optional.of("test"));
- when(packageArchive.getPackageFileContents()).thenReturn(new byte[0]);
UploadFileResponse uploadFileResponse = new UploadFileResponse();
uploadFileResponse.setOnboardingType(OnboardingTypesEnum.ZIP);
uploadFileResponse.setNetworkPackageName("test");
@@ -163,36 +155,34 @@ public class OrchestrationTemplateCandidateImplTest {
}
@Test
- public void uploadSignedTest() throws SecurityManagerException {
- when(packageArchive.isSigned()).thenReturn(true);
- when(packageArchive.isSignatureValid()).thenReturn(true);
+ public void uploadSignedTest() {
orchestrationTemplateCandidate = new OrchestrationTemplateCandidateImpl();
- Response response = orchestrationTemplateCandidate.upload("1", "1", mockAttachment(), "1");
+ Response response = orchestrationTemplateCandidate.upload("1", "1", mockAttachment("filename.zip"), "1");
assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
}
@Test
public void uploadNotSignedTest(){
- when(packageArchive.isSigned()).thenReturn(false);
orchestrationTemplateCandidate = new OrchestrationTemplateCandidateImpl();
- Response response = orchestrationTemplateCandidate.upload("1", "1", mockAttachment(), "1");
+ Response response = orchestrationTemplateCandidate.upload("1", "1", mockAttachment("filename.csar"), "1");
assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
}
- private Attachment mockAttachment() {
+ private Attachment mockAttachment(final String fileName) {
final Attachment attachment = mock(Attachment.class);
when(attachment.getContentDisposition()).thenReturn(new ContentDisposition("test"));
+ final DataHandler dataHandler = mock(DataHandler.class);
+ when(dataHandler.getName()).thenReturn(fileName);
+ when(attachment.getDataHandler()).thenReturn(dataHandler);
final byte[] bytes = "upload package Test".getBytes();
when(attachment.getObject(ArgumentMatchers.any())).thenReturn(bytes);
return attachment;
}
@Test
- public void uploadSignNotValidTest() throws SecurityManagerException {
- when(packageArchive.isSigned()).thenReturn(true);
- when(packageArchive.isSignatureValid()).thenReturn(false);
+ public void uploadSignNotValidTest() {
orchestrationTemplateCandidate = new OrchestrationTemplateCandidateImpl();
- Response response = orchestrationTemplateCandidate.upload("1", "1", mockAttachment(), "1");
+ Response response = orchestrationTemplateCandidate.upload("1", "1", mockAttachment("filename.zip"), "1");
assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
assertFalse(((UploadFileResponseDto)response.getEntity()).getErrors().isEmpty());
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/notCsar.txt b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/notCsar.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/notCsar.txt
+++ /dev/null
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-directories-in-root.zip b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-directories-in-root.zip
deleted file mode 100644
index d0f1fd09dc..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-directories-in-root.zip
+++ /dev/null
Binary files differ
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-files-1-directory-with-contents-in-root.zip b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-files-1-directory-with-contents-in-root.zip
deleted file mode 100644
index 0f10af262f..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-files-1-directory-with-contents-in-root.zip
+++ /dev/null
Binary files differ
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-files-1-empty-directory-in-root.zip b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-files-1-empty-directory-in-root.zip
deleted file mode 100644
index 6ded8b1d57..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-empty-files-1-empty-directory-in-root.zip
+++ /dev/null
Binary files differ
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-files-in-root.zip b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-files-in-root.zip
deleted file mode 100644
index d1e80ae132..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/2-files-in-root.zip
+++ /dev/null
Binary files differ
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/csar-and-cms-in-root.zip b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/csar-and-cms-in-root.zip
deleted file mode 100644
index 07331466df..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/csar-and-cms-in-root.zip
+++ /dev/null
Binary files differ
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/signed-package-tampered-data.zip b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/signed-package-tampered-data.zip
deleted file mode 100644
index 0cfb9e0265..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/signed-package-tampered-data.zip
+++ /dev/null
Binary files differ
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/signed-package.zip b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/signed-package.zip
deleted file mode 100644
index a64ddd9be2..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/resources/vspmanager.csar/signing/signed-package.zip
+++ /dev/null
Binary files differ
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java
index 5bcd3d3a39..fe07f8a07f 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java
@@ -39,6 +39,7 @@ import javax.ws.rs.core.Link;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
import org.onap.config.api.ConfigurationManager;
+import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
import org.openecomp.sdc.common.errors.CoreException;
import org.openecomp.sdc.common.errors.ErrorCode;
import org.openecomp.sdc.common.errors.ErrorCodeAndMessage;
@@ -141,8 +142,10 @@ public class VnfPackageRepositoryImpl implements VnfPackageRepository {
final OrchestrationTemplateCandidateManager candidateManager =
OrchestrationTemplateCandidateManagerFactory.getInstance().createInterface();
final String filename = formatFilename(csarId);
- final OnboardPackageInfo onboardPackageInfo = new OnboardPackageInfo(getNetworkPackageName(filename),
- getFileExtension(filename), ByteBuffer.wrap(payload));
+ final String fileExtension = getFileExtension(filename);
+ final OnboardPackageInfo onboardPackageInfo =
+ new OnboardPackageInfo(getNetworkPackageName(filename), fileExtension, ByteBuffer.wrap(payload),
+ OnboardingTypesEnum.getOnboardingTypesEnum(fileExtension));
final VspDetails vspDetails = new VspDetails(vspId, getVersion(vspId, versionId));
final UploadFileResponse response = candidateManager.upload(vspDetails, onboardPackageInfo);
final UploadFileResponseDto uploadFileResponse =