This commit was manufactured by cvs2svn to create tag 'pymilter-0_9_6'.

Sprout from master 2012-03-03 18:51:56 UTC Stuart Gathman <stuart@gathman.org> 'Release 0.9.6' Cherrypick from bmsi 2005-05-31 18:23:49 UTC Stuart Gathman <stuart@gathman.org> 'Development changes since 0.7.2': sample.py test/big5 test/bounce test/bounce1 test/bound test/honey test/missingboundary test/samp1 test/spam44 test/spam7 test/spam8 test/test1 test/test8 test/virus1 test/virus13 test/virus2 test/virus3 test/virus4 test/virus5 test/virus6 test/virus7
2012-03-03 18:51:57 +00:00
17 changed files with 170 additions and 18934 deletions
@@ -31,7 +31,7 @@ PROJECT_NAME           = pymilter
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.

-PROJECT_NUMBER         = 1.0
+PROJECT_NUMBER         = 0.9.5

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -8,14 +8,13 @@
 # Copyright 2001,2009 Business Management Systems, Inc.
 # This code is under the GNU General Public License.  See COPYING for details.

-__version__ = '0.9.7'
+__version__ = '0.9.5'

 import os
 import milter
 import thread

 from milter import *
-from functools import wraps

 _seq_lock = thread.allocate_lock()
 _seq = 0
@@ -103,7 +102,7 @@ def rejected_recipients(klass):
  return enable_protocols(klass,P_RCPT_REJ)

 ## Milter leading space on headers. A class decorator that calls
-# enable_protocols() with the P_HDR_LEADSPC flag.  By default,
+# enable_protocols() with the P_HEAD_LEADSPC flag.  By default,
 # header continuation lines are collected and joined before getting
 # sent to a milter.  Headers modified or added by the milter are
 # folded by the MTA as necessary according to its own standards.
@@ -121,7 +120,7 @@ def rejected_recipients(klass):
 # @param klass the %milter application class to modify
 # @return the modified %milter class
 def header_leading_space(klass):
-  return enable_protocols(klass,P_HDR_LEADSPC)
+  return enable_protocols(klass,P_HEAD_LEADSPC)

 ## Function decorator to disable callback methods.
 # If the MTA supports it, tells the MTA not to invoke this callback,
@@ -138,12 +137,7 @@ def nocallback(func):
  except KeyError:
    raise ValueError(
      '@nocallback applied to non-optional method: '+func.__name__)
-  def wrapper(self,*args):
-    if func(self,*args) != CONTINUE:
-      raise RuntimeError('%s return code must be CONTINUE with @nocallback'
-        % func.__name__)
-    return CONTINUE
-  return wrapper
+  return func

 ## Function decorator to disable callback reply.
 # If the MTA supports it, tells the MTA not to wait for a reply from
@@ -158,14 +152,9 @@ def noreply(func):
  except KeyError:
    raise ValueError(
      '@noreply applied to non-optional method: '+func.__name__)
-  @wraps(func)
  def wrapper(self,*args):
    rc = func(self,*args)
-    if self._protocol & nr_mask:
-      if rc != CONTINUE:
-        raise RuntimeError('%s return code must be CONTINUE with @noreply'
-	  % func.__name__)
-      return NOREPLY
+    if self._protocol & nr_mask: return NOREPLY
    return rc
  wrapper.milter_protocol = nr_mask
  return wrapper
@@ -258,9 +247,7 @@ class Base(object):

  ## Defined by subclasses to write log messages.
  def log(self,*msg): pass
-  ## Called for each connection to the MTA.  Called by the
-  # <a href="milter_api/xxfi_connect.html">
-  # xxfi_connect</a> callback.  
+  ## Called for each connection to the MTA.
  # The <code>hostname</code> provided by the local MTA is either
  # the PTR name or the IP in the form "[1.2.3.4]" if no PTR is available.
  # The format of hostaddr depends on the socket family:
@@ -273,17 +260,6 @@ class Base(object):
  # <dt><code>socket.AF_UNIX</code>
  # <dd>A string with the socketname
  # </dl>
-  # To vary behavior based on what port the client connected to,
-  # for example skipping blacklist checks for port 587 (which must 
-  # be authenticated), use @link #getsymval getsymval('{daemon_port}') @endlink.
-  # The <code>{daemon_port}</code> macro must be enabled in sendmail.cf
-  # <pre>
-  # O Milter.macros.connect=j, _, {daemon_name}, {daemon_port}, {if_name}, {if_addr}
-  # </pre>
-  # or sendmail.mc
-  # <pre>
-  # define(`confMILTER_MACROS_CONNECT', ``j, _, {daemon_name}, {daemon_port}, {if_name}, {if_addr}'')dnl
-  # </pre>
  # @param hostname the PTR name or bracketed IP of the SMTP client
  # @param family <code>socket.AF_INET</code>, <code>socket.AF_INET6</code>,
  #     or <code>socket.AF_UNIX</code>
@@ -295,26 +271,12 @@ class Base(object):
  # this almost always results in terminating the connection.
  @nocallback
  def hello(self,hostname): return CONTINUE
-  ## Called when the SMTP client says MAIL FROM. Called by the
-  # <a href="milter_api/xxfi_envfrom.html">
-  # xxfi_envfrom</a> callback.  
+  ## Called when the SMTP client says MAIL FROM.
  # Returning REJECT rejects the message, but not the connection.
-  # The sender is the "envelope" from as defined by
-  # <a href="http://tools.ietf.org/html/rfc5321">RFC 5321</a>.
-  # For the From: header (author) defined in 
-  # <a href="http://tools.ietf.org/html/rfc5322">RFC 5322</a>,
-  # see @link #header the header callback @endlink.
  @nocallback
  def envfrom(self,f,*str): return CONTINUE
-  ## Called when the SMTP client says RCPT TO. Called by the
-  # <a href="milter_api/xxfi_envrcpt.html">
-  # xxfi_envrcpt</a> callback.
+  ## Called when the SMTP client says RCPT TO.
  # Returning REJECT rejects the current recipient, not the entire message.
