Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Security issues fixes for QG #88

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/workflows/helm-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ on:
type: string
upgrade_from:
description: 'Managed service orchestrator service chart version to upgrade from'
# version from 3.1 release
default: '1.4.2'
# version from 23.12 release
default: '1.5.2'

jobs:
lint-test:
Expand All @@ -65,7 +65,7 @@ jobs:
- name: Set up Helm
uses: azure/setup-helm@v3
with:
version: v3.10.3
version: v3.9.3

# Setup python as a prerequisite for chart linting
- uses: actions/setup-python@v4
Expand All @@ -85,11 +85,10 @@ jobs:
fi
# run chart linting
- name: Run chart-testing (lint)
run: ct lint --charts charts/orchestrator --config charts/chart-testing-config.yaml

run: ct lint --validate-maintainers=false --target-branch ${{ github.event.repository.default_branch }} --config charts/chart-testing-config.yaml

- name: Run chart-testing (install)
run: ct install --charts charts/orchestrator --config charts/chart-testing-config.yaml --helm-extra-set-args "--set=image.tag=testing --set=image.repository=kind-registry:5000/managed-service-orchestrator"
run: ct install --charts charts/orchestrator --config charts/chart-testing-config.yaml
if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true'

- name: Run helm upgrade
Expand Down
7 changes: 3 additions & 4 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ How to install application using helm: <br />
helm install ReleaseName ChartName

a.) Add helm repository in tractusx:
helm repo add orchestrator https://eclipse-tractusx.github.io/charts/dev
helm repo add tractusx https://eclipse-tractusx.github.io/charts/dev
b.) To search the specific repo in helm repositories
helm search repo orchestrator/autosetup
helm search repo tractusx/managed-service-orchestrator
c.) To install using helm command:
helm install orchestrator orchestrator/autosetup

helm install orchestrator tractusx/managed-service-orchestrator
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This service will help service provider to set up DFT/SDE with EDC and EDC as se

```shell
Application version: 1.5.1
Helm release version: 1.5.2
Helm release version: 1.5.3
```

# Container images
Expand All @@ -34,7 +34,7 @@ __Managed Service Orchestrator__

**Used base image**

