Merge branch 'master' of gitea.hottis.de:wn/exim-docker

.woodpecker.yml

@@ -13,12 +13,49 @@ steps:
       dockerfile: Dockerfile
     when:
       - event: [push, tag]
+
   scan_image:
     image: aquasec/trivy
     commands:
       - trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
     when:
       - event: [push, tag]
+
+  generate_sbom:
+    image: quay.io/wollud1969/woodpecker-helper:0.5.1
+    environment:
+      TRIVY_TOKEN:
+        from_secret: trivy_token
+      TRIVY_URL:
+        from_secret: trivy_url
+      DTRACK_API_KEY:
+        from_secret: dtrack_api_key
+      DTRACK_API_URL:
+        from_secret: dtrack_api_url
+    commands:
+      - HOME=/home/`id -nu`
+      - TAG="${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
+      - |
+        trivy image \
+              --server $TRIVY_URL \
+              --token $TRIVY_TOKEN \
+              --format cyclonedx \
+              --scanners license \
+              --output /tmp/sbom.xml \
+              $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA
+      - cat /tmp/sbom.xml
+      - |
+        curl -X "POST" \
+             -H "Content-Type: multipart/form-data" \
+             -H "X-Api-Key: $DTRACK_API_KEY" \
+             -F "autoCreate=true" \
+             -F "projectName=$CI_REPO" \
+             -F "projectVersion=$TAG" \
+             -F "bom=@/tmp/sbom.xml"\
+             "$DTRACK_API_URL/api/v1/bom"
+    when:
+      - event: [push, tag]
+
   build:
     image: plugins/kaniko
     settings:

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.21.0
+FROM alpine:3.21.3
 
 LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
 LABEL ImageName="quay.io/wollud1969/exim-docker"
@@ -11,6 +11,9 @@ ENV SMARTHOST_USER=""
 ENV SMARTHOST_PASS=""
 # ip addresses or networks to allow for relaying, separate multiple ones by semicolon
 ENV RELAYNETS="127.0.0.1/32"
+# whitelist of recipient domains, colon-separated, if empty all no restrictions
+ENV WHITELISTED_RECIPIENTS=""
+
 
 RUN apk add --no-cache exim m4
 

examples/deploy.yml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: smtp
+  namespace: system
   labels:
     app: smtp
   annotations:
@@ -18,7 +19,7 @@ spec:
     spec:
       containers:
         - name: smtp
-          image: quay.io/wollud1969/exim-docker:0.2.1
+          image: quay.io/wollud1969/exim-docker:0.3.2
           envFrom:
             - secretRef:
                 name: smtp-secrets
@@ -30,6 +31,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: smtp
+  namespace: system
 spec:
   type: ClusterIP
   selector:

exim.conf.m4

@@ -5,6 +5,8 @@ define(`SMARTHOST', esyscmd(`echo -n $SMARTHOST'))dnl
 define(`SMARTHOST_USER', esyscmd(`echo -n $SMARTHOST_USER'))dnl
 define(`SMARTHOST_PASS', esyscmd(`echo -n $SMARTHOST_PASS'))dnl
 define(`RELAYNETS', esyscmd(`echo -n $RELAYNETS'))dnl
+define(`WHITELISTED_RECIPIENTS', esyscmd(`echo -n $WHITELISTED_RECIPIENTS'))dnl
+
 
 ifelse(SMARTHOST, `', `
 errprint(`Error: SMARTHOST not set')
@@ -59,8 +61,12 @@ begin acl
 acl_check_rcpt:
   accept
     hosts = RELAYNETS
+ifelse(WHITELISTED_RECIPIENTS, `', `', `
+  accept
+    domains = WHITELISTED_RECIPIENTS
+')
   deny
-    message = "Relaying denied"
+    message = "550 5.7.1 Relaying denied"
 
 ifelse(LOCALMAILNAME, `', `', `
 begin rewrite

readme.md

@@ -12,6 +12,7 @@ Four environment variables are used to configure the container:
 * `SMARTHOST_PASS`: Password for smarthost.
 * `LOCALMAILNAME`: The domain name which shall be used as the domain part of the sender address in every outgoing mail. If not required, skip it.
 * `RELAYNETS`: Networks exim in this container accepts for relaying. Separate multiple networks by semicolon.
+* `WHITELISTED_RECIPIENT`: Colon-separated list of whitelisted recipient domains, if empty no recipient restrictions will be applied
 
 
 ## Deployment
@@ -24,7 +25,7 @@ Typically, don't expose the smtp port of this container to the default network o
 ```
 #!/bin/bash
 
-IMAGE=quay.io/wollud1969/exim-docker:0.2.2
+IMAGE=quay.io/wollud1969/exim-docker:0.3.2
 MAILER_NETWORK=mailer-network
 
 docker network create $MAILER_NETWORK || echo "mailer-network already exists"
@@ -38,6 +39,7 @@ docker run \
   -e SMARTHOST=smarthost.example.com \
   -e LOCALMAILNAME=krohne.com \
   -e RELAYNETS=$RELAYNETS \
+  -e WHITELISTED_RECIPIENT="example-recipients.com" \
   --network $MAILER_NETWORK \
   --name mailer \
   --restart always \