Skip to content

Commit cb7ca88

Browse files
authored
Bug fixes and integrate cxone-async-api (#3)
* fix docker build warnings * enable audit under debug * don't allow undefined default policy * fix audit debug * fix logger thread problem * remove embedded copy of cxone_api * reference cxone-async-api * remove copying embedded cxone_api * fix group scheduling * remediation * build fix
1 parent e282f6f commit cb7ca88

File tree

15 files changed

+74
-891
lines changed

15 files changed

+74
-891
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ jobs:
3737
with:
3838
ref: refs/tags/${{ inputs.tag }}
3939

40-
- name: Update version.txt
40+
- name: Update version
4141
run: |
4242
echo ${{ inputs.tag }} > version.txt
43-
echo ${{ inputs.tag }} > cxone_api/version.txt
4443
4544
- name: Build and Push Docker Image
4645
run: |

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ run/*
66
env
77
mitm*
88

9+
**/*.whl
10+
911
# Byte-compiled / optimized / DLL files
1012
__pycache__/
1113
*.py[cod]

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM ubuntu:24.04
2-
LABEL org.opencontainers.image.source https://github.com/checkmarx-ts/cxone-scan-scheduler
3-
LABEL org.opencontainers.image.vendor Checkmarx Professional Services
4-
LABEL org.opencontainers.image.title Checkmarx One Scan Scheduler
5-
LABEL org.opencontainers.image.description Schedules scans for projects in Checkmarx One
2+
LABEL org.opencontainers.image.source="https://github.com/checkmarx-ts/cxone-scan-scheduler"
3+
LABEL org.opencontainers.image.vendor="Checkmarx Professional Services"
4+
LABEL org.opencontainers.image.title="Checkmarx One Scan Scheduler"
5+
LABEL org.opencontainers.image.description="Schedules scans for projects in Checkmarx One"
66

77
USER root
88

@@ -16,19 +16,19 @@ RUN apt-get update && \
1616

1717

1818
WORKDIR /opt/cxone
19-
COPY *.txt /opt/cxone
19+
COPY *.txt *.whl /opt/cxone/
2020

2121
RUN pip install -r requirements.txt --no-cache-dir --break-system-packages && \
2222
apt-get remove -y perl && \
2323
apt-get autoremove -y && \
2424
apt-get clean && \
2525
dpkg --purge $(dpkg --get-selections | grep deinstall | cut -f1)
2626

27+
RUN [ -f *.whl ] && pip install --no-cache-dir --break-system-packages *.whl || :
28+
2729
COPY *.py entrypoint.sh *.json /opt/cxone/
2830
COPY logic /opt/cxone/logic
2931
COPY utils /opt/cxone/utils
30-
COPY cxone_api /opt/cxone/cxone_api
31-
3232

3333
RUN ln -s scheduler.py scheduler && \
3434
ln -s scheduler.py audit

RELEASE_NOTES.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Release Notes
22

3+
## v1.3
4+
5+
* Bugfixes
6+
* Some projects without tags that aren't eligible for scheduling were not displayed in the audit report.
7+
* It was possible to set the default schedule to use a policy that was not defined.
8+
* Schedule execution scripts that should have been removed when a schedule was deleted were not being removed.
9+
* Group scheduling was broken by a change to an undocumented API. The published Access Management API is now used.
10+
* Replace the local `cxone_api` module with the [cxone-async-api](https://github.com/checkmarx-ts/cxone-async-api) shared library.
11+
312
## v1.2
413

514
* Support added for projects created by code repository integrations.
@@ -15,5 +24,3 @@
1524
## v1.0
1625

1726
Initial release
18-
19-

0 commit comments

Comments
 (0)