Compare commits
11
Commits
main
..
4baad84225
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4baad84225 | ||
|
|
d7cf4108df | ||
|
|
fff6e49350 | ||
|
|
ac1addca14 | ||
|
|
01a863deed | ||
|
|
769462a028 | ||
|
|
ea467474d0 | ||
|
|
373dbfce2e | ||
|
|
d75172dd62 | ||
|
|
b825dec8be | ||
|
|
f6b27fe51c |
+3
-96
@@ -18,21 +18,6 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- name: Scan for secrets
|
|
||||||
run: |
|
|
||||||
# docker cp, not a build COPY: a repo's own .dockerignore (e.g. one that
|
|
||||||
# excludes .git for prod builds) would otherwise silently give an empty,
|
|
||||||
# falsely-clean scan.
|
|
||||||
CID=$(docker create zricethezav/gitleaks:v8.30.1 detect --source=/repo --no-banner -v)
|
|
||||||
docker cp . "$CID:/repo"
|
|
||||||
docker start -a "$CID"
|
|
||||||
STATUS=$?
|
|
||||||
docker rm "$CID" > /dev/null
|
|
||||||
exit $STATUS
|
|
||||||
|
|
||||||
- name: Lint Dockerfile with hadolint
|
|
||||||
run: docker run --rm -i hadolint/hadolint:v2.15.1-alpine hadolint --failure-threshold error - < Dockerfile
|
|
||||||
|
|
||||||
- name: Build Docker image
|
- name: Build Docker image
|
||||||
run: docker build -t socat-proxy:ci .
|
run: docker build -t socat-proxy:ci .
|
||||||
|
|
||||||
@@ -48,53 +33,12 @@ jobs:
|
|||||||
run: docker build --target lint -t socat-proxy:lint .
|
run: docker build --target lint -t socat-proxy:lint .
|
||||||
|
|
||||||
- name: Scan with Trivy (critical - blocking)
|
- name: Scan with Trivy (critical - blocking)
|
||||||
id: trivy_critical
|
|
||||||
continue-on-error: true
|
|
||||||
run: |
|
run: |
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
-e DOCKER_HOST=tcp://dockerhost:2375 \
|
-e DOCKER_HOST=tcp://dockerhost:2375 \
|
||||||
--add-host=dockerhost:host-gateway \
|
--add-host=dockerhost:host-gateway \
|
||||||
aquasec/trivy:0.74.0 image --exit-code 1 --severity CRITICAL socat-proxy:ci
|
aquasec/trivy:0.74.0 image --exit-code 1 --severity CRITICAL socat-proxy:ci
|
||||||
|
|
||||||
- name: Handle CRITICAL findings
|
|
||||||
if: steps.trivy_critical.outcome == 'failure'
|
|
||||||
run: |
|
|
||||||
if [ "${{ github.event_name }}" != "schedule" ]; then
|
|
||||||
echo "::error::CRITICAL vulnerabilities found, failing the build."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Scheduled scan found CRITICAL vulnerabilities — attempting an automatic apk upgrade + rescan."
|
|
||||||
|
|
||||||
sed -i '/^FROM .* AS base$/a RUN apk upgrade --no-cache' Dockerfile
|
|
||||||
docker build -t socat-proxy:remediated .
|
|
||||||
|
|
||||||
if docker run --rm \
|
|
||||||
-e DOCKER_HOST=tcp://dockerhost:2375 \
|
|
||||||
--add-host=dockerhost:host-gateway \
|
|
||||||
aquasec/trivy:0.74.0 image --exit-code 1 --severity CRITICAL socat-proxy:remediated; then
|
|
||||||
echo "apk upgrade clears the CRITICAL finding(s) — opening a PR for review."
|
|
||||||
|
|
||||||
BRANCH="auto/cve-fix-$(date +%Y%m%d)-$(echo "${{ github.sha }}" | cut -c1-7)"
|
|
||||||
git config user.name "socat-proxy-ci"
|
|
||||||
git config user.email "[email protected]"
|
|
||||||
git checkout -b "$BRANCH"
|
|
||||||
git add Dockerfile
|
|
||||||
git commit -m "Auto-remediate CRITICAL CVE via apk upgrade"
|
|
||||||
git config --unset-all http.https://git.djeex.fr/.extraheader || true
|
|
||||||
git push "https://Djeex:${{ secrets.CI_PUSH_TOKEN }}@git.djeex.fr/Djeex/socat-proxy.git" "HEAD:$BRANCH"
|
|
||||||
|
|
||||||
PR_JSON=$(curl -s -X POST \
|
|
||||||
-H "Authorization: token ${{ secrets.CI_PUSH_TOKEN }}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$(jq -n --arg head "$BRANCH" '{title: "🔒 Auto: remediate CRITICAL CVE via apk upgrade", head: $head, base: "main", body: "Opened automatically by the scheduled CVE scan. An `apk upgrade --no-cache` cleared the CRITICAL Trivy finding(s) in a rebuild — review the diff and merge to publish the fix."}')" \
|
|
||||||
"https://git.djeex.fr/api/v1/repos/Djeex/socat-proxy/pulls")
|
|
||||||
echo "PR API response: $(echo "$PR_JSON" | jq -r '.html_url // .message // "unknown"')"
|
|
||||||
else
|
|
||||||
echo "::error::apk upgrade does not clear the CRITICAL finding(s) — no automatic fix available, needs manual review."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Scan with Trivy (high - informative)
|
- name: Scan with Trivy (high - informative)
|
||||||
run: |
|
run: |
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
@@ -159,16 +103,6 @@ jobs:
|
|||||||
docker push "$IMAGE:$MINOR_TAG"
|
docker push "$IMAGE:$MINOR_TAG"
|
||||||
docker push "$IMAGE:$VERSION"
|
docker push "$IMAGE:$VERSION"
|
||||||
|
|
||||||
GHCR_IMAGE=ghcr.io/djeex/socat-proxy
|
|
||||||
echo "${{ secrets.GH_TOKEN }}" | docker login ghcr.io -u Djeex --password-stdin
|
|
||||||
|
|
||||||
docker tag socat-proxy:ci "$GHCR_IMAGE:latest"
|
|
||||||
docker tag socat-proxy:ci "$GHCR_IMAGE:$MINOR_TAG"
|
|
||||||
docker tag socat-proxy:ci "$GHCR_IMAGE:$VERSION"
|
|
||||||
docker push "$GHCR_IMAGE:latest"
|
|
||||||
docker push "$GHCR_IMAGE:$MINOR_TAG"
|
|
||||||
docker push "$GHCR_IMAGE:$VERSION"
|
|
||||||
|
|
||||||
TRIGGER_MSG=$(git log -1 --format=%s "${{ github.sha }}")
|
TRIGGER_MSG=$(git log -1 --format=%s "${{ github.sha }}")
|
||||||
PR_NUM=$(echo "$TRIGGER_MSG" | grep -oE '#[0-9]+' | head -1 | tr -d '#' || true)
|
PR_NUM=$(echo "$TRIGGER_MSG" | grep -oE '#[0-9]+' | head -1 | tr -d '#' || true)
|
||||||
|
|
||||||
@@ -195,7 +129,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
REPO_URL="https://git.djeex.fr/Djeex/socat-proxy"
|
REPO_URL="https://git.djeex.fr/Djeex/socat-proxy"
|
||||||
COMMIT_LIST=$(git log --no-merges --format="- %s ([%h](${REPO_URL}/commit/%H))" "$BASE_REF".."${{ github.sha }}")
|
COMMIT_LIST=$(git log --no-merges --format="- [%h](${REPO_URL}/commit/%H) %s" "$BASE_REF".."${{ github.sha }}")
|
||||||
|
|
||||||
SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
|
SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
|
||||||
SOURCE_LINE="[${SHORT_SHA}](${REPO_URL}/commit/${{ github.sha }})"
|
SOURCE_LINE="[${SHORT_SHA}](${REPO_URL}/commit/${{ github.sha }})"
|
||||||
@@ -205,8 +139,10 @@ jobs:
|
|||||||
|
|
||||||
BODY=$(cat <<EOF
|
BODY=$(cat <<EOF
|
||||||
## Changelog
|
## Changelog
|
||||||
|
---
|
||||||
|
|
||||||
### ${CATEGORY}
|
### ${CATEGORY}
|
||||||
|
---
|
||||||
${CHANGE_TITLE}
|
${CHANGE_TITLE}
|
||||||
|
|
||||||
**Source:** ${SOURCE_LINE}
|
**Source:** ${SOURCE_LINE}
|
||||||
@@ -228,32 +164,3 @@ jobs:
|
|||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "$JSON_PAYLOAD" \
|
-d "$JSON_PAYLOAD" \
|
||||||
"https://git.djeex.fr/api/v1/repos/Djeex/socat-proxy/releases"
|
"https://git.djeex.fr/api/v1/repos/Djeex/socat-proxy/releases"
|
||||||
|
|
||||||
MIRROR_NOTICE="_This github repo is a mirror of https://git.djeex.fr/Djeex/socat-proxy. You'll find full package, PR, history and release note there._"
|
|
||||||
GH_BODY=$(printf '%s\n\n%s' "$MIRROR_NOTICE" "$BODY")
|
|
||||||
|
|
||||||
GH_JSON_PAYLOAD=$(jq -n \
|
|
||||||
--arg tag "$VERSION" \
|
|
||||||
--arg name "$VERSION" \
|
|
||||||
--arg body "$GH_BODY" \
|
|
||||||
--arg sha "${{ github.sha }}" \
|
|
||||||
'{tag_name: $tag, name: $name, target_commitish: $sha, body: $body}')
|
|
||||||
|
|
||||||
GH_STATUS=0
|
|
||||||
for i in 1 2 3 4 5; do
|
|
||||||
GH_STATUS=$(curl -s -o /tmp/gh_release.json -w "%{http_code}" -X POST \
|
|
||||||
-H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" \
|
|
||||||
-H "Accept: application/vnd.github+json" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$GH_JSON_PAYLOAD" \
|
|
||||||
"https://api.github.com/repos/Djeex/socat-proxy/releases")
|
|
||||||
if [ "$GH_STATUS" = "201" ]; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo "GitHub Release attempt $i failed (HTTP $GH_STATUS) — mirror may not have synced this commit yet, retrying in 15s..."
|
|
||||||
sleep 15
|
|
||||||
done
|
|
||||||
echo "GitHub Release API response: $GH_STATUS"
|
|
||||||
if [ "$GH_STATUS" != "201" ]; then
|
|
||||||
cat /tmp/gh_release.json 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
|
|||||||
+1
-1
@@ -145,7 +145,7 @@ fi
|
|||||||
|
|
||||||
log "[~] Testing connection to target..."
|
log "[~] Testing connection to target..."
|
||||||
# Test if we can reach the target before starting socat
|
# Test if we can reach the target before starting socat
|
||||||
if ! nc -z -w 2 "$TARGET_HOST" "$TARGET_PORT" 2>/dev/null; then
|
if ! nc -z "$TARGET_HOST" "$TARGET_PORT" 2>/dev/null; then
|
||||||
log "[!] Cannot connect to $TARGET_HOST:$TARGET_PORT - socat will retry automatically"
|
log "[!] Cannot connect to $TARGET_HOST:$TARGET_PORT - socat will retry automatically"
|
||||||
else
|
else
|
||||||
log "[✓] Connection to $TARGET_HOST:$TARGET_PORT is working"
|
log "[✓] Connection to $TARGET_HOST:$TARGET_PORT is working"
|
||||||
|
|||||||
@@ -58,11 +58,7 @@ socat_pid() {
|
|||||||
wait_for_log() {
|
wait_for_log() {
|
||||||
pattern="$1"
|
pattern="$1"
|
||||||
tries=0
|
tries=0
|
||||||
# 40 * 0.25s = 10s — merge-triggered runs can land on a cold runner
|
while [ "$tries" -lt 20 ]; do
|
||||||
# (evicted Docker cache, first container start), pushing the very first
|
|
||||||
# backgrounded entrypoint.sh past a tighter budget even though nothing's
|
|
||||||
# actually wrong; a rerun on a warm runner always passes.
|
|
||||||
while [ "$tries" -lt 40 ]; do
|
|
||||||
grep -qE "$pattern" "$LOG" 2>/dev/null && return 0
|
grep -qE "$pattern" "$LOG" 2>/dev/null && return 0
|
||||||
tries=$((tries + 1))
|
tries=$((tries + 1))
|
||||||
sleep 0.25
|
sleep 0.25
|
||||||
|
|||||||
Reference in New Issue
Block a user