-  # The recipient is the "envelope" recipient as defined by 
-  # <a href="http://tools.ietf.org/html/rfc5321">RFC 5321</a>.
-  # For recipients defined in 
-  # <a href="http://tools.ietf.org/html/rfc5322">RFC 5322</a>, 
-  # for example To: or Cc:, see @link #header the header callback @endlink.
  @nocallback
  def envrcpt(self,to,*str): return CONTINUE
  ## Called when the SMTP client says DATA.
@@ -373,7 +335,7 @@ class Base(object):
      return p
    
  ## Negotiate milter protocol options.  Called by the
-  # <a href="milter_api/xxfi_negotiate.html">
+  # <a href="https://www.milter.org/developers/api/xxfi_negotiate">
  # xffi_negotiate</a> callback.  This is an advanced callback,
  # do not override unless you know what you are doing.  Most
  # negotiation can be done simply by using the supplied 
@@ -404,7 +366,7 @@ class Base(object):
  ## Return the value of an MTA macro.  Sendmail macro names
  # are either single chars (e.g. "j") or multiple chars enclosed
  # in braces (e.g. "{auth_type}").  Macro names are MTA dependent.
-  # See <a href="milter_api/smfi_getsymval.html">
+  # See <a href="https://www.milter.org/developers/api/smfi_getsymval">
  # smfi_getsymval</a> for default sendmail macros.
  # @param sym the macro name
  def getsymval(self,sym):
@@ -416,17 +378,8 @@ class Base(object):
  # must be doubled, or libmilter will silently ignore the setreply.
  # Beginning with 0.9.6, we test for that case and throw ValueError to avoid
  # head scratching.  What will <i>really</i> irritate you, however,
-  # is that if you carefully double any '%%', your message will be
-  # sent - but with the '%%' still doubled!
-  # See <a href="milter_api/smfi_setreply.html">
-  # smfi_setreply</a> for more information.
-  # @param rcode The three-digit (RFC 821/2821) SMTP reply code as a string. 
-  # rcode cannot be None, and <b>must be a valid 4XX or 5XX reply code</b>.
-  # @param xcode The extended (RFC 1893/2034) reply code. If xcode is None,
-  # no extended code is used. Otherwise, xcode must conform to RFC 1893/2034.
-  # @param msg The text part of the SMTP reply. If msg is None,
-  # an empty message is used.
-  # @param ml  Optional additional message lines.
+  # is that if you carefully double any '%', your message will be
+  # sent - but with the '%' still doubled!
  def setreply(self,rcode,xcode=None,msg=None,*ml):
    for m in (msg,)+ml:
      if 1 in [len(s)&1 for s in R.findall(m)]:
@@ -449,7 +402,7 @@ class Base(object):
  # Milter methods which can only be called from eom callback.

  ## Add a mail header field.
-  # Calls <a href="milter_api/smfi_addheader.html">
+  # Calls <a href="https://www.milter.org/developers/api/smfi_addheader">
  # smfi_addheader</a>.  
  # The <code>Milter.ADDHDRS</code> action flag must be set.
  #
@@ -463,7 +416,7 @@ class Base(object):
    return self._ctx.addheader(field,value,idx)

  ## Change the value of a mail header field.
-  # Calls <a href="milter_api/smfi_chgheader.html">
+  # Calls <a href="https://www.milter.org/developers/api/smfi_chgheader">
  # smfi_chgheader</a>.  
  # The <code>Milter.CHGHDRS</code> action flag must be set.
  #
@@ -477,7 +430,7 @@ class Base(object):
    return self._ctx.chgheader(field,idx,value)

  ## Add a recipient to the message.  
-  # Calls <a href="milter_api/smfi_addrcpt.html">
+  # Calls <a href="https://www.milter.org/developers/api/smfi_addrcpt">
  # smfi_addrcpt</a>.  
  # If no corresponding mail header is added, this is like a Bcc.
  # The syntax of the recipient is the same as used in the SMTP
@@ -497,7 +450,7 @@ class Base(object):
        raise DisabledAction("ADDRCPT_PAR")
    return self._ctx.addrcpt(rcpt,params)
  ## Delete a recipient from the message.
-  # Calls <a href="milter_api/smfi_delrcpt.html">
+  # Calls <a href="https://www.milter.org/developers/api/smfi_delrcpt">
  # smfi_delrcpt</a>.  
  # The recipient should match one passed to the envrcpt callback.
  # The <code>Milter.DELRCPT</code> action flag must be set.
@@ -510,7 +463,7 @@ class Base(object):
    return self._ctx.delrcpt(rcpt)

  ## Replace the message body.
-  # Calls <a href="milter_api/smfi_replacebody.html">
+  # Calls <a href="https://www.milter.org/developers/api/smfi_replacebody">
  # smfi_replacebody</a>.  
  # The entire message body must be replaced.  
  # Call repeatedly with blocks of data until the entire body is transferred.
@@ -524,7 +477,7 @@ class Base(object):
    return self._ctx.replacebody(body)

  ## Change the SMTP envelope sender address.
-  # Calls <a href="milter_api/smfi_chgfrom.html">
+  # Calls <a href="https://www.milter.org/developers/api/smfi_chgfrom">
  # smfi_chgfrom</a>.  
  # The syntax of the sender is that same as used in the SMTP
  # MAIL FROM command (and as delivered to the envfrom callback),
@@ -541,7 +494,7 @@ class Base(object):
    return self._ctx.chgfrom(sender,params)

  ## Quarantine the message.
-  # Calls <a href="milter_api/smfi_quarantine.html">
+  # Calls <a href="https://www.milter.org/developers/api/smfi_quarantine">
  # smfi_quarantine</a>.  
  # When quarantined, a message goes into the mailq as if to be delivered,
  # but delivery is deferred until the message is unquarantined.
@@ -555,7 +508,7 @@ class Base(object):
    return self._ctx.quarantine(reason)

  ## Tell the MTA to wait a bit longer.
-  # Calls <a href="milter_api/smfi_progress.html">
+  # Calls <a href="https://www.milter.org/developers/api/smfi_progress">
  # smfi_progress</a>.  
  # Resets timeouts in the MTA that detect a "hung" milter.
  def progress(self):
