Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 cvs2svn
|
84eb9e5020 |
@@ -7,13 +7,6 @@ real, usable Python extension.
|
||||
|
||||
Other contributors (in random order):
|
||||
|
||||
|
||||
Daniel Troeder
|
||||
for pointing out a typo in @noreply
|
||||
arkanes@irc.freenode.net
|
||||
for suggesting a class method to compute and cache protocol masks
|
||||
habnabit@habnabit.org
|
||||
for suggesting function attributes and decorators for protocol negotiation
|
||||
Dwayne Litzenberger, B.A.Sc.
|
||||
for library_dirs patch to compile on Debian
|
||||
Dave MacQuigg
|
||||
|
||||
@@ -0,0 +1,154 @@
|
||||
On Sun, 11 Feb 2007, Rick Saul wrote:
|
||||
|
||||
> Stuart I was planning to move to centos4.4 in a couple of weeks anyway...
|
||||
> Your advice of where to go from here.
|
||||
|
||||
Oh - you are asking for a howto.
|
||||
|
||||
Step one. Which DSPAM is right for you?
|
||||
|
||||
The DSPAM project makes dspam part of the LDA (Local Delivery Agent).
|
||||
Pydspam puts dspam into the MTA (Mail Transfer Agent - sendmail with pymilter).
|
||||
|
||||
The advantage of doing dspam in the LDA is that any aliasing has already been
|
||||
resolved. You need only configure mailboxes.
|
||||
|
||||
The advantage of doing dspam in the MTA is it can screen an entire
|
||||
company as a gateway with multiple domains. Unfortunately, this
|
||||
means you have to tell it about all the aliases that comprise each
|
||||
account. (Also, pydspam is still uses dspam-2.6.5.2 - the Dspam API
|
||||
has changed for newer versions.)
|
||||
|
||||
If the LDA is right for you, you'll want to use the official Dspam
|
||||
package. http://www.nuclearelephant.com/projects/dspam/
|
||||
|
||||
If the MTA approach is what you want, then pydspam is what you want.
|
||||
|
||||
In either case, you will still want pymilter to block forgeries, Windows
|
||||
executables, etc.
|
||||
|
||||
So, lets assume you want to install pymilter, and may or may not
|
||||
wish to install pydspam.
|
||||
|
||||
Step two. Obtaining RPMS.
|
||||
|
||||
For basic pymilter you'll need:
|
||||
|
||||
python-2.4
|
||||
milter-0.8.10
|
||||
sendmail-8.13.x (with milter support enabled)
|
||||
|
||||
and for SPF you'll need:
|
||||
|
||||
pydns-2.3.3-2.4
|
||||
pyspf-2.0.5-1.py24
|
||||
|
||||
and for SRS you'll need:
|
||||
|
||||
pysrs-0.30.11-1.py24
|
||||
|
||||
I'm pretty sure you will want to have SPF and SRS available.
|
||||
|
||||
Step three. Activate basic milter.
|
||||
|
||||
Activate the basic milter and pysrs by editing /etc/mail/sendmail.mc and adding:
|
||||
|
||||
define(`NO_SRS_FILE',`/etc/mail/no-srs-mailers')dnl
|
||||
dnl define(`NO_SRS_FROM_LOCAL')dnl
|
||||
HACK(`pysrs',`/var/run/milter/pysrs')dnl
|
||||
INPUT_MAIL_FILTER(`pythonfilter', `S=local:/var/run/milter/pythonsock, F=T, T=C:5m;S:20s;R:5m;E:5m')
|
||||
|
||||
You can then "make sendmail.cf" and restart sendmail.
|
||||
|
||||
Start milter and pysrs with "service milter start", "service pysrs start".
|
||||
|
||||
Tail /var/log/milter/milter.log while SMTP clients connect to your
|
||||
sendmail instance. This should show you what the milter is doing.
|
||||
|
||||
By default, milter-0.8.10 rejects on SPF fail.
|
||||
|
||||
Step four. Tweaking the basic config.
|
||||
|
||||
Most pymilter configuration is in /etc/mail/pymilter.cfg. To activate
|
||||
changes, "service milter restart".
|
||||
|
||||
By default, milter scans attachments for executable extensions. You can
|
||||
turn this off by setting banned_exts to the empty list. There are options
|
||||
to scan ZIP attachments and rfc822 attachments. When it finds a banned
|
||||
file type, milter saves the original message in /var/log/milter/save,
|
||||
and replaces the attachment with a plain text warning message.
|
||||
|
||||
Configure hello_blacklist with your own helo name and domains - which
|
||||
you know cannot legitimately be used by external MTAs.
|
||||
|
||||
Configure trusted_relay with your secondary MX servers, if any. These
|
||||
should also run pymilter with similar policies. (But this isn't
|
||||
needed for initial testing.)
|
||||
|
||||
Configure internal_connect with subnets of your internal SMTP clients.
|
||||
Internal connections skip SPF testing and other policies. You will
|
||||
likely need to set this to allow outgoing mail if you have
|
||||
an SPF policy already.
|
||||
|
||||
Configure internal_domains with domains used by your internal SMTP clients.
|
||||
If they attempt to use any other domain, the attempt is blocked and the
|
||||
client is logged as a "zombie". Conversely, any attempt by an external
|
||||
MTA to use one of your internal domains is treated as a forgery and
|
||||
blocked (a simplified form of local SPF).
|
||||
|
||||
Adjust porn_words and spam_words - these block emails with a Subject
|
||||
containing the listed strings. They can be empty to disable Subject
|
||||
string blocking.
|
||||
|
||||
Advanced SPF configuration.
|
||||
|
||||
The sendmail access file, or another readonly database with that
|
||||
format, can be used for detail spf policy. SPF access policy
|
||||
record are tagged with "SPF-{Result}:". Results are
|
||||
Pass, Neutral, Softfail, Fail, PermError. Currently supported
|
||||
policy keywords are OK, CBV, REJECT. Currently, TempError always
|
||||
results in TEMPFAIL.
|
||||
|
||||
The default policies are set in pymilter.cfg. The defaults
|
||||
if none of the config options are set are as follows:
|
||||
|
||||
SPF-Fail: REJECT
|
||||
SPF-Softfail: CBV
|
||||
SPF-Neutral: OK
|
||||
SPF-PermError: REJECT
|
||||
SPF-Pass: OK
|
||||
|
||||
The tag may be followed by a specific domain. For instance, to
|
||||
require a Pass from aol.com:
|
||||
|
||||
SPF-Neutral:aol.com REJECT
|
||||
SPF-Softfail:aol.com REJECT
|
||||
|
||||
The CBV policy requires a valid HELO name. If the EHLO name is
|
||||
RFC2822 compliant, then a DSN is sent to the alleged sender. The
|
||||
template for the DSN is selected according to the SPF result:
|
||||
|
||||
Fail: fail.txt
|
||||
SoftFail: softfail.txt
|
||||
Neutral: neutral.txt
|
||||
PermError: permerror.txt
|
||||
None: strike3.txt
|
||||
|
||||
An SPF-Pass is always accepted by the milter. Domains can be blacklisted
|
||||
via sendmail in the access file or via a RHS DNS blacklist.
|
||||
|
||||
To be continued.
|
||||
|
||||
Forthcoming topics:
|
||||
|
||||
SRS config
|
||||
|
||||
|
||||
pydspam config
|
||||
wiretap config
|
||||
|
||||
--
|
||||
Stuart D. Gathman <stuart@bmsi.com>
|
||||
Business Management Systems Inc. Phone: 703 591-0911 Fax: 703 591-6154
|
||||
"Confutatis maledictis, flammis acribus addictis" - background song for
|
||||
a Microsoft sponsored "Where do you want to go from here?" commercial.
|
||||
+67
-557
@@ -1,531 +1,59 @@
|
||||
## @package Milter
|
||||
# A thin OO wrapper for the milter module.
|
||||
#
|
||||
# Clients generally subclass Milter.Base and define callback
|
||||
# methods.
|
||||
#
|
||||
# @author Stuart D. Gathman <stuart@bmsi.com>
|
||||
# Copyright 2001,2009 Business Management Systems, Inc.
|
||||
# Author: Stuart D. Gathman <stuart@bmsi.com>
|
||||
# Copyright 2001 Business Management Systems, Inc.
|
||||
# This code is under the GNU General Public License. See COPYING for details.
|
||||
|
||||
__version__ = '0.9.5'
|
||||
# A thin OO wrapper for the milter module
|
||||
|
||||
import os
|
||||
import milter
|
||||
import thread
|
||||
|
||||
from milter import *
|
||||
from milter import ACCEPT,CONTINUE,REJECT,DISCARD,TEMPFAIL, \
|
||||
set_flags, setdbg, setbacklog, settimeout, error, \
|
||||
ADDHDRS, CHGBODY, ADDRCPT, DELRCPT, CHGHDRS, \
|
||||
V1_ACTS, V2_ACTS, CURR_ACTS
|
||||
|
||||
try: from milter import QUARANTINE
|
||||
except: pass
|
||||
|
||||
__version__ = '0.8.5'
|
||||
|
||||
_seq_lock = thread.allocate_lock()
|
||||
_seq = 0
|
||||
|
||||
## @fn set_flags(flags)
|
||||
# @brief Enable optional %milter actions.
|
||||
# Certain %milter actions need to be enabled before calling milter.runmilter()
|
||||
# or they throw an exception.
|
||||
# @param flags Bit ored mask of optional actions to enable
|
||||
|
||||
def uniqueID():
|
||||
"""Return a unique sequence number (incremented on each call).
|
||||
"""Return a sequence number unique to this process.
|
||||
"""
|
||||
global _seq
|
||||
_seq_lock.acquire()
|
||||
seqno = _seq = _seq + 1
|
||||
_seq_lock.release()
|
||||
return seqno
|
||||
|
||||
## @private
|
||||
OPTIONAL_CALLBACKS = {
|
||||
'connect':(P_NR_CONN,P_NOCONNECT),
|
||||
'hello':(P_NR_HELO,P_NOHELO),
|
||||
'envfrom':(P_NR_MAIL,P_NOMAIL),
|
||||
'envrcpt':(P_NR_RCPT,P_NORCPT),
|
||||
'data':(P_NR_DATA,P_NODATA),
|
||||
'unknown':(P_NR_UNKN,P_NOUNKNOWN),
|
||||
'eoh':(P_NR_EOH,P_NOEOH),
|
||||
'body':(P_NR_BODY,P_NOBODY),
|
||||
'header':(P_NR_HDR,P_NOHDRS)
|
||||
}
|
||||
|
||||
## @private
|
||||
def decode_mask(bits,names):
|
||||
t = [ (s,getattr(milter,s)) for s in names]
|
||||
nms = [s for s,m in t if bits & m]
|
||||
for s,m in t: bits &= ~m
|
||||
if bits: nms += hex(bits)
|
||||
return nms
|
||||
|
||||
## Class decorator to enable optional protocol steps.
|
||||
# P_SKIP is enabled by default when supported, but
|
||||
# applications may wish to enable P_HDR_LEADSPC
|
||||
# to send and receive the leading space of header continuation
|
||||
# lines unchanged, and/or P_RCPT_REJ to have recipients
|
||||
# detected as invalid by the MTA passed to the envcrpt callback.
|
||||
#
|
||||
# Applications may want to check whether the protocol is actually
|
||||
# supported by the MTA in use. Base._protocol
|
||||
# is a bitmask of protocol options negotiated. So,
|
||||
# for instance, if <code>self._protocol & Milter.P_RCPT_REJ</code>
|
||||
# is true, then that feature was successfully negotiated with the MTA
|
||||
# and the application will see recipients the MTA has flagged as invalid.
|
||||
#
|
||||
# Sample use:
|
||||
# <pre>
|
||||
# class myMilter(Milter.Base):
|
||||
# def envrcpt(self,to,*params):
|
||||
# return Milter.CONTINUE
|
||||
# myMilter = Milter.enable_protocols(myMilter,Milter.P_RCPT_REJ)
|
||||
# </pre>
|
||||
# @since 0.9.3
|
||||
# @param klass the %milter application class to modify
|
||||
# @param mask a bitmask of protocol steps to enable
|
||||
# @return the modified %milter class
|
||||
def enable_protocols(klass,mask):
|
||||
klass._protocol_mask = klass.protocol_mask() & ~mask
|
||||
return klass
|
||||
|
||||
## Milter rejected recipients. A class decorator that calls
|
||||
# enable_protocols() with the P_RCPT_REJ flag. By default, the MTA
|
||||
# does not pass recipients that it knows are invalid on to the milter.
|
||||
# This decorator enables a %milter app to see all recipients if supported
|
||||
# by the MTA. Use like this with python-2.6 and later:
|
||||
# <pre>
|
||||
# @@Milter.rejected_recipients
|
||||
# class myMilter(Milter.Base):
|
||||
# def envrcpt(self,to,*params):
|
||||
# return Milter.CONTINUE
|
||||
# </pre>
|
||||
# @since 0.9.5
|
||||
# @param klass the %milter application class to modify
|
||||
# @return the modified %milter class
|
||||
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_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.
|
||||
# With this flag, header continuation lines are preserved
|
||||
# with their newlines and leading space. In addition, header folding
|
||||
# done by the milter is preserved as well.
|
||||
# Use like this with python-2.6 and later:
|
||||
# <pre>
|
||||
# @@Milter.header_leading_space
|
||||
# class myMilter(Milter.Base):
|
||||
# def header(self,hname,value):
|
||||
# return Milter.CONTINUE
|
||||
# </pre>
|
||||
# @since 0.9.5
|
||||
# @param klass the %milter application class to modify
|
||||
# @return the modified %milter class
|
||||
def header_leading_space(klass):
|
||||
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,
|
||||
# increasing efficiency. All the callbacks (except negotiate)
|
||||
# are disabled in Milter.Base, and overriding them reenables the
|
||||
# callback. An application may need to use @@nocallback when it extends
|
||||
# another %milter and wants to disable a callback again.
|
||||
# The disabled method should still return Milter.CONTINUE, in case the MTA does
|
||||
# not support protocol negotiation, and for when called from a test harness.
|
||||
# @since 0.9.2
|
||||
def nocallback(func):
|
||||
try:
|
||||
func.milter_protocol = OPTIONAL_CALLBACKS[func.__name__][1]
|
||||
except KeyError:
|
||||
raise ValueError(
|
||||
'@nocallback applied to non-optional method: '+func.__name__)
|
||||
return func
|
||||
|
||||
## Function decorator to disable callback reply.
|
||||
# If the MTA supports it, tells the MTA not to wait for a reply from
|
||||
# this callback, and assume CONTINUE. The method should still return
|
||||
# CONTINUE in case the MTA does not support protocol negotiation.
|
||||
# The decorator arranges to change the return code to NOREPLY
|
||||
# when supported by the MTA.
|
||||
# @since 0.9.2
|
||||
def noreply(func):
|
||||
try:
|
||||
nr_mask = OPTIONAL_CALLBACKS[func.__name__][0]
|
||||
except KeyError:
|
||||
raise ValueError(
|
||||
'@noreply applied to non-optional method: '+func.__name__)
|
||||
def wrapper(self,*args):
|
||||
rc = func(self,*args)
|
||||
if self._protocol & nr_mask: return NOREPLY
|
||||
return rc
|
||||
wrapper.milter_protocol = nr_mask
|
||||
return wrapper
|
||||
|
||||
## Disabled action exception.
|
||||
# set_flags() can tell the MTA that this application will not use certain
|
||||
# features (such as CHGFROM). This can also be negotiated for each
|
||||
# connection in the negotiate callback. If the application then calls
|
||||
# the feature anyway via an instance method, this exception is
|
||||
# thrown.
|
||||
# @since 0.9.2
|
||||
class DisabledAction(RuntimeError):
|
||||
pass
|
||||
|
||||
## A do "nothing" Milter base class representing an SMTP connection.
|
||||
#
|
||||
# Python milters should derive from this class
|
||||
# unless they are using the low level milter module directly.
|
||||
#
|
||||
# Most of the methods are either "actions" or "callbacks". Callbacks
|
||||
# are invoked by the MTA at certain points in the SMTP protocol. For
|
||||
# instance when the HELO command is seen, the MTA calls the helo
|
||||
# callback before returning a response code. All callbacks must
|
||||
# return one of these constants: CONTINUE, TEMPFAIL, REJECT, ACCEPT,
|
||||
# DISCARD, SKIP. The NOREPLY response is supplied automatically by
|
||||
# the @@noreply decorator if negotiation with the MTA is successful.
|
||||
# @@noreply and @@nocallback methods should return CONTINUE for two reasons:
|
||||
# the MTA may not support negotiation, and the class may be running in a test
|
||||
# harness.
|
||||
#
|
||||
# Optional callbacks are disabled with the @@nocallback decorator, and
|
||||
# automatically reenabled when overridden. Disabled callbacks should
|
||||
# still return CONTINUE for testing and MTAs that do not support
|
||||
# negotiation.
|
||||
|
||||
# Each SMTP connection to the MTA calls the factory method you provide to
|
||||
# create an instance derived from this class. This is typically the
|
||||
# constructor for a class derived from Base. The _setctx() method attaches
|
||||
# the instance to the low level milter.milterContext object. When the SMTP
|
||||
# connection terminates, the close callback is called, the low level connection
|
||||
# object is destroyed, and this normally causes instances of this class to be
|
||||
# garbage collected as well. The close() method should release any global
|
||||
# resources held by instances.
|
||||
# @since 0.9.2
|
||||
class Base(object):
|
||||
"The core class interface to the %milter module."
|
||||
|
||||
## Attach this Milter to the low level milter.milterContext object.
|
||||
|
||||
class Milter:
|
||||
"""A simple class interface to the milter module.
|
||||
"""
|
||||
def _setctx(self,ctx):
|
||||
## The low level @ref milter.milterContext object.
|
||||
self._ctx = ctx
|
||||
## A bitmask of actions this connection has negotiated to use.
|
||||
# By default, all actions are enabled. High throughput milters
|
||||
# may want to disable unused actions to increase efficiency.
|
||||
# Some optional actions may be disabled by calling milter.set_flags(), or
|
||||
# by overriding the negotiate callback. The bits include:
|
||||
# <code>ADDHDRS,CHGBODY,MODBODY,ADDRCPT,ADDRCPT_PAR,DELRCPT
|
||||
# CHGHDRS,QUARANTINE,CHGFROM,SETSMLIST</code>.
|
||||
# The <code>Milter.CURR_ACTS</code> bitmask is all actions
|
||||
# known when the milter module was compiled.
|
||||
# Application code can also inspect this field to determine
|
||||
# which actions are available. This is especially useful in
|
||||
# generic library code designed to work in multiple milters.
|
||||
# @since 0.9.2
|
||||
#
|
||||
self._actions = CURR_ACTS # all actions enabled by default
|
||||
## A bitmask of protocol options this connection has negotiated.
|
||||
# An application may inspect this
|
||||
# variable to determine which protocol steps are supported. Options
|
||||
# of interest to applications: the SKIP result code is allowed
|
||||
# only if the P_SKIP bit is set, rejected recipients are passed to the
|
||||
# %milter application only if the P_RCPT_REJ bit is set, and
|
||||
# header values are sent and received with leading spaces (in the
|
||||
# continuation lines) intact if the P_HDR_LEADSPC bit is set (so
|
||||
# that the application can customize indenting).
|
||||
#
|
||||
# The P_N* bits should be negotiated via the @@noreply and @@nocallback
|
||||
# method decorators, and P_RCPT_REJ, P_HDR_LEADSPC should
|
||||
# be enabled using the enable_protocols class decorator.
|
||||
#
|
||||
# The bits include: <code>
|
||||
# P_RCPT_REJ P_NR_CONN P_NR_HELO P_NR_MAIL P_NR_RCPT P_NR_DATA P_NR_UNKN
|
||||
# P_NR_EOH P_NR_BODY P_NR_HDR P_NOCONNECT P_NOHELO P_NOMAIL P_NORCPT
|
||||
# P_NODATA P_NOUNKNOWN P_NOEOH P_NOBODY P_NOHDRS P_HDR_LEADSPC P_SKIP
|
||||
# </code> (all under the Milter namespace).
|
||||
# @since 0.9.2
|
||||
self._protocol = 0 # no protocol options by default
|
||||
self.__ctx = ctx
|
||||
if ctx:
|
||||
ctx.setpriv(self)
|
||||
|
||||
## Defined by subclasses to write log messages.
|
||||
def log(self,*msg): pass
|
||||
## 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:
|
||||
# <dl>
|
||||
# <dt><code>socket.AF_INET</code>
|
||||
# <dd>A tuple of (IP as string in dotted quad form, integer port)
|
||||
# <dt><code>socket.AF_INET6</code>
|
||||
# <dd>A tuple of (IP as a string in standard representation,
|
||||
# integer port, integer flow info, integer scope id)
|
||||
# <dt><code>socket.AF_UNIX</code>
|
||||
# <dd>A string with the socketname
|
||||
# </dl>
|
||||
# @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>
|
||||
# @param hostaddr a tuple or string with peer IP or socketname
|
||||
@nocallback
|
||||
def connect(self,hostname,family,hostaddr): return CONTINUE
|
||||
## Called when the SMTP client says HELO.
|
||||
# Returning REJECT prevents progress until a valid HELO is provided;
|
||||
# this almost always results in terminating the connection.
|
||||
@nocallback
|
||||
def hello(self,hostname): return CONTINUE
|
||||
## Called when the SMTP client says MAIL FROM.
|
||||
# Returning REJECT rejects the message, but not the connection.
|
||||
@nocallback
|
||||
def envfrom(self,f,*str): return CONTINUE
|
||||
## Called when the SMTP client says RCPT TO.
|
||||
# Returning REJECT rejects the current recipient, not the entire message.
|
||||
@nocallback
|
||||
def envrcpt(self,to,*str): return CONTINUE
|
||||
## Called when the SMTP client says DATA.
|
||||
# Returning REJECT rejects the message without wasting bandwidth
|
||||
# on the unwanted message.
|
||||
# @since 0.9.2
|
||||
@nocallback
|
||||
def data(self): return CONTINUE
|
||||
## Called for each header field in the message body.
|
||||
@nocallback
|
||||
def header(self,field,value): return CONTINUE
|
||||
## Called at the blank line that terminates the header fields.
|
||||
@nocallback
|
||||
def eoh(self): return CONTINUE
|
||||
## Called to supply the body of the message to the Milter by chunks.
|
||||
# @param blk a block of message bytes
|
||||
@nocallback
|
||||
def body(self,blk): return CONTINUE
|
||||
## Called when the SMTP client issues an unknown command.
|
||||
# @param cmd the unknown command
|
||||
# @since 0.9.2
|
||||
@nocallback
|
||||
def unknown(self,cmd): return CONTINUE
|
||||
## Called at the end of the message body.
|
||||
# Most of the message manipulation actions can only take place from
|
||||
# the eom callback.
|
||||
def eom(self): return CONTINUE
|
||||
## Called when the connection is abnormally terminated.
|
||||
# The close callback is still called also.
|
||||
def abort(self): return CONTINUE
|
||||
## Called when the connection is closed.
|
||||
def close(self): return CONTINUE
|
||||
|
||||
## Return mask of SMFIP_N.. protocol option bits to clear for this class
|
||||
# The @@nocallback and @@noreply decorators set the
|
||||
# <code>milter_protocol</code> function attribute to the protocol mask bit to
|
||||
# pass to libmilter, causing that callback or its reply to be skipped.
|
||||
# Overriding a method creates a new function object, so that
|
||||
# <code>milter_protocol</code> defaults to 0.
|
||||
# Libmilter passes the protocol bits that the current MTA knows
|
||||
# how to skip. We clear the ones we don't want to skip.
|
||||
# The negation is somewhat mind bending, but it is simple.
|
||||
# @since 0.9.2
|
||||
@classmethod
|
||||
def protocol_mask(klass):
|
||||
try:
|
||||
return klass._protocol_mask
|
||||
except AttributeError:
|
||||
p = P_RCPT_REJ | P_HDR_LEADSPC # turn these new features off by default
|
||||
for func,(nr,nc) in OPTIONAL_CALLBACKS.items():
|
||||
func = getattr(klass,func)
|
||||
ca = getattr(func,'milter_protocol',0)
|
||||
#print func,hex(nr),hex(nc),hex(ca)
|
||||
p |= (nr|nc) & ~ca
|
||||
klass._protocol_mask = p
|
||||
return p
|
||||
|
||||
## Negotiate milter protocol options. Called by the
|
||||
# <a href="https://www.milter.org/developers/api/xxfi_negotiate">
|
||||
# xffi_negotiate</a> callback.
|
||||
# Options are passed as
|
||||
# a list of 4 32-bit ints which can be modified and are passed
|
||||
# back to libmilter on return.
|
||||
# Default negotiation sets P_NO* and P_NR* for callbacks
|
||||
# marked @@nocallback and @@noreply respectively, leaves all
|
||||
# actions enabled, and enables Milter.SKIP. The @@enable_protocols
|
||||
# class decorator can customize which protocol steps are implemented.
|
||||
# @param opts a modifiable list of 4 ints with negotiated options
|
||||
# @since 0.9.2
|
||||
def negotiate(self,opts):
|
||||
try:
|
||||
self._actions,p,f1,f2 = opts
|
||||
opts[1] = self._protocol = p & ~self.protocol_mask()
|
||||
opts[2] = 0
|
||||
opts[3] = 0
|
||||
#self.log("Negotiated:",opts)
|
||||
except:
|
||||
# don't change anything if something went wrong
|
||||
return ALL_OPTS
|
||||
return CONTINUE
|
||||
|
||||
# Milter methods which can be invoked from most callbacks
|
||||
|
||||
## 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.
|
||||
# @param sym the macro name
|
||||
def getsymval(self,sym):
|
||||
return self._ctx.getsymval(sym)
|
||||
|
||||
## Set the SMTP reply code and message.
|
||||
# If the MTA does not support setmlreply, then only the
|
||||
# first msg line is used.
|
||||
def setreply(self,rcode,xcode=None,msg=None,*ml):
|
||||
return self._ctx.setreply(rcode,xcode,msg,*ml)
|
||||
|
||||
## Tell the MTA which macro names will be used.
|
||||
# The <code>Milter.SETSMLIST</code> action flag must be set.
|
||||
#
|
||||
# May only be called from negotiate callback.
|
||||
# @since 0.9.2
|
||||
# @param stage the protocol stage to set to macro list for
|
||||
# @param macros a string with a space delimited list of macros
|
||||
def setsmlist(self,stage,macros):
|
||||
if not self._actions & SETSMLIST: raise DisabledAction("SETSMLIST")
|
||||
if type(macros) in (list,tuple):
|
||||
macros = ' '.join(macros)
|
||||
return self._ctx.setsmlist(stage,macros)
|
||||
|
||||
# Milter methods which can only be called from eom callback.
|
||||
|
||||
## Add a mail header field.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_addheader">
|
||||
# smfi_addheader</a>.
|
||||
# The <code>Milter.ADDHDRS</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param field the header field name
|
||||
# @param value the header field value
|
||||
# @param idx header field index from the top of the message to insert at
|
||||
# @throws DisabledAction if ADDHDRS is not enabled
|
||||
def addheader(self,field,value,idx=-1):
|
||||
if not self._actions & ADDHDRS: raise DisabledAction("ADDHDRS")
|
||||
return self._ctx.addheader(field,value,idx)
|
||||
|
||||
## Change the value of a mail header field.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_chgheader">
|
||||
# smfi_chgheader</a>.
|
||||
# The <code>Milter.CHGHDRS</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param field the name of the field to change
|
||||
# @param idx index of the field to change when there are multiple instances
|
||||
# @param value the new value of the field
|
||||
# @throws DisabledAction if CHGHDRS is not enabled
|
||||
def chgheader(self,field,idx,value):
|
||||
if not self._actions & CHGHDRS: raise DisabledAction("CHGHDRS")
|
||||
return self._ctx.chgheader(field,idx,value)
|
||||
|
||||
## Add a recipient to the message.
|
||||
# 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
|
||||
# RCPT TO command (and as delivered to the envrcpt callback), for example
|
||||
# "self.addrcpt('<foo@example.com>')".
|
||||
# The <code>Milter.ADDRCPT</code> action flag must be set.
|
||||
# If the optional <code>params</code> argument is used, then
|
||||
# the <code>Milter.ADDRCPT_PAR</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param rcpt the message recipient
|
||||
# @param params an optional list of ESMTP parameters
|
||||
# @throws DisabledAction if ADDRCPT or ADDRCPT_PAR is not enabled
|
||||
def addrcpt(self,rcpt,params=None):
|
||||
if not self._actions & ADDRCPT: raise DisabledAction("ADDRCPT")
|
||||
if params and not self._actions & ADDRCPT_PAR:
|
||||
raise DisabledAction("ADDRCPT_PAR")
|
||||
return self._ctx.addrcpt(rcpt,params)
|
||||
## Delete a recipient from the message.
|
||||
# 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.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param rcpt the message recipient to delete
|
||||
# @throws DisabledAction if DELRCPT is not enabled
|
||||
def delrcpt(self,rcpt):
|
||||
if not self._actions & DELRCPT: raise DisabledAction("DELRCPT")
|
||||
return self._ctx.delrcpt(rcpt)
|
||||
|
||||
## Replace the message body.
|
||||
# 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.
|
||||
# The <code>Milter.MODBODY</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param body a chunk of body data
|
||||
# @throws DisabledAction if MODBODY is not enabled
|
||||
def replacebody(self,body):
|
||||
if not self._actions & MODBODY: raise DisabledAction("MODBODY")
|
||||
return self._ctx.replacebody(body)
|
||||
|
||||
## Change the SMTP envelope sender address.
|
||||
# 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),
|
||||
# for example <code>self.chgfrom('<bar@example.com>')</code>.
|
||||
# The <code>Milter.CHGFROM</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @since 0.9.1
|
||||
# @param sender the new sender address
|
||||
# @param params an optional list of ESMTP parameters
|
||||
# @throws DisabledAction if CHGFROM is not enabled
|
||||
def chgfrom(self,sender,params=None):
|
||||
if not self._actions & CHGFROM: raise DisabledAction("CHGFROM")
|
||||
return self._ctx.chgfrom(sender,params)
|
||||
|
||||
## Quarantine the message.
|
||||
# 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.
|
||||
# The <code>Milter.QUARANTINE</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param reason a string describing the reason for quarantine
|
||||
# @throws DisabledAction if QUARANTINE is not enabled
|
||||
def quarantine(self,reason):
|
||||
if not self._actions & QUARANTINE: raise DisabledAction("QUARANTINE")
|
||||
return self._ctx.quarantine(reason)
|
||||
|
||||
## Tell the MTA to wait a bit longer.
|
||||
# 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):
|
||||
return self._ctx.progress()
|
||||
|
||||
## A logging but otherwise do nothing Milter base class.
|
||||
# This is included for compatibility with previous versions of pymilter.
|
||||
# The logging callbacks are marked @@noreply.
|
||||
class Milter(Base):
|
||||
"A simple class interface to the milter module."
|
||||
|
||||
## Provide simple logging to sys.stdout
|
||||
# user replaceable callbacks
|
||||
def log(self,*msg):
|
||||
print 'Milter:',
|
||||
for i in msg: print i,
|
||||
print
|
||||
|
||||
@noreply
|
||||
def connect(self,hostname,family,hostaddr):
|
||||
"Called for each connection to sendmail."
|
||||
self.log("connect from %s at %s" % (hostname,hostaddr))
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def hello(self,hostname):
|
||||
"Called after the HELO command."
|
||||
self.log("hello from %s" % hostname)
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def envfrom(self,f,*str):
|
||||
"""Called to begin each message.
|
||||
f -> string message sender
|
||||
@@ -534,24 +62,25 @@ class Milter(Base):
|
||||
self.log("mail from",f,str)
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def envrcpt(self,to,*str):
|
||||
"Called for each message recipient."
|
||||
self.log("rcpt to",to,str)
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def header(self,field,value):
|
||||
"Called for each message header."
|
||||
self.log("%s: %s" % (field,value))
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def eoh(self):
|
||||
"Called after all headers are processed."
|
||||
self.log("eoh")
|
||||
return CONTINUE
|
||||
|
||||
def body(self,unused):
|
||||
"Called to transfer the message body."
|
||||
return CONTINUE
|
||||
|
||||
def eom(self):
|
||||
"Called at the end of message."
|
||||
self.log("eom")
|
||||
@@ -567,49 +96,58 @@ class Milter(Base):
|
||||
self.log("close")
|
||||
return CONTINUE
|
||||
|
||||
## The milter connection factory
|
||||
# This factory method is called for each connection to create the
|
||||
# python object that tracks the connection. It should return
|
||||
# an object derived from Milter.Base.
|
||||
#
|
||||
# Note that since python is dynamic, this variable can be changed while
|
||||
# the milter is running: for instance, to a new subclass based on a
|
||||
# change in configuration.
|
||||
# Milter methods which can be invoked from callbacks
|
||||
def getsymval(self,sym):
|
||||
return self.__ctx.getsymval(sym)
|
||||
|
||||
# If sendmail does not support setmlreply, then only the
|
||||
# first msg line is used.
|
||||
def setreply(self,rcode,xcode=None,msg=None,*ml):
|
||||
return self.__ctx.setreply(rcode,xcode,msg,*ml)
|
||||
|
||||
# Milter methods which can only be called from eom callback.
|
||||
def addheader(self,field,value,idx=-1):
|
||||
return self.__ctx.addheader(field,value,idx)
|
||||
|
||||
def chgheader(self,field,idx,value):
|
||||
return self.__ctx.chgheader(field,idx,value)
|
||||
|
||||
def addrcpt(self,rcpt,params=None):
|
||||
return self.__ctx.addrcpt(rcpt,params)
|
||||
|
||||
def delrcpt(self,rcpt):
|
||||
return self.__ctx.delrcpt(rcpt)
|
||||
|
||||
def replacebody(self,body):
|
||||
return self.__ctx.replacebody(body)
|
||||
|
||||
def chgfrom(self,sender,params=None):
|
||||
return self.__ctx.chgfrom(sender,params)
|
||||
|
||||
# When quarantined, a message goes into the mailq as if to be delivered,
|
||||
# but delivery is deferred until the message is unquarantined.
|
||||
def quarantine(self,reason):
|
||||
return self.__ctx.quarantine(reason)
|
||||
|
||||
def progress(self):
|
||||
return self.__ctx.progress()
|
||||
|
||||
factory = Milter
|
||||
|
||||
## @private
|
||||
# @brief Connect context to connection instance and return enabled callbacks.
|
||||
def negotiate_callback(ctx,opts):
|
||||
def connectcallback(ctx,hostname,family,hostaddr):
|
||||
m = factory()
|
||||
m._setctx(ctx)
|
||||
return m.negotiate(opts)
|
||||
|
||||
## @private
|
||||
# @brief Connect context if needed and invoke connect method.
|
||||
def connect_callback(ctx,hostname,family,hostaddr,nr_mask=P_NR_CONN):
|
||||
m = ctx.getpriv()
|
||||
if not m:
|
||||
# If not already created (because the current MTA doesn't support
|
||||
# xmfi_negotiate), create the connection object.
|
||||
m = factory()
|
||||
m._setctx(ctx)
|
||||
return m.connect(hostname,family,hostaddr)
|
||||
|
||||
## @private
|
||||
# @brief Disconnect milterContext and call close method.
|
||||
def close_callback(ctx):
|
||||
def closecallback(ctx):
|
||||
m = ctx.getpriv()
|
||||
if not m: return CONTINUE
|
||||
try:
|
||||
rc = m.close()
|
||||
finally:
|
||||
m._setctx(None) # release milterContext
|
||||
rc = m.close()
|
||||
m._setctx(None) # release milterContext
|
||||
return rc
|
||||
|
||||
## Convert ESMTP parameters with values to a keyword dictionary.
|
||||
# @deprecated You probably want Milter.param2dict instead.
|
||||
def dictfromlist(args):
|
||||
"Convert ESMTP parms with values to keyword dictionary."
|
||||
"Convert ESMTP parm list to keyword dictionary."
|
||||
kw = {}
|
||||
for s in args:
|
||||
pos = s.find('=')
|
||||
@@ -617,18 +155,6 @@ def dictfromlist(args):
|
||||
kw[s[:pos].upper()] = s[pos+1:]
|
||||
return kw
|
||||
|
||||
## Convert ESMTP parm list to keyword dictionary.
|
||||
# Params with no value are set to None in the dictionary.
|
||||
# @since 0.9.3
|
||||
# @param str list of param strings of the form "NAME" or "NAME=VALUE"
|
||||
# @return a dictionary of ESMTP param names and values
|
||||
def param2dict(str):
|
||||
"Convert ESMTP parm list to keyword dictionary."
|
||||
pairs = [x.split('=',1) for x in str]
|
||||
for e in pairs:
|
||||
if len(e) < 2: e.append(None)
|
||||
return dict([(k.upper(),v) for k,v in pairs])
|
||||
|
||||
def envcallback(c,args):
|
||||
"""Call function c with ESMTP parms converted to keyword parameters.
|
||||
Can be used in the envfrom and/or envrcpt callbacks to process
|
||||
@@ -643,11 +169,6 @@ def envcallback(c,args):
|
||||
pargs.append(s)
|
||||
return c(*pargs,**kw)
|
||||
|
||||
## Run the %milter.
|
||||
# @param name the name of the %milter known to the MTA
|
||||
# @param socketname the socket to be passed to milter.setconn()
|
||||
# @param timeout the time in secs the MTA should wait for a response before
|
||||
# considering this %milter dead
|
||||
def runmilter(name,socketname,timeout = 0):
|
||||
# This bit is here on the assumption that you will be starting this filter
|
||||
# before sendmail. If sendmail is not running and the socket already exists,
|
||||
@@ -673,7 +194,7 @@ def runmilter(name,socketname,timeout = 0):
|
||||
|
||||
# The default flags set include everything
|
||||
# milter.set_flags(milter.ADDHDRS)
|
||||
milter.set_connect_callback(connect_callback)
|
||||
milter.set_connect_callback(connectcallback)
|
||||
milter.set_helo_callback(lambda ctx, host: ctx.getpriv().hello(host))
|
||||
# For envfrom and envrcpt, we would like to convert ESMTP parms to keyword
|
||||
# parms, but then all existing users would have to include **kw to accept
|
||||
@@ -686,20 +207,12 @@ def runmilter(name,socketname,timeout = 0):
|
||||
milter.set_body_callback(lambda ctx,chunk: ctx.getpriv().body(chunk))
|
||||
milter.set_eom_callback(lambda ctx: ctx.getpriv().eom())
|
||||
milter.set_abort_callback(lambda ctx: ctx.getpriv().abort())
|
||||
milter.set_close_callback(close_callback)
|
||||
milter.set_close_callback(closecallback)
|
||||
|
||||
milter.setconn(socketname)
|
||||
if timeout > 0: milter.settimeout(timeout)
|
||||
# disable negotiate callback if runtime version < (1,0,1)
|
||||
ncb = negotiate_callback
|
||||
if milter.getversion() < (1,0,1):
|
||||
ncb = None
|
||||
# The name *must* match the X line in sendmail.cf (supposedly)
|
||||
milter.register(name,
|
||||
data=lambda ctx: ctx.getpriv().data(),
|
||||
unknown=lambda ctx,cmd: ctx.getpriv().unknown(cmd),
|
||||
negotiate=ncb
|
||||
)
|
||||
milter.register(name)
|
||||
start_seq = _seq
|
||||
try:
|
||||
milter.main()
|
||||
@@ -712,6 +225,3 @@ __all__ = globals().copy()
|
||||
for priv in ('os','milter','thread','factory','_seq','_seq_lock','__version__'):
|
||||
del __all__[priv]
|
||||
__all__ = __all__.keys()
|
||||
|
||||
## @example milter-template.py
|
||||
#
|
||||
|
||||
+16
-29
@@ -1,22 +1,12 @@
|
||||
## @package Milter.dns
|
||||
# Provide a higher level interface to pydns.
|
||||
# provide a higher level interface to pydns
|
||||
|
||||
import DNS
|
||||
from DNS import DNSError
|
||||
|
||||
MAX_CNAME = 10
|
||||
|
||||
## Lookup DNS records by label and RR type.
|
||||
# The response can include records of other types that the DNS
|
||||
# server thinks we might need.
|
||||
# @param name the DNS label to lookup
|
||||
# @param qtype the name of the DNS RR type to lookup
|
||||
# @return a list of ((name,type),data) tuples
|
||||
def DNSLookup(name, qtype):
|
||||
try:
|
||||
# To be thread safe, we create a fresh DnsRequest with
|
||||
# each call. It would be more efficient to reuse
|
||||
# a req object stored in a Session.
|
||||
req = DNS.DnsRequest(name, qtype=qtype)
|
||||
resp = req.req()
|
||||
#resp.show()
|
||||
@@ -34,28 +24,25 @@ class Session(object):
|
||||
def __init__(self):
|
||||
self.cache = {}
|
||||
|
||||
## Additional DNS RRs we can safely cache.
|
||||
# We have to be careful which additional DNS RRs we cache. For
|
||||
# instance, PTR records are controlled by the connecting IP, and they
|
||||
# could poison our local cache with bogus A and MX records.
|
||||
# Each entry is a tuple of (query_type,rr_type). So for instance,
|
||||
# the entry ('MX','A') says it is safe (for milter purposes) to cache
|
||||
# any 'A' RRs found in an 'MX' query.
|
||||
SAFE2CACHE = frozenset((
|
||||
('MX','MX'), ('MX','A'),
|
||||
('CNAME','CNAME'), ('CNAME','A'),
|
||||
('A','A'),
|
||||
('AAAA','AAAA'),
|
||||
('PTR','PTR'),
|
||||
('NS','NS'), ('NS','A'),
|
||||
('TXT','TXT'),
|
||||
('SPF','SPF')
|
||||
))
|
||||
|
||||
## Cached DNS lookup.
|
||||
# @param name the DNS label to query
|
||||
# @param qtype the query type, e.g. 'A'
|
||||
# @param cnames tracks CNAMES already followed in recursive calls
|
||||
SAFE2CACHE = {
|
||||
('MX','A'): None,
|
||||
('MX','MX'): None,
|
||||
('CNAME','A'): None,
|
||||
('CNAME','CNAME'): None,
|
||||
('A','A'): None,
|
||||
('AAAA','AAAA'): None,
|
||||
('PTR','PTR'): None,
|
||||
('NS','NS'): None,
|
||||
('NS','A'): None,
|
||||
('TXT','TXT'): None,
|
||||
('SPF','SPF'): None
|
||||
}
|
||||
|
||||
|
||||
def dns(self, name, qtype, cnames=None):
|
||||
"""DNS query.
|
||||
|
||||
|
||||
+11
-76
@@ -5,24 +5,6 @@
|
||||
# Send DSNs, do call back verification,
|
||||
# and generate DSN messages from a template
|
||||
# $Log$
|
||||
# Revision 1.21 2011/03/03 05:11:58 customdesigned
|
||||
# Release 0.9.4
|
||||
#
|
||||
# Revision 1.20 2010/10/11 00:29:47 customdesigned
|
||||
# Handle multiple recipients. For CBV or auto whitelist of multiple emails.
|
||||
#
|
||||
# Revision 1.19 2009/07/02 19:41:12 customdesigned
|
||||
# Handle @ in localpart.
|
||||
#
|
||||
# Revision 1.18 2009/06/10 18:01:59 customdesigned
|
||||
# Doxygen updates
|
||||
#
|
||||
# Revision 1.17 2009/05/20 20:08:44 customdesigned
|
||||
# Support non-DSN CBV (non-empty MAIL FROM)
|
||||
#
|
||||
# Revision 1.16 2007/09/25 01:24:59 customdesigned
|
||||
# Allow arbitrary object, not just spf.query like, to provide data for create_msg
|
||||
#
|
||||
# Revision 1.15 2007/09/24 20:13:26 customdesigned
|
||||
# Remove explicit spf dependency.
|
||||
#
|
||||
@@ -41,31 +23,7 @@
|
||||
# Revision 1.10 2006/05/24 20:56:35 customdesigned
|
||||
# Remove default templates. Scrub test.
|
||||
#
|
||||
## @package Milter.dsn
|
||||
# Support DSNs and CallBackValidations (CBV).
|
||||
#
|
||||
# A Delivery Status Notification (bounce) is sent to the envelope
|
||||
# sender (original MAIL FROM) with a null MAIL FROM (<>) to notify the
|
||||
# original sender # of delays or problems with delivery. A Callback Validation
|
||||
# starts the DSN process, but stops before issuing the DATA command. The
|
||||
# purpose is to check whether the envelope recipient is accepted (and is
|
||||
# therefore a valid email). The null MAIL FROM tells the remote
|
||||
# MTA to never reply according to RFC2821 (but some braindead MTAs
|
||||
# reply anyway, of course).
|
||||
#
|
||||
# Milters should cache CBV results and should avoid sending DSNs
|
||||
# unless the sender is authenticated somehow (e.g. SPF Pass). However,
|
||||
# when email is quarantined, and is not known to be a forgery, sending a DSN
|
||||
# is better than silently disappearing, and a DSN is better than sending
|
||||
# a normal message as notification - because MAIL FROM signing schemes
|
||||
# can reject bounces of forged emails. Whatever you do, don't copy those
|
||||
# assinine commercial filters that send a normal message to notify you
|
||||
# that some virus is forging your email.
|
||||
#
|
||||
# <b>DSNs should *only* be sent to MAIL FROM addresses.</b> Never send
|
||||
# a DSN or use a null MAIL FROM with an email address obtained from
|
||||
# anywhere else.
|
||||
#
|
||||
|
||||
import smtplib
|
||||
import socket
|
||||
from email.Message import Message
|
||||
@@ -73,25 +31,12 @@ import Milter
|
||||
import time
|
||||
import dns
|
||||
|
||||
## Send DSN.
|
||||
# Try the published MX names in order, rejecting obviously bogus entries
|
||||
# (like <code>localhost</code>).
|
||||
# @param mailfrom the original sender we are notifying or validating
|
||||
# @param receiver the HELO name of the MTA we are sending the DSN on behalf of.
|
||||
# Be sure to send from an IP that matches the HELO.
|
||||
# @param msg the DSN message in RFC2822 format, or None for CBV.
|
||||
# @param timeout total seconds to wait for a response from an MX
|
||||
# @param session Milter.dns.Session object from current incoming mail
|
||||
# session to reuse its cache, or None to create a fresh one.
|
||||
# @param ourfrom set to a valid email to send a normal notification from, or
|
||||
# to validate emails not obtained from MAIL FROM.
|
||||
# @return None on success or (status_code,msg) on failure.
|
||||
def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
|
||||
def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None):
|
||||
"""Send DSN. If msg is None, do callback verification.
|
||||
Mailfrom is original sender we are sending DSN or CBV to.
|
||||
Receiver is the MTA sending the DSN.
|
||||
Return None for success or (code,msg) for failure."""
|
||||
user,domain = mailfrom.rsplit('@',1)
|
||||
user,domain = mailfrom.split('@')
|
||||
if not session: session = dns.Session()
|
||||
try:
|
||||
mxlist = session.dns(domain,'MX')
|
||||
@@ -117,31 +62,21 @@ def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
|
||||
raise smtplib.SMTPHeloError(code, resp)
|
||||
if msg:
|
||||
try:
|
||||
smtp.sendmail('<%s>'%ourfrom,mailfrom,msg)
|
||||
smtp.sendmail('<>',mailfrom,msg)
|
||||
except smtplib.SMTPSenderRefused:
|
||||
# does not accept DSN, try postmaster (at the risk of mail loops)
|
||||
smtp.sendmail('<postmaster@%s>'%receiver,mailfrom,msg)
|
||||
else: # CBV
|
||||
code,resp = smtp.docmd('MAIL FROM: <%s>'%ourfrom)
|
||||
code,resp = smtp.docmd('MAIL FROM: <>')
|
||||
if code != 250:
|
||||
raise smtplib.SMTPSenderRefused(code, resp, '<%s>'%ourfrom)
|
||||
if isinstance(mailfrom,basestring):
|
||||
mailfrom = [mailfrom]
|
||||
badrcpts = {}
|
||||
for rcpt in mailfrom:
|
||||
code,resp = smtp.rcpt(rcpt)
|
||||
if code not in (250,251):
|
||||
badrcpts[rcpt] = (code,resp)# permanent error
|
||||
raise smtplib.SMTPSenderRefused(code, resp, '<>')
|
||||
code,resp = smtp.rcpt(mailfrom)
|
||||
if code not in (250,251):
|
||||
return (code,resp) # permanent error
|
||||
smtp.quit()
|
||||
if len(badrcpts) == 1:
|
||||
return badrcpts.values()[0] # permanent error
|
||||
if badrcpts:
|
||||
return badrcpts
|
||||
return None # success
|
||||
except smtplib.SMTPRecipientsRefused,x:
|
||||
if len(x.recipients) == 1:
|
||||
return x.recipients.values()[0] # permanent error
|
||||
return x.recipients
|
||||
return x.recipients[mailfrom] # permanent error
|
||||
except smtplib.SMTPSenderRefused,x:
|
||||
return x.args[:2] # does not accept DSN
|
||||
except smtplib.SMTPDataError,x:
|
||||
@@ -152,7 +87,7 @@ def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
|
||||
pass # MX didn't accept connections, try next one
|
||||
except socket.timeout:
|
||||
pass # MX too slow, try next one
|
||||
if hasattr(smtp,'sock'): smtp.close()
|
||||
smtp.close()
|
||||
if time.time() > toolate:
|
||||
return (450,'No MX response within %f minutes'%(timeout/60.0))
|
||||
return (450,'No MX servers available') # temp error
|
||||
|
||||
+1
-2
@@ -48,10 +48,9 @@ def is_dynip(host,addr):
|
||||
True
|
||||
"""
|
||||
if host.startswith('[') and host.endswith(']'):
|
||||
return True # no ptr
|
||||
return True
|
||||
if addr:
|
||||
if host.find(addr) >= 0: return True
|
||||
if addr.find(':') >= 0: return False # IP6
|
||||
a = addr.split('.')
|
||||
ia = map(int,a)
|
||||
h = host
|
||||
|
||||
-117
@@ -1,117 +0,0 @@
|
||||
"""Pure Python IP6 parsing and formatting
|
||||
|
||||
Copyright (c) 2006 Stuart Gathman <stuart@bmsi.com>
|
||||
|
||||
This module is free software, and you may redistribute it and/or modify
|
||||
it under the same terms as Python itself, so long as this copyright message
|
||||
and disclaimer are retained in their original form.
|
||||
"""
|
||||
import struct
|
||||
#from spf import RE_IP4
|
||||
import re
|
||||
PAT_IP4 = r'\.'.join([r'(?:\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])']*4)
|
||||
RE_IP4 = re.compile(PAT_IP4+'$')
|
||||
|
||||
def inet_ntop(s):
|
||||
"""
|
||||
Convert ip6 address to standard hex notation.
|
||||
|
||||
Examples:
|
||||
|
||||
>>> inet_ntop(struct.pack("!HHHHHHHH",0,0,0,0,0,0xFFFF,0x0102,0x0304))
|
||||
'::FFFF:1.2.3.4'
|
||||
|
||||
>>> inet_ntop(struct.pack("!HHHHHHHH",0x1234,0x5678,0,0,0,0,0x0102,0x0304))
|
||||
'1234:5678::102:304'
|
||||
|
||||
>>> inet_ntop(struct.pack("!HHHHHHHH",0,0,0,0x1234,0x5678,0,0x0102,0x0304))
|
||||
'::1234:5678:0:102:304'
|
||||
|
||||
>>> inet_ntop(struct.pack("!HHHHHHHH",0x1234,0x5678,0,0x0102,0x0304,0,0,0))
|
||||
'1234:5678:0:102:304::'
|
||||
|
||||
>>> inet_ntop(struct.pack("!HHHHHHHH",0,0,0,0,0,0,0,0))
|
||||
'::'
|
||||
"""
|
||||
# convert to 8 words
|
||||
a = struct.unpack("!HHHHHHHH",s)
|
||||
n = (0,0,0,0,0,0,0,0) # null ip6
|
||||
if a == n: return '::'
|
||||
# check for ip4 mapped
|
||||
if a[:5] == (0,0,0,0,0) and a[5] in (0,0xFFFF):
|
||||
ip4 = '.'.join([str(i) for i in struct.unpack("!BBBB",s[12:])])
|
||||
if a[5]:
|
||||
return "::FFFF:" + ip4
|
||||
return "::" + ip4
|
||||
# find index of longest sequence of 0
|
||||
for l in (7,6,5,4,3,2,1):
|
||||
e = n[:l]
|
||||
for i in range(9-l):
|
||||
if a[i:i+l] == e:
|
||||
if i == 0:
|
||||
return ':'+':%x'*(8-l) % a[l:]
|
||||
if i == 8 - l:
|
||||
return '%x:'*(8-l) % a[:-l] + ':'
|
||||
return '%x:'*i % a[:i] + ':%x'*(8-l-i) % a[i+l:]
|
||||
return "%x:%x:%x:%x:%x:%x:%x:%x" % a
|
||||
|
||||
def inet_pton(p):
|
||||
"""
|
||||
Convert ip6 standard hex notation to ip6 address.
|
||||
|
||||
Examples:
|
||||
|
||||
>>> struct.unpack('!HHHHHHHH',inet_pton('::'))
|
||||
(0, 0, 0, 0, 0, 0, 0, 0)
|
||||
|
||||
>>> struct.unpack('!HHHHHHHH',inet_pton('::1234'))
|
||||
(0, 0, 0, 0, 0, 0, 0, 4660)
|
||||
|
||||
>>> struct.unpack('!HHHHHHHH',inet_pton('1234::'))
|
||||
(4660, 0, 0, 0, 0, 0, 0, 0)
|
||||
|
||||
>>> struct.unpack('!HHHHHHHH',inet_pton('1234::5678'))
|
||||
(4660, 0, 0, 0, 0, 0, 0, 22136)
|
||||
|
||||
>>> struct.unpack('!HHHHHHHH',inet_pton('::FFFF:1.2.3.4'))
|
||||
(0, 0, 0, 0, 0, 65535, 258, 772)
|
||||
|
||||
>>> struct.unpack('!HHHHHHHH',inet_pton('1.2.3.4'))
|
||||
(0, 0, 0, 0, 0, 65535, 258, 772)
|
||||
|
||||
>>> try: inet_pton('::1.2.3.4.5')
|
||||
... except ValueError,x: print x
|
||||
::1.2.3.4.5
|
||||
"""
|
||||
if p == '::':
|
||||
return '\0'*16
|
||||
s = p
|
||||
m = RE_IP4.search(s)
|
||||
try:
|
||||
if m:
|
||||
pos = m.start()
|
||||
ip4 = [int(i) for i in s[pos:].split('.')]
|
||||
if not pos:
|
||||
return struct.pack('!QLBBBB',0,65535,*ip4)
|
||||
s = s[:pos]+'%x%02x:%x%02x'%tuple(ip4)
|
||||
a = s.split('::')
|
||||
if len(a) == 2:
|
||||
l,r = a
|
||||
if not l:
|
||||
r = r.split(':')
|
||||
return struct.pack('!HHHHHHHH',
|
||||
*[0]*(8-len(r)) + [int(s,16) for s in r])
|
||||
if not r:
|
||||
l = l.split(':')
|
||||
return struct.pack('!HHHHHHHH',
|
||||
*[int(s,16) for s in l] + [0]*(8-len(l)))
|
||||
l = l.split(':')
|
||||
r = r.split(':')
|
||||
return struct.pack('!HHHHHHHH',
|
||||
*[int(s,16) for s in l] + [0]*(8-len(l)-len(r))
|
||||
+ [int(s,16) for s in r])
|
||||
if len(a) == 1:
|
||||
return struct.pack('!HHHHHHHH',
|
||||
*[int(s,16) for s in a[0].split(':')])
|
||||
except ValueError: pass
|
||||
raise ValueError,p
|
||||
+9
-86
@@ -1,7 +1,3 @@
|
||||
## @package Milter.utils
|
||||
# Miscellaneous functions.
|
||||
#
|
||||
|
||||
import re
|
||||
import struct
|
||||
import socket
|
||||
@@ -11,53 +7,17 @@ from email.Header import decode_header
|
||||
#import email.Utils
|
||||
import rfc822
|
||||
|
||||
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$'
|
||||
'|::(?:%(hex4)s:){5}%(ls32)s$'
|
||||
'|(?:%(hex4)s)?::(?:%(hex4)s:){4}%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,1}%(hex4)s)?::(?:%(hex4)s:){3}%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,2}%(hex4)s)?::(?:%(hex4)s:){2}%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,3}%(hex4)s)?::%(hex4)s:%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,4}%(hex4)s)?::%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,5}%(hex4)s)?::%(hex4)s$'
|
||||
'|(?:(?:%(hex4)s:){0,6}%(hex4)s)?::$'
|
||||
% {
|
||||
'ls32': r'(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|%s)'%PAT_IP4,
|
||||
'hex4': r'[0-9a-f]{1,4}'
|
||||
}, re.IGNORECASE)
|
||||
ip4re = re.compile(r'^[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*$')
|
||||
|
||||
# from spf.py
|
||||
def addr2bin(s):
|
||||
"""Convert a string IPv4 address into an unsigned integer."""
|
||||
if s.find(':') >= 0:
|
||||
try:
|
||||
return bin2long6(inet_pton(s))
|
||||
except:
|
||||
raise socket.error("Invalid IP6 address: "+s)
|
||||
try:
|
||||
return struct.unpack("!L", socket.inet_aton(s))[0]
|
||||
except socket.error:
|
||||
raise socket.error("Invalid IP4 address: "+s)
|
||||
|
||||
def bin2long6(s):
|
||||
"""Convert binary IP6 address into an unsigned Python long integer."""
|
||||
h, l = struct.unpack("!QQ", s)
|
||||
return h << 64 | l
|
||||
|
||||
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)
|
||||
else:
|
||||
from pyip6 import inet_ntop, inet_pton
|
||||
def addr2bin(str):
|
||||
"Convert a string IPv4 address into an unsigned integer."
|
||||
return struct.unpack("!L", socket.inet_aton(str))[0]
|
||||
|
||||
MASK = 0xFFFFFFFFL
|
||||
MASK6 = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL
|
||||
|
||||
def cidr(i,n,mask=MASK):
|
||||
return ~(mask >> n) & mask & i
|
||||
def cidr(i,n):
|
||||
return ~(MASK >> n) & MASK & i
|
||||
|
||||
def iniplist(ipaddr,iplist):
|
||||
"""Return whether ip is in cidr list
|
||||
@@ -67,19 +27,8 @@ def iniplist(ipaddr,iplist):
|
||||
True
|
||||
>>> iniplist('192.168.0.45',['192.168.0.*'])
|
||||
True
|
||||
>>> 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'])
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
ValueError: Invalid ip syntax:2G01:610:779:0:223:6cff:fe9a:9cf3
|
||||
"""
|
||||
if ip4re.match(ipaddr):
|
||||
ipnum = addr2bin(ipaddr)
|
||||
elif ip6re.match(ipaddr):
|
||||
ipnum = bin2long6(inet_pton(ipaddr))
|
||||
else:
|
||||
raise ValueError('Invalid ip syntax:'+ipaddr)
|
||||
ipnum = addr2bin(ipaddr)
|
||||
for pat in iplist:
|
||||
p = pat.split('/',1)
|
||||
if ip4re.match(p[0]):
|
||||
@@ -89,21 +38,10 @@ def iniplist(ipaddr,iplist):
|
||||
n = 32
|
||||
if cidr(addr2bin(p[0]),n) == cidr(ipnum,n):
|
||||
return True
|
||||
elif ip6re.match(p[0]):
|
||||
if len(p) > 1:
|
||||
n = int(p[1])
|
||||
else:
|
||||
n = 128
|
||||
if cidr(bin2long6(inet_pton(p[0])),n,MASK6) == cidr(ipnum,n,MASK6):
|
||||
return True
|
||||
elif fnmatchcase(ipaddr,pat):
|
||||
return True
|
||||
return False
|
||||
|
||||
## 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>.
|
||||
#
|
||||
def parseaddr(t):
|
||||
"""Split email into Fullname and address.
|
||||
|
||||
@@ -153,27 +91,13 @@ def parse_addr(t):
|
||||
['user@bar', 'example.com']
|
||||
>>> parse_addr('foo')
|
||||
['foo']
|
||||
>>> parse_addr('@mx.example.com:user@example.com')
|
||||
['user', 'example.com']
|
||||
>>> parse_addr('@user@example.com')
|
||||
['@user', 'example.com']
|
||||
"""
|
||||
if t.startswith('<') and t.endswith('>'): t = t[1:-1]
|
||||
if t.startswith('"'):
|
||||
if t.endswith('"'): return [t[1:-1]]
|
||||
pos = t.find('"@')
|
||||
if pos > 0: return [t[1:pos],t[pos+2:]]
|
||||
if t.startswith('@'):
|
||||
try: t = t.split(':',1)[1]
|
||||
except IndexError: pass
|
||||
return t.rsplit('@',1)
|
||||
|
||||
## Decode headers gratuitously encoded to hide the content.
|
||||
# Spammers often encode headers to obscure the content from
|
||||
# spam filters. This function decodes gratuitously encoded
|
||||
# headers.
|
||||
# @param val the raw header value
|
||||
# @return the decoded value or the original raw value
|
||||
return t.split('@')
|
||||
|
||||
def parse_header(val):
|
||||
"""Decode headers gratuitously encoded to hide the content.
|
||||
@@ -185,7 +109,7 @@ def parse_header(val):
|
||||
for s,enc in h:
|
||||
if enc:
|
||||
try:
|
||||
u.append(unicode(s,enc,'replace'))
|
||||
u.append(unicode(s,enc))
|
||||
except LookupError:
|
||||
u.append(unicode(s))
|
||||
else:
|
||||
@@ -197,6 +121,5 @@ def parse_header(val):
|
||||
except UnicodeError: continue
|
||||
except UnicodeDecodeError: pass
|
||||
except LookupError: pass
|
||||
except ValueError: pass
|
||||
except email.Errors.HeaderParseError: pass
|
||||
return val
|
||||
|
||||
@@ -69,7 +69,8 @@ Not-so-quick Installation
|
||||
First install Sendmail. Make sure you read libmilter/README in the Sendmail
|
||||
source directory, and make sure you enable libmilter before you build. The
|
||||
8.11 series had libmilter marked as FFR (For Future Release); 8.12
|
||||
officially supports libmilter, but it's still not built by default.
|
||||
officially
|
||||
supports libmilter, but it's still not built by default.
|
||||
|
||||
Install Python, and enable threading in Modules/Setup.
|
||||
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
+222
@@ -0,0 +1,222 @@
|
||||
Title: Recent Changes
|
||||
|
||||
<h2> Recent Changes </h2>
|
||||
|
||||
<h3> 0.8.10 </h3>
|
||||
|
||||
SRS rejections now log the recipient.
|
||||
I have finally implemented plain CBV (no DSN). The CBV policy
|
||||
will do a plain CBV from now on, and the DSN policy is required
|
||||
if you want to send a DSN.
|
||||
I started checking the MAIL FROM fullname (human readable part
|
||||
of an email) for porn keywords. There is now a banned IP database.
|
||||
IPs are banned for too many bad MAIL FROMs or RCPT TOs, and remain banned
|
||||
for 7 days.
|
||||
|
||||
<h3> 0.8.9 </h3>
|
||||
|
||||
I use the <code>%ifarch</code> hack to build milter and milter-spf
|
||||
packages as noarch, while pymilter is built as native.
|
||||
|
||||
I removed the spf dependency from dsn.py, so pymilter can be used without
|
||||
installing pyspf, and added a Milter.dns module to let python milters do
|
||||
general DNS lookups without loading pyspf.
|
||||
|
||||
<h3> 0.8.8 </h3>
|
||||
|
||||
Programs do not belong in the /var/log directory. I moved the
|
||||
milter apps to /usr/lib/pymilter. Since having the programs and
|
||||
data in the same directory is convenient for debugging, it will
|
||||
still use an executable present in the datadir.
|
||||
|
||||
Several general utility classes and functions are now in the Milter package
|
||||
for possible use by other python milters. In addition to the trivial example
|
||||
milter, a simple SPF only milter is included as a realistic example.
|
||||
|
||||
The spec file now build 3 RPMs:
|
||||
|
||||
<ul>
|
||||
<li> pymilter is the milter module and Milter package for use by all python
|
||||
milters.
|
||||
<li> milter is the all-singing, all-dancing python milter application, with
|
||||
supporting <code>/etc/init.d</code>, logrotate and other scripts.
|
||||
<li> milter-spf is the simple SPF only milter application.
|
||||
</ul>
|
||||
|
||||
<h3> 0.8.7 </h3>
|
||||
|
||||
The spf module has been moved to the
|
||||
<a href="http://cheeseshop.python.org/pypi/pyspf">pyspf</a> package.
|
||||
Download <a href="http://sourceforge.net/project/showfiles.php?group_id=139894&package_id=191419">here</a>.
|
||||
|
||||
<h3> 0.8.6 </h3>
|
||||
|
||||
Python milter has been moved to
|
||||
<a href="http://sourceforge.net/projects/pymilter/">pymilter Sourceforge
|
||||
project</a> for development and release downloads.
|
||||
|
||||
<h3> 0.8.5 </h3>
|
||||
|
||||
Release 0.8.5 fixes some build bugs reported by Stephen Figgins. It
|
||||
fixes many small things, like not auto-whitelisting recipients of
|
||||
outgoing mail when the subject contains "autoreply:". There is a
|
||||
simple trusted forwarder implementation. If you have more than
|
||||
2 or so forwarders, we will need a way to "compile" SPF records into an
|
||||
IP set and TTL for it to be efficient (like libspf2 does).
|
||||
|
||||
<h3> GOSSiP </h3>
|
||||
An alpha release of <a href="pygossip.html">pygossip</a> has been commited to
|
||||
CVS, module pygossip. A version of the bms.py milter has been commited to CVS
|
||||
which supports calling GOSSiP to track domain reputation in a local database.
|
||||
|
||||
<h3> New website design </h3>
|
||||
|
||||
Hey, I'm no artist, so I just used the
|
||||
<a href="http://ht2html.sourceforge.net/">ht2html</a> package
|
||||
by <a href="http://barry.wooz.org/">Barry Warsaw</a>. The mascot
|
||||
is by <a href="http://alphard.ethz.ch/hafner/lebl.htm">Christian Hafner</a>,
|
||||
or maybe his wife. I chose Maxwell's daemon because it tirelessly
|
||||
and invisibly sorts molecules, just as milters sort mail.
|
||||
Christian has also provided a fun
|
||||
<a href="http://alphard.ethz.ch/hafner/PPS/PPS2002/Maxwell/simulation.htm">
|
||||
simulation</a> that lets you try your hand at sorting molecules.
|
||||
|
||||
<h3> 0.8.4 </h3>
|
||||
|
||||
Release 0.8.4 makes configuring SPF policy via access.db actually work.
|
||||
The honeypot idea is enhanced by auto-whitelisting recipients of
|
||||
email sent from selected domains. Whitelisted messages are then used
|
||||
to train the honeypot. This makes the honeypot screener entirely self
|
||||
training. The smfi_progress() API is now automatically supported when present.
|
||||
An optional idx parameter to milter.addheader() invokes smfi_insheader().
|
||||
|
||||
<h3> 0.8.3 </h3>
|
||||
|
||||
Release 0.8.3 uses the standard logging module, and supports configuring
|
||||
more detailed SPF policy via the sendmail access map. SMTP AUTH connections
|
||||
are considered INTERNAL. Preventing forgery between internal domains is
|
||||
just a matter of specifying the user-domain map - I'll define something
|
||||
for the next version. We now send DSNs when mail is quarantined (rejecting
|
||||
if DSN fails) and for SPF syntax errors (PermError). There is an
|
||||
experimental option to add a Sender header when it is missing and the From
|
||||
domain doesn't match the MAIL FROM domain. Next release, we may start
|
||||
renaming and replacing an existing Sender header when neither it nor the
|
||||
From domain matches MAIL FROM. Since bogus MAIL FROMs are rejected
|
||||
(to varying degrees depending on the configured SPF policy), and
|
||||
both Sender and From and displayed by default in many email clients,
|
||||
this provides some phishing protection without rejecting mail based
|
||||
on headers.
|
||||
|
||||
<h3> 0.8.2 </h3>
|
||||
|
||||
Release 0.8.2 has changes to <a href="http://openspf.net">SPF</a> to bring it
|
||||
in line with the newly official RFC. It adds
|
||||
<a href="http://ses.codeshare.ca/">SES</a>
|
||||
support (the original SES without body hash) for pysrs-0.30.10, and honeypot
|
||||
support for pydspam-1.1.9. There is a new method in the base milter module.
|
||||
milter.set_exception_policy(i) lets you choose a policy of CONTINUE, REJECT, or
|
||||
TEMPFAIL (default) for untrapped exceptions encountered in a milter callback.
|
||||
|
||||
<h3> 0.8.0 </h3>
|
||||
|
||||
Release 0.8.0 is the first <a href="http://sourceforge.net/">Sourceforge</a>
|
||||
release. It supports Python-2.4, and provides an option to accept mail
|
||||
that gets an SPF softfail or fails the 3 strikes rule, provided the
|
||||
alleged sender accepts a DSN explaining the problem. Python-2.3 is
|
||||
no longer supported by the reworked mime.py module, although API changes
|
||||
could be backported. There are too many incompatible changes to the
|
||||
python email package.
|
||||
|
||||
<h3> Older Releases </h3>
|
||||
|
||||
Release 0.7.2 tightens the authentication screws with a "3 strikes and
|
||||
you're out" policy. A sender must have a valid PTR, HELO, or SPF record
|
||||
to send email. Specific senders can be whitelisted using the
|
||||
"delegate" option in the spf configuration section by adding a
|
||||
default SPF record for them. The PTR and HELO are required
|
||||
by RFC anyway, so this is not an unreasonable requirement.
|
||||
There is now a coherent policy for an SPF softfail result. A softfail
|
||||
is accepted if there is a valid PTR or HELO, or if the domain
|
||||
is listed in the "accept_softfail" option of the spf configuration section.
|
||||
A neutral result is accepted by default if there is a valid PTR or
|
||||
HELO, (and the SPF record was not guessed), unless the domain is listed in the
|
||||
"reject_neutral" option. Common forms of PTR records for dynamic IPs are
|
||||
recognized, and do not count as a valid PTR. This does not prevent anyone
|
||||
from sending mail from a dynamic IP - they just need to configure a
|
||||
valid HELO name or publish an SPF record.
|
||||
<p>
|
||||
As SPF adoption continues to rise, forged spam is not getting through. So
|
||||
spammers are publishing their SPF records as predicted. The 0.7.2 RPM
|
||||
now provides the <code>rhsbl</code> sendmail hack so that spammer domains
|
||||
can be blacklisted. With the RPM installed, add a line like the following
|
||||
to your <code>sendmail.mc</code>.
|
||||
<pre>
|
||||
HACK(rhsbl,`blackholes.example.com',"550 Rejected: " $&{RHS} " has been spamming our customers.")dnl
|
||||
</pre>
|
||||
<p>
|
||||
Of course, spammers are now starting to register
|
||||
throwaway domains. The next thing we need is a custom DNS server,
|
||||
in Python, that
|
||||
can recognize patterns. For instance, one spammer registers ded304.com,
|
||||
ded305.com, ded306.com, etc. We also need the custom DNS server to
|
||||
let SPF classic clients check SES (which will be part of pysrs).
|
||||
The <a href="http://twistedmatrix.com/products/twisted">Twisted Python</a>
|
||||
framework provides a custom DNS server - but I
|
||||
would like a smaller implementation for our use.
|
||||
<p>
|
||||
The RPM for release 0.7.0 moves the config file and socket locations to
|
||||
/etc/mail and /var/run/milter respectively. We now parse Microsoft CID records
|
||||
- but only hotmail.com uses them. They seem to have applied for a patent on
|
||||
the brilliant idea of examining the mail headers to see who the message is
|
||||
from. We aren't doing that here, so not to worry - but I am not a lawyer, so
|
||||
if you are worried, change spf.py around line 626 to return None instead of
|
||||
calling CIDParser(). There is a new option to reject mail with no PTR
|
||||
and no SPF.
|
||||
<p>
|
||||
Microsoft is pushing an anti-opensource license for their pending patent
|
||||
along with their sender-ID proposal before the IETF.
|
||||
It is royalty free - but requires anyone distributing a binary they've
|
||||
compiled from source to sign a license agreement. The Apache Software
|
||||
Foundation <a
|
||||
href="http://www.apache.org/foundation/docs/sender-id-position.html"> explains
|
||||
the problem with sender-ID</a>, and Debian <a
|
||||
href="http://www.debian.org/News/2004/20040904">concurs</a>. Since
|
||||
the <a href="http://download.microsoft.com/download/4/3/9/439b024b-09fd-44ee-8ff0-10e834004c36/senderid_FAQ.PDF">Microsoft license</a> is
|
||||
<a href="http://www.circleid.com/article/732_0_1_0_C/">incompatible with free
|
||||
software in general</a> and the <a
|
||||
href="http://www.imc.org/ietf-mxcomp/mail-archive/msg03678.html">GPL in
|
||||
particular</a>, Python milter will not be able to implement sender-ID in its
|
||||
current form. This was, no doubt, Microsoft's intent all along.
|
||||
<p>
|
||||
Sender-ID attempts to do for RFC2822 headers what SPF does for RFC2821 headers.
|
||||
Unlike SPF, it has never been tried, and is encumbered by a stupid patent. I
|
||||
recommend ignoring it and continuing to implement and improve SPF until a
|
||||
working and unencumbered proposal for RFC2822 headers surfaces.
|
||||
|
||||
<p>
|
||||
<a href="http://openspf.com">
|
||||
<img src="SPF.gif" align=left alt="SPF logo"></a>
|
||||
Release 0.6.6 adds support for <a href="http://openspf.com/">SPF</a>,
|
||||
a protocol to prevent forging of the envelope from address.
|
||||
SPF support requires <a href="http://pydns.sourceforge.net/">pydns</a>.
|
||||
The included spf.py module is an updated version of the original 1.6
|
||||
version at <a href="http://www.wayforward.net/spf/">wayforward.net</a>.
|
||||
The updated version tracks the draft RFC and test suite.
|
||||
<p>
|
||||
The FAQ addresses <a href="faq.html#spf">how to get started with SPF</a>.
|
||||
<p>
|
||||
Release 0.6.1 adds a full milter based dspam application.
|
||||
<p>
|
||||
I have selected the <a href="http://www.nuclearelephant.com/projects/dspam/">
|
||||
dspam bayes filter project</a> and <a href="dspam.html">
|
||||
packaged it for python</a>.
|
||||
Release 0.6.0 offers a simple application of dspam I call "header triage",
|
||||
which rejects messages with spammy headers.
|
||||
To use header triage, you must have <a href="dspam.html">DSPAM</a> installed,
|
||||
and select a dictionary that is well moderated by someone who gets
|
||||
lots of spam. That dictionary can be used to block spam that is
|
||||
obvious from the headers (e.g. X-Mailer and Subject) before it ties
|
||||
up any more resources. I have yet to see any false positives from this
|
||||
approach (check the milter log), but if there are, the sender will
|
||||
get a REJECT with the message "Your message looks spammy."
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
Title: Credits
|
||||
|
||||
<h1> CREDITS </h1>
|
||||
|
||||
<a href="mailto:Jim Niemira <urmane@urmane.org>">Jim Niemira</a>
|
||||
wrote the original C module and some quick
|
||||
and dirty python to use it.
|
||||
<a href="http://gathman.org/vitae">Stuart D. Gathman</a>
|
||||
took that kludge and added threading and context objects to it, wrote a proper
|
||||
OO wrapper (Milter.py) that handles attachments, did lots of testing, packaged
|
||||
it with distutils, and generally transformed it from a quick hack to a
|
||||
real, usable Python extension.
|
||||
|
||||
<h2>Other contributors (in random order):</h2>
|
||||
|
||||
<dl>
|
||||
<dt> <a href="http://alphard.ethz.ch/hafner/lebl.htm">Christian Hafner</a>
|
||||
<dd>for the pymilter mascot image of
|
||||
<a href="http://maxwelld.netfirms.com/">
|
||||
Maxwell's daemon</a>
|
||||
<dt>Stephen Figgins
|
||||
<dd>for reporting problems building with sendmail-8.12, and when
|
||||
building milter.so for the first time.
|
||||
<dt>Dave MacQuigg
|
||||
<dd>for noticing that smfi_insheader wasn't supported, and creating
|
||||
a template to help first time pymilter users create their own milter.
|
||||
<dt>Terence Way
|
||||
<dd>for providing a Python port of SPF
|
||||
<dt>Scott Kitterman
|
||||
<dd>for doing lots of testing and debugging of SPF against draft standard,
|
||||
and for putting up a <a href="http://www.kitterman.com/spf/validate.html">
|
||||
web page that validates SPF</a> records using spf.py
|
||||
<dt>Alexander Kourakos
|
||||
<dd>for plugging several memory leaks
|
||||
<dt>George Graf at Vienna University of Economics and Business Administration
|
||||
<dd>for handling None passed to setreply and chgheader.
|
||||
<dt>Deron Meranda
|
||||
<dd>for IPv6 patches
|
||||
<dt>Jason Erikson
|
||||
<dd>for handling NULL hostaddr in connect callback.
|
||||
<dt>John Draper
|
||||
<dd>for porting Python milter to OpenBSD, and starting to work on tutorials
|
||||
then pointing out that it would be easier to just write the MTA in Python.
|
||||
<dt>Eric S. Johansson
|
||||
<dd>for helpful design discussions while working on camram
|
||||
<dt>Alex Savguira
|
||||
<dd>for finding bugs with international headers and
|
||||
suggesting the scan_zip option.
|
||||
<dt><a href="http://www.bmsi.com">Business Management Systems</a>
|
||||
<dd>for hosting the website, and providing paying clients who need milter
|
||||
service so I can work on it as part of my day job.
|
||||
</dl>
|
||||
|
||||
If I have left anybody out, send me a reminder:
|
||||
<a href="mailto:Stuart Gathman <stuart@bmsi.com>">stuart@bmsi.com</a>
|
||||
+293
@@ -0,0 +1,293 @@
|
||||
Title: Python Milter FAQ
|
||||
|
||||
<h1> Python Milter <a name=faq>FAQ</a> </h1>
|
||||
|
||||
<menu>
|
||||
<li> <a href="#compiling">Compiling Python Milter</a>
|
||||
<li> <a href="#running">Running Python Milter</a>
|
||||
<li> <a href="#spf">Using SPF</a>
|
||||
<li> <a href="#srs">Using SRS</a>
|
||||
</menu>
|
||||
|
||||
<ol>
|
||||
|
||||
<h3> <a name="compiling">Compiling Python Milter </a> </h3>
|
||||
|
||||
<li> Q. I have tried to download the current milter code and my virus scan
|
||||
traps several viruses in the download.
|
||||
<p> A. The milter source includes a number of deactivated viruses in
|
||||
the test directory. All but the first and last lines of the base64
|
||||
encoded virus data has been removed. I suppose I should randomize
|
||||
the first and last lines as well, since pymilter just deletes executables,
|
||||
and doesn't look for signatures.
|
||||
<li> Q. I have installed sendmail from source, but Python milter won't
|
||||
compile.
|
||||
<p> A. Even though libmilter is officially supported in sendmail-8.12,
|
||||
you need to build and install it in separate steps. Take a look
|
||||
at the <a href="/aix/sendmail12.spec">RPM spec file</a> for sendmail-8.12.
|
||||
The %prep section shows you how to create
|
||||
a site.config.m4 that enables MILTER. The %build section shows you how
|
||||
to build libmilter in a separate invocation of make. The %install section
|
||||
shows you how to install libmilter with a separate invocation of make.
|
||||
<p>
|
||||
|
||||
<li> Q. Why is mfapi.h not found when I try to compile Python milter on
|
||||
RedHat 7.2?
|
||||
<p> A. RedHat forgot to include the header in the RPM. See the
|
||||
<a href="requirements.html#rh72">RedHat 7.2 requirements</a>.
|
||||
<p>
|
||||
<li> Q. Python milter compiles ok, but I get an error like this when
|
||||
I try to import the milter module:
|
||||
<pre>
|
||||
ImportError: /usr/lib/python2.4/site-packages/milter.so: undefined symbol: smfi_setmlreply
|
||||
</pre>
|
||||
<p> A. Your libmilter.a is from sendmail-8.12 or earlier. You need
|
||||
sendmail-8.13 or later to support setmlreply. You can disable
|
||||
setmlreply by changing setup.py. Change:
|
||||
<pre>
|
||||
define_macros = [ ('MAX_ML_REPLY',32) ]
|
||||
</pre>
|
||||
in setup.py to
|
||||
<pre>
|
||||
define_macros = [ ('MAX_ML_REPLY',1) ]
|
||||
</pre>
|
||||
|
||||
<h3> <a name="running">Running Python Milter </a></h3>
|
||||
|
||||
<li> Q. The sample.py milter prints a message, then just sits there.
|
||||
<pre>
|
||||
To use this with sendmail, add the following to sendmail.cf:
|
||||
|
||||
O InputMailFilters=pythonfilter
|
||||
Xpythonfilter, S=local:inet:1030@localhost
|
||||
|
||||
See the sendmail README for libmilter.
|
||||
sample milter startup
|
||||
</pre>
|
||||
<p> A. You need to tell sendmail to connect to your milter. The
|
||||
sample milter tells you what to add to your sendmail.cf to tell
|
||||
sendmail to use the milter. You can also add an INPUT_MAIL_FILTER
|
||||
macro to your sendmail.mc file and rebuild sendmail.cf - see the sendmail
|
||||
README for milters.
|
||||
<p>
|
||||
|
||||
<li> Q. I've configured sendmail properly, but still nothing happens
|
||||
when I send myself mail!
|
||||
<p> A. Sendmail only milters SMTP mail. Local mail is not miltered.
|
||||
You can pipe a raw message through sendmail to test your milter:
|
||||
<pre>
|
||||
$ cat rawtextmsg | sendmail myname@my.full.domain
|
||||
</pre>
|
||||
Now check your milter log.
|
||||
<p>
|
||||
|
||||
<li> Q. Why do I get this ImportError exception?
|
||||
<pre>
|
||||
File "mime.py", line 370, in ?
|
||||
from sgmllib import declstringlit, declname
|
||||
ImportError: cannot import name declstringlit
|
||||
</pre>
|
||||
<p> A. <code>declstringlit</code> is not provided by sgmllib in all versions
|
||||
of python. For instance, python-2.2 does not have it. Upgrade to
|
||||
milter-0.4.5 or later to remove this dependency.
|
||||
<p>
|
||||
|
||||
<li> Q. Why do I get <code>milter.error: cannot add recipient</code>?
|
||||
<pre>
|
||||
</pre>
|
||||
<p> A. You must tell libmilter how you might mutate the message with
|
||||
<code>set_flags()</code> before calling <code>runmilter()</code>. For
|
||||
instance, <code>Milter.set_flags(Milter.ADDRCPT)</code>. You must add together
|
||||
all of <code>ADDHDRS, CHGBODY, ADDRCPT, DELRCPT, CHGHDRS</code> that apply.
|
||||
<p> NOTE - recent versions default flags to enabling all features. You
|
||||
must now call <code>set_flags()</code> if you wish to disable features for
|
||||
efficiency.
|
||||
<p>
|
||||
|
||||
<li> Q. Why does sendmail sometimes print something like:
|
||||
"...write(D) returned -1, expected 5: Broken pipe"
|
||||
in the sendmail log?
|
||||
<p> A. Libmilter expects "rcpt to" shortly after getting "mail from".
|
||||
"Shortly" is defined by the timeout parameter you passed to
|
||||
<code>Milter.runmilter()
|
||||
</code> or <code>milter.settimeout()</code>. If the timeout is 10 seconds,
|
||||
and looking up the first recipient in DNS takes more than
|
||||
10 seconds, libmilter will give up and break the connection.
|
||||
<code>Milter.runmilter()</code> defaulted to 10 seconds in 0.3.4. In 0.3.5
|
||||
it will keep the libmilter default of 2 hours.
|
||||
<p>
|
||||
|
||||
<li> Q. Why does milter block messages with big5 encoding? What if I
|
||||
want to receive them?
|
||||
<p> A. sample.py is a sample. It is supposed to be easily modified
|
||||
for your specific needs. We will of course continue to move generic
|
||||
code out of the sample as the project evolves. Think of sample.py as
|
||||
an active config file.
|
||||
<p>
|
||||
If you are running bms.py, then the block_chinese option in
|
||||
<code>/etc/mail/pymilter.cfg</code> controls this feature.
|
||||
<p>
|
||||
|
||||
<li> Q. Why does sendmail coredump with milters on OpenBSD?
|
||||
<p> A. Sendmail has a problem with unix sockets on old versions of OpenBSD.
|
||||
OpenBSD users report that this problem has been fixed, so upgrading
|
||||
OpenBSD will fix this. Otherwise, you can
|
||||
use an internet domain socket instead. For example, in
|
||||
<code>sendmail.cf</code> use
|
||||
<pre>
|
||||
Xpythonfilter, S=inet:1234@localhost
|
||||
</pre>
|
||||
and change sample.py accordingly.
|
||||
<p>
|
||||
|
||||
<li> Q. How can I change the bounce message for an invalid recipient?
|
||||
I can only change the recipient in the eom callback, but the eom callback
|
||||
is never called when the recipient is invalid!
|
||||
<p> A. Configure sendmail to use virtusertable, and send all unknown
|
||||
addresses to /dev/null. For example,
|
||||
<h4>/etc/mail/virtusertable</h4>
|
||||
<pre>
|
||||
@mycorp.com dev-null
|
||||
dan@mycorp.com dan
|
||||
sally@mycorp.com sally
|
||||
</pre>
|
||||
<h4>/etc/aliases</h4>
|
||||
<pre>
|
||||
dev-null: /dev/null
|
||||
</pre>
|
||||
Now your milter will get to the eom callback, and can change the
|
||||
envelope recipient at will. Thanks to Dredd at
|
||||
<a href=http://www.milter.org/>milter.org</a> for this solution.
|
||||
<p>
|
||||
|
||||
<li> Q. I am having trouble with the setreply method. It always outputs
|
||||
"milter.error: cannot set reply".
|
||||
<p> A. Check the sendmail log for errors. If sendmail is getting
|
||||
milter timeouts, then your milter is taking too long and sendmail gave
|
||||
up waiting. You can adjust the timeouts in your sendmail config. Here
|
||||
is a milter declaration for sendmail.cf with all timeouts specified:
|
||||
<pre>
|
||||
Xpythonfilter, S=local:/var/log/milter/pythonsock, F=T, T=C:5m;S:20s;R:60s;E:5m
|
||||
</pre>
|
||||
<li> Q. There is a Python traceback in the log file! What happened to
|
||||
my email?
|
||||
<p> A. By default, when the milter fails with an untrapped exception, a
|
||||
TEMPFAIL result (451) is returned to the sender. The sender will then retry
|
||||
every hour or so for several days. Hopefully, someone will notice the
|
||||
traceback, and workaround or fix the problem. Beginning with milter-0.8.2,
|
||||
you can call <code>milter.set_exception_policy(milter.CONTINUE)</code>
|
||||
to cause an untrapped exception to continue processing with the
|
||||
next callback or milter instead. For
|
||||
completeness, you can also set the exception policy to
|
||||
<code>milter.REJECT</code>.
|
||||
|
||||
<li> Q. I read some notes such as "Check valid domains allowed by internal
|
||||
senders to detect PCs infected with spam trojans." but could not
|
||||
understand the idea. Could you clarify the content ?
|
||||
|
||||
<p> A. The <code>internal_domains</code> configuration specifies which
|
||||
MAIL FROM domains are used by internal connections. If an internal
|
||||
PC tries to use some other domain, it is assumed to be a "Zombie".
|
||||
<p>
|
||||
Here is a sample log line:
|
||||
<pre>
|
||||
2005Jun22 12:01:04 [12430] REJECT: zombie PC at 192.168.100.171 sending MAIL FROM debby@fedex.com
|
||||
</pre>
|
||||
No, fedex.com does not use pymilter, and there is no one named debby at my
|
||||
client. But the idiot using the PC at 192.168.100.171 has downloaded and
|
||||
installed some stupid weatherbar/hotbar/aquariumscreensaver that is actually a
|
||||
spam bot.
|
||||
<p>
|
||||
The <code>internal_domains</code> option is simplistic, it assumes all
|
||||
valid senders of the domains are internal. SPF provides a much more general
|
||||
check of IP and MAIL FROM for external email. Pymilter should soon
|
||||
have a local policy feature for more general checking of internal mail.
|
||||
<li> Q. <code>mail_archive</code> isn't working. Or I don't understand how
|
||||
it's suppose to work. I have
|
||||
<code>mail_archive = /var/mail/mail_archive</code>
|
||||
in <code>pymilter.cfg</code> but nothing ever gets dumped into
|
||||
<code>/var/mail/mail_archive</code>.
|
||||
<p> A. The 'mail' user needs to have write access. Permission failures
|
||||
should be logged as a traceback in milter.log if it doesn't.
|
||||
|
||||
<h3> <a name="spf">Using SPF </a></h3>
|
||||
|
||||
<li> Q. So how do I use the SPF support? The sample.py milter doesn't seem
|
||||
to use it.
|
||||
<p> A. The bms.py milter supports spf. The RedHat RPMs will set almost
|
||||
everything up for you. For other systems:
|
||||
<ol type=i>
|
||||
<li> Arrange to run bms.py in the background (as a service perhaps) and
|
||||
redirect output and errors to a logfile. For instance, on AIX you'll want
|
||||
to use SRC (System Resource Controller).
|
||||
<li> Copy pymilter.cfg to the /etc/mail or the directory you run bms.py in,
|
||||
and edit it. The comments should explain the options.
|
||||
<li> Start bms.py in the background as arranged.
|
||||
<li> Add Xpythonfilter to sendmail.cf or add an INPUT_MAIL_FILTER to
|
||||
sendmail.mc. Regen sendmail.cf if you use sendmail.mc and restart
|
||||
sendmail.
|
||||
<li> Arrange to rotate log files and remove old defang files in
|
||||
<code>tempdir</code>. The RedHat RPM uses <code>logrotate</code> for
|
||||
logfiles and a simple cron script using <code>find</code> to clean
|
||||
<code>tempdir</code>.
|
||||
</ol>
|
||||
In CVS, there is <code>spfmilter.py</code>. Run that as a service,
|
||||
and it does just SPF. It uses the sendmail <code>access</code>
|
||||
file to configure SPF responses just like <code>bms.py</code>, but
|
||||
supports only REJECT and OK.
|
||||
<li> Q. The SPF DSN is sent at least once for domains that don't publish a SPF.
|
||||
How do I stop this behavior?
|
||||
<p> A. The SPF response is controlled by <code>/etc/mail/access</code>
|
||||
(actually the file you specify with <code>access_file</code> in
|
||||
the <code>[spf]</code> section of <code>pymilter.cfg</code>).
|
||||
Responses are OK, CBV, and REJECT. CBV sends the DSN.
|
||||
<p>
|
||||
You can change the defaults. For instance, I have:
|
||||
<pre>
|
||||
SPF-None: REJECT
|
||||
SPF-Neutral: CBV
|
||||
SPF-Softfail: CBV
|
||||
SPF-Permerror: CBV
|
||||
</pre>
|
||||
I have best_guess = 1, so SPF none is converted to PASS/NEUTRAL for policy
|
||||
lookup, and 3 strikes (no PTR, no HELO, no SPF) becomes "SPF NONE" for local
|
||||
policy purposes (the Received-SPF header always shows the official SPF
|
||||
result.)
|
||||
<p>
|
||||
You can change the default for specific domains:
|
||||
<pre>
|
||||
# these guys aren't going to pay attention to CBVs anyway...
|
||||
SPF-None:cia.gov REJECT
|
||||
SPF-None:fbi.gov REJECT
|
||||
SPF-Neutral:aol.com REJECT
|
||||
SPF-Softfail:ebay.com REJECT
|
||||
</pre>
|
||||
|
||||
<h3> <a name="srs">Using SRS </a></h3>
|
||||
|
||||
<li> Q. The SRS part doesn't seem to work as whenever I try to start
|
||||
<code>/etc/init.d/pysrs</code>, I get this in
|
||||
<code>/var/log/milter/pysrs.log</code>:
|
||||
<pre>
|
||||
ConfigParser.NoOptionError: No option 'fwdomain' in section: 'srs'
|
||||
</pre>
|
||||
<p> A. You need to specify the forward domain - i.e. the domain you want
|
||||
SRS to rewrite stuff too.
|
||||
<p>
|
||||
For instance, I have:
|
||||
<pre>
|
||||
# sample SRS configuration
|
||||
[srs]
|
||||
secret = don't you wish
|
||||
maxage = 8
|
||||
hashlength = 5
|
||||
;database=/var/log/milter/srs.db
|
||||
fwdomain = bmsi.com
|
||||
sign=bmsi.com,mail.bmsi.com,gathman.org
|
||||
srs=bmsaix.bmsi.com,bmsred.bmsi.com,stl.gathman.org,bampa.gathman.org
|
||||
</pre>
|
||||
The <code>sign</code> is for local domains which are signed.
|
||||
The <code>srs</code> list is for other domains which you are relaying,
|
||||
and which need to have SRS checked/undone for bounces.
|
||||
|
||||
</ol>
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
<!-- -*- html -*- -->
|
||||
<h3>Subsections</h3>
|
||||
<li><a href="milter.html">Introduction</a>
|
||||
<li><a href="changes.html">Changes</a>
|
||||
<li><a href="requirements.html">Requirements</a>
|
||||
<li><a href="http://sourceforge.net/project/showfiles.php?group_id=139894">Download</a>
|
||||
<li><a href="RPM-GPG-KEY-bms">GPG-KEY</a>
|
||||
<li><a href="faq.html">FAQ</a>
|
||||
<li><a href="policy.html">Policies</a>
|
||||
<li><a href="logmsgs.html">Log Messages</a>
|
||||
<li><a href="http://bmsi.com/mailman/listinfo/pymilter">Mailing List</a>
|
||||
<li><a href="credits.html">CREDITS</a>
|
||||
<li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=139894&type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
|
||||
<h3>Links</h3>
|
||||
<li><a href="https://www.milter.org/developers/api/index">C API</a>
|
||||
<li><a href="http://www.milter.org/">Milter.Org</a>
|
||||
<li><a href="http://www.python.org/">Python.Org</a>
|
||||
<li><a href="http://www.sendmail.org/">Sendmail.Org</a>
|
||||
<li><a href="http://www.openspf.org/">SPF</a>
|
||||
<li><a href="pysrs.html">pysrs</a>
|
||||
<li><a href="http://cheeseshop.python.org/pypi/pyspf">pyspf</a>
|
||||
<li><a href="http://bmsi.com/python/pygossip.html">pygossip</a>
|
||||
<li><a href="http://bmsi.com/python/dspam.html">pydspam</a>
|
||||
<li><a href="http://bmsi.com/libdspam/dspam.html">libdspam</a>
|
||||
@@ -0,0 +1,91 @@
|
||||
Title: Python Milter Log Documentation
|
||||
<style>
|
||||
DT { font-weight: bolder; padding-top: 1em }
|
||||
</style>
|
||||
|
||||
<h1> Milter Log Documentation </h1>
|
||||
|
||||
The milter log from the bms.py application has a variety of "tags" in it that
|
||||
indicate what it did.
|
||||
|
||||
<dl>
|
||||
<dt> DSPAM: honeypot SCREENED
|
||||
<dd> message was quarantined to the honeypot quarantine
|
||||
|
||||
<dt> REJECT: hello SPF: fail 550 access denied
|
||||
<dt> REJECT: hello SPF: softfail 550 domain in transition
|
||||
<dt> REJECT: hello SPF: neutral 550 access neither permitted nor denied
|
||||
<dd> message was rejected because there was an SPF policy for the
|
||||
HELO name, and it did not pass.
|
||||
|
||||
<dt> CBV: sender-17-44662668-643@bluepenmagic.com
|
||||
<dd> we performed a call back verification
|
||||
|
||||
<dt> dspam
|
||||
<dd> dspam identifier was added to the message
|
||||
|
||||
<dt> REJECT: spam from self: jsconnor.com
|
||||
<dd> message was reject because HELO was us (jsconnor.com)
|
||||
|
||||
<dt> INNOC: richh
|
||||
<dd> message was used to update richh's dspam dictionary
|
||||
|
||||
<dt> HONEYPOT: pooh@bwicorp.com
|
||||
<dd> message was sent to a honeypot address (pooh@bwicorp.com), the
|
||||
message was added to the honeypot dspam dictionary as spam
|
||||
|
||||
<dt> REJECT: numeric hello name: 63.217.19.146
|
||||
<dd> message was rejected because helo name was invalid (numeric)
|
||||
|
||||
<dt> eom
|
||||
<dd> message was successfully received
|
||||
|
||||
<dt> TEMPFAIL: CBV: 450 No MX servers available
|
||||
<dd> we tried to do a call back verification but could not look up
|
||||
MX record, we told the sender to try again later
|
||||
|
||||
<dt> CBV: info@emailpizzahut.com (cached)
|
||||
<dd> call back verification was needed, we had already done it recently
|
||||
|
||||
<dt> abort after 0 body chars
|
||||
<dd> sender hung up on us
|
||||
|
||||
<dt> REJECT: SPF fail 550 SPF fail: see
|
||||
http://openspf.com/why.html?sender=m.hendersonxk@163.net&ip=213.47.161.100
|
||||
<dd> message was reject because its sender's spf policy said to
|
||||
|
||||
<dt> REJECT: Subject: Cialis - No prescription needed!
|
||||
<dd> message was rejected because its subject contained a bad expression
|
||||
|
||||
<dt> REJECT: zombie PC at 192.168.3.37 sending MAIL FROM seajdr@amritind.com
|
||||
<dd> message was rejected because the connect ip was internal, but the
|
||||
sender was not. This is usually because a Windows PC is infected with
|
||||
malware.
|
||||
|
||||
<dt> X-Guessed-SPF: pass
|
||||
<dd> When the SPF result is NONE, we guess a result based on the generic
|
||||
SPF policy "v=spf1 a/24 mx/24 ptr".
|
||||
|
||||
<dt> DSPAM: tonyc tonyc@example.com
|
||||
<dd> message was sent to tonyc@example.com and it was identified as spam
|
||||
and placed in the tonyc dspam quarantine
|
||||
|
||||
<dt> REJECT: CBV: 550 calvinalstonis@ix.netcom.com...User unknown
|
||||
<dt> REJECT: CBV: 553 sorry, that domain isn't in my list
|
||||
<dt> REJECT: CBV: 554 delivery error: dd This user doesn't have an account
|
||||
<dd> message was rejected because call back verification gave us a fatal
|
||||
error
|
||||
<dt> Auto-Whitelist: user@example.com
|
||||
<dd> recipient has been added to auto_whitelist.log because the message
|
||||
was sent from an internal IP and the recipient is not internal.
|
||||
<dt> WHITELIST user@example.com
|
||||
<dd> message is whitelisted because sender appears in auto_whitelist.log
|
||||
<dt> BLACKLIST user@example.com
|
||||
<dd> message is blacklisted because sender appears in blacklist.log or
|
||||
failed a CBV test.
|
||||
<dt> TRAINSPAM: honeypot X-Dspam-Score: 0.002278
|
||||
<dd> message was used to train screener dictionary as spam
|
||||
<dt> TRAIN: honeypot X-Dspam-Score: 0.980203
|
||||
<dd> message was used to train screener dictionary as ham
|
||||
</dl>
|
||||
<br>
|
||||
@@ -1,53 +0,0 @@
|
||||
## @mainpage Writing Milters in Python
|
||||
#
|
||||
# At the lowest level, the <code>milter</code> module provides a thin wrapper
|
||||
# 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
|
||||
# recipients, the top level mail headers, and the message body. There are
|
||||
# options to mangle all of these components of the message as it passes through
|
||||
# the milter.
|
||||
#
|
||||
# At the next level, the <code>Milter</code> module (note the case difference)
|
||||
# provides a Python friendly object oriented wrapper for the low level API. To
|
||||
# use the Milter module, an application registers a 'factory' to create an
|
||||
# object for each connection from a MTA to sendmail. These connection objects
|
||||
# must provide methods corresponding to the libmilter callback events.
|
||||
#
|
||||
# Each event method returns a code to tell sendmail whether to proceed with
|
||||
# processing the message. This is a big advantage of milters over other mail
|
||||
# filtering systems. Unwanted mail can be stopped in its tracks at the
|
||||
# earliest possible point.
|
||||
#
|
||||
# The <code>Milter.Base</code> class provides default implementations for
|
||||
# event methods that do nothing, and also provides wrappers for the libmilter
|
||||
# methods to mutate the message. It automatically negotiates with MTA
|
||||
# which protocol steps need to be processed by the milter, based on
|
||||
# which callback methods are overridden.
|
||||
#
|
||||
# The <code>Milter.Milter</code> class provides an alternate default
|
||||
# implementation that logs the main milter events, but otherwise does nothing.
|
||||
# It is provided for compatibility.
|
||||
#
|
||||
# The <code>mime</code> module provides a wrapper for the Python email package
|
||||
# that fixes some bugs, and simplifies modifying selected parts of a MIME
|
||||
# message.
|
||||
#
|
||||
# @section threading
|
||||
#
|
||||
# The libmilter library which pymilter wraps
|
||||
# <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="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
|
||||
# confused. Threads may still be useful, but you may need to provide an
|
||||
# alternate means of causing graceful shutdown.
|
||||
#
|
||||
# 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 @ref milter-template.py.
|
||||
+264
@@ -0,0 +1,264 @@
|
||||
Title: Python Milters
|
||||
|
||||
<P ALIGN="CENTER"><A HREF="http://www.anybrowser.org/campaign/">
|
||||
<IMG SRC="http://bmsi.com/art/brain1.gif"
|
||||
ALT="Viewable With Any Browser" BORDER="0"></A>
|
||||
|
||||
<img src="http://bmsi.com/art/banner_4.gif" width="468" height="60" border="0"
|
||||
usemap="#banner_4" alt="Your vote?">
|
||||
<map name="banner_4">
|
||||
<area shape="rect" coords="330,25,426,59"
|
||||
href="http://education-survey.org/" alt="I Disagree">
|
||||
<area shape="rect" coords="234,28,304,57" href="http://www.honestEd.com/" alt="I Agree">
|
||||
</map>
|
||||
</P>
|
||||
|
||||
<table rules="none">
|
||||
<tr><td>
|
||||
<img src="Maxwells.gif" alt="Maxwell's Daemon: pymilter mascot" align="top">
|
||||
Mascot by <a href="http://alphard.ethz.ch/hafner/lebl.htm">Christian Hafner</a>
|
||||
</td>
|
||||
<td>
|
||||
<h1 align=center>Sendmail Milters in Python</h1>
|
||||
<h4 align=center>by <a href="mailto:%75%72%6D%61%6E%65%40%6E%65%75%72%61l%61%63%63%65%73%73%2E%63%6F%6D">Jim Niemira</a>
|
||||
and <a href="mailto:%73%74%75%61%72%74%40%62%6D%73%69%2E%63%6F%6D">
|
||||
Stuart D. Gathman</a><br>
|
||||
This web page is written by Stuart D. Gathman<br>and<br>sponsored by
|
||||
<a href="http://www.bmsi.com">Business Management Systems, Inc.</a> <br>
|
||||
Last updated Aug 26, 2008</h4>
|
||||
|
||||
See the <a href="faq.html">FAQ</a> | <a href="http://sourceforge.net/project/showfiles.php?group_id=139894">Download now</a> |
|
||||
<a href="http://bmsi.com/mailman/listinfo/pymilter">Subscribe to mailing list</a> |
|
||||
<a href="#overview">Overview</a> |
|
||||
<a href="/python/dspam.html">pydspam</a> |
|
||||
<a href="/libdspam/dspam.html">libdspam</a>
|
||||
<p>
|
||||
<a href="//www.python.org">
|
||||
<img src="python55.gif" align=left alt="A Python"></a>
|
||||
<a href="//www.sendmail.org/">Sendmail</a> introduced a
|
||||
<a href="https://www.milter.org/developers/api/index"> new API</a> beginning with version 8.10 -
|
||||
libmilter. The milter module for <a href="//www.python.org">Python</a>
|
||||
provides a python interface to libmilter that exploits all its features.
|
||||
<p>
|
||||
Sendmail 8.12 officially releases libmilter.
|
||||
Version 8.12 seems to be more robust, and includes new privilege
|
||||
separation features to enhance security. Even better, sendmail 8.13
|
||||
supports socket maps, which makes <a href="pysrs.html">pysrs</a> much more
|
||||
efficient and secure. Sendmail 8.14 finally supports modifying
|
||||
MAIL FROM via the milter API. Unfortunately, I haven't gotten around
|
||||
to supporting that yet in python milter.
|
||||
</td></tr>
|
||||
</table>
|
||||
|
||||
<h3><a name=overview>Overview</a></h3>
|
||||
|
||||
This package provides a robust toolkit for Python <a
|
||||
href="#milter">milters</a>, and the beginnings of a general purpose mail
|
||||
filtering system written in Python.
|
||||
<p>
|
||||
At the lowest level, the 'milter' module provides a thin wrapper 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
|
||||
<a href="http://www.cs.concordia.ca/~group/fig/public/email/relay/milter+ruleset-checks.html">process of sendmail receiving a message via SMTP</a>.
|
||||
These events include the initial connection from a MTA,
|
||||
the envelope sender and recipients, the top level mail headers, and
|
||||
the message body. There are options to mangle all of these components
|
||||
of the message as it passes through the milter.
|
||||
<p>
|
||||
At the next level, the 'Milter' module (note the case difference) provides a
|
||||
Python friendly object oriented wrapper for the low level API. To use the
|
||||
Milter module, an application registers a 'factory' to create an object
|
||||
for each connection from a MTA to sendmail. These connection objects
|
||||
must provide methods corresponding to the libmilter callback events.
|
||||
<p>
|
||||
Each event method returns a code to tell sendmail whether to proceed
|
||||
with processing the message. This is a big advantage of milters over
|
||||
other mail filtering systems. Unwanted mail can be stopped in its
|
||||
tracks at the earliest possible point.
|
||||
<p>
|
||||
The Milter.Milter class provides default implementations for event
|
||||
methods that
|
||||
do nothing, and also provides wrappers for the libmilter methods to mutate
|
||||
the message.
|
||||
<p>
|
||||
The 'spf' module provides an implementation of <a href="http://openspf.com">
|
||||
SPF</a> useful for detecting email forgery.
|
||||
<p>
|
||||
The 'mime' module provides a wrapper for the Python email package that
|
||||
fixes some bugs, and simplifies modifying selected parts of a MIME message.
|
||||
<p>
|
||||
Finally, the bms.py application is both a sample of how to use the
|
||||
Milter and spf modules, and the beginnings of a general purpose SPAM filtering,
|
||||
wiretapping, SPF checking, and Win32 virus protecting milter. It can
|
||||
make use of the <a href="pysrs.html">pysrs</a> package when available for
|
||||
SRS/SES checking and the <a href="dspam.html">pydspam</a> package for Bayesian
|
||||
content filtering. SPF checking
|
||||
requires <a href="http://pydns.sourceforge.net/">
|
||||
pydns</a>. Configuration documentation is currently included as comments
|
||||
in the <a href="milter.cfg">sample config file</a> for the bms.py milter.
|
||||
See also the <a href="HOWTO">HOWTO</a> and <a href="logmsgs.html">
|
||||
Milter Log Message Tags</a>.
|
||||
<p>
|
||||
Python milter is under GPL. The authors can probably be convinced to
|
||||
change this to LGPL if needed.
|
||||
|
||||
<h3>What is a <a name="milter">milter</a>?</h3>
|
||||
|
||||
Milters can run on the same machine as sendmail, or another machine. The
|
||||
milter can even run with a different operating system or processor than
|
||||
sendmail.
|
||||
Sendmail talks to the milter via a local or internet socket.
|
||||
Sendmail keeps the
|
||||
milter informed of events as it processes a mail connection. At any
|
||||
point, the milter can cut the conversation short by telling sendmail
|
||||
to ACCEPT, REJECT, or DISCARD the message. After receiving a complete
|
||||
message from sendmail, the milter can again REJECT or DISCARD it, but it
|
||||
can also ACCEPT it with changes to the headers or body.
|
||||
|
||||
<h3> What can you do with a milter? </h3>
|
||||
|
||||
<menu>
|
||||
<li> A milter can DISCARD or REJECT spam based based on algorithms scripted
|
||||
in python rather than sendmail's cryptic "cf" language.
|
||||
<li> A milter can alter or remove attachments from mail that are poisonous to
|
||||
Windows.
|
||||
<li> A milter can scan for viruses and clean them when detected.
|
||||
<li> A milter scans outgoing as well as incoming mail.
|
||||
<li> A milter can add and delete recipients to forward or secretly
|
||||
copy mail.
|
||||
<li> For more ideas, check the <a href="//www.milter.org">Milter Web Page</a>.
|
||||
</menu>
|
||||
|
||||
<a href="https://www.milter.org/developers/api/index">
|
||||
Documentation</a> for the C API is provided with sendmail. Miltermodule
|
||||
provides a thin python wrapper for the C API. Milter.py provides a simple
|
||||
OO wrapper on top of that.
|
||||
<p>
|
||||
The Python milter package includes a sample milter that replaces dangerous
|
||||
attachments with a warning message, discards mail addressed to
|
||||
MAILER-DAEMON, and demonstrates several SPAM abatement strategies.
|
||||
The MimeMessage class to do this used to be based on the
|
||||
<code>mimetools</code> and <code>multifile</code> standard python packages.
|
||||
As of milter version 0.6.0, it is based on the email standard
|
||||
python packages, which were derived from the
|
||||
<a href="http://sourceforge.net/projects/mimelib">mimelib</a> project.
|
||||
The MimeMessage class patches several bugs in the email package,
|
||||
and provides some backward compatibility.
|
||||
|
||||
<p>
|
||||
The "defang" function of the sample milter was inspired by
|
||||
<a href="http://www.roaringpenguin.com/mimedefang/">MIMEDefang</a>,
|
||||
a Perl milter with flexible attachment processing options. The latest
|
||||
version of MIMEDefang uses an apache style process pool to avoid reloading
|
||||
the Perl interpreter for each message. This makes it fast enough for
|
||||
production without using Perl threading.
|
||||
<p>
|
||||
<a href="http://sourceforge.net/projects/mailchecker">mailchecker</a> is
|
||||
a Python project to provide flexible attachment processing for mail. I
|
||||
will be looking at plugging mailchecker into a milter.
|
||||
<p>
|
||||
<a href="http://software.libertine.org/tmda/">TMDA</a> is a Python project
|
||||
to require confirmation the first time someone tries to send to your
|
||||
mailbox. This would be a nice feature to have in a milter.
|
||||
<p>
|
||||
There is also a <a href="http://www.milter.org/">Milter community website</a>
|
||||
where milter software and gory details of the API are discussed.
|
||||
|
||||
<h3> Is a milter written in python efficient? </h3>
|
||||
|
||||
The python milter process is multi-threaded and startup cost is incurred
|
||||
only once. This is much more efficient than some implementations that
|
||||
start a new interpreter for each connection. Testing in a production
|
||||
environment did not use a significant percentage of the CPU. Furthermore,
|
||||
python is easily extended in C for any step requiring expensive CPU
|
||||
processing.
|
||||
<p>
|
||||
For example, the HTML parsing feature to remove scripts from HTML attachments
|
||||
is rather CPU intensive in pure python. Using the C replacement for sgmllib
|
||||
greatly speeds things up.
|
||||
|
||||
<h3> Goals </h3>
|
||||
|
||||
<menu>
|
||||
<li> Implement RRS - a backdoor for non-SRS forwarders. User lists non-SRS
|
||||
forwarder accounts (perhaps in <code>~/.forwarders</code>), and a util
|
||||
provides a special local alias for the user to give to the forwarder.
|
||||
Alias only works for mail from that forwarder. Milter gets forwarder
|
||||
domain from alias and uses it to SPF check forwarder. Requires
|
||||
milter to have read access to <code>~/.forwarders</code> or else
|
||||
a way for user to submit entries to milter database.
|
||||
<li> The bms.py milter has too many features. Create a framework where
|
||||
numerous small feature modules can be plugged together in the
|
||||
configuration.
|
||||
<li> Create a pure python substitute for miltermodule and libmilter that
|
||||
implements the <a
|
||||
href="http://www.duh.org/cvsweb.cgi/~checkout~/pmilter/doc/milter-protocol.txt?rev=1">
|
||||
libmilter protocol</a> in python.
|
||||
<li> Find or write a faster implementation of sgmllib. The
|
||||
<a href="http://www.effbot.org/zone/sgmlop-index.htm">sgmlop package</a>
|
||||
is not very compatible with
|
||||
<a href="http://www.python.org/doc/2.1.3/lib/module-sgmllib.html">
|
||||
Python-2.1 sgmllib</a>, but it is a start, and is supported in
|
||||
milter-0.4.5 or later.
|
||||
<li> Implement all or most of the features of
|
||||
<a href="http://www.roaringpenguin.com/mimedefang/">MIMEDefang</a>.
|
||||
<li> Follow the official <a href="http://www.python.org/peps/pep-0008.html">
|
||||
Python coding standards</a> more closely.
|
||||
<li> Make unit test code more like other python modules.
|
||||
</menu>
|
||||
|
||||
<h3> Confirmed Installations </h3>
|
||||
|
||||
Please <a href="mailto:%73%74%75%61%72%74%40%62%6D%73%69%2E%63%6F%6D">email</a>
|
||||
me if you do <i>not</i> successfully install milter. The confirmed
|
||||
installations are too numerous to list at this point.
|
||||
|
||||
<h2> Enough Already! </h2>
|
||||
|
||||
Nearly a dozen people have emailed me begging for a feature to copy
|
||||
outgoing and/or incoming mail to a backup directory by user. Ok, it
|
||||
looks like this is a most requested feature for 0.5.6. In the meantime,
|
||||
here are some things to consider:
|
||||
<ul>
|
||||
<li> If you want to equivalent of a Bcc added to each message, this
|
||||
is very easy to do in the python code for bms.py. See below.
|
||||
<li> If you want to copy to a file in a directory (thus avoiding having to
|
||||
set up aliases), this is slightly more involved. The bms.py milter already
|
||||
copies the message to a temporary file for use in replacing the message body
|
||||
when banned attachments are found. You have to open a file, and copy the
|
||||
Mesage object to it in eom().
|
||||
<li> Finally, you are probably aware that most email clients already
|
||||
keep a copy of outgoing mail? Presumably there is a good reason for
|
||||
keeping another copy on the server.
|
||||
</ul>
|
||||
<p>
|
||||
To Bcc a message, call <code>self.add_recipient(rcpt)</code> in envfrom after
|
||||
determining whether you want to copy (e.g. whether the sender is local). For
|
||||
example,
|
||||
<pre>
|
||||
def envfrom(...
|
||||
...
|
||||
if len(t) == 2:
|
||||
self.rejectvirus = t[1] in reject_virus_from
|
||||
if t[0] in wiretap_users.get(t[1],()):
|
||||
self.add_recipient(wiretap_dest)
|
||||
if t[1] == 'mydomain.com':
|
||||
self.add_recipient('<copy-%s>' % t[0])
|
||||
...
|
||||
</pre>
|
||||
<p>
|
||||
To make this a generic feature requires thinking about how the configuration
|
||||
would look. Feel free to make specific suggestions about config file
|
||||
entries. Be sure to handle both Bcc and file copies, and designating what
|
||||
mail should be copied. How should "outgoing" be defined? Implementing it is
|
||||
easy once the configuration is designed.
|
||||
|
||||
|
||||
<hr>
|
||||
<p>
|
||||
<a href="http://validator.w3.org/check/referer">
|
||||
<img border=0 src="http://bmsi.com/vh32.png" alt=" [ Valid HTML 3.2! ] " height=31 width=88></a>
|
||||
<a href="http://www.redhat.com">
|
||||
<img src="http://bmsi.com/art/powered_by.gif" width="88" height="31" alt=" [ Powered By Red Hat Linux ] " border="0"></a>
|
||||
</p>
|
||||
-167
@@ -1,167 +0,0 @@
|
||||
# Document miltermodule for Doxygen
|
||||
#
|
||||
|
||||
## @package milter
|
||||
#
|
||||
# A thin wrapper around libmilter.
|
||||
#
|
||||
|
||||
## Hold context for a milter connection.
|
||||
# Each connection to sendmail creates a new <code>SMFICTX</code> struct within
|
||||
# libmilter. The milter module in turn creates a milterContext
|
||||
# tied to the <code>SMFICTX</code> struct via <code>smfi_setpriv</code>
|
||||
# to hold a PyThreadState and a user defined Python object for the connection.
|
||||
#
|
||||
# Most application interaction with libmilter takes places via
|
||||
# the milterContext object for the connection. It is passed to
|
||||
# callback functions as the first parameter.
|
||||
#
|
||||
# The <code>Milter</code> module creates a python class for each connection,
|
||||
# and converts function callbacks to instance method invocations.
|
||||
#
|
||||
class milterContext(object):
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_getsymval">smfi_getsymval</a>.
|
||||
def getsymval(self,sym): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_setreply">
|
||||
# smfi_setreply</a> or
|
||||
# <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="https://www.milter.org/developers/api/smfi_addheader">smfi_addheader</a>.
|
||||
def addheader(self,name,value,idx=-1): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_chgheader">smfi_chgheader</a>.
|
||||
def chgheader(self,name,idx,value): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_addrcpt">smfi_addrcpt</a>.
|
||||
def addrcpt(self,rcpt,params=None): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_delrcpt">smfi_delrcpt</a>.
|
||||
def delrcpt(self,rcpt): pass
|
||||
## 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="https://www.milter.org/developers/api/smfi_quarantine">smfi_quarantine</a>.
|
||||
def quarantine(self,reason): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_progress">smfi_progress</a>.
|
||||
def progress(self): pass
|
||||
## 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.
|
||||
def setsmlist(self,stage,macrolist): pass
|
||||
|
||||
class error(Exception): pass
|
||||
|
||||
## Enable optional milter actions.
|
||||
# Certain milter actions need to be enabled before calling main()
|
||||
# or they throw an exception. Pymilter enables them all by
|
||||
# default (since 0.9.2), but you may wish to disable unneeded
|
||||
# actions as an optimization.
|
||||
# @param flags Bit or mask of optional actions to enable
|
||||
def set_flags(flags): pass
|
||||
|
||||
def set_connect_callback(cb): pass
|
||||
def set_helo_callback(cb): pass
|
||||
def set_envfrom_callback(cb): pass
|
||||
def set_envrcpt_callback(cb): pass
|
||||
def set_header_callback(cb): pass
|
||||
def set_eoh_callback(cb): pass
|
||||
def set_body_callback(cb): pass
|
||||
def set_abort_callback(cb): pass
|
||||
def set_close_callback(cb): pass
|
||||
|
||||
## Sets the return code for untrapped Python exceptions during a callback.
|
||||
# Must be one of TEMPFAIL,REJECT,CONTINUE
|
||||
def set_exception_policy(code): pass
|
||||
|
||||
## Register python milter with libmilter.
|
||||
# The name we pass is used to identify the milter in the MTA configuration.
|
||||
# Callback functions must be set using the set_*_callback() functions before
|
||||
# registering the milter.
|
||||
# Three additional callbacks are specified as keyword parameters. These
|
||||
# were added by recent versions of libmilter. The keyword parameters is
|
||||
# a nicer way to do it, I think, since it makes clear that you have to do
|
||||
# it before registering. I may move all the callbacks
|
||||
# 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="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="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="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
|
||||
def opensocket(rmsock): pass
|
||||
|
||||
## Transfer control to libmilter.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_main">
|
||||
# smfi_main</a>.
|
||||
def main(): pass
|
||||
|
||||
## Set the libmilter debugging 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="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="https://www.milter.org/developers/api/smfi_setbacklog">
|
||||
# smfi_setbacklog</a>. Must be called before calling main().
|
||||
def setbacklog(n): pass
|
||||
|
||||
## Set the socket used to communicate with the MTA.
|
||||
# The MTA can communicate with the milter by means of a
|
||||
# unix, inet, or inet6 socket. By default, a unix domain socket
|
||||
# is used. It must not exist,
|
||||
# and sendmail will throw warnings if, eg, the file is under a
|
||||
# group or world writable directory.
|
||||
# <pre>
|
||||
# setconn('unix:/var/run/pythonfilter')
|
||||
# setconn('inet:8800') # listen on ANY interface
|
||||
# setconn('inet:7871@@publichost') # listen on a specific interface
|
||||
# setconn('inet6:8020')
|
||||
# </pre>
|
||||
def setconn(s): pass
|
||||
|
||||
## Stop the milter gracefully.
|
||||
def stop(): pass
|
||||
|
||||
## Retrieve diagnostic info.
|
||||
# Return a tuple with diagnostic info gathered by the milter module.
|
||||
# The first two fields are counts of milterContext objects created
|
||||
# and deleted. Additional fields may be added later.
|
||||
# @return a tuple of diagnostic data
|
||||
def getdiag(): pass
|
||||
|
||||
## Retrieve the runtime libmilter version.
|
||||
# Return the runtime libmilter version. This can be different
|
||||
# from the compile time version when sendmail or libmilter is upgraded
|
||||
# after pymilter is compiled.
|
||||
# @return a tuple of <code>(major,minor,patchlevel)</code>
|
||||
def getversion(): pass
|
||||
|
||||
## The compile time libmilter version.
|
||||
# Python code might need to deal with pymilter compiled
|
||||
# against various versions of libmilter. This module constant
|
||||
# contains the contents of the <code>SMFI_VERSION</code> macro when
|
||||
# the milter module was compiled.
|
||||
VERSION = 0x1000001
|
||||
+249
@@ -0,0 +1,249 @@
|
||||
Title: Python Milter Mail Policy
|
||||
|
||||
<h1> Python Milter Mail Policy </h1>
|
||||
|
||||
These are the policies implemented by the <code>bms.py</code> milter
|
||||
application. The milter and Milter modules do not implement any policies
|
||||
by themselves.
|
||||
|
||||
<h3> Classify connection </h3>
|
||||
|
||||
When the SMTP client connects, the connection IP address is
|
||||
saved for later verification, and the connection
|
||||
is classified as INTERNAL or EXTERNAL by matching the ip
|
||||
address against the <code>internal_connect</code> configuration.
|
||||
IP addresses with no PTR, and PTR names that look like
|
||||
the kind assigned to dynamic IPs (as determined by a heuristic
|
||||
algorithm) are flagged as DYNAMIC. IPs that match the
|
||||
<code>trusted_relay</code> configuration are flagged as TRUSTED.
|
||||
<p>
|
||||
Examples from the log file (<i>not</i> the SMTP error message returned):
|
||||
<pre>
|
||||
2005Jul29 13:56:53 [71207] connect from p50863492.dip0.t-ipconnect.de at ('80.134.52.146', 1858) EXTERNAL DYN
|
||||
2005Jul29 18:10:15 [74511] connect from foopub at ('1.2.3.4', 46513) EXTERNAL TRUSTED
|
||||
2005Jul29 14:41:00 [71805] connect from foobar at ('192.168.0.1', 41205) INTERNAL
|
||||
2005Jul29 14:41:15 [71806] connect from cncln.online.ln.cn at ('218.25.240.137', 35992) EXTERNAL
|
||||
</pre>
|
||||
<p>
|
||||
Certain obviously evil PTR names are blocked at this point:
|
||||
"localhost" (when IP is not 127.*) and ".".
|
||||
<pre>
|
||||
2005Jul29 14:49:50 [71918] connect from localhost at ('221.132.0.6', 50507) EXTERNAL
|
||||
2005Jul29 14:49:50 [71918] REJECT: PTR is localhost
|
||||
</pre>
|
||||
|
||||
<h3> HELO Check </h3>
|
||||
|
||||
The HELO name provided by the client is saved for later verification
|
||||
(for example by SPF). We could validate the HELO at this point
|
||||
by verifying that an A record for the HELO name matches the connect ip.
|
||||
However, currently we only block certain obvious problems.
|
||||
HELO names that look like an IP4 address
|
||||
and ones that match the <code>hello_blacklist</code> configuration
|
||||
are immediately rejected. The hello_blacklist typically contains
|
||||
the current MTAs own HELO name or email domains.
|
||||
Clients that attempt to skip HELO are immediately rejected.
|
||||
<pre>
|
||||
2005Jul29 18:10:15 [74512] hello from example.com
|
||||
2005Jul29 18:10:15 [74512] REJECT: spam from self: example.com
|
||||
2005Jul29 18:17:09 [74581] hello from 80.191.244.69
|
||||
2005Jul29 18:17:09 [74581] REJECT: numeric hello name: 80.191.244.69
|
||||
</pre>
|
||||
|
||||
<h3> MAIL FROM Check </h3>
|
||||
|
||||
Before calling our milter, sendmail checks a DNS blacklist to
|
||||
block banned sender domains. We never see a blocked domain.
|
||||
<p>
|
||||
The MAIL FROM address is saved for possible use by the smart-alias
|
||||
feature. First, the <code>internal_domains</code> is used for
|
||||
a simple screening if defined. If the MAIL FROM for an INTERNAL connection
|
||||
is NOT in <code>internal_domains</code>, then it is rejected (the
|
||||
PC is most likely infected and attempting to send out spam).
|
||||
If the MAIL FROM for an EXTERNAL connection IS in
|
||||
<code>internal_domains</code>, then the message is immediately rejected.
|
||||
This is quick and effective for most small company MTAs. For more
|
||||
complex mail networks, it is too simplistic, and should not be defined.
|
||||
SPF will handle the complex cases.
|
||||
|
||||
<h4> wiretap </h4>
|
||||
|
||||
The wiretap feature can screen and/or monitor mail to/from certain
|
||||
users. If the MAIL FROM is being wiretapped, the recipients are
|
||||
altered accordingly.
|
||||
|
||||
<!--table-stop-->
|
||||
|
||||
<h2> SPF check </h2>
|
||||
|
||||
The MAIL FROM, connect IP, and HELO name are checked against
|
||||
any SPF records published via DNS for the alleged sender (MAIL FROM)
|
||||
to determine the official SPF policy result.
|
||||
The offical SPF result is then logged in the Received-SPF header field,
|
||||
but certain results are subjected to further processing to create
|
||||
an effective result for policy purposes.
|
||||
<p>
|
||||
If the official result is 'none', we try to turn it into an effective result of
|
||||
'pass' or 'fail'. First, we check for a local substitute SPF record
|
||||
under the domain defined in the <code>[spf]delegate</code> configuration.
|
||||
It is often useful to add local SPF records for correspondents that are
|
||||
too clueless to add their own. If there is no local substitute, we use a "best
|
||||
guess" SPF record of "v=spf1 a/24 mx/24 ptr" for MAIL FROM or "v=spf1 a/24
|
||||
mx/24" for HELO. In addition, a HELO that is a subdomain of MAIL FROM and
|
||||
resolves to the connect IP results in an effective result of 'pass'.
|
||||
<p>
|
||||
If there is no local SPF record, and the effective result is still not
|
||||
'pass', we check for either a valid HELO name or a valid PTR record for
|
||||
the connect IP. A valid HELO or PTR cannot look like a dynamic name
|
||||
as determined by the heuristic in <code>Milter.dynip</code>.
|
||||
<p>
|
||||
If HELO has an SPF record, and the result is anything but pass, we reject
|
||||
the connection:
|
||||
<pre>
|
||||
2005Jul30 19:45:16 [93991] connect from [221.200.41.54] at ('221.200.41.54', 3581) EXTERNAL DYN
|
||||
2005Jul30 19:45:18 [93991] hello from adelphia.net
|
||||
2005Jul30 19:45:19 [93991] mail from <wendy.stubbsua@link-it.com> ()
|
||||
2005Jul30 19:45:19 [93991] REJECT: hello SPF: fail 550 access denied
|
||||
</pre>
|
||||
Note that HELO does not have any forwarding issues like MAIL FROM, and so
|
||||
any result other than 'pass' or 'none' should be treated like 'fail'.
|
||||
<p>
|
||||
Only if nothing about the SMTP envelope can be validated does the effective
|
||||
result remain 'none. I call this the "3 strikes" rule.
|
||||
<p>
|
||||
If the official result is 'permerror' (a syntax error in the sender's
|
||||
policy), we use the 'lax' option in pyspf to try various heuristics to guess
|
||||
what they really meant. For instance, the invalid mechanism "ip:1.2.3.4" is
|
||||
treated as "ip4:1.2.3.4". The result of lax processing is then used
|
||||
as the effective result for policy purposes.
|
||||
<p>
|
||||
With an effective SPF result in hand, we consult the sendmail access
|
||||
database to find our receiver policy for the sender.
|
||||
|
||||
<table border=1>
|
||||
<tr><th>REJECT</th><td>
|
||||
Reject the sender with a 550 5.7.1 SMTP code. The SMTP rejection
|
||||
includes a detailed description of the problem.
|
||||
</td></tr>
|
||||
<tr><th>CBV</th><td>
|
||||
Do a Call Back Validation by connecting to an MX of the sender
|
||||
and checking that using the sender as the RCPT TO is not rejected.
|
||||
We quit the CBV connection before actualling sending a message.
|
||||
If the CBV is rejected, our SMTP connection is rejected with the
|
||||
same error code and message. CBV results are cached.
|
||||
</td></tr>
|
||||
<tr><th>DSN</th><td>
|
||||
Do a Call Back Validation by connecting to an MX of the sender
|
||||
and checking that using the sender as the RCPT TO is not rejected.
|
||||
Unlike a CBV, we continue on to data and send a detailed message
|
||||
explaining the problem. This can be useful for reporting PermError
|
||||
or SoftFail to the sender. Keep in mind that for any result other
|
||||
than 'pass', the sender could be forged, and your DSN could annoy the
|
||||
wrong person. However, a SoftFail result is requesting such feedback
|
||||
for debugging and a PermError result needs to be fixed by the sender ASAP
|
||||
whether forged or not. DSN results are cached so that senders are
|
||||
annoyed only weekly.
|
||||
</td></tr>
|
||||
<tr><th>OK</th><td>
|
||||
Accept the sender. The message may still be rejected via reputation
|
||||
or content filtering.
|
||||
</td></tr>
|
||||
</table>
|
||||
|
||||
<h3> SPF policy syntax </h3>
|
||||
|
||||
First, the full sender is checked:
|
||||
<pre>
|
||||
SPF-Fail:abeb@adelphia.net DSN
|
||||
</pre>
|
||||
This says to accept mail from that adelphia.net user despite the
|
||||
SPF fail, but only after annoying them with a DSN about their ISP's broken
|
||||
policy.
|
||||
<p>
|
||||
If there is no match on the full sender, the domain is checked:
|
||||
<pre>
|
||||
SPF-Neutral:aol.com REJECT
|
||||
</pre>
|
||||
This says to reject mail from AOL with an SPF result of neutral.
|
||||
This means AOL users can't use their AOL address with another mail service
|
||||
to send us mail. This is good because the other mail service is
|
||||
likely a badly configured greeting card site or a virus.
|
||||
<p>
|
||||
Finally, a default policy for the result is checked. While there are program
|
||||
defaults, you should have defaults in the access database for SPF results:
|
||||
<pre>
|
||||
SPF-Neutral: CBV
|
||||
SPF-Softfail: DSN
|
||||
SPF-PermError: DSN
|
||||
SPF-TempError: REJECT
|
||||
SPF-None: REJECT
|
||||
SPF-Fail: REJECT
|
||||
SPF-Pass: OK
|
||||
</pre>
|
||||
|
||||
<h2> Reputation </h2>
|
||||
|
||||
If the sender has not been rejected by this point, and if a GOSSiP server is
|
||||
configured, we consult GOSSiP for the reputation score of the sender and
|
||||
SPF result. The score is a number from -100 to 100 with a confidence
|
||||
percentage from 0 to 100. A really bad reputation (less than -50 with
|
||||
confidence greater than 3) is rejected. Note that the reputation is tracked
|
||||
independently for each SPF result and sender combination. So aol.com:neutral
|
||||
might have a really bad reputation, while aol.com:pass would be ok.
|
||||
Furthermore, when a sender finally publishes an SPF policy and starts
|
||||
getting SPF pass, their reputation is effectively reset.
|
||||
|
||||
<h2> Whitelists and Blacklists </h2>
|
||||
|
||||
The administrator can whitelist or blacklist senders and sending domains by
|
||||
appending them to <code>${datadir}/auto_whitelist.log</code> or
|
||||
<code>${datadir}/blacklist.log</code> respectively. In addition,
|
||||
recipients of internal senders (except for automatic replies like vacation
|
||||
messages and return receipts) are automatically whitelisted for 60 days, and
|
||||
senders that fail CBV or DSN checks are automatically blacklisted for 30 days.
|
||||
Whitelisted and blacklisted senders are used to automatically train the
|
||||
bayesian content filter before being delivered or rejected, respectively.
|
||||
<p>
|
||||
Real Soon Now users will be able to maintain their own whitelist and
|
||||
blacklist that applies only when they are the recipient.
|
||||
|
||||
<h2> Content Filter </h2>
|
||||
|
||||
Most messages have been rejected or delivered by now, but spammers
|
||||
are always finding new places to send their junk from. For instance,
|
||||
we get around 10000 emails a day, of which around 500 are first time
|
||||
spam senders. A bayesian filter is trained by the whitelists and
|
||||
blacklists, and scores the message. What is likely spam is either
|
||||
rejected or quarantined. If the sender is an effective SPF pass,
|
||||
then they get a DSN notifying them that their message has been
|
||||
quarantined. (A DSN failure gets the sender auto blacklisted.)
|
||||
Else, if the reject_spam option is set, the message is rejected.
|
||||
Otherwise, a CBV is done (failure gets the sender auto blacklisted)
|
||||
and the message is silently quarantined.
|
||||
<p>
|
||||
Normally, you don't want email messages to silently disappear into
|
||||
a black hole, so you should set the reject_spam option. However,
|
||||
if you don't want your correspondent's email to get rejected, you can
|
||||
check your quarantine frequently instead.
|
||||
|
||||
<h3> Honeypot </h3>
|
||||
|
||||
You can also blacklist recipients by listing them as aliases of the
|
||||
'honeypot' dspam user. These are collectively called
|
||||
the honeypot. Any email to these recipients is used to train the
|
||||
spam filter as spam and chalk up a reputation demerit for the sender, then
|
||||
discarded. It might be a good idea to blacklist the sender if it has SPF pass
|
||||
as well, but I'm afraid of accidents.
|
||||
|
||||
<h3> Reputation </h3>
|
||||
|
||||
Reputation is tracked by sending domain and effective SPF result.
|
||||
The GOSSiP server tracks the spam/ham status of the last 1024 messages
|
||||
for each domain:result combination. When the server is queried during
|
||||
the SMTP envelope phase (MAIL FROM), it also queries any configured
|
||||
peers, and the scores are combined. Domains with a history of spam for
|
||||
a given SPF result are rejected at MAIL FROM. The GOSSiP system has
|
||||
a command line utility to reset (delete) a reputation for cases where a
|
||||
sender that was infected with malware is repaired. In addition,
|
||||
the confidence score of a reputation decays with time, so a bad sender
|
||||
will eventually be able to try again without manual intervention.
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
@@ -0,0 +1,99 @@
|
||||
Title: Requirements
|
||||
|
||||
<h2> Requirements </h2>
|
||||
|
||||
<menu>
|
||||
<li> While the miltermodule will work with python 1.5, you probably
|
||||
want to use python 2.0 or better. The python code uses a number of
|
||||
python 2 features. The email support requires python 2.4.
|
||||
<li> Python must be configured with thread support. This is because
|
||||
pymilter uses sendmail's libmilter which requires thread support.
|
||||
<li> You must compile sendmail with libmilter enabled. In versions of
|
||||
sendmail prior to 8.12 libmilter is marked FFR (For Future Release) and
|
||||
is not installed by default.
|
||||
Sendmail 8.12 still does not enable libmilter by default. You must
|
||||
explicitly select the "MILTER" option when compiling.
|
||||
<li> When compiling Python milter against sendmail versions earlier than
|
||||
8.13, you must set MAX_ML_REPLY to 1 in setup.py. There is no way to tell from
|
||||
the libmilter includes that smfi_setmlreply is not supported.
|
||||
<li> You probably want to use sendmail-8.13, since that supports multi-line
|
||||
SMTP error descriptions and SOCKETMAP. You want SOCKETMAP for use with
|
||||
pysrs.
|
||||
<li> Python milter has been tested against sendmail-8.11 through sendmail-8.13.
|
||||
<li> Python milter must be compiled for the specific version of sendmail
|
||||
it will run with. (Since the result is dynamically loaded, there could
|
||||
conceivably be multiple versions available and selected at startup - but
|
||||
that will have to wait.) This situation may only exist for sendmail
|
||||
versions prior to 8.12. The protocol seems designed for backward
|
||||
compatibility - and 8.12 is the first official milter release.
|
||||
<li> Mea Culpa! After reading the Python Style guide, I realize that
|
||||
my Python code is not up to snuff. Apparently mixed tabs and spaces
|
||||
are anathema to those using Windows editors, where tabs can be expanded using
|
||||
any arbitrary algorithm. Other than that, my
|
||||
intuition matched Guido's pretty well - although I like to indent by 2
|
||||
rather than 4. I will arrange to have tabs expanded to spaces when
|
||||
exporting new versions. Until then, beware!
|
||||
</menu>
|
||||
|
||||
<h3> <a name="aix4"> AIX 4.1.5 Requirements </a> </h3>
|
||||
To create sendmail RPMs for AIX, you can download my AIX 4.1.5 spec files
|
||||
for <a href="/aix/sendmail.spec">sendmail-8.11.5</a>
|
||||
or <a href="/aix/sendmail12.spec">sendmail-8.12.3</a>. If you have
|
||||
not already set it up, I use a <a href="/aix/aix.spec">dummy RPM package</a>
|
||||
to represent the stuff that comes with AIX. You might also want
|
||||
my <a href="/aix/python.spec">python-2.1.1</a> spec file for AIX. It
|
||||
does not include Tk or curses modules, sorry. If y'all trust me, you can
|
||||
download rpms for AIX 4.x from my <a href="/aix">AIX RPM directory</a>.
|
||||
<p>
|
||||
Sendmail-8.12 renames
|
||||
libsmutil.a to libsm.a. Unfortunately, libsm.a is an important AIX system
|
||||
shared library. Therefore, I rename libsm.a back to libsmutil.a for
|
||||
AIX. This presents a problem for setup.py.
|
||||
|
||||
<h3> <a name="rh72"> RedHat 7.2 Requirements </a> </h3>
|
||||
|
||||
If you are running Redhat 7.2, the distributed version of sendmail
|
||||
now enables libmilter by default. RedHat 7.2 bundles
|
||||
the development libraries with the main sendmail package, so
|
||||
there is no sendmail-devel package. However, they forgot to include the
|
||||
headers! So you'll have to get the SRPM and modify it. I suggest
|
||||
moving the static libs to a devel package and adding the headers. If
|
||||
this is too much trouble, you can get the <a href="mfapi.h">mfapi.h</a>
|
||||
header for sendmail-8.6.11 from here and manually install it as
|
||||
<code>/usr/include/libmilter/mfapi.h</code>.
|
||||
<p>
|
||||
If you do modify the SRPM, I suggest renaming libsmutil.a
|
||||
to libsm.a - just like sendmail-8.12 will. If you manually install
|
||||
mfapi.h or don't rename libsmutil.a, you'll
|
||||
need to force <code>libs = ["milter", "smutil"]</code> in setup.py.
|
||||
<p>
|
||||
If you have installed python2, and want
|
||||
python-milter to use python2, add <code>python=python2</code> to setup.cfg
|
||||
and build with <code>python2 setup.py bdist_rpm</code>.
|
||||
|
||||
<h3> <a name="rh62"> Redhat 6.2 Requirements </a> </h3>
|
||||
|
||||
If you are running Redhat 6.2, the distributed version of sendmail
|
||||
does not enable libmilter. You can download the Redhat 7.2 sendmail.spec
|
||||
modified to compile on RedHat 6.2:
|
||||
<a href="http://www.bmsi.com/linux/rh62/sendmail-rhmilter.spec">
|
||||
sendmail-rhmilter.spec</a>. The <a
|
||||
href="ftp://updates.redhat.com/7.0/en/os/SRPMS/sendmail-8.11.6-1.7.0.src.rpm">
|
||||
SRPM for sendmail-8.11.6</a> is available from
|
||||
<a href="http://www.redhat.com">Redhat</a> under
|
||||
<a href="http://www.redhat.com/support/errata/RHSA-2001-106.html">
|
||||
Errata for RH6.2</a>. But that doesn't include the latest security
|
||||
patches since RH6.2 is no longer supported.
|
||||
<p>
|
||||
If y'all trust me, you can pick up source and binary sendmail RPMs for RH6.2
|
||||
from my <a href="http://www.bmsi.com/linux/rh62">linux downloads</a> directory.
|
||||
The lastest RPMs were built by taking a RH7.2 SRPMS and removing some
|
||||
RPM features from the spec file that RH6.2 doesn't support, then
|
||||
recompiling on RH6.2. You can check this by installing the RH7.2 SRPM,
|
||||
then diffing my sendmail.spec with theirs. Then run
|
||||
"rpm -bb sendmail-rhmilter.spec" when you are satisfied.
|
||||
<p>
|
||||
If you have installed python2, and want
|
||||
python-milter to use python2, add <code>python=python2</code> to setup.cfg
|
||||
and build with <code>python2 setup.py bdist_rpm</code>.
|
||||
You'll need to install the sendmail-devel package to compile milter.
|
||||
@@ -1,15 +0,0 @@
|
||||
web:
|
||||
doxygen
|
||||
rsync -ravK doc/html/ spidey2.bmsi.com:/Public/pymilter
|
||||
|
||||
VERSION=0.9.5
|
||||
CVSTAG=pymilter-0_9_5
|
||||
PKG=pymilter-$(VERSION)
|
||||
SRCTAR=$(PKG).tar.gz
|
||||
|
||||
$(SRCTAR):
|
||||
cvs export -r$(CVSTAG) -d $(PKG) pymilter
|
||||
tar cvfz $(PKG).tar.gz $(PKG)
|
||||
rm -r $(PKG)
|
||||
|
||||
cvstar: $(SRCTAR)
|
||||
+7
-28
@@ -11,18 +11,11 @@ import Milter
|
||||
import StringIO
|
||||
import time
|
||||
import email
|
||||
import sys
|
||||
from socket import AF_INET, AF_INET6
|
||||
from Milter.utils import parse_addr
|
||||
if True:
|
||||
from multiprocessing import Process as Thread, Queue
|
||||
else:
|
||||
from threading import Thread
|
||||
from Queue import Queue
|
||||
from Milter import parse_addr
|
||||
|
||||
logq = Queue(maxsize=4)
|
||||
|
||||
class myMilter(Milter.Base):
|
||||
class myMilter(Milter.Milter):
|
||||
|
||||
def __init__(self): # A new instance with each new connection.
|
||||
self.id = Milter.uniqueID() # Integer incremented with each call.
|
||||
@@ -30,7 +23,6 @@ class myMilter(Milter.Base):
|
||||
# each connection runs in its own thread and has its own myMilter
|
||||
# instance. Python code must be thread safe. This is trivial if only stuff
|
||||
# in myMilter instances is referenced.
|
||||
@Milter.noreply
|
||||
def connect(self, IPname, family, hostaddr):
|
||||
# (self, 'ip068.subnet71.example.com', AF_INET, ('215.183.71.68', 4720) )
|
||||
# (self, 'ip6.mxout.example.com', AF_INET6,
|
||||
@@ -78,7 +70,6 @@ class myMilter(Milter.Base):
|
||||
|
||||
|
||||
## def envrcpt(self, to, *str):
|
||||
@Milter.noreply
|
||||
def envrcpt(self, recipient, *str):
|
||||
rcptinfo = to,Milter.dictfromlist(str)
|
||||
self.R.append(rcptinfo)
|
||||
@@ -86,21 +77,21 @@ class myMilter(Milter.Base):
|
||||
return Milter.CONTINUE
|
||||
|
||||
|
||||
@Milter.noreply
|
||||
def header(self, name, hval):
|
||||
self.fp.write("%s: %s\n" % (name,hval)) # add header to buffer
|
||||
return Milter.CONTINUE
|
||||
|
||||
@Milter.noreply
|
||||
|
||||
def eoh(self):
|
||||
self.fp.write("\n") # terminate headers
|
||||
return Milter.CONTINUE
|
||||
|
||||
@Milter.noreply
|
||||
|
||||
def body(self, chunk):
|
||||
self.fp.write(chunk)
|
||||
return Milter.CONTINUE
|
||||
|
||||
|
||||
def eom(self):
|
||||
self.fp.seek(0)
|
||||
msg = email.message_from_file(self.fp)
|
||||
@@ -123,25 +114,15 @@ class myMilter(Milter.Base):
|
||||
## === Support Functions ===
|
||||
|
||||
def log(self,*msg):
|
||||
logq.put((msg,self.id,time.time()))
|
||||
|
||||
def background():
|
||||
while True:
|
||||
t = logq.get()
|
||||
if not t: break
|
||||
msg,id,ts = t
|
||||
print "%s [%d]" % (time.strftime('%Y%b%d %H:%M:%S',time.localtime(ts)),id),
|
||||
print "%s [%d]" % (time.strftime('%Y%b%d %H:%M:%S'),self.id),
|
||||
# 2005Oct13 02:34:11 [1] msg1 msg2 msg3 ...
|
||||
for i in msg: print i,
|
||||
print
|
||||
|
||||
|
||||
## ===
|
||||
|
||||
def main():
|
||||
bt = Thread(target=background)
|
||||
bt.start()
|
||||
socketname = "/home/stuart/pythonsock"
|
||||
timeout = 600
|
||||
# Register to have the Milter factory create instances of your class:
|
||||
Milter.factory = myMilter
|
||||
flags = Milter.CHGBODY + Milter.CHGHDRS + Milter.ADDHDRS
|
||||
@@ -151,8 +132,6 @@ def main():
|
||||
print "%s milter startup" % time.strftime('%Y%b%d %H:%M:%S')
|
||||
sys.stdout.flush()
|
||||
Milter.runmilter("pythonfilter",socketname,timeout)
|
||||
logq.put(None)
|
||||
bt.join()
|
||||
print "%s bms milter shutdown" % time.strftime('%Y%b%d %H:%M:%S')
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
+18
-313
@@ -35,48 +35,6 @@ $ python setup.py help
|
||||
libraries=["milter","smutil","resolv"]
|
||||
|
||||
* $Log$
|
||||
* Revision 1.28 2011/06/08 23:13:48 customdesigned
|
||||
* Generate special exception when callback return not int.
|
||||
*
|
||||
* Revision 1.27 2009/07/28 21:45:54 customdesigned
|
||||
* Add getversion() to return runtime version.
|
||||
*
|
||||
* Revision 1.26 2009/07/28 21:08:20 customdesigned
|
||||
* Increment del count.
|
||||
*
|
||||
* Revision 1.25 2009/07/28 20:58:55 customdesigned
|
||||
* getdiag method
|
||||
*
|
||||
* Revision 1.24 2009/06/09 01:54:44 customdesigned
|
||||
* Forgot to initialize optional parameter.
|
||||
*
|
||||
* Revision 1.23 2009/05/29 20:44:58 customdesigned
|
||||
* Typo SMFIP_NO constants.
|
||||
*
|
||||
* Revision 1.22 2009/05/29 19:53:36 customdesigned
|
||||
* Typo SMFIS_ALL_OPTS
|
||||
*
|
||||
* Revision 1.21 2009/05/29 19:49:40 customdesigned
|
||||
* Typo calling helo instead of negotiate.
|
||||
*
|
||||
* Revision 1.20 2009/05/29 18:25:59 customdesigned
|
||||
* Null terminate keyword list.
|
||||
*
|
||||
* Revision 1.19 2009/05/28 18:36:42 customdesigned
|
||||
* Support new callbacks, including negotiate
|
||||
*
|
||||
* Revision 1.18 2009/05/21 21:53:05 customdesigned
|
||||
* First cut at support unknown, data, negotiate callbacks.
|
||||
*
|
||||
* Revision 1.17 2009/02/06 04:28:08 customdesigned
|
||||
* Oops! Missing options argument pointer for addrcpt.
|
||||
*
|
||||
* Revision 1.16 2008/12/16 04:21:05 customdesigned
|
||||
* Fedora release
|
||||
*
|
||||
* Revision 1.15 2008/12/13 20:29:56 customdesigned
|
||||
* Split off milter applications.
|
||||
*
|
||||
* Revision 1.14 2008/12/04 19:43:00 customdesigned
|
||||
* Doc updates.
|
||||
*
|
||||
@@ -274,6 +232,7 @@ $ python setup.py help
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
/* 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;
|
||||
@@ -286,44 +245,12 @@ static PyObject *body_callback = NULL;
|
||||
static PyObject *eom_callback = NULL;
|
||||
static PyObject *abort_callback = NULL;
|
||||
static PyObject *close_callback = NULL;
|
||||
#ifdef SMFIS_ALL_OPTS
|
||||
static PyObject *unknown_callback = NULL;
|
||||
static PyObject *data_callback = NULL;
|
||||
static PyObject *negotiate_callback = NULL;
|
||||
#endif
|
||||
static struct MilterCallback {
|
||||
PyObject **cbp;
|
||||
const char *name;
|
||||
} 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
|
||||
{ &unknown_callback,"unknown" },
|
||||
{ &data_callback,"data" },
|
||||
{ &negotiate_callback,"negotiate" },
|
||||
#endif
|
||||
{ NULL, NULL }
|
||||
};
|
||||
|
||||
staticforward struct smfiDesc description; /* forward declaration */
|
||||
|
||||
static PyObject *MilterError;
|
||||
/* The interpreter instance that called milter.main */
|
||||
static PyInterpreterState *interp;
|
||||
typedef struct {
|
||||
unsigned int contextNew;
|
||||
unsigned int contextDel;
|
||||
} milter_Diag;
|
||||
|
||||
static milter_Diag diag;
|
||||
|
||||
staticforward PyTypeObject milter_ContextType;
|
||||
|
||||
@@ -362,7 +289,6 @@ _get_context(SMFICTX *ctx) {
|
||||
PyThreadState_Delete(t);
|
||||
return NULL;
|
||||
}
|
||||
++diag.contextNew;
|
||||
self->t = t;
|
||||
self->ctx = ctx;
|
||||
Py_INCREF(Py_None);
|
||||
@@ -401,7 +327,6 @@ milter_Context_dealloc(PyObject *s) {
|
||||
}
|
||||
Py_DECREF(self->priv);
|
||||
PyObject_DEL(self);
|
||||
++diag.contextDel;
|
||||
}
|
||||
|
||||
/* Throw an exception if an smfi call failed, otherwise return PyNone. */
|
||||
@@ -450,7 +375,7 @@ generic_set_callback(PyObject *args,char *t,PyObject **cb) {
|
||||
callback = 0;
|
||||
else {
|
||||
if (!PyCallable_Check(callback)) {
|
||||
PyErr_SetString(PyExc_TypeError, "callback parameter must be callable");
|
||||
PyErr_SetString(PyExc_TypeError, "parameter must be callable");
|
||||
return NULL;
|
||||
}
|
||||
Py_INCREF(callback);
|
||||
@@ -662,23 +587,9 @@ _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 (!PyInt_Check(result)) {
|
||||
const struct MilterCallback *p;
|
||||
const char *cbname = "milter";
|
||||
char buf[40];
|
||||
Py_DECREF(result);
|
||||
for (p = callback_names; p->cbp; ++p) {
|
||||
if (cb == *p->cbp) {
|
||||
cbname = p->name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
sprintf(buf,"The %s callback must return int",cbname);
|
||||
PyErr_SetString(MilterError,buf);
|
||||
return _report_exception(self);
|
||||
}
|
||||
retval = PyInt_AS_LONG(result);
|
||||
retval = PyInt_AsLong(result);
|
||||
Py_DECREF(result);
|
||||
if (PyErr_Occurred()) return _report_exception(self);
|
||||
_release_thread(self->t);
|
||||
return retval;
|
||||
}
|
||||
@@ -866,83 +777,6 @@ milter_wrap_abort(SMFICTX *ctx) {
|
||||
return generic_noarg_wrapper(ctx,abort_callback);
|
||||
}
|
||||
|
||||
#ifdef SMFIS_ALL_OPTS
|
||||
static int
|
||||
milter_wrap_unknown(SMFICTX *ctx, const char *cmd) {
|
||||
PyObject *arglist;
|
||||
milter_ContextObject *c;
|
||||
|
||||
if (unknown_callback == NULL) return SMFIS_CONTINUE;
|
||||
c = _get_context(ctx);
|
||||
if (!c) return SMFIS_TEMPFAIL;
|
||||
arglist = Py_BuildValue("(Os)", c, cmd);
|
||||
return _generic_wrapper(c, unknown_callback, arglist);
|
||||
}
|
||||
|
||||
static int
|
||||
milter_wrap_data(SMFICTX *ctx) {
|
||||
return generic_noarg_wrapper(ctx,data_callback);
|
||||
}
|
||||
|
||||
static int
|
||||
milter_wrap_negotiate(SMFICTX *ctx,
|
||||
unsigned long f0,
|
||||
unsigned long f1,
|
||||
unsigned long f2,
|
||||
unsigned long f3,
|
||||
unsigned long *pf0,
|
||||
unsigned long *pf1,
|
||||
unsigned long *pf2,
|
||||
unsigned long *pf3) {
|
||||
PyObject *arglist, *optlist;
|
||||
milter_ContextObject *c;
|
||||
int rc;
|
||||
|
||||
if (negotiate_callback == NULL) return SMFIS_ALL_OPTS;
|
||||
c = _get_context(ctx);
|
||||
if (!c)
|
||||
return SMFIS_REJECT; // do not contact us again for current connection
|
||||
optlist = Py_BuildValue("[kkkk]",f0,f1,f2,f3);
|
||||
if (optlist == NULL)
|
||||
arglist = NULL;
|
||||
else
|
||||
arglist = Py_BuildValue("(OO)", c, optlist);
|
||||
PyThreadState *t = c->t;
|
||||
c->t = 0; // do not release thread in _generic_wrapper
|
||||
rc = _generic_wrapper(c, negotiate_callback, arglist);
|
||||
c->t = t;
|
||||
if (rc == SMFIS_CONTINUE) {
|
||||
#if 0 // PyArgs_Parse deprecated and going away
|
||||
if (!PyArgs_Parse(optlist,"[kkkk]",pf0,pf1,pf2,pf3)) {
|
||||
PyErr_Print();
|
||||
PyErr_Clear(); /* must clear since not returning to python */
|
||||
rc = SMFIS_REJECT;
|
||||
}
|
||||
#else
|
||||
unsigned long *pa[4] = { pf0,pf1,pf2,pf3 };
|
||||
unsigned long fa[4] = { f0,f1,f2,f3 };
|
||||
int len = PyList_Size(optlist);
|
||||
int i;
|
||||
for (i = 0; i < 4; ++i) {
|
||||
*pa[i] = (i <= len)
|
||||
? PyInt_AsUnsignedLongMask(PyList_GET_ITEM(optlist,i))
|
||||
: fa[i];
|
||||
}
|
||||
if (PyErr_Occurred()) {
|
||||
PyErr_Print();
|
||||
PyErr_Clear();
|
||||
rc = SMFIS_REJECT;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else if (rc != SMFIS_ALL_OPTS)
|
||||
rc = SMFIS_REJECT;
|
||||
Py_DECREF(optlist);
|
||||
_release_thread(t);
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int
|
||||
milter_wrap_close(SMFICTX *ctx) {
|
||||
/* xxfi_close can be called out of order - even before connect.
|
||||
@@ -974,61 +808,15 @@ milter_wrap_close(SMFICTX *ctx) {
|
||||
}
|
||||
|
||||
static char milter_register__doc__[] =
|
||||
"register(name,unknown=,data=,negotiate=) -> None\n\
|
||||
"register(name) -> None\n\
|
||||
Registers the milter name with current callbacks, and flags.\n\
|
||||
Required before main() is called.";
|
||||
|
||||
static PyObject *
|
||||
milter_register(PyObject *self, PyObject *args, PyObject *kwds) {
|
||||
static char *kwlist[] = { "name","unknown","data","negotiate", NULL };
|
||||
static PyObject** const cbp[3] =
|
||||
{ &unknown_callback, &data_callback, &negotiate_callback };
|
||||
PyObject *cb[3] = { NULL, NULL, NULL };
|
||||
int i;
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|OOO:register", kwlist,
|
||||
&description.xxfi_name, &cb[0],&cb[1],&cb[2]))
|
||||
return NULL;
|
||||
for (i = 0; i < 3; ++i) {
|
||||
PyObject *callback = cb[i];
|
||||
if (callback != NULL && callback != Py_None) {
|
||||
if (!PyCallable_Check(callback)) {
|
||||
char err[80];
|
||||
sprintf(err,"%s parameter must be callable",kwlist[i]);
|
||||
PyErr_SetString(PyExc_TypeError, err);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (i = 0; i < 3; ++i) {
|
||||
PyObject *callback = cb[i];
|
||||
if (callback != NULL) { // if keyword specified
|
||||
if (callback == Py_None) {
|
||||
callback = NULL;
|
||||
}
|
||||
else {
|
||||
Py_INCREF(callback);
|
||||
}
|
||||
PyObject *oldval = *cbp[i];
|
||||
*cbp[i] = callback;
|
||||
if (oldval) {
|
||||
Py_DECREF(oldval);
|
||||
}
|
||||
}
|
||||
}
|
||||
return _generic_return(smfi_register(description), "cannot register");
|
||||
}
|
||||
|
||||
static char milter_opensocket__doc__[] =
|
||||
"opensocket(rmsock) -> None\n\
|
||||
Attempts to create and open the socket provided with setconn.\n\
|
||||
Removes the socket first if rmsock is True.";
|
||||
|
||||
static PyObject *
|
||||
milter_opensocket(PyObject *self, PyObject *args) {
|
||||
char rmsock = 0;
|
||||
if (!PyArg_ParseTuple(args, "b:opensocket", &rmsock))
|
||||
milter_register(PyObject *self, PyObject *args) {
|
||||
if (!PyArg_ParseTuple(args, "s:register", &description.xxfi_name))
|
||||
return NULL;
|
||||
return _generic_return(smfi_opensocket(rmsock), "cannot opensocket");
|
||||
return _generic_return(smfi_register(description), "cannot register");
|
||||
}
|
||||
|
||||
static char milter_main__doc__[] =
|
||||
@@ -1124,30 +912,6 @@ milter_stop(PyObject *self, PyObject *args) {
|
||||
return _thread_return(t,smfi_stop(), "cannot stop");
|
||||
}
|
||||
|
||||
static char milter_getdiag__doc__[] =
|
||||
"getdiag() -> tuple\n\
|
||||
Return a tuple of diagnostic data. The first two items are context new\n\
|
||||
count and context del count. The rest are yet to be defined.";
|
||||
static PyObject *
|
||||
milter_getdiag(PyObject *self, PyObject *args) {
|
||||
if (!PyArg_ParseTuple(args, ":getdiag")) return NULL;
|
||||
return Py_BuildValue("(kk)", diag.contextNew,diag.contextDel);
|
||||
}
|
||||
|
||||
static char milter_getversion__doc__[] =
|
||||
"getversion() -> tuple\n\
|
||||
Return runtime libmilter version as a tuple of major,minor,patchlevel.";
|
||||
static PyObject *
|
||||
milter_getversion(PyObject *self, PyObject *args) {
|
||||
unsigned int major, minor, patch;
|
||||
if (!PyArg_ParseTuple(args, ":getversion")) return NULL;
|
||||
if (smfi_version(&major,&minor,&patch) != MI_SUCCESS) {
|
||||
PyErr_SetString(MilterError, "smfi_version failed");
|
||||
return NULL;
|
||||
}
|
||||
return Py_BuildValue("(kkk)", major,minor,patch);
|
||||
}
|
||||
|
||||
static char milter_getsymval__doc__[] =
|
||||
"getsymval(String) -> String\n\
|
||||
Returns a symbol's value. Context-dependent, and unclear from the dox.";
|
||||
@@ -1273,7 +1037,7 @@ This function can only be called from the EOM callback.";
|
||||
static PyObject *
|
||||
milter_chgfrom(PyObject *self, PyObject *args) {
|
||||
char *sender;
|
||||
char *params = NULL;
|
||||
char *params;
|
||||
SMFICTX *ctx;
|
||||
PyThreadState *t;
|
||||
|
||||
@@ -1330,7 +1094,7 @@ milter_addrcpt(PyObject *self, PyObject *args) {
|
||||
PyThreadState *t;
|
||||
int rc;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "s|z:addrcpt", &rcpt, ¶ms)) return NULL;
|
||||
if (!PyArg_ParseTuple(args, "s|z:addrcpt", &rcpt)) return NULL;
|
||||
ctx = _find_context(self);
|
||||
if (ctx == NULL) return NULL;
|
||||
t = PyEval_SaveThread();
|
||||
@@ -1360,7 +1124,8 @@ milter_delrcpt(PyObject *self, PyObject *args) {
|
||||
ctx = _find_context(self);
|
||||
if (ctx == NULL) return NULL;
|
||||
t = PyEval_SaveThread();
|
||||
return _thread_return(t,smfi_delrcpt(ctx, rcpt), "cannot delete recipient");
|
||||
return _thread_return(t,smfi_delrcpt(ctx, rcpt),
|
||||
"cannot delete recipient");
|
||||
}
|
||||
|
||||
static char milter_replacebody__doc__[] =
|
||||
@@ -1381,8 +1146,8 @@ milter_replacebody(PyObject *self, PyObject *args) {
|
||||
ctx = _find_context(self);
|
||||
if (ctx == NULL) return NULL;
|
||||
t = PyEval_SaveThread();
|
||||
return _thread_return(t,smfi_replacebody(ctx,
|
||||
(unsigned char *)bodyp, bodylen), "cannot replace message body");
|
||||
return _thread_return(t,smfi_replacebody(ctx, bodyp, bodylen),
|
||||
"cannot replace message body");
|
||||
}
|
||||
|
||||
static char milter_setpriv__doc__[] =
|
||||
@@ -1467,27 +1232,6 @@ milter_progress(PyObject *self, PyObject *args) {
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef SMFIF_SETSMLIST
|
||||
static char milter_setsmlist__doc__[] =
|
||||
"setsmlist(stage,macrolist) -> None\n\
|
||||
Tell the MTA which macro values we are interested in for a given stage";
|
||||
|
||||
static PyObject *
|
||||
milter_setsmlist(PyObject *self, PyObject *args) {
|
||||
SMFICTX *ctx;
|
||||
PyThreadState *t;
|
||||
int stage = 0;
|
||||
char *smlist = 0;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "is:setsmlist",&stage, &smlist)) return NULL;
|
||||
ctx = _find_context(self);
|
||||
if (ctx == NULL) return NULL;
|
||||
t = PyEval_SaveThread();
|
||||
return _thread_return(t,smfi_setsmlist(ctx,stage,smlist),
|
||||
"cannot set macro list");
|
||||
}
|
||||
#endif
|
||||
|
||||
static PyMethodDef context_methods[] = {
|
||||
{ "getsymval", milter_getsymval, METH_VARARGS, milter_getsymval__doc__},
|
||||
{ "setreply", milter_setreply, METH_VARARGS, milter_setreply__doc__},
|
||||
@@ -1506,9 +1250,6 @@ static PyMethodDef context_methods[] = {
|
||||
#endif
|
||||
#ifdef SMFIF_CHGFROM
|
||||
{ "chgfrom", milter_chgfrom, METH_VARARGS, milter_chgfrom__doc__},
|
||||
#endif
|
||||
#ifdef SMFIF_SETSMLIST
|
||||
{ "setsmlist", milter_setsmlist, METH_VARARGS, milter_setsmlist__doc__},
|
||||
#endif
|
||||
{ NULL, NULL }
|
||||
};
|
||||
@@ -1531,12 +1272,7 @@ static struct smfiDesc description = { /* Set some reasonable defaults */
|
||||
milter_wrap_body,
|
||||
milter_wrap_eom,
|
||||
milter_wrap_abort,
|
||||
milter_wrap_close,
|
||||
#ifdef SMFIS_ALL_OPTS
|
||||
milter_wrap_unknown,
|
||||
milter_wrap_data,
|
||||
milter_wrap_negotiate
|
||||
#endif
|
||||
milter_wrap_close
|
||||
};
|
||||
|
||||
static PyMethodDef milter_methods[] = {
|
||||
@@ -1551,17 +1287,15 @@ static PyMethodDef milter_methods[] = {
|
||||
{ "set_eom_callback", milter_set_eom_callback, METH_VARARGS, milter_set_eom_callback__doc__},
|
||||
{ "set_abort_callback", milter_set_abort_callback, METH_VARARGS, milter_set_abort_callback__doc__},
|
||||
{ "set_close_callback", milter_set_close_callback, METH_VARARGS, milter_set_close_callback__doc__},
|
||||
{ "set_exception_policy", milter_set_exception_policy, METH_VARARGS, milter_set_exception_policy__doc__},
|
||||
{ "register", (PyCFunction)milter_register,METH_VARARGS|METH_KEYWORDS, milter_register__doc__},
|
||||
{ "opensocket", milter_opensocket, METH_VARARGS, milter_opensocket__doc__},
|
||||
{ "set_exception_policy", milter_set_exception_policy,METH_VARARGS, milter_set_exception_policy__doc__},
|
||||
{ "register", milter_register, METH_VARARGS, milter_register__doc__},
|
||||
{ "register", milter_register, METH_VARARGS, milter_register__doc__},
|
||||
{ "main", milter_main, METH_VARARGS, milter_main__doc__},
|
||||
{ "setdbg", milter_setdbg, METH_VARARGS, milter_setdbg__doc__},
|
||||
{ "settimeout", milter_settimeout, METH_VARARGS, milter_settimeout__doc__},
|
||||
{ "setbacklog", milter_setbacklog, METH_VARARGS, milter_setbacklog__doc__},
|
||||
{ "setconn", milter_setconn, METH_VARARGS, milter_setconn__doc__},
|
||||
{ "stop", milter_stop, METH_VARARGS, milter_stop__doc__},
|
||||
{ "getdiag", milter_getdiag, METH_VARARGS, milter_getdiag__doc__},
|
||||
{ "getversion", milter_getversion, METH_VARARGS, milter_getversion__doc__},
|
||||
{ NULL, NULL }
|
||||
};
|
||||
|
||||
@@ -1630,35 +1364,6 @@ initmilter(void) {
|
||||
#endif
|
||||
#ifdef SMFIF_CHGFROM
|
||||
setitem(d,"CHGFROM",SMFIF_CHGFROM);
|
||||
#endif
|
||||
#ifdef SMFIF_SETSMLIST
|
||||
setitem(d,"SETSMLIST",SMFIF_SETSMLIST);
|
||||
#endif
|
||||
#ifdef SMFIS_ALL_OPTS
|
||||
setitem(d,"P_RCPT_REJ",SMFIP_RCPT_REJ);
|
||||
setitem(d,"P_NR_CONN",SMFIP_NR_CONN);
|
||||
setitem(d,"P_NR_HELO",SMFIP_NR_HELO);
|
||||
setitem(d,"P_NR_MAIL",SMFIP_NR_MAIL);
|
||||
setitem(d,"P_NR_RCPT",SMFIP_NR_RCPT);
|
||||
setitem(d,"P_NR_DATA",SMFIP_NR_DATA);
|
||||
setitem(d,"P_NR_UNKN",SMFIP_NR_UNKN);
|
||||
setitem(d,"P_NR_EOH",SMFIP_NR_EOH);
|
||||
setitem(d,"P_NR_BODY",SMFIP_NR_BODY);
|
||||
setitem(d,"P_NR_HDR",SMFIP_NR_HDR);
|
||||
setitem(d,"P_NOCONNECT",SMFIP_NOCONNECT);
|
||||
setitem(d,"P_NOHELO",SMFIP_NOHELO);
|
||||
setitem(d,"P_NOMAIL",SMFIP_NOMAIL);
|
||||
setitem(d,"P_NORCPT",SMFIP_NORCPT);
|
||||
setitem(d,"P_NODATA",SMFIP_NODATA);
|
||||
setitem(d,"P_NOUNKNOWN",SMFIP_NOUNKNOWN);
|
||||
setitem(d,"P_NOEOH",SMFIP_NOEOH);
|
||||
setitem(d,"P_NOBODY",SMFIP_NOBODY);
|
||||
setitem(d,"P_NOHDRS",SMFIP_NOHDRS);
|
||||
setitem(d,"P_HDR_LEADSPC",SMFIP_HDR_LEADSPC);
|
||||
setitem(d,"P_SKIP",SMFIP_SKIP);
|
||||
setitem(d,"ALL_OPTS",SMFIS_ALL_OPTS);
|
||||
setitem(d,"SKIP",SMFIS_SKIP);
|
||||
setitem(d,"NOREPLY",SMFIS_NOREPLY);
|
||||
#endif
|
||||
setitem(d,"CONTINUE", SMFIS_CONTINUE);
|
||||
setitem(d,"REJECT", SMFIS_REJECT);
|
||||
|
||||
@@ -1,10 +1,4 @@
|
||||
# $Log$
|
||||
# Revision 1.6 2009/06/09 03:13:13 customdesigned
|
||||
# More doxygen docs.
|
||||
#
|
||||
# Revision 1.5 2005/07/20 14:49:43 customdesigned
|
||||
# Handle corrupt and empty ZIP files.
|
||||
#
|
||||
# Revision 1.4 2005/06/17 01:49:39 customdesigned
|
||||
# Handle zip within zip.
|
||||
#
|
||||
@@ -76,12 +70,8 @@
|
||||
# with old milter code.
|
||||
#
|
||||
|
||||
## @package mime
|
||||
# This module provides a "defang" function to replace naughty attachments.
|
||||
#
|
||||
# We also provide workarounds for bugs in the email module that comes
|
||||
# with python. The "bugs" fixed mostly come up only with malformed
|
||||
# messages - but that is what you have when dealing with spam.
|
||||
# This module provides a "defang" function to replace naughty attachments
|
||||
# with a warning message.
|
||||
|
||||
# Author: Stuart D. Gathman <stuart@bmsi.com>
|
||||
# Copyright 2001,2002,2003,2004,2005 Business Management Systems, Inc.
|
||||
@@ -103,8 +93,6 @@ from email import Errors
|
||||
|
||||
from types import ListType,StringType
|
||||
|
||||
## Return a list of filenames in a zip file.
|
||||
# Embedded zip files are recursively expanded.
|
||||
def zipnames(txt):
|
||||
fp = StringIO.StringIO(txt)
|
||||
zipf = zipfile.ZipFile(fp,'r')
|
||||
@@ -115,8 +103,6 @@ def zipnames(txt):
|
||||
names += zipnames(zipf.read(nm))
|
||||
return names
|
||||
|
||||
## Fix multipart handling in email.Generator.
|
||||
#
|
||||
class MimeGenerator(Generator):
|
||||
def _dispatch(self, msg):
|
||||
# Get the Content-Type: for the message, then try to dispatch to
|
||||
@@ -156,9 +142,12 @@ def _unquotevalue(value):
|
||||
|
||||
from email.Message import _parseparam
|
||||
|
||||
## Enhance email.Message
|
||||
#
|
||||
# Tracks modifications to headers of body or any part independently.
|
||||
# Enhance email.Message
|
||||
# - Provide a headerchange event for integration with Milter
|
||||
# Headerchange attribute can be assigned a function to be called when
|
||||
# changing headers. The signature is:
|
||||
# headerchange(msg,name,value) -> None
|
||||
# - Track modifications to headers of body or any part independently
|
||||
|
||||
class MimeMessage(Message):
|
||||
"""Version of email.Message.Message compatible with old mime module
|
||||
@@ -169,12 +158,6 @@ class MimeMessage(Message):
|
||||
self.submsg = None
|
||||
self.modified = False
|
||||
|
||||
## @var headerchange
|
||||
# Provide a headerchange event for integration with Milter.
|
||||
# The headerchange attribute can be assigned a function to be called when
|
||||
# changing headers. The signature is:
|
||||
# headerchange(msg,name,value) -> None
|
||||
|
||||
def get_param(self, param, failobj=None, header='content-type', unquote=True):
|
||||
val = Message.get_param(self,param,failobj,header,unquote)
|
||||
if val != failobj and param == 'boundary' and unquote:
|
||||
|
||||
+42
-84
@@ -1,24 +1,23 @@
|
||||
%define __python python2.6
|
||||
%define pythonbase python26
|
||||
|
||||
%define __python python2.4
|
||||
%define version 0.8.12
|
||||
%define release 1%{?dist}.py24
|
||||
%define libdir %{_libdir}/pymilter
|
||||
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
%define name pymilter
|
||||
%define redhat7 0
|
||||
|
||||
Summary: Python interface to sendmail milter API
|
||||
Name: %{pythonbase}-pymilter
|
||||
Version: 0.9.5
|
||||
Release: 1%{dist}
|
||||
Source: http://downloads.sourceforge.net/pymilter/pymilter-%{version}.tar.gz
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
#Patch: %{name}-%{version}.patch
|
||||
License: GPLv2+
|
||||
Group: Development/Libraries
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRoot: %{_tmppath}/%{name}-buildroot
|
||||
Vendor: Stuart D. Gathman <stuart@bmsi.com>
|
||||
Url: http://www.bmsi.com/python/milter.html
|
||||
# python-2.6.4 gets RuntimeError: not holding the import lock
|
||||
Requires: %{pythonbase} >= 2.6.5, sendmail >= 8.13
|
||||
# Need python2.6 specific pydns, not the version for system python
|
||||
Requires: %{pythonbase}-pydns
|
||||
# Needed for callbacks, not a core function but highly useful for milters
|
||||
BuildRequires: ed, %{pythonbase}-devel, sendmail-devel >= 8.13
|
||||
Requires: %{__python} >= 2.4, sendmail >= 8.13
|
||||
BuildRequires: %{__python}-devel >= 2.4, sendmail-devel >= 8.13
|
||||
|
||||
%description
|
||||
This is a python extension module to enable python scripts to
|
||||
@@ -27,31 +26,31 @@ modules provide for navigating and modifying MIME parts, sending
|
||||
DSNs, and doing CBV.
|
||||
|
||||
%prep
|
||||
%setup -q -n pymilter-%{version}
|
||||
%setup -q
|
||||
#patch -p0 -b .bms
|
||||
|
||||
%build
|
||||
env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
|
||||
%if %{redhat7}
|
||||
LDFLAGS="-s"
|
||||
%else # Redhat builds debug packages after 7.3
|
||||
LDFLAGS="-g"
|
||||
%endif
|
||||
env CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$LDFLAGS" %{__python} setup.py build
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%{__python} setup.py install --root=$RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/milter
|
||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/milter
|
||||
%{__python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
|
||||
mkdir -p $RPM_BUILD_ROOT/var/run/milter
|
||||
mkdir -p $RPM_BUILD_ROOT%{libdir}
|
||||
%ifos aix4.1
|
||||
cat >$RPM_BUILD_ROOT%{libdir}/start.sh <<'EOF'
|
||||
#!/bin/sh
|
||||
cd /var/log/milter
|
||||
exec /usr/local/bin/python bms.py >>milter.log 2>&1
|
||||
EOF
|
||||
%else # not aix4.1
|
||||
cp start.sh $RPM_BUILD_ROOT%{libdir}
|
||||
ed $RPM_BUILD_ROOT%{libdir}/start.sh <<'EOF'
|
||||
/^datadir=/
|
||||
c
|
||||
datadir="%{_localstatedir}/log/milter"
|
||||
.
|
||||
/^piddir=/
|
||||
c
|
||||
piddir="%{_localstatedir}/run/milter"
|
||||
.
|
||||
/^libdir=/
|
||||
c
|
||||
libdir="%{libdir}"
|
||||
.
|
||||
/^python=/
|
||||
c
|
||||
python="%{__python}"
|
||||
@@ -59,84 +58,43 @@ python="%{__python}"
|
||||
w
|
||||
q
|
||||
EOF
|
||||
%endif
|
||||
chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh
|
||||
%if !%{redhat7}
|
||||
#grep '.pyc$' INSTALLED_FILES | sed -e 's/c$/o/' >>INSTALLED_FILES
|
||||
%endif
|
||||
|
||||
# start.sh is used by spfmilter, srsmilter, and milter, and could be used by
|
||||
# other milters using pymilter.
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
# start.sh is used by spfmilter and milter, and could be used by
|
||||
# other milters running on redhat
|
||||
%files -f INSTALLED_FILES
|
||||
%defattr(-,root,root)
|
||||
%doc README ChangeLog NEWS TODO CREDITS sample.py milter-template.py
|
||||
%{python_sitearch}/*
|
||||
%{libdir}
|
||||
%dir %attr(0755,mail,mail) %{_localstatedir}/run/milter
|
||||
%dir %attr(0755,mail,mail) %{_localstatedir}/log/milter
|
||||
%config %{libdir}/start.sh
|
||||
%dir %attr(0755,mail,mail) /var/run/milter
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Wed Mar 02 2010 Stuart Gathman <stuart@bmsi.com> 0.9.5-1
|
||||
- Print milter.error for invalid callback return type.
|
||||
(Since stacktrace is empty, the TypeError exception is confusing.)
|
||||
- Fix milter-template.py
|
||||
- Tweak Milter.utils.addr2bin and Milter.dynip to handle IP6
|
||||
|
||||
* Wed Mar 02 2010 Stuart Gathman <stuart@bmsi.com> 0.9.4-1
|
||||
- Handle IP6 in Milter.utils.iniplist()
|
||||
- python-2.6
|
||||
|
||||
* Thu Jul 02 2009 Stuart Gathman <stuart@bmsi.com> 0.9.3-1
|
||||
- Handle source route in Milter.utils.parse_addr()
|
||||
- Fix default arg in chgfrom.
|
||||
- Disable negotiate callback for libmilter < 8.14.3 (1,0,1)
|
||||
|
||||
* Tue Jun 02 2009 Stuart Gathman <stuart@bmsi.com> 0.9.2-3
|
||||
- Change result of @noreply callbacks to NOREPLY when so negotiated.
|
||||
|
||||
* Tue Jun 02 2009 Stuart Gathman <stuart@bmsi.com> 0.9.2-2
|
||||
- Cache callback negotiation
|
||||
|
||||
* Thu May 28 2009 Stuart Gathman <stuart@bmsi.com> 0.9.2-1
|
||||
- Add new callback support: data,negotiate,unknown
|
||||
- Auto-negotiate protocol steps
|
||||
|
||||
* Thu Feb 05 2009 Stuart Gathman <stuart@bmsi.com> 0.9.1-1
|
||||
- Fix missing address of optional param to addrcpt
|
||||
|
||||
* Wed Jan 07 2009 Stuart Gathman <stuart@bmsi.com> 0.9.0-4
|
||||
- Stop using INSTALLED_FILES to make Fedora happy
|
||||
- Remove config flag from start.sh glue
|
||||
- Own /var/log/milter
|
||||
- Use _localstatedir
|
||||
|
||||
* Wed Jan 07 2009 Stuart Gathman <stuart@bmsi.com> 0.9.0-2
|
||||
- Changes to meet Fedora standards
|
||||
|
||||
* Mon Nov 24 2008 Stuart Gathman <stuart@bmsi.com> 0.9.0-1
|
||||
* Mon Nov 24 2008 Stuart Gathman <stuart@bmsi.com> 0.8.12-1
|
||||
- Split pymilter into its own CVS module
|
||||
- Support chgfrom and addrcpt_par
|
||||
- Support NS records in Milter.dns
|
||||
|
||||
* Mon Aug 25 2008 Stuart Gathman <stuart@bmsi.com> 0.8.10-2
|
||||
- /var/run/milter directory must be owned by mail
|
||||
|
||||
* Mon Aug 25 2008 Stuart Gathman <stuart@bmsi.com> 0.8.10-1
|
||||
- improved parsing into email and fullname (still 2 self test failures)
|
||||
- implement no-DSN CBV, reduce full DSNs
|
||||
|
||||
* Mon Sep 24 2007 Stuart Gathman <stuart@bmsi.com> 0.8.9-1
|
||||
- Use ifarch hack to build milter and milter-spf packages as noarch
|
||||
- Remove spf dependency from dsn.py, add dns.py
|
||||
|
||||
* Fri Jan 05 2007 Stuart Gathman <stuart@bmsi.com> 0.8.8-1
|
||||
- move AddrCache, parse_addr, iniplist to Milter package
|
||||
- move parse_header to Milter.utils
|
||||
- fix plock for missing source and can't change owner/group
|
||||
- split out pymilter and pymilter-spf packages
|
||||
- move milter apps to /usr/lib/pymilter
|
||||
|
||||
* Sat Nov 04 2006 Stuart Gathman <stuart@bmsi.com> 0.8.7-1
|
||||
- SPF moved to pyspf RPM
|
||||
|
||||
* Tue May 23 2006 Stuart Gathman <stuart@bmsi.com> 0.8.6-2
|
||||
- Support CBV timeout
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[bdist_rpm]
|
||||
python=python2.6
|
||||
python=python2.4
|
||||
doc_files=README NEWS TODO
|
||||
packager=Stuart D. Gathman <stuart@bmsi.com>
|
||||
release=1
|
||||
|
||||
@@ -2,18 +2,21 @@ import os
|
||||
import sys
|
||||
from distutils.core import setup, Extension
|
||||
|
||||
if sys.version < '2.6.5':
|
||||
sys.exit('ERROR: Sorry, python 2.6.5 is required for this module.')
|
||||
|
||||
# FIXME: on some versions of sendmail, smutil is renamed to sm.
|
||||
# On slackware and debian, leave it out entirely. It depends
|
||||
# FIXME: on some versions of sendmail, smutil is renamed to sm
|
||||
# on slackware and debian, leave it out entirely. It depends
|
||||
# on how libmilter was built by the sendmail package.
|
||||
#libs = ["milter", "smutil"]
|
||||
libs = ["milter"]
|
||||
libs = ["milter", "smutil"]
|
||||
libdirs = ["/usr/lib/libmilter"] # needed for Debian
|
||||
|
||||
# patch distutils if it can't cope with the "classifiers" or
|
||||
# "download_url" keywords
|
||||
if sys.version < '2.2.3':
|
||||
from distutils.dist import DistributionMetadata
|
||||
DistributionMetadata.classifiers = None
|
||||
DistributionMetadata.download_url = None
|
||||
|
||||
# NOTE: importing Milter to obtain version fails when milter.so not built
|
||||
setup(name = "pymilter", version = '0.9.5',
|
||||
setup(name = "pymilter", version = '0.8.12',
|
||||
description="Python interface to sendmail milter API",
|
||||
long_description="""\
|
||||
This is a python extension module to enable python scripts to
|
||||
|
||||
@@ -1,19 +1,14 @@
|
||||
#!/bin/sh
|
||||
appname="$1"
|
||||
script="${2:-${appname}}"
|
||||
datadir="/var/lib/milter"
|
||||
logdir="/var/log/milter"
|
||||
piddir="/var/run/milter"
|
||||
libdir="/usr/lib/pymilter"
|
||||
datadir=/var/log/milter
|
||||
python="python2.4"
|
||||
exec >>${logdir}/${appname}.log 2>&1
|
||||
exec >>${datadir}/${appname}.log 2>&1
|
||||
if test -s ${datadir}/${script}.py; then
|
||||
cd ${datadir} # use version in data dir if it exists for debugging
|
||||
elif test -s ${logdir}/${script}.py; then
|
||||
cd ${logdir} # use version in log dir if it exists for debugging
|
||||
cd ${datadir} # use version in log dir if it exists for debugging
|
||||
else
|
||||
cd ${libdir}
|
||||
cd /usr/lib/pymilter
|
||||
fi
|
||||
|
||||
${python} ${script}.py &
|
||||
echo $! >${piddir}/${appname}.pid
|
||||
echo $! >/var/run/milter/${appname}.pid
|
||||
|
||||
+710
@@ -0,0 +1,710 @@
|
||||
From stuart@bmsi.com Wed May 1 14:37:14 2002
|
||||
Return-Path: <stuart@bmsi.com>
|
||||
Received: from bmsi.com (IDENT:stuart@localhost [127.0.0.1])
|
||||
by gathman.bmsi.com (8.11.6/8.11.6) with ESMTP id g41IbCF01796
|
||||
for <stuart@gathman.bmsi.com>; Wed, 1 May 2002 14:37:13 -0400
|
||||
Sender: stuart@gathman.bmsi.com
|
||||
Message-ID: <3CD035D7.18ADF27F@bmsi.com>
|
||||
Date: Wed, 01 May 2002 14:37:11 -0400
|
||||
From: "Stuart D. Gathman" <stuart@bmsi.com>
|
||||
Organization: Business Management Systems, Inc.
|
||||
X-Mailer: Mozilla 4.78 [en] (X11; U; Linux 2.4.9-21 i586)
|
||||
X-Accept-Language: en
|
||||
MIME-Version: 1.0
|
||||
To: stuart@gathman.bmsi.com
|
||||
Subject: Amazon.com--Earth's Biggest Selection
|
||||
Content-Type: multipart/mixed;
|
||||
boundary="------------59A46341C90BA737DD47867B"
|
||||
|
||||
This is a multi-part message in MIME format.
|
||||
--------------59A46341C90BA737DD47867B
|
||||
Content-Type: multipart/alternative;
|
||||
boundary="------------0B098FB91956AC123C61B151"
|
||||
|
||||
|
||||
--------------0B098FB91956AC123C61B151
|
||||
Content-Type: text/plain; charset=us-ascii
|
||||
Content-Transfer-Encoding: 7bit
|
||||
|
||||
http://www.amazon.com/exec/obidos/subst/home/redirect.html/103-3111065-2579065
|
||||
|
||||
--
|
||||
Stuart D. Gathman
|
||||
Business Management Systems Inc. Phone: 703 591-0911 Fax: 703 591-6154
|
||||
"Confutatis maledictis, flamis acribus addictis" - background song for
|
||||
a Microsoft sponsored "Where do you want to go from here?" commercial.
|
||||
|
||||
|
||||
|
||||
--------------0B098FB91956AC123C61B151
|
||||
Content-Type: text/html; charset=us-ascii
|
||||
Content-Transfer-Encoding: 7bit
|
||||
|
||||
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
|
||||
<html>
|
||||
<A HREF="http://www.amazon.com/exec/obidos/subst/home/redirect.html/103-3111065-2579065">http://www.amazon.com/exec/obidos/subst/home/redirect.html/103-3111065-2579065</A>
|
||||
<pre>--
|
||||
Stuart D. Gathman <stuart@bmsi.com>
|
||||
Business Management Systems Inc. Phone: 703 591-0911 Fax: 703 591-6154
|
||||
"Confutatis maledictis, flamis acribus addictis" - background song for
|
||||
a Microsoft sponsored "Where do you want to go from here?" commercial.</pre>
|
||||
</html>
|
||||
|
||||
--------------0B098FB91956AC123C61B151--
|
||||
|
||||
--------------59A46341C90BA737DD47867B
|
||||
Content-Type: text/html; charset=us-ascii;
|
||||
name="103-3111065-2579065"
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Content-Disposition: inline;
|
||||
filename="103-3111065-2579065"
|
||||
Content-Base: "http://www.amazon.com/exec/obidos/subs
|
||||
t/home/redirect.html/103-3111065-25
|
||||
79065"
|
||||
Content-Location: "http://www.amazon.com/exec/obidos/subs
|
||||
t/home/redirect.html/103-3111065-25
|
||||
79065"
|
||||
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<title>
|
||||
Amazon.com--Earth's Biggest Selection
|
||||
</title>
|
||||
<meta name="keywords" content="amazon.com,amazon books,amazon,amazon.com books,amazon music,amazon.com music,amazon video,amazon.com video,auctions,amazon auctions,amazon.com auctions,electronics,consumer electronics,gifts,amazon gifts,amazon.com gifts,cards,e-cards,e-mail cards,greeting cards,amazon cards,amazon.com cards,toys,amazon toys,amazon.com toys,games,amazon games,amazon.com games,toys & games,toys and games">
|
||||
<style type="text/css"><!-- .serif { font-family: times,serif; font-size: medium; }
|
||||
.sans { font-family: verdana,arial,helvetica,sans-serif; font-size: medium; }
|
||||
.small { font-family: verdana,arial,helvetica,sans-serif; font-size: small; }
|
||||
.h1 { font-family: verdana,arial,helvetica,sans-serif; color: #CC6600; font-size: medium; }
|
||||
.h3color { font-family: verdana,arial,helvetica,sans-serif; color: #CC6600; font-size: small; }
|
||||
.tiny { font-family: verdana,arial,helvetica,sans-serif; font-size: x-small; }
|
||||
.listprice { font-family: arial,verdana,helvetica,sans-serif; text-decoration: line-through; font-size: small; }
|
||||
.price { font-family: verdana,arial,helvetica,sans-serif; color: #990000; font-size: small; }
|
||||
--></style>
|
||||
</head>
|
||||
<body bgcolor="#FFFFFF" link="#003399" alink="#FF9933" vlink="#996633" text="#000000" onLoad="document.searchform.elements[1].focus()">
|
||||
<a name="top"></a>
|
||||
<map name="right_top_nav_map">
|
||||
<area shape="rect" href=/exec/obidos/shopping-basket/ref=top_nav_sb_gateway/103-3111065-2579065 coords="0,0,80,21">
|
||||
<area shape="rect" href=/exec/obidos/wishlist/ref=cm_wl_topnav_gateway/103-3111065-2579065 coords="85,0,151,21">
|
||||
<area shape="rect" href=/exec/obidos/account-access-login/ref=top_nav_ya_gateway/103-3111065-2579065 coords="155,0,256,21">
|
||||
<area shape="rect" href=/exec/obidos/tg/browse/-/508510/ref=top_nav_hp_gateway/103-3111065-2579065 coords="260,0,299,21">
|
||||
</map>
|
||||
<map name="gateway_nav_map">
|
||||
<area shape=rect coords="0,0,124,28" href=/exec/obidos/tg/stores/static/-/gateway/international-gateway/ref=gw_subnav_in/103-3111065-2579065>
|
||||
<area shape=rect coords="125,0,228,28" href=/exec/obidos/tg/new-for-you/top-sellers/-/main/ref=gw_subnav_ts/103-3111065-2579065>
|
||||
<area shape=rect coords="229,0,332,28" href=/exec/obidos/tg/browse/-/700060/ref=gw_subnav_target/103-3111065-2579065>
|
||||
<area shape=rect coords="333,0,450,28" href=/exec/obidos/tg/browse/-/909656/ref=stuffandsubnav_td1_/103-3111065-2579065>
|
||||
<area shape=rect coords="451,0,580,28" href=/exec/obidos/subst/misc/sell-your-stuff.html/ref=subnav_sys_/103-3111065-2579065>
|
||||
</map>
|
||||
<table border=0 width=100% cellspacing=0 cellpadding=0>
|
||||
<tr><td width=100%>
|
||||
<center>
|
||||
<table width=100% border=0 cellspacing=0 cellpadding=0 vspace=0>
|
||||
<tr>
|
||||
<td width=25% rowspan=2> </td>
|
||||
<td align=left valign=bottom><a href=/exec/obidos/subst/home/redirect.html/ref=nh_gateway/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/associates/navbar2000/logo-no-border(1).gif" width=148 height=43 alt="" border=0></a></td>
|
||||
<td width=10%> </td>
|
||||
<td align=right>
|
||||
<img src="http://g-images.amazon.com/images/G/01/nav/personalized/cartwish/right-topnav-default-2.gif" width=300 height=22 alt="" USEMAP=#right_top_nav_map border=0></td>
|
||||
<td align=right rowspan=2 width=25%>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr valign=bottom>
|
||||
<td colspan=3 align=center>
|
||||
<table align=center border=0 cellpadding=0 cellspacing=0><tr valign=bottom>
|
||||
<td><a href=/exec/obidos/subst/home/home.html/ref%3Dtab%5Fgw%5Fgw%5F1/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/welcome-on-whole.gif" width=60 height=26 border=0></a></td>
|
||||
<td><a href=/exec/obidos/tg/stores/your/store-home/-/0/ref%3Dtab%5Fgw%5Ffr%5F2/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/yourstore-off-sliced._ZCSTUART%27S,0,2,0,0,verdenab,7,90,90,80_.gif" width=81 height=26 border=0></a></td>
|
||||
<td><a href=/exec/obidos/tg/browse/-/283155/ref%3Dtab%5Fgw%5Fb%5F3/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/books-off-sliced.gif" width=39 height=26 border=0></a></td>
|
||||
<td><a href=/exec/obidos/tg/browse/-/172282/ref%3Dtab%5Fgw%5Fe%5F4/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/electronics-off-sliced.gif" width=74 height=26 border=0></a></td>
|
||||
<td><a href=/exec/obidos/tg/browse/-/130/ref%3Dtab%5Fgw%5Fd%5F5/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/dvd-off-sliced.gif" width=35 height=26 border=0></a></td>
|
||||
<td><a href=/exec/obidos/tg/browse/-/171280/ref%3Dtab%5Fgw%5Ft%5F6/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/toys-off-sliced.gif" width=47 height=26 border=0></a></td>
|
||||
<td><a href=/exec/obidos/tg/browse/-/468642/ref%3Dtab%5Fgw%5Fvg%5F7/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/videogames-off-sliced.gif" width=73 height=26 border=0></a></td>
|
||||
<td><a href=/exec/obidos/tg/browse/-/600460/ref%3Dtab%5Fgw%5F%5F8/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/corporate-off-sliced.gif" width=70 height=26 border=0></a></td>
|
||||
<td><a href=/exec/obidos/subst/home/all-stores.html/ref%3Dtab_gw_storesdirectory/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/see-more-off-sliced.gif" width=70 height=26 border=0></a></td>
|
||||
</tr></table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</center>
|
||||
</td></tr>
|
||||
<tr align=center bgcolor=#006699>
|
||||
<td><img src="http://g-images.amazon.com/images/G/01/nav/amazon/gateway/blue/gateway-subnav-default.gif" width=580 height=28 width=580 height=28 alt="" USEMAP="#gateway_nav_map" border=0></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td bgcolor=#ffffdd align=center class=small>
|
||||
<font face=verdana,arial,helvetica size=-1>
|
||||
<font color="#CC6600"><B>Hello, Stuart D. Gathman.</B></font>
|
||||
We have <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/subst%2Frecs%2Finstant-recs-home.html%2Fref%3Dpd_ir_gw_r/ref=ilm_stripe_272005/103-3111065-2579065&message=272005,m1,26">recommendations</A> for you.
|
||||
</font><font face=verdana,arial,helvetica size=-2>
|
||||
(If you're not Stuart D. Gathman, <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/flex-sign-in%2Fref%3Dpd_ir_gw_r%2F%3Fopt%3Doa%26page%3Drecs%2Fsign-in-secure.html%26response%3Dtg%2Frecs%2Frecs-post-login-dispatch%2F-%2Frecs%2Fpd_rw_gw_r/ref=ilm_stripe_272005/103-3111065-2579065&message=272005,m1,26">click here</A>.)
|
||||
</font>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<br>
|
||||
<table width=100% cellpadding=0 cellspacing=0 border=0>
|
||||
<tr valign=top>
|
||||
<td width=174>
|
||||
<TABLE border=0 cellspacing=0 cellpadding=0><TR valign=bottom align=center>
|
||||
<td><img src="http://g-images.amazon.com/images/G/01/v9/search-browse/search-gateway.gif" width=171 height=19 border=0 alt="Search Amazon.com"></td>
|
||||
</TR> <TR valign=top align=center><TD> <TABLE border=0 width= 171 cellpadding=1 cellspacing=0 bgcolor=#708090 ><TR> <TD width=100%><TABLE width=100% border=0 cellpadding=4 cellspacing=0 bgcolor=#708090><TR> <TD bgcolor=#FFCC66 valign=top width=100%>
|
||||
<form method="post" action="/exec/obidos/search-handle-form/103-3111065-2579065" name="searchform">
|
||||
<select name=index>
|
||||
<option value=blended selected>All Products
|
||||
<option value=books>Books
|
||||
<option value=music>Popular Music
|
||||
<option value=music-dd>Music Downloads
|
||||
<option value=classical>Classical Music
|
||||
<option value="dvd">DVD
|
||||
<option value="vhs">VHS
|
||||
<option value=theatrical>Movie Showtimes
|
||||
<option value=toys>Toys
|
||||
<option value=baby>Baby
|
||||
<option value=pc-hardware>Computers
|
||||
<option value=videogames>Video Games
|
||||
<option value=electronics>Electronics
|
||||
<option value=photo>Camera & Photo
|
||||
<option value=software>Software
|
||||
<option value=tools>Tools & Hardware
|
||||
<option value=magazines>Magazines
|
||||
<option value=garden>Outdoor Living
|
||||
<option value=kitchen>Kitchen
|
||||
<option value=travel>Travel
|
||||
<option value=wireless-phones>Cell Phones & Service
|
||||
<option value=outlet>Outlet
|
||||
<option value=auction-redirect>Auctions
|
||||
<option value=fixed-price-redirect>zShops
|
||||
</select>
|
||||
<input type="text" name="field-keywords" size="15">
|
||||
<input type="image" height="21" width="21" border=0 value="Go" name="Go" src="http://g-images.amazon.com/images/G/01/v9/search-browse/go-button-gateway.gif" align=absmiddle>
|
||||
</TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </form>
|
||||
</TR> </TABLE> <br clear=left>
|
||||
<TABLE border=0 cellspacing=0 cellpadding=0>
|
||||
<TR valign=bottom align=center>
|
||||
<td><img src="http://g-images.amazon.com/images/G/01/v9/search-browse/browse-gateway.gif" width=171 height=19 border=0 alt="Browse Amazon.com"></td>
|
||||
</TR> <TR valign=top align=center>
|
||||
<TD> <TABLE border=0 width= 171 cellpadding=1 cellspacing=0 bgcolor=#708090 ><TR> <TD width=100%><TABLE width=100% border=0 cellpadding=4 cellspacing=0 bgcolor=#708090><TR> <TD bgcolor=#ffffff valign=top width=100%>
|
||||
<table cellpadding=3 cellspacing=0>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/283155/ref=gw_br_bo/103-3111065-2579065">Books</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/172282/ref=gw_br_el/103-3111065-2579065">Electronics</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/540744/ref=gw_br_ba/103-3111065-2579065">Baby &</a><br> <a href="/exec/obidos/tg/browse/-/540744/ref=gw_br_ba/103-3111065-2579065">Baby Registry</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/5174/ref=gw_br_mu/103-3111065-2579065">Music</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/redirect-to-partner/ref=gw_br_dscm/103-3111065-2579065?name=dscm&aid=2&aparam=tb5270_bhp&trx=8056">Health & Beauty</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/130/ref=gw_br_dvd/103-3111065-2579065">DVD</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/229534/ref=gw_br_sw/103-3111065-2579065">Software</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/284507/ref=gw_br_ki/103-3111065-2579065">Kitchen &</a><br> <a href="/exec/obidos/tg/browse/-/284507/ref=gw_br_ki/103-3111065-2579065">Housewares</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/228013/ref=gw_br_hi/103-3111065-2579065">Tools &</a><br> <a href="/exec/obidos/tg/browse/-/228013/ref=gw_br_hi/103-3111065-2579065">Hardware</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/541966/ref=gw_br_pc/103-3111065-2579065">Computers</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/502394/ref=gw_br_p/103-3111065-2579065">Camera & Photo</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/562436/ref=gw_br_th/103-3111065-2579065">Movie Showtimes</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/468642/ref=gw_br_cvg/103-3111065-2579065">Computer &</a><br> <a href="/exec/obidos/tg/browse/-/468642/ref=gw_br_cvg/103-3111065-2579065">Video Games</a></b></td>
|
||||
</tr> <tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/171280/ref=gw_br_tg/103-3111065-2579065">Toys & Games</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/301185/ref=gw_br_wi/103-3111065-2579065">Cell Phones</a><br> <a href="/exec/obidos/tg/browse/-/301185/ref=gw_br_wi/103-3111065-2579065">& Service</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/404272/ref=gw_br_vi/103-3111065-2579065">Video</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/599858/ref=gw_br_zi/103-3111065-2579065">Magazine</a><br> <a href="/exec/obidos/tg/browse/-/599858/ref=gw_br_zi/103-3111065-2579065">Subscriptions</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/286168/ref=gw_br_lp/103-3111065-2579065">Outdoor Living</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/605012/ref=gw_br_tr/103-3111065-2579065">Travel</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/acn-redirect-to-partner/ref=gw_br_cars/103-3111065-2579065?partner-name=carsdirect&partner-url=home%3Fpartner%3Damzn%26customerid%3Dbrowse">Cars</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/229220/ref=gw_br_gi/103-3111065-2579065">Gifts &</a><br> <a href="/exec/obidos/tg/browse/-/229220/ref=gw_br_gi/103-3111065-2579065">Gift Certificates</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="http://s1.amazon.com/exec/varzea/subst/home/home.html/ref=gw_br_au/103-3111065-2579065">Auctions</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="http://s1.amazon.com/exec/varzea/subst/home/fixed.html/ref=gw_br_zs/103-3111065-2579065">zShops</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/517808/ref=gw_br_ou/103-3111065-2579065">Outlet</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <b><a href="/exec/obidos/tg/browse/-/600460/ref=gw_br_cb/103-3111065-2579065">Corporate</a> <br> <a href="/exec/obidos/tg/browse/-/600460/ref=gw_br_cb/103-3111065-2579065">Accounts</a></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>
|
||||
<a href="/exec/obidos/flex-sign-in/ref=pd_fr_gw_fav_edt/103-3111065-2579065?page=personalization/favorites/favorites-sign-in-secure.html&response=favorites-edit/personalization/favorites/edit-areas.html&pass_through=product-group-id.gateway.hp&method=GET">
|
||||
<img src="http://g-images.amazon.com/images/G/01/buttons/edit-favorites.gif" width=69 height=15 border=0 valign=top vspace=2></a><br>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small><b>Browse Partners</b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <a href="/exec/obidos/tg/browse/-/700060/ref=gw_tarb_/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/target/target-logo-sm.gif" width=71 height=17 border=0 alt=Target></a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <a href="/exec/obidos/tg/browse/-/171280/ref=gw_trub_/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/toys/navigation/tru-logo.gif" width=117 height=14 border=0 alt=Toysrus.com></a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=small>• <a href="/exec/obidos/tg/browse/-/540744/ref=gw_brub_/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/toys/navigation/bru-logo.gif" width=136 height=15 border=0 alt=Babiesrus.com></a></td>
|
||||
</tr>
|
||||
</table>
|
||||
</TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD>
|
||||
</TR>
|
||||
</TABLE> <br>
|
||||
<TABLE border=0 width=171 cellpadding=1 cellspacing=0 bgcolor=#708090 ><TR> <TD width=100%><TABLE width=100% border=0 cellpadding=4 cellspacing=0 bgcolor=#708090><TR> <TD bgcolor=#ffffff valign=top width=100%>
|
||||
<font face=verdana,arial,helvetica color=#000000 size=-1><b>Special Features</b></font><br>
|
||||
<font face=verdana,arial,helvetica size=-1>
|
||||
<ul><li> <A href="/exec/obidos/subst/alerts/signup.html/ref=gw_hp_ls_1_1/103-3111065-2579065">Alerts</A><li> <A href="/exec/obidos/subst/misc/anywhere/anywhere.html/ref=gw_hp_ls_1_2/103-3111065-2579065">Amazon.com
|
||||
Anywhere</A><li> <A href="/exec/obidos/subst/misc/amazon-credit/marketing-page.html/ref=gw_hp_ls_1_3/103-3111065-2579065">Amazon Credit Account</A><li> <A href="/exec/obidos/subst/delivers/delivers-signup-combo.html/ref=gw_hp_ls_1_4/103-3111065-2579065">Delivers</A><li><A href="/exec/obidos/tg/browse/-/225840/ref=gw_hp_ls_1_5/103-3111065-2579065">Free e-Cards</A><li><A href="/exec/obidos/subst/community/community-home.html/ref=gw_hp_ls_1_6/103-3111065-2579065">Friends & Favorites</A><li> <A href="/exec/obidos/subst/gifts/gift-services/gift-certificates.html/ref=gw_hp_ls_1_7/103-3111065-2579065">Gift
|
||||
Certificates</A><li> <A href="http://auctions.amazon.com/exec/varzea/subst/fx/home.html/ref=gw_hp_ls_1_8/103-3111065-2579065">Honor
|
||||
System</A><li> <A href="/exec/obidos/subst/community/community.html/ref=gw_hp_ls_1_9/103-3111065-2579065">Purchase
|
||||
Circles</A><li>
|
||||
<A href="/exec/obidos/tg/browse/-/885446/ref=gw_hp_ls_1_10/103-3111065-2579065">Wedding
|
||||
Registry</A></ul>
|
||||
</font>
|
||||
</TD> </TR> </TABLE> </TD> </TR> </TABLE> <br>
|
||||
<TABLE border=0 width=171 cellpadding=1 cellspacing=0 bgcolor=#708090 ><TR> <TD width=100%><TABLE width=100% border=0 cellpadding=4 cellspacing=0 bgcolor=#708090><TR> <TD bgcolor=#ffffff valign=top width=100%>
|
||||
<font face=verdana,arial,helvetica color=#000000 size=-1><b>Associates</b></font><br>
|
||||
<font face=verdana,arial,helvetica size=-1>
|
||||
Sell books, music, videos, and more from your
|
||||
Web site. <A href="/exec/obidos/subst/associates/join/associates.html/ref=gw_hp_ls_2_1/103-3111065-2579065">Start earning
|
||||
today</A>!<BR>
|
||||
</font>
|
||||
</TD> </TR> </TABLE> </TD> </TR> </TABLE> <br>
|
||||
<p>
|
||||
<br clear=all>
|
||||
</td>
|
||||
<td> </td>
|
||||
<td>
|
||||
<center>
|
||||
</center>
|
||||
<br clear=all><p>
|
||||
<A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/tg/browse/-/283155/ref=ilm_rc_285799/103-3111065-2579065&message=285799,m1,27">
|
||||
<center><img src="http://g-images.amazon.com/images/G/01/books/homepage-pricing/books-home-pricing-iii.gif" width=257 height=99 border=0></center>
|
||||
</A>
|
||||
<br clear=all><br>
|
||||
<A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/tg/browse/-/753570/ref=ilm_rc_283024/103-3111065-2579065&message=283024,gw_lr_dvd_lor,28"><img src="http://g-images.amazon.com/images/G/01/icons/thumbnails/b00003cwt6_thumb.gif" width=41 height=60 border=0 valign=top align=left></A>
|
||||
Pre-order the Oscar®-winning blockbuster <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/tg/browse/-/753570/ref=ilm_rc_283024/103-3111065-2579065&message=283024,gw_lr_dvd_lor,28"><I>The Lord of the Rings: The Fellowship of the Ring</I></A>, arriving on <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/ASIN/B00003CWT6/ref=ilm_rc_283024/103-3111065-2579065&message=283024,gw_lr_dvd_lor,28">DVD</A> and <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/ASIN/B000065U6Q/ref=ilm_rc_283024/103-3111065-2579065&message=283024,gw_lr_dvd_lor,28">video</A> August 6.
|
||||
<br clear=all><br>
|
||||
<b class=small><A href="/exec/obidos/tg/browse/-/229220/ref=gw_hp_cs_1_1/103-3111065-2579065">In Gifts</A></b><br>
|
||||
<A href="/exec/obidos/tg/browse/-/229220/ref=gw_hp_cs_2_1/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/marketing/mothers_day/md_sd_roto.jpg" width=100 height=95 border=0 align=left hspace=4></A>
|
||||
<b><font face=verdana,arial,helvetica color=#CC6600>Mother's Day Is May 12</font></b><br>
|
||||
We've made it fun and easy to buy the perfect
|
||||
present for Mom. Shop by <A href="/exec/obidos/tg/stores/recs/gift-wizard-refine/-/holiday/ref=gw_hp_cs_2_2/103-3111065-2579065">recipient</A>
|
||||
or <A href="/exec/obidos/tg/stores/recs/gift-wizard/-/price/ref=gw_hp_cs_2_3/103-3111065-2579065">price</A>,
|
||||
browse <A href="/exec/obidos/tg/stores/recs/gift-wizard/-/topsellers/ref=gw_hp_cs_2_4/103-3111065-2579065">top
|
||||
sellers</A>, or order <A href="http://www.amazon.com/exec/obidos/redirect-to-external-url/103-3111065-2579065?path=http%3A//www.proflowers.com/freechocolate/freechocolate.cfm%3FREF%3DFCHAmazonGatewayExp042702">flowers</A>.
|
||||
Visit <A href="/exec/obidos/tg/browse/-/229220/ref=gw_hp_cs_2_5/103-3111065-2579065">Gifts</A> for
|
||||
these and more great ideas for expressing your love and
|
||||
appreciation.<BR>
|
||||
<br clear=left>
|
||||
<br clear=all>
|
||||
<a href=/exec/obidos/instant-recs/recs/instant-recs-home.html/ref=pd_gw_qpt_h/103-3111065-2579065><b class=small>Your Recommendations</b></a>
|
||||
<br> <b class=h1>
|
||||
<i>War in Heaven</i>
|
||||
</b>
|
||||
</b><br>
|
||||
<a href=/exec/obidos/ASIN/0802812198/ref=pd_gw_qpt_1/103-3111065-2579065><img src="http://images.amazon.com/images/P/0802812198.01.__PE20_PIm.arrow,TopLeft,-2,-19_SCTZZZZZZZ_.jpg" width=76 height=116 vspace=3 hspace=7 align=left border=0></a>
|
||||
<b>Amazon.com</b><br>
|
||||
"The telephone was ringing wildly," begins Charles Williams's novel <I>War in Heaven</I>, "but without result, since there was no-one in the room but the corpse." From this abrupt--and darkly humorous--start, Williams takes us on a 20th-century version of the Grail quest, with an Archdeacon, a Duke, and an...
|
||||
<a href=/exec/obidos/ASIN/0802812198/ref=pd_gw_qpt_1/103-3111065-2579065>
|
||||
<font size=-1>Read more</font></a>
|
||||
<span class=tiny>
|
||||
|
|
||||
(<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/0802812198/gw/1/pc/3/none/ref=pd_gw_qpt_1/103-3111065-2579065>Why was I recommended this?</a>)
|
||||
</span>
|
||||
<br clear=all>
|
||||
<br><b class=small>More Recommendations</b><br>
|
||||
<img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
|
||||
<a href=/exec/obidos/ASIN/0471070408/ref=pd_gw_qpt_2/103-3111065-2579065><i>Reliable Linux</i></a> by Iain Campbell
|
||||
<span class=tiny>
|
||||
(<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/0471070408/gw/1/pc/3/none/ref=pd_gw_qpt_2/103-3111065-2579065>Why?</a>)
|
||||
</span>
|
||||
<br>
|
||||
<img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
|
||||
<a href=/exec/obidos/ASIN/1565926102/ref=pd_gw_qpt_3/103-3111065-2579065><i>Programming PHP</i></a> by Rasmus Lerdorf, et al
|
||||
<span class=tiny>
|
||||
(<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/1565926102/gw/1/pc/3/none/ref=pd_gw_qpt_3/103-3111065-2579065>Why?</a>)
|
||||
</span>
|
||||
<br>
|
||||
<img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
|
||||
<a href=/exec/obidos/ASIN/0802812201/ref=pd_gw_qpt_4/103-3111065-2579065><i>Descent into Hell</i></a> by Charles W. Williams
|
||||
<span class=tiny>
|
||||
(<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/0802812201/gw/1/pc/3/none/ref=pd_gw_qpt_4/103-3111065-2579065>Why?</a>)
|
||||
</span>
|
||||
<br>
|
||||
<img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
|
||||
<a href=/exec/obidos/ASIN/059600186X/ref=pd_gw_qpt_5/103-3111065-2579065><i>Network Troubleshooting Tools (O'Reilly System Administration)</i></a> by Joseph D. Sloan
|
||||
<span class=tiny>
|
||||
(<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/059600186X/gw/1/pc/3/none/ref=pd_gw_qpt_5/103-3111065-2579065>Why?</a>)
|
||||
</span>
|
||||
<br>
|
||||
<p>
|
||||
<font face=verdana,arial,helvetica size=-1><a href=/exec/obidos/tg/stores/your/favorites/-/music/ref=pd_fr_gw_nr_h/103-3111065-2579065><b>Your Music Store</b></a></font><br>
|
||||
<font face=verdana,arial,helvetica color=#CC6600><b>
|
||||
Isaac Freeman, et al,
|
||||
<i>Beautiful Stars</i>
|
||||
</b></font>
|
||||
<br>
|
||||
<a href=/exec/obidos/ASIN/B000063TQV/ref=pd_fr_qw_nr_1/103-3111065-2579065><img src="http://images.amazon.com/images/P/B000063TQV.01.26TLZZZZ.jpg" width=73 height=71 vspace=3 hspace=7 align=left border=0></a>
|
||||
Great African American gospel music has an indisputable power, rooted in the audible faith of its performers and the beauty of their voices. As the bass singer of the <a href="/exec/obidos/tg/stores/artist/glance/-/73920/103-3111065-2579065">Fairfield Four</a>, an a cappella group that started more than a half century ago,...
|
||||
<a href=/exec/obidos/ASIN/B000063TQV/ref=pd_fr_qw_nr_1/103-3111065-2579065><font size=-1>Read more</font></a>
|
||||
<br>
|
||||
<br clear=left>
|
||||
<br>
|
||||
<table border=0 cellpadding=2 cellspacing=0><tr><td colspan=2>
|
||||
<p><b class="small">More Stores:</b>
|
||||
</td></tr>
|
||||
<tr valign=top><td width=1%><a href=/exec/obidos/tg/stores/your/favorites/-/electronics/ref=pd_fr_qw_nr_2/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-electronics-icon.gif" width=18 height=18 alt=Icon border=0 align=absmiddle></a></td><td><b class="small"><a href=/exec/obidos/tg/stores/your/favorites/-/electronics/ref=pd_fr_gw_nr_2_p/103-3111065-2579065>Your Electronics Store</a>:</b> <a href=/exec/obidos/ASIN/B000063574/ref=pd_fr_gw_nr_2/103-3111065-2579065>iRiver SlimX iMP-350 CD/MP3 Player with 8 minutes ASP and Upgradeable Firmware</a>
|
||||
by iRiver
|
||||
</td></tr>
|
||||
<tr valign=top><td width=1%><a href=/exec/obidos/tg/stores/your/favorites/-/video/ref=pd_fr_qw_nr_3/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-video-icon.gif" width=18 height=18 alt=Icon border=0 align=absmiddle></a></td><td><b class="small"><a href=/exec/obidos/tg/stores/your/favorites/-/video/ref=pd_fr_gw_nr_3_p/103-3111065-2579065>Your Video Store</a>:</b> <a href=/exec/obidos/ASIN/B000062XNA/ref=pd_fr_gw_nr_3/103-3111065-2579065><i>Ocean's Eleven</i></a>
|
||||
<b>VHS</b> ~ George Clooney
|
||||
</td></tr>
|
||||
</table>
|
||||
<p>
|
||||
<b><font face=verdana,arial,helvetica color=#CC6600>Listmania!</font></b><br>
|
||||
<font face=verdana,arial,helvetica size=-2>
|
||||
(<a href=/exec/obidos/tg/browse/-/542566/103-3111065-2579065>What is this?</a>)
|
||||
</font><br>
|
||||
<table width=100% border=0 cellpadding=5 cellspacing=0>
|
||||
<tr valign=top>
|
||||
<td width=50% class=small>
|
||||
<a href=/exec/obidos/tg/listmania/list-browse/-/2RKS17C9X4D3F/ref=pd_gw_lmq_1/103-3111065-2579065><img src="http://images.amazon.com/images/P/0072127732.01.__PIm.arrow,TopLeft,-2,-19_SCTZZZZZZZ_.jpg" width=76 height=109 border=0 vspace=4 hspace=5></a>
|
||||
<p>
|
||||
<font face=verdana,arial,helvetica size=-1>
|
||||
<a href=/exec/obidos/tg/listmania/list-browse/-/2RKS17C9X4D3F/ref=pd_gw_lmq_1/103-3111065-2579065><b>Best Linux Security books</b></a>: A list by <a href=/exec/obidos/tg/cm/member-fil/-/A3362WVVMJ3LE9/ref=pd_gw_lmq_n1/103-3111065-2579065>J. Parker</a>, Administrator, hacker.<br>
|
||||
(7 item list)</font>
|
||||
</td>
|
||||
<td width=50% class=small>
|
||||
<a href=/exec/obidos/tg/listmania/list-browse/-/2B0DIAPG2D3RT/ref=pd_gw_lmq_2/103-3111065-2579065><img src="http://images.amazon.com/images/P/0070419531.01.__PIm.arrow,TopLeft,-2,-19_SCTZZZZZZZ_.jpg" width=76 height=109 border=0 vspace=4 hspace=5></a>
|
||||
<p>
|
||||
<font face=verdana,arial,helvetica size=-1>
|
||||
<a href=/exec/obidos/tg/listmania/list-browse/-/2B0DIAPG2D3RT/ref=pd_gw_lmq_2/103-3111065-2579065><b>Networking</b></a>: A list by <a href=/exec/obidos/tg/cm/member-fil/-/AJINE650CAMUQ/ref=pd_gw_lmq_n2/103-3111065-2579065>gakis</a>, Engineer<br>
|
||||
(13 item list)</font>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan=2 class=small><ul>
|
||||
<li><a href=/exec/obidos/tg/listmania/list-browse/-/IEF1DNVKZO8B/ref=pd_gw_lmq_3/103-3111065-2579065>My Coder Library</a>: A list by <a href=/exec/obidos/tg/cm/member-fil/-/A3RK9LZQKL2YIN/ref=pd_gw_lmq_n3/103-3111065-2579065>John Washam</a><br> <li><a href=/exec/obidos/tg/listmania/list-browse/-/LE6A7H4L7VZK/ref=pd_gw_lmq_4/103-3111065-2579065>ALL THE FANTASY YOU'LL EVER NE</a>: A list by <a href=/exec/obidos/tg/cm/member-fil/-/A3628L43ZVEMP5/ref=pd_gw_lmq_n4/103-3111065-2579065>aramis</a><br> <li><a href=/exec/obidos/tg/listmania/list-browse/-/1MD5H6RUOIMIU/ref=pd_gw_lmq_5/103-3111065-2579065>Mythopoeic Fantasy</a>: A list by <a href=/exec/obidos/tg/cm/member-fil/-/A7CSNW9E46NR5/ref=pd_gw_lmq_n5/103-3111065-2579065>Vera Nazarian</a><br> </ul></td></tr></table>
|
||||
<p>
|
||||
<b class=small><A href="/exec/obidos/tg/browse/-/605012/ref=gw_hp_cb_1_1/103-3111065-2579065">In Travel</A></b><br>
|
||||
<A href="/exec/obidos/tg/browse/-/605012/ref=gw_hp_cb_2_1/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/travel/promotions/travel-gateway1.gif" width=100 height=95 border=0 align=left hspace=4></A>
|
||||
<b><font face=verdana,arial,helvetica color=#CC6600>Your Next Vacation Starts
|
||||
Here</font></b><br>
|
||||
Save up to 70% on hotels from Vegas to New York
|
||||
and everywhere in between on <A href="/exec/obidos/acn-redirect-to-partner/103-3111065-2579065?partner-name=expedia&partner-url=pubspec/scripts/eap.asp%3FEAPID%3D11420-1%26GOTO%3DDAILY%26Page%3D/deals/hoteldeals.asp%3Frfrr%3D-2980">Expedia.com</A>.
|
||||
Book a flight during Hotwire's <A href="/exec/obidos/acn-redirect-to-partner/103-3111065-2579065?partner-name=hotwire&partner-url=index.jsp%3Fsid%3D39151%26bid%3DB627">major-airline Spring Sale</A> through May 2 and fly the
|
||||
big-name airlines at no-name airline prices. <A href="/exec/obidos/acn-redirect-to-partner/103-3111065-2579065?partner-name=thevacationstore&partner-url=cruises/show_cruise.asp%3Fd%3D%26i%3D743065%26c%3D24%26v%3D110">The
|
||||
Vacation Store</A> is offering seven-day Holland America
|
||||
Caribbean cruises from just $599. <BR>
|
||||
<br clear=left>
|
||||
<td width=174>
|
||||
<table width=100% cellpadding=3 cellspacing=0 border=0>
|
||||
<tr>
|
||||
<td>
|
||||
<a href=/exec/obidos/subst/xs/hotpicks.html/ref=xs_ie_13_gw/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/marketing/cross-shop/web-labs/lp_gate_roto_t._ZCStuart%5c,,3,5,300,300,verdenab,14,204,0,0_SCLZZZZZZZ_.gif" width=174 height=34 border=0></a><br>
|
||||
<a href=/exec/obidos/subst/xs/hotpicks.html/ref=xs_ie_13_gw/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/marketing/cross-shop/web-labs/lp_gate_roto_m.gif" width=174 height=200 border=0></a><br>
|
||||
<a href=/exec/obidos/subst/xs/hotpicks.html/ref=xs_ie_13_gw/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/marketing/cross-shop/web-labs/lp_gate_roto_b.gif" width=174 height=231 border=0></a><br>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-for-you/-/main/ref=pd_nfy_gw_n/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/banners/n4u/n4u-header-recognized-01.gif" width=174 height=41 hspace=0 vspace=0 align=right border=0 alt="New For You"></a><br clear=all>
|
||||
<table border=0 bgcolor=#708090 cellpadding=1 cellspacing=0 width=174 align=right valign=top vspace=0 hspace=0><tr><td>
|
||||
<table border=0 cellpadding=3 cellspacing=0 width=100% bgcolor=#ffffff>
|
||||
<tr><td bgcolor=#ffffff align=middle>
|
||||
<span class=small><font color=#CC6600><b>Stuart,</b></font> check out what's<b> <a href=/exec/obidos/tg/new-for-you/new-for-you/-/main/ref=pd_nfy_gw_n/103-3111065-2579065>New for You</a></b>:<br></span>
|
||||
</td></tr>
|
||||
<tr><td bgcolor=#ffffff align=middle>
|
||||
<span class=tiny>(If you're not Stuart D. Gathman, <a href=/exec/obidos/flex-sign-in/ref=pd_nfy_gw_n/103-3111065-2579065?opt=o&page=misc/login/flex-sign-in-secure.html&response=tg/new-for-you/new-for-you/-/main>click here</a>.)</span>
|
||||
<br><br>
|
||||
</td></tr>
|
||||
<tr bgcolor=#eeeecc><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/inbox/inbox/-/main/ref=pd_nfy_gw_ibx/103-3111065-2579065><b class=small>Your Message Center</b></a>
|
||||
</td></tr>
|
||||
<tr bgcolor=#ffffee><td>
|
||||
<table><tr bgcolor=#ffffee>
|
||||
<td valign=top><a href=/exec/obidos/tg/new-for-you/inbox/inbox/-/main/ref=pd_nfy_gw_ibx/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/exclamation-clear.gif" width=20 height=20 border=0 alt=!></a></td>
|
||||
<td class=small> You have <a href=/exec/obidos/tg/new-for-you/inbox/inbox/-/main/ref=pd_nfy_gw_ibx/103-3111065-2579065>5 new messages</a>.
|
||||
<br><br>
|
||||
</td>
|
||||
</tr></table>
|
||||
</td></tr>
|
||||
<tr bgcolor=#eeeecc><td>
|
||||
<font face=verdana,arial,helvetica size=-1><a href=/exec/obidos/shopping-basket/ref=pd_nfy_gw_sc/103-3111065-2579065><b>Your Shopping Cart</b></a></font>
|
||||
</td></tr>
|
||||
<tr><td>
|
||||
<table><tr>
|
||||
<td valign=top><a href=/exec/obidos/shopping-basket/ref=pd_nfy_gw_sc/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/shopping-cart-small.gif" width=25 height=25 border=0 alt="Shopping Cart" align=left></a></td>
|
||||
<td valign=top><font face=verdana,arial,helvetica size=-1>You have 0 items in <a href=/exec/obidos/shopping-basket/ref=pd_nfy_gw_sc/103-3111065-2579065>your Shopping Cart</a>.</font><br><br></td>
|
||||
</tr></table>
|
||||
</td></tr></table>
|
||||
<table border=0 cellpadding=3 cellspacing=0 width=100% bgcolor=#ffffff vspace=0>
|
||||
<tr bgcolor=#eeeecc><td class=small>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/main/ref=pd_nfy_gw_n/103-3111065-2579065><b>Your New Releases</b></a>
|
||||
</td></tr></table>
|
||||
<table border=0 cellpadding=3 cellspacing=0 width=100% bgcolor=#ffffff vspace=0>
|
||||
<tr valign=top><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/music/37/ref=pd_nfy_gw_n1/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-music-icon.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/music/37/ref=pd_nfy_gw_n1/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Pop</font></a>
|
||||
</td></tr>
|
||||
<tr valign=top><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/music/173429/ref=pd_nfy_gw_n2/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-music-icon.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/music/173429/ref=pd_nfy_gw_n2/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Christian & Gospel</font></a>
|
||||
</td></tr>
|
||||
<tr valign=top><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/books/5/ref=pd_nfy_gw_n3/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/books/5/ref=pd_nfy_gw_n3/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Computers & Internet</font></a>
|
||||
</td></tr>
|
||||
<tr valign=top><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/kitchen/289814/ref=pd_nfy_gw_n4/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/icon-kitchen-blue.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/kitchen/289814/ref=pd_nfy_gw_n4/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Cookware</font></a>
|
||||
</td></tr>
|
||||
<tr valign=top><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/video/141/ref=pd_nfy_gw_n5/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-vhs-icon.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
|
||||
<a href=/exec/obidos/tg/new-for-you/new-releases/-/video/141/ref=pd_nfy_gw_n5/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Action & Adventure</font></a>
|
||||
</td></tr>
|
||||
</td></tr>
|
||||
<tr><td colspan=2 align=left> <img src="http://g-images.amazon.com/images/G/01/icons/orange-arrow.gif" width=10 height=9 border=0> <a href=/exec/obidos/tg/new-for-you/new-releases/-/main/ref=pd_nfy_gw_n/103-3111065-2579065><font face=verdana,arial,helvetica size=-1><b>More New Releases</b></font></a><p>
|
||||
</td></tr></table>
|
||||
<table border=0 cellpadding=3 cellspacing=0 width=100% bgcolor=#ffffff>
|
||||
<tr bgcolor=#eeeecc><td class=small>
|
||||
<a href=/exec/obidos/tg/new-for-you/movers-and-shakers/-/books/ref=pd_gw_msgr/103-3111065-2579065><b>Movers & Shakers</b></a>
|
||||
</td></tr></table>
|
||||
<table border=0 cellpadding=2 cellspacing=0 width=100% bgcolor=#ffffff vspace=0>
|
||||
<tr><td valign=top align=center>
|
||||
<img src="http://g-images.amazon.com/images/G/01/icons/uparrow_green2.gif" width=13 height=11 alt="Up">
|
||||
</td>
|
||||
<td valign=top>
|
||||
<font color=#339900 face=verdana,arial,helvetica size=-1><b>974%</b></font> </td></tr>
|
||||
<tr><td valign=top align=left>
|
||||
<img src="http://g-images.amazon.com/images/G/01/icons/small-blue-dvd-icon.gif" width=18 height=18 border=0 alt=Icon >
|
||||
</td>
|
||||
<td valign=top>
|
||||
<font face=verdana,arial,helvetica size=-1><a href=/exec/obidos/tg/new-for-you/movers-and-shakers/-/dvd/ref=pd_gw_msd2/103-3111065-2579065>Dorothy L. Sayers Mysteries (Strong Poison / Have His Carcass / Gaudy Night)</a>
|
||||
<font face=verdana,arial,helvetica size=-1>
|
||||
<b>DVD</b>
|
||||
<br>~ Dorothy L. Sayers
|
||||
</font>
|
||||
</font>
|
||||
</td></tr>
|
||||
<tr><td valign=top align=center>
|
||||
<img src="http://g-images.amazon.com/images/G/01/icons/uparrow_green2.gif" width=13 height=11 alt="Up">
|
||||
</td>
|
||||
<td valign=top>
|
||||
<font color=#339900 face=verdana,arial,helvetica size=-1><b>2,415%</b></font> </td></tr>
|
||||
<tr><td valign=top align=left>
|
||||
<img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
|
||||
</td>
|
||||
<td valign=top>
|
||||
<font face=verdana,arial,helvetica size=-1><a href=/exec/obidos/tg/new-for-you/movers-and-shakers/-/books/ref=pd_gw_msb2/103-3111065-2579065>Artemis Fowl</a>
|
||||
<br><font face=verdana,arial,helvetica size=-1>by Eoin Colfer</font>
|
||||
</font>
|
||||
</td></tr>
|
||||
<tr><td colspan=2>
|
||||
<img src="http://g-images.amazon.com/images/G/01/icons/orange-arrow.gif" width=10 height=9 border=0> <font face=verdana,arial,helvetica size=-1><b><a href=/exec/obidos/tg/new-for-you/movers-and-shakers/-/books/ref=pd_gw_msgr/103-3111065-2579065>More Movers & Shakers</a></b>
|
||||
<br>
|
||||
</td></tr></table>
|
||||
</td></tr></table>
|
||||
</td></tr></table>
|
||||
</td></tr></table>
|
||||
<br clear="all">
|
||||
<center>
|
||||
<form method="post" action="/exec/obidos/search-handle-form/103-3111065-2579065">
|
||||
<table border=0 width=100% cellpadding=1 cellspacing=0 bgcolor=#999999>
|
||||
<tr><td>
|
||||
<table border=0 width=100% bgcolor=#ffffff cellspacing=0 cellpadding=5 class="small">
|
||||
<tr valign=top><td width=33% class="small">
|
||||
<b>Where's My Stuff?</b><br>
|
||||
• Track your <a href="/exec/obidos/flex-sign-in/ref=hy_f_1/103-3111065-2579065?opt=ab&page=help/ya-sign-in-secure.html&response=order-history-filtered&method=POST&ss-order-filter=wheres-my-stuff&return-url=order-history-filtered">recent orders</a>.<br>
|
||||
• View or change your orders in <a href="/exec/obidos/account-access-login/ref=hy_f_2/103-3111065-2579065">Your Account</a>.
|
||||
<script language="JavaScript1.1" type="text/javascript">
|
||||
<!--
|
||||
var agt=navigator.userAgent.toLowerCase();
|
||||
var is_major = parseInt(navigator.appVersion);
|
||||
var is_nav = ((agt.indexOf('mozilla')!=-1) && (agt.indexOf('spoofer')==-1)
|
||||
&& (agt.indexOf('compatible') == -1) && (agt.indexOf('opera')==-1)
|
||||
&& (agt.indexOf('webtv')==-1) && (agt.indexOf('hotjava')==-1));
|
||||
var is_gecko = (agt.indexOf('gecko') != -1);
|
||||
var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
|
||||
var is_aol = (agt.indexOf("aol") != -1);
|
||||
var is_opera = (agt.indexOf("opera") != -1);
|
||||
var is_win = ( (agt.indexOf("win")!=-1) || (agt.indexOf("16bit")!=-1) );
|
||||
//-->
|
||||
</script>
|
||||
<script language="JavaScript1.1" type="text/javascript">
|
||||
<!--
|
||||
var OpenedWin;
|
||||
function openWin (URL, width, height) {
|
||||
OpenedWin = window.open(URL, "demo_window", "width="+width+",height="+height+",status=no,menubar=no,location=no,toolbar=no,directories=no,scrollbars=no");
|
||||
if (! is_aol) {
|
||||
var NewX = (screen.availWidth/2)-(width/2);
|
||||
var NewY = (screen.availHeight/2)-(height/2);
|
||||
OpenedWin.moveTo(NewX, NewY);
|
||||
NewX = null;
|
||||
NewY = null;
|
||||
}
|
||||
}
|
||||
function launch (URL, width, height) {
|
||||
if (!URL || !width || !height) {
|
||||
alert("Error");
|
||||
} else if (width>screen.availWidth || height>screen.availHeight) {
|
||||
var message;
|
||||
message = "Your screen resolution is too low to display the demo.\nClick 'OK' if you wish to continue anyway.\n";
|
||||
message += '\n Your screen resolution: '+screen.width+' x '+screen.height;
|
||||
message += ' | Viewable: '+screen.availWidth+' x '+screen.availHeight;
|
||||
message += '\n Required: '+width+' x '+height;
|
||||
if (confirm(message)) {
|
||||
message = "If you can not find the close buttons, use your keyboard:\n";
|
||||
message += 'Windows: ALT+F4\n';
|
||||
message += 'Macintosh: CONTROL+W';
|
||||
alert(message);
|
||||
openWin(URL, width, height);
|
||||
}
|
||||
} else {
|
||||
openWin(URL, width, height);
|
||||
}
|
||||
}
|
||||
function displayLink(text){
|
||||
if ( is_major >= 4 && is_win && ( is_nav || is_ie || is_opera || is_gecko ) ) {
|
||||
document.write(text);
|
||||
};
|
||||
}
|
||||
//-->
|
||||
</script>
|
||||
<script language="JavaScript1.1" type="text/javascript">
|
||||
<!--
|
||||
displayLink('<br>• See our <b><a href=javascript:launch(\'/exec/obidos/subst/help/demo-wms/display-demo.html/ref=hy_f_demo/103-3111065-2579065\',788,444)>animated demo</a></b>!');
|
||||
//-->
|
||||
</script>
|
||||
</td>
|
||||
<td width=33% class="small">
|
||||
<b>Shipping & Returns</b><br>
|
||||
• See our <a href="/exec/obidos/tg/browse/-/468520/ref=hy_f_3/103-3111065-2579065">shipping rates & policies</a>.<br>
|
||||
• <a href="/exec/obidos/subst/help/self-service-returns.html/ref=hy_f_4/103-3111065-2579065">Return</a> an item (here's our <a href="/exec/obidos/tg/browse/-/468532/103-3111065-2579065">Returns Policy</a>).
|
||||
</td>
|
||||
<td width=33% class="small">
|
||||
<b>Need Help?</b><br>
|
||||
• Forgot your password? <a href="/exec/obidos/self-service-forgot-password-get-email/ref=hy_f_6/103-3111065-2579065">Click here</a>.
|
||||
<br>
|
||||
• <a href="/exec/obidos/subst/gifts/gift-certificates/gc-redeeming.html/ref=hy_f_7/103-3111065-2579065">Redeem</a> or <a href="/exec/obidos/subst/gifts/gift-services/gift-certificates.html/ref=hy_f_8/103-3111065-2579065">buy</a> a gift certificate.<br>
|
||||
• <a href="/exec/obidos/tg/browse/-/508510/ref=hy_f_9/103-3111065-2579065">Visit our Help department</a>. <br>
|
||||
</td></tr>
|
||||
</table>
|
||||
</td></tr>
|
||||
<tr><td>
|
||||
<table border=0 width=100% bgcolor=#FFCC66 cellspacing=0 cellpadding=5>
|
||||
<tr><td align=center class="small">
|
||||
<b>Search </b>
|
||||
<select name=index>
|
||||
<option value=blended selected>All Products
|
||||
<option value=books>Books
|
||||
<option value=music>Popular Music
|
||||
<option value=music-dd>Music Downloads
|
||||
<option value=classical>Classical Music
|
||||
<option value="dvd">DVD
|
||||
<option value="vhs">VHS
|
||||
<option value=theatrical>Movie Showtimes
|
||||
<option value=toys>Toys
|
||||
<option value=baby>Baby
|
||||
<option value=pc-hardware>Computers
|
||||
<option value=videogames>Video Games
|
||||
<option value=electronics>Electronics
|
||||
<option value=photo>Camera & Photo
|
||||
<option value=software>Software
|
||||
<option value=tools>Tools & Hardware
|
||||
<option value=magazines>Magazines
|
||||
<option value=garden>Outdoor Living
|
||||
<option value=kitchen>Kitchen
|
||||
<option value=travel>Travel
|
||||
<option value=wireless-phones>Cell Phones & Service
|
||||
<option value=outlet>Outlet
|
||||
<option value=auction-redirect>Auctions
|
||||
<option value=fixed-price-redirect>zShops
|
||||
</select>
|
||||
<b> for </b>
|
||||
<input type="text" name="field-keywords" size="15">
|
||||
<input type=image name="Go" value="Go!" border=0 alt="Go!" src=http://g-images.amazon.com/images/G/01/v9/search-browse/go-button-gateway.gif width=21 height=21 border=0 align=absmiddle > </td></tr></table>
|
||||
</td></tr>
|
||||
</table>
|
||||
</form>
|
||||
<p align=center>
|
||||
<b class=h1>Stuart D. Gathman, make </b><font color=#990000><b class=sans>$</b><b class=sans>310.61</b></font><br />
|
||||
<b class=sans>Sell <a href="/exec/obidos/flex-sign-in/ref=sdp_bbump_gw/103-3111065-2579065?opt=an&page=misc/login/flex-sign-in-secure.html&response=tg/stores/static/-/used/sell-your-collection/1/">your past purchases</a> at Amazon.com today!</b>
|
||||
</p>
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<td width="50%" valign="top" align="left">
|
||||
<span class="small"><a href=/exec/obidos/change-style/subst/home/redirect.html/103-3111065-2579065>Text Only</a></span>
|
||||
</td>
|
||||
<td width="50%" valign="top" align="right" class="small">
|
||||
<a href="#top">Top of Page</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<center>
|
||||
<p>
|
||||
<a href=/exec/obidos/subst/home/all-stores.html/ref=gw_bt_st/103-3111065-2579065>Directory of All Stores</a><p>
|
||||
Our International Sites:
|
||||
<a href="/exec/obidos/redirect-to-external-url/ref=gw_bt_uk/103-3111065-2579065?path=http%3A//www.amazon.co.uk/exec/obidos/redirect-home%3Ftag%3Dintl-usgt-ukhome-21%26site%3Damazon">United Kingdom</a>
|
||||
|
|
||||
<a href="/exec/obidos/redirect-to-external-url/ref=gw_bt_de/103-3111065-2579065?path=http%3A//www.amazon.de/exec/obidos/redirect-home%3Ftag%3Dintl-usgt-dehome-21%26site%3Dhome">Germany</a>
|
||||
|
|
||||
<a href="/exec/obidos/redirect-to-external-url/ref=gw_bt_jp/103-3111065-2579065?path=http%3A//www.amazon.co.jp/exec/obidos/redirect-home%3Ftag%3Dintl-usgatew-jphome-22%26site%3Damazon">Japan</a>
|
||||
 |
|
||||
<a href="/exec/obidos/redirect-to-external-url/ref=gw_bt_fr/103-3111065-2579065?path=http%3A//www.amazon.fr/exec/obidos/redirect-home%3Fsite%3Damazon%26tag%3Dusfr-gatew-footer-21">France</a>
|
||||
<p>
|
||||
<a href=/exec/obidos/tg/browse/-/508510/ref=gw_bt_he/103-3111065-2579065>Help</a> |
|
||||
<a href=/exec/obidos/shopping-basket/ref=gw_bt_sc/103-3111065-2579065>Shopping Cart</a> |
|
||||
<a href=/exec/obidos/account-access-login/ref=gw_bt_ya/103-3111065-2579065>Your Account</a> |
|
||||
<a href="http://s1.amazon.com/exec/varzea/ts/announcement-list-zshops/slp/ref=gw_bt_si/103-3111065-2579065">Sell Items</a> |
|
||||
<a href="/exec/obidos/flex-sign-in/ref=gw_bt_oc/103-3111065-2579065?opt=a&page=ordering/one-click-address-sign-in-secure.html&response=one-click-main&method=GET&return-url=one-click-main">1-Click Settings</a>
|
||||
<p>
|
||||
<a href=/exec/obidos/subst/misc/company-info.html/ref=gw_bt_aa/103-3111065-2579065>About Amazon.com</a> |
|
||||
<a href=/exec/obidos/tg/stores/job-listings/-/generic/home/103-3111065-2579065>Join Our Staff</a> |
|
||||
<a href="/exec/obidos/subst/associates/join/associates.html/ref=gw_bt_as/103-3111065-2579065">Join Associates</a> |
|
||||
<a href=/exec/obidos/subst/partners/direct/direct-application.html/ref=gw_bt_ad/103-3111065-2579065>Join Advantage</a> |
|
||||
<a href="http://s1.amazon.com/exec/varzea/subst/fx/home.html/ref=gw_bt_hs/103-3111065-2579065">Join Honor System</a>
|
||||
</center>
|
||||
<center>
|
||||
<p>
|
||||
<div class="tiny" align=center>
|
||||
<A HREF="/exec/obidos/subst/misc/policy/conditions-of-use.html/103-3111065-2579065">Conditions of Use</A> | <A HREF="/exec/obidos/tg/browse/-/468496/103-3111065-2579065">Privacy Notice</A> © 1996-2002, Amazon.com, Inc. or its affiliates
|
||||
</div>
|
||||
</center>
|
||||
<!-- whfhYn47qD1fv3PW2R8XWAkFcMwteHFKxorD -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
--------------59A46341C90BA737DD47867B--
|
||||
|
||||
-29
@@ -1,7 +1,4 @@
|
||||
# $Log$
|
||||
# Revision 1.4 2005/07/20 14:49:44 customdesigned
|
||||
# Handle corrupt and empty ZIP files.
|
||||
#
|
||||
# Revision 1.3 2005/06/17 01:49:39 customdesigned
|
||||
# Handle zip within zip.
|
||||
#
|
||||
@@ -29,7 +26,6 @@ import socket
|
||||
import StringIO
|
||||
import email
|
||||
import sys
|
||||
import Milter
|
||||
from email import Errors
|
||||
|
||||
samp1_txt1 = """Dear Agent 1
|
||||
@@ -150,31 +146,6 @@ class MimeTestCase(unittest.TestCase):
|
||||
# test zip within zip
|
||||
self.testDefang('ziploop',1,'stuart@bmsi.com.zip')
|
||||
|
||||
def _chk_name(self,name):
|
||||
self.filename = name
|
||||
|
||||
def _chk_attach(self,msg):
|
||||
"Filter attachments by content."
|
||||
# check for bad extensions
|
||||
mime.check_name(msg,ckname=self._chk_name,scan_zip=True)
|
||||
# remove scripts from HTML
|
||||
mime.check_html(msg)
|
||||
# don't let a tricky virus slip one past us
|
||||
msg = msg.get_submsg()
|
||||
if isinstance(msg,email.Message.Message):
|
||||
return mime.check_attachments(msg,self._chk_attach)
|
||||
return Milter.CONTINUE
|
||||
|
||||
def testCheckAttach(self,fname="test1"):
|
||||
# test1 contains a very long filename
|
||||
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/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)
|
||||
|
||||
def testHTML(self,fname=""):
|
||||
result = StringIO.StringIO()
|
||||
filter = mime.HTMLScriptFilter(result)
|
||||
|
||||
@@ -7,7 +7,6 @@ import StringIO
|
||||
|
||||
class TestMilter(sample.sampleMilter):
|
||||
|
||||
_protocol = 0
|
||||
def __init__(self):
|
||||
self.logfp = open("test/milter.log","a")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user