Skip to content

Commit

Permalink
Merge pull request #238 from MaibornWolff/dev
Browse files Browse the repository at this point in the history
chore: merge to main for release 2025_01
  • Loading branch information
StefanFl authored Jan 7, 2025
2 parents 62f07d2 + a8344da commit 62978bf
Show file tree
Hide file tree
Showing 42 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion actions/DAST/cryptolyzer/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_cryptolyzer.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/DAST/drheader/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_drheader.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/DAST/zap/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners-zap:2024_12'
image: 'docker://maibornwolff/secobserve-scanners-zap:2025_01'
entrypoint: '/entrypoints/entrypoint_zap.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SAST/bandit/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_bandit.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SAST/checkov/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_checkov.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SAST/eslint/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_eslint.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SAST/kics/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_kics.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SAST/semgrep/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_semgrep.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SAST/tfsec/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_tfsec.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SAST/trivy_config/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_trivy_config.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SCA/grype_image/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_grype_image.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SCA/grype_sbom/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_grype_sbom.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SCA/trivy_filesystem/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_trivy_filesystem.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/SCA/trivy_image/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_trivy_image.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/check_security_gate/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: 'check_security_gate.sh'
env:
SO_API_BASE_URL: ${{ inputs.so_api_base_url }}
Expand Down
2 changes: 1 addition & 1 deletion actions/importer/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: 'file_upload_observations.sh'
env:
SO_UPLOAD: ${{ inputs.so_upload }}
Expand Down
2 changes: 1 addition & 1 deletion actions/secrets/gitleaks/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_gitleaks.sh'
env:
REPORT_NAME: ${{ inputs.report_name }}
Expand Down
2 changes: 1 addition & 1 deletion actions/secrets/trivy_filesystem_secrets/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_trivy_filesystem_secrets.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/secrets/trivy_image_secrets/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_trivy_image_secrets.sh'
env:
TARGET: ${{ inputs.target }}
Expand Down
2 changes: 1 addition & 1 deletion actions/vulnerability_scanner/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ inputs:

runs:
using: 'docker'
image: 'docker://maibornwolff/secobserve-scanners:2024_12'
image: 'docker://maibornwolff/secobserve-scanners:2025_01'
entrypoint: '/entrypoints/entrypoint_vulnerability_scanner.sh'
env:
SO_CONFIGURATION: ${{ inputs.so_configuration }}
Expand Down
10 changes: 5 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Python build stage
FROM python:3.12.7-alpine AS python-build-stage
FROM python:3.12.8-alpine AS python-build-stage

# Install gcc to be able to compile wheels for python packages
RUN apk add --no-cache gcc musl-dev python3-dev
Expand All @@ -22,13 +22,13 @@ RUN wget --no-verbose https://github.com/Checkmarx/kics/archive/refs/tags/v${KIC
&& go build -o ./bin/kics cmd/console/main.go

# Python run stage
FROM python:3.12.7-alpine AS python-run-stage
FROM python:3.12.8-alpine AS python-run-stage

ARG GITLEAKS_VERSION=8.22.0
ARG GITLEAKS_VERSION=8.22.1
ARG GRYPE_VERSION=0.86.1
ARG KICS_VERSION=2.1.3
ARG TRIVY_VERSION=0.58.0
ARG TFSEC_VERSION=1.28.11
ARG TRIVY_VERSION=0.58.1
ARG TFSEC_VERSION=1.28.12

ARG CREATED
ARG REVISION
Expand Down
4 changes: 2 additions & 2 deletions docker/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ bandit-sarif-formatter==1.1.1 # https://github.com/microsoft/bandit-sarif-forma

# Checkov
# ----------------------------------------------------------------
checkov==3.2.344 # https://github.com/bridgecrewio/checkov
checkov==3.2.347 # https://github.com/bridgecrewio/checkov

# Semgrep
# ----------------------------------------------------------------
semgrep==1.101.0 # https://github.com/returntocorp/semgrep

# CryptoLyzer
# ----------------------------------------------------------------
CryptoLyzer==0.12.5 # https://gitlab.com/coroner/cryptolyzer
CryptoLyzer==0.12.6 # https://gitlab.com/coroner/cryptolyzer

# Importer
# ----------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion templates/DAST/cryptolyzer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.cryptolyzer:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: post_deploy
variables:
GIT_STRATEGY: none
Expand Down
2 changes: 1 addition & 1 deletion templates/DAST/drheader.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.drheader:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: post_deploy
variables:
GIT_STRATEGY: none
Expand Down
2 changes: 1 addition & 1 deletion templates/DAST/zap.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.zap:
image:
name: maibornwolff/secobserve-scanners-zap:2024_12
name: maibornwolff/secobserve-scanners-zap:2025_01
stage: post_deploy
variables:
GIT_STRATEGY: none
Expand Down
2 changes: 1 addition & 1 deletion templates/SAST/bandit.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.bandit:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/SAST/checkov.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.checkov:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/SAST/eslint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.eslint:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/SAST/kics.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.kics:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/SAST/semgrep.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.semgrep:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/SAST/tfsec.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.kics:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/SAST/trivy_config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.kics:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/SCA/grype_image.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.grype_image:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
GIT_STRATEGY: none
Expand Down
2 changes: 1 addition & 1 deletion templates/SCA/grype_sbom.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.grype_image:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/SCA/trivy_filesystem.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.trivy_filesystem:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/SCA/trivy_image.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.trivy_image:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
GIT_STRATEGY: none
Expand Down
2 changes: 1 addition & 1 deletion templates/check_security_gate.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.check_security_gate:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: post_test
variables:
GIT_STRATEGY: none
Expand Down
2 changes: 1 addition & 1 deletion templates/importer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.importer:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: upload
variables:
GIT_STRATEGY: none
Expand Down
2 changes: 1 addition & 1 deletion templates/secrets/gitleaks.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.gitleaks:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/secrets/trivy_filesystem_secrets.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.trivy_filesystem_secrets:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
FURTHER_PARAMETERS: ""
Expand Down
2 changes: 1 addition & 1 deletion templates/secrets/trivy_image_secrets.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.trivy_image_secrets:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
stage: test
variables:
GIT_STRATEGY: none
Expand Down
2 changes: 1 addition & 1 deletion templates/vulnerability_scanner.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.vulnerability_scanner:
image:
name: maibornwolff/secobserve-scanners:2024_12
name: maibornwolff/secobserve-scanners:2025_01
script:
- scan_vulnerabilities.sh
interruptible: true
Expand Down

0 comments on commit 62978bf

Please sign in to comment.