@@ -569,9 +522,9 @@ class Milter(Base):

  ## Provide simple logging to sys.stdout
  def log(self,*msg):
-    print('Milter:',end=None)
-    for i in msg: print(i,end=None)
-    print()
+    print 'Milter:',
+    for i in msg: print i,
+    print

  @noreply
  def connect(self,hostname,family,hostaddr):
@@ -70,24 +70,15 @@ class Session(object):
    pre: qtype in ['A', 'AAAA', 'MX', 'PTR', 'TXT', 'SPF']
    post: isinstance(__return__, types.ListType)
    """
-    if name.endswith('.'): name = name[:-1]
-    if not reduce(lambda x,y:x and 0 < len(y) < 64, name.split('.'),True):
-        return []   # invalid DNS name (too long or empty)
-    name = name.lower()
    result = self.cache.get( (name, qtype) )
    cname = None
-    if result: return result
-    cnamek = (name,'CNAME')
-    cname = self.cache.get( cnamek )

-    if cname:
-        cname = cname[0]
-    else:
+    if not result:
        safe2cache = Session.SAFE2CACHE
        for k, v in DNSLookup(name, qtype):
-            if k == cnamek:
+            if k == (name, 'CNAME'):
                cname = v
-            if k[1] == 'CNAME' or (qtype,k[1]) in safe2cache:
+            if (qtype,k[1]) in safe2cache:
                self.cache.setdefault(k, []).append(v)
        result = self.cache.get( (name, qtype), [])
    if not result and cname:
@@ -97,23 +88,11 @@ class Session(object):
            #return result    # if too many == NX_DOMAIN
            raise DNSError('Length of CNAME chain exceeds %d' % MAX_CNAME)
        cnames[name] = cname
-	if cname.lower().rstrip('.') in cnames:
-            raise DNSError('CNAME loop')
+        if cname in cnames:
+            raise DNSError, 'CNAME loop'
        result = self.dns(cname, qtype, cnames=cnames)
-        if result:
-            self.cache[(name,qtype)] = result
    return result

-  def dns_txt(self, domainname, enc='ascii'):
-    "Get a list of TXT records for a domain name."
-    if domainname:
-        try:
-            return [''.join(s.decode(enc) for s in a)
-                for a in self.dns(domainname, 'TXT')]
-        except UnicodeEncodeError:
-            raise DNSError('Non-ascii character in SPF TXT record.')
-    return []
-
 DNS.DiscoverNameServers()

 if __name__ == '__main__':
@@ -6,14 +6,11 @@ import re
 import struct
 import socket
 import email.Errors
-import email.base64mime
 from fnmatch import fnmatchcase
 from email.Header import decode_header
-from binascii import a2b_base64
 #import email.Utils
 import rfc822

-dnsre = re.compile(r'^[a-z][-a-z\d.]+$', re.IGNORECASE)
 PAT_IP4 = r'\.'.join([r'(?:\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])']*4)
 ip4re = re.compile(PAT_IP4+'$')
 ip6re = re.compile(                 '(?:%(hex4)s:){6}%(ls32)s$'
@@ -52,7 +49,7 @@ if hasattr(socket,'has_ipv6') and socket.has_ipv6:
    def inet_ntop(s):
        return socket.inet_ntop(socket.AF_INET6,s)
    def inet_pton(s):
-        return socket.inet_pton(socket.AF_INET6,s.strip())
+        return socket.inet_pton(socket.AF_INET6,s)
 else:
    from pyip6 import inet_ntop, inet_pton

@@ -70,12 +67,6 @@ def iniplist(ipaddr,iplist):
  True
  >>> iniplist('192.168.0.45',['192.168.0.*'])
  True
-  >>> iniplist('4.2.2.2',['b.resolvers.Level3.net'])
-  True
-  >>> iniplist('2607:f8b0:4004:801::',['google.com/40'])
-  True
-  >>> iniplist('4.2.2.2',['nothing.example.com'])
-  False
  >>> iniplist('2001:610:779:0:223:6cff:fe9a:9cf3',['127.0.0.1','172.20.1.0/24','2001:610:779::/48'])
  True
  >>> iniplist('2G01:610:779:0:223:6cff:fe9a:9cf3',['127.0.0.1','172.20.1.0/24','2001:610:779::/48'])
@@ -84,10 +75,8 @@ def iniplist(ipaddr,iplist):
  ValueError: Invalid ip syntax:2G01:610:779:0:223:6cff:fe9a:9cf3
  """
  if ip4re.match(ipaddr):
-    fam = socket.AF_INET
    ipnum = addr2bin(ipaddr)
  elif ip6re.match(ipaddr):
-    fam = socket.AF_INET6
    ipnum = bin2long6(inet_pton(ipaddr))
  else:
    raise ValueError('Invalid ip syntax:'+ipaddr)
@@ -107,13 +96,6 @@ def iniplist(ipaddr,iplist):
        n = 128
      if cidr(bin2long6(inet_pton(p[0])),n,MASK6) == cidr(ipnum,n,MASK6):
        return True
-    elif dnsre.match(p[0]):
-      try:
-        sfx = '/'.join(['']+p[1:])
-        addrlist = [r[4][0]+sfx for r in socket.getaddrinfo(p[0],25,fam)]
-        if iniplist(ipaddr,addrlist):
-          return True
-      except socket.gaierror: pass
    elif fnmatchcase(ipaddr,pat):
      return True
  return False
@@ -121,7 +103,6 @@ def iniplist(ipaddr,iplist):
 ## Split email into Fullname and address.
 # This replaces <code>email.Utils.parseaddr</code> but fixes
 # some <a href="http://bugs.python.org/issue1025395">tricky test cases</a>.
-# Additional tricky cases are still broken.  Patches welcome.
 #
 def parseaddr(t):
  """Split email into Fullname and address.
@@ -160,16 +141,6 @@ def parseaddr(t):
      return rfc822.parseaddr('%s<%s>' % (t[:pos].strip(),addrspec))
  return res
    
-## Fix email.base64mime.decode to add any missing padding
-def decode(s, convert_eols=None):
-  if not s: return s
-  while len(s) % 4: s += '='	# add missing padding
-  dec = a2b_base64(s)
-  if convert_eols:
-      return dec.replace(CRLF, convert_eols)
-  return dec
-    
-email.base64mime.decode = decode

 def parse_addr(t):
  """Split email into user,domain.
