Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 cvs2svn
|
07503a8dea |
@@ -7,9 +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
|
||||
|
||||
+30
-458
@@ -1,33 +1,22 @@
|
||||
## @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.7'
|
||||
# A thin OO wrapper for the milter module
|
||||
|
||||
__version__ = '0.9.2'
|
||||
|
||||
import os
|
||||
import milter
|
||||
import thread
|
||||
|
||||
from milter import *
|
||||
from functools import wraps
|
||||
|
||||
_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()
|
||||
@@ -35,7 +24,6 @@ def uniqueID():
|
||||
_seq_lock.release()
|
||||
return seqno
|
||||
|
||||
## @private
|
||||
OPTIONAL_CALLBACKS = {
|
||||
'connect':(P_NR_CONN,P_NOCONNECT),
|
||||
'hello':(P_NR_HELO,P_NOHELO),
|
||||
@@ -48,322 +36,72 @@ OPTIONAL_CALLBACKS = {
|
||||
'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_HDR_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_HDR_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__)
|
||||
def wrapper(self,*args):
|
||||
if func(self,*args) != CONTINUE:
|
||||
raise RuntimeError('%s return code must be CONTINUE with @nocallback'
|
||||
% func.__name__)
|
||||
return CONTINUE
|
||||
return wrapper
|
||||
return func
|
||||
|
||||
## Function decorator to disable callback reply.
|
||||
# If the MTA supports it, tells the MTA not to wait for a reply from
|
||||
# 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:
|
||||
except KeyErro:
|
||||
raise ValueError(
|
||||
'@noreply applied to non-optional method: '+func.__name__)
|
||||
@wraps(func)
|
||||
def wrapper(self,*args):
|
||||
rc = func(self,*args)
|
||||
if self._protocol & nr_mask:
|
||||
if rc != CONTINUE:
|
||||
raise RuntimeError('%s return code must be CONTINUE with @noreply'
|
||||
% func.__name__)
|
||||
return NOREPLY
|
||||
if self._protocol & nr_mask: return NOREPLY
|
||||
return rc
|
||||
wrapper.milter_protocol = nr_mask
|
||||
return wrapper
|
||||
|
||||
## 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.
|
||||
# A do nothing Milter base class from which python milters should derive
|
||||
# unless they are using the milter C module directly.
|
||||
|
||||
# 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."
|
||||
"The core class interface to the milter module."
|
||||
|
||||
## Attach this Milter to the low level milter.milterContext object.
|
||||
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
|
||||
if ctx:
|
||||
ctx.setpriv(self)
|
||||
|
||||
## Defined by subclasses to write log messages.
|
||||
def log(self,*msg): pass
|
||||
## Called for each connection to the MTA. Called by the
|
||||
# <a href="milter_api/xxfi_connect.html">
|
||||
# xxfi_connect</a> callback.
|
||||
# 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>
|
||||
# To vary behavior based on what port the client connected to,
|
||||
# for example skipping blacklist checks for port 587 (which must
|
||||
# be authenticated), use @link #getsymval getsymval('{daemon_port}') @endlink.
|
||||
# The <code>{daemon_port}</code> macro must be enabled in sendmail.cf
|
||||
# <pre>
|
||||
# O Milter.macros.connect=j, _, {daemon_name}, {daemon_port}, {if_name}, {if_addr}
|
||||
# </pre>
|
||||
# or sendmail.mc
|
||||
# <pre>
|
||||
# define(`confMILTER_MACROS_CONNECT', ``j, _, {daemon_name}, {daemon_port}, {if_name}, {if_addr}'')dnl
|
||||
# </pre>
|
||||
# @param hostname the PTR name or bracketed IP of the SMTP client
|
||||
# @param family <code>socket.AF_INET</code>, <code>socket.AF_INET6</code>,
|
||||
# or <code>socket.AF_UNIX</code>
|
||||
# @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. Called by the
|
||||
# <a href="milter_api/xxfi_envfrom.html">
|
||||
# xxfi_envfrom</a> callback.
|
||||
# Returning REJECT rejects the message, but not the connection.
|
||||
# The sender is the "envelope" from as defined by
|
||||
# <a href="http://tools.ietf.org/html/rfc5321">RFC 5321</a>.
|
||||
# For the From: header (author) defined in
|
||||
# <a href="http://tools.ietf.org/html/rfc5322">RFC 5322</a>,
|
||||
# see @link #header the header callback @endlink.
|
||||
@nocallback
|
||||
def envfrom(self,f,*str): return CONTINUE
|
||||
## Called when the SMTP client says RCPT TO. Called by the
|
||||
# <a href="milter_api/xxfi_envrcpt.html">
|
||||
# xxfi_envrcpt</a> callback.
|
||||
# Returning REJECT rejects the current recipient, not the entire message.
|
||||
# The recipient is the "envelope" recipient as defined by
|
||||
# <a href="http://tools.ietf.org/html/rfc5321">RFC 5321</a>.
|
||||
# For recipients defined in
|
||||
# <a href="http://tools.ietf.org/html/rfc5322">RFC 5322</a>,
|
||||
# for example To: or Cc:, see @link #header the header callback @endlink.
|
||||
@nocallback
|
||||
def envrcpt(self,to,*str): return CONTINUE
|
||||
## Called when the SMTP client says DATA.
|
||||
# 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
|
||||
def body(self,unused): return CONTINUE
|
||||
@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
|
||||
# Return mask of SMFIP_N.. protocol option bits to clear for this class
|
||||
@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
|
||||
p = 0
|
||||
for func,(nr,nc) in OPTIONAL_CALLBACKS.items():
|
||||
func = getattr(klass,func)
|
||||
ca = getattr(func,'milter_protocol',0)
|
||||
@@ -372,25 +110,13 @@ class Base(object):
|
||||
klass._protocol_mask = p
|
||||
return p
|
||||
|
||||
## Negotiate milter protocol options. Called by the
|
||||
# <a href="milter_api/xxfi_negotiate.html">
|
||||
# xffi_negotiate</a> callback. This is an advanced callback,
|
||||
# do not override unless you know what you are doing. Most
|
||||
# negotiation can be done simply by using the supplied
|
||||
# class and function decorators.
|
||||
# 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
|
||||
# marked @nocallback and @noreply respectively
|
||||
def negotiate(self,opts):
|
||||
try:
|
||||
self._actions,p,f1,f2 = opts
|
||||
opts[1] = self._protocol = p & ~self.protocol_mask()
|
||||
opts[1] = self._protocol = \
|
||||
p & ~self.protocol_mask() & ~P_RCPT_REJ & ~P_HDR_LEADSPC
|
||||
opts[2] = 0
|
||||
opts[3] = 0
|
||||
#self.log("Negotiated:",opts)
|
||||
@@ -400,46 +126,15 @@ class Base(object):
|
||||
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.
|
||||
# See <a href="milter_api/smfi_getsymval.html">
|
||||
# smfi_getsymval</a> for default sendmail macros.
|
||||
# @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. Any '%' in a message line
|
||||
# must be doubled, or libmilter will silently ignore the setreply.
|
||||
# Beginning with 0.9.6, we test for that case and throw ValueError to avoid
|
||||
# head scratching. What will <i>really</i> irritate you, however,
|
||||
# is that if you carefully double any '%%', your message will be
|
||||
# sent - but with the '%%' still doubled!
|
||||
# See <a href="milter_api/smfi_setreply.html">
|
||||
# smfi_setreply</a> for more information.
|
||||
# @param rcode The three-digit (RFC 821/2821) SMTP reply code as a string.
|
||||
# rcode cannot be None, and <b>must be a valid 4XX or 5XX reply code</b>.
|
||||
# @param xcode The extended (RFC 1893/2034) reply code. If xcode is None,
|
||||
# no extended code is used. Otherwise, xcode must conform to RFC 1893/2034.
|
||||
# @param msg The text part of the SMTP reply. If msg is None,
|
||||
# an empty message is used.
|
||||
# @param ml Optional additional message lines.
|
||||
# If sendmail does not support setmlreply, then only the
|
||||
# first msg line is used.
|
||||
def setreply(self,rcode,xcode=None,msg=None,*ml):
|
||||
for m in (msg,)+ml:
|
||||
if 1 in [len(s)&1 for s in R.findall(m)]:
|
||||
raise ValueError("'%' must be doubled: "+m)
|
||||
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
|
||||
# may only be called from negotiate callback
|
||||
def setsmlist(self,stage,macros):
|
||||
if not self._actions & SETSMLIST: raise DisabledAction("SETSMLIST")
|
||||
if type(macros) in (list,tuple):
|
||||
@@ -447,131 +142,49 @@ class Base(object):
|
||||
return self._ctx.setsmlist(stage,macros)
|
||||
|
||||
# Milter methods which can only be called from eom callback.
|
||||
|
||||
## Add a mail header field.
|
||||
# Calls <a href="milter_api/smfi_addheader.html">
|
||||
# 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="milter_api/smfi_chgheader.html">
|
||||
# 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="milter_api/smfi_addrcpt.html">
|
||||
# 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="milter_api/smfi_delrcpt.html">
|
||||
# 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="milter_api/smfi_replacebody.html">
|
||||
# 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="milter_api/smfi_chgfrom.html">
|
||||
# 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="milter_api/smfi_quarantine.html">
|
||||
# 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="milter_api/smfi_progress.html">
|
||||
# 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.
|
||||
# A logging but otherwise do nothing Milter base class included
|
||||
# for compatibility with previous versions of pymilter.
|
||||
|
||||
class Milter(Base):
|
||||
"A simple class interface to the milter module."
|
||||
|
||||
## Provide simple logging to sys.stdout
|
||||
def log(self,*msg):
|
||||
print('Milter:',end=None)
|
||||
for i in msg: print(i,end=None)
|
||||
print()
|
||||
print 'Milter:',
|
||||
for i in msg: print i,
|
||||
print
|
||||
|
||||
@noreply
|
||||
def connect(self,hostname,family,hostaddr):
|
||||
@@ -627,25 +240,13 @@ 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.
|
||||
factory = Milter
|
||||
|
||||
## @private
|
||||
# @brief Connect context to connection instance and return enabled callbacks.
|
||||
def negotiate_callback(ctx,opts):
|
||||
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:
|
||||
@@ -655,8 +256,6 @@ def connect_callback(ctx,hostname,family,hostaddr,nr_mask=P_NR_CONN):
|
||||
m._setctx(ctx)
|
||||
return m.connect(hostname,family,hostaddr)
|
||||
|
||||
## @private
|
||||
# @brief Disconnect milterContext and call close method.
|
||||
def close_callback(ctx):
|
||||
m = ctx.getpriv()
|
||||
if not m: return CONTINUE
|
||||
@@ -666,10 +265,8 @@ def close_callback(ctx):
|
||||
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('=')
|
||||
@@ -677,18 +274,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
|
||||
@@ -703,11 +288,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,
|
||||
@@ -750,15 +330,11 @@ def runmilter(name,socketname,timeout = 0):
|
||||
|
||||
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
|
||||
negotiate=negotiate_callback
|
||||
)
|
||||
start_seq = _seq
|
||||
try:
|
||||
@@ -772,7 +348,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
|
||||
## @example milter-nomix.py
|
||||
#
|
||||
|
||||
+21
-55
@@ -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.
|
||||
|
||||
@@ -70,24 +57,15 @@ class Session(object):
|
||||
pre: qtype in ['A', 'AAAA', 'MX', 'PTR', 'TXT', 'SPF']
|
||||
post: isinstance(__return__, types.ListType)
|
||||
"""
|
||||
if name.endswith('.'): name = name[:-1]
|
||||
if not reduce(lambda x,y:x and 0 < len(y) < 64, name.split('.'),True):
|
||||
return [] # invalid DNS name (too long or empty)
|
||||
name = name.lower()
|
||||
result = self.cache.get( (name, qtype) )
|
||||
cname = None
|
||||
if result: return result
|
||||
cnamek = (name,'CNAME')
|
||||
cname = self.cache.get( cnamek )
|
||||
|
||||
if cname:
|
||||
cname = cname[0]
|
||||
else:
|
||||
if not result:
|
||||
safe2cache = Session.SAFE2CACHE
|
||||
for k, v in DNSLookup(name, qtype):
|
||||
if k == cnamek:
|
||||
if k == (name, 'CNAME'):
|
||||
cname = v
|
||||
if k[1] == 'CNAME' or (qtype,k[1]) in safe2cache:
|
||||
if (qtype,k[1]) in safe2cache:
|
||||
self.cache.setdefault(k, []).append(v)
|
||||
result = self.cache.get( (name, qtype), [])
|
||||
if not result and cname:
|
||||
@@ -97,23 +75,11 @@ class Session(object):
|
||||
#return result # if too many == NX_DOMAIN
|
||||
raise DNSError('Length of CNAME chain exceeds %d' % MAX_CNAME)
|
||||
cnames[name] = cname
|
||||
if cname.lower().rstrip('.') in cnames:
|
||||
raise DNSError('CNAME loop')
|
||||
if cname in cnames:
|
||||
raise DNSError, 'CNAME loop'
|
||||
result = self.dns(cname, qtype, cnames=cnames)
|
||||
if result:
|
||||
self.cache[(name,qtype)] = result
|
||||
return result
|
||||
|
||||
def dns_txt(self, domainname, enc='ascii'):
|
||||
"Get a list of TXT records for a domain name."
|
||||
if domainname:
|
||||
try:
|
||||
return [''.join(s.decode(enc) for s in a)
|
||||
for a in self.dns(domainname, 'TXT')]
|
||||
except UnicodeEncodeError:
|
||||
raise DNSError('Non-ascii character in SPF TXT record.')
|
||||
return []
|
||||
|
||||
DNS.DiscoverNameServers()
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
+6
-68
@@ -5,21 +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
|
||||
#
|
||||
@@ -41,31 +26,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 +34,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=''):
|
||||
"""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')
|
||||
@@ -125,23 +73,13 @@ def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
|
||||
code,resp = smtp.docmd('MAIL FROM: <%s>'%ourfrom)
|
||||
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)
|
||||
code,resp = smtp.rcpt(mailfrom)
|
||||
if code not in (250,251):
|
||||
badrcpts[rcpt] = (code,resp)# permanent error
|
||||
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 +90,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
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ class Greylist(object):
|
||||
# expired
|
||||
log.debug('Expired greylist: %s',key)
|
||||
r = Record()
|
||||
elif now < r.firstseen + self.greylist_time + 5:
|
||||
elif now < r.firstseen + self.greylist_time:
|
||||
# still greylisted
|
||||
log.debug('Early greylist: %s',key)
|
||||
#r = Record()
|
||||
|
||||
-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
|
||||
+10
-116
@@ -1,66 +1,23 @@
|
||||
## @package Milter.utils
|
||||
# Miscellaneous functions.
|
||||
#
|
||||
|
||||
import re
|
||||
import struct
|
||||
import socket
|
||||
import email.Errors
|
||||
import email.base64mime
|
||||
from fnmatch import fnmatchcase
|
||||
from email.Header import decode_header
|
||||
from binascii import a2b_base64
|
||||
#import email.Utils
|
||||
import rfc822
|
||||
|
||||
dnsre = re.compile(r'^[a-z][-a-z\d.]+$', re.IGNORECASE)
|
||||
PAT_IP4 = r'\.'.join([r'(?:\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])']*4)
|
||||
ip4re = re.compile(PAT_IP4+'$')
|
||||
ip6re = re.compile( '(?:%(hex4)s:){6}%(ls32)s$'
|
||||
'|::(?:%(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.strip())
|
||||
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
|
||||
@@ -70,27 +27,8 @@ def iniplist(ipaddr,iplist):
|
||||
True
|
||||
>>> iniplist('192.168.0.45',['192.168.0.*'])
|
||||
True
|
||||
>>> iniplist('4.2.2.2',['b.resolvers.Level3.net'])
|
||||
True
|
||||
>>> iniplist('2607:f8b0:4004:801::',['google.com/40'])
|
||||
True
|
||||
>>> iniplist('4.2.2.2',['nothing.example.com'])
|
||||
False
|
||||
>>> iniplist('2001:610:779:0:223:6cff:fe9a:9cf3',['127.0.0.1','172.20.1.0/24','2001:610:779::/48'])
|
||||
True
|
||||
>>> iniplist('2G01:610:779:0:223:6cff:fe9a:9cf3',['127.0.0.1','172.20.1.0/24','2001:610:779::/48'])
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
ValueError: Invalid ip syntax:2G01:610:779:0:223:6cff:fe9a:9cf3
|
||||
"""
|
||||
if ip4re.match(ipaddr):
|
||||
fam = socket.AF_INET
|
||||
ipnum = addr2bin(ipaddr)
|
||||
elif ip6re.match(ipaddr):
|
||||
fam = socket.AF_INET6
|
||||
ipnum = bin2long6(inet_pton(ipaddr))
|
||||
else:
|
||||
raise ValueError('Invalid ip syntax:'+ipaddr)
|
||||
for pat in iplist:
|
||||
p = pat.split('/',1)
|
||||
if ip4re.match(p[0]):
|
||||
@@ -100,29 +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 dnsre.match(p[0]):
|
||||
try:
|
||||
sfx = '/'.join(['']+p[1:])
|
||||
addrlist = [r[4][0]+sfx for r in socket.getaddrinfo(p[0],25,fam)]
|
||||
if iniplist(ipaddr,addrlist):
|
||||
return True
|
||||
except socket.gaierror: pass
|
||||
elif fnmatchcase(ipaddr,pat):
|
||||
return True
|
||||
return False
|
||||
|
||||
## Split email into Fullname and address.
|
||||
# This replaces <code>email.Utils.parseaddr</code> but fixes
|
||||
# some <a href="http://bugs.python.org/issue1025395">tricky test cases</a>.
|
||||
# Additional tricky cases are still broken. Patches welcome.
|
||||
#
|
||||
def parseaddr(t):
|
||||
"""Split email into Fullname and address.
|
||||
|
||||
@@ -160,16 +79,6 @@ def parseaddr(t):
|
||||
return rfc822.parseaddr('%s<%s>' % (t[:pos].strip(),addrspec))
|
||||
return res
|
||||
|
||||
## Fix email.base64mime.decode to add any missing padding
|
||||
def decode(s, convert_eols=None):
|
||||
if not s: return s
|
||||
while len(s) % 4: s += '=' # add missing padding
|
||||
dec = a2b_base64(s)
|
||||
if convert_eols:
|
||||
return dec.replace(CRLF, convert_eols)
|
||||
return dec
|
||||
|
||||
email.base64mime.decode = decode
|
||||
|
||||
def parse_addr(t):
|
||||
"""Split email into user,domain.
|
||||
@@ -182,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.
|
||||
@@ -214,18 +109,17 @@ 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:
|
||||
u.append(unicode(s))
|
||||
u = u''.join(u)
|
||||
for enc in ('us-ascii','iso-8859-1','utf-8'):
|
||||
u = ''.join(u)
|
||||
for enc in ('us-ascii','iso-8859-1','utf8'):
|
||||
try:
|
||||
return u.encode(enc)
|
||||
except UnicodeError: continue
|
||||
except UnicodeDecodeError: pass
|
||||
except LookupError: pass
|
||||
except ValueError: pass
|
||||
except email.Errors.HeaderParseError: pass
|
||||
return val
|
||||
|
||||
@@ -11,24 +11,25 @@ any point, tell Sendmail to reject, discard, or accept the message.
|
||||
Requirements
|
||||
------------
|
||||
|
||||
Python milter extension: http://https://pypi.python.org/pypi/pymilter/
|
||||
This python milter extension: http://www.bmsi.com/python/milter.html
|
||||
Python: http://www.python.org
|
||||
Sendmail: http://www.sendmail.org
|
||||
|
||||
NB: From Sendmail's libmilter/README:
|
||||
|
||||
libmilter requires pthread support in the operating system. Moreover, it
|
||||
requires that the library functions it uses are thread safe; which is true
|
||||
for the operating systems libmilter has been developed and tested on. On
|
||||
some operating systems this requires special compile time options (e.g.,
|
||||
not just -pthread). libmilter is currently known to work on (modulo problems
|
||||
in the pthread support of some specific versions):
|
||||
not just -pthread). libmilter is currently known to work on (modulo
|
||||
problems in the pthread support of some specific versions):
|
||||
|
||||
FreeBSD 3.x, 4.x
|
||||
SunOS 5.x (x >= 5)
|
||||
AIX 4.3.x
|
||||
HP UX 11.x
|
||||
Linux (recent versions/distributions)
|
||||
OpenBSD
|
||||
AIX 4.1.5
|
||||
|
||||
libmilter is currently not supported on:
|
||||
|
||||
@@ -68,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.
|
||||
|
||||
@@ -109,6 +111,28 @@ _FFR_MILTER for the cf macros. For example,
|
||||
|
||||
m4 -D_FFR_MILTER ../m4/cf.m4 myconfig.mc > myconfig.cf
|
||||
|
||||
|
||||
RedHat 6.2 Notes
|
||||
----------------
|
||||
|
||||
The Redhat 6.2 sendmail RPM does not enable milter. You can obtain a
|
||||
modified spec file at
|
||||
|
||||
http://www.bmsi.com/linux/rh62/sendmail-rhmilter.spec
|
||||
|
||||
use it to rebuild the Redhat 7.2 SRPM. The RH6.2 SRPM does not have
|
||||
recent sendmail security patches.
|
||||
|
||||
RedHat 7.2 Notes
|
||||
----------------
|
||||
|
||||
The Redhat 7.2 sendmail RPM enables milter in sendmail - but does not include
|
||||
the headers needed for compiling a milter. You can obtain a modified spec
|
||||
file with a sendmail-devel package that includes the needed static libraries
|
||||
and headers at
|
||||
|
||||
http://www.bmsi.com/linux/sendmail-rh72.spec
|
||||
|
||||
IPv6 Notes
|
||||
----------
|
||||
|
||||
|
||||
@@ -1,86 +0,0 @@
|
||||
## @mainpage Writing Milters in Python
|
||||
#
|
||||
# At the lowest level, the <code>milter</code> module provides a thin wrapper
|
||||
# around the <a href="milter_api/index.html"> sendmail
|
||||
# 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="milter_overview#SignalHandling">handles
|
||||
# all signals</a> itself, and expects to be called from a single main thread.
|
||||
# It handles SIGTERM, SIGHUP, and SIGINT, mapping the first two to
|
||||
# <a href="milter_api/smfi_stop.html">smfi_stop</a>
|
||||
# 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
|
||||
# <a href="milter-template_8py-example.html">milter-template.py</a>.
|
||||
#
|
||||
# @section Useful python packages for milters
|
||||
#
|
||||
# <a href="https://pypi.python.org/pypi/pyspf">pyspf</a> checks the
|
||||
# SMTP envelope sender (MAIL FROM, passed to the Milter.Base.envfrom callback)
|
||||
# against a Sender Policy published in DNS by the sending domain. This
|
||||
# can prevent forgery of the MAIL FROM. SPF is Sender Policy Framework.
|
||||
#
|
||||
# <a href="https://launchpad.net/dkimpy">pydkim</a> checks a DKIM signature
|
||||
# of the email body and headers against a public key published in DNS by
|
||||
# the signing domain. DKIM is DomainKeys Identified Mail.
|
||||
#
|
||||
# The <a href="https://pypi.python.org/pypi/authres/">authres</a> module
|
||||
# parses and formats the Authentication-Results email header, providing
|
||||
# a standard place to summarize the results from DKIM, SPF, rDNS, SMTP AUTH,
|
||||
# and other email authentication methods.
|
||||
#
|
||||
# <a href="https://pypi.python.org/pypi/pydspam/">pydspam</a> wraps
|
||||
# the libdspam API of the <a href="http://dspam.sourceforge.net/">DSPAM</a>
|
||||
# project.
|
||||
#
|
||||
# @section Milters written with pymilter
|
||||
#
|
||||
# <a href="https://github.com/croessner/vrfydmn">Verify Domain</a> is a
|
||||
# Postfix milter that rejects/fixes manipulated From: header
|
||||
# on a mail host with multiple virtual domains.
|
||||
#
|
||||
# <a href="https://pypi.python.org/pypi/milter/">BMS Milter</a> has several
|
||||
# milters, a big complicated spam filter that integrates multiple
|
||||
# authentication protocols with pydpsm, and two simple ones: spfmilter.py and
|
||||
# dkim-milter.py.
|
||||
#
|
||||
-183
@@ -1,183 +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="milter_api/smfi_getsymval.html">smfi_getsymval</a>.
|
||||
def getsymval(self,sym): pass
|
||||
## Calls <a href="milter_api/smfi_setreply.html">
|
||||
# smfi_setreply</a> or
|
||||
# <a href="milter_api/smfi_setmlreply.html">
|
||||
# smfi_setmlreply</a>.
|
||||
# @param rcode SMTP response code
|
||||
# @param xcode extended SMTP response code
|
||||
# @param msg one or more message lines. If the MTA does not support
|
||||
# multiline messages, only the first is used.
|
||||
def setreply(self,rcode,xcode,*msg): pass
|
||||
## Calls <a href="milter_api/smfi_addheader.html">smfi_addheader</a>.
|
||||
def addheader(self,name,value,idx=-1): pass
|
||||
## Calls <a href="milter_api/smfi_chgheader.html">smfi_chgheader</a>.
|
||||
def chgheader(self,name,idx,value): pass
|
||||
## Calls <a href="milter_api/smfi_addrcpt.html">smfi_addrcpt</a>.
|
||||
def addrcpt(self,rcpt,params=None): pass
|
||||
## Calls <a href="milter_api/smfi_delrcpt.html">smfi_delrcpt</a>.
|
||||
def delrcpt(self,rcpt): pass
|
||||
## Calls <a href="milter_api/smfi_replacebody.html">smfi_replacebody</a>.
|
||||
def replacebody(self,data): pass
|
||||
## Attach a Python object to this connection context.
|
||||
# @return the old value or None
|
||||
def setpriv(self,priv): pass
|
||||
## Return the Python object attached to this connection context.
|
||||
def getpriv(self): pass
|
||||
## Calls <a href="milter_api/smfi_quarantine.html">smfi_quarantine</a>.
|
||||
def quarantine(self,reason): pass
|
||||
## Calls <a href="milter_api/smfi_progress.html">smfi_progress</a>.
|
||||
def progress(self): pass
|
||||
## Calls <a href="milter_api/smfi_chgfrom.html">smfi_chgfrom</a>.
|
||||
def chgfrom(self,sender,param=None): pass
|
||||
## Tell the MTA which macro values we are interested in for a given stage.
|
||||
# Of interest only when you need to squeeze a few more bytes of bandwidth.
|
||||
# It may only be called from the negotiate callback.
|
||||
# The protocol stages are
|
||||
# M_CONNECT, M_HELO, M_ENVFROM, M_ENVRCPT, M_DATA, M_EOM, M_EOH.
|
||||
# Calls <a href="milter_api/smfi_setsymlist.html">smfi_setsymlist</a>.
|
||||
# @param stage protocol stage in which the macro list should be used
|
||||
# @param macrolist a space separated list of macro names
|
||||
def setsymlist(self,stage,macrolist): pass
|
||||
|
||||
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="milter_api/xxfi_negotiate.html">
|
||||
# xxfi_negotiate</a> callback, called to negotiate supported
|
||||
# actions, callbacks, and protocol steps.
|
||||
# @param unknown the
|
||||
# <a href="milter_api/xxfi_unknown.html">
|
||||
# xxfi_unknown</a> callback, called when for SMTP commands
|
||||
# not recognized by the MTA. (Extend SMTP in your milter!)
|
||||
# @param data the
|
||||
# <a href="milter_api/xxfi_data.html">
|
||||
# xxfi_data</a> callback, called when the DATA
|
||||
# SMTP command is received.
|
||||
def register(name,negotiate=None,unknown=None,data=None): pass
|
||||
|
||||
## Attempt to create the socket used to communicate with the MTA.
|
||||
# milter.opensocket() attempts to create the socket specified previously by a
|
||||
# call to milter.setconn() which will be the interface between MTAs and the
|
||||
# %milter. This allows the calling application to ensure that the socket can be
|
||||
# created. If this is not called, milter.main() will do so implicitly.
|
||||
# Calls <a href="milter_api/smfi_opensocket.html">
|
||||
# smfi_opensocket</a>. While not documented for libmilter, my experiments
|
||||
# indicate that you must call register() before calling opensocket().
|
||||
# @param rmsock Try to remove an existing unix domain socket if true.
|
||||
def opensocket(rmsock): pass
|
||||
|
||||
## Transfer control to libmilter.
|
||||
# Calls <a href="milter_api/smfi_main.html">
|
||||
# smfi_main</a>.
|
||||
def main(): pass
|
||||
|
||||
## Set the libmilter debugging level.
|
||||
# <a href="milter_api/smfi_setdbg.html">smfi_setdbg</a>
|
||||
# sets the %milter library's internal debugging level to a new level
|
||||
# so that code details may be traced. A level of zero turns off debugging. The
|
||||
# greater (more positive) the level the more detailed the debugging. Six is the
|
||||
# current, highest, useful value. Must be called before calling main().
|
||||
def setdbg(lev): pass
|
||||
|
||||
## Set timeout for MTA communication.
|
||||
# Calls <a href="milter_api/smfi_settimeout.html">
|
||||
# smfi_settimeout</a>. Must be called before calling main().
|
||||
def settimeout(secs): pass
|
||||
|
||||
## Set socket backlog.
|
||||
# Calls <a href="milter_api/smfi_setbacklog.html">
|
||||
# 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
|
||||
@@ -1,17 +0,0 @@
|
||||
web:
|
||||
doxygen
|
||||
test -L doc/html/milter_api || ln -sf /usr/share/doc/sendmail-devel-* doc/html/milter_api
|
||||
rsync -ravKk doc/html/ spidey2.bmsi.com:/Public/pymilter
|
||||
cd doc/html; zip -r ../../doc .
|
||||
|
||||
VERSION=0.9.6
|
||||
CVSTAG=pymilter-0_9_6
|
||||
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)
|
||||
@@ -1,79 +0,0 @@
|
||||
## A very simple milter to prevent mixing of internal and external mail.
|
||||
# Internal is defined as using one of a list of internal top level domains.
|
||||
# This code is open-source on the same terms as Python.
|
||||
|
||||
import Milter
|
||||
import time
|
||||
import sys
|
||||
from Milter.utils import parse_addr
|
||||
|
||||
internal_tlds = ["corp", "personal"]
|
||||
|
||||
## Determine if a hostname is internal or not.
|
||||
# True if internal, False otherwise
|
||||
def is_internal(hostname):
|
||||
components = hostname.split(".")
|
||||
return components.pop() in internal_tlds:
|
||||
|
||||
# Determine if internal and external hosts are mixed based on a list
|
||||
# of hostnames
|
||||
def are_mixed(hostnames):
|
||||
hostnames_mapped = map(is_internal, hostnames)
|
||||
|
||||
# Num internals
|
||||
num_internal_hosts = hostnames_mapped.count(True)
|
||||
|
||||
# Num externals
|
||||
num_external_hosts = hostnames_mapped.count(False)
|
||||
|
||||
return num_external_hosts >= 1 and num_internal_hosts >= 1
|
||||
|
||||
class NoMixMilter(Milter.Base):
|
||||
|
||||
def __init__(self): # A new instance with each new connection.
|
||||
self.id = Milter.uniqueID() # Integer incremented with each call.
|
||||
|
||||
|
||||
## def envfrom(self,f,*str):
|
||||
@Milter.noreply
|
||||
def envfrom(self, mailfrom, *str):
|
||||
self.mailfrom = mailfrom
|
||||
self.domains = []
|
||||
t = parse_addr(mailfrom)
|
||||
if len(t) > 1:
|
||||
self.domains.append(t[1])
|
||||
else:
|
||||
self.domains.append('local')
|
||||
self.internal = False
|
||||
return Milter.CONTINUE
|
||||
|
||||
## def envrcpt(self, to, *str):
|
||||
def envrcpt(self, to, *str):
|
||||
self.R.append(to)
|
||||
t = parse_addr(to)
|
||||
if len(t) > 1:
|
||||
self.domains.append(t[1])
|
||||
else:
|
||||
self.domains.append('local')
|
||||
|
||||
if are_mixed(self.domains):
|
||||
# FIXME: log recipients collected in self.mailfrom and self.R
|
||||
self.setreply('550','5.7.1','Mixing internal and external TLDs')
|
||||
return Milter.REJECT
|
||||
|
||||
return Milter.CONTINUE
|
||||
|
||||
def main():
|
||||
socketname = "/var/run/nomixsock"
|
||||
timeout = 600
|
||||
# Register to have the Milter factory create instances of your class:
|
||||
Milter.factory = NoMixMilter
|
||||
print "%s milter startup" % time.strftime('%Y%b%d %H:%M:%S')
|
||||
sys.stdout.flush()
|
||||
Milter.runmilter("nomixfilter",socketname,timeout)
|
||||
logq.put(None)
|
||||
bt.join()
|
||||
print "%s nomix milter shutdown" % time.strftime('%Y%b%d %H:%M:%S')
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
+10
-30
@@ -1,6 +1,6 @@
|
||||
## To roll your own milter, create a class that extends Milter.
|
||||
# See the pymilter project at http://bmsi.com/python/milter.html
|
||||
# based on Sendmail's milter API
|
||||
# based on Sendmail's milter API http://www.milter.org/milter_api/api.html
|
||||
# This code is open-source on the same terms as Python.
|
||||
|
||||
## Milter calls methods of your class at milter events.
|
||||
@@ -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,29 +70,28 @@ class myMilter(Milter.Base):
|
||||
|
||||
|
||||
## def envrcpt(self, to, *str):
|
||||
@Milter.noreply
|
||||
def envrcpt(self, to, *str):
|
||||
def envrcpt(self, recipient, *str):
|
||||
rcptinfo = to,Milter.dictfromlist(str)
|
||||
self.R.append(rcptinfo)
|
||||
|
||||
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)
|
||||
@@ -110,6 +101,7 @@ class myMilter(Milter.Base):
|
||||
self.addrcpt('<%s>' % 'spy@example.com')
|
||||
return Milter.ACCEPT
|
||||
|
||||
|
||||
def close(self):
|
||||
# always called, even when abort is called. Clean up
|
||||
# any external resources here.
|
||||
@@ -122,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
|
||||
@@ -150,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__":
|
||||
|
||||
+41
-165
@@ -35,34 +35,6 @@ $ python setup.py help
|
||||
libraries=["milter","smutil","resolv"]
|
||||
|
||||
* $Log$
|
||||
* Revision 1.31 2012/04/12 23:32:50 customdesigned
|
||||
* Replace redundant callback array with macros. If this doesn't break anything,
|
||||
* macros can be eliminated with code changes.
|
||||
*
|
||||
* Revision 1.30 2012/04/12 23:08:06 customdesigned
|
||||
* Support RFC2553 on BSD
|
||||
*
|
||||
* Revision 1.29 2011/06/09 15:45:27 customdesigned
|
||||
* Print callback name for non-int return error.
|
||||
*
|
||||
* Revision 1.28 2011/06/08 23:13:48 customdesigned
|
||||
* Generate special exception when callback return not int.
|
||||
*
|
||||
* 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
|
||||
*
|
||||
@@ -267,10 +239,10 @@ $ python setup.py help
|
||||
#define HAVE_IPV6_SUPPORT /* use this for #ifdef's later on */
|
||||
/* Now see if it supports the RFC-2553 socket's API spec. Early
|
||||
* IPv6 "prototype" implementations existed before the RFC was
|
||||
* published. Unfortunately I know of no good way to do this
|
||||
* published. Unfortunately I know of now good way to do this
|
||||
* other than with OS-specific tests.
|
||||
*/
|
||||
#if defined(__FreeBSD_kernel__) || defined(__linux__)
|
||||
#ifdef linux
|
||||
#define HAVE_IPV6_RFC2553
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
@@ -284,66 +256,27 @@ $ python setup.py help
|
||||
#endif
|
||||
#endif
|
||||
|
||||
enum callbacks {
|
||||
CONNECT,HELO,ENVFROM,ENVRCPT,HEADER,EOH,BODY,EOM,ABORT,CLOSE,
|
||||
#ifdef SMFIS_ALL_OPTS
|
||||
UNKNOWN,DATA,NEGOTIATE,
|
||||
#endif
|
||||
NUMCALLBACKS
|
||||
};
|
||||
|
||||
#define connect_callback callback[CONNECT].cb
|
||||
#define helo_callback callback[HELO].cb
|
||||
#define envfrom_callback callback[ENVFROM].cb
|
||||
#define envrcpt_callback callback[ENVRCPT].cb
|
||||
#define header_callback callback[HEADER].cb
|
||||
#define eoh_callback callback[EOH].cb
|
||||
#define body_callback callback[BODY].cb
|
||||
#define eom_callback callback[EOM].cb
|
||||
#define abort_callback callback[ABORT].cb
|
||||
#define close_callback callback[CLOSE].cb
|
||||
#define unknown_callback callback[UNKNOWN].cb
|
||||
#define data_callback callback[DATA].cb
|
||||
#define negotiate_callback callback[NEGOTIATE].cb
|
||||
/* Yes, these are static. If you need multiple different callbacks, */
|
||||
/* it's cleaner to use multiple filters, or convert to OO method calls. */
|
||||
static PyObject *connect_callback = NULL;
|
||||
static PyObject *helo_callback = NULL;
|
||||
static PyObject *envfrom_callback = NULL;
|
||||
static PyObject *envrcpt_callback = NULL;
|
||||
static PyObject *header_callback = NULL;
|
||||
static PyObject *eoh_callback = NULL;
|
||||
static PyObject *body_callback = NULL;
|
||||
static PyObject *eom_callback = NULL;
|
||||
static PyObject *abort_callback = NULL;
|
||||
static PyObject *close_callback = NULL;
|
||||
|
||||
/* Yes, these are static. If you need multiple different callbacks,
|
||||
it's cleaner to use multiple filters, or convert to OO method calls. */
|
||||
|
||||
static struct MilterCallback {
|
||||
PyObject *cb;
|
||||
const char *name;
|
||||
} callback[NUMCALLBACKS+1] = {
|
||||
{ NULL ,"connect" },
|
||||
{ NULL ,"helo" },
|
||||
{ NULL ,"envfrom" },
|
||||
{ NULL ,"envrcpt" },
|
||||
{ NULL ,"header" },
|
||||
{ NULL ,"eoh" },
|
||||
{ NULL ,"body" },
|
||||
{ NULL ,"eom" },
|
||||
{ NULL ,"abort" },
|
||||
{ NULL ,"close" },
|
||||
#ifdef SMFIS_ALL_OPTS
|
||||
{ NULL ,"unknown" },
|
||||
{ NULL ,"data" },
|
||||
{ NULL ,"negotiate" },
|
||||
#endif
|
||||
{ NULL , NULL }
|
||||
};
|
||||
|
||||
static struct smfiDesc description; /* forward declaration */
|
||||
staticforward struct smfiDesc description; /* forward declaration */
|
||||
|
||||
static PyObject *MilterError;
|
||||
/* The interpreter instance that called milter.main */
|
||||
static PyInterpreterState *interp;
|
||||
typedef struct {
|
||||
unsigned int contextNew;
|
||||
unsigned int contextDel;
|
||||
} milter_Diag;
|
||||
|
||||
static milter_Diag diag;
|
||||
|
||||
static PyTypeObject milter_ContextType;
|
||||
staticforward PyTypeObject milter_ContextType;
|
||||
|
||||
typedef struct {
|
||||
PyObject_HEAD
|
||||
@@ -380,7 +313,6 @@ _get_context(SMFICTX *ctx) {
|
||||
PyThreadState_Delete(t);
|
||||
return NULL;
|
||||
}
|
||||
++diag.contextNew;
|
||||
self->t = t;
|
||||
self->ctx = ctx;
|
||||
Py_INCREF(Py_None);
|
||||
@@ -419,7 +351,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. */
|
||||
@@ -680,23 +611,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 (!PyLong_Check(result)) {
|
||||
const struct MilterCallback *p;
|
||||
const char *cbname = "milter";
|
||||
char buf[40];
|
||||
Py_DECREF(result);
|
||||
for (p = callback; p->name; ++p) {
|
||||
if (cb == p->cb) {
|
||||
cbname = p->name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
sprintf(buf,"The %s callback must return int",cbname);
|
||||
PyErr_SetString(MilterError,buf);
|
||||
return _report_exception(self);
|
||||
}
|
||||
retval = PyLong_AS_LONG(result);
|
||||
retval = PyInt_AsLong(result);
|
||||
Py_DECREF(result);
|
||||
if (PyErr_Occurred()) return _report_exception(self);
|
||||
_release_thread(self->t);
|
||||
return retval;
|
||||
}
|
||||
@@ -712,7 +629,7 @@ makeipaddr(struct sockaddr_in *addr) {
|
||||
sprintf(buf, "%d.%d.%d.%d",
|
||||
(int) (x>>24) & 0xff, (int) (x>>16) & 0xff,
|
||||
(int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff);
|
||||
return PyUnicode_FromString(buf);
|
||||
return PyString_FromString(buf);
|
||||
}
|
||||
|
||||
#ifdef HAVE_IPV6_SUPPORT
|
||||
@@ -720,8 +637,8 @@ static PyObject *
|
||||
makeip6addr(struct sockaddr_in6 *addr) {
|
||||
char buf[100]; /* must be at least INET6_ADDRSTRLEN + 1 */
|
||||
const char *s = inet_ntop(AF_INET6, &addr->sin6_addr, buf, sizeof buf);
|
||||
if (s) return PyUnicode_FromString(s);
|
||||
return PyUnicode_FromString("inet6:unknown");
|
||||
if (s) return PyString_FromString(s);
|
||||
return PyString_FromString("inet6:unknown");
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -812,7 +729,7 @@ generic_env_wrapper(SMFICTX *ctx, PyObject*cb, char **argv) {
|
||||
for (i=0;i<count;i++) {
|
||||
/* There's some error checking performed in do_mkvalue() for a string */
|
||||
/* that's not currently done here - it probably should be */
|
||||
PyObject *o = PyUnicode_FromStringAndSize(argv[i], strlen(argv[i]));
|
||||
PyObject *o = PyString_FromStringAndSize(argv[i], strlen(argv[i]));
|
||||
if (o == NULL) { /* out of memory */
|
||||
Py_DECREF(arglist);
|
||||
return _report_exception(self);
|
||||
@@ -885,6 +802,10 @@ milter_wrap_abort(SMFICTX *ctx) {
|
||||
}
|
||||
|
||||
#ifdef SMFIS_ALL_OPTS
|
||||
static PyObject *unknown_callback = NULL;
|
||||
static PyObject *data_callback = NULL;
|
||||
static PyObject *negotiate_callback = NULL;
|
||||
|
||||
static int
|
||||
milter_wrap_unknown(SMFICTX *ctx, const char *cmd) {
|
||||
PyObject *arglist;
|
||||
@@ -943,7 +864,7 @@ milter_wrap_negotiate(SMFICTX *ctx,
|
||||
int i;
|
||||
for (i = 0; i < 4; ++i) {
|
||||
*pa[i] = (i <= len)
|
||||
? PyLong_AsUnsignedLongMask(PyList_GET_ITEM(optlist,i))
|
||||
? PyInt_AsUnsignedLongMask(PyList_GET_ITEM(optlist,i))
|
||||
: fa[i];
|
||||
}
|
||||
if (PyErr_Occurred()) {
|
||||
@@ -1142,30 +1063,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.";
|
||||
@@ -1291,7 +1188,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;
|
||||
|
||||
@@ -1531,6 +1428,11 @@ static PyMethodDef context_methods[] = {
|
||||
{ NULL, NULL }
|
||||
};
|
||||
|
||||
static PyObject *
|
||||
milter_Context_getattr(PyObject *self, char *name) {
|
||||
return Py_FindMethod(context_methods, self, name);
|
||||
}
|
||||
|
||||
static struct smfiDesc description = { /* Set some reasonable defaults */
|
||||
"pythonfilter",
|
||||
SMFI_VERSION,
|
||||
@@ -1573,19 +1475,18 @@ static PyMethodDef milter_methods[] = {
|
||||
{ "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 }
|
||||
};
|
||||
|
||||
static PyTypeObject milter_ContextType = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type,0)
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0,
|
||||
"milterContext",
|
||||
sizeof(milter_ContextObject),
|
||||
0,
|
||||
milter_Context_dealloc, /* tp_dealloc */
|
||||
0, /* tp_print */
|
||||
0, /* tp_getattr */
|
||||
milter_Context_getattr, /* tp_getattr */
|
||||
0, /* tp_setattr */
|
||||
0, /* tp_compare */
|
||||
0, /* tp_repr */
|
||||
@@ -1599,13 +1500,6 @@ static PyTypeObject milter_ContextType = {
|
||||
0, /* tp_setattro */
|
||||
0, /* tp_as_buffer */
|
||||
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
||||
NULL, /* Documentation string */
|
||||
0, /* call function for all accessible objects */
|
||||
0, /* delete references to contained objects */
|
||||
0, /* rich comparisons */
|
||||
0, /* weak reference enabler */
|
||||
0, 0, /* Iterators */
|
||||
context_methods, /* Attribute descriptor and subclassing stuff */
|
||||
};
|
||||
|
||||
static char milter_documentation[] =
|
||||
@@ -1615,27 +1509,17 @@ Libmilter is currently marked FFR, and needs to be explicitly installed.\n\
|
||||
See <sendmailsource>/libmilter/README for details on setting it up.\n";
|
||||
|
||||
static void setitem(PyObject *d,const char *name,long val) {
|
||||
PyObject *v = PyLong_FromLong(val);
|
||||
PyObject *v = PyInt_FromLong(val);
|
||||
PyDict_SetItemString(d,name,v);
|
||||
Py_DECREF(v);
|
||||
}
|
||||
|
||||
static struct PyModuleDef moduledef = {
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"milter", /* m_name */
|
||||
milter_documentation,/* m_doc */
|
||||
-1, /* m_size */
|
||||
milter_methods, /* m_methods */
|
||||
NULL, /* m_reload */
|
||||
NULL, /* m_traverse */
|
||||
NULL, /* m_clear */
|
||||
NULL, /* m_free */
|
||||
};
|
||||
|
||||
PyMODINIT_FUNC PyInit_milter(void) {
|
||||
void
|
||||
initmilter(void) {
|
||||
PyObject *m, *d;
|
||||
|
||||
m = PyModule_Create(&moduledef);
|
||||
m = Py_InitModule4("milter", milter_methods, milter_documentation,
|
||||
(PyObject*)NULL, PYTHON_API_VERSION);
|
||||
d = PyModule_GetDict(m);
|
||||
MilterError = PyErr_NewException("milter.error", NULL, NULL);
|
||||
PyDict_SetItemString(d,"error", MilterError);
|
||||
@@ -1662,13 +1546,6 @@ PyMODINIT_FUNC PyInit_milter(void) {
|
||||
#endif
|
||||
#ifdef SMFIF_SETSMLIST
|
||||
setitem(d,"SETSMLIST",SMFIF_SETSMLIST);
|
||||
setitem(d,"M_CONNECT",SMFIM_CONNECT);/* connect */
|
||||
setitem(d,"M_HELO",SMFIM_HELO); /* HELO/EHLO */
|
||||
setitem(d,"M_ENVFROM",SMFIM_ENVFROM);/* MAIL From */
|
||||
setitem(d,"M_ENVRCPT",SMFIM_ENVRCPT);/* RCPT To */
|
||||
setitem(d,"M_DATA",SMFIM_DATA); /* DATA */
|
||||
setitem(d,"M_EOM",SMFIM_EOM); /* end of message (final dot) */
|
||||
setitem(d,"M_EOH",SMFIM_EOH); /* end of header */
|
||||
#endif
|
||||
#ifdef SMFIS_ALL_OPTS
|
||||
setitem(d,"P_RCPT_REJ",SMFIP_RCPT_REJ);
|
||||
@@ -1701,5 +1578,4 @@ PyMODINIT_FUNC PyInit_milter(void) {
|
||||
setitem(d,"DISCARD", SMFIS_DISCARD);
|
||||
setitem(d,"ACCEPT", SMFIS_ACCEPT);
|
||||
setitem(d,"TEMPFAIL", SMFIS_TEMPFAIL);
|
||||
return m;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
# $Log$
|
||||
# Revision 1.7 2009/06/13 21:15:12 customdesigned
|
||||
# Doxygen updates.
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
@@ -79,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.
|
||||
@@ -106,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')
|
||||
@@ -118,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
|
||||
@@ -159,23 +142,21 @@ 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
|
||||
"""
|
||||
def __init__(self,fp=None,seekable=1):
|
||||
Message.__init__(self)
|
||||
self.headerchange = None
|
||||
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
|
||||
self.headerchange = None
|
||||
|
||||
def get_param(self, param, failobj=None, header='content-type', unquote=True):
|
||||
val = Message.get_param(self,param,failobj,header,unquote)
|
||||
|
||||
+20
-35
@@ -1,24 +1,32 @@
|
||||
%define __python python2.6
|
||||
%define pythonbase python26
|
||||
# EL 3,4,5 supported, set to 0 for Fedora
|
||||
%define el4 1
|
||||
%define dist .el4
|
||||
%if 0%{?el3} || 0%{?el4}
|
||||
%define __python python2.4
|
||||
%endif
|
||||
|
||||
%define libdir %{_libdir}/pymilter
|
||||
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
%define pythonbase %(basename %{__python})
|
||||
|
||||
Summary: Python interface to sendmail milter API
|
||||
Name: %{pythonbase}-pymilter
|
||||
Version: 0.9.6
|
||||
Release: 1%{dist}
|
||||
Source: http://downloads.sourceforge.net/pymilter/pymilter-%{version}.tar.gz
|
||||
Name: pymilter
|
||||
Version: 0.9.2
|
||||
Release: 3%{dist}
|
||||
Source: http://downloads.sourceforge.net/pymilter/%{name}-%{version}.tar.gz
|
||||
License: GPLv2+
|
||||
Group: Development/Libraries
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
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
|
||||
Requires: %{pythonbase} >= 2.4, sendmail >= 8.13
|
||||
%if 0%{?el3} || 0%{?el4}
|
||||
# Need python2.4 specific pydns, not the version for system python
|
||||
Requires: pydns
|
||||
%else
|
||||
# Needed for callbacks, not a core function but highly useful for milters
|
||||
BuildRequires: ed, %{pythonbase}-devel, sendmail-devel >= 8.13
|
||||
Requires: python-pydns
|
||||
%endif
|
||||
BuildRequires: ed, %{pythonbase}-devel >= 2.4, sendmail-devel >= 8.13
|
||||
|
||||
%description
|
||||
This is a python extension module to enable python scripts to
|
||||
@@ -27,7 +35,7 @@ modules provide for navigating and modifying MIME parts, sending
|
||||
DSNs, and doing CBV.
|
||||
|
||||
%prep
|
||||
%setup -q -n pymilter-%{version}
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
|
||||
@@ -75,29 +83,6 @@ chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Sat Feb 25 2012 Stuart Gathman <stuart@bmsi.com> 0.9.7-1
|
||||
- Raise RuntimeError when result != CONTINUE for @noreply and @nocallback
|
||||
- Remove redundant table in miltermodule
|
||||
|
||||
* Sat Feb 25 2012 Stuart Gathman <stuart@bmsi.com> 0.9.6-1
|
||||
- Raise ValueError on unescaped '%' passed to setreply
|
||||
- Grace time at end of Greylist window
|
||||
|
||||
* Fri Aug 19 2011 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.
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from __future__ import print_function
|
||||
|
||||
# A simple milter.
|
||||
|
||||
# Author: Stuart D. Gathman <stuart@bmsi.com>
|
||||
@@ -21,9 +21,9 @@ class sampleMilter(Milter.Milter):
|
||||
"Milter to replace attachments poisonous to Windows with a WARNING message."
|
||||
|
||||
def log(self,*msg):
|
||||
print("%s [%d]" % (strftime('%Y%b%d %H:%M:%S'),self.id), end=' ')
|
||||
for i in msg: print(i, end=' ')
|
||||
print()
|
||||
print "%s [%d]" % (strftime('%Y%b%d %H:%M:%S'),self.id),
|
||||
for i in msg: print i,
|
||||
print
|
||||
|
||||
def __init__(self):
|
||||
self.tempname = None
|
||||
@@ -35,9 +35,7 @@ class sampleMilter(Milter.Milter):
|
||||
# multiple messages can be received on a single connection
|
||||
# envfrom (MAIL FROM in the SMTP protocol) seems to mark the start
|
||||
# of each message.
|
||||
@Milter.noreply
|
||||
def envfrom(self,f,*str):
|
||||
"start of MAIL transaction"
|
||||
self.log("mail from",f,str)
|
||||
self.fp = StringIO.StringIO()
|
||||
self.tempname = None
|
||||
@@ -171,13 +169,13 @@ if __name__ == "__main__":
|
||||
socketname = os.getenv("HOME") + "/pythonsock"
|
||||
Milter.factory = sampleMilter
|
||||
Milter.set_flags(Milter.CHGBODY + Milter.CHGHDRS + Milter.ADDHDRS)
|
||||
print("""To use this with sendmail, add the following to sendmail.cf:
|
||||
print """To use this with sendmail, add the following to sendmail.cf:
|
||||
|
||||
O InputMailFilters=pythonfilter
|
||||
Xpythonfilter, S=local:%s
|
||||
|
||||
See the sendmail README for libmilter.
|
||||
sample milter startup""" % socketname)
|
||||
sample milter startup""" % socketname
|
||||
sys.stdout.flush()
|
||||
Milter.runmilter("pythonfilter",socketname,240)
|
||||
print("sample milter shutdown")
|
||||
print "sample milter shutdown"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[bdist_rpm]
|
||||
python=python3
|
||||
doc_files=README NEWS TODO COPYING CREDITS
|
||||
packager=Stuart D. Gathman <stuart@gathman.org>
|
||||
python=python2.4
|
||||
doc_files=README NEWS TODO
|
||||
packager=Stuart D. Gathman <stuart@bmsi.com>
|
||||
release=1
|
||||
|
||||
@@ -2,9 +2,6 @@ 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
|
||||
# on how libmilter was built by the sendmail package.
|
||||
@@ -12,8 +9,15 @@ if sys.version < '2.6.5':
|
||||
libs = ["milter"]
|
||||
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.7',
|
||||
setup(name = "pymilter", version = '0.9.2',
|
||||
description="Python interface to sendmail milter API",
|
||||
long_description="""\
|
||||
This is a python extension module to enable python scripts to
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
#!/bin/sh
|
||||
appname="$1"
|
||||
script="${2:-${appname}}"
|
||||
datadir="/var/lib/milter"
|
||||
logdir="/var/log/milter"
|
||||
datadir="/var/log/milter"
|
||||
piddir="/var/run/milter"
|
||||
libdir="/usr/lib/pymilter"
|
||||
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}
|
||||
fi
|
||||
|
||||
+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--
|
||||
|
||||
-18587
File diff suppressed because it is too large
Load Diff
+1
-33
@@ -1,10 +1,4 @@
|
||||
# $Log$
|
||||
# Revision 1.5 2011/06/09 17:27:42 customdesigned
|
||||
# Documentation updates.
|
||||
#
|
||||
# Revision 1.4 2005/07/20 14:49:44 customdesigned
|
||||
# Handle corrupt and empty ZIP files.
|
||||
#
|
||||
# Revision 1.3 2005/06/17 01:49:39 customdesigned
|
||||
# Handle zip within zip.
|
||||
#
|
||||
@@ -32,7 +26,6 @@ import socket
|
||||
import StringIO
|
||||
import email
|
||||
import sys
|
||||
import Milter
|
||||
from email import Errors
|
||||
|
||||
samp1_txt1 = """Dear Agent 1
|
||||
@@ -153,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/test2','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)
|
||||
@@ -201,4 +169,4 @@ if __name__ == '__main__':
|
||||
fp = open(fname,'r')
|
||||
msg = mime.message_from_file(fp)
|
||||
mime.defang(msg,scan_zip=True)
|
||||
print(msg.as_string())
|
||||
print msg.as_string()
|
||||
|
||||
@@ -7,7 +7,6 @@ import StringIO
|
||||
|
||||
class TestMilter(sample.sampleMilter):
|
||||
|
||||
_protocol = 0
|
||||
def __init__(self):
|
||||
self.logfp = open("test/milter.log","a")
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@ class AddrCacheTestCase(unittest.TestCase):
|
||||
self.fname = 'test.dat'
|
||||
|
||||
def tearDown(self):
|
||||
if os.path.exists(self.fname):
|
||||
os.remove(self.fname)
|
||||
|
||||
def testAdd(self):
|
||||
@@ -39,11 +38,6 @@ class AddrCacheTestCase(unittest.TestCase):
|
||||
cache.load(self.fname,30)
|
||||
self.failUnless('spammer.com' in cache)
|
||||
|
||||
def testParseHeader(self):
|
||||
s='=?UTF-8?B?TGFzdCBGZXcgQ29sZHBsYXkgQWxidW0gQXJ0d29ya3MgQXZhaWxhYmxlAA?='
|
||||
h = Milter.utils.parse_header(s)
|
||||
self.assertEqual(h,'Last Few Coldplay Album Artworks Available\x00')
|
||||
|
||||
def suite():
|
||||
s = unittest.makeSuite(AddrCacheTestCase,'test')
|
||||
s.addTest(doctest.DocTestSuite(Milter.utils))
|
||||
|
||||
Reference in New Issue
Block a user