Skip to content

Commit 4c7c8d1

Browse files
authored
Argocd app status CVE (#712)
1 parent 74e57a8 commit 4c7c8d1

File tree

5 files changed

+40
-10
lines changed

5 files changed

+40
-10
lines changed

Diff for: incubating/argocd-app-status/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
build
2+
dist
3+
argocd_app_status.spec

Diff for: incubating/argocd-app-status/CHANGELOG.md

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
# Changelog
2-
## [1.1.2] - 2023-09-18
2+
## [1.1.3] - 2024-11-20
33
### Changed
4+
* upgrade yarl to 1.17.2
5+
6+
### Fixed
7+
* CVE-2024-45491 - upgrade libexpat1
8+
* CVE-2024-45492 - upgrade libexpat1
9+
* CVE-2024-37371 - upgrade libkrb5
10+
* CVE-2023-45853 - upgrade zlib1g
11+
12+
## [1.1.2] - 2023-09-18
13+
414

515
### Fixed
616
- PYSEC-2023-135 - upgrade Python module certifi to 2023.7.22
717
- CVE-2019-8457 - upgrade base image to python:3.11.5-slim-bookworm
818

919
## [1.1.1] - 2023-06-03
1020
### Changed
11-
- Upgrade pythpn version to 3.11.3
21+
- Upgrade python version to 3.11.3
1222

1323
### Fixed
1424
- Link for application

Diff for: incubating/argocd-app-status/Dockerfile

+20-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
1-
FROM python:3.11.5-slim-bookworm
1+
# stage 1 Build
2+
# Bookworm is debian based
3+
FROM python:3.13.1-slim-bookworm AS builder
24
WORKDIR /app
35
COPY requirements.txt requirements.txt
4-
RUN pip3 install -r requirements.txt
56
COPY queries queries/
67
COPY argocd_app_status.py argocd_app_status.py
7-
CMD [ "python3", "argocd_app_status.py"]
8+
9+
RUN apt-get update && apt-get install -y binutils
10+
RUN pip3 install -r requirements.txt
11+
RUN pip3 install pyinstaller
12+
RUN pyinstaller --strip --onefile argocd_app_status.py
13+
14+
# stage 2 : Prod
15+
FROM debian:bookworm-slim
16+
17+
# USER cfuser
18+
RUN adduser cfuser --home /home/codefresh --shel /bin/sh
19+
USER cfuser
20+
21+
WORKDIR /app
22+
COPY queries queries/
23+
COPY --from=builder /app/dist/argocd_app_status argocd_app_status
24+
ENTRYPOINT ["/app/argocd_app_status"]

Diff for: incubating/argocd-app-status/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ docopt==0.6.2
55
gql==3.4.0
66
graphql-core==3.2.3
77
idna==3.4
8-
multidict==6.0.4
8+
multidict==6.1.0
99
pipreqs==0.4.13
1010
requests==2.31.0
1111
requests-toolbelt==0.10.1
1212
urllib3==1.26.16
1313
yarg==0.1.9
14-
yarl==1.9.2
14+
yarl==1.17.2

Diff for: incubating/argocd-app-status/step.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kind: step-type
22
metadata:
33
name: argocd-app-status
4-
version: 1.1.2
4+
version: 1.1.3
55
isPublic: true
66
description: Get Argo CD App status and return its sybc and health status
77
sources:
@@ -61,7 +61,7 @@ spec:
6161
},
6262
"IMAGE_TAG": {
6363
"type": "string",
64-
"default": "1.1.2",
64+
"default": "1.1.3",
6565
"description": "OPTIONAL - To overwrite the tag to use"
6666
}
6767
}
@@ -97,7 +97,7 @@ spec:
9797
[[- end ]]
9898
commands:
9999
- cd /app
100-
- python3 argocd_app_status.py
100+
- /app/argocd_app_status
101101
delimiters:
102102
left: '[['
103103
right: ']]'

0 commit comments

Comments
 (0)