@@ -219,8 +190,8 @@ def parse_header(val):
 	  u.append(unicode(s))
      else:
 	u.append(unicode(s))
-    u = u''.join(u)
-    for enc in ('us-ascii','iso-8859-1','utf-8'):
+    u = ''.join(u)
+    for enc in ('us-ascii','iso-8859-1','utf8'):
      try:
 	return u.encode(enc)
      except UnicodeError: continue
@@ -11,24 +11,25 @@ any point, tell Sendmail to reject, discard, or accept the message.
 Requirements
 ------------

-Python milter extension: http://https://pypi.python.org/pypi/pymilter/
+This python milter extension: http://www.bmsi.com/python/milter.html
 Python: http://www.python.org
 Sendmail: http://www.sendmail.org
-
 NB: From Sendmail's libmilter/README:

 libmilter requires pthread support in the operating system.  Moreover, it
 requires that the library functions it uses are thread safe; which is true
 for the operating systems libmilter has been developed and tested on.  On
 some operating systems this requires special compile time options (e.g.,
-not just -pthread).  libmilter is currently known to work on (modulo problems
-in the pthread support of some specific versions):
+not just -pthread).  libmilter is currently known to work on (modulo
+problems in the pthread support of some specific versions):

 FreeBSD 3.x, 4.x
 SunOS 5.x (x >= 5)
 AIX 4.3.x
 HP UX 11.x
 Linux (recent versions/distributions)
+OpenBSD
+AIX 4.1.5

 libmilter is currently not supported on:

@@ -109,6 +110,28 @@ _FFR_MILTER for the cf macros.  For example,

 m4 -D_FFR_MILTER ../m4/cf.m4 myconfig.mc > myconfig.cf

+
+RedHat 6.2 Notes
+----------------
+
+The Redhat 6.2 sendmail RPM does not enable milter.  You can obtain a
+modified spec file at
+
+http://www.bmsi.com/linux/rh62/sendmail-rhmilter.spec
+
+use it to rebuild the Redhat 7.2 SRPM.  The RH6.2 SRPM does not have
+recent sendmail security patches.
+
+RedHat 7.2 Notes
+----------------
+
+The Redhat 7.2 sendmail RPM enables milter in sendmail - but does not include
+the headers needed for compiling a milter.  You can obtain a modified spec
+file with a sendmail-devel package that includes the needed static libraries
+and headers at
+
+http://www.bmsi.com/linux/sendmail-rh72.spec
+
 IPv6 Notes
 ----------

@@ -1,7 +1,7 @@
 ## @mainpage Writing Milters in Python
 #
 # At the lowest level, the <code>milter</code> module provides a thin wrapper
-# around the <a href="milter_api/index.html"> sendmail
+# around the <a href="https://www.milter.org/developers/api/index"> sendmail
 # libmilter API</a>.  This API lets you register callbacks for a number of
 # events in the process of sendmail receiving a message via SMTP.  These
 # events include the initial connection from a MTA, the envelope sender and
@@ -37,10 +37,10 @@
 # @section threading
 #
 # The libmilter library which pymilter wraps 
-# <a href="milter_overview#SignalHandling">handles
+# <a href="https://www.milter.org/developers/overview#SignalHandling">handles
 # all signals</a> itself, and expects to be called from a single main thread.
 # It handles SIGTERM, SIGHUP, and SIGINT, mapping the first two to 
-# <a href="milter_api/smfi_stop.html">smfi_stop</a>
+# <a href="https://www.milter.org/developers/api/smfi_stop">smfi_stop</a>
 # and the last to an internal ABORT.
 #
 # If you use python threads or threading modules, then signal handling gets
@@ -50,37 +50,4 @@
 # You may find the
 # <a href="http://docs.python.org/release/2.6.6/library/multiprocessing.html">
 # multiprocessing</a> module useful.  It can be a drop-in
-# replacement for threading as illustrated in 
-# <a href="milter-template_8py-example.html">milter-template.py</a>.
-#
-# @section Useful python packages for milters
-#
-# <a href="https://pypi.python.org/pypi/pyspf">pyspf</a> checks the
-# SMTP envelope sender (MAIL FROM, passed to the Milter.Base.envfrom callback)
-# against a Sender Policy published in DNS by the sending domain.  This
-# can prevent forgery of the MAIL FROM.  SPF is Sender Policy Framework.
-#
-# <a href="https://launchpad.net/dkimpy">pydkim</a> checks a DKIM signature
-# of the email body and headers against a public key published in DNS by
-# the signing domain.  DKIM is DomainKeys Identified Mail.
-#
-# The <a href="https://pypi.python.org/pypi/authres/">authres</a> module 
-# parses and formats the Authentication-Results email header, providing
-# a standard place to summarize the results from DKIM, SPF, rDNS, SMTP AUTH,
-# and other email authentication methods.
-#
-# <a href="https://pypi.python.org/pypi/pydspam/">pydspam</a> wraps 
-# the libdspam API of the <a href="http://dspam.sourceforge.net/">DSPAM</a>
-# project.
-#
-# @section Milters written with pymilter
-#
-# <a href="https://github.com/croessner/vrfydmn">Verify Domain</a> is a
-# Postfix milter that rejects/fixes manipulated From: header
-# on a mail host with multiple virtual domains.
-#
-# <a href="https://pypi.python.org/pypi/milter/">BMS Milter</a> has several
-# milters, a big complicated spam filter that integrates multiple
-# authentication protocols with pydpsm, and two simple ones: spfmilter.py and
-# dkim-milter.py.
-#
+# replacement for threading as illustrated in @ref milter-template.py.
@@ -20,47 +20,41 @@
 # and converts function callbacks to instance method invocations.
 #
 class milterContext(object):
-  ## Calls <a href="milter_api/smfi_getsymval.html">smfi_getsymval</a>.
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_getsymval">smfi_getsymval</a>.
  def getsymval(self,sym): pass
