Merge pull request #36 from Mixeway/version/1_6_1

release of the new version
Mixeway · May 7, 2022 · c073a50 · c073a50
2 parents c4f84f2 + 452cceb
commit c073a50
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/MixewayBackend b/MixewayBackend
diff --git a/MixewayFrontend b/MixewayFrontend
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<a href="https://github.com/Mixeway/MixewayHub/blob/master/releasenote.md"><img src="https://img.shields.io/badge/version-1.6.0-blue" alt="https://img.shields.io/badge/-changelog-blue.svg" data-canonical-src="https://img.shields.io/badge/-changelog-blue.svg" style="max-width:100%;"></a>
+<a href="https://github.com/Mixeway/MixewayHub/blob/master/releasenote.md"><img src="https://img.shields.io/badge/version-1.6.1-blue" alt="https://img.shields.io/badge/-changelog-blue.svg" data-canonical-src="https://img.shields.io/badge/-changelog-blue.svg" style="max-width:100%;"></a>
 <a href="hub.docker.comd"><img src="https://img.shields.io/docker/pulls/mixeway/backend?logo=Mixeway&style=plastic" alt="https://img.shields.io/badge/-changelog-blue.svg" data-canonical-src="https://img.shields.io/badge/-changelog-blue.svg" style="max-width:100%;"></a>
 ![](https://github.com/Mixeway/MixewayBackend/workflows/Deploy%20prod%20version/badge.svg?branch=master)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Mixeway_MixewayBackend&metric=alert_status)](https://sonarcloud.io/dashboard?id=Mixeway_MixewayBackend)

diff --git a/releasenote.md b/releasenote.md
@@ -1,3 +1,10 @@
+## 1.6.1 (2022-05-07)
+
+#### Bug Fixes
+* Fixed bug that allow to perform multiple sast scans of same project. Fixed status management, now when specific codeproject has inqueue or running state equal to true, it cannot be put on queue (https://github.com/Mixeway/MixewayBackend/issues/82)
+* Fixed bug related with improper view of the status in codeproject opensource scanner integration (https://github.com/Mixeway/MixewayFrontend/issues/57)
+
+
 ## 1.6.0 (2022-04-25)
 #### New Features
 * New widget on show-project page
+7 −0		CHANGELOG.md
+10 −10		pom.xml
+1 −0		readme.md
+2 −0		src/main/java/io/mixeway/api/auth/model/StatusEntity.java
+10 −1		src/main/java/io/mixeway/api/auth/service/AuthService.java
+4 −6		src/main/java/io/mixeway/api/cioperations/service/CiOperationsService.java
+3 −3		src/main/java/io/mixeway/api/project/service/AssetService.java
+1 −0		src/main/java/io/mixeway/api/project/service/WebAppService.java
+3 −3		src/main/java/io/mixeway/api/protocol/cioperations/CiResultModel.java
+3 −3		src/main/java/io/mixeway/api/protocol/cioperations/GetInfoRequest.java
+3 −4		src/main/java/io/mixeway/api/protocol/cioperations/InfoScanPerformed.java
+2 −0		src/main/java/io/mixeway/api/protocol/cioperations/PrepareCIOperation.java
+3 −3		src/main/java/io/mixeway/api/protocol/cioperations/VulnerabilityModel.java
+3 −4		src/main/java/io/mixeway/api/protocol/user/UserModel.java
+2 −2		src/main/java/io/mixeway/api/vulnmanage/service/GetVulnerabilitiesService.java
+6 −14		src/main/java/io/mixeway/db/entity/CodeProject.java
+0 −10		src/main/java/io/mixeway/db/entity/WebApp.java
+4 −0		src/main/java/io/mixeway/db/repository/CodeProjectRepository.java
+1 −0		src/main/java/io/mixeway/db/repository/ScannerRepository.java
+2 −0		src/main/java/io/mixeway/domain/service/infrascan/FindInfraScanService.java
+3 −2		src/main/java/io/mixeway/domain/service/intf/UpdateInterfaceService.java
+10 −0		src/main/java/io/mixeway/domain/service/project/GetOrCreateProjectService.java
+21 −0		src/main/java/io/mixeway/domain/service/scanmanager/code/CreateOrGetCodeProjectService.java
+11 −3		src/main/java/io/mixeway/domain/service/scanmanager/code/UpdateCodeProjectService.java
+3 −0		src/main/java/io/mixeway/domain/service/scanmanager/webapp/FindWebAppService.java
+1 −1		src/main/java/io/mixeway/domain/service/scanner/GetScannerService.java
+1 −1		src/main/java/io/mixeway/scanmanager/integrations/acunetix/apiclient/AcunetixApiClient.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxCreateProject.java
+3 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxCreateScan.java
+3 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxGitCreate.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxLoginResponse.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxProject.java
+3 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxProjectCreate.java
+3 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxReportGenerate.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxReportStatus.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxResponseId.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxResult.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxResultCsvTemplate.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxScan.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxSetGitRepo.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxStatus.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxTeamResponse.java
+4 −0		src/main/java/io/mixeway/scanmanager/integrations/checkmarx/model/CxVulnShortDescription.java
+6 −2		src/main/java/io/mixeway/scanmanager/integrations/nexpose/apiclient/NexposeApiClient.java
+7 −7		src/main/java/io/mixeway/scanmanager/integrations/openvas/apiclient/OpenVasApiClient.java
+3 −3		src/main/java/io/mixeway/scanmanager/model/AssetToCreate.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/CodeRequestHelper.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/CodeScanRequestModel.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/CreateTarget.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/LoadVlnerabilitiesModel.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/NetworkScanRequestModel.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/OSSVulnerabilityModel.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/Projects.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/ServiceDiscoveryKoordynatorRequest.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/VulnerabilityModel.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/WebAppScanModel.java
+2 −0		src/main/java/io/mixeway/scanmanager/model/WebAppScanRequestModel.java
+2 −2		src/main/java/io/mixeway/scanmanager/service/code/CodeScanService.java
+7 −5		src/main/java/io/mixeway/scanmanager/service/network/NetworkScanService.java
+1 −0		src/main/java/io/mixeway/scanmanager/service/webapp/WebAppScanService.java
+1 −0		src/main/java/io/mixeway/utils/PermissionFactory.java
+2 −0		src/main/java/io/mixeway/utils/RunScanForAssets.java
+2 −0		src/main/java/io/mixeway/utils/RunScanForWebApps.java
+2 −0		src/main/java/io/mixeway/utils/SASTProject.java
+3 −3		src/main/java/io/mixeway/utils/ScannerModel.java
+3 −4		src/main/java/io/mixeway/utils/SecurityGatewayEntry.java
+2 −0		src/main/java/io/mixeway/utils/Status.java
+5 −0		src/main/java/io/mixeway/utils/VulnerabilityModel.java
+1 −1		src/main/resources/bootstrap.properties
+5 −1		src/main/resources/db/changelog/db.changelog-master.sql
+10 −2		src/test/java/io/mixeway/api/vulnmanage/service/ScanManagerServiceTest.java
+2 −2		src/test/java/io/mixeway/domain/service/intf/UpdateInterfaceServiceTest.java
+20 −0		src/test/java/io/mixeway/domain/service/scanmanager/code/CreateOrGetCodeProjectServiceTest.java
+18 −10		src/test/java/io/mixeway/domain/service/scanmanager/webapp/FindWebAppServiceTest.java
+1 −1		src/test/java/io/mixeway/scanmanager/service/network/NetworkScanServiceTest.java
+0 −1		src/test/java/io/mixeway/scanmanager/service/webapp/WebAppScanServiceTest.java