From 400b1fd90cbe3e91ca5c096b27047e4839d8adf8 Mon Sep 17 00:00:00 2001
From: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
Date: Thu, 2 May 2024 17:59:05 +1200
Subject: [PATCH] tests: Add test coverage for custom parameter support

---
 test/config/override-configs/postfix-main.cf   |  3 +++
 test/config/override-configs/postfix-master.cf |  3 +++
 test/tests/parallel/set1/config_overrides.bats | 17 +++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/test/config/override-configs/postfix-main.cf b/test/config/override-configs/postfix-main.cf
index ce07bd56..fb29f3cc 100644
--- a/test/config/override-configs/postfix-main.cf
+++ b/test/config/override-configs/postfix-main.cf
@@ -2,3 +2,6 @@ max_idle = 600s
 # this is a comment
     # this is also a comment
 readme_directory = /tmp
+
+# This parameter is referenced by an override in `postfix-master.cf`:
+custom_parameter = cidr:{{!172.16.0.42 REJECT}}, permit_sasl_authenticated, reject
diff --git a/test/config/override-configs/postfix-master.cf b/test/config/override-configs/postfix-master.cf
index 516fea81..d284575b 100644
--- a/test/config/override-configs/postfix-master.cf
+++ b/test/config/override-configs/postfix-master.cf
@@ -1,3 +1,6 @@
 submission/inet/smtpd_sasl_security_options=noanonymous
 # this is a test comment, please don't delete me :'(
     # this is also a test comment, :O
+
+# `postfix-main.cf` must be processed first before this custom parameter is in scope:
+submission/inet/smtpd_client_restrictions=$custom_parameter
diff --git a/test/tests/parallel/set1/config_overrides.bats b/test/tests/parallel/set1/config_overrides.bats
index 0a7a5e7f..2f9673ff 100644
--- a/test/tests/parallel/set1/config_overrides.bats
+++ b/test/tests/parallel/set1/config_overrides.bats
@@ -15,6 +15,9 @@ function setup_file() {
 
 function teardown_file() { _default_teardown ; }
 
+# The `postconf` command can query both `main.cf` and `master.cf` at `/etc/postfix/`.
+# Reference: http://www.postfix.org/postconf.1.html
+
 @test "Postfix - 'postfix-main.cf' overrides applied to '/etc/postfix/main.cf'" {
   _run_in_container grep -q 'max_idle = 600s' /tmp/docker-mailserver/postfix-main.cf
   assert_success
@@ -37,6 +40,20 @@ function teardown_file() { _default_teardown ; }
   assert_output --partial '-o smtpd_sasl_security_options=noanonymous'
 }
 
+# Custom parameter support works correctly:
+@test "Postfix - 'postfix-main.cf' should apply before 'postfix-master.cf'" {
+  # Retrieve the value for this setting, `postfix-master.cf` should have the override set:
+  _run_in_container postconf -Ph 'submission/inet/smtpd_client_restrictions'
+  assert_success
+  asset_output '$custom_parameter'
+
+  # As it's a custom parameter ($ prefix), ensure the parameters value is correctly configured:
+  _run_in_container postconf -Phx 'submission/inet/smtpd_client_restrictions'
+  assert_success
+  assert_output 'cidr:{{!172.16.0.42 REJECT}}, permit_sasl_authenticated, reject'
+  refute_output 'postconf: warning: /etc/postfix/master.cf: undefined parameter: custom_parameter'
+}
+
 @test "Dovecot - 'dovecot.cf' overrides applied to '/etc/dovecot/local.conf'" {
   _run_in_container grep -q 'mail_max_userip_connections = 69' /tmp/docker-mailserver/dovecot.cf
   assert_success