Add new settings to control when (under what circumstances) a Sender:, X-Sender: or even an obscured X-Authenticated-As: header is prepended to email submitted through Kolab.

1 files changed, 21 insertions, 2 deletions

diff --git a/conf/kolab.conf b/conf/kolab.conf
index 8c36605..2f8ea2b 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -279,12 +279,31 @@ cache_retention = 86400
 ; list.
 address_search_attrs = mail, alias
 
-; Prepend the Sender: header?
+; Prepend the Sender: and/or X-Sender header(s) if the user authenticated is a
+; designated delegatee of the envelope sender address?
+delegate_sender_header = True
+
+; Prepend the Sender: and/or X-Sender header(s) if the user authenticated
+; is using an envelope sender address that is a secondary recipient email
+; address (attached to the object entry) of the user authenticated?
+alias_sender_header = True
+
+; Prepend the Sender: header? Only relevant if delegate_sender_header or
+; alias_sender_header is set to True.
 sender_header = True
 
-; Prepend the X-Sender: header?
+; Prepend the X-Sender: header? Only relevant if delegate_sender_header or
+; alias_sender_header is set to True.
 xsender_header = True
 
+; "Encrypt" -- read, "obscure" -- the contents of the 'Sender:' and/or
+; 'X-Sender:' header(s). Note that this invalidates client's use of the header
+; value, and therefore replaces both headers with 'X-Authenticated-As'.
+;
+; Example: 'vanmeeuwen@kolabsys.com' becomes '6crb3dHK6ODS3qzQ4tXO0t_e5pfQ39k='
+;
+; sender_header_enc_key = 'simple'
+
 ; Allow hosts in these networks to submit messages with empty envelope senders,
 ; such as web-clients responding to MDN requests.
 empty_sender_hosts = 3.2.1.0/24, 6.6.6.0/24