Merge pull request #123 from MaibornWolff/dev

chore: merge to main for release 2023_12

docker/Dockerfile

@@ -10,9 +10,9 @@ COPY docker/requirements.txt .
 RUN pip wheel --wheel-dir /usr/src/app/wheels -r ./requirements.txt
 
 # Go build stage for KICS
-FROM golang:1.21.4-alpine as go-build-stage
+FROM golang:1.21.5-alpine as go-build-stage
 
-ARG KICS_VERSION=1.7.10
+ARG KICS_VERSION=1.7.12
 
 # Install kics from GitHub
 WORKDIR /usr/local/kics
@@ -25,9 +25,9 @@ RUN wget --no-verbose https://github.com/Checkmarx/kics/archive/refs/tags/v${KIC
 FROM python:3.11.5-alpine as python-run-stage
 
 ARG GITLEAKS_VERSION=8.18.1
-ARG GRYPE_VERSION=0.73.3
-ARG KICS_VERSION=1.7.10
-ARG TRIVY_VERSION=0.47.0
+ARG GRYPE_VERSION=0.73.4
+ARG KICS_VERSION=1.7.12
+ARG TRIVY_VERSION=0.48.1
 ARG TFSEC_VERSION=1.28.4
 
 # Install openssl-dev because libcrypto is needed for CryptoLyzer
@@ -60,7 +60,6 @@ WORKDIR /usr/local/kics
 COPY --from=go-build-stage /usr/local/kics/kics-${KICS_VERSION}/bin ./bin/
 COPY --from=go-build-stage /usr/local/kics/kics-${KICS_VERSION}/assets/queries ./bin/assets/queries/
 COPY --from=go-build-stage /usr/local/kics/kics-${KICS_VERSION}/assets/libraries ./bin/assets/libraries/
-COPY --from=go-build-stage /usr/local/kics/kics-${KICS_VERSION}/assets/utils ./bin/assets/utils/
 
 # Install trivy from GitHub
 WORKDIR /usr/local/trivy

docker/entrypoints/entrypoint_importer.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+source file_upload_observations.sh

docker/requirements.txt

@@ -1,19 +1,19 @@
 # Bandit
 # ----------------------------------------------------------------
-bandit==1.7.5  # https://github.com/PyCQA/bandit
+bandit==1.7.6  # https://github.com/PyCQA/bandit
 bandit-sarif-formatter==1.1.1  # https://github.com/microsoft/bandit-sarif-formatter
 
 # Checkov
 # ----------------------------------------------------------------
-checkov==3.1.11  # https://github.com/bridgecrewio/checkov
+checkov==3.1.40  # https://github.com/bridgecrewio/checkov
 
 # Semgrep
 # ----------------------------------------------------------------
-semgrep==1.50.0  # https://github.com/returntocorp/semgrep
+semgrep==1.54.1  # https://github.com/returntocorp/semgrep
 
 # CryptoLyzer
 # ----------------------------------------------------------------
-CryptoLyzer==0.12.0  # https://gitlab.com/coroner/cryptolyzer
+CryptoLyzer==0.12.1  # https://gitlab.com/coroner/cryptolyzer
 
 # Importer
 # ----------------------------------------------------------------

importer/importer/file_upload_observations.py

@@ -1,5 +1,6 @@
 from importer.secobserve_api import Api
 from importer.environment import Environment
+from requests.exceptions import HTTPError
 
 
 def file_upload_observations():
@@ -10,6 +11,8 @@ def file_upload_observations():
         api.file_upload_observations()
     except Exception as e:
         print(f"{e.__class__.__name__}: {str(e)}")
+        if isinstance(e, HTTPError):
+            print(f"Response: {e.response.content.decode('utf-8')}")
         exit(1)