-  ## Calls <a href="milter_api/smfi_setreply.html">
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_setreply">
  # smfi_setreply</a> or
-  # <a href="milter_api/smfi_setmlreply.html">
+  # <a href="https://www.milter.org/developers/api/smfi_setmlreply">
  # smfi_setmlreply</a>.
  # @param rcode SMTP response code
  # @param xcode extended SMTP response code
  # @param msg one or more message lines.  If the MTA does not support 
  #     multiline messages, only the first is used.
  def setreply(self,rcode,xcode,*msg): pass
-  ## Calls <a href="milter_api/smfi_addheader.html">smfi_addheader</a>.
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_addheader">smfi_addheader</a>.
  def addheader(self,name,value,idx=-1): pass
-  ## Calls <a href="milter_api/smfi_chgheader.html">smfi_chgheader</a>.
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_chgheader">smfi_chgheader</a>.
  def chgheader(self,name,idx,value): pass
-  ## Calls <a href="milter_api/smfi_addrcpt.html">smfi_addrcpt</a>.
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_addrcpt">smfi_addrcpt</a>.
  def addrcpt(self,rcpt,params=None): pass
-  ## Calls <a href="milter_api/smfi_delrcpt.html">smfi_delrcpt</a>.
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_delrcpt">smfi_delrcpt</a>.
  def delrcpt(self,rcpt): pass
-  ## Calls <a href="milter_api/smfi_replacebody.html">smfi_replacebody</a>.
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_replacebody">smfi_replacebody</a>.
  def replacebody(self,data): pass
  ## Attach a Python object to this connection context.
  # @return the old value or None
  def setpriv(self,priv): pass
  ## Return the Python object attached to this connection context.
  def getpriv(self): pass
-  ## Calls <a href="milter_api/smfi_quarantine.html">smfi_quarantine</a>.
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_quarantine">smfi_quarantine</a>.
  def quarantine(self,reason): pass
-  ## Calls <a href="milter_api/smfi_progress.html">smfi_progress</a>.
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_progress">smfi_progress</a>.
  def progress(self): pass
-  ## Calls <a href="milter_api/smfi_chgfrom.html">smfi_chgfrom</a>.
+  ## Calls <a href="https://www.milter.org/developers/api/smfi_chgfrom">smfi_chgfrom</a>.
  def chgfrom(self,sender,param=None): pass
  ## Tell the MTA which macro values we are interested in for a given stage.
  # Of interest only when you need to squeeze a few more bytes of bandwidth.
-  # It may only be called from the negotiate callback.
-  # The protocol stages are 
-  # M_CONNECT, M_HELO, M_ENVFROM, M_ENVRCPT, M_DATA, M_EOM, M_EOH.
-  # Calls <a href="milter_api/smfi_setsymlist.html">smfi_setsymlist</a>.
-  # @param stage protocol stage in which the macro list should be used
-  # @param macrolist a space separated list of macro names
-  def setsymlist(self,stage,macrolist): pass
+  def setsmlist(self,stage,macrolist): pass

 class error(Exception): pass

@@ -97,50 +91,40 @@ def set_exception_policy(code): pass
 # in the future (perhaps keeping the set functions for compatibility).
 # @param name the milter name by which the MTA finds us
 # @param negotiate the
-#       <a href="milter_api/xxfi_negotiate.html">
+#       <a href="https://www.milter.org/developers/api/xxfi_negotiate">
 #       xxfi_negotiate</a> callback, called to negotiate supported
 #       actions, callbacks, and protocol steps.
 # @param unknown the
-#       <a href="milter_api/xxfi_unknown.html">
+#       <a href="https://www.milter.org/developers/api/xxfi_unknown">
 #       xxfi_unknown</a> callback, called when for SMTP commands
 #       not recognized by the MTA. (Extend SMTP in your milter!)
 # @param data the
-#       <a href="milter_api/xxfi_data.html">
+#       <a href="https://www.milter.org/developers/api/xxfi_data">
 #       xxfi_data</a> callback, called when the DATA
 #       SMTP command is received.
 def register(name,negotiate=None,unknown=None,data=None): pass
-
-## Attempt to create the socket used to communicate with the MTA.
-# milter.opensocket() attempts to create the socket specified previously by a
-# call to milter.setconn() which will be the interface between MTAs and the
-# %milter.  This allows the calling application to ensure that the socket can be
-# created.  If this is not called, milter.main() will do so implicitly.
-# Calls <a href="milter_api/smfi_opensocket.html">
-# smfi_opensocket</a>.  While not documented for libmilter, my experiments
-# indicate that you must call register() before calling opensocket().
-# @param rmsock Try to remove an existing unix domain socket if true.
 def opensocket(rmsock): pass

 ## Transfer control to libmilter.
-# Calls <a href="milter_api/smfi_main.html">
+# Calls <a href="https://www.milter.org/developers/api/smfi_main">
 #   smfi_main</a>.
 def main(): pass

 ## Set the libmilter debugging level.
-# <a href="milter_api/smfi_setdbg.html">smfi_setdbg</a>
-# sets the %milter library's internal debugging level to a new level
+# <a href="https://www.milter.org/developers/api/smfi_setdbg">smfi_setdbg</a>
+# sets the milter library's internal debugging level to a new level
 # so that code details may be traced. A level of zero turns off debugging. The
 # greater (more positive) the level the more detailed the debugging. Six is the
 # current, highest, useful value.  Must be called before calling main().
 def setdbg(lev): pass

 ## Set timeout for MTA communication.
-# Calls <a href="milter_api/smfi_settimeout.html">
+# Calls <a href="https://www.milter.org/developers/api/smfi_settimeout">
 # smfi_settimeout</a>.  Must be called before calling main().
 def settimeout(secs): pass

 ## Set socket backlog.
-# Calls <a href="milter_api/smfi_setbacklog.html">
+# Calls <a href="https://www.milter.org/developers/api/smfi_setbacklog">
 # smfi_setbacklog</a>.  Must be called before calling main().
 def setbacklog(n): pass

@@ -1,8 +1,6 @@
 web:
 	doxygen