- 17-jdk-alpine(https://hub.docker.com/layers/library/eclipse-temurin/17-jdk-alpine/images/sha256-f4766a483f0754930109771aebccb93c6e7a228b1977cf2e3fd49285270a2eb3?context=explore)
- [eclipse-temurin:17.0.8.1_1-jdk](https://github.com/adoptium/containers)
- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
- Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
Expand Down
263 changes: 259 additions & 4 deletions charts/orchestrator/CHANGELOG.md
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you copy the history of your app CHANGELOG. I added the the 1.5.2 line to a chart CHANGELOG, because this is what I fixed.
All of the rest is already included in your top-level CHANGELOG.
And I don't know how often I have to remind you, that releases are done in Tractus-X.
You do not have a 1.5.3. You also cannot set any date, if you do not know yet, when these releases will happen.
Add the changed you do to the unreleased section and we can set version and date, when there is actually a proper release done

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed and raised new PRs

Original file line number Diff line number Diff line change
@@ -1,11 +1,266 @@
# Managed-Service-Orchestrator Chart CHANGELOG
# Changelog

This Changelog describes the changes introduced in each new Helm Chart version.
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [1.5.2] - 2023-11-20
## [Unreleased]

## [1.5.3] - 2023-11-21

### Fixes
### Changed
- Updated Notice for Docker image
- Updated Helm lint
- Updated Installation steps
- Veracode security issue fix

## [1.5.2] - 2023-11-20

### Fixes
- fix: deployment of orchestrator by providing default values in secret @adkumar1 (#81)

## [1.5.1] - 2023-11-17
### Changed
- Update DT asset creation for oauth secret information
- Updated trivy workflow
- Changed the base image for security issue

## [1.5.0] - 2023-09-04

### Changed
- Support DDTR 3.2 for external subject id

## [1.4.2] - 2023-08-22

### Changed
- Image creation on docker hub
- Image update for Trivy workflow
- Updated the deployment to take the image from tractusx
- Name change for the image
- Updated the product name
- Updated Dockerfile image to point to the overarching package
- Updated the Helm lint file
- CPU/Memory updated in values file
- Updated documentation
- Updated Security file

### Fixed
- Security issue fix

## [1.4.1] - 2023-08-21

### Fixed
- Corrected image for Trviy workflow
- Email notification only on successful component connetcivity test
- Corrected email template

## [1.4.0] - 2023-08-17

### Fixed
- Security issue fixed

## [1.3.9] - 2023-08-14

### Added
- Added interface document

## [1.3.8] - 2023-08-04

### Changed
- Updated the document

## [1.3.7] - 2023-08-01

### Added
- Added flag to skip portal integration API point

### Changed
- Improvement in portal failure logs
- Security issue fix
- Latest DEPENDENCIES file

## [1.3.6] - 2023-07-17

### Added
- Refactor technical user use for bpdm and portal backend for SDE

## [1.3.5] - 2023-07-12

### Added
- Support for tool app/service type in autosetup

## [1.3.4] - 2023-07-11

### Changed
- Updated the ARC42 document

## [1.3.3] - 2023-07-06

### Changed
- Support EDC SSI

## [1.3.2] - 2023-06-30

### Added
- Addition of Helm lint

### Changed
- Updated code of conduct

## [1.3.1] - 2023-06-27

### Changed
- Updated SDE to combine frontend & backend helm charts

## [1.3.0] - 2023-06-23

### Fixed
- Updated Spring boot version

## [1.2.9] - 2023-06-22

### Added
- Added support for EDC connector 0.4.1
- Added registry base url in asset for consumer reference
- Upgrade for DT registry 0.3.2

## [1.2.8] - 2023-05-31

### Fixed
- Fixed spring core security issue

### Changed
- Changed name of repository

## [1.2.7] - 2023-05-16

### Added
- Added header to the files

### Changed
- Changed default ingress to false

## [1.2.6] - 2023-05-10

### Added
- Added .tractusx file

### Fixed
- Veracode security issue fixes
- Fixed DEPENDENCIES file issue
- Specified runAsUser for securitycontext of container
- Specified base image in Readme

## [1.2.5] - 2023-04-21

### Added
- Added changes related to digital twin registry
- Validate input request attribute

### Changed
- Upgrade spring expression to 6.0.8 version
- Spring boot upgraded to 3.0.5

### Fixed
- Fixed for cross site scripting
- Veracode issue fix

## [1.2.4] - 2023-04-20

### Added
- Support Digital Twin registry in Autosetup

### Changed
- Arc 42 update for E2E Data exchange test service integration


## [1.2.3] - 2023-04-07

### Fixed
- Fixed email sent issue for failure use case of connector test
- Rename tractus-X connector app name because of ingress access issue

## [1.2.2] - 2023-03-30

### Added
- Connector test service integration for managed connector connectivity test
- Update email template for connector status

## [1.2.1] - 2023-03-20

### Fixed
- Sonar code duplication issue fix

## [1.2.0] - 2023-03-14

### Fixed
- Security issues fixed
- Snakeyaml jar issue fixed
- veracode security issue fixed

### Changed
- Supports EDC connector 0.1.6
- Changed base image to eclipse-temurin


## [1.1.5] - 2023-03-02

### Added
- Added AUTHORS.md, INSTALL.md
- Added sources in Chart.yaml
- Added LICENSE in charts
- Added README.md in charts
- Springboot jar fixes
- keycloak jar fixes


### Changed
- Fixed CHANGELOG.md file format
- Changed README.md


## [1.1.4] - 2023-02-10

### Added
- Added semantic versioing
- Update bounce crystel lib version
- Organisation name with more special character support
- Hot fix of Multi requesting of Managed SDE
- update tomcat, spring security version

### Removed
- Removed tag from values.yaml

## [1.1.0] - 2023-02-01

### Added
- Addded Daps wrapper service
- test issue fix and update dft package as deployment
- Added .helmignore

### Changed
- Moved helm charts from `helm/` to `charts`

## [1.0.1] - 2023-01-25

### Added
- Added helm release
- Added versioning
- Added tagging
- Move ARC42.md to docs directory

## [1.0.0] - 2022-10-21

### Added
- Enable triggering of Autosetup process for SDE application
- Enable triggering of Autosetup process for EDC application
- Creation of the certificates for DAPS registration
- Registration of EDC connector into Catena-X dataspace
- Registration of the services in CX-Portal
- Autosetup process is based on KubeApps

### Changed
- Integration to Catena-X Portal

### Known knowns
- Cross side scripting (XSS) shall be mitigated (low risk)
2 changes: 1 addition & 1 deletion charts/orchestrator/Chart.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you bumping the Chart version? There is no change to the Chart

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed and raised new PRs

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ sources:
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.5.2
version: 1.5.3

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ class VaultManagerTest {
@MockBean
private AutoSetupTriggerManager autoSetupTriggerManager;

@MockBean
private OpenSSLClientManager openSSLClientManager;

@Autowired
private VaultManager vaultManager;

Expand Down