From 78e82b51571bd10e73173a772c43736e42c22c6a Mon Sep 17 00:00:00 2001 From: Dominik Chilla Date: Fri, 4 Dec 2020 18:01:07 +0100 Subject: [PATCH] X-ExOTA-AR with x509_client_trust --- README.md | 2 ++ app/exota-milter.py | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 636d359..02597ae 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,8 @@ services: MILTER_TRUSTED_AUTHSERVID: 'my-auth-serv-id' MILTER_X509_ENABLED: 'some_value' MILTER_X509_TRUSTED_CN: 'mail.protection.outlook.com' + MILTER_ADD_HEADER: 'some_value' + MILTER_AUTHSERVID: 'my-auth-serv-id' volumes: - "./data/:/data/:ro" - "./socket/:/socket/:rw" diff --git a/app/exota-milter.py b/app/exota-milter.py index 8eb2f84..a45a8fd 100644 --- a/app/exota-milter.py +++ b/app/exota-milter.py @@ -284,9 +284,12 @@ class ExOTAMilter(Milter.Base): ) if g_milter_add_header: try: - self.addheader("X-ExOTA-Authentication-Results", "{0};\n exota=pass header.d={1} dkim={2}".format( - g_milter_authservid, self.hdr_from_domain, policy.is_dkim_enabled() - )) + self.addheader("X-ExOTA-Authentication-Results", + "{0};\n exota=pass header.d={1} dkim={2} x509_client_trust={3}".format( + g_milter_authservid, self.hdr_from_domain, policy.is_dkim_enabled(), + g_milter_x509_enabled + ) + ) logging.debug(self.mconn_id + "/" + str(self.getsymval('i')) + "/EOM: AR-header added" )