Add support for MacroList option

dkimpy_milter/__init__.py

@@ -74,6 +74,15 @@ class dkimMilter(Milter.Base):
                 self.internal_connection = True
     else: ipaddr = ''
     self.connectip = ipaddr
+    if milterconfig.get('MacroList') and not self.internal_connection:
+        macrolist = milterconfig.get('MacroList')
+        for macro in macrolist:
+            macroname = macro.split('|')[0]
+            macroname = '{' + macroname + '}'
+            macroresult = self.getsymval(macroname)
+            if (len(macro.split('|')) == 1 and macroresult) or macroresult in \
+                    macro.split('|')[1:]:
+                self.internal_connection = True
     if self.internal_connection:
         connecttype = 'INTERNAL'
     else:
@@ -99,22 +108,6 @@ class dkimMilter(Milter.Base):
     self.author = None
     self.arheaders = []
     self.arresults = []
-    '''if self.user:
-      # Very simple SMTP AUTH policy by default:
-      #   any successful authentication is considered INTERNAL
-      self.internal_connection = True
-      auth_type = self.getsymval('{auth_type}')
-      ssl_bits =  self.getsymval('{cipher_bits}')
-      if milterconfig.get('Syslog'):
-          syslog.syslog(
-              "SMTP AUTH:",self.user,"sslbits =",ssl_bits, auth_type,
-              "ssf =",self.getsymval('{auth_ssf}'), "INTERNAL"
-      )
-      # Detailed authorization policy is configured in the access file below.
-      self.arresults.append(
-        authres.SMTPAUTHAuthenticationResult(result = 'pass',
-      	result_comment = auth_type+' sslbits='+ssl_bits, smtp_auth = self.user)
-      )'''
     return Milter.CONTINUE
 
   @Milter.noreply

dkimpy_milter/config.py

@@ -47,7 +47,8 @@ defaultConfigData = {
         'Canonicalization' : 'relaxed/simple',
         'InternalHosts' : '127.0.0.1',
         'InternalHostsObj' : False,
-        'DiagnosticDirectory' : ''
+        'DiagnosticDirectory' : '',
+        'MacroList' : ''
         }
 
 
@@ -335,7 +336,8 @@ def _readConfigFile(path, configData = None, configGlobal = {}):
         'Canonicalization' : 'str',
         'InternalHosts' : 'dataset',
         'InternalHostsObj': 'bool',
-        'DiagnosticDirectory' : 'str'
+        'DiagnosticDirectory' : 'str',
+        'MacroList' : 'dataset'
             }
 
     #  check to see if it's a file