-	test -L doc/html/milter_api || ln -sf /usr/share/doc/sendmail-devel-* doc/html/milter_api
-	rsync -ravKk doc/html/ spidey2.bmsi.com:/Public/pymilter
-	cd doc/html; zip -r ../../doc .
+	rsync -ravK doc/html/ spidey2.bmsi.com:/Public/pymilter

 VERSION=0.9.6
 CVSTAG=pymilter-0_9_6
@@ -1,6 +1,6 @@
 ## To roll your own milter, create a class that extends Milter.  
 #  See the pymilter project at http://bmsi.com/python/milter.html
-#  based on Sendmail's milter API 
+#  based on Sendmail's milter API http://www.milter.org/milter_api/api.html
 #  This code is open-source on the same terms as Python.

 ## Milter calls methods of your class at milter events.
@@ -35,16 +35,6 @@ $ python setup.py help
     libraries=["milter","smutil","resolv"]

 * $Log$
- * Revision 1.31  2012/04/12 23:32:50  customdesigned
- * Replace redundant callback array with macros.  If this doesn't break anything,
- * macros can be eliminated with code changes.
- *
- * Revision 1.30  2012/04/12 23:08:06  customdesigned
- * Support RFC2553 on BSD
- *
- * Revision 1.29  2011/06/09 15:45:27  customdesigned
- * Print callback name for non-int return error.
- *
 * Revision 1.28  2011/06/08 23:13:48  customdesigned
 * Generate special exception when callback return not int.
 *
@@ -267,10 +257,10 @@ $ python setup.py help
 #define HAVE_IPV6_SUPPORT /* use this for #ifdef's later on */
 /* Now see if it supports the RFC-2553 socket's API spec.  Early
 * IPv6 "prototype" implementations existed before the RFC was
- * published.  Unfortunately I know of no good way to do this
+ * published.  Unfortunately I know of now good way to do this
 * other than with OS-specific tests.
 */
-#if defined(__FreeBSD_kernel__) || defined(__linux__)
+#ifdef linux
 #define HAVE_IPV6_RFC2553
 #include <arpa/inet.h>
 #endif
@@ -284,54 +274,46 @@ $ python setup.py help
 #endif
 #endif

-enum callbacks {
-	CONNECT,HELO,ENVFROM,ENVRCPT,HEADER,EOH,BODY,EOM,ABORT,CLOSE,
+/* Yes, these are static.  If you need multiple different callbacks, */
+/* it's cleaner to use multiple filters, or convert to OO method calls. */
+static PyObject *connect_callback = NULL;
+static PyObject *helo_callback    = NULL;
+static PyObject *envfrom_callback = NULL;
+static PyObject *envrcpt_callback = NULL;
+static PyObject *header_callback  = NULL;
+static PyObject *eoh_callback     = NULL;
+static PyObject *body_callback    = NULL;
+static PyObject *eom_callback     = NULL;
+static PyObject *abort_callback   = NULL;
+static PyObject *close_callback   = NULL;
 #ifdef SMFIS_ALL_OPTS
-	UNKNOWN,DATA,NEGOTIATE,
+static PyObject *unknown_callback = NULL;
+static PyObject *data_callback    = NULL;
+static PyObject *negotiate_callback = NULL;
 #endif
-	NUMCALLBACKS
-};
-
-#define connect_callback callback[CONNECT].cb
-#define helo_callback callback[HELO].cb
-#define envfrom_callback callback[ENVFROM].cb
-#define envrcpt_callback callback[ENVRCPT].cb
-#define header_callback callback[HEADER].cb
-#define eoh_callback callback[EOH].cb
-#define body_callback callback[BODY].cb
-#define eom_callback callback[EOM].cb
-#define abort_callback callback[ABORT].cb
-#define close_callback callback[CLOSE].cb
-#define unknown_callback callback[UNKNOWN].cb
-#define data_callback callback[DATA].cb
-#define negotiate_callback callback[NEGOTIATE].cb
-
-/* Yes, these are static.  If you need multiple different callbacks, 
-   it's cleaner to use multiple filters, or convert to OO method calls. */
-
 static struct MilterCallback {
-  PyObject *cb;
+  PyObject **cbp;
  const char *name;
-} callback[NUMCALLBACKS+1] = {
-      { NULL ,"connect" },
-      { NULL ,"helo" },
-      { NULL ,"envfrom" },
-      { NULL ,"envrcpt" },
-      { NULL ,"header" },
-      { NULL ,"eoh" },
-      { NULL ,"body" },
-      { NULL ,"eom" },
-      { NULL ,"abort" },
-      { NULL ,"close" },
+} callback_names[] = {
+      { &connect_callback,"connect" },
+      { &helo_callback,"helo" },
+      { &envfrom_callback,"envfrom" },
+      { &envrcpt_callback,"envrcpt" },
+      { &header_callback,"header" },
+      { &eoh_callback,"eoh" },
+      { &body_callback,"body" },
+      { &eom_callback,"eom" },
+      { &abort_callback,"abort" },
+      { &close_callback,"close" },
 #ifdef SMFIS_ALL_OPTS
-      { NULL ,"unknown" },
-      { NULL ,"data" },
-      { NULL ,"negotiate" },
+      { &unknown_callback,"unknown" },
+      { &data_callback,"data" },
+      { &negotiate_callback,"negotiate" },
 #endif
      { NULL, NULL }
    };

-static struct smfiDesc description; /* forward declaration */
+staticforward struct smfiDesc description; /* forward declaration */

 static PyObject *MilterError;
 /* The interpreter instance that called milter.main */
