fix(mda): remove conflicting vendor files from configuration

Author: jeboehm

.github/linters/super-linter.env

@@ -5,10 +5,13 @@ VALIDATE_CHECKOV=false
 VALIDATE_GITHUB_ACTIONS=false
 VALIDATE_GITHUB_ACTIONS_ZIZMOR=false
 VALIDATE_GIT_COMMITLINT=false
+VALIDATE_JAVASCRIPT_ES=false
+VALIDATE_JAVASCRIPT_PRETTIER=false
 VALIDATE_JSCPD=false
 VALIDATE_KUBERNETES_KUBECONFORM=false
 VALIDATE_PHP=false
 VALIDATE_PHP_PHPCS=false
+VALIDATE_PHP_PHPSTAN=false
 VALIDATE_PHP_PSALM=false
 VALIDATE_PYTHON_BLACK=false
 VALIDATE_SQLFLUFF=false

Makefile

@@ -41,7 +41,8 @@ up: .env
 
 .PHONY: fixtures
 fixtures:
-	$(COMPOSE_PRODUCTION) run --rm web /opt/admin/bin/console system:check --wait
+	$(COMPOSE_PRODUCTION) exec web /opt/admin/bin/console system:check --wait
+	sleep 5 # TODO: remove when admin implemented better checks
 	$(COMPOSE_PRODUCTION) exec web /opt/admin/bin/console domain:add example.com
 	$(COMPOSE_PRODUCTION) exec web /opt/admin/bin/console domain:add example.org
 	$(COMPOSE_PRODUCTION) exec web /opt/admin/bin/console user:add --admin --password=changeme --enable admin example.com
@@ -101,7 +102,7 @@ kubernetes-logs:
 kubernetes-test:
 	kubectl delete -f test/k8s/test-job.yaml --ignore-not-found
 	kubectl apply -f test/k8s/test-job.yaml
-	kubectl wait --timeout=10m --for=condition=complete job -l app.kubernetes.io/name=test-runner-job
+	kubectl wait --timeout=5m --for=condition=complete job -l app.kubernetes.io/name=test-runner-job
 	kubectl logs --ignore-errors -l app.kubernetes.io/name=test-runner-job
 
 .PHONY: kubernetes-up

target/mda/Dockerfile

@@ -8,7 +8,11 @@ LABEL de.ressourcenkonflikt.docker-mailserver.autoheal="true"
 USER root
 RUN apt-get update && \
     apt-get install --no-install-recommends -y curl && \
-    rm -rf /var/lib/apt/lists/*
+    rm -r \
+        /etc/dovecot/conf.d/mail.conf \
+        /etc/dovecot/conf.d/ssl.conf \
+        /etc/dovecot/ssl \
+        /var/lib/apt/lists/*
 USER vmail
 
 ENV MYSQL_HOST=db \

test/bats/integration/010_tls.bats

@@ -4,8 +4,15 @@
 	[ -f /media/tls/tls.crt ]
 }
 
+@test "compare certificate fingerprints" {
+	MDA_FINGERPRINT=$(echo | openssl s_client -showcerts -connect "${MDA_IMAPS_ADDRESS}" 2>&1 | openssl x509 -fingerprint -noout)
+	MTA_FINGERPRINT=$(echo | openssl s_client -showcerts -connect "${MTA_SMTP_ADDRESS}" -starttls smtp 2>&1 | openssl x509 -fingerprint -noout)
+
+	[ "$MDA_FINGERPRINT" = "$MTA_FINGERPRINT" ]
+}
+
 @test "connection to imaps" {
-	run bash -c 'echo -e "a1 LOGOUT\r\n" | openssl s_client -quiet -brief -connect ${MDA_IMAPS_ADDRESS}'
+	run bash -c 'echo -e "a1 LOGOUT\r\n" | openssl s_client -showcerts -quiet -brief -connect ${MDA_IMAPS_ADDRESS}'
 	[ "$status" -eq 0 ]
 }