Skip to content

Fixed Critical CVE #689

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

Merged
merged 13 commits into from
Apr 16, 2024
Merged
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
22 changes: 14 additions & 8 deletions incubating/argo-cd-sync/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,35 @@
# Changelog

## [1.4.5] - 2024-04-04
### Fixed
- fixing CVEs
- upgrade requirements.txt
- install Python modules locally

## [1.4.4] - 2024-03-07
### Fixed
Do not sync an application in auto-sync mode
Check for application existence before anything is done
- Do not sync an application in auto-sync mode
- Check for application existence before anything is done

## [1.4.3] - 2024-02-22
### Fixed
intercepting application not found for better error message
- Intercepting application not found for better error message

### Changed
Move the creation of the link to the application earlier
Exit with error when app is in OUT_OF_SYNC state
- Move the creation of the link to the application earlier
- Exit with error when app is in OUT_OF_SYNC state

## [1.4.2] - 2024-01-17
### Changed
New graphql call to speed up query
- New graphql call to speed up query

## [1.4.1] - 2023-10-31
### Changed
Add CA_BUNDLE option
- Add CA_BUNDLE option

## [1.4.0] - 2023-10-30
### Changed
Add INSECURE option
- Add INSECURE option

## [1.3.1] - 2023-09-18
### Fixed
Expand Down
16 changes: 12 additions & 4 deletions incubating/argo-cd-sync/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
FROM python:3.12.0-bookworm
WORKDIR /app
COPY requirements.txt requirements.txt
FROM python:3.13.0a5-bookworm


# USER codefresh
RUN useradd -d /home/codefresh -m -s /usr/bin/bash codefresh
USER codefresh
WORKDIR /home/codefresh

ENV PYTHONPATH /home/codefresh/.local/lib/python3.13/site-packages/

COPY --chown=codefresh requirements.txt requirements.txt
RUN pip3 install --upgrade pip
RUN pip3 install -r requirements.txt
RUN pip3 install --user -r requirements.txt
COPY queries queries/
COPY argocd_sync.py run.py
CMD [ "python3", "run.py"]
18 changes: 9 additions & 9 deletions incubating/argo-cd-sync/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
backoff==2.2.1
certifi==2023.7.22
charset-normalizer==3.1.0
gql==3.4.0
certifi==2024.2.2
charset-normalizer==3.3.2
gql==3.5.0
graphql-core==3.2.3
idna==3.4
multidict==6.0.4
requests==2.28.2
requests-toolbelt==0.10.1
urllib3==1.26.16
yarl==1.9.2
idna==3.6
multidict==6.0.5
requests==2.31.0
requests-toolbelt==1.0.0
urllib3==2.2.1
yarl==1.9.4
6 changes: 3 additions & 3 deletions incubating/argo-cd-sync/step.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kind: step-type
metadata:
name: argo-cd-sync
version: 1.4.4
version: 1.4.5
isPublic: true
description: Syncs Argo CD apps managed by our GitOps Runtimes
sources:
Expand Down Expand Up @@ -120,7 +120,7 @@ spec:
},
"IMAGE_TAG": {
"type": "string",
"default": "1.4.4",
"default": "1.4.5",
"description": "OPTIONAL - To overwrite the tag to use"
}
}
Expand Down Expand Up @@ -157,7 +157,7 @@ spec:
[[ if .Arguments.CA_BUNDLE ]]
- echo [[ .Arguments.CA_BUNDLE ]] | base64 -d >/root/bundle.pem
[[ end ]]
- cd /app
- cd /home/codefresh
- python3 run.py

delimiters:
Expand Down