@@ -343,7 +325,7 @@ typedef struct {

 static milter_Diag diag;

-static PyTypeObject milter_ContextType;
+staticforward PyTypeObject milter_ContextType;

 typedef struct {
  PyObject_HEAD
@@ -680,13 +662,13 @@ _generic_wrapper(milter_ContextObject *self, PyObject *cb, PyObject *arglist) {
  result = PyEval_CallObject(cb, arglist);
  Py_DECREF(arglist);
  if (result == NULL) return _report_exception(self);
-  if (!PyLong_Check(result)) {
+  if (!PyInt_Check(result)) {
    const struct MilterCallback *p;
    const char *cbname = "milter";
    char buf[40];
    Py_DECREF(result);
-    for (p = callback; p->name; ++p) {
-      if (cb == p->cb) {
+    for (p = callback_names; p->cbp; ++p) {
+      if (cb == *p->cbp) {
        cbname = p->name;
 	break;
      }
@@ -695,7 +677,7 @@ _generic_wrapper(milter_ContextObject *self, PyObject *cb, PyObject *arglist) {
    PyErr_SetString(MilterError,buf);
    return _report_exception(self);
  }
-  retval = PyLong_AS_LONG(result);
+  retval = PyInt_AS_LONG(result);
  Py_DECREF(result);
  _release_thread(self->t);
  return retval;
@@ -712,7 +694,7 @@ makeipaddr(struct sockaddr_in *addr) {
 	sprintf(buf, "%d.%d.%d.%d",
 		(int) (x>>24) & 0xff, (int) (x>>16) & 0xff,
 		(int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff);
-	return PyUnicode_FromString(buf);
+	return PyString_FromString(buf);
 }

 #ifdef HAVE_IPV6_SUPPORT
@@ -720,8 +702,8 @@ static PyObject *
 makeip6addr(struct sockaddr_in6 *addr) {
 	char buf[100]; /* must be at least INET6_ADDRSTRLEN + 1 */
 	const char *s = inet_ntop(AF_INET6, &addr->sin6_addr, buf, sizeof buf);
-	if (s) return PyUnicode_FromString(s);
-	return PyUnicode_FromString("inet6:unknown");
+	if (s) return PyString_FromString(s);
+	return PyString_FromString("inet6:unknown");
 }
 #endif

@@ -812,7 +794,7 @@ generic_env_wrapper(SMFICTX *ctx, PyObject*cb, char **argv) {
   for (i=0;i<count;i++) {
     /* There's some error checking performed in do_mkvalue() for a string */
     /* that's not currently done here - it probably should be */
-     PyObject *o = PyUnicode_FromStringAndSize(argv[i], strlen(argv[i]));
+     PyObject *o = PyString_FromStringAndSize(argv[i], strlen(argv[i]));
     if (o == NULL) {	/* out of memory */
       Py_DECREF(arglist);
       return _report_exception(self);
@@ -943,7 +925,7 @@ milter_wrap_negotiate(SMFICTX *ctx,
    int i;
    for (i = 0; i < 4; ++i) {
      *pa[i] = (i <= len)
-      	? PyLong_AsUnsignedLongMask(PyList_GET_ITEM(optlist,i))
+      	? PyInt_AsUnsignedLongMask(PyList_GET_ITEM(optlist,i))
 	: fa[i];
    }
    if (PyErr_Occurred()) {
@@ -1531,6 +1513,11 @@ static PyMethodDef context_methods[] = {
  { NULL, NULL }
 };

+static PyObject *
+milter_Context_getattr(PyObject *self, char *name) {
+  return Py_FindMethod(context_methods, self, name);
+}
+
 static struct smfiDesc description = {  /* Set some reasonable defaults */
  "pythonfilter",
  SMFI_VERSION,
@@ -1579,13 +1566,14 @@ static PyMethodDef milter_methods[] = {
 };

 static PyTypeObject milter_ContextType = {
-  PyVarObject_HEAD_INIT(&PyType_Type,0)
+  PyObject_HEAD_INIT(&PyType_Type)
+  0,
  "milterContext",
  sizeof(milter_ContextObject),
  0,
        milter_Context_dealloc,            /* tp_dealloc */
        0,               /* tp_print */
-        0,           /* tp_getattr */
+        milter_Context_getattr,           /* tp_getattr */
        0,			/* tp_setattr */
        0,                                      /* tp_compare */
        0,                 /* tp_repr */
@@ -1599,13 +1587,6 @@ static PyTypeObject milter_ContextType = {
        0,                                      /* tp_setattro */
        0,                                      /* tp_as_buffer */
        Py_TPFLAGS_DEFAULT,                     /* tp_flags */
-	NULL,	/* Documentation string */
-	0, 	/* call function for all accessible objects */
-    	0,	/* delete references to contained objects */
-    	0,	/* rich comparisons */
-    	0,	/* weak reference enabler */
-    	0, 0,	/* Iterators */
-    	context_methods, /* Attribute descriptor and subclassing stuff */
 };

 static char milter_documentation[] =
@@ -1615,27 +1596,17 @@ Libmilter is currently marked FFR, and needs to be explicitly installed.\n\
 See <sendmailsource>/libmilter/README for details on setting it up.\n";

 static void setitem(PyObject *d,const char *name,long val) {
-  PyObject *v = PyLong_FromLong(val);
+  PyObject *v = PyInt_FromLong(val);
  PyDict_SetItemString(d,name,v);
  Py_DECREF(v);
 }

-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "milter",     	 /* m_name */
-    milter_documentation,/* m_doc */
-    -1,                  /* m_size */
-    milter_methods,      /* m_methods */
-    NULL,                /* m_reload */
-    NULL,                /* m_traverse */
-    NULL,                /* m_clear */
-    NULL,                /* m_free */
-};
-
-PyMODINIT_FUNC PyInit_milter(void) {
+void
+initmilter(void) {
   PyObject *m, *d;

-   m = PyModule_Create(&moduledef);
+   m = Py_InitModule4("milter", milter_methods, milter_documentation,
+		      (PyObject*)NULL, PYTHON_API_VERSION);
   d = PyModule_GetDict(m);
   MilterError = PyErr_NewException("milter.error", NULL, NULL);
   PyDict_SetItemString(d,"error", MilterError);
@@ -1662,13 +1633,6 @@ PyMODINIT_FUNC PyInit_milter(void) {
 #endif
 #ifdef SMFIF_SETSMLIST
   setitem(d,"SETSMLIST",SMFIF_SETSMLIST);
-   setitem(d,"M_CONNECT",SMFIM_CONNECT);/* connect */
-   setitem(d,"M_HELO",SMFIM_HELO);      /* HELO/EHLO */
-   setitem(d,"M_ENVFROM",SMFIM_ENVFROM);/* MAIL From */
-   setitem(d,"M_ENVRCPT",SMFIM_ENVRCPT);/* RCPT To */
-   setitem(d,"M_DATA",SMFIM_DATA);      /* DATA */
-   setitem(d,"M_EOM",SMFIM_EOM);        /* end of message (final dot) */
-   setitem(d,"M_EOH",SMFIM_EOH);        /* end of header */
 #endif
 #ifdef SMFIS_ALL_OPTS
   setitem(d,"P_RCPT_REJ",SMFIP_RCPT_REJ);
@@ -1701,5 +1665,4 @@ PyMODINIT_FUNC PyInit_milter(void) {
   setitem(d,"DISCARD",  SMFIS_DISCARD);
   setitem(d,"ACCEPT",  SMFIS_ACCEPT);
   setitem(d,"TEMPFAIL",  SMFIS_TEMPFAIL);
-   return m;
 }
@@ -75,10 +75,6 @@ chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh
 rm -rf $RPM_BUILD_ROOT

 %changelog
-* Sat Feb 25 2012 Stuart Gathman <stuart@bmsi.com> 0.9.7-1
- Raise RuntimeError when result != CONTINUE for @noreply and @nocallback
- Remove redundant table in miltermodule
-
 * Sat Feb 25 2012 Stuart Gathman <stuart@bmsi.com> 0.9.6-1
 - Raise ValueError on unescaped '%' passed to setreply
 - Grace time at end of Greylist window
@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 # A simple milter.

 # Author: Stuart D. Gathman <stuart@bmsi.com>
@@ -21,9 +21,9 @@ class sampleMilter(Milter.Milter):
  "Milter to replace attachments poisonous to Windows with a WARNING message."

  def log(self,*msg):
-    print("%s [%d]" % (strftime('%Y%b%d %H:%M:%S'),self.id), end=' ')
-    for i in msg: print(i, end=' ')
-    print()
+    print "%s [%d]" % (strftime('%Y%b%d %H:%M:%S'),self.id),
+    for i in msg: print i,
+    print

  def __init__(self):
    self.tempname = None
@@ -35,9 +35,7 @@ class sampleMilter(Milter.Milter):
  # multiple messages can be received on a single connection
  # envfrom (MAIL FROM in the SMTP protocol) seems to mark the start
  # of each message.
-  @Milter.noreply
  def envfrom(self,f,*str):
-    "start of MAIL transaction"
    self.log("mail from",f,str)
    self.fp = StringIO.StringIO()
    self.tempname = None
@@ -171,13 +169,13 @@ if __name__ == "__main__":
  socketname = os.getenv("HOME") + "/pythonsock"
  Milter.factory = sampleMilter
  Milter.set_flags(Milter.CHGBODY + Milter.CHGHDRS + Milter.ADDHDRS)
-  print("""To use this with sendmail, add the following to sendmail.cf:
+  print """To use this with sendmail, add the following to sendmail.cf:

 O InputMailFilters=pythonfilter
 Xpythonfilter,        S=local:%s

 See the sendmail README for libmilter.
-sample  milter startup""" % socketname)
+sample  milter startup""" % socketname
  sys.stdout.flush()
  Milter.runmilter("pythonfilter",socketname,240)
-  print("sample milter shutdown")
+  print "sample milter shutdown"
@@ -1,5 +1,5 @@
 [bdist_rpm]
-python=python3
-doc_files=README NEWS TODO COPYING CREDITS
-packager=Stuart D. Gathman <stuart@gathman.org>
+python=python2.6
+doc_files=README NEWS TODO
+packager=Stuart D. Gathman <stuart@bmsi.com>
 release=1
@@ -13,7 +13,7 @@ libs = ["milter"]
 libdirs = ["/usr/lib/libmilter"]    # needed for Debian

 # NOTE: importing Milter to obtain version fails when milter.so not built
-setup(name = "pymilter", version = '0.9.7',
+setup(name = "pymilter", version = '0.9.6',
 	description="Python interface to sendmail milter API",
 	long_description="""\
 This is a python extension module to enable python scripts to
@@ -1,7 +1,4 @@
 # $Log$
-# Revision 1.5  2011/06/09 17:27:42  customdesigned
-# Documentation updates.
-#
 # Revision 1.4  2005/07/20 14:49:44  customdesigned
 # Handle corrupt and empty ZIP files.
 #
@@ -173,7 +170,7 @@ class MimeTestCase(unittest.TestCase):
    msg = mime.message_from_file(open('test/'+fname,'r'))
    mime.defang(msg,scan_zip=True)
    self.failIf(msg.ismodified())
-    msg = mime.message_from_file(open('test/test2','r'))
+    msg = mime.message_from_file(open('test/tmpytgcE5.fail','r'))
    rc = mime.check_attachments(msg,self._chk_attach)
    self.assertEquals(self.filename,"7501'S FOR TWO GOLDEN SOURCES SHIPMENTS FOR TAX & DUTY PURPOSES ONLY.PDF")
    self.assertEquals(rc,Milter.CONTINUE)
@@ -201,4 +198,4 @@ if __name__ == '__main__':
      fp = open(fname,'r')
      msg = mime.message_from_file(fp)
      mime.defang(msg,scan_zip=True)
-      print(msg.as_string())
+      print msg.as_string()
@@ -11,7 +11,6 @@ class AddrCacheTestCase(unittest.TestCase):
    self.fname = 'test.dat'

  def tearDown(self):
-    if os.path.exists(self.fname):
    os.remove(self.fname)

  def testAdd(self):
@@ -39,11 +38,6 @@ class AddrCacheTestCase(unittest.TestCase):
    cache.load(self.fname,30)
    self.failUnless('spammer.com' in cache)

-  def testParseHeader(self):
-    s='=?UTF-8?B?TGFzdCBGZXcgQ29sZHBsYXkgQWxidW0gQXJ0d29ya3MgQXZhaWxhYmxlAA?='
-    h = Milter.utils.parse_header(s)
-    self.assertEqual(h,'Last Few Coldplay Album Artworks Available\x00')
-
 def suite(): 
  s = unittest.makeSuite(AddrCacheTestCase,'test')
  s.addTest(doctest.DocTestSuite(Milter.utils))