Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 cvs2svn
|
3cef83f59b |
@@ -1,8 +1,8 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
the GNU Library General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
@@ -225,7 +225,7 @@ impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
@@ -303,9 +303,10 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
@@ -335,5 +336,5 @@ necessary. Here is a sample; alter the names:
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
library. If this is what you want to do, use the GNU Library General
|
||||
Public License instead of this License.
|
||||
|
||||
@@ -5,25 +5,10 @@ wrapper (Milter.py) that handles attachments, did lots of testing, packaged
|
||||
it with distutils, and generally transformed it from a quick hack to a
|
||||
real, usable Python extension.
|
||||
|
||||
Other contributors (in random order):
|
||||
Other contributors:
|
||||
|
||||
|
||||
Daniel Troeder
|
||||
for pointing out a typo in @noreply
|
||||
arkanes@irc.freenode.net
|
||||
for suggesting a class method to compute and cache protocol masks
|
||||
habnabit@habnabit.org
|
||||
for suggesting function attributes and decorators for protocol negotiation
|
||||
Dwayne Litzenberger, B.A.Sc.
|
||||
for library_dirs patch to compile on Debian
|
||||
Dave MacQuigg
|
||||
for noticing that smfi_insheader wasn't supported, and creating
|
||||
a template to help first time pymilter users create their own milter.
|
||||
Terence Way
|
||||
for providing a Python port of SPF
|
||||
Scott Kitterman
|
||||
for doing lots of testing and debugging of SPF against draft standard,
|
||||
and for putting up a web page that validates SPF records using spf.py
|
||||
Alexander Kourakos
|
||||
for plugging several memory leaks
|
||||
George Graf at Vienna University of Economics and Business Administration
|
||||
@@ -37,9 +22,6 @@ John Draper
|
||||
then pointing out that it would be easier to just write the MTA in Python.
|
||||
Eric S. Johansson
|
||||
for helpful design discussions while working on camram
|
||||
Alex Savguira
|
||||
for finding bugs with international headers and
|
||||
suggesting the scan_zip option.
|
||||
Business Management Systems - http://www.bmsi.com
|
||||
for hosting the website, and providing paying clients who need milter service
|
||||
so I can work on it as part of my day job.
|
||||
|
||||
@@ -1,214 +0,0 @@
|
||||
# Revision 1.69 2006/11/04 22:09:39 customdesigned
|
||||
# Another lame DSN heuristic. Block PTR cache poisoning attack.
|
||||
#
|
||||
# Revision 1.68 2006/10/04 03:46:01 customdesigned
|
||||
# Fix defaults.
|
||||
#
|
||||
# Revision 1.67 2006/10/01 01:44:06 customdesigned
|
||||
# case_sensitive_localpart option, more delayed bounce heuristics,
|
||||
# optional smart_alias section.
|
||||
#
|
||||
# Revision 1.66 2006/07/26 16:42:26 customdesigned
|
||||
# Support CBV timeout
|
||||
#
|
||||
# Revision 1.65 2006/06/21 22:22:00 customdesigned
|
||||
# Handle multi-line headers in delayed dsns.
|
||||
#
|
||||
# Revision 1.64 2006/06/21 21:12:04 customdesigned
|
||||
# More delayed reject token headers.
|
||||
# Don't require HELO pass for CBV.
|
||||
#
|
||||
# Revision 1.63 2006/05/21 03:41:44 customdesigned
|
||||
# Fail dsn
|
||||
#
|
||||
# Revision 1.61 2006/05/17 21:28:07 customdesigned
|
||||
# Create GOSSiP record only when connection will procede to DATA.
|
||||
#
|
||||
# Revision 1.60 2006/05/12 16:14:48 customdesigned
|
||||
# Don't require SPF pass for white/black listing mail from trusted relay.
|
||||
# Support localpart wildcard for white and black lists.
|
||||
#
|
||||
# Revision 1.59 2006/04/06 18:14:17 customdesigned
|
||||
# Check whitelist/blacklist even when not checking SPF (e.g. trusted relay).
|
||||
#
|
||||
# Revision 1.58 2006/03/10 20:52:49 customdesigned
|
||||
# Use re to recognize failure DSNs.
|
||||
#
|
||||
# Revision 1.57 2006/03/07 20:50:54 customdesigned
|
||||
# Use signed Message-ID in delayed reject to blacklist senders
|
||||
#
|
||||
# Revision 1.56 2006/02/24 02:12:54 customdesigned
|
||||
# Properly report hard PermError (lax mode fails also) by always setting
|
||||
# perm_error attribute with PermError exception. Improve reporting of
|
||||
# invalid domain PermError.
|
||||
#
|
||||
# Revision 1.55 2006/02/17 05:04:29 customdesigned
|
||||
# Use SRS sign domain list.
|
||||
# Accept but do not use for training whitelisted senders without SPF pass.
|
||||
# Immediate rejection of unsigned bounces.
|
||||
#
|
||||
# Revision 1.54 2006/02/16 02:16:36 customdesigned
|
||||
# User specific SPF receiver policy.
|
||||
#
|
||||
# Revision 1.53 2006/02/12 04:15:01 customdesigned
|
||||
# Remove spf dependency for iniplist
|
||||
#
|
||||
# Revision 1.52 2006/02/12 02:12:08 customdesigned
|
||||
# Use CIDR notation for internal connect list.
|
||||
#
|
||||
# Revision 1.51 2006/02/12 01:13:58 customdesigned
|
||||
# Don't check rcpt user list when signed MFROM.
|
||||
#
|
||||
# Revision 1.50 2006/02/09 20:39:43 customdesigned
|
||||
# Use CIDR notation for trusted_relay iplist
|
||||
#
|
||||
# Revision 1.49 2006/01/30 23:14:48 customdesigned
|
||||
# put back eom condition
|
||||
#
|
||||
# Revision 1.48 2006/01/12 20:31:24 customdesigned
|
||||
# Accelerate training via whitelist and blacklist.
|
||||
#
|
||||
# Revision 1.47 2005/12/29 04:49:10 customdesigned
|
||||
# Do not auto-whitelist autoreplys
|
||||
#
|
||||
# Revision 1.46 2005/12/28 20:17:29 customdesigned
|
||||
# Expire and renew AddrCache entries
|
||||
#
|
||||
# Revision 1.45 2005/12/23 22:34:46 customdesigned
|
||||
# Put guessed result in separate header.
|
||||
#
|
||||
# Revision 1.44 2005/12/23 21:47:07 customdesigned
|
||||
# Move Received-SPF header to top.
|
||||
#
|
||||
# Revision 1.43 2005/12/09 16:54:01 customdesigned
|
||||
# Select neutral DSN template for best_guess
|
||||
#
|
||||
# Revision 1.42 2005/12/01 22:42:32 customdesigned
|
||||
# improve gossip support.
|
||||
# Initialize srs_domain from srs.srs config property. Should probably
|
||||
# always block unsigned DSN when signing all.
|
||||
#
|
||||
# Revision 1.41 2005/12/01 18:59:25 customdesigned
|
||||
# Fix neutral policy. pobox.com -> openspf.org
|
||||
#
|
||||
# Revision 1.40 2005/11/07 21:22:35 customdesigned
|
||||
# GOSSiP support, local database only.
|
||||
#
|
||||
# Revision 1.39 2005/10/31 00:04:58 customdesigned
|
||||
# Simple implementation of trusted_forwarder list. Inefficient for
|
||||
# more than 1 or 2 entries.
|
||||
#
|
||||
# Revision 1.38 2005/10/28 19:36:54 customdesigned
|
||||
# Don't check internal_domains for trusted_relay.
|
||||
#
|
||||
# Revision 1.37 2005/10/28 09:30:49 customdesigned
|
||||
# Do not send quarantine DSN when sender is DSN.
|
||||
#
|
||||
# Revision 1.36 2005/10/23 16:01:29 customdesigned
|
||||
# Consider MAIL FROM a match for supply_sender when a subdomain of From or Sender
|
||||
#
|
||||
# Revision 1.35 2005/10/20 18:47:27 customdesigned
|
||||
# Configure auto_whitelist senders.
|
||||
#
|
||||
# Revision 1.34 2005/10/19 21:07:49 customdesigned
|
||||
# access.db stores keys in lower case
|
||||
#
|
||||
# Revision 1.33 2005/10/19 19:37:50 customdesigned
|
||||
# Train screener on whitelisted messages.
|
||||
#
|
||||
# Revision 1.32 2005/10/14 16:17:31 customdesigned
|
||||
# Auto whitelist refinements.
|
||||
#
|
||||
# Revision 1.31 2005/10/14 01:14:08 customdesigned
|
||||
# Auto whitelist feature.
|
||||
#
|
||||
# Revision 1.30 2005/10/12 16:36:30 customdesigned
|
||||
# Release 0.8.3
|
||||
#
|
||||
# Revision 1.29 2005/10/11 22:50:07 customdesigned
|
||||
# Always check HELO except for SPF pass, temperror.
|
||||
#
|
||||
# Revision 1.28 2005/10/10 23:50:20 customdesigned
|
||||
# Use logging module to make logging threadsafe (avoid splitting log lines)
|
||||
#
|
||||
# Revision 1.27 2005/10/10 20:15:33 customdesigned
|
||||
# Configure SPF policy via sendmail access file.
|
||||
#
|
||||
# Revision 1.26 2005/10/07 03:23:40 customdesigned
|
||||
# Banned users option. Experimental feature to supply Sender when
|
||||
# missing and MFROM domain doesn't match From. Log cipher bits for
|
||||
# SMTP AUTH. Sketch access file feature.
|
||||
#
|
||||
# Revision 1.25 2005/09/08 03:55:08 customdesigned
|
||||
# Handle perverse MFROM quoting.
|
||||
#
|
||||
# Revision 1.24 2005/08/18 03:36:54 customdesigned
|
||||
# Don't innoculate with SCREENED mail.
|
||||
#
|
||||
# Revision 1.23 2005/08/17 19:35:27 customdesigned
|
||||
# Send DSN before adding message to quarantine.
|
||||
#
|
||||
# Revision 1.22 2005/08/11 22:17:58 customdesigned
|
||||
# Consider SMTP AUTH connections internal.
|
||||
#
|
||||
# Revision 1.21 2005/08/04 21:21:31 customdesigned
|
||||
# Treat fail like softfail for selected (braindead) domains.
|
||||
# Treat mail according to extended processing results, but
|
||||
# report any PermError that would officially result via DSN.
|
||||
#
|
||||
# Revision 1.20 2005/08/02 18:04:35 customdesigned
|
||||
# Keep screened honeypot mail, but optionally discard honeypot only mail.
|
||||
#
|
||||
# Revision 1.19 2005/07/20 03:30:04 customdesigned
|
||||
# Check pydspam version for honeypot, include latest pyspf changes.
|
||||
#
|
||||
# Revision 1.18 2005/07/17 01:25:44 customdesigned
|
||||
# Log as well as use extended result for best guess.
|
||||
#
|
||||
# Revision 1.17 2005/07/15 20:25:36 customdesigned
|
||||
# Use extended results processing for best_guess.
|
||||
#
|
||||
# Revision 1.16 2005/07/14 03:23:33 customdesigned
|
||||
# Make SES package optional. Initial honeypot support.
|
||||
#
|
||||
# Revision 1.15 2005/07/06 04:05:40 customdesigned
|
||||
# Initial SES integration.
|
||||
#
|
||||
# Revision 1.14 2005/07/02 23:27:31 customdesigned
|
||||
# Don't match hostnames for internal connects.
|
||||
#
|
||||
# Revision 1.13 2005/07/01 16:30:24 customdesigned
|
||||
# Always log trusted Received and Received-SPF headers.
|
||||
#
|
||||
# Revision 1.12 2005/06/20 22:35:35 customdesigned
|
||||
# Setreply for rejectvirus.
|
||||
#
|
||||
# Revision 1.11 2005/06/17 02:07:20 customdesigned
|
||||
# Release 0.8.1
|
||||
#
|
||||
# Revision 1.10 2005/06/16 18:35:51 customdesigned
|
||||
# Ignore HeaderParseError decoding header
|
||||
#
|
||||
# Revision 1.9 2005/06/14 21:55:29 customdesigned
|
||||
# Check internal_domains for outgoing mail.
|
||||
#
|
||||
# Revision 1.8 2005/06/06 18:24:59 customdesigned
|
||||
# Properly log exceptions from pydspam
|
||||
#
|
||||
# Revision 1.7 2005/06/04 19:41:16 customdesigned
|
||||
# Fix bugs from testing RPM
|
||||
#
|
||||
# Revision 1.6 2005/06/03 04:57:05 customdesigned
|
||||
# Organize config reader by section. Create defang section.
|
||||
#
|
||||
# Revision 1.5 2005/06/02 15:00:17 customdesigned
|
||||
# Configure banned extensions. Scan zipfile option with test case.
|
||||
#
|
||||
# Revision 1.4 2005/06/02 04:18:55 customdesigned
|
||||
# Update copyright notices after reading article on /.
|
||||
#
|
||||
# Revision 1.3 2005/06/02 02:09:00 customdesigned
|
||||
# Record timestamp in send_dsn.log
|
||||
#
|
||||
# Revision 1.2 2005/06/02 01:00:36 customdesigned
|
||||
# Support configurable templates for DSNs.
|
||||
+12
-3
@@ -3,15 +3,24 @@ include TODO
|
||||
include NEWS
|
||||
include CREDITS
|
||||
include README
|
||||
include ChangeLog
|
||||
include MANIFEST.in
|
||||
include testsample.py
|
||||
include testmime.py
|
||||
include testutils.py
|
||||
include testbms.py
|
||||
include testdspam.py
|
||||
include rejects.py
|
||||
include bms.py
|
||||
include spf.py
|
||||
include spfquery.py
|
||||
include test.py
|
||||
include sample.py
|
||||
include milter-template.py
|
||||
include test/*
|
||||
include Milter/*.py
|
||||
include *.spec
|
||||
include start.sh
|
||||
include milter.rc
|
||||
include milter.rc7
|
||||
include milter.cfg
|
||||
include rhsbl.m4
|
||||
include softfail.txt
|
||||
include strike3.txt
|
||||
|
||||
@@ -0,0 +1,203 @@
|
||||
|
||||
# Author: Stuart D. Gathman <stuart@bmsi.com>
|
||||
# Copyright 2001 Business Management Systems, Inc.
|
||||
# This code is under GPL. See COPYING for details.
|
||||
|
||||
import os
|
||||
import milter
|
||||
import thread
|
||||
|
||||
from milter import ACCEPT,CONTINUE,REJECT,DISCARD,TEMPFAIL, \
|
||||
set_flags, setdbg, setbacklog, settimeout, \
|
||||
ADDHDRS, CHGBODY, ADDRCPT, DELRCPT, CHGHDRS, \
|
||||
V1_ACTS, V2_ACTS, CURR_ACTS
|
||||
|
||||
try: from milter import QUARANTINE
|
||||
except: pass
|
||||
|
||||
_seq_lock = thread.allocate_lock()
|
||||
_seq = 0
|
||||
|
||||
def uniqueID():
|
||||
"""Return a sequence number unique to this process.
|
||||
"""
|
||||
global _seq
|
||||
_seq_lock.acquire()
|
||||
seqno = _seq = _seq + 1
|
||||
_seq_lock.release()
|
||||
return seqno
|
||||
|
||||
class Milter:
|
||||
"""A simple class interface to the milter module.
|
||||
"""
|
||||
def _setctx(self,ctx):
|
||||
self.__ctx = ctx
|
||||
if ctx:
|
||||
ctx.setpriv(self)
|
||||
|
||||
# user replaceable callbacks
|
||||
def log(self,*msg):
|
||||
print 'Milter:',
|
||||
for i in msg: print i,
|
||||
print
|
||||
|
||||
def connect(self,hostname,unused,hostaddr):
|
||||
"Called for each connection to sendmail."
|
||||
self.log("connect from %s at %s" % (hostname,hostaddr))
|
||||
return CONTINUE
|
||||
|
||||
def hello(self,hostname):
|
||||
"Called after the HELO command."
|
||||
self.log("hello from %s" % hostname)
|
||||
return CONTINUE
|
||||
|
||||
def envfrom(self,f,*str):
|
||||
"""Called to begin each message.
|
||||
f -> string message sender
|
||||
str -> tuple additional ESMTP parameters
|
||||
"""
|
||||
self.log("mail from",f,str)
|
||||
return CONTINUE
|
||||
|
||||
def envrcpt(self,to,*str):
|
||||
"Called for each message recipient."
|
||||
self.log("rcpt to",to,str)
|
||||
return CONTINUE
|
||||
|
||||
def header(self,field,value):
|
||||
"Called for each message header."
|
||||
self.log("%s: %s" % (field,value))
|
||||
return CONTINUE
|
||||
|
||||
def eoh(self):
|
||||
"Called after all headers are processed."
|
||||
self.log("eoh")
|
||||
return CONTINUE
|
||||
|
||||
def body(self,unused):
|
||||
"Called to transfer the message body."
|
||||
return CONTINUE
|
||||
|
||||
def eom(self):
|
||||
"Called at the end of message."
|
||||
self.log("eom")
|
||||
return CONTINUE
|
||||
|
||||
def abort(self):
|
||||
"Called if the connection is terminated abnormally."
|
||||
self.log("abort")
|
||||
return CONTINUE
|
||||
|
||||
def close(self):
|
||||
"Called at the end of connection, even if aborted."
|
||||
self.log("close")
|
||||
return CONTINUE
|
||||
|
||||
# Milter methods which can be invoked from callbacks
|
||||
def getsymval(self,sym):
|
||||
return self.__ctx.getsymval(sym)
|
||||
|
||||
# If sendmail does not support setmlreply, then only the
|
||||
# first msg line is used.
|
||||
def setreply(self,rcode,xcode=None,msg=None,*ml):
|
||||
return self.__ctx.setreply(rcode,xcode,msg,*ml)
|
||||
|
||||
# Milter methods which can only be called from eom callback.
|
||||
def addheader(self,field,value):
|
||||
return self.__ctx.addheader(field,value)
|
||||
|
||||
def chgheader(self,field,idx,value):
|
||||
return self.__ctx.chgheader(field,idx,value)
|
||||
|
||||
def addrcpt(self,rcpt):
|
||||
return self.__ctx.addrcpt(rcpt)
|
||||
|
||||
def delrcpt(self,rcpt):
|
||||
return self.__ctx.delrcpt(rcpt)
|
||||
|
||||
def replacebody(self,body):
|
||||
return self.__ctx.replacebody(body)
|
||||
|
||||
# When quarantined, a message goes into the mailq as if to be delivered,
|
||||
# but delivery is deferred until the message is unquarantined.
|
||||
def quarantine(self,reason):
|
||||
return self.__ctx.quarantine(reason)
|
||||
|
||||
def progress(self):
|
||||
return self.__ctx.progress()
|
||||
|
||||
factory = Milter
|
||||
|
||||
def connectcallback(ctx,hostname,family,hostaddr):
|
||||
m = factory()
|
||||
m._setctx(ctx)
|
||||
return m.connect(hostname,family,hostaddr)
|
||||
|
||||
def closecallback(ctx):
|
||||
m = ctx.getpriv()
|
||||
if not m: return CONTINUE
|
||||
rc = m.close()
|
||||
m._setctx(None) # release milterContext
|
||||
return rc
|
||||
|
||||
def envcallback(c,args):
|
||||
"""Convert ESMTP parms to keyword parameters.
|
||||
Can be used in the envfrom and/or envrcpt callbacks to process
|
||||
ESMTP parameters as python keyword parameters."""
|
||||
kw = {}
|
||||
for s in args[1:]:
|
||||
pos = s.find('=')
|
||||
if pos > 0:
|
||||
kw[s[:pos]] = s[pos+1:]
|
||||
return apply(c,args,kw)
|
||||
|
||||
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,
|
||||
# libmilter will throw a warning. If sendmail is running, this is still
|
||||
# safe if there are no messages currently being processed. It's safer to
|
||||
# shutdown sendmail, kill the filter process, restart the filter, and then
|
||||
# restart sendmail.
|
||||
pos = socketname.find(':')
|
||||
if pos > 1:
|
||||
s = socketname[:pos]
|
||||
fname = socketname[pos+1:]
|
||||
else:
|
||||
s = "unix"
|
||||
fname = socketname
|
||||
if s == "unix" or s == "local":
|
||||
print "Removing %s" % fname
|
||||
try:
|
||||
os.unlink(fname)
|
||||
except:
|
||||
pass
|
||||
|
||||
# The default flags set include everything
|
||||
# milter.set_flags(milter.ADDHDRS)
|
||||
milter.set_connect_callback(connectcallback)
|
||||
milter.set_helo_callback(lambda ctx, host: ctx.getpriv().hello(host))
|
||||
milter.set_envfrom_callback(lambda ctx,*str:
|
||||
ctx.getpriv().envfrom(*str))
|
||||
# envcallback(ctx.getpriv().envfrom,str))
|
||||
milter.set_envrcpt_callback(lambda ctx,*str:
|
||||
ctx.getpriv().envrcpt(*str))
|
||||
# envcallback(ctx.getpriv().envrcpt,str))
|
||||
milter.set_header_callback(lambda ctx,fld,val:
|
||||
ctx.getpriv().header(fld,val))
|
||||
milter.set_eoh_callback(lambda ctx: ctx.getpriv().eoh())
|
||||
milter.set_body_callback(lambda ctx,chunk: ctx.getpriv().body(chunk))
|
||||
milter.set_eom_callback(lambda ctx: ctx.getpriv().eom())
|
||||
milter.set_abort_callback(lambda ctx: ctx.getpriv().abort())
|
||||
milter.set_close_callback(closecallback)
|
||||
|
||||
milter.setconn(socketname)
|
||||
if timeout > 0: milter.settimeout(timeout)
|
||||
# The name *must* match the X line in sendmail.cf (supposedly)
|
||||
milter.register(name)
|
||||
start_seq = _seq
|
||||
try:
|
||||
milter.main()
|
||||
except milter.error:
|
||||
if start_seq == _seq: raise # couldn't start
|
||||
# milter has been running for a while, but now it can't start new threads
|
||||
raise milter.error("out of thread resources")
|
||||
+63
-637
@@ -1,34 +1,26 @@
|
||||
## @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.8'
|
||||
# A thin OO wrapper for the milter module
|
||||
|
||||
import os
|
||||
import re
|
||||
import milter
|
||||
import thread
|
||||
|
||||
from milter import *
|
||||
from functools import wraps
|
||||
from milter import ACCEPT,CONTINUE,REJECT,DISCARD,TEMPFAIL, \
|
||||
set_flags, setdbg, setbacklog, settimeout, \
|
||||
ADDHDRS, CHGBODY, ADDRCPT, DELRCPT, CHGHDRS, \
|
||||
V1_ACTS, V2_ACTS, CURR_ACTS
|
||||
|
||||
try: from milter import QUARANTINE
|
||||
except: pass
|
||||
|
||||
_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()
|
||||
@@ -36,572 +28,30 @@ def uniqueID():
|
||||
_seq_lock.release()
|
||||
return seqno
|
||||
|
||||
## @private
|
||||
OPTIONAL_CALLBACKS = {
|
||||
'connect':(P_NR_CONN,P_NOCONNECT),
|
||||
'hello':(P_NR_HELO,P_NOHELO),
|
||||
'envfrom':(P_NR_MAIL,P_NOMAIL),
|
||||
'envrcpt':(P_NR_RCPT,P_NORCPT),
|
||||
'data':(P_NR_DATA,P_NODATA),
|
||||
'unknown':(P_NR_UNKN,P_NOUNKNOWN),
|
||||
'eoh':(P_NR_EOH,P_NOEOH),
|
||||
'body':(P_NR_BODY,P_NOBODY),
|
||||
'header':(P_NR_HDR,P_NOHDRS)
|
||||
}
|
||||
|
||||
## @private
|
||||
R = re.compile(r'%+')
|
||||
|
||||
## @private
|
||||
def decode_mask(bits,names):
|
||||
t = [ (s,getattr(milter,s)) for s in names]
|
||||
nms = [s for s,m in t if bits & m]
|
||||
for s,m in t: bits &= ~m
|
||||
if bits: nms += hex(bits)
|
||||
return nms
|
||||
|
||||
## Class decorator to enable optional protocol steps.
|
||||
# P_SKIP is enabled by default when supported, but
|
||||
# applications may wish to enable P_HDR_LEADSPC
|
||||
# to send and receive the leading space of header continuation
|
||||
# lines unchanged, and/or P_RCPT_REJ to have recipients
|
||||
# detected as invalid by the MTA passed to the envcrpt callback.
|
||||
#
|
||||
# Applications may want to check whether the protocol is actually
|
||||
# supported by the MTA in use. Base._protocol
|
||||
# is a bitmask of protocol options negotiated. So,
|
||||
# for instance, if <code>self._protocol & Milter.P_RCPT_REJ</code>
|
||||
# is true, then that feature was successfully negotiated with the MTA
|
||||
# and the application will see recipients the MTA has flagged as invalid.
|
||||
#
|
||||
# Sample use:
|
||||
# <pre>
|
||||
# class myMilter(Milter.Base):
|
||||
# def envrcpt(self,to,*params):
|
||||
# return Milter.CONTINUE
|
||||
# myMilter = Milter.enable_protocols(myMilter,Milter.P_RCPT_REJ)
|
||||
# </pre>
|
||||
# @since 0.9.3
|
||||
# @param klass the %milter application class to modify
|
||||
# @param mask a bitmask of protocol steps to enable
|
||||
# @return the modified %milter class
|
||||
def enable_protocols(klass,mask):
|
||||
klass._protocol_mask = klass.protocol_mask() & ~mask
|
||||
return klass
|
||||
|
||||
## Milter rejected recipients. A class decorator that calls
|
||||
# enable_protocols() with the P_RCPT_REJ flag. By default, the MTA
|
||||
# does not pass recipients that it knows are invalid on to the milter.
|
||||
# This decorator enables a %milter app to see all recipients if supported
|
||||
# by the MTA. Use like this with python-2.6 and later:
|
||||
# <pre>
|
||||
# @@Milter.rejected_recipients
|
||||
# class myMilter(Milter.Base):
|
||||
# def envrcpt(self,to,*params):
|
||||
# return Milter.CONTINUE
|
||||
# </pre>
|
||||
# @since 0.9.5
|
||||
# @param klass the %milter application class to modify
|
||||
# @return the modified %milter class
|
||||
def rejected_recipients(klass):
|
||||
return enable_protocols(klass,P_RCPT_REJ)
|
||||
|
||||
## Milter leading space on headers. A class decorator that calls
|
||||
# enable_protocols() with the P_HEAD_LEADSPC flag. By default,
|
||||
# header continuation lines are collected and joined before getting
|
||||
# sent to a milter. Headers modified or added by the milter are
|
||||
# folded by the MTA as necessary according to its own standards.
|
||||
# With this flag, header continuation lines are preserved
|
||||
# with their newlines and leading space. In addition, header folding
|
||||
# done by the milter is preserved as well.
|
||||
# Use like this with python-2.6 and later:
|
||||
# <pre>
|
||||
# @@Milter.header_leading_space
|
||||
# class myMilter(Milter.Base):
|
||||
# def header(self,hname,value):
|
||||
# return Milter.CONTINUE
|
||||
# </pre>
|
||||
# @since 0.9.5
|
||||
# @param klass the %milter application class to modify
|
||||
# @return the modified %milter class
|
||||
def header_leading_space(klass):
|
||||
return enable_protocols(klass,P_HEAD_LEADSPC)
|
||||
|
||||
## Function decorator to disable callback methods.
|
||||
# If the MTA supports it, tells the MTA not to invoke this callback,
|
||||
# increasing efficiency. All the callbacks (except negotiate)
|
||||
# are disabled in Milter.Base, and overriding them reenables the
|
||||
# callback. An application may need to use @@nocallback when it extends
|
||||
# another %milter and wants to disable a callback again.
|
||||
# The disabled method should still return Milter.CONTINUE, in case the MTA does
|
||||
# not support protocol negotiation, and for when called from a test harness.
|
||||
# @since 0.9.2
|
||||
def nocallback(func):
|
||||
try:
|
||||
func.milter_protocol = OPTIONAL_CALLBACKS[func.__name__][1]
|
||||
except KeyError:
|
||||
raise ValueError(
|
||||
'@nocallback applied to non-optional method: '+func.__name__)
|
||||
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
|
||||
|
||||
## Function decorator to disable callback reply.
|
||||
# If the MTA supports it, tells the MTA not to wait for a reply from
|
||||
# this callback, and assume CONTINUE. The method should still return
|
||||
# CONTINUE in case the MTA does not support protocol negotiation.
|
||||
# The decorator arranges to change the return code to NOREPLY
|
||||
# when supported by the MTA.
|
||||
# @since 0.9.2
|
||||
def noreply(func):
|
||||
try:
|
||||
nr_mask = OPTIONAL_CALLBACKS[func.__name__][0]
|
||||
except KeyError:
|
||||
raise ValueError(
|
||||
'@noreply applied to non-optional method: '+func.__name__)
|
||||
@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
|
||||
return rc
|
||||
wrapper.milter_protocol = nr_mask
|
||||
return wrapper
|
||||
|
||||
## Disabled action exception.
|
||||
# set_flags() can tell the MTA that this application will not use certain
|
||||
# features (such as CHGFROM). This can also be negotiated for each
|
||||
# connection in the negotiate callback. If the application then calls
|
||||
# the feature anyway via an instance method, this exception is
|
||||
# thrown.
|
||||
# @since 0.9.2
|
||||
class DisabledAction(RuntimeError):
|
||||
pass
|
||||
|
||||
## A do "nothing" Milter base class representing an SMTP connection.
|
||||
#
|
||||
# Python milters should derive from this class
|
||||
# unless they are using the low level milter module directly.
|
||||
#
|
||||
# Most of the methods are either "actions" or "callbacks". Callbacks
|
||||
# are invoked by the MTA at certain points in the SMTP protocol. For
|
||||
# instance when the HELO command is seen, the MTA calls the helo
|
||||
# callback before returning a response code. All callbacks must
|
||||
# return one of these constants: CONTINUE, TEMPFAIL, REJECT, ACCEPT,
|
||||
# DISCARD, SKIP. The NOREPLY response is supplied automatically by
|
||||
# the @@noreply decorator if negotiation with the MTA is successful.
|
||||
# @@noreply and @@nocallback methods should return CONTINUE for two reasons:
|
||||
# the MTA may not support negotiation, and the class may be running in a test
|
||||
# harness.
|
||||
#
|
||||
# Optional callbacks are disabled with the @@nocallback decorator, and
|
||||
# automatically reenabled when overridden. Disabled callbacks should
|
||||
# still return CONTINUE for testing and MTAs that do not support
|
||||
# negotiation.
|
||||
|
||||
# Each SMTP connection to the MTA calls the factory method you provide to
|
||||
# create an instance derived from this class. This is typically the
|
||||
# constructor for a class derived from Base. The _setctx() method attaches
|
||||
# the instance to the low level milter.milterContext object. When the SMTP
|
||||
# connection terminates, the close callback is called, the low level connection
|
||||
# object is destroyed, and this normally causes instances of this class to be
|
||||
# garbage collected as well. The close() method should release any global
|
||||
# resources held by instances.
|
||||
# @since 0.9.2
|
||||
class Base(object):
|
||||
"The core class interface to the %milter module."
|
||||
|
||||
## Attach this Milter to the low level milter.milterContext object.
|
||||
class Milter:
|
||||
"""A simple class interface to the milter module.
|
||||
"""
|
||||
def _setctx(self,ctx):
|
||||
## The low level @ref milter.milterContext object.
|
||||
self._ctx = ctx
|
||||
## A bitmask of actions this connection has negotiated to use.
|
||||
# By default, all actions are enabled. High throughput milters
|
||||
# may want to disable unused actions to increase efficiency.
|
||||
# Some optional actions may be disabled by calling milter.set_flags(), or
|
||||
# by overriding the negotiate callback. The bits include:
|
||||
# <code>ADDHDRS,CHGBODY,MODBODY,ADDRCPT,ADDRCPT_PAR,DELRCPT
|
||||
# CHGHDRS,QUARANTINE,CHGFROM,SETSYMLIST</code>.
|
||||
# The <code>Milter.CURR_ACTS</code> bitmask is all actions
|
||||
# known when the milter module was compiled.
|
||||
# Application code can also inspect this field to determine
|
||||
# which actions are available. This is especially useful in
|
||||
# generic library code designed to work in multiple milters.
|
||||
# @since 0.9.2
|
||||
#
|
||||
self._actions = CURR_ACTS # all actions enabled by default
|
||||
## A bitmask of protocol options this connection has negotiated.
|
||||
# An application may inspect this
|
||||
# variable to determine which protocol steps are supported. Options
|
||||
# of interest to applications: the SKIP result code is allowed
|
||||
# only if the P_SKIP bit is set, rejected recipients are passed to the
|
||||
# %milter application only if the P_RCPT_REJ bit is set, and
|
||||
# header values are sent and received with leading spaces (in the
|
||||
# continuation lines) intact if the P_HDR_LEADSPC bit is set (so
|
||||
# that the application can customize indenting).
|
||||
#
|
||||
# The P_N* bits should be negotiated via the @@noreply and @@nocallback
|
||||
# method decorators, and P_RCPT_REJ, P_HDR_LEADSPC should
|
||||
# be enabled using the enable_protocols class decorator.
|
||||
#
|
||||
# The bits include: <code>
|
||||
# P_RCPT_REJ P_NR_CONN P_NR_HELO P_NR_MAIL P_NR_RCPT P_NR_DATA P_NR_UNKN
|
||||
# P_NR_EOH P_NR_BODY P_NR_HDR P_NOCONNECT P_NOHELO P_NOMAIL P_NORCPT
|
||||
# P_NODATA P_NOUNKNOWN P_NOEOH P_NOBODY P_NOHDRS P_HDR_LEADSPC P_SKIP
|
||||
# </code> (all under the Milter namespace).
|
||||
# @since 0.9.2
|
||||
self._protocol = 0 # no protocol options by default
|
||||
self.__ctx = ctx
|
||||
if ctx:
|
||||
ctx.setpriv(self)
|
||||
|
||||
## Defined by subclasses to write log messages.
|
||||
def log(self,*msg): pass
|
||||
## Called for each connection to the MTA. Called by the
|
||||
# <a href="https://www.milter.org/developers/api/xxfi_connect">
|
||||
# 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="https://www.milter.org/developers/api/xxfi_envfrom">
|
||||
# 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="https://www.milter.org/developers/api/xxfi_envrcpt">
|
||||
# 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
|
||||
@nocallback
|
||||
def unknown(self,cmd): return CONTINUE
|
||||
## Called at the end of the message body.
|
||||
# Most of the message manipulation actions can only take place from
|
||||
# the eom callback.
|
||||
def eom(self): return CONTINUE
|
||||
## Called when the connection is abnormally terminated.
|
||||
# The close callback is still called also.
|
||||
def abort(self): return CONTINUE
|
||||
## Called when the connection is closed.
|
||||
def close(self): return CONTINUE
|
||||
|
||||
## Return mask of SMFIP_N* protocol option bits to clear for this class
|
||||
# The @@nocallback and @@noreply decorators set the
|
||||
# <code>milter_protocol</code> function attribute to the protocol mask bit to
|
||||
# pass to libmilter, causing that callback or its reply to be skipped.
|
||||
# Overriding a method creates a new function object, so that
|
||||
# <code>milter_protocol</code> defaults to 0.
|
||||
# Libmilter passes the protocol bits that the current MTA knows
|
||||
# how to skip. We clear the ones we don't want to skip.
|
||||
# The negation is somewhat mind bending, but it is simple.
|
||||
# @since 0.9.2
|
||||
@classmethod
|
||||
def protocol_mask(klass):
|
||||
try:
|
||||
return klass._protocol_mask
|
||||
except AttributeError:
|
||||
p = P_RCPT_REJ | P_HDR_LEADSPC # turn these new features off by default
|
||||
for func,(nr,nc) in OPTIONAL_CALLBACKS.items():
|
||||
func = getattr(klass,func)
|
||||
ca = getattr(func,'milter_protocol',0)
|
||||
#print func,hex(nr),hex(nc),hex(ca)
|
||||
p |= (nr|nc) & ~ca
|
||||
klass._protocol_mask = p
|
||||
return p
|
||||
|
||||
## Negotiate milter protocol options. Called by the
|
||||
# <a href="https://www.milter.org/developers/api/xxfi_negotiate">
|
||||
# xffi_negotiate</a> callback. 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
|
||||
def negotiate(self,opts):
|
||||
try:
|
||||
self._actions,p,f1,f2 = opts
|
||||
opts[1] = self._protocol = p & ~self.protocol_mask()
|
||||
opts[2] = 0
|
||||
opts[3] = 0
|
||||
#self.log("Negotiated:",opts)
|
||||
except:
|
||||
# don't change anything if something went wrong
|
||||
return ALL_OPTS
|
||||
return CONTINUE
|
||||
|
||||
# Milter methods which can be invoked from most callbacks
|
||||
|
||||
## Return the value of an MTA macro. Sendmail macro names
|
||||
# are either single chars (e.g. "j") or multiple chars enclosed
|
||||
# in braces (e.g. "{auth_type}"). Macro names are MTA dependent.
|
||||
# See <a href="https://www.milter.org/developers/api/smfi_getsymval">
|
||||
# smfi_getsymval</a> for default sendmail macros.
|
||||
# @param sym the macro name
|
||||
def getsymval(self,sym):
|
||||
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="https://www.milter.org/developers/api/smfi_setreply">
|
||||
# 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.
|
||||
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.
|
||||
# This information can reduce the size of messages received from sendmail,
|
||||
# and hence could reduce bandwidth between sendmail and your milter where
|
||||
# that is a factor. The <code>Milter.SETSYMLIST</code> action flag must be
|
||||
# set. The protocol stages are M_CONNECT, M_HELO, M_ENVFROM, M_ENVRCPT,
|
||||
# M_DATA, M_EOM, M_EOH.
|
||||
#
|
||||
# May only be called from negotiate callback.
|
||||
# @since 0.9.8, previous version was misspelled!
|
||||
# @param stage the protocol stage to set to macro list for,
|
||||
# one of the M_* constants defined in Milter
|
||||
# @param macros space separated and/or lists of strings
|
||||
def setsymlist(self,stage,*macros):
|
||||
if not self._actions & SETSYMLIST: raise DisabledAction("SETSYMLIST")
|
||||
a = []
|
||||
for m in macros:
|
||||
try:
|
||||
m = m.encode('utf8')
|
||||
except: pass
|
||||
try:
|
||||
m = m.split(' ')
|
||||
except: pass
|
||||
a += m
|
||||
return self._ctx.setsmlist(stage,' '.join(a))
|
||||
|
||||
# Milter methods which can only be called from eom callback.
|
||||
|
||||
## Add a mail header field.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_addheader">
|
||||
# smfi_addheader</a>.
|
||||
# The <code>Milter.ADDHDRS</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param field the header field name
|
||||
# @param value the header field value
|
||||
# @param idx header field index from the top of the message to insert at
|
||||
# @throws DisabledAction if ADDHDRS is not enabled
|
||||
def addheader(self,field,value,idx=-1):
|
||||
if not self._actions & ADDHDRS: raise DisabledAction("ADDHDRS")
|
||||
return self._ctx.addheader(field,value,idx)
|
||||
|
||||
## Change the value of a mail header field.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_chgheader">
|
||||
# smfi_chgheader</a>.
|
||||
# The <code>Milter.CHGHDRS</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param field the name of the field to change
|
||||
# @param idx index of the field to change when there are multiple instances
|
||||
# @param value the new value of the field
|
||||
# @throws DisabledAction if CHGHDRS is not enabled
|
||||
def chgheader(self,field,idx,value):
|
||||
if not self._actions & CHGHDRS: raise DisabledAction("CHGHDRS")
|
||||
return self._ctx.chgheader(field,idx,value)
|
||||
|
||||
## Add a recipient to the message.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_addrcpt">
|
||||
# smfi_addrcpt</a>.
|
||||
# If no corresponding mail header is added, this is like a Bcc.
|
||||
# The syntax of the recipient is the same as used in the SMTP
|
||||
# RCPT TO command (and as delivered to the envrcpt callback), for example
|
||||
# "self.addrcpt('<foo@example.com>')".
|
||||
# The <code>Milter.ADDRCPT</code> action flag must be set.
|
||||
# If the optional <code>params</code> argument is used, then
|
||||
# the <code>Milter.ADDRCPT_PAR</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param rcpt the message recipient
|
||||
# @param params an optional list of ESMTP parameters
|
||||
# @throws DisabledAction if ADDRCPT or ADDRCPT_PAR is not enabled
|
||||
def addrcpt(self,rcpt,params=None):
|
||||
if not self._actions & ADDRCPT: raise DisabledAction("ADDRCPT")
|
||||
if params and not self._actions & ADDRCPT_PAR:
|
||||
raise DisabledAction("ADDRCPT_PAR")
|
||||
return self._ctx.addrcpt(rcpt,params)
|
||||
## Delete a recipient from the message.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_delrcpt">
|
||||
# smfi_delrcpt</a>.
|
||||
# The recipient should match one passed to the envrcpt callback.
|
||||
# The <code>Milter.DELRCPT</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param rcpt the message recipient to delete
|
||||
# @throws DisabledAction if DELRCPT is not enabled
|
||||
def delrcpt(self,rcpt):
|
||||
if not self._actions & DELRCPT: raise DisabledAction("DELRCPT")
|
||||
return self._ctx.delrcpt(rcpt)
|
||||
|
||||
## Replace the message body.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_replacebody">
|
||||
# smfi_replacebody</a>.
|
||||
# The entire message body must be replaced.
|
||||
# Call repeatedly with blocks of data until the entire body is transferred.
|
||||
# The <code>Milter.MODBODY</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param body a chunk of body data
|
||||
# @throws DisabledAction if MODBODY is not enabled
|
||||
def replacebody(self,body):
|
||||
if not self._actions & MODBODY: raise DisabledAction("MODBODY")
|
||||
return self._ctx.replacebody(body)
|
||||
|
||||
## Change the SMTP envelope sender address.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_chgfrom">
|
||||
# smfi_chgfrom</a>.
|
||||
# The syntax of the sender is that same as used in the SMTP
|
||||
# MAIL FROM command (and as delivered to the envfrom callback),
|
||||
# for example <code>self.chgfrom('<bar@example.com>')</code>.
|
||||
# The <code>Milter.CHGFROM</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @since 0.9.1
|
||||
# @param sender the new sender address
|
||||
# @param params an optional list of ESMTP parameters
|
||||
# @throws DisabledAction if CHGFROM is not enabled
|
||||
def chgfrom(self,sender,params=None):
|
||||
if not self._actions & CHGFROM: raise DisabledAction("CHGFROM")
|
||||
return self._ctx.chgfrom(sender,params)
|
||||
|
||||
## Quarantine the message.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_quarantine">
|
||||
# smfi_quarantine</a>.
|
||||
# When quarantined, a message goes into the mailq as if to be delivered,
|
||||
# but delivery is deferred until the message is unquarantined.
|
||||
# The <code>Milter.QUARANTINE</code> action flag must be set.
|
||||
#
|
||||
# May be called from eom callback only.
|
||||
# @param reason a string describing the reason for quarantine
|
||||
# @throws DisabledAction if QUARANTINE is not enabled
|
||||
def quarantine(self,reason):
|
||||
if not self._actions & QUARANTINE: raise DisabledAction("QUARANTINE")
|
||||
return self._ctx.quarantine(reason)
|
||||
|
||||
## Tell the MTA to wait a bit longer.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_progress">
|
||||
# smfi_progress</a>.
|
||||
# Resets timeouts in the MTA that detect a "hung" milter.
|
||||
def progress(self):
|
||||
return self._ctx.progress()
|
||||
|
||||
## A logging but otherwise do nothing Milter base class.
|
||||
# This is included for compatibility with previous versions of pymilter.
|
||||
# The logging callbacks are marked @@noreply.
|
||||
class Milter(Base):
|
||||
"A simple class interface to the milter module."
|
||||
|
||||
## Provide simple logging to sys.stdout
|
||||
# user replaceable callbacks
|
||||
def log(self,*msg):
|
||||
print 'Milter:',
|
||||
for i in msg: print i,
|
||||
print
|
||||
|
||||
@noreply
|
||||
def connect(self,hostname,family,hostaddr):
|
||||
def connect(self,hostname,unused,hostaddr):
|
||||
"Called for each connection to sendmail."
|
||||
self.log("connect from %s at %s" % (hostname,hostaddr))
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def hello(self,hostname):
|
||||
"Called after the HELO command."
|
||||
self.log("hello from %s" % hostname)
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def envfrom(self,f,*str):
|
||||
"""Called to begin each message.
|
||||
f -> string message sender
|
||||
@@ -610,24 +60,25 @@ class Milter(Base):
|
||||
self.log("mail from",f,str)
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def envrcpt(self,to,*str):
|
||||
"Called for each message recipient."
|
||||
self.log("rcpt to",to,str)
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def header(self,field,value):
|
||||
"Called for each message header."
|
||||
self.log("%s: %s" % (field,value))
|
||||
return CONTINUE
|
||||
|
||||
@noreply
|
||||
def eoh(self):
|
||||
"Called after all headers are processed."
|
||||
self.log("eoh")
|
||||
return CONTINUE
|
||||
|
||||
def body(self,unused):
|
||||
"Called to transfer the message body."
|
||||
return CONTINUE
|
||||
|
||||
def eom(self):
|
||||
"Called at the end of message."
|
||||
self.log("eom")
|
||||
@@ -643,49 +94,55 @@ class Milter(Base):
|
||||
self.log("close")
|
||||
return CONTINUE
|
||||
|
||||
## The milter connection factory
|
||||
# This factory method is called for each connection to create the
|
||||
# python object that tracks the connection. It should return
|
||||
# an object derived from Milter.Base.
|
||||
#
|
||||
# Note that since python is dynamic, this variable can be changed while
|
||||
# the milter is running: for instance, to a new subclass based on a
|
||||
# change in configuration.
|
||||
# Milter methods which can be invoked from callbacks
|
||||
def getsymval(self,sym):
|
||||
return self.__ctx.getsymval(sym)
|
||||
|
||||
# If sendmail does not support setmlreply, then only the
|
||||
# first msg line is used.
|
||||
def setreply(self,rcode,xcode=None,msg=None,*ml):
|
||||
return self.__ctx.setreply(rcode,xcode,msg,*ml)
|
||||
|
||||
# Milter methods which can only be called from eom callback.
|
||||
def addheader(self,field,value):
|
||||
return self.__ctx.addheader(field,value)
|
||||
|
||||
def chgheader(self,field,idx,value):
|
||||
return self.__ctx.chgheader(field,idx,value)
|
||||
|
||||
def addrcpt(self,rcpt):
|
||||
return self.__ctx.addrcpt(rcpt)
|
||||
|
||||
def delrcpt(self,rcpt):
|
||||
return self.__ctx.delrcpt(rcpt)
|
||||
|
||||
def replacebody(self,body):
|
||||
return self.__ctx.replacebody(body)
|
||||
|
||||
# When quarantined, a message goes into the mailq as if to be delivered,
|
||||
# but delivery is deferred until the message is unquarantined.
|
||||
def quarantine(self,reason):
|
||||
return self.__ctx.quarantine(reason)
|
||||
|
||||
def progress(self):
|
||||
return self.__ctx.progress()
|
||||
|
||||
factory = Milter
|
||||
|
||||
## @private
|
||||
# @brief Connect context to connection instance and return enabled callbacks.
|
||||
def negotiate_callback(ctx,opts):
|
||||
m = factory()
|
||||
m._setctx(ctx)
|
||||
return m.negotiate(opts)
|
||||
|
||||
## @private
|
||||
# @brief Connect context if needed and invoke connect method.
|
||||
def connect_callback(ctx,hostname,family,hostaddr,nr_mask=P_NR_CONN):
|
||||
m = ctx.getpriv()
|
||||
if not m:
|
||||
# If not already created (because the current MTA doesn't support
|
||||
# xmfi_negotiate), create the connection object.
|
||||
def connectcallback(ctx,hostname,family,hostaddr):
|
||||
m = factory()
|
||||
m._setctx(ctx)
|
||||
return m.connect(hostname,family,hostaddr)
|
||||
|
||||
## @private
|
||||
# @brief Disconnect milterContext and call close method.
|
||||
def close_callback(ctx):
|
||||
def closecallback(ctx):
|
||||
m = ctx.getpriv()
|
||||
if not m: return CONTINUE
|
||||
try:
|
||||
rc = m.close()
|
||||
finally:
|
||||
m._setctx(None) # release milterContext
|
||||
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('=')
|
||||
@@ -693,18 +150,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
|
||||
@@ -719,11 +164,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,
|
||||
@@ -742,14 +182,12 @@ def runmilter(name,socketname,timeout = 0):
|
||||
print "Removing %s" % fname
|
||||
try:
|
||||
os.unlink(fname)
|
||||
except os.error, x:
|
||||
import errno
|
||||
if x.errno != errno.ENOENT:
|
||||
raise milter.error(x)
|
||||
except:
|
||||
pass
|
||||
|
||||
# The default flags set include everything
|
||||
# milter.set_flags(milter.ADDHDRS)
|
||||
milter.set_connect_callback(connect_callback)
|
||||
milter.set_connect_callback(connectcallback)
|
||||
milter.set_helo_callback(lambda ctx, host: ctx.getpriv().hello(host))
|
||||
# For envfrom and envrcpt, we would like to convert ESMTP parms to keyword
|
||||
# parms, but then all existing users would have to include **kw to accept
|
||||
@@ -762,20 +200,12 @@ def runmilter(name,socketname,timeout = 0):
|
||||
milter.set_body_callback(lambda ctx,chunk: ctx.getpriv().body(chunk))
|
||||
milter.set_eom_callback(lambda ctx: ctx.getpriv().eom())
|
||||
milter.set_abort_callback(lambda ctx: ctx.getpriv().abort())
|
||||
milter.set_close_callback(close_callback)
|
||||
milter.set_close_callback(closecallback)
|
||||
|
||||
milter.setconn(socketname)
|
||||
if timeout > 0: milter.settimeout(timeout)
|
||||
# disable negotiate callback if runtime version < (1,0,1)
|
||||
ncb = negotiate_callback
|
||||
if milter.getversion() < (1,0,1):
|
||||
ncb = None
|
||||
# The name *must* match the X line in sendmail.cf (supposedly)
|
||||
milter.register(name,
|
||||
data=lambda ctx: ctx.getpriv().data(),
|
||||
unknown=lambda ctx,cmd: ctx.getpriv().unknown(cmd),
|
||||
negotiate=ncb
|
||||
)
|
||||
milter.register(name)
|
||||
start_seq = _seq
|
||||
try:
|
||||
milter.main()
|
||||
@@ -785,10 +215,6 @@ def runmilter(name,socketname,timeout = 0):
|
||||
raise milter.error("out of thread resources")
|
||||
|
||||
__all__ = globals().copy()
|
||||
for priv in ('os','milter','thread','factory','_seq','_seq_lock','__version__'):
|
||||
for priv in ('os','milter','thread','factory','_seq','_seq_lock'):
|
||||
del __all__[priv]
|
||||
__all__ = __all__.keys()
|
||||
|
||||
## @example milter-template.py
|
||||
## @example milter-nomix.py
|
||||
#
|
||||
|
||||
-161
@@ -1,161 +0,0 @@
|
||||
# Email address list with expiration
|
||||
#
|
||||
# This class acts like a map. Entries with a value of None are persistent,
|
||||
# but disappear after a time limit. This is useful for automatic whitelists
|
||||
# and blacklists with expiration. The persistent store is a simple ascii
|
||||
# file with sender and timestamp on each line. Entries can be appended
|
||||
# to the store, and will be picked up the next time it is loaded.
|
||||
#
|
||||
# Entries with other values are not persistent. This is used to hold failed
|
||||
# CBV results.
|
||||
#
|
||||
# $Log$
|
||||
# Revision 1.9 2008/05/08 21:35:57 customdesigned
|
||||
# Allow explicitly whitelisted email from banned_users.
|
||||
#
|
||||
# Revision 1.8 2007/09/03 16:18:45 customdesigned
|
||||
# Delete unparseable timestamps when loading address cache. These have
|
||||
# arisen because of failure to parse MAIL FROM properly. Will have to
|
||||
# tighten up MAIL FROM parsing to match RFC.
|
||||
#
|
||||
# Revision 1.7 2007/01/25 22:47:26 customdesigned
|
||||
# Persist blacklisting from delayed DSNs.
|
||||
#
|
||||
# Revision 1.6 2007/01/19 23:31:38 customdesigned
|
||||
# Move parse_header to Milter.utils.
|
||||
# Test case for delayed DSN parsing.
|
||||
# Fix plock when source missing or cannot set owner/group.
|
||||
#
|
||||
# Revision 1.5 2007/01/11 19:59:40 customdesigned
|
||||
# Purge old entries in auto_whitelist and send_dsn logs.
|
||||
#
|
||||
# Revision 1.4 2007/01/11 04:31:26 customdesigned
|
||||
# Negative feedback for bad headers. Purge cache logs on startup.
|
||||
#
|
||||
# Revision 1.3 2007/01/08 23:20:54 customdesigned
|
||||
# Get user feedback.
|
||||
#
|
||||
# Revision 1.2 2007/01/05 23:33:55 customdesigned
|
||||
# Make blacklist an AddrCache
|
||||
#
|
||||
# Revision 1.1 2007/01/05 21:25:40 customdesigned
|
||||
# Move AddrCache to Milter package.
|
||||
#
|
||||
|
||||
# Author: Stuart D. Gathman <stuart@bmsi.com>
|
||||
# Copyright 2001,2002,2003,2004,2005 Business Management Systems, Inc.
|
||||
# This code is under the GNU General Public License. See COPYING for details.
|
||||
|
||||
import time
|
||||
from plock import PLock
|
||||
|
||||
class AddrCache(object):
|
||||
time_format = '%Y%b%d %H:%M:%S %Z'
|
||||
|
||||
def __init__(self,renew=7,fname=None):
|
||||
self.age = renew
|
||||
self.cache = {}
|
||||
self.fname = fname
|
||||
|
||||
def load(self,fname,age=0):
|
||||
"Load address cache from persistent store."
|
||||
if not age:
|
||||
age = self.age
|
||||
self.fname = fname
|
||||
cache = {}
|
||||
self.cache = cache
|
||||
now = time.time()
|
||||
lock = PLock(self.fname)
|
||||
wfp = lock.lock()
|
||||
changed = False
|
||||
try:
|
||||
too_old = now - age*24*60*60 # max age in days
|
||||
try:
|
||||
fp = open(self.fname)
|
||||
except OSError:
|
||||
fp = ()
|
||||
for ln in fp:
|
||||
try:
|
||||
rcpt,ts = ln.strip().split(None,1)
|
||||
try:
|
||||
l = time.strptime(ts,AddrCache.time_format)
|
||||
t = time.mktime(l)
|
||||
if t < too_old:
|
||||
changed = True
|
||||
continue
|
||||
cache[rcpt.lower()] = (t,None)
|
||||
except: # unparsable timestamp - likely garbage
|
||||
changed = True
|
||||
continue
|
||||
except: # manual entry (no timestamp)
|
||||
cache[ln.strip().lower()] = (now,None)
|
||||
wfp.write(ln)
|
||||
if changed:
|
||||
lock.commit(self.fname+'.old')
|
||||
else:
|
||||
lock.unlock()
|
||||
except IOError:
|
||||
lock.unlock()
|
||||
|
||||
def has_precise_key(self,sender):
|
||||
"""True if precise sender is cached and has not expired. Don't
|
||||
try looking up wildcard entries.
|
||||
"""
|
||||
try:
|
||||
lsender = sender and sender.lower()
|
||||
ts,res = self.cache[lsender]
|
||||
too_old = time.time() - self.age*24*60*60 # max age in days
|
||||
if not ts or ts > too_old:
|
||||
return True
|
||||
del self.cache[lsender]
|
||||
except KeyError: pass
|
||||
return False
|
||||
|
||||
def has_key(self,sender):
|
||||
"True if sender is cached and has not expired."
|
||||
if self.has_precise_key(sender):
|
||||
return True
|
||||
try:
|
||||
user,host = sender.split('@',1)
|
||||
return self.has_precise_key(host)
|
||||
except: pass
|
||||
return False
|
||||
|
||||
__contains__ = has_key
|
||||
|
||||
def __getitem__(self,sender):
|
||||
try:
|
||||
lsender = sender.lower()
|
||||
ts,res = self.cache[lsender]
|
||||
too_old = time.time() - self.age*24*60*60 # max age in days
|
||||
if not ts or ts > too_old:
|
||||
return res
|
||||
del self.cache[lsender]
|
||||
raise KeyError, sender
|
||||
except KeyError,x:
|
||||
try:
|
||||
user,host = sender.split('@',1)
|
||||
return self.__getitem__(host)
|
||||
except ValueError:
|
||||
raise x
|
||||
|
||||
def addperm(self,sender,res=None):
|
||||
"Add a permanent sender."
|
||||
lsender = sender.lower()
|
||||
if self.has_key(lsender):
|
||||
ts,res = self.cache[lsender]
|
||||
if not ts: return # already permanent
|
||||
self.cache[lsender] = (None,res)
|
||||
if not res:
|
||||
print >>open(self.fname,'a'),sender
|
||||
|
||||
def __setitem__(self,sender,res):
|
||||
lsender = sender.lower()
|
||||
now = time.time()
|
||||
self.cache[lsender] = (now,res)
|
||||
if not res and self.fname:
|
||||
s = time.strftime(AddrCache.time_format,time.localtime(now))
|
||||
print >>open(self.fname,'a'),sender,s # log refreshed senders
|
||||
|
||||
def __len__(self):
|
||||
return len(self.cache)
|
||||
@@ -1,64 +0,0 @@
|
||||
from ConfigParser import ConfigParser
|
||||
|
||||
class MilterConfigParser(ConfigParser):
|
||||
|
||||
def __init__(self,defaults={}):
|
||||
ConfigParser.__init__(self)
|
||||
self.defaults = defaults
|
||||
|
||||
# The defaults provided by ConfigParser show up in all sections,
|
||||
# which screws up iterating over all options in a section.
|
||||
# Worse, passing "defaults" with vars= overrides the config file!
|
||||
# So we roll our own defaults.
|
||||
def get(self,sect,opt):
|
||||
if not self.has_option(sect,opt) and opt in self.defaults:
|
||||
return self.defaults[opt]
|
||||
return ConfigParser.get(self,sect,opt)
|
||||
|
||||
def getlist(self,sect,opt):
|
||||
if self.has_option(sect,opt):
|
||||
return [q.strip() for q in self.get(sect,opt).split(',')]
|
||||
return []
|
||||
|
||||
def getaddrset(self,sect,opt):
|
||||
if not self.has_option(sect,opt):
|
||||
return {}
|
||||
s = self.get(sect,opt)
|
||||
d = {}
|
||||
for q in s.split(','):
|
||||
q = q.strip()
|
||||
if q.startswith('file:'):
|
||||
domain = q[5:].lower()
|
||||
d[domain] = d.setdefault(domain,[]) + open(domain,'r').read().split()
|
||||
else:
|
||||
user,domain = q.split('@')
|
||||
d.setdefault(domain.lower(),[]).append(user)
|
||||
return d
|
||||
|
||||
def getaddrdict(self,sect,opt):
|
||||
if not self.has_option(sect,opt):
|
||||
return {}
|
||||
d = {}
|
||||
for q in self.get(sect,opt).split(','):
|
||||
q = q.strip()
|
||||
if self.has_option(sect,q):
|
||||
l = self.get(sect,q)
|
||||
for addr in l.split(','):
|
||||
addr = addr.strip()
|
||||
if addr.startswith('file:'):
|
||||
fname = addr[5:]
|
||||
for a in open(fname,'r').read().split():
|
||||
d[a] = q
|
||||
else:
|
||||
d[addr] = q
|
||||
return d
|
||||
|
||||
def getdefault(self,sect,opt,default=None):
|
||||
if self.has_option(sect,opt):
|
||||
return self.get(sect,opt)
|
||||
return default
|
||||
|
||||
def getintdefault(self,sect,opt,default=None):
|
||||
if self.has_option(sect,opt):
|
||||
return self.getint(sect,opt)
|
||||
return default
|
||||
-123
@@ -1,123 +0,0 @@
|
||||
## @package Milter.dns
|
||||
# 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()
|
||||
# key k: ('wayforward.net', 'A'), value v
|
||||
# FIXME: pydns returns AAAA RR as 16 byte binary string, but
|
||||
# A RR as dotted quad. For consistency, this driver should
|
||||
# return both as binary string.
|
||||
return [((a['name'], a['typename']), a['data']) for a in resp.answers]
|
||||
except IOError, x:
|
||||
raise DNSError, str(x)
|
||||
|
||||
class Session(object):
|
||||
"""A Session object has a simple cache with no TTL that is valid
|
||||
for a single "session", for example an SMTP conversation."""
|
||||
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
|
||||
def dns(self, name, qtype, cnames=None):
|
||||
"""DNS query.
|
||||
|
||||
If the result is in cache, return that. Otherwise pull the
|
||||
result from DNS, and cache ALL answers, so additional info
|
||||
is available for further queries later.
|
||||
|
||||
CNAMEs are followed.
|
||||
|
||||
If there is no data, [] is returned.
|
||||
|
||||
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)
|
||||
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:
|
||||
safe2cache = Session.SAFE2CACHE
|
||||
for k, v in DNSLookup(name, qtype):
|
||||
if k == cnamek:
|
||||
cname = v
|
||||
if k[1] == 'CNAME' or (qtype,k[1]) in safe2cache:
|
||||
self.cache.setdefault(k, []).append(v)
|
||||
result = self.cache.get( (name, qtype), [])
|
||||
if not result and cname:
|
||||
if not cnames:
|
||||
cnames = {}
|
||||
elif len(cnames) >= MAX_CNAME:
|
||||
#return result # if too many == NX_DOMAIN
|
||||
raise DNSError('Length of CNAME chain exceeds %d' % MAX_CNAME)
|
||||
cnames[name] = cname
|
||||
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__':
|
||||
import sys
|
||||
s = Session()
|
||||
for n,t in zip(*[iter(sys.argv[1:])]*2):
|
||||
print n,t
|
||||
print s.dns(n,t)
|
||||
+128
-175
@@ -4,147 +4,135 @@
|
||||
|
||||
# Send DSNs, do call back verification,
|
||||
# and generate DSN messages from a template
|
||||
# $Log$
|
||||
# Revision 1.22 2011/03/18 20:41:31 customdesigned
|
||||
# Python2.6 SMTP.close() fails when instance never connected.
|
||||
#
|
||||
# Revision 1.21 2011/03/03 05:11:58 customdesigned
|
||||
# Release 0.9.4
|
||||
#
|
||||
# Revision 1.20 2010/10/11 00:29:47 customdesigned
|
||||
# Handle multiple recipients. For CBV or auto whitelist of multiple emails.
|
||||
#
|
||||
# Revision 1.19 2009/07/02 19:41:12 customdesigned
|
||||
# Handle @ in localpart.
|
||||
#
|
||||
# Revision 1.18 2009/06/10 18:01:59 customdesigned
|
||||
# Doxygen updates
|
||||
#
|
||||
# Revision 1.17 2009/05/20 20:08:44 customdesigned
|
||||
# Support non-DSN CBV (non-empty MAIL FROM)
|
||||
#
|
||||
# Revision 1.16 2007/09/25 01:24:59 customdesigned
|
||||
# Allow arbitrary object, not just spf.query like, to provide data for create_msg
|
||||
#
|
||||
# Revision 1.15 2007/09/24 20:13:26 customdesigned
|
||||
# Remove explicit spf dependency.
|
||||
#
|
||||
# Revision 1.14 2007/03/03 18:19:40 customdesigned
|
||||
# Handle DNS error sending DSN.
|
||||
#
|
||||
# Revision 1.13 2007/01/04 18:01:11 customdesigned
|
||||
# Do plain CBV when template missing.
|
||||
#
|
||||
# Revision 1.12 2006/07/26 16:37:35 customdesigned
|
||||
# Support timeout.
|
||||
#
|
||||
# Revision 1.11 2006/06/21 21:07:11 customdesigned
|
||||
# Include header fields in DSN template.
|
||||
#
|
||||
# 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 spf
|
||||
import socket
|
||||
from email.Message import Message
|
||||
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=''):
|
||||
nospf_msg = """Subject: Critical mail server configuration error
|
||||
|
||||
This is an automatically generated Delivery Status Notification.
|
||||
|
||||
THIS IS A WARNING MESSAGE ONLY.
|
||||
|
||||
YOU DO *NOT* NEED TO RESEND YOUR MESSAGE.
|
||||
|
||||
Delivery to the following recipients has been delayed.
|
||||
|
||||
%(rcpt)s
|
||||
|
||||
Subject: %(subject)s
|
||||
|
||||
Someone at IP address %(connectip)s sent an email claiming
|
||||
to be from %(sender)s.
|
||||
|
||||
If that wasn't you, then your domain, %(sender_domain)s,
|
||||
was forged - i.e. used without your knowlege or authorization by
|
||||
someone attempting to steal your mail identity. This is a very
|
||||
serious problem, and you need to provide authentication for your
|
||||
SMTP (email) servers to prevent criminals from forging your
|
||||
domain. The simplest step is usually to publish an SPF record
|
||||
with your Sender Policy.
|
||||
|
||||
For more information, see: http://spfhelp.net
|
||||
|
||||
I hate to annoy you with a DSN (Delivery Status
|
||||
Notification) from a possibly forged email, but since you
|
||||
have not published a sender policy, there is no other way
|
||||
of bringing this to your attention.
|
||||
|
||||
If it *was* you that sent the email, then your email domain
|
||||
or configuration is in error. If you don't know anything
|
||||
about mail servers, then pass this on to your SMTP (mail)
|
||||
server administrator. We have accepted the email anyway, in
|
||||
case it is important, but we couldn't find anything about
|
||||
the mail submitter at %(connectip)s to distinguish it from a
|
||||
zombie (compromised/infected computer - usually a Windows
|
||||
PC). There was no PTR record for its IP address (PTR names
|
||||
that contain the IP address don't count). RFC2821 requires
|
||||
that your hello name be a FQN (Fully Qualified domain Name,
|
||||
i.e. at least one dot) that resolves to the IP address of
|
||||
the mail sender. In addition, just like for PTR, we don't
|
||||
accept a helo name that contains the IP, since this doesn't
|
||||
help to identify you. The hello name you used,
|
||||
%(heloname)s, was invalid.
|
||||
|
||||
Furthermore, there was no SPF record for the sending domain
|
||||
%(sender_domain)s. We even tried to find its IP in any A or
|
||||
MX records for your domain, but that failed also. We really
|
||||
should reject mail from anonymous mail clients, but in case
|
||||
it is important, we are accepting it anyway.
|
||||
|
||||
We are sending you this message to alert you to the fact that
|
||||
|
||||
Either - Someone is forging your domain.
|
||||
Or - You have problems with your email configuration.
|
||||
Or - Possibly both.
|
||||
|
||||
If you need further assistance, please do not hesitate to
|
||||
contact me again.
|
||||
|
||||
Kind regards,
|
||||
|
||||
postmaster@%(receiver)s
|
||||
"""
|
||||
|
||||
softfail_msg = """Subject: SPF softfail (POSSIBLE FORGERY)
|
||||
|
||||
This is an automatically generated Delivery Status Notification.
|
||||
|
||||
THIS IS A WARNING MESSAGE ONLY.
|
||||
|
||||
YOU DO *NOT* NEED TO RESEND YOUR MESSAGE.
|
||||
|
||||
Delivery to the following recipients has been delayed.
|
||||
|
||||
%(rcpt)s
|
||||
|
||||
Subject: %(subject)s
|
||||
Received-SPF: %(spf_result)s
|
||||
"""
|
||||
|
||||
def send_dsn(mailfrom,receiver,msg=None):
|
||||
"""Send DSN. If msg is None, do callback verification.
|
||||
Mailfrom is original sender we are sending DSN or CBV to.
|
||||
Receiver is the MTA sending the DSN.
|
||||
Return None for success or (code,msg) for failure."""
|
||||
user,domain = mailfrom.rsplit('@',1)
|
||||
if not session: session = dns.Session()
|
||||
try:
|
||||
mxlist = session.dns(domain,'MX')
|
||||
except dns.DNSError:
|
||||
return (450,'DNS Timeout: %s MX'%domain) # temp error
|
||||
user,domain = mailfrom.split('@')
|
||||
q = spf.query(None,None,None)
|
||||
mxlist = q.dns(domain,'MX')
|
||||
if not mxlist:
|
||||
mxlist = (0,domain), # fallback to A record when no MX
|
||||
mxlist = (0,domain),
|
||||
else:
|
||||
mxlist.sort()
|
||||
smtp = smtplib.SMTP()
|
||||
toolate = time.time() + timeout
|
||||
for prior,host in mxlist:
|
||||
try:
|
||||
smtp.connect(host)
|
||||
code,resp = smtp.helo(receiver)
|
||||
# some wiley spammers have MX records that resolve to 127.0.0.1
|
||||
a = resp.split()
|
||||
if not a:
|
||||
return (553,'MX for %s has no hostname in banner: %s' % (domain,host))
|
||||
if a[0] == receiver:
|
||||
return (553,'Fraudulent MX for %s: %s' % (domain,host))
|
||||
if resp.split()[0] == receiver:
|
||||
return (553,'Fraudulent MX for %s' % domain)
|
||||
if not (200 <= code <= 299):
|
||||
raise smtplib.SMTPHeloError(code, resp)
|
||||
if msg:
|
||||
try:
|
||||
smtp.sendmail('<%s>'%ourfrom,mailfrom,msg)
|
||||
smtp.sendmail('<>',mailfrom,msg)
|
||||
except smtplib.SMTPSenderRefused:
|
||||
# does not accept DSN, try postmaster (at the risk of mail loops)
|
||||
smtp.sendmail('<postmaster@%s>'%receiver,mailfrom,msg)
|
||||
else: # CBV
|
||||
code,resp = smtp.docmd('MAIL FROM: <%s>'%ourfrom)
|
||||
code,resp = smtp.docmd('MAIL FROM: <>')
|
||||
if code != 250:
|
||||
raise smtplib.SMTPSenderRefused(code, resp, '<%s>'%ourfrom)
|
||||
if isinstance(mailfrom,basestring):
|
||||
mailfrom = [mailfrom]
|
||||
badrcpts = {}
|
||||
for rcpt in mailfrom:
|
||||
code,resp = smtp.rcpt(rcpt)
|
||||
raise smtplib.SMTPSenderRefused(code, resp, '<>')
|
||||
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:
|
||||
@@ -153,83 +141,48 @@ def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
|
||||
pass # any other error, try next MX
|
||||
except socket.error:
|
||||
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()
|
||||
if time.time() > toolate:
|
||||
return (450,'No MX response within %f minutes'%(timeout/60.0))
|
||||
smtp.close()
|
||||
return (450,'No MX servers available') # temp error
|
||||
|
||||
class Vars: pass
|
||||
|
||||
# NOTE: Caller can pass an object to create_msg that in a typical milter
|
||||
# collects things like heloname or sender anyway.
|
||||
def create_msg(v,rcptlist=None,origmsg=None,template=None):
|
||||
"""Create a DSN message from a template. Template must be '\n' separated.
|
||||
v - an object whose attributes are used for substitutions. Must
|
||||
have sender and receiver attributes at a minimum.
|
||||
rcptlist - used to set v.rcpt if given
|
||||
origmsg - used to set v.subject and v.spf_result if given
|
||||
template - a '\n' separated string with python '%(name)s' substitutions.
|
||||
"""
|
||||
if not template:
|
||||
return None
|
||||
if hasattr(v,'perm_error'):
|
||||
# likely to be an spf.query, try translating for backward compatibility
|
||||
q = v
|
||||
v = Vars()
|
||||
def create_msg(q,rcptlist,origmsg=None,template=None):
|
||||
"Create a DSN message from a template. Template must be '\n' separated."
|
||||
heloname = q.h
|
||||
sender = q.s
|
||||
connectip = q.i
|
||||
receiver = q.r
|
||||
sender_domain = q.o
|
||||
rcpt = '\n\t'.join(rcptlist)
|
||||
try: subject = origmsg['Subject']
|
||||
except: subject = '(none)'
|
||||
try:
|
||||
v.heloname = q.h
|
||||
v.sender = q.s
|
||||
v.connectip = q.i
|
||||
v.receiver = q.r
|
||||
v.sender_domain = q.o
|
||||
v.result = q.result
|
||||
v.perm_error = q.perm_error
|
||||
except: v = q
|
||||
if rcptlist:
|
||||
v.rcpt = '\n\t'.join(rcptlist)
|
||||
if origmsg:
|
||||
try: v.subject = origmsg['Subject']
|
||||
except: v.subject = '(none)'
|
||||
try:
|
||||
v.spf_result = origmsg['Received-SPF']
|
||||
except: v.spf_result = None
|
||||
spf_result = origmsg['Received-SPF']
|
||||
if not spf_result.startswith('softfail'):
|
||||
spf_result = None
|
||||
except: spf_result = None
|
||||
|
||||
msg = Message()
|
||||
|
||||
msg.add_header('X-Mailer','PyMilter-'+Milter.__version__)
|
||||
msg.add_header('To',sender)
|
||||
msg.add_header('From','postmaster@%s'%receiver)
|
||||
msg.add_header('Auto-Submitted','auto-generated (configuration error)')
|
||||
msg.set_type('text/plain')
|
||||
|
||||
hdrs,body = template.split('\n\n',1)
|
||||
if not template:
|
||||
if spf_result: template = softfail_msg
|
||||
else: template = nospf_msg
|
||||
hdrs,body = template.split('\n',1)
|
||||
for ln in hdrs.splitlines():
|
||||
name,val = ln.split(':',1)
|
||||
msg.add_header(name,(val % v.__dict__).strip())
|
||||
msg.set_payload(body % v.__dict__)
|
||||
# add headers if missing from old template
|
||||
if 'to' not in msg:
|
||||
msg.add_header('To',v.sender)
|
||||
if 'from' not in msg:
|
||||
msg.add_header('From','postmaster@%s'%v.receiver)
|
||||
if 'auto-submitted' not in msg:
|
||||
msg.add_header('Auto-Submitted','auto-generated')
|
||||
msg.add_header(name,(val % locals()).strip())
|
||||
msg.set_payload(body % locals())
|
||||
|
||||
return msg
|
||||
|
||||
if __name__ == '__main__':
|
||||
import spf
|
||||
q = spf.query('192.168.9.50',
|
||||
'SRS0=pmeHL=RH==stuart@example.com',
|
||||
'red.example.com',receiver='mail.example.com')
|
||||
q.result = 'softfail'
|
||||
q.perm_error = None
|
||||
msg = create_msg(q,['charlie@example.com'],None,
|
||||
"""From: postmaster@%(receiver)s
|
||||
To: %(sender)s
|
||||
Subject: Test
|
||||
|
||||
Test DSN template
|
||||
"""
|
||||
)
|
||||
'SRS0=pmeHL=RH=bmsi.com=stuart@bmsi.com',
|
||||
'bmsred.bmsi.com',receiver='mail.bmsi.com')
|
||||
msg = create_msg(q,['charlie@jsconnor.com'],None,None)
|
||||
print msg.as_string()
|
||||
# print send_dsn(f,msg.as_string())
|
||||
# print send_dsn(q.s,'mail.example.com',msg.as_string())
|
||||
print send_dsn(q.s,'mail.bmsi.com',msg.as_string())
|
||||
|
||||
+2
-5
@@ -44,20 +44,17 @@ def is_dynip(host,addr):
|
||||
True
|
||||
>>> is_dynip('[1.2.3.4]','1.2.3.4')
|
||||
True
|
||||
>>> is_dynip('c-71-63-151-151.hsd1.mn.comcast.net','71.63.151.151')
|
||||
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
|
||||
m = ip3.findall(host)
|
||||
if m:
|
||||
g = map(int,m)[:4]
|
||||
g = map(int,m)
|
||||
ia3 = (ia[1:],ia[:3])
|
||||
if g[-3:] in ia3: return True
|
||||
if g[0] == ia[3] and g[1:3] == ia[:2]: return True
|
||||
|
||||
@@ -1,102 +0,0 @@
|
||||
import time
|
||||
import shelve
|
||||
import thread
|
||||
import logging
|
||||
import urllib
|
||||
|
||||
log = logging.getLogger('milter.greylist')
|
||||
|
||||
def quoteAddress(s):
|
||||
'''Quote an address so that it's safe to store in the file-system.
|
||||
Address can either be a domain name, or local part.
|
||||
Returns the quoted address.'''
|
||||
|
||||
s = urllib.quote(s, '@_-+~!.%')
|
||||
if s.startswith('.'): s = '%2e' + s[1:]
|
||||
return s
|
||||
|
||||
class Record(object):
|
||||
__slots__ = ( 'firstseen', 'lastseen', 'umis', 'cnt' )
|
||||
|
||||
def __init__(self,timeinc=0):
|
||||
now = time.time() + timeinc
|
||||
self.firstseen = now
|
||||
self.lastseen = now
|
||||
self.cnt = 0
|
||||
self.umis = None
|
||||
|
||||
def __str__(self):
|
||||
return "Grey[%s:%s:%s:%d]" % (
|
||||
time.ctime(self.firstseen),time.ctime(self.lastseen),
|
||||
self.umis,self.cnt
|
||||
)
|
||||
|
||||
class Greylist(object):
|
||||
|
||||
def __init__(self,dbname,grey_time=10,grey_expire=4,grey_retain=36):
|
||||
self.ignoreLastByte = False
|
||||
self.greylist_time = grey_time * 60 # minutes
|
||||
self.greylist_expire = grey_expire * 3600 # hours
|
||||
self.greylist_retain = grey_retain * 24 * 3600 # days
|
||||
self.dbp = shelve.open(dbname,'c',protocol=2)
|
||||
self.lock = thread.allocate_lock()
|
||||
|
||||
def clean(self,timeinc=0):
|
||||
"Delete records past the retention limit."
|
||||
now = time.time() + timeinc
|
||||
cnt = 0
|
||||
dbp = self.dbp
|
||||
for key, r in dbp.iteritems():
|
||||
#print key,r,time.ctime(now)
|
||||
if now > r.lastseen + self.greylist_retain:
|
||||
self.lock.acquire()
|
||||
try:
|
||||
r = dbp[key]
|
||||
now = time.time() + timeinc
|
||||
if now > r.lastseen + self.greylist_retain:
|
||||
del dbp[key]
|
||||
cnt += 1
|
||||
finally:
|
||||
self.lock.release()
|
||||
return cnt
|
||||
|
||||
def check(self,ip,sender,recipient,timeinc=0):
|
||||
"Return number of allowed messages for greylist triple."
|
||||
sender = quoteAddress(sender)
|
||||
recipient = quoteAddress(recipient)
|
||||
key = ip + ':' + sender + ':' + recipient
|
||||
self.lock.acquire()
|
||||
try:
|
||||
dbp = self.dbp
|
||||
try:
|
||||
r = dbp[key]
|
||||
now = time.time() + timeinc
|
||||
if now > r.lastseen + self.greylist_retain:
|
||||
# expired
|
||||
log.debug('Expired greylist: %s',key)
|
||||
r = Record(timeinc)
|
||||
elif now < r.firstseen + self.greylist_time + 5:
|
||||
# still greylisted
|
||||
log.debug('Early greylist: %s',key)
|
||||
#r = Record(timeinc)
|
||||
r.lastseen = now
|
||||
elif r.cnt or now < r.firstseen + self.greylist_expire:
|
||||
# in greylist window or active
|
||||
r.lastseen = now
|
||||
r.cnt += 1
|
||||
log.debug('Active greylist(%d): %s',r.cnt,key)
|
||||
else:
|
||||
# passed greylist window
|
||||
log.debug('Late greylist: %s',key)
|
||||
r = Record(timeinc)
|
||||
dbp[key] = r
|
||||
except:
|
||||
r = Record(timeinc)
|
||||
dbp[key] = r
|
||||
dbp.sync()
|
||||
finally:
|
||||
self.lock.release()
|
||||
return r.cnt
|
||||
|
||||
def close(self):
|
||||
self.dbp.close()
|
||||
@@ -1,86 +0,0 @@
|
||||
import time
|
||||
import logging
|
||||
import urllib
|
||||
import sqlite3
|
||||
import thread
|
||||
from datetime import datetime
|
||||
|
||||
log = logging.getLogger('milter.greylist')
|
||||
|
||||
_db_lock = thread.allocate_lock()
|
||||
|
||||
class Greylist(object):
|
||||
|
||||
def __init__(self,dbname,grey_time=10,grey_expire=4,grey_retain=36):
|
||||
self.ignoreLastByte = False
|
||||
self.greylist_time = grey_time * 60 # minutes
|
||||
self.greylist_expire = grey_expire * 3600 # hours
|
||||
self.greylist_retain = grey_retain * 24 * 3600 # days
|
||||
self.conn = sqlite3.connect(dbname)
|
||||
self.conn.row_factory = sqlite3.Row
|
||||
try:
|
||||
self.conn.execute('''create table greylist(
|
||||
ip text , sender text, recipient text,
|
||||
firstseen timestamp, lastseen timestamp, cnt integer, umis text,
|
||||
primary key (ip,sender,recipient))''')
|
||||
except: pass
|
||||
|
||||
def clean(self,timeinc=0):
|
||||
"Delete records past the retention limit."
|
||||
now = time.time() + timeinc - self.greylist_retain
|
||||
cur = self.conn.cursor()
|
||||
try:
|
||||
cur.execute('delete from greylist where lastseen < ?',(now,))
|
||||
cnt = cur.rowcount
|
||||
self.conn.commit()
|
||||
finally: cur.close()
|
||||
return cnt
|
||||
|
||||
def check(self,ip,sender,recipient,timeinc=0):
|
||||
"Return number of allowed messages for greylist triple."
|
||||
_db_lock.acquire()
|
||||
cur = self.conn.execute('begin immediate')
|
||||
try:
|
||||
cur.execute('''select firstseen,lastseen,cnt,umis from greylist where
|
||||
ip=? and sender=? and recipient=?''',(ip,sender,recipient))
|
||||
r = cur.fetchone()
|
||||
now = time.time() + timeinc
|
||||
cnt = 0
|
||||
if not r:
|
||||
cur.execute('''insert into
|
||||
greylist(ip,sender,recipient,firstseen,lastseen,cnt,umis)
|
||||
values(?,?,?,?,?,?,?)''', (ip,sender,recipient,now,now,0,None))
|
||||
elif now > r['lastseen'] + self.greylist_retain:
|
||||
# expired
|
||||
log.debug('Expired greylist: %s:%s:%s',ip,sender,recipient)
|
||||
cur.execute('''update greylist set firstseen=?,lastseen=?,cnt=?,umis=?
|
||||
where ip=? and sender=? and recipient=?''',
|
||||
(now,now,0,None,ip,sender,recipient))
|
||||
elif now < r['firstseen'] + self.greylist_time + 5:
|
||||
# still greylisted
|
||||
log.debug('Early greylist: %s:%s:%s',ip,sender,recipient)
|
||||
#r = Record()
|
||||
cur.execute('''update greylist set lastseen=?
|
||||
where ip=? and sender=? and recipient=?''',
|
||||
(now,ip,sender,recipient))
|
||||
elif r['cnt'] or now < r['firstseen'] + self.greylist_expire:
|
||||
# in greylist window or active
|
||||
cnt = r['cnt'] + 1
|
||||
cur.execute('''update greylist set lastseen=?,cnt=?
|
||||
where ip=? and sender=? and recipient=?''',
|
||||
(now,cnt,ip,sender,recipient))
|
||||
log.debug('Active greylist(%d): %s:%s:%s',cnt,ip,sender,recipient)
|
||||
else:
|
||||
# passed greylist window
|
||||
log.debug('Late greylist: %s:%s:%s',ip,sender,recipient)
|
||||
cur.execute('''update greylist set firstseen=?,lastseen=?,cnt=?,umis=?
|
||||
where ip=? and sender=? and recipient=?''',
|
||||
(now,now,0,None,ip,sender,recipient))
|
||||
self.conn.commit()
|
||||
finally:
|
||||
cur.close()
|
||||
_db_lock.release()
|
||||
return cnt
|
||||
|
||||
def close(self):
|
||||
self.conn.close()
|
||||
@@ -1,66 +0,0 @@
|
||||
# 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.
|
||||
|
||||
import os
|
||||
from time import sleep
|
||||
|
||||
class PLock(object):
|
||||
"A simple /etc/passwd style lock,update,rename protocol for updating files."
|
||||
def __init__(self,basename):
|
||||
self.basename = basename
|
||||
self.fp = None
|
||||
|
||||
def lock(self,lockname=None,mode=0660,strict_perms=False):
|
||||
"Start an update transaction. Return FILE to write new version."
|
||||
self.unlock()
|
||||
if not lockname:
|
||||
lockname = self.basename + '.lock'
|
||||
self.lockname = lockname
|
||||
try:
|
||||
st = os.stat(self.basename)
|
||||
mode |= st.st_mode
|
||||
except OSError: pass
|
||||
u = os.umask(0002)
|
||||
try:
|
||||
fd = os.open(lockname,os.O_WRONLY+os.O_CREAT+os.O_EXCL,mode)
|
||||
finally:
|
||||
os.umask(u)
|
||||
self.fp = os.fdopen(fd,'w')
|
||||
try:
|
||||
os.chown(self.lockname,-1,st.st_gid)
|
||||
except:
|
||||
if strict_perms:
|
||||
self.unlock()
|
||||
raise
|
||||
return self.fp
|
||||
|
||||
def wlock(self,lockname=None):
|
||||
"Wait until lock is free, then start an update transaction."
|
||||
while True:
|
||||
try:
|
||||
return self.lock(lockname)
|
||||
except OSError:
|
||||
sleep(2)
|
||||
|
||||
def commit(self,backname=None):
|
||||
"Commit update transaction with optional backup file."
|
||||
if not self.fp:
|
||||
raise IOError,"File not locked"
|
||||
self.fp.close()
|
||||
self.fp = None
|
||||
if backname:
|
||||
try:
|
||||
os.remove(backname)
|
||||
except OSError: pass
|
||||
os.link(self.basename,backname)
|
||||
os.rename(self.lockname,self.basename)
|
||||
|
||||
def unlock(self):
|
||||
"Cancel update transaction."
|
||||
if self.fp:
|
||||
try:
|
||||
self.fp.close()
|
||||
except: pass
|
||||
self.fp = None
|
||||
os.remove(self.lockname)
|
||||
-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
|
||||
-192
@@ -1,192 +0,0 @@
|
||||
## @package Milter.test
|
||||
# A test framework for milters
|
||||
|
||||
import rfc822
|
||||
import StringIO
|
||||
import Milter
|
||||
|
||||
Milter.NOREPLY = Milter.CONTINUE
|
||||
|
||||
## Test mixin for unit testing milter applications.
|
||||
# This mixin overrides many Milter.MilterBase methods
|
||||
# with stub versions that simply record what was done.
|
||||
# @since 0.9.8
|
||||
class TestBase(object):
|
||||
|
||||
def __init__(self,logfile='test/milter.log'):
|
||||
self._protocol = 0
|
||||
self.logfp = open(logfile,"a")
|
||||
## List of recipients deleted
|
||||
self._delrcpt = []
|
||||
## List of recipients added
|
||||
self._addrcpt = []
|
||||
## Macros defined
|
||||
self._macros = { }
|
||||
## The message body.
|
||||
self._body = None
|
||||
## True if the milter replaced the message body.
|
||||
self._bodyreplaced = False
|
||||
## True if the milter changed any headers.
|
||||
self._headerschanged = False
|
||||
## Reply codes and messages set by milter
|
||||
self._reply = None
|
||||
## The rfc822 message object for the current email being fed to the milter.
|
||||
self._msg = None
|
||||
self._symlist = [ None, None, None, None, None, None, None ]
|
||||
|
||||
def log(self,*msg):
|
||||
for i in msg: print >>self.logfp, i,
|
||||
print >>self.logfp
|
||||
|
||||
## Set a macro value.
|
||||
# These are retrieved by the milter with getsymval.
|
||||
# @param name the macro name, as passed to getsymval
|
||||
# @param val the macro value
|
||||
def setsymval(self,name,val):
|
||||
self._macros[name] = val
|
||||
|
||||
def getsymval(self,name):
|
||||
# FIXME: track stage, and use _symlist
|
||||
return self._macros.get(name,'')
|
||||
|
||||
def replacebody(self,chunk):
|
||||
if self._body:
|
||||
self._body.write(chunk)
|
||||
self._bodyreplaced = True
|
||||
else:
|
||||
raise IOError,"replacebody not called from eom()"
|
||||
|
||||
# FIXME: rfc822 indexing does not really reflect the way chg/add header
|
||||
# work for a milter
|
||||
def chgheader(self,field,idx,value):
|
||||
if not self._body:
|
||||
raise IOError,"chgheader not called from eom()"
|
||||
self.log('chgheader: %s[%d]=%s' % (field,idx,value))
|
||||
if value == '':
|
||||
del self._msg[field]
|
||||
else:
|
||||
self._msg[field] = value
|
||||
self._headerschanged = True
|
||||
|
||||
def addheader(self,field,value,idx=-1):
|
||||
if not self._body:
|
||||
raise IOError,"addheader not called from eom()"
|
||||
self.log('addheader: %s=%s' % (field,value))
|
||||
self._msg[field] = value
|
||||
self._headerschanged = True
|
||||
|
||||
def delrcpt(self,rcpt):
|
||||
if not self._body:
|
||||
raise IOError,"delrcpt not called from eom()"
|
||||
self._delrcpt.append(rcpt)
|
||||
|
||||
def addrcpt(self,rcpt):
|
||||
if not self._body:
|
||||
raise IOError,"addrcpt not called from eom()"
|
||||
self._addrcpt.append(rcpt)
|
||||
|
||||
## Save the reply codes and messages in self._reply.
|
||||
def setreply(self,rcode,xcode,*msg):
|
||||
self._reply = (rcode,xcode) + msg
|
||||
|
||||
def setsymlist(self,stage,macros):
|
||||
if not self._actions & SETSYMLIST: raise DisabledAction("SETSYMLIST")
|
||||
# not used yet, but just for grins we save the data
|
||||
a = []
|
||||
for m in macros:
|
||||
try:
|
||||
m = m.encode('utf8')
|
||||
except: pass
|
||||
try:
|
||||
m = m.split(' ')
|
||||
except: pass
|
||||
a += m
|
||||
self._symlist[stage] = set(a)
|
||||
|
||||
## Feed a file like object to the milter. Calls envfrom, envrcpt for
|
||||
# each recipient, header for each header field, body for each body
|
||||
# block, and finally eom. A return code from the milter other than
|
||||
# CONTINUE returns immediately with that return code.
|
||||
#
|
||||
# This is a convenience method, a test could invoke the callbacks
|
||||
# in sequence on its own - and for some complex tests, this may
|
||||
# be necessary.
|
||||
# @param fp the file with rfc2822 message stream
|
||||
# @param sender the MAIL FROM
|
||||
# @param rcpt RCPT TO - additional recipients may follow
|
||||
def feedFile(self,fp,sender="spam@adv.com",rcpt="victim@lamb.com",*rcpts):
|
||||
self._body = None
|
||||
self._bodyreplaced = False
|
||||
self._headerschanged = False
|
||||
self._reply = None
|
||||
msg = rfc822.Message(fp)
|
||||
rc = self.envfrom('<%s>'%sender)
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
for rcpt in (rcpt,) + rcpts:
|
||||
rc = self.envrcpt('<%s>'%rcpt)
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
line = None
|
||||
for h in msg.headers:
|
||||
if h[:1].isspace():
|
||||
line = line + h
|
||||
continue
|
||||
if not line:
|
||||
line = h
|
||||
continue
|
||||
s = line.split(': ',1)
|
||||
if len(s) > 1: val = s[1].strip()
|
||||
else: val = ''
|
||||
rc = self.header(s[0],val)
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
line = h
|
||||
if line:
|
||||
s = line.split(': ',1)
|
||||
rc = self.header(s[0],s[1])
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
rc = self.eoh()
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
while 1:
|
||||
buf = fp.read(8192)
|
||||
if len(buf) == 0: break
|
||||
rc = self.body(buf)
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
self._msg = msg
|
||||
self._body = StringIO.StringIO()
|
||||
rc = self.eom()
|
||||
if self._bodyreplaced:
|
||||
body = self._body.getvalue()
|
||||
else:
|
||||
msg.rewindbody()
|
||||
body = msg.fp.read()
|
||||
self._body = StringIO.StringIO()
|
||||
self._body.writelines(msg.headers)
|
||||
self._body.write('\n')
|
||||
self._body.write(body)
|
||||
return rc
|
||||
|
||||
## Feed an email contained in a file to the milter.
|
||||
# This is a convenience method that invokes @link #feedFile feedFile @endlink.
|
||||
# @param sender MAIL FROM
|
||||
# @param rcpts RCPT TO, multiple recipients may be supplied
|
||||
def feedMsg(self,fname,sender="spam@adv.com",*rcpts):
|
||||
with open('test/'+fname,'r') as fp:
|
||||
return self.feedFile(fp,sender,*rcpts)
|
||||
|
||||
## Call the connect and helo callbacks.
|
||||
# The helo callback is not called if connect does not return CONTINUE.
|
||||
# @param host the hostname passed to the connect callback
|
||||
# @param helo the hostname passed to the helo callback
|
||||
# @param ip the IP address passed to the connect callback
|
||||
def connect(self,host='localhost',helo='spamrelay',ip='1.2.3.4'):
|
||||
self._body = None
|
||||
self._bodyreplaced = False
|
||||
opts = [ Milter.CURR_ACTS,~0,0,0 ]
|
||||
rc = self.negotiate(opts)
|
||||
rc = super(TestBase,self).connect(host,1,(ip,1234))
|
||||
if rc != Milter.CONTINUE:
|
||||
self.close()
|
||||
return rc
|
||||
rc = self.hello(helo)
|
||||
if rc != Milter.CONTINUE:
|
||||
self.close()
|
||||
return rc
|
||||
@@ -1,17 +0,0 @@
|
||||
# Author: Stuart D. Gathman <stuart@bmsi.com>
|
||||
# Copyright 2005 Business Management Systems, Inc.
|
||||
# This code is under the GNU General Public License. See COPYING for details.
|
||||
|
||||
# The localpart of SMTP return addresses is often signed. The format
|
||||
# of the signing is application specific and doesn't concern us -
|
||||
# except that we wish to extract some sort of fixed string from
|
||||
# the variable signature which represents the "source" of the message.
|
||||
|
||||
def unsign(s):
|
||||
"""Attempt to unsign localpart and return original email.
|
||||
No attempt is made to verify the signature.
|
||||
>>> unsign('SRS0=8Y3CZ=3U=jsconnor.com=bills@bmsi.com')
|
||||
'bills@jsconnor.com'
|
||||
"""
|
||||
# not implemented yet
|
||||
return s
|
||||
-202
@@ -1,202 +0,0 @@
|
||||
## @package Milter.utils
|
||||
# Miscellaneous functions.
|
||||
#
|
||||
|
||||
import re
|
||||
import struct
|
||||
import socket
|
||||
import email.Errors
|
||||
from fnmatch import fnmatchcase
|
||||
from email.Header import decode_header
|
||||
#import email.Utils
|
||||
import rfc822
|
||||
|
||||
PAT_IP4 = r'\.'.join([r'(?:\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])']*4)
|
||||
ip4re = re.compile(PAT_IP4+'$')
|
||||
ip6re = re.compile( '(?:%(hex4)s:){6}%(ls32)s$'
|
||||
'|::(?:%(hex4)s:){5}%(ls32)s$'
|
||||
'|(?:%(hex4)s)?::(?:%(hex4)s:){4}%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,1}%(hex4)s)?::(?:%(hex4)s:){3}%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,2}%(hex4)s)?::(?:%(hex4)s:){2}%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,3}%(hex4)s)?::%(hex4)s:%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,4}%(hex4)s)?::%(ls32)s$'
|
||||
'|(?:(?:%(hex4)s:){0,5}%(hex4)s)?::%(hex4)s$'
|
||||
'|(?:(?:%(hex4)s:){0,6}%(hex4)s)?::$'
|
||||
% {
|
||||
'ls32': r'(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|%s)'%PAT_IP4,
|
||||
'hex4': r'[0-9a-f]{1,4}'
|
||||
}, re.IGNORECASE)
|
||||
|
||||
# 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
|
||||
|
||||
MASK = 0xFFFFFFFFL
|
||||
MASK6 = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL
|
||||
|
||||
def cidr(i,n,mask=MASK):
|
||||
return ~(mask >> n) & mask & i
|
||||
|
||||
def iniplist(ipaddr,iplist):
|
||||
"""Return whether ip is in cidr list
|
||||
>>> iniplist('66.179.26.146',['127.0.0.1','66.179.26.128/26'])
|
||||
True
|
||||
>>> iniplist('127.0.0.1',['127.0.0.1','66.179.26.128/26'])
|
||||
True
|
||||
>>> iniplist('192.168.0.45',['192.168.0.*'])
|
||||
True
|
||||
>>> iniplist('2001:610:779:0:223:6cff:fe9a:9cf3',['127.0.0.1','172.20.1.0/24','2001:610:779::/48'])
|
||||
True
|
||||
>>> iniplist('2G01:610:779:0:223:6cff:fe9a:9cf3',['127.0.0.1','172.20.1.0/24','2001:610:779::/48'])
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
ValueError: Invalid ip syntax:2G01:610:779:0:223:6cff:fe9a:9cf3
|
||||
"""
|
||||
if ip4re.match(ipaddr):
|
||||
ipnum = addr2bin(ipaddr)
|
||||
elif ip6re.match(ipaddr):
|
||||
ipnum = bin2long6(inet_pton(ipaddr))
|
||||
else:
|
||||
raise ValueError('Invalid ip syntax:'+ipaddr)
|
||||
for pat in iplist:
|
||||
p = pat.split('/',1)
|
||||
if ip4re.match(p[0]):
|
||||
if len(p) > 1:
|
||||
n = int(p[1])
|
||||
else:
|
||||
n = 32
|
||||
if cidr(addr2bin(p[0]),n) == cidr(ipnum,n):
|
||||
return True
|
||||
elif ip6re.match(p[0]):
|
||||
if len(p) > 1:
|
||||
n = int(p[1])
|
||||
else:
|
||||
n = 128
|
||||
if cidr(bin2long6(inet_pton(p[0])),n,MASK6) == cidr(ipnum,n,MASK6):
|
||||
return True
|
||||
elif fnmatchcase(ipaddr,pat):
|
||||
return True
|
||||
return False
|
||||
|
||||
## Split email into Fullname and address.
|
||||
# This replaces <code>email.Utils.parseaddr</code> but fixes
|
||||
# some <a href="http://bugs.python.org/issue1025395">tricky test cases</a>.
|
||||
#
|
||||
def parseaddr(t):
|
||||
"""Split email into Fullname and address.
|
||||
|
||||
>>> parseaddr('user@example.com')
|
||||
('', 'user@example.com')
|
||||
>>> parseaddr('"Full Name" <foo@example.com>')
|
||||
('Full Name', 'foo@example.com')
|
||||
>>> parseaddr('spam@spammer.com <foo@example.com>')
|
||||
('spam@spammer.com', 'foo@example.com')
|
||||
>>> parseaddr('God@heaven <@hop1.org,@hop2.net:jeff@spec.org>')
|
||||
('God@heaven', 'jeff@spec.org')
|
||||
>>> parseaddr('Real Name ((comment)) <addr...@example.com>')
|
||||
('Real Name', 'addr...@example.com')
|
||||
>>> parseaddr('a(WRONG)@b')
|
||||
('WRONG', 'a@b')
|
||||
"""
|
||||
#return email.Utils.parseaddr(t)
|
||||
res = rfc822.parseaddr(t)
|
||||
# dirty fix for some broken cases
|
||||
if not res[0]:
|
||||
pos = t.find('<')
|
||||
if pos > 0 and t[-1] == '>':
|
||||
addrspec = t[pos+1:-1]
|
||||
pos1 = addrspec.rfind(':')
|
||||
if pos1 > 0:
|
||||
addrspec = addrspec[pos1+1:]
|
||||
return rfc822.parseaddr('"%s" <%s>' % (t[:pos].strip(),addrspec))
|
||||
if not res[1]:
|
||||
pos = t.find('<')
|
||||
if pos > 0 and t[-1] == '>':
|
||||
addrspec = t[pos+1:-1]
|
||||
pos1 = addrspec.rfind(':')
|
||||
if pos1 > 0:
|
||||
addrspec = addrspec[pos1+1:]
|
||||
return rfc822.parseaddr('%s<%s>' % (t[:pos].strip(),addrspec))
|
||||
return res
|
||||
|
||||
|
||||
def parse_addr(t):
|
||||
"""Split email into user,domain.
|
||||
|
||||
>>> parse_addr('user@example.com')
|
||||
['user', 'example.com']
|
||||
>>> parse_addr('"user@example.com"')
|
||||
['user@example.com']
|
||||
>>> parse_addr('"user@bar"@example.com')
|
||||
['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
|
||||
|
||||
def parse_header(val):
|
||||
"""Decode headers gratuitously encoded to hide the content.
|
||||
"""
|
||||
try:
|
||||
h = decode_header(val)
|
||||
if not len(h) or (not h[0][1] and len(h) == 1): return val
|
||||
u = []
|
||||
for s,enc in h:
|
||||
if enc:
|
||||
try:
|
||||
u.append(unicode(s,enc,'replace'))
|
||||
except LookupError:
|
||||
u.append(unicode(s))
|
||||
else:
|
||||
u.append(unicode(s))
|
||||
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
|
||||
@@ -1,63 +1,5 @@
|
||||
See pymilter.spec for recent history.
|
||||
Here is a history of user visible changes to Python milter.
|
||||
|
||||
Here is a history of older changes to Python milter.
|
||||
0.8.8 move AddrCache, parse_addr, iniplist, parse_header to Milter package
|
||||
fix plock for missing source and can't change owner/group
|
||||
add sample spfmilter.py milter
|
||||
private_relay config option
|
||||
0.8.7 Move spf module to pyspf
|
||||
Prevent PTR cache poisoning
|
||||
More lame bounce heuristics
|
||||
Do plain CBV when template is missing
|
||||
0.8.6 Support CBV timeout
|
||||
Support fail template, headers in templates
|
||||
Create GOSSiP record only when connection will procede to DATA.
|
||||
More SPF lax heuristics
|
||||
Don't require SPF pass for white/black listing mail from trusted relay.
|
||||
Support localpart wildcard for white and black lists.
|
||||
Delay reject of unsigned RCPT for postmaster and abuse only
|
||||
Fix dsn reporting of hard permerror
|
||||
Resolve FIXME for wrap_close in miltermodule.c
|
||||
Add Message-ID to DSNs
|
||||
Use signed Message-ID in delayed reject to blacklist senders
|
||||
Auto-train via blacklist and auto-whitelist
|
||||
Don't check userlist for signed MFROM
|
||||
Accept but skip DSPAM training for whitelisted senders without SPF PASS
|
||||
Report GC stats
|
||||
Support CIDR matching for IP lists
|
||||
Support pysrs sign feature
|
||||
Support localpart specific SPF policy in access file
|
||||
0.8.5 Simple trusted_forwarder implementation.
|
||||
Fix access_file neutral policy
|
||||
Move Received-SPF header to beginning of headers
|
||||
Supply keyword info for all results in Received-SPF header.
|
||||
Move guessed SPF result to separate header
|
||||
Activate smfi_insheader only when SMFIR_INSHEADER defined
|
||||
Handle NULL MX in spf.py
|
||||
in-process GOSSiP server support (to be extended later)
|
||||
Expire CBV cache and renew auto-whitelist entries
|
||||
0.8.4 Auto-whitelist recipients of outgoing email.
|
||||
Fix SPF policy via sendmail access map (case insensitive keys).
|
||||
Train screener on whitelisted messages
|
||||
Optional idx parameter to addheader to invoke smfi_insheader
|
||||
Activate progress API when SMFIR_PROGRESS defined
|
||||
0.8.3 Keep screened honeypot mail, but optionally discard honeypot only mail.
|
||||
spf_accept_fail option for braindead SPF senders
|
||||
(treats fail like softfail)
|
||||
Option to set SPF policy via sendmail access map.
|
||||
Option to supply Sender header from MAIL FROM when missing.
|
||||
Consider SMTP AUTH connections internal.
|
||||
Send DSN for SPF errors corrected by extended processing.
|
||||
Send DSN before SCREENED mail is quarantined
|
||||
Use logging package to keep log lines atomic.
|
||||
0.8.2 Strict processing limits per SPF RFC
|
||||
Fixed several parsing bugs under RFC
|
||||
Support official IANA SPF record (type99)
|
||||
Honeypot support (requires pydspam-1.1.9)
|
||||
Extended SPF processing results beyond strict RFC limits
|
||||
Support original SES for bounce protection (requires pysrs-0.30.10)
|
||||
Callback exception processing option in milter module
|
||||
Handle corrupt ZIP attachments
|
||||
0.8.1 Fix zip in zip loop in mime.py
|
||||
Fix HeaderParseError in bms.py header callback
|
||||
Check internal_domains for outgoing mail
|
||||
|
||||
@@ -42,7 +42,7 @@ Quick Installation
|
||||
1. Build and install Sendmail, enabling libmilter (see libmilter/README).
|
||||
2. Build and install Python, enabling threading.
|
||||
3. Install this module: python setup.py --help
|
||||
4. Add these two lines to sendmail.cf[*]:
|
||||
4. Add these two lines to sendmail.cf:
|
||||
|
||||
O InputMailFilters=pythonfilter
|
||||
Xpythonfilter, S=local:/home/username/pythonsock
|
||||
@@ -51,17 +51,9 @@ Xpythonfilter, S=local:/home/username/pythonsock
|
||||
Note that milters should almost certainly not run as root.
|
||||
|
||||
That's it. Incoming mail will cause the milter to print some things, and
|
||||
some email will be rejected (see the "header" method). Edit and play.
|
||||
See spfmilter.py for a functional SPF milter, or see bms.py for an complex
|
||||
milter used in production.
|
||||
some email will be rejected (see the "header" method). Edit and play. See
|
||||
bms.py for an example milter used in production.
|
||||
|
||||
[*] This is for a quick test. Your sendmail.cf in most distros will get
|
||||
overwritten whenever sendmail.mc is updated. To make a milter permanent,
|
||||
add something like:
|
||||
|
||||
INPUT_MAIL_FILTER(`pythonfilter', `S=local:/home/username/pythonsock, F=T, T=C:5m;S:20s;R:5m;E:5m')
|
||||
|
||||
to sendmail.mc instead.
|
||||
|
||||
Not-so-quick Installation
|
||||
-------------------------
|
||||
@@ -69,7 +61,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.
|
||||
|
||||
@@ -97,10 +90,8 @@ some options associated with it. In this case, we have the "S" option, which
|
||||
names the socket that sendmail will use to communicate with this particular
|
||||
milter. This milter's socket is a unix-domain socket in the filesystem.
|
||||
See libmilter/README for the definitive list of options.
|
||||
|
||||
NB: The name is specified in two places: here, in sendmail's cf file, and
|
||||
in the milter itself. Make sure the two match.
|
||||
|
||||
NB: The above lines can be added in your .mc file with this line:
|
||||
|
||||
INPUT_MAIL_FILTER(`pythonfilter', `S=local:/home/username/pythonsock')
|
||||
|
||||
@@ -1,6 +1,81 @@
|
||||
Support smfi_negotiate and auto negotiate only those callbacks for which
|
||||
Milter.Milter methods have been overridden. (Python should be able to
|
||||
do that.)
|
||||
Defer TEMPERROR in SPF evaluation - give precedence to security
|
||||
(only defer for PASS mechanisms).
|
||||
|
||||
Option to add Received-SPF header, but never reject on SPF.
|
||||
|
||||
Create null config that does nothing - except maybe add Received-SPF
|
||||
headers. Many admins would like to turn features on one at a time.
|
||||
|
||||
Checking in mime.py;
|
||||
/bms/cvs/milter/mime.py,v <-- mime.py
|
||||
new revision: 1.56; previous revision: 1.55
|
||||
done
|
||||
Checking in spf.py;
|
||||
/bms/cvs/milter/spf.py,v <-- spf.py
|
||||
new revision: 1.18; previous revision: 1.17
|
||||
done
|
||||
Checking in testmime.py;
|
||||
/bms/cvs/milter/testmime.py,v <-- testmime.py
|
||||
new revision: 1.19; previous revision: 1.18
|
||||
|
||||
Auto whitelist based on outgoing email - perhaps with magic subject
|
||||
or recipient prefix.
|
||||
|
||||
Can't output messages with malformed rfc822 attachments.
|
||||
|
||||
Example malformed SPF:
|
||||
onvunvuvvx.usafisnews.org text "v=spf1 mx ptr ip4:207.44.199.970 -all"
|
||||
|
||||
Move milter,Milter,mime,spf modules to pymilter
|
||||
milter package will have bms.py application
|
||||
|
||||
Support SMTP AUTH and disable SPF checks when connection is authorized.
|
||||
Web admin interface
|
||||
Check valid domains allowed by internal senders to detect PCs infected
|
||||
with spam trojans.
|
||||
Do CBV (callback verification) for mail with no published SPF record.
|
||||
message log for automated stats and blacklisting
|
||||
Skip dspam when SPF pass?
|
||||
Report 551 with rcpt on SPF fail?
|
||||
check spam keywords with character classes, e.g.
|
||||
{a}=[a@ãä], {i}=[i1í], {e}=[eë], {o}=[o0ö]
|
||||
|
||||
Implement RRS - a backdoor for non-SRS forwarders. User lists non-SRS
|
||||
forwarder accounts, and a util provides a special local alias for the
|
||||
user to give to the forwarder. Alias only works for mail from that
|
||||
forwarder. Milter gets forwarder domain from alias and uses it to
|
||||
SPF check forwarder.
|
||||
|
||||
Another special dspam user, 'honeypot', can be listed in innoculations.
|
||||
All email to those addresses is treated as known spam.
|
||||
|
||||
Framework for modular Python milter components within a single VM.
|
||||
Python milters can be already be composed through sendmail by running each in
|
||||
a separate process. However, a significant amount of memory is wasted
|
||||
for each additional Python VM, and communication between milters
|
||||
is cumbersome (e.g., adding mail headers, writing external files).
|
||||
|
||||
Backup copies for outgoing/incoming mail.
|
||||
|
||||
Allow multiple wiretap groups, each with its own destination. Perhaps
|
||||
also copy incoming wiretap mail, even though sendmail alias works perfectly
|
||||
for the purpose, to avoid having to change two configs for a wiretap.
|
||||
|
||||
Provide a way to reload milter.cfg without stopping/restarting milter.
|
||||
|
||||
Allow selected Windows extensions for specific domains via milter.cfg
|
||||
|
||||
Fix setup.py so that _FFR_QUARANTINE is automatically defined when
|
||||
available in libmilter.
|
||||
|
||||
Keep separate ismodified flag for headers and body. This is important
|
||||
when rejecting outgoing mail with viruses removed (so as not to
|
||||
embarrass yourself), and also removing Received headers with hidepath.
|
||||
|
||||
Wrap smfi_setbacklog(int) - but it is only available in sendmail >= 8.12.3,
|
||||
so how can we detect whether to wrap it?
|
||||
|
||||
Need a test module to feed sample messages to a milter though a live
|
||||
sendmail and SMTP. The mockup currently used is probably not very accurate,
|
||||
and doesn't test the threading code.
|
||||
|
||||
Lookup exact RFC syntax of real name / email and make
|
||||
Milter.utils.parse_addr() pass all unit tests.
|
||||
|
||||
+153
@@ -0,0 +1,153 @@
|
||||
#!/usr/bin/python2.3
|
||||
|
||||
# Convert a MS Caller-ID entry (XML) to a SPF entry
|
||||
#
|
||||
# (c) 2004 by Ernesto Baschny
|
||||
# (c) 2004 Python version by Stuart Gathman
|
||||
#
|
||||
# Date: 2004-02-25
|
||||
# Version: 1.0
|
||||
#
|
||||
# Usage:
|
||||
# ./cid2spf.pl "<ep xmlns='http://ms.net/1'>...</ep>"
|
||||
#
|
||||
# Note that the 'include' directives will also have to be checked and
|
||||
# "translated". Future versions of this script might be able to get a
|
||||
# domain name as an argument and "crawl" the DNS for the necessary
|
||||
# information.
|
||||
#
|
||||
# A complete reverse translation (SPF -> CID) might be impossible, since
|
||||
# there are no way to handle:
|
||||
# - PTR and EXISTS mechanism
|
||||
# - MX mechanism with an different domain as argument
|
||||
# - macros
|
||||
#
|
||||
# References:
|
||||
# http://www.microsoft.com/mscorp/twc/privacy/spam_callerid.mspx
|
||||
# http://spf.pobox.com/
|
||||
#
|
||||
# Known bugs:
|
||||
# - Currently it won't handle the exclusions provided in the A and R
|
||||
# tags (prefix '!'). They will show up "as-is" in the SPF record
|
||||
# - I really haven't read the MS-CID specs in-depth, so there are probably
|
||||
# other bugs too :)
|
||||
#
|
||||
# Ernesto Baschny <ernst@baschny.de>
|
||||
#
|
||||
|
||||
import xml.sax
|
||||
import spf
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
class CIDParser(xml.sax.ContentHandler):
|
||||
"Convert a MS Caller-ID entry (XML) to a SPF entry"
|
||||
|
||||
def __init__(self,q=None):
|
||||
self.spf = []
|
||||
self.action = '-all'
|
||||
self.has_servers = None
|
||||
self.spf_entry = None
|
||||
if q:
|
||||
self.spf_query = q
|
||||
else:
|
||||
self.spf_query = spf.query(i='127.0.0.1', s='localhost', h='unknown')
|
||||
|
||||
def startElement(self,tag,attr):
|
||||
if tag == 'm':
|
||||
if self.has_servers != None and not self.has_servers:
|
||||
raise ValueError(
|
||||
"Declared <noMailServers\> and later <m>, this CID entry is not valid."
|
||||
)
|
||||
self.has_servers = True
|
||||
elif tag == 'noMailServers':
|
||||
if self.has_servers:
|
||||
raise ValueError(
|
||||
"Declared <m> and later <noMailServers\>, this CID entry is not valid."
|
||||
)
|
||||
self.has_servers = False
|
||||
elif tag == 'ep':
|
||||
if attr.has_key('testing') and attr.getValue('testing') == 'true':
|
||||
# A CID with 'testing' found:
|
||||
# From the MS-specs:
|
||||
# "Documents in which such attribute is present with a true
|
||||
# value SHOULD be entirely ignored (one should act as if the
|
||||
# document were absent)"
|
||||
# From the SPF-specs:
|
||||
# "Neutral (?): The SPF client MUST proceed as if a domain did
|
||||
# not publish SPF data."
|
||||
# So we set SPF action to "neutral":
|
||||
self.action = '?all'
|
||||
elif tag == 'mx':
|
||||
# The empty MX-tag, same as SPF's MX-mechanism
|
||||
self.spf.append('mx')
|
||||
self.tag = tag
|
||||
|
||||
def characters(self,text):
|
||||
tag = self.tag
|
||||
# Remove starting and trailing spaces from text:
|
||||
text = text.strip()
|
||||
|
||||
if tag == 'a' or tag == 'r':
|
||||
# The A and R tags from MS-CID are both handled by the
|
||||
# ipv4/6-mechanisms from SPF:
|
||||
if text.find(':') < 0:
|
||||
mechanism = 'ip4'
|
||||
else:
|
||||
mechanism = 'ip6'
|
||||
self.spf.append(mechanism + ':' + text)
|
||||
elif tag == 'indirect':
|
||||
# MS-CID's indirect is "sort of" the include from SPF:
|
||||
# Not really true, because the <indirect> tag from MS-CID also
|
||||
# provides a fallback in case the included domain doesn't provide
|
||||
# _ep-records: The inbound MX-servers of the included domains
|
||||
# are added to the list of allowed outgoing mailservers for the
|
||||
# domain that declared the _ep-record with the <indirect> tag.
|
||||
# In SPF you would use the 'mx:domain' to handle this, but this
|
||||
# wouldn't depend on referred domain having or not SPF-records.
|
||||
cid_xml = self.cid_txt(text)
|
||||
if cid_xml:
|
||||
p = CIDParser()
|
||||
xml.sax.parseString(cid_xml,p)
|
||||
if p.has_servers != False:
|
||||
self.spf += p.spf
|
||||
else:
|
||||
self.spf.append('mx:' + text)
|
||||
|
||||
def cid_txt(self,domain):
|
||||
q = self.spf_query
|
||||
domain='_ep.' + domain
|
||||
a = q.dns_txt(domain)
|
||||
if not a: return None
|
||||
if a[0].lower().startswith('<ep ') and a[-1].lower().endswith('</ep>'):
|
||||
return ''.join(a)
|
||||
return None
|
||||
|
||||
def endElement(self,tag):
|
||||
if tag == 'ep':
|
||||
# This is the end... assemble what we've got
|
||||
spf_entry = ['v=spf1']
|
||||
if self.has_servers != False:
|
||||
spf_entry += self.spf
|
||||
spf_entry.append(self.action)
|
||||
self.spf_entry = ' '.join(spf_entry)
|
||||
|
||||
def spf_txt(self,cid_xml):
|
||||
if not cid_xml.startswith('<'):
|
||||
cid_xml = self.cid_txt(cid_xml)
|
||||
if not cid_xml: return None
|
||||
# Parse the beast. Any XML-problem will be reported by xlm.sax
|
||||
self.spf_entry = None
|
||||
xml.sax.parseString(cid_xml,self)
|
||||
return self.spf_entry
|
||||
|
||||
if __name__ == '__main__':
|
||||
import sys
|
||||
if len(sys.argv) < 2:
|
||||
print >>sys.stderr, \
|
||||
"""Usage: %s "<ep xmlns='http://ms.net/1'>...</ep>" """ % sys.argv[0]
|
||||
sys.exit(1)
|
||||
|
||||
cid_xml = sys.argv[1]
|
||||
|
||||
p = CIDParser()
|
||||
print p.spf_txt(cid_xml)
|
||||
@@ -1,53 +0,0 @@
|
||||
## @mainpage Writing Milters in Python
|
||||
#
|
||||
# At the lowest level, the <code>milter</code> module provides a thin wrapper
|
||||
# around the <a href="https://www.milter.org/developers/api/index"> sendmail
|
||||
# libmilter API</a>. This API lets you register callbacks for a number of
|
||||
# events in the process of sendmail receiving a message via SMTP. These
|
||||
# events include the initial connection from a MTA, the envelope sender and
|
||||
# recipients, the top level mail headers, and the message body. There are
|
||||
# options to mangle all of these components of the message as it passes through
|
||||
# the milter.
|
||||
#
|
||||
# At the next level, the <code>Milter</code> module (note the case difference)
|
||||
# provides a Python friendly object oriented wrapper for the low level API. To
|
||||
# use the Milter module, an application registers a 'factory' to create an
|
||||
# object for each connection from a MTA to sendmail. These connection objects
|
||||
# must provide methods corresponding to the libmilter callback events.
|
||||
#
|
||||
# Each event method returns a code to tell sendmail whether to proceed with
|
||||
# processing the message. This is a big advantage of milters over other mail
|
||||
# filtering systems. Unwanted mail can be stopped in its tracks at the
|
||||
# earliest possible point.
|
||||
#
|
||||
# The <code>Milter.Base</code> class provides default implementations for
|
||||
# event methods that do nothing, and also provides wrappers for the libmilter
|
||||
# methods to mutate the message. It automatically negotiates with MTA
|
||||
# which protocol steps need to be processed by the milter, based on
|
||||
# which callback methods are overridden.
|
||||
#
|
||||
# The <code>Milter.Milter</code> class provides an alternate default
|
||||
# implementation that logs the main milter events, but otherwise does nothing.
|
||||
# It is provided for compatibility.
|
||||
#
|
||||
# The <code>mime</code> module provides a wrapper for the Python email package
|
||||
# that fixes some bugs, and simplifies modifying selected parts of a MIME
|
||||
# message.
|
||||
#
|
||||
# @section threading
|
||||
#
|
||||
# The libmilter library which pymilter wraps
|
||||
# <a href="https://www.milter.org/developers/overview#SignalHandling">handles
|
||||
# all signals</a> itself, and expects to be called from a single main thread.
|
||||
# It handles SIGTERM, SIGHUP, and SIGINT, mapping the first two to
|
||||
# <a href="https://www.milter.org/developers/api/smfi_stop">smfi_stop</a>
|
||||
# and the last to an internal ABORT.
|
||||
#
|
||||
# If you use python threads or threading modules, then signal handling gets
|
||||
# confused. Threads may still be useful, but you may need to provide an
|
||||
# alternate means of causing graceful shutdown.
|
||||
#
|
||||
# You may find the
|
||||
# <a href="http://docs.python.org/release/2.6.6/library/multiprocessing.html">
|
||||
# multiprocessing</a> module useful. It can be a drop-in
|
||||
# replacement for threading as illustrated in @ref milter-template.py.
|
||||
-177
@@ -1,177 +0,0 @@
|
||||
# Document miltermodule for Doxygen
|
||||
#
|
||||
|
||||
## @package milter
|
||||
#
|
||||
# A thin wrapper around libmilter.
|
||||
#
|
||||
|
||||
## Hold context for a milter connection.
|
||||
# Each connection to sendmail creates a new <code>SMFICTX</code> struct within
|
||||
# libmilter. The milter module in turn creates a milterContext
|
||||
# tied to the <code>SMFICTX</code> struct via <code>smfi_setpriv</code>
|
||||
# to hold a PyThreadState and a user defined Python object for the connection.
|
||||
#
|
||||
# Most application interaction with libmilter takes places via
|
||||
# the milterContext object for the connection. It is passed to
|
||||
# callback functions as the first parameter.
|
||||
#
|
||||
# The <code>Milter</code> module creates a python class for each connection,
|
||||
# and converts function callbacks to instance method invocations.
|
||||
#
|
||||
class milterContext(object):
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_getsymval">smfi_getsymval</a>.
|
||||
def getsymval(self,sym): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_setreply">
|
||||
# smfi_setreply</a> or
|
||||
# <a href="https://www.milter.org/developers/api/smfi_setmlreply">
|
||||
# smfi_setmlreply</a>.
|
||||
# @param rcode SMTP response code
|
||||
# @param xcode extended SMTP response code
|
||||
# @param msg one or more message lines. If the MTA does not support
|
||||
# multiline messages, only the first is used.
|
||||
def setreply(self,rcode,xcode,*msg): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_addheader">smfi_addheader</a>.
|
||||
def addheader(self,name,value,idx=-1): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_chgheader">smfi_chgheader</a>.
|
||||
def chgheader(self,name,idx,value): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_addrcpt">smfi_addrcpt</a>.
|
||||
def addrcpt(self,rcpt,params=None): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_delrcpt">smfi_delrcpt</a>.
|
||||
def delrcpt(self,rcpt): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_replacebody">smfi_replacebody</a>.
|
||||
def replacebody(self,data): pass
|
||||
## Attach a Python object to this connection context.
|
||||
# @return the old value or None
|
||||
def setpriv(self,priv): pass
|
||||
## Return the Python object attached to this connection context.
|
||||
def getpriv(self): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_quarantine">smfi_quarantine</a>.
|
||||
def quarantine(self,reason): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_progress">smfi_progress</a>.
|
||||
def progress(self): pass
|
||||
## Calls <a href="https://www.milter.org/developers/api/smfi_chgfrom">smfi_chgfrom</a>.
|
||||
def chgfrom(self,sender,param=None): pass
|
||||
## Tell the MTA which macro values we are interested in for a given stage.
|
||||
# Of interest only when you need to squeeze a few more bytes of bandwidth.
|
||||
# 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="https://www.milter.org/developers/api/smfi_setsymlist">smfi_setsymlist</a>.
|
||||
# @param stage protocol stage in which the macro list should be used
|
||||
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. The default is TEMPFAIL.
|
||||
# You should not depend on this handler. Your application should
|
||||
# have its own top level exception handler for each callback. You can
|
||||
# then choose your own reply message, log the stack track were you please,
|
||||
# and so on. However, if you miss one, this last ditch handler will
|
||||
# print a standard stack trace to sys.stderr, and return to sendmail.
|
||||
def set_exception_policy(code): pass
|
||||
|
||||
## Register python milter with libmilter.
|
||||
# The name we pass is used to identify the milter in the MTA configuration.
|
||||
# Callback functions must be set using the set_*_callback() functions before
|
||||
# registering the milter.
|
||||
# Three additional callbacks are specified as keyword parameters. These
|
||||
# were added by recent versions of libmilter. The keyword parameters is
|
||||
# a nicer way to do it, I think, since it makes clear that you have to do
|
||||
# it before registering. I may move all the callbacks
|
||||
# in the future (perhaps keeping the set functions for compatibility).
|
||||
# @param name the milter name by which the MTA finds us
|
||||
# @param negotiate the
|
||||
# <a href="https://www.milter.org/developers/api/xxfi_negotiate">
|
||||
# xxfi_negotiate</a> callback, called to negotiate supported
|
||||
# actions, callbacks, and protocol steps.
|
||||
# @param unknown the
|
||||
# <a href="https://www.milter.org/developers/api/xxfi_unknown">
|
||||
# xxfi_unknown</a> callback, called when for SMTP commands
|
||||
# not recognized by the MTA. (Extend SMTP in your milter!)
|
||||
# @param data the
|
||||
# <a href="https://www.milter.org/developers/api/xxfi_data">
|
||||
# xxfi_data</a> callback, called when the DATA
|
||||
# SMTP command is received.
|
||||
def register(name,negotiate=None,unknown=None,data=None): pass
|
||||
def opensocket(rmsock): pass
|
||||
|
||||
## Transfer control to libmilter.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_main">
|
||||
# smfi_main</a>.
|
||||
def main(): pass
|
||||
|
||||
## Set the libmilter debugging level.
|
||||
# <a href="https://www.milter.org/developers/api/smfi_setdbg">smfi_setdbg</a>
|
||||
# sets the milter library's internal debugging level to a new level
|
||||
# so that code details may be traced. A level of zero turns off debugging. The
|
||||
# greater (more positive) the level the more detailed the debugging. Six is the
|
||||
# current, highest, useful value. Must be called before calling main().
|
||||
def setdbg(lev): pass
|
||||
|
||||
## Set timeout for MTA communication.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_settimeout">
|
||||
# smfi_settimeout</a>. Must be called before calling main().
|
||||
def settimeout(secs): pass
|
||||
|
||||
## Set socket backlog.
|
||||
# Calls <a href="https://www.milter.org/developers/api/smfi_setbacklog">
|
||||
# smfi_setbacklog</a>. Must be called before calling main().
|
||||
def setbacklog(n): pass
|
||||
|
||||
## Set the socket used to communicate with the MTA.
|
||||
# The MTA can communicate with the milter by means of a
|
||||
# unix, inet, or inet6 socket. By default, a unix domain socket
|
||||
# is used. It must not exist,
|
||||
# and sendmail will throw warnings if, eg, the file is under a
|
||||
# group or world writable directory.
|
||||
# <pre>
|
||||
# setconn('unix:/var/run/pythonfilter')
|
||||
# setconn('inet:8800') # listen on ANY interface
|
||||
# setconn('inet:7871@@publichost') # listen on a specific interface
|
||||
# setconn('inet6:8020')
|
||||
# </pre>
|
||||
def setconn(s): pass
|
||||
|
||||
## Stop the milter gracefully.
|
||||
def stop(): pass
|
||||
|
||||
## Retrieve diagnostic info.
|
||||
# Return a tuple with diagnostic info gathered by the milter module.
|
||||
# The first two fields are counts of milterContext objects created
|
||||
# and deleted. Additional fields may be added later.
|
||||
# @return a tuple of diagnostic data
|
||||
def getdiag(): pass
|
||||
|
||||
## Retrieve the runtime libmilter version.
|
||||
# Return the runtime libmilter version. This can be different
|
||||
# from the compile time version when sendmail or libmilter is upgraded
|
||||
# after pymilter is compiled.
|
||||
# @return a tuple of <code>(major,minor,patchlevel)</code>
|
||||
def getversion(): pass
|
||||
|
||||
## The compile time libmilter version.
|
||||
# Python code might need to deal with pymilter compiled
|
||||
# against various versions of libmilter. This module constant
|
||||
# contains the contents of the <code>SMFI_VERSION</code> macro when
|
||||
# the milter module was compiled.
|
||||
VERSION = 0x1000001
|
||||
@@ -0,0 +1,167 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Python Milter FAQ</title>
|
||||
</head><body>
|
||||
|
||||
<h1> Python Milter <a name=faq>FAQ</a> </h1>
|
||||
|
||||
<ol>
|
||||
<h3> Compiling Python Milter </h3>
|
||||
<li> Q. I have installed sendmail from source, but Python milter won't
|
||||
compile.
|
||||
<p> A. Even though libmilter is officially supported in sendmail-8.12,
|
||||
you need to build and install it in separate steps. Take a look
|
||||
at the <a href="/aix/sendmail12.spec">RPM spec file</a> for sendmail-8.12.
|
||||
The %prep section shows you how to create
|
||||
a site.config.m4 that enables MILTER. The %build section shows you how
|
||||
to build libmilter in a separate invocation of make. The %install section
|
||||
shows you how to install libmilter with a separate invocation of make.
|
||||
<p>
|
||||
|
||||
<li> Q. Why is mfapi.h not found when I try to compile Python milter on
|
||||
RedHat 7.2?
|
||||
<p> A. RedHat forgot to include the header in the RPM. See the
|
||||
<a href="milter.html#rh72">RedHat 7.2 requirements</a>.
|
||||
<p>
|
||||
|
||||
<h3> Running Python Milter </h3>
|
||||
|
||||
<li> Q. The sample.py milter prints a message, then just sits there.
|
||||
<pre>
|
||||
To use this with sendmail, add the following to sendmail.cf:
|
||||
|
||||
O InputMailFilters=pythonfilter
|
||||
Xpythonfilter, S=local:inet:1030@localhost
|
||||
|
||||
See the sendmail README for libmilter.
|
||||
sample milter startup
|
||||
</pre>
|
||||
<p> A. You need to tell sendmail to connect to your milter. The
|
||||
sample milter tells you what to add to your sendmail.cf to tell
|
||||
sendmail to use the milter. You can also add an INPUT_MAIL_FILTER
|
||||
macro to your sendmail.mc file and rebuild sendmail.cf - see the sendmail
|
||||
README for milters.
|
||||
<p>
|
||||
|
||||
<li> Q. I've configured sendmail properly, but still nothing happens
|
||||
when I send myself mail!
|
||||
<p> A. Sendmail only milters SMTP mail. Local mail is not miltered.
|
||||
You can pipe a raw message through sendmail to test your milter:
|
||||
<pre>
|
||||
$ cat rawtextmsg | sendmail myname@my.full.domain
|
||||
</pre>
|
||||
Now check your milter log.
|
||||
<p>
|
||||
|
||||
<li> Q. Why do I get this ImportError exception?
|
||||
<pre>
|
||||
File "mime.py", line 370, in ?
|
||||
from sgmllib import declstringlit, declname
|
||||
ImportError: cannot import name declstringlit
|
||||
</pre>
|
||||
<p> A. <code>declstringlit</code> is not provided by sgmllib in all versions
|
||||
of python. For instance, python-2.2 does not have it. Upgrade to
|
||||
milter-0.4.5 or later to remove this dependency.
|
||||
<p>
|
||||
|
||||
<li> Q. Why do I get <code>milter.error: cannot add recipient</code>?
|
||||
<pre>
|
||||
</pre>
|
||||
<p> A. You must tell libmilter how you might mutate the message with
|
||||
<code>set_flags()</code> before calling <code>runmilter()</code>. For
|
||||
instance, <code>Milter.set_flags(Milter.ADDRCPT)</code>. You must add together
|
||||
all of <code>ADDHDRS, CHGBODY, ADDRCPT, DELRCPT, CHGHDRS</code> that apply.
|
||||
<p> NOTE - recent versions default flags to enabling all features. You
|
||||
must now call <code>set_flags()</code> if you wish to disable features for
|
||||
efficiency.
|
||||
<p>
|
||||
|
||||
<li> Q. Why does sendmail sometimes print something like:
|
||||
"...write(D) returned -1, expected 5: Broken pipe"
|
||||
in the sendmail log?
|
||||
<p> A. Libmilter expects "rcpt to" shortly after getting "mail from".
|
||||
"Shortly" is defined by the timeout parameter you passed to
|
||||
<code>Milter.runmilter()
|
||||
</code> or <code>milter.settimeout()</code>. If the timeout is 10 seconds,
|
||||
and looking up the first recipient in DNS takes more than
|
||||
10 seconds, libmilter will give up and break the connection.
|
||||
<code>Milter.runmilter()</code> defaulted to 10 seconds in 0.3.4. In 0.3.5
|
||||
it will keep the libmilter default of 2 hours.
|
||||
<p>
|
||||
|
||||
<li> Q. Why does milter block messages with big5 encoding? What if I
|
||||
want to receive them?
|
||||
<p> A. sample.py is a sample. It is supposed to be easily modified
|
||||
for your specific needs. We will of course continue to move generic
|
||||
code out of the sample as the project evolves. Think of sample.py as
|
||||
an active config file.
|
||||
<p>
|
||||
If you are running bms.py, then the block_chinese option in
|
||||
<code>/etc/mail/pymilter.cfg</code> controls this feature.
|
||||
<p>
|
||||
|
||||
<li> Q. Why does sendmail coredump with milters on OpenBSD?
|
||||
<p> A. Sendmail has a problem with unix sockets on old versions of OpenBSD.
|
||||
Use an internet domain socket instead. For example, in
|
||||
<code>sendmail.cf</code> use
|
||||
<pre>
|
||||
Xpythonfilter, S=inet:1234@localhost
|
||||
</pre>
|
||||
and change sample.py accordingly.
|
||||
<p> OpenBSD users report that this problem has been fixed.
|
||||
<p>
|
||||
|
||||
<li> Q. How can I change the bounce message for an invalid recipient?
|
||||
I can only change the recipient in the eom callback, but the eom callback
|
||||
is never called when the recipient is invalid!
|
||||
<p> A. Configure sendmail to use virtusertable, and send all unknown
|
||||
addresses to /dev/null. For example,
|
||||
<h4>/etc/mail/virtusertable</h4>
|
||||
<pre>
|
||||
@mycorp.com dev-null
|
||||
dan@mycorp.com dan
|
||||
sally@mycorp.com sally
|
||||
</pre>
|
||||
<h4>/etc/aliases</h4>
|
||||
<pre>
|
||||
dev-null: /dev/null
|
||||
</pre>
|
||||
Now your milter will get to the eom callback, and can change the
|
||||
envelope recipient at will. Thanks to Dredd at
|
||||
<a href=http://www.milter.org/>milter.org</a> for this solution.
|
||||
<p>
|
||||
|
||||
<li> Q. I am having trouble with the setreply method. It always outputs
|
||||
"milter.error: cannot set reply".
|
||||
<p> A. Check the sendmail log for errors. If sendmail is getting
|
||||
milter timeouts, then your milter is taking too long and sendmail gave
|
||||
up waiting. You can adjust the timeouts in your sendmail config. Here
|
||||
is a milter declaration for sendmail.cf with all timeouts specified:
|
||||
<pre>
|
||||
Xpythonfilter, S=local:/var/log/milter/pythonsock, F=T, T=C:5m;S:20s;R:60s;E:5m
|
||||
</pre>
|
||||
|
||||
<a name="spf">
|
||||
<li> Q. So how do I use the SPF support? The sample.py milter doesn't seem
|
||||
to use it.
|
||||
<p> A. The bms.py milter supports spf. The RedHat RPMs will set almost
|
||||
everything up for you. For other systems:
|
||||
<ol type=i>
|
||||
<li> Arrange to run bms.py in the background (as a service perhaps) and
|
||||
redirect output and errors to a logfile. For instance, on AIX you'll want
|
||||
to use SRC (System Resource Controller).
|
||||
<li> Copy pymilter.cfg to the /etc/mail or the directory you run bms.py in,
|
||||
and edit it. The comments should explain the options.
|
||||
<li> Start bms.py in the background as arranged.
|
||||
<li> Add Xpythonfilter to sendmail.cf or add an INPUT_MAIL_FILTER to
|
||||
sendmail.mc. Regen sendmail.cf if you use sendmail.mc and restart
|
||||
sendmail.
|
||||
<li> Arrange to rotate log files and remove old defang files in
|
||||
<code>tempdir</code>. The RedHat RPM uses <code>logrotate</code> for
|
||||
logfiles and a simple cron script using <code>find</code> to clean
|
||||
<code>tempdir</code>.
|
||||
</ol>
|
||||
|
||||
</ol>
|
||||
</html>
|
||||
@@ -1,15 +0,0 @@
|
||||
web:
|
||||
doxygen
|
||||
rsync -ravK doc/html/ spidey2.bmsi.com:/Public/pymilter
|
||||
|
||||
VERSION=0.9.8
|
||||
CVSTAG=pymilter-0_9_8
|
||||
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()
|
||||
@@ -1,158 +0,0 @@
|
||||
## 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 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.
|
||||
## Return REJECT,TEMPFAIL,ACCEPT to short circuit processing for a message.
|
||||
## You can also add/del recipients, replacebody, add/del headers, etc.
|
||||
|
||||
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
|
||||
|
||||
logq = Queue(maxsize=4)
|
||||
|
||||
class myMilter(Milter.Base):
|
||||
|
||||
def __init__(self): # A new instance with each new connection.
|
||||
self.id = Milter.uniqueID() # Integer incremented with each call.
|
||||
|
||||
# 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,
|
||||
# ('3ffe:80e8:d8::1', 4720, 1, 0) )
|
||||
self.IP = hostaddr[0]
|
||||
self.port = hostaddr[1]
|
||||
if family == AF_INET6:
|
||||
self.flow = hostaddr[2]
|
||||
self.scope = hostaddr[3]
|
||||
else:
|
||||
self.flow = None
|
||||
self.scope = None
|
||||
self.IPname = IPname # Name from a reverse IP lookup
|
||||
self.H = None
|
||||
self.fp = None
|
||||
self.receiver = self.getsymval('j')
|
||||
self.log("connect from %s at %s" % (IPname, hostaddr) )
|
||||
|
||||
return Milter.CONTINUE
|
||||
|
||||
|
||||
## def hello(self,hostname):
|
||||
def hello(self, heloname):
|
||||
# (self, 'mailout17.dallas.texas.example.com')
|
||||
self.H = heloname
|
||||
self.log("HELO %s" % heloname)
|
||||
if heloname.find('.') < 0: # illegal helo name
|
||||
# NOTE: example only - too many real braindead clients to reject on this
|
||||
self.setreply('550','5.7.1','Sheesh people! Use a proper helo name!')
|
||||
return Milter.REJECT
|
||||
|
||||
return Milter.CONTINUE
|
||||
|
||||
## def envfrom(self,f,*str):
|
||||
def envfrom(self, mailfrom, *str):
|
||||
self.F = mailfrom
|
||||
self.R = [] # list of recipients
|
||||
self.fromparms = Milter.dictfromlist(str) # ESMTP parms
|
||||
self.user = self.getsymval('{auth_authen}') # authenticated user
|
||||
self.log("mail from:", mailfrom, *str)
|
||||
self.fp = StringIO.StringIO()
|
||||
self.canon_from = '@'.join(parse_addr(mailfrom))
|
||||
self.fp.write('From %s %s\n' % (self.canon_from,time.ctime()))
|
||||
return Milter.CONTINUE
|
||||
|
||||
|
||||
## def envrcpt(self, to, *str):
|
||||
@Milter.noreply
|
||||
def envrcpt(self, to, *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)
|
||||
self.setreply('250','2.5.1','Grokked by pymilter')
|
||||
# many milter functions can only be called from eom()
|
||||
# example of adding a Bcc:
|
||||
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.
|
||||
return Milter.CONTINUE
|
||||
|
||||
def abort(self):
|
||||
# client disconnected prematurely
|
||||
return Milter.CONTINUE
|
||||
|
||||
## === 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),
|
||||
# 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
|
||||
flags += Milter.ADDRCPT
|
||||
flags += Milter.DELRCPT
|
||||
Milter.set_flags(flags) # tell Sendmail which features we use
|
||||
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__":
|
||||
main()
|
||||
+160
@@ -0,0 +1,160 @@
|
||||
[milter]
|
||||
# the socket used to communicate with sendmail. Must match sendmail.cf
|
||||
socket=/var/run/milter/pythonsock
|
||||
# where to save original copies of defanged and failed messages
|
||||
tempdir = /var/log/milter/save
|
||||
# how long to wait for a response from sendmail before giving up
|
||||
;timeout=600
|
||||
log_headers = 0
|
||||
# connection ips and hostnames are matched against this glob style list
|
||||
# to recognize internal senders.
|
||||
;internal_connect = 192.168.*.*
|
||||
|
||||
# mail that is not an internal_connect and claims to be from an
|
||||
# internal domain is rejected. Furthermore, internal mail that
|
||||
# does not claim to be from an internal domain is rejected.
|
||||
# You should enable SPF instead if you can. SPF is much more comprehensive and
|
||||
# flexible. However, SPF is not currently checked for outgoing
|
||||
# (internal_connect) mail because it doesn't yet handle authorizing
|
||||
# internal IPs locally.
|
||||
;internal_domains = mycorp.com
|
||||
|
||||
# connections from a trusted relay can trust the first Received header
|
||||
# SPF checks are bypassed for internal connections and trusted relays.
|
||||
;trusted_relay = 1.2.3.4, 66.12.34.56
|
||||
|
||||
# Reject external senders with hello names no legit external sender would use.
|
||||
# SPF will do this also, but listing your own domain and mailserver here
|
||||
# will save some DNS lookups when rejecting certain viruses.
|
||||
;hello_blacklist = mycorp.com, 66.12.34.56
|
||||
|
||||
# Reject mail for domains mentioned unless user is mentioned here also
|
||||
;check_user = joe@mycorp.com, mary@mycorp.com, file:bigcorp.com
|
||||
|
||||
# features intended to filter or block incoming mail
|
||||
[defang]
|
||||
|
||||
# do virus scanning on attached messages also
|
||||
scan_rfc822 = 1
|
||||
# do virus scanning on attached zipfiles also
|
||||
scan_zip = 0
|
||||
# Comment out scripts in HTML attachments. Can be CPU intensive.
|
||||
scan_html = 0
|
||||
# reject messages with asian fonts because we can't read them
|
||||
block_chinese = 1
|
||||
# list users who hate forwarded mail
|
||||
;block_forward = egghead@mycorp.com, busybee@mycorp.com
|
||||
# reject mail with these case insensitive strings in the subject
|
||||
porn_words = penis, breast, pussy, horse cock, porn, xenical, diet pill, d1ck,
|
||||
vi*gra, vi-a-gra, viag, tits, p0rn, hunza, horny, sexy, c0ck, xanaax,
|
||||
p-e-n-i-s, hydrocodone, vicodin, xanax, vicod1n, x@nax, diazepam,
|
||||
v1@gra, xan@x, cialis, ci@lis, frëe, xãnax, valíum, vãlium, via-gra,
|
||||
x@n3x, vicod3n, penís, c0d1n, phentermine, en1arge, dip1oma, v1codin,
|
||||
valium, rolex, sexual, fuck
|
||||
# reject mail with these case sensitive strings in the subject
|
||||
spam_words = $$$, !!!, XXX, FREE, HGH
|
||||
# attachments with these extensions will be replaced with a warning
|
||||
# message. A copy of the original will be saved.
|
||||
banned_exts = ade,adp,asd,asx,asp,bas,bat,chm,cmd,com,cpl,crt,dll,exe,hlp,hta,
|
||||
inf,ins,isp,js,jse,lnk,mdb,mde,msc,msi,msp,mst,ocx,pcd,pif,reg,scr,sct,
|
||||
shs,url,vb,vbe,vbs,wsc,wsf,wsh
|
||||
|
||||
# See http://bmsi.com/python/pysrs.html for details
|
||||
[srs]
|
||||
config=/etc/mail/pysrs.cfg
|
||||
# SRS options can be set here also, but must match the sendmail plugin
|
||||
;secret="shhhh!"
|
||||
;maxage=21
|
||||
;hashlength=4
|
||||
;database=/var/log/milter/srsdata
|
||||
;fwdomain = mydomain.com
|
||||
# turn this on after a grace period to reject spoofed DSNs
|
||||
reject_spoofed = 0
|
||||
|
||||
# See http://spf.pobox.com for more info on SPF.
|
||||
[spf]
|
||||
# namespace where SPF records can be supplied for domains without one
|
||||
# records are searched for under _spf.domain.com
|
||||
;delegate = domain.com
|
||||
# domains where a neutral SPF result should cause mail to be rejected
|
||||
;reject_neutral = aol.com
|
||||
# use a default (v=spf1 a/24 mx/24 ptr) when no SPF records are published
|
||||
;best_guess = 0
|
||||
# Reject senders that have neither PTR nor valid HELO nor SPF records, or send
|
||||
# DSN otherwise
|
||||
;reject_noptr = 0
|
||||
# always accept softfail from these domains, or send DSN otherwise
|
||||
;accept_softfail = bounces.amazon.com
|
||||
|
||||
# features intended to clean up outgoing mail
|
||||
[scrub]
|
||||
# domains that block visible private nodes
|
||||
;hide_path = jcpenney.com
|
||||
# reject, don't just replace with warning, viruses from these domains
|
||||
;reject_virus_from = mycorp.com
|
||||
|
||||
# features intended for spying on users and coworkers
|
||||
[wiretap]
|
||||
blind = 1
|
||||
#
|
||||
# wiretap lets you surreptitiously monitor a users outgoing email
|
||||
# (sendmail aliases let you monitor incoming mail)
|
||||
#
|
||||
;users = disloyal@bigcorp.com, bigmouth@bigcorp.com
|
||||
;dest = spy@bigcorp.com
|
||||
# discard outgoing mail without alerting sender
|
||||
# can be used in conjunction with wiretap to censor outgoing mail
|
||||
;discard_users = canned@bigcorp.com
|
||||
#
|
||||
# smart aliases trigger on both sender and recipient
|
||||
#
|
||||
;smart_alias = copycust,walter
|
||||
# mail from client@clientcorp.com to sue@bigcorp.com is redirected to
|
||||
# local alias copycust
|
||||
;copycust = client@clientcorp.com,sue@bigcorp.com
|
||||
# mail from cust@othercorp.com to walter@bigcorp.com is redirected to
|
||||
# boss@bigcorp.com
|
||||
;walter = cust@othercorp.com,walter@bigcorp.com,boss@bigcorp.com
|
||||
# additional copies can be added
|
||||
;walter1 = cust@othercorp.com,walter@bigcorp.com,boss@bigcorp.com,
|
||||
; walter@bigcorp.com
|
||||
;bulk = soruce@telex.com,bob@jsconnor.com
|
||||
;bulk = soruce@telex.com,larry@jsconnor.com
|
||||
|
||||
# See http://bmsi.com/python/dspam.html
|
||||
[dspam]
|
||||
# Select a well moderated dspam dictionary to reject spammy headers.
|
||||
# To filter on the entire message, use the full setup below.
|
||||
# only EXTERNAL messages are dspam filtered
|
||||
;dspam_dict=/var/lib/dspam/moderator.dict
|
||||
|
||||
# Opt-opt recipients from dspam screening and header triage
|
||||
;dspam_exempt=getitall@mycorp.com
|
||||
# Do not scan mail (ostensibly) from these senders
|
||||
;dspam_whitelist=getitall@sender.com
|
||||
# Reject spam to these domains instead of quarantining it.
|
||||
;dspam_reject=othercorp.com
|
||||
# Scan internal mail - often a good source of stats on legit mail.
|
||||
;dspam_internal=1
|
||||
|
||||
# directory for dspam user quarantine, signature db, and dictionaries
|
||||
# defining this activates the dspam application
|
||||
# dspam and dspam-python must be installed
|
||||
;dspam_userdir=/var/lib/dspam
|
||||
# do not dspam messages larger than this
|
||||
;dspam_sizelimit=180000
|
||||
|
||||
# Map email addresses and aliases to dspam users
|
||||
;dspam_users=david,goliath,spam,falsepositive
|
||||
;david=david@foocorp.com,david.yelnetz@foocorp.com,david@bar.foocorp.com
|
||||
;goliath=giant@foocorp.com,goliath.philistine@foocorp.com
|
||||
# address to forward spam to. milter will process these and not deliver
|
||||
;spam=spam@foocorp.com
|
||||
# address to forward false positives to. milter will process and not deliver
|
||||
;falsepositive=ham@foocorp.com
|
||||
# the dspam_screener is a list of dspam users who screen mail for all
|
||||
# recipients who are not dspam_users. Spam goes to the screeners quarantine,
|
||||
# and the original recipients are saved so that false positives can be properly
|
||||
# delivered.
|
||||
;dspam_screener=david,goliath
|
||||
# The dspam CGI can also be used: logins must match dspam users
|
||||
+502
@@ -0,0 +1,502 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
|
||||
<title>Python Milters</title>
|
||||
</head><body>
|
||||
|
||||
<P ALIGN="CENTER"><A HREF="http://www.anybrowser.org/campaign/">
|
||||
<IMG SRC="/art/brain1.gif"
|
||||
ALT="Viewable With Any Browser" BORDER="0"></A>
|
||||
|
||||
<img src="/art/banner_4.gif" width="468" height="60" border="0"
|
||||
usemap="#banner_4" alt="Your vote?">
|
||||
<map name="banner_4">
|
||||
<area shape="rect" coords="330,25,426,59"
|
||||
href="http://education-survey.org/" alt="I Disagree">
|
||||
<area shape="rect" coords="234,28,304,57" href="http://www.honestEd.com/" alt="I Agree">
|
||||
</map>
|
||||
|
||||
</P>
|
||||
<h1 align=center>Sendmail Milters in Python</h1>
|
||||
<h4 align=center>by <a href="mailto:%75%72%6D%61%6E%65%40%6E%65%75%72%61l%61%63%63%65%73%73%2E%63%6F%6D">Jim Niemira</a>
|
||||
and <a href="mailto:%73%74%75%61%72%74%40%62%6D%73%69%2E%63%6F%6D">
|
||||
Stuart D. Gathman</a><br>
|
||||
This web page is written by Stuart D. Gathman<br>and<br>sponsored by
|
||||
<a href="http://www.bmsi.com">Business Management Systems, Inc.</a> <br>
|
||||
Last updated Jun 09, 2005</h4>
|
||||
|
||||
See the <a href="faq.html">FAQ</a> | <a href="http://sourceforge.net/project/showfiles.php?group_id=139894">Download now</a> |
|
||||
<a href="/mailman/listinfo/pymilter">Subscribe to mailing list</a> |
|
||||
<a href="#overview">Overview</a> |
|
||||
<a href="/python/dspam.html">pydspam</a> |
|
||||
<a href="/libdspam/dspam.html">libdspam</a>
|
||||
<p>
|
||||
<a href="//www.python.org">
|
||||
<img src="python55.gif" align=left alt="A Python"></a>
|
||||
<a href="//www.sendmail.org/">Sendmail</a> introduced a
|
||||
<a href="http://www.milter.org/milter_api/api.html"> new API</a> beginning with version 8.10 -
|
||||
libmilter. The milter module for <a href="//www.python.org">Python</a>
|
||||
provides a python interface to libmilter that exploits all its features.
|
||||
<p>
|
||||
Sendmail 8.12 officially releases libmilter.
|
||||
Version 8.12 seems to be more robust, and includes new privilege
|
||||
separation features to enhance security. Even better, sendmail 8.13
|
||||
supports socket maps, which makes <a href="pysrs.html">pysrs</a> much more
|
||||
efficient and secure. I recommend upgrading.
|
||||
|
||||
<h2> Recent Changes </h2>
|
||||
|
||||
Python milter is being moved to
|
||||
<a href="http://sourceforge.net/projects/pymilter/">pymilter Sourceforge
|
||||
project</a> for development.
|
||||
<p>
|
||||
Release 0.8.0 is the first <a href="http://sourceforge.net/">Sourceforge</a>
|
||||
release. It supports Python-2.4, and provides an option to accept mail
|
||||
that gets an SPF softfail or fails the 3 strikes rule, provided the
|
||||
alleged sender accepts a DSN explaining the problem. Python-2.3 is
|
||||
no longer supported by the reworked mime.py module, although API changes
|
||||
could be backported. There are too many incompatible changes to the
|
||||
python email package.
|
||||
<p>
|
||||
Release 0.7.2 tightens the authentication screws with a "3 strikes and
|
||||
you're out" policy. A sender must have a valid PTR, HELO, or SPF record
|
||||
to send email. Specific senders can be whitelisted using the
|
||||
"delegate" option in the spf configuration section by adding a
|
||||
default SPF record for them. The PTR and HELO are required
|
||||
by RFC anyway, so this is not an unreasonable requirement.
|
||||
There is now a coherent policy for an SPF softfail result. A softfail
|
||||
is accepted if there is a valid PTR or HELO, or if the domain
|
||||
is listed in the "accept_softfail" option of the spf configuration section.
|
||||
A neutral result is accepted by default if there is a valid PTR or
|
||||
HELO, (and the SPF record was not guessed), unless the domain is listed in the
|
||||
"reject_neutral" option. Common forms of PTR records for dynamic IPs are
|
||||
recognized, and do not count as a valid PTR. This does not prevent anyone
|
||||
from sending mail from a dynamic IP - they just need to configure a
|
||||
valid HELO name or publish an SPF record.
|
||||
<p>
|
||||
As SPF adoption continues to rise, forged spam is not getting through. So
|
||||
spammers are publishing their SPF records as predicted. The 0.7.2 RPM
|
||||
now provides the <code>rhsbl</code> sendmail hack so that spammer domains
|
||||
can be blacklisted. With the RPM installed, add a line like the following
|
||||
to your <code>sendmail.mc</code>.
|
||||
<pre>
|
||||
HACK(rhsbl,`blackholes.example.com',"550 Rejected: " $&{RHS} " has been spamming our customers.")dnl
|
||||
</pre>
|
||||
<p>
|
||||
Of course, spammers are now starting to register
|
||||
throwaway domains. The next thing we need is a custom DNS server,
|
||||
in Python, that
|
||||
can recognize patterns. For instance, one spammer registers ded304.com,
|
||||
ded305.com, ded306.com, etc. We also need the custom DNS server to
|
||||
let SPF classic clients check SES (which will be part of pysrs).
|
||||
The <a href="http://twistedmatrix.com/products/twisted">Twisted Python</a>
|
||||
framework provides a custom DNS server - but I
|
||||
would like a smaller implementation for our use.
|
||||
<p>
|
||||
The RPM for release 0.7.0 moves the config file and socket locations to
|
||||
/etc/mail and /var/run/milter respectively. We now parse Microsoft CID records
|
||||
- but only hotmail.com uses them. They seem to have applied for a patent on
|
||||
the brilliant idea of examining the mail headers to see who the message is
|
||||
from. We aren't doing that here, so not to worry - but I am not a lawyer, so
|
||||
if you are worried, change spf.py around line 626 to return None instead of
|
||||
calling CIDParser(). There is a new option to reject mail with no PTR
|
||||
and no SPF.
|
||||
<p>
|
||||
Microsoft is pushing an anti-opensource license for their pending patent
|
||||
along with their sender-ID proposal before the IETF.
|
||||
It is royalty free - but requires anyone distributing a binary they've
|
||||
compiled from source to sign a license agreement. The Apache Software
|
||||
Foundation <a
|
||||
href="http://www.apache.org/foundation/docs/sender-id-position.html"> explains
|
||||
the problem with sender-ID</a>, and Debian <a
|
||||
href="http://www.debian.org/News/2004/20040904">concurs</a>. Since
|
||||
the <a href="http://download.microsoft.com/download/4/3/9/439b024b-09fd-44ee-8ff0-10e834004c36/senderid_FAQ.PDF">Microsoft license</a> is
|
||||
<a href="http://www.circleid.com/article/732_0_1_0_C/">incompatible with free
|
||||
software in general</a> and the <a
|
||||
href="http://www.imc.org/ietf-mxcomp/mail-archive/msg03678.html">GPL in
|
||||
particular</a>, Python milter will not be able to implement sender-ID in its
|
||||
current form. This was, no doubt, Microsoft's intent all along.
|
||||
<p>
|
||||
Sender-ID attempts to do for RFC2822 headers what SPF does for RFC2821 headers.
|
||||
Unlike SPF, it has never been tried, and is encumbered by a stupid patent. I
|
||||
recommend ignoring it and continuing to implement and improve SPF until a
|
||||
working and unencumbered proposal for RFC2822 headers surfaces.
|
||||
|
||||
<p>
|
||||
<a href="http://spf.pobox.com">
|
||||
<img src="SPF.gif" align=left alt="SPF logo"></a>
|
||||
Release 0.6.6 adds support for <a href="http://spf.pobox.com/">SPF</a>,
|
||||
a protocol to prevent forging of the envelope from address.
|
||||
SPF support requires <a href="http://pydns.sourceforge.net/">pydns</a>.
|
||||
The included spf.py module is an updated version of the original 1.6
|
||||
version at <a href="http://www.wayforward.net/spf/">wayforward.net</a>.
|
||||
The updated version tracks the draft RFC and test suite.
|
||||
<p>
|
||||
The FAQ addresses <a href="faq.html#spf">how to get started with SPF</a>.
|
||||
<p>
|
||||
Release 0.6.1 adds a full milter based dspam application.
|
||||
<p>
|
||||
I have selected the <a href="http://www.nuclearelephant.com/projects/dspam/">
|
||||
dspam bayes filter project</a> and <a href="dspam.html">
|
||||
packaged it for python</a>.
|
||||
Release 0.6.0 offers a simple application of dspam I call "header triage",
|
||||
which rejects messages with spammy headers.
|
||||
To use header triage, you must have <a href="dspam.html">DSPAM</a> installed,
|
||||
and select a dictionary that is well moderated by someone who gets
|
||||
lots of spam. That dictionary can be used to block spam that is
|
||||
obvious from the headers (e.g. X-Mailer and Subject) before it ties
|
||||
up any more resources. I have yet to see any false positives from this
|
||||
approach (check the milter log), but if there are, the sender will
|
||||
get a REJECT with the message "Your message looks spammy."
|
||||
|
||||
<h2> Enough Already! </h2>
|
||||
|
||||
Nearly a dozen people have emailed me begging for a feature to copy
|
||||
outgoing and/or incoming mail to a backup directory by user. Ok, it
|
||||
looks like this is a most requested feature for 0.5.6. In the meantime,
|
||||
here are some things to consider:
|
||||
<ul>
|
||||
<li> If you want to equivalent of a Bcc added to each message, this
|
||||
is very easy to do in the python code for bms.py. See below.
|
||||
<li> If you want to copy to a file in a directory (thus avoiding having to
|
||||
set up aliases), this is slightly more involved. The bms.py milter already
|
||||
copies the message to a temporary file for use in replacing the message body
|
||||
when banned attachments are found. You have to open a file, and copy the
|
||||
Mesage object to it in eom().
|
||||
<li> Finally, you are probably aware that most email clients already
|
||||
keep a copy of outgoing mail? Presumably there is a good reason for
|
||||
keeping another copy on the server.
|
||||
</ul>
|
||||
<p>
|
||||
To Bcc a message, call <code>self.add_recipient(rcpt)</code> in envfrom after
|
||||
determining whether you want to copy (e.g. whether the sender is local). For
|
||||
example,
|
||||
<pre>
|
||||
def envfrom(...
|
||||
...
|
||||
if len(t) == 2:
|
||||
self.rejectvirus = t[1] in reject_virus_from
|
||||
if t[0] in wiretap_users.get(t[1],()):
|
||||
self.add_recipient(wiretap_dest)
|
||||
if t[1] == 'mydomain.com':
|
||||
self.add_recipient('<copy-%s>' % t[0])
|
||||
...
|
||||
</pre>
|
||||
<p>
|
||||
To make this a generic feature requires thinking about how the configuration
|
||||
would look. Feel free to make specific suggestions about config file
|
||||
entries. Be sure to handle both Bcc and file copies, and designating what
|
||||
mail should be copied. How should "outgoing" be defined? Implementing it is
|
||||
easy once the configuration is designed.
|
||||
|
||||
<h3><a name=overview>Overview</a></h3>
|
||||
|
||||
This package provides a robust toolkit for Python <a
|
||||
href="#milter">milters</a>, and the beginnings of a general purpose mail
|
||||
filtering system written in Python.
|
||||
<p>
|
||||
At the lowest level, the 'milter' module provides a thin wrapper around the
|
||||
<a href="http://www.milter.org/milter_api/api.html">
|
||||
sendmail libmilter API</a>. This API lets you register callbacks for
|
||||
a number of events in the
|
||||
<a href="http://www.cs.concordia.ca/~group/fig/public/email/relay/milter+ruleset-checks.html">process of sendmail receiving a message via SMTP</a>.
|
||||
These events include the initial connection from a MTA,
|
||||
the envelope sender and recipients, the top level mail headers, and
|
||||
the message body. There are options to mangle all of these components
|
||||
of the message as it passes through the milter.
|
||||
<p>
|
||||
At the next level, the 'Milter' module (note the case difference) provides a
|
||||
Python friendly object oriented wrapper for the low level API. To use the
|
||||
Milter module, an application registers a 'factory' to create an object
|
||||
for each connection from a MTA to sendmail. These connection objects
|
||||
must provide methods corresponding to the libmilter callback events.
|
||||
<p>
|
||||
Each event method returns a code to tell sendmail whether to proceed
|
||||
with processing the message. This is a big advantage of milters over
|
||||
other mail filtering systems. Unwanted mail can be stopped in its
|
||||
tracks at the earliest possible point.
|
||||
<p>
|
||||
The Milter.Milter class provides default implementations for event
|
||||
methods that
|
||||
do nothing, and also provides wrappers for the libmilter methods to mutate
|
||||
the message.
|
||||
<p>
|
||||
The 'spf' module provides an implementation of <a href="http://spf.pobox.com">
|
||||
SPF</a> useful for detecting email forgery.
|
||||
<p>
|
||||
The 'mime' module provides a wrapper for the Python email package that
|
||||
fixes some bugs, and simplifies modifying selected parts of a MIME message.
|
||||
<p>
|
||||
Finally, the bms.py application is both a sample of how to use the
|
||||
Milter and spf modules, and the beginnings of a general purpose SPAM filtering,
|
||||
wiretapping, SPF checking, and Win32 virus protecting milter. It can
|
||||
make use of the <a href="pysrs.html">pysrs</a> package when available for
|
||||
SRS/SES checking and the <a href="dspam.html">pydspam</a> package for Bayesian
|
||||
content filtering. SPF checking
|
||||
requires <a href="http://pydns.sourceforge.net/">
|
||||
pydns</a>. Configuration documentation is currently included as comments
|
||||
in the <a href="milter.cfg">sample config file</a> for the bms.py milter.
|
||||
<p>
|
||||
Python milter is under GPL. The authors can probably be convinced to
|
||||
change this to LGPL if needed.
|
||||
|
||||
<h3>What is a <a name="milter">milter</a>?</h3>
|
||||
|
||||
Milters can run on the same machine as sendmail, or another machine. The
|
||||
milter can even run with a different operating system or processor than
|
||||
sendmail.
|
||||
Sendmail talks to the milter via a local or internet socket.
|
||||
Sendmail keeps the
|
||||
milter informed of events as it processes a mail connection. At any
|
||||
point, the milter can cut the conversation short by telling sendmail
|
||||
to ACCEPT, REJECT, or DISCARD the message. After receiving a complete
|
||||
message from sendmail, the milter can again REJECT or DISCARD it, but it
|
||||
can also ACCEPT it with changes to the headers or body.
|
||||
|
||||
<h3> What can you do with a milter? </h3>
|
||||
|
||||
<menu>
|
||||
<li> A milter can DISCARD or REJECT spam based based on algorithms scripted
|
||||
in python rather than sendmail's cryptic "cf" language.
|
||||
<li> A milter can alter or remove attachments from mail that are poisonous to
|
||||
Windows.
|
||||
<li> A milter can scan for viruses and clean them when detected.
|
||||
<li> A milter scans outgoing as well as incoming mail.
|
||||
<li> A milter can add and delete recipients to forward or secretly
|
||||
copy mail.
|
||||
<li> For more ideas, check the <a href="//www.milter.org">Milter Web Page</a>.
|
||||
</menu>
|
||||
|
||||
<a href="http://www.milter.org/milter_api/api.html">
|
||||
Documentation</a> for the C API is provided with sendmail. Miltermodule
|
||||
provides a thin python wrapper for the C API. Milter.py provides a simple
|
||||
OO wrapper on top of that.
|
||||
<p>
|
||||
The Python milter package includes a sample milter that replaces dangerous
|
||||
attachments with a warning message, discards mail addressed to
|
||||
MAILER-DAEMON, and demonstrates several SPAM abatement strategies.
|
||||
The MimeMessage class to do this used to be based on the
|
||||
<code>mimetools</code> and <code>multifile</code> standard python packages.
|
||||
As of milter version 0.6.0, it is based on the email standard
|
||||
python packages, which were derived from the
|
||||
<a href="http://sourceforge.net/projects/mimelib">mimelib</a> project.
|
||||
The MimeMessage class patches several bugs in the email package,
|
||||
and provides some backward compatibility.
|
||||
|
||||
<p>
|
||||
The "defang" function of the sample milter was inspired by
|
||||
<a href="http://www.roaringpenguin.com/mimedefang/">MIMEDefang</a>,
|
||||
a Perl milter with flexible attachment processing options. The latest
|
||||
version of MIMEDefang uses an apache style process pool to avoid reloading
|
||||
the Perl interpreter for each message. This makes it fast enough for
|
||||
production without using Perl threading.
|
||||
<p>
|
||||
<a href="http://sourceforge.net/projects/mailchecker">mailchecker</a> is
|
||||
a Python project to provide flexible attachment processing for mail. I
|
||||
will be looking at plugging mailchecker into a milter.
|
||||
<p>
|
||||
<a href="http://software.libertine.org/tmda/">TMDA</a> is a Python project
|
||||
to require confirmation the first time someone tries to send to your
|
||||
mailbox. This would be a nice feature to have in a milter.
|
||||
<p>
|
||||
There is also a <a href="http://www.milter.org/">Milter community website</a>
|
||||
where milter software and gory details of the API are discussed.
|
||||
|
||||
<h3> Is a milter written in python efficient? </h3>
|
||||
|
||||
The python milter process is multi-threaded and startup cost is incurred
|
||||
only once. This is much more efficient than some implementations that
|
||||
start a new interpreter for each connection. Testing in a production
|
||||
environment did not use a significant percentage of the CPU. Furthermore,
|
||||
python is easily extended in C for any step requiring expensive CPU
|
||||
processing.
|
||||
<p>
|
||||
For example, the HTML parsing feature to remove scripts from HTML attachments
|
||||
is rather CPU intensive in pure python. Using the C replacement for sgmllib
|
||||
greatly speeds things up.
|
||||
|
||||
<h3> Goals </h3>
|
||||
|
||||
<menu>
|
||||
<li> Implement RRS - a backdoor for non-SRS forwarders. User lists non-SRS
|
||||
forwarder accounts (perhaps in <code>~/.forwarders</code>), and a util
|
||||
provides a special local alias for the user to give to the forwarder.
|
||||
Alias only works for mail from that forwarder. Milter gets forwarder
|
||||
domain from alias and uses it to SPF check forwarder. Requires
|
||||
milter to have read access to <code>~/.forwarders</code> or else
|
||||
a way for user to submit entries to milter database.
|
||||
<li> The bms.py milter has too many features. Create a framework where
|
||||
numerous small feature modules can be plugged together in the
|
||||
configuration.
|
||||
<li> Create a pure python substitute for miltermodule and libmilter that
|
||||
implements the <a
|
||||
href="http://www.duh.org/cvsweb.cgi/~checkout~/pmilter/doc/milter-protocol.txt?rev=1">
|
||||
libmilter protocol</a> in python.
|
||||
<li> Find or write a faster implementation of sgmllib. The
|
||||
<a href="http://www.effbot.org/zone/sgmlop-index.htm">sgmlop package</a>
|
||||
is not very compatible with
|
||||
<a href="http://www.python.org/doc/2.1.3/lib/module-sgmllib.html">
|
||||
Python-2.1 sgmllib</a>, but it is a start, and is supported in
|
||||
milter-0.4.5 or later.
|
||||
<li> Implement all or most of the features of
|
||||
<a href="http://www.roaringpenguin.com/mimedefang/">MIMEDefang</a>.
|
||||
<li> Follow the official <a href="http://www.python.org/peps/pep-0008.html">
|
||||
Python coding standards</a> more closely.
|
||||
<li> Make unit test code more like other python modules.
|
||||
</menu>
|
||||
|
||||
<h3> Confirmed Installations </h3>
|
||||
|
||||
Please <a href="mailto:%73%74%75%61%72%74%40%62%6D%73%69%2E%63%6F%6D">email</a>
|
||||
me if you successfully install milter on a system not mentioned below.
|
||||
<p>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Operating System</th> <th>Compiler</th> <th>Python</th> <th>Sendmail</th>
|
||||
<th>milter</th>
|
||||
<tr>
|
||||
<td>Mandrake 8.0</td><td>gcc-3.0.1</td><td>2.1.1</td><td>8.12.0</td>
|
||||
<td>0.3.3</td><tr>
|
||||
<td>Mandrake 8.0</td><td>gcc-2.96</td><td>2.0</td><td>8.11.2</td>
|
||||
<td>0.3.6</td><tr>
|
||||
<td>RedHat 6.2</td><td>egcs-1.1.2</td><td>2.2.2</td><td>8.11.6</td>
|
||||
<td>0.5.4</td><tr>
|
||||
<td>RedHat 7.1</td><td>gcc-2.96</td><td>?</td><td>8.12.1</td>
|
||||
<td>0.3.5</td><tr>
|
||||
<td>RedHat 7.3</td><td>gcc-2.96</td><td>2.2.2</td><td>8.11.6</td>
|
||||
<td>0.5.5</td><tr>
|
||||
<td>RedHat 7.3</td><td>gcc-2.96</td><td>2.3.3</td><td>8.13.1</td>
|
||||
<td>0.7.2</td><tr>
|
||||
<td>RedHat 8.0</td><td>gcc-3.2</td><td>2.2.1</td><td>8.12.6</td>
|
||||
<td>0.5.2</td><tr>
|
||||
<td>Debian Linux</td><td>gcc-2.95.2</td><td>2.1.1</td><td>8.12.0</td>
|
||||
<td>0.3.7</td><tr>
|
||||
<td>Debian Linux</td><td>gcc-3.2.2</td><td>2.2.2</td><td>8.12.7</td>
|
||||
<td>0.5.4</td><tr>
|
||||
<td>AIX-4.1.5</td><td>gcc-2.95.2</td><td>2.1.1</td><td>8.11.5</td>
|
||||
<td>0.3.3</td><tr>
|
||||
<td>AIX-4.1.5</td><td>gcc-2.95.2</td><td>2.1.1</td><td>8.12.1</td>
|
||||
<td>0.3.4</td><tr>
|
||||
<td>AIX-4.1.5</td><td>gcc-2.95.2</td><td>2.1.3</td><td>8.12.3</td>
|
||||
<td>0.4.2</td><tr>
|
||||
<td>AIX-4.1.5</td><td>gcc-2.95.2</td><td>2.2.3</td><td>8.13.1</td>
|
||||
<td>0.7.1</td><tr>
|
||||
<td>Slackware 7.1</td><td>?</td><td>?</td><td>8.12.1</td>
|
||||
<td>0.3.8</td><tr>
|
||||
<td>Slackware 9.0</td><td>gcc-3.2.2</td><td>2.2.3</td><td>8.12.9</td>
|
||||
<td>0.5.4</td><tr>
|
||||
<td>OpenBSD</td><td>?</td><td>2.3.3?</td><td>8.13.1?</td>
|
||||
<td>0.7.2</td><tr>
|
||||
<td>SuSE 7.3</td><td>gcc-2.95.3</td><td>2.1.1</td><td>8.12.2</td>
|
||||
<td>0.3.9</td><tr>
|
||||
<td>FreeBSD</td><td>gcc-2.95.3</td><td>2.2.1</td><td>8.12.3</td>
|
||||
<td>0.4.0</td><tr>
|
||||
<td>FreeBSD</td><td>gcc-2.95.3</td><td>2.2.2</td><td>?</td>
|
||||
<td>0.5.5</td><tr>
|
||||
<td>FreeBSD 4.4</td><td>gcc-2.95.3</td><td>?</td><td>8.12.10</td>
|
||||
<td>0.6.6</td><tr>
|
||||
|
||||
</table>
|
||||
|
||||
<h3> Requirements </h3>
|
||||
|
||||
<menu>
|
||||
<li> While the miltermodule will work with python 1.5, you probably
|
||||
want to use python 2.0 or better. The python code uses a number of
|
||||
python 2 features.
|
||||
<li> Python must be configured with thread support. This is because
|
||||
sendmail's libmilter requires thread support.
|
||||
<li> You must compile sendmail with libmilter enabled. In versions of
|
||||
sendmail prior to 8.12 libmilter is marked FFR (For Future Release) and
|
||||
is not installed by default.
|
||||
Sendmail 8.12 still does not enable libmilter by default. You must
|
||||
explicitly select the "MILTER" option when compiling.
|
||||
<li> Python milter has been tested against sendmail-8.11 and sendmail-8.12.
|
||||
<li> Python milter must be compiled for the specific version of sendmail
|
||||
it will run with. (Since the result is dynamically loaded, there could
|
||||
conceivably be multiple versions available and selected at startup - but
|
||||
that will have to wait.) This situation may only exist for sendmail
|
||||
versions prior to 8.12. The protocol seems designed for backward
|
||||
compatibility - and 8.12 is the first official milter release.
|
||||
<li> Mea Culpa! After reading the Python Style guide, I realize that
|
||||
my Python code is not up to snuff. Apparently mixed tabs and spaces
|
||||
are anathema to those using Windows editors, where tabs can be expanded using
|
||||
any arbitrary algorithm. Other than that, my
|
||||
intuition matched Guido's pretty well - although I like to indent by 2
|
||||
rather than 4. I will arrange to have tabs expanded to spaces when
|
||||
exporting new versions. Until then, beware!
|
||||
</menu>
|
||||
|
||||
<h3> <a name="aix4"> AIX 4.1.5 Requirements </a> </h3>
|
||||
To create sendmail RPMs for AIX, you can download my AIX 4.1.5 spec files
|
||||
for <a href="/aix/sendmail.spec">sendmail-8.11.5</a>
|
||||
or <a href="/aix/sendmail12.spec">sendmail-8.12.3</a>. If you have
|
||||
not already set it up, I use a <a href="/aix/aix.spec">dummy RPM package</a>
|
||||
to represent the stuff that comes with AIX. You might also want
|
||||
my <a href="/aix/python.spec">python-2.1.1</a> spec file for AIX. It
|
||||
does not include Tk or curses modules, sorry. If y'all trust me, you can
|
||||
download rpms for AIX 4.x from my <a href="/aix">AIX RPM directory</a>.
|
||||
<p>
|
||||
Sendmail-8.12 renames
|
||||
libsmutil.a to libsm.a. Unfortunately, libsm.a is an important AIX system
|
||||
shared library. Therefore, I rename libsm.a back to libsmutil.a for
|
||||
AIX. This presents a problem for setup.py.
|
||||
|
||||
<h3> <a name="rh72"> RedHat 7.2 Requirements </a> </h3>
|
||||
|
||||
If you are running Redhat 7.2, the distributed version of sendmail
|
||||
now enables libmilter by default. RedHat 7.2 bundles
|
||||
the development libraries with the main sendmail package, so
|
||||
there is no sendmail-devel package. However, they forgot to include the
|
||||
headers! So you'll have to get the SRPM and modify it. I suggest
|
||||
moving the static libs to a devel package and adding the headers. If
|
||||
this is too much trouble, you can get the <a href="mfapi.h">mfapi.h</a>
|
||||
header for sendmail-8.6.11 from here and manually install it as
|
||||
<code>/usr/include/libmilter/mfapi.h</code>.
|
||||
<p>
|
||||
If you do modify the SRPM, I suggest renaming libsmutil.a
|
||||
to libsm.a - just like sendmail-8.12 will. If you manually install
|
||||
mfapi.h or don't rename libsmutil.a, you'll
|
||||
need to force <code>libs = ["milter", "smutil"]</code> in setup.py.
|
||||
<p>
|
||||
If you have installed python2, and want
|
||||
python-milter to use python2, add <code>python=python2</code> to setup.cfg
|
||||
and build with <code>python2 setup.py bdist_rpm</code>.
|
||||
|
||||
<h3> <a name="rh62"> Redhat 6.2 Requirements </a> </h3>
|
||||
|
||||
If you are running Redhat 6.2, the distributed version of sendmail
|
||||
does not enable libmilter. You can download the Redhat 7.2 sendmail.spec
|
||||
modified to compile on RedHat 6.2:
|
||||
<a href="http://www.bmsi.com/linux/rh62/sendmail-rhmilter.spec">
|
||||
sendmail-rhmilter.spec</a>. The <a
|
||||
href="ftp://updates.redhat.com/7.0/en/os/SRPMS/sendmail-8.11.6-1.7.0.src.rpm">
|
||||
SRPM for sendmail-8.11.6</a> is available from
|
||||
<a href="http://www.redhat.com">Redhat</a> under
|
||||
<a href="http://www.redhat.com/support/errata/RHSA-2001-106.html">
|
||||
Errata for RH6.2</a>. But that doesn't include the latest security
|
||||
patches since RH6.2 is no longer supported.
|
||||
<p>
|
||||
If y'all trust me, you can pick up source and binary sendmail RPMs for RH6.2
|
||||
from my <a href="http://www.bmsi.com/linux/rh62">linux downloads</a> directory.
|
||||
The lastest RPMs were built by taking a RH7.2 SRPMS and removing some
|
||||
RPM features from the spec file that RH6.2 doesn't support, then
|
||||
recompiling on RH6.2. You can check this by installing the RH7.2 SRPM,
|
||||
then diffing my sendmail.spec with theirs. Then run
|
||||
"rpm -bb sendmail-rhmilter.spec" when you are satisfied.
|
||||
<p>
|
||||
If you have installed python2, and want
|
||||
python-milter to use python2, add <code>python=python2</code> to setup.cfg
|
||||
and build with <code>python2 setup.py bdist_rpm</code>.
|
||||
You'll need to install the sendmail-devel package to compile milter.
|
||||
|
||||
<hr>
|
||||
<p>
|
||||
<a href="http://validator.w3.org/check/referer">
|
||||
<img border=0 src="/vh32.png" alt=" [ Valid HTML 3.2! ] " height=31 width=88></a>
|
||||
<a href="http://www.redhat.com">
|
||||
<img src="/art/powered_by.gif" width="88" height="31" alt=" [ Powered By Red Hat Linux ] " border="0"></a>
|
||||
</p>
|
||||
|
||||
</body></html>
|
||||
@@ -0,0 +1,81 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# milter This shell script takes care of starting and stopping milter.
|
||||
#
|
||||
# chkconfig: 2345 80 30
|
||||
# description: Milter is a process that filters messages sent through sendmail.
|
||||
# processname: milter
|
||||
# config: /var/log/milter/bms.py
|
||||
# pidfile: /var/run/milter/milter.pid
|
||||
|
||||
python="python2.3"
|
||||
|
||||
pidof() {
|
||||
set - ""
|
||||
if set - `ps -e -o pid,cmd | grep "${python} bms.py"` &&
|
||||
[ "$2" != "grep" ]; then
|
||||
echo $1
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Source function library.
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
[ -x /var/log/milter/start.sh ] || exit 0
|
||||
|
||||
RETVAL=0
|
||||
prog="milter"
|
||||
|
||||
start() {
|
||||
# Start daemons.
|
||||
|
||||
echo -n "Starting $prog: "
|
||||
daemon --check milter --user mail /var/log/milter/start.sh
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/milter
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
stop() {
|
||||
# Stop daemons.
|
||||
echo -n "Shutting down $prog: "
|
||||
killproc milter
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/milter
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart|reload)
|
||||
stop
|
||||
start
|
||||
RETVAL=$?
|
||||
;;
|
||||
condrestart)
|
||||
if [ -f /var/lock/subsys/milter ]; then
|
||||
stop
|
||||
start
|
||||
RETVAL=$?
|
||||
fi
|
||||
;;
|
||||
status)
|
||||
status milter
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|condrestart|status}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
Executable
+81
@@ -0,0 +1,81 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# milter This shell script takes care of starting and stopping milter.
|
||||
#
|
||||
# chkconfig: 2345 80 30
|
||||
# description: Milter is a process that filters messages sent through sendmail.
|
||||
# processname: milter
|
||||
# config: /var/log/milter/bms.py
|
||||
# pidfile: /var/run/milter/milter.pid
|
||||
|
||||
python="python2.3"
|
||||
|
||||
pidof() {
|
||||
set - ""
|
||||
if set - `ps -e -o pid,wchan,cmd | grep "rt_sig ${python} bms.py"` &&
|
||||
[ "$3" != "grep" ]; then
|
||||
echo $1
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Source function library.
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
[ -x /var/log/milter/start.sh ] || exit 0
|
||||
|
||||
RETVAL=0
|
||||
prog="milter"
|
||||
|
||||
start() {
|
||||
# Start daemons.
|
||||
|
||||
echo -n "Starting $prog: "
|
||||
daemon --check milter --user mail /var/log/milter/start.sh
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/milter
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
stop() {
|
||||
# Stop daemons.
|
||||
echo -n "Shutting down $prog: "
|
||||
killproc milter
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/milter
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart|reload)
|
||||
stop
|
||||
start
|
||||
RETVAL=$?
|
||||
;;
|
||||
condrestart)
|
||||
if [ -f /var/lock/subsys/milter ]; then
|
||||
stop
|
||||
start
|
||||
RETVAL=$?
|
||||
fi
|
||||
;;
|
||||
status)
|
||||
status milter
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|condrestart|status}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
+258
@@ -0,0 +1,258 @@
|
||||
%define name milter
|
||||
%define version 0.8.1
|
||||
%define release 1.RH7
|
||||
# what version of RH are we building for?
|
||||
%define redhat9 0
|
||||
%define redhat7 1
|
||||
%define redhat6 0
|
||||
|
||||
# Options for Redhat version 6.x:
|
||||
# rpm -ba|--rebuild --define "rh6 1"
|
||||
%{?rh6:%define redhat7 0}
|
||||
%{?rh6:%define redhat6 1}
|
||||
|
||||
# some systems dont have initrddir defined
|
||||
%{?_initrddir:%define _initrddir /etc/rc.d/init.d}
|
||||
|
||||
%if %{redhat9}
|
||||
%define sysvinit milter.rc
|
||||
%else # Redhat 7.x and earlier (multiple ps lines per thread)
|
||||
%define sysvinit milter.rc7
|
||||
%endif
|
||||
# RH9, other systems (single ps line per process)
|
||||
%ifos Linux
|
||||
%define python python2.4
|
||||
%else
|
||||
%define python python
|
||||
%endif
|
||||
|
||||
Summary: Python interface to sendmail milter API
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
#Patch: %{name}-%{version}.patch
|
||||
Copyright: GPL
|
||||
Group: Development/Libraries
|
||||
BuildRoot: %{_tmppath}/%{name}-buildroot
|
||||
Prefix: %{_prefix}
|
||||
Vendor: Stuart D. Gathman <stuart@bmsi.com>
|
||||
Packager: Stuart D. Gathman <stuart@bmsi.com>
|
||||
Url: http://www.bmsi.com/python/milter.html
|
||||
Requires: %{python} >= 2.4, sendmail >= 8.12.10
|
||||
%ifos Linux
|
||||
Requires: chkconfig
|
||||
%endif
|
||||
BuildRequires: %{python}-devel , sendmail-devel >= 8.12.10
|
||||
|
||||
%description
|
||||
This is a python extension module to enable python scripts to
|
||||
attach to sendmail's libmilter functionality. Additional python
|
||||
modules provide for navigating and modifying MIME parts.
|
||||
|
||||
%prep
|
||||
%setup
|
||||
#%patch -p1
|
||||
|
||||
%build
|
||||
env CFLAGS="$RPM_OPT_FLAGS" %{python} setup.py build
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%{python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
|
||||
mkdir -p $RPM_BUILD_ROOT/var/log/milter
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/mail
|
||||
mkdir $RPM_BUILD_ROOT/var/log/milter/save
|
||||
cp bms.py strike3.txt softfail.txt $RPM_BUILD_ROOT/var/log/milter
|
||||
cp milter.cfg $RPM_BUILD_ROOT/etc/mail/pymilter.cfg
|
||||
|
||||
# logfile rotation
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
||||
cat >$RPM_BUILD_ROOT/etc/logrotate.d/milter <<'EOF'
|
||||
/var/log/milter/milter.log {
|
||||
copytruncate
|
||||
compress
|
||||
}
|
||||
EOF
|
||||
|
||||
# purge saved defanged message copies
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
|
||||
%ifos aix4.1
|
||||
R=
|
||||
%else
|
||||
R='-r'
|
||||
%endif
|
||||
cat >$RPM_BUILD_ROOT/etc/cron.daily/milter <<'EOF'
|
||||
#!/bin/sh
|
||||
|
||||
find /var/log/milter/save -mtime +7 | xargs $R rm
|
||||
EOF
|
||||
chmod a+x $RPM_BUILD_ROOT/etc/cron.daily/milter
|
||||
|
||||
%ifos aix4.1
|
||||
cat >$RPM_BUILD_ROOT/var/log/milter/start.sh <<'EOF'
|
||||
#!/bin/sh
|
||||
cd /var/log/milter
|
||||
# uncomment to enable sgmlop if installed
|
||||
#export PYTHONPATH=/usr/local/lib/python2.1/site-packages
|
||||
exec /usr/local/bin/python bms.py >>milter.log 2>&1
|
||||
EOF
|
||||
%else
|
||||
cat >$RPM_BUILD_ROOT/var/log/milter/start.sh <<'EOF'
|
||||
#!/bin/sh
|
||||
cd /var/log/milter
|
||||
exec >>milter.log 2>&1
|
||||
%{python} bms.py &
|
||||
echo $! >/var/run/milter/milter.pid
|
||||
EOF
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
|
||||
cp %{sysvinit} $RPM_BUILD_ROOT/etc/rc.d/init.d/milter
|
||||
ed $RPM_BUILD_ROOT/etc/rc.d/init.d/milter <<'EOF'
|
||||
/^python=/
|
||||
c
|
||||
python="%{python}"
|
||||
.
|
||||
w
|
||||
q
|
||||
EOF
|
||||
%endif
|
||||
chmod a+x $RPM_BUILD_ROOT/var/log/milter/start.sh
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/var/run/milter
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/sendmail-cf/hack
|
||||
cp -p rhsbl.m4 $RPM_BUILD_ROOT/usr/share/sendmail-cf/hack
|
||||
|
||||
%ifos aix4.1
|
||||
%post
|
||||
mkssys -s milter -p /var/log/milter/start.sh -u 25 -S -n 15 -f 9 -G mail || :
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
rmssys -s milter || :
|
||||
fi
|
||||
%else
|
||||
%post
|
||||
#echo "pythonsock has moved to /var/run/milter, update /etc/mail/sendmail.cf"
|
||||
/sbin/chkconfig --add milter
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/chkconfig --del milter
|
||||
fi
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -f INSTALLED_FILES
|
||||
%defattr(-,root,root)
|
||||
%doc README NEWS TODO CREDITS sample.py
|
||||
/etc/logrotate.d/milter
|
||||
/etc/cron.daily/milter
|
||||
%ifos aix4.1
|
||||
%defattr(-,smmsp,mail)
|
||||
%else
|
||||
/etc/rc.d/init.d/milter
|
||||
%defattr(-,mail,mail)
|
||||
%endif
|
||||
%dir /var/log/milter
|
||||
%dir /var/run/milter
|
||||
%dir /var/log/milter/save
|
||||
%config /var/log/milter/start.sh
|
||||
%config /var/log/milter/bms.py
|
||||
%config /var/log/milter/strike3.txt
|
||||
%config /var/log/milter/softfail.txt
|
||||
%config(noreplace) /etc/mail/pymilter.cfg
|
||||
/usr/share/sendmail-cf/hack/rhsbl.m4
|
||||
|
||||
%changelog
|
||||
* Thu Jun 16 2005 Stuart Gathman <stuart@bmsi.com> 0.8.1-1
|
||||
- Fix zip in zip loop in mime.py
|
||||
- Fix HeaderParseError in bms.py header callback
|
||||
- Check internal_domains for outgoing mail
|
||||
- Fix inconsistent results from send_dsn
|
||||
* Mon Jun 06 2005 Stuart Gathman <stuart@bmsi.com> 0.8.0-3
|
||||
- properly log pydspam exceptions
|
||||
* Sat Jun 04 2005 Stuart Gathman <stuart@bmsi.com> 0.8.0-2
|
||||
- Include default softfail, strike3 templates
|
||||
* Wed May 25 2005 Stuart Gathman <stuart@bmsi.com> 0.8.0-1
|
||||
- Move Milter module to subpackage.
|
||||
- DSN support for Three strikes rule and SPF SOFTFAIL
|
||||
- Move /*mime*/ and dynip to Milter subpackage
|
||||
- Fix SPF unknown mechanism list not cleared
|
||||
- Make banned extensions configurable.
|
||||
- Option to scan zipfiles for bad extensions.
|
||||
* Tue Feb 08 2005 Stuart Gathman <stuart@bmsi.com> 0.7.3-1.EL3
|
||||
- Support EL3 and Python2.4 (some scanning/defang support broken)
|
||||
* Mon Aug 30 2004 Stuart Gathman <stuart@bmsi.com> 0.7.2-1
|
||||
- Fix various SPF bugs
|
||||
- Recognize dynamic PTR names, and don't count them as authentication.
|
||||
- Three strikes and yer out rule.
|
||||
- Block softfail by default unless valid PTR or HELO
|
||||
- Return unknown for null mechanism
|
||||
- Return unknown for invalid ip address in mechanism
|
||||
- Try best guess on HELO also
|
||||
- Expand setreply for common errors
|
||||
- make rhsbl.m4 hack available for sendmail.mc
|
||||
* Sun Aug 22 2004 Stuart Gathman <stuart@bmsi.com> 0.7.1-1
|
||||
- Handle modifying mislabeled multipart messages without an exception
|
||||
- Support setbacklog, setmlreply
|
||||
- allow multi-recipient CBV
|
||||
- return TEMPFAIL for SPF softfail
|
||||
* Fri Jul 23 2004 Stuart Gathman <stuart@bmsi.com> 0.7.0-1
|
||||
- SPF check hello name
|
||||
- Move pythonsock to /var/run/milter
|
||||
- Move milter.cfg to /etc/mail/pymilter.cfg
|
||||
- Check M$ style XML CID records by converting to SPF
|
||||
- Recognize, but never match ip6 until we properly support it.
|
||||
- Option to reject when no PTR and no SPF
|
||||
* Fri Apr 09 2004 Stuart Gathman <stuart@bmsi.com> 0.6.9-1
|
||||
- Validate spf.py against test suite, and add Received-SPF support to spf.py
|
||||
- Support best_guess for SPF
|
||||
- Reject numeric hello names
|
||||
- Preserve case of local part in sender
|
||||
- Make libmilter timeout a config option
|
||||
- Fix setup.py to work with python < 2.2.3
|
||||
* Tue Apr 06 2004 Stuart Gathman <stuart@bmsi.com> 0.6.8-3
|
||||
- Reject invalid SRS immediately for benefit of callback verifiers
|
||||
- Fix include bug in spf.py
|
||||
* Tue Apr 06 2004 Stuart Gathman <stuart@bmsi.com> 0.6.8-2
|
||||
- Bug in check_header
|
||||
* Mon Apr 05 2004 Stuart Gathman <stuart@bmsi.com> 0.6.8-1
|
||||
- Don't report spoofed unless rcpt looks like SRS
|
||||
- Check for bounce with multiple rcpts
|
||||
- Make dspam see Received-SPF headers
|
||||
- Make sysv init work with RH9
|
||||
* Thu Mar 25 2004 Stuart Gathman <stuart@bmsi.com> 0.6.7-3
|
||||
- Forgot to make spf_reject_neutral global in bms.py
|
||||
* Wed Mar 24 2004 Stuart Gathman <stuart@bmsi.com> 0.6.7-2
|
||||
- Defang message/rfc822 content_type with boundary
|
||||
- Support SPF delegation
|
||||
- Reject neutral SPF result for selected domains
|
||||
* Tue Mar 23 2004 Stuart Gathman <stuart@bmsi.com> 0.6.7-1
|
||||
- SRS forgery check. Detect thread resource starvation.
|
||||
- Properly remove local socket with explicit type.
|
||||
- Decode obfuscated subject headers.
|
||||
* Wed Mar 11 2004 Stuart Gathman <stuart@bmsi.com> 0.6.6-2
|
||||
- init script bug with python2.3
|
||||
* Wed Mar 10 2004 Stuart Gathman <stuart@bmsi.com> 0.6.6-1
|
||||
- SPF checking, hello blacklist
|
||||
* Mon Mar 08 2004 Stuart Gathman <stuart@bmsi.com> 0.6.5-2
|
||||
- memory leak in envfrom and envrcpt
|
||||
* Mon Mar 01 2004 Stuart Gathman <stuart@bmsi.com> 0.6.5-1
|
||||
- progress notification
|
||||
- memory leak in connect
|
||||
- trusted relay
|
||||
* Thu Feb 19 2004 Stuart Gathman <stuart@bmsi.com> 0.6.4-2
|
||||
- smart alias wildcard patch, compile for sendmail-8.12
|
||||
* Thu Dec 04 2003 Stuart Gathman <stuart@bmsi.com> 0.6.4-1
|
||||
- many fixes for dspam support
|
||||
* Wed Oct 22 2003 Stuart Gathman <stuart@bmsi.com> 0.6.3
|
||||
- dspam SCREEN feature
|
||||
- streamline dspam false positive handling
|
||||
* Mon Sep 01 2003 Stuart Gathman <stuart@bmsi.com> 0.6.1
|
||||
- Full dspam support added
|
||||
* Mon Aug 26 2003 Stuart Gathman <stuart@bmsi.com>
|
||||
- Use New email module
|
||||
* Fri Jun 27 2003 Stuart Gathman <stuart@bmsi.com>
|
||||
- Add dspam module
|
||||
+121
-594
File diff suppressed because it is too large
Load Diff
@@ -1,19 +1,4 @@
|
||||
# $Log$
|
||||
# Revision 1.8 2011/11/05 15:51:03 customdesigned
|
||||
# New example
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# Revision 1.3 2005/06/02 15:00:17 customdesigned
|
||||
# Configure banned extensions. Scan zipfile option with test case.
|
||||
#
|
||||
@@ -82,12 +67,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.
|
||||
@@ -109,8 +90,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')
|
||||
@@ -121,8 +100,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
|
||||
@@ -162,23 +139,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)
|
||||
@@ -218,7 +193,6 @@ class MimeMessage(Message):
|
||||
for key,name in tuple(names): # copy by converting to tuple
|
||||
if name and name.lower().endswith('.zip'):
|
||||
txt = self.get_payload(decode=True)
|
||||
if txt.strip():
|
||||
names += zipnames(txt)
|
||||
return names
|
||||
|
||||
@@ -330,25 +304,19 @@ See your administrator.
|
||||
|
||||
def check_name(msg,savname=None,ckname=check_ext,scan_zip=False):
|
||||
"Replace attachment with a warning if its name is suspicious."
|
||||
try:
|
||||
for key,name in msg.getnames(scan_zip):
|
||||
badname = ckname(name)
|
||||
if badname:
|
||||
hostname = socket.gethostname()
|
||||
if key == 'zipname':
|
||||
badname = msg.get_filename()
|
||||
break
|
||||
else:
|
||||
return Milter.CONTINUE
|
||||
except zipfile.BadZipfile:
|
||||
# a ZIP that is not a zip is very suspicious
|
||||
badname = msg.get_filename()
|
||||
hostname = socket.gethostname()
|
||||
msg.set_payload(virus_msg % (badname,hostname,savname))
|
||||
del msg["content-type"]
|
||||
del msg["content-disposition"]
|
||||
del msg["content-transfer-encoding"]
|
||||
name = "WARNING.TXT"
|
||||
msg["Content-Type"] = "text/plain; name="+name
|
||||
break
|
||||
return Milter.CONTINUE
|
||||
|
||||
import email.Iterators
|
||||
|
||||
-157
@@ -1,157 +0,0 @@
|
||||
%define __python python2.6
|
||||
%define pythonbase python
|
||||
|
||||
%define libdir %{_libdir}/pymilter
|
||||
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
|
||||
Summary: Python interface to sendmail milter API
|
||||
Name: %{pythonbase}-pymilter
|
||||
Version: 0.9.8
|
||||
Release: 1%{dist}
|
||||
Source: http://downloads.sourceforge.net/pymilter/pymilter-%{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
|
||||
# Needed for callbacks, not a core function but highly useful for milters
|
||||
BuildRequires: ed, %{pythonbase}-devel, sendmail-devel >= 8.13
|
||||
|
||||
%description
|
||||
This is a python extension module to enable python scripts to
|
||||
attach to sendmail's libmilter functionality. Additional python
|
||||
modules provide for navigating and modifying MIME parts, sending
|
||||
DSNs, and doing CBV.
|
||||
|
||||
%prep
|
||||
%setup -q -n pymilter-%{version}
|
||||
|
||||
%build
|
||||
env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%{__python} setup.py install --root=$RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/milter
|
||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/milter
|
||||
mkdir -p $RPM_BUILD_ROOT%{libdir}
|
||||
cp start.sh $RPM_BUILD_ROOT%{libdir}
|
||||
ed $RPM_BUILD_ROOT%{libdir}/start.sh <<'EOF'
|
||||
/^datadir=/
|
||||
c
|
||||
datadir="%{_localstatedir}/log/milter"
|
||||
.
|
||||
/^piddir=/
|
||||
c
|
||||
piddir="%{_localstatedir}/run/milter"
|
||||
.
|
||||
/^libdir=/
|
||||
c
|
||||
libdir="%{libdir}"
|
||||
.
|
||||
/^python=/
|
||||
c
|
||||
python="%{__python}"
|
||||
.
|
||||
w
|
||||
q
|
||||
EOF
|
||||
chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh
|
||||
|
||||
# start.sh is used by spfmilter, srsmilter, and milter, and could be used by
|
||||
# other milters using pymilter.
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc README ChangeLog NEWS TODO CREDITS sample.py milter-template.py
|
||||
%{python_sitearch}/*
|
||||
%{libdir}
|
||||
%dir %attr(0755,mail,mail) %{_localstatedir}/run/milter
|
||||
%dir %attr(0755,mail,mail) %{_localstatedir}/log/milter
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Sat Mar 9 2013 Stuart Gathman <stuart@bmsi.com> 0.9.8-1
|
||||
- Add Milter.test module for unit testing milters.
|
||||
- Fix typo that prevented setsymlist from being active.
|
||||
- Change untrapped exception message to:
|
||||
- "pymilter: untrapped exception in milter app"
|
||||
|
||||
* 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
|
||||
- Fix CNAME chain duplicating TXT records in Milter.dns (from pyspf).
|
||||
|
||||
* 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.
|
||||
|
||||
* Tue Jun 02 2009 Stuart Gathman <stuart@bmsi.com> 0.9.2-2
|
||||
- Cache callback negotiation
|
||||
|
||||
* Thu May 28 2009 Stuart Gathman <stuart@bmsi.com> 0.9.2-1
|
||||
- Add new callback support: data,negotiate,unknown
|
||||
- Auto-negotiate protocol steps
|
||||
|
||||
* Thu Feb 05 2009 Stuart Gathman <stuart@bmsi.com> 0.9.1-1
|
||||
- Fix missing address of optional param to addrcpt
|
||||
|
||||
* Wed Jan 07 2009 Stuart Gathman <stuart@bmsi.com> 0.9.0-4
|
||||
- Stop using INSTALLED_FILES to make Fedora happy
|
||||
- Remove config flag from start.sh glue
|
||||
- Own /var/log/milter
|
||||
- Use _localstatedir
|
||||
|
||||
* Wed Jan 07 2009 Stuart Gathman <stuart@bmsi.com> 0.9.0-2
|
||||
- Changes to meet Fedora standards
|
||||
|
||||
* Mon Nov 24 2008 Stuart Gathman <stuart@bmsi.com> 0.9.0-1
|
||||
- Split pymilter into its own CVS module
|
||||
- Support chgfrom and addrcpt_par
|
||||
- Support NS records in Milter.dns
|
||||
|
||||
* Mon Aug 25 2008 Stuart Gathman <stuart@bmsi.com> 0.8.10-2
|
||||
- /var/run/milter directory must be owned by mail
|
||||
|
||||
* Mon Aug 25 2008 Stuart Gathman <stuart@bmsi.com> 0.8.10-1
|
||||
- improved parsing into email and fullname (still 2 self test failures)
|
||||
- implement no-DSN CBV, reduce full DSNs
|
||||
|
||||
* Mon Sep 24 2007 Stuart Gathman <stuart@bmsi.com> 0.8.9-1
|
||||
- Use ifarch hack to build milter and milter-spf packages as noarch
|
||||
- Remove spf dependency from dsn.py, add dns.py
|
||||
|
||||
* Fri Jan 05 2007 Stuart Gathman <stuart@bmsi.com> 0.8.8-1
|
||||
- move AddrCache, parse_addr, iniplist to Milter package
|
||||
- move parse_header to Milter.utils
|
||||
- fix plock for missing source and can't change owner/group
|
||||
- split out pymilter and pymilter-spf packages
|
||||
- move milter apps to /usr/lib/pymilter
|
||||
|
||||
* Sat Nov 04 2006 Stuart Gathman <stuart@bmsi.com> 0.8.7-1
|
||||
- SPF moved to pyspf RPM
|
||||
|
||||
* Tue May 23 2006 Stuart Gathman <stuart@bmsi.com> 0.8.6-2
|
||||
- Support CBV timeout
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
# Analyze milter log to find abusers
|
||||
|
||||
fp = open('/var/log/milter/milter.log','r')
|
||||
subdict = {}
|
||||
ipdict = {}
|
||||
spamcnt = {}
|
||||
for line in fp:
|
||||
a = line.split(None,4)
|
||||
if len(a) < 4: continue
|
||||
dt,tm,id,op = a[:4]
|
||||
if op == 'Subject:':
|
||||
if len(a) > 4: subdict[id] = a[4].rstrip()
|
||||
elif op == 'connect':
|
||||
ipdict[id] = a[4].rstrip()
|
||||
elif op in ('eom','dspam'):
|
||||
if id in subdict: del subdict[id]
|
||||
if id in ipdict: del ipdict[id]
|
||||
elif op in ('REJECT:','DSPAM:','SPAM:','abort'):
|
||||
if id in subdict:
|
||||
if id in ipdict:
|
||||
ip = ipdict[id]
|
||||
del ipdict[id]
|
||||
f,host,raw = ip.split(None,2)
|
||||
if host in spamcnt:
|
||||
spamcnt[host] += 1
|
||||
else:
|
||||
spamcnt[host] = 1
|
||||
else: ip = ''
|
||||
print dt,tm,op,a[4].rstrip(),subdict[id]
|
||||
del subdict[id]
|
||||
else:
|
||||
print line.rstrip()
|
||||
print len(subdict),'leftover entries'
|
||||
|
||||
spamlist = filter(lambda x: x[1] > 1,spamcnt.items())
|
||||
spamlist.sort(lambda x,y: x[1] - y[1])
|
||||
for ip,cnt in spamlist:
|
||||
print cnt,ip
|
||||
@@ -0,0 +1,44 @@
|
||||
divert(-1)
|
||||
#
|
||||
# Copyright (c) 2002 Derek J. Balling
|
||||
# All rights reserved.
|
||||
#
|
||||
# Permission to use granted for all purposes. If modifications are made
|
||||
# they are requested to be sent to <dredd@megacity.org> for inclusion in future
|
||||
# versions
|
||||
#
|
||||
# Allows (hopefully) for checking of access.db whitelisting now. This ONLY
|
||||
# works on sendmail-8.12.x ... use on any other version may require tinkering
|
||||
# by you the downloader.
|
||||
#
|
||||
# Incorporates many changes by Sergey S. Mokryshev <mokr@mokr.net>
|
||||
#
|
||||
#
|
||||
|
||||
divert(0)
|
||||
ifdef(`_RHSBL_R_',`dnl',`dnl
|
||||
VERSIONID(`$Id$')
|
||||
define(`_RHSBL_R_',`')
|
||||
ifdef(`_DNSBL_R_',`dnl',`dnl
|
||||
LOCAL_CONFIG
|
||||
# map for DNS based blacklist lookups based on the sender RHS
|
||||
Kdnsbl host -T<TMP>')')
|
||||
divert(-1)
|
||||
define(`_RHSBL_SRV_', `_ARG_')dnl
|
||||
define(`_RHSBL_MSG_', `ifelse(len(X`'_ARG2_),`1',`"550 Mail from " $`'&{RHS} " refused by blackhole site '_RHSBL_SRV_`"',`_ARG2_')')dnl
|
||||
define(`_RHSBL_MSG_TMP_', `ifelse(_ARG3_,`t',`"451 Temporary lookup failure of " $`'&{RHS} " at '_RHSBL_SRV_`"',`_ARG3_')')dnl
|
||||
|
||||
MAILER_DEFINITIONS
|
||||
|
||||
SLocal_check_mail
|
||||
# DNS based RHS spam list blackholes.bmsi.com
|
||||
R$* $: <?> $>CanonAddr $1
|
||||
R<?> $*<@$+.> $: <?> $1<@$2.> $| $>SearchList <+ rhs> $| <F:$1@$2> <D:$2> <>
|
||||
R<?> $* $| <$={Accept}> $: OKSOFAR
|
||||
R<?> $*<@$+.> $| $* $: <?> $(dnsbl $2._RHSBL_SRV_. $: OK $) $(macro {RHS} $@ $2 $)
|
||||
R<?> OK $: OKSOFAR
|
||||
R<?> $*<@$*> $: OKSOFAR
|
||||
ifelse(len(X`'_ARG3_),`1',
|
||||
`R<?>$+<TMP> $: TMPOK',
|
||||
`R<?>$+<TMP> $#error $@ 4.7.1 $: _RHSBL_MSG_TMP_')
|
||||
R<?>$+ $#error $@ 5.7.1 $: _RHSBL_MSG_
|
||||
@@ -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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[bdist_rpm]
|
||||
python=python2.6
|
||||
python=python2
|
||||
doc_files=README NEWS TODO
|
||||
packager=Stuart D. Gathman <stuart@bmsi.com>
|
||||
release=1
|
||||
release=2.4
|
||||
|
||||
@@ -2,24 +2,23 @@ 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
|
||||
libs = ["milter", "smutil"]
|
||||
|
||||
# FIXME: on some versions of sendmail, smutil is renamed to sm.
|
||||
# On slackware and debian, leave it out entirely. It depends
|
||||
# on how libmilter was built by the sendmail package.
|
||||
#libs = ["milter", "smutil"]
|
||||
libs = ["milter"]
|
||||
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.8',
|
||||
setup(name = "milter", version = "0.8.1",
|
||||
description="Python interface to sendmail milter API",
|
||||
long_description="""\
|
||||
This is a python extension module to enable python scripts to
|
||||
attach to sendmail's libmilter functionality. Additional python
|
||||
modules provide for navigating and modifying MIME parts, and
|
||||
sending DSNs or doing CBVs.
|
||||
querying SPF records.
|
||||
""",
|
||||
author="Jim Niemira",
|
||||
author_email="urmane@urmane.org",
|
||||
@@ -27,13 +26,11 @@ sending DSNs or doing CBVs.
|
||||
maintainer_email="stuart@bmsi.com",
|
||||
license="GPL",
|
||||
url="http://www.bmsi.com/python/milter.html",
|
||||
py_modules=["mime"],
|
||||
py_modules=["mime","spf"],
|
||||
packages = ['Milter'],
|
||||
ext_modules=[
|
||||
Extension("milter", ["miltermodule.c"],
|
||||
library_dirs=libdirs,
|
||||
libraries=libs,
|
||||
# set MAX_ML_REPLY to 1 for sendmail < 8.13
|
||||
define_macros = [ ('MAX_ML_REPLY',32) ]
|
||||
),
|
||||
],
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
Subject: SPF softfail (POSSIBLE FORGERY)
|
||||
|
||||
This is an automatically generated Delivery Status Notification.
|
||||
|
||||
THIS IS A WARNING MESSAGE ONLY.
|
||||
|
||||
YOU DO *NOT* NEED TO RESEND YOUR MESSAGE.
|
||||
|
||||
Delivery to the following recipients has been delayed.
|
||||
|
||||
%(rcpt)s
|
||||
|
||||
Subject: %(subject)s
|
||||
Received-SPF: %(spf_result)s
|
||||
|
||||
Your sender policy indicated that the above email was likely forged and that
|
||||
feedback was desired.
|
||||
|
||||
If you need further assistance, please do not hesitate to contact me.
|
||||
|
||||
Kind regards,
|
||||
|
||||
postmaster@%(receiver)s
|
||||
Executable
+99
@@ -0,0 +1,99 @@
|
||||
#!/usr/bin/python2.3
|
||||
|
||||
# Author: Stuart D. Gathman <stuart@bmsi.com>
|
||||
# Copyright 2004 Business Management Systems, Inc.
|
||||
# This code is under the GNU General Public License. See COPYING for details.
|
||||
|
||||
# $Log$
|
||||
# Revision 1.1.1.1 2005/05/31 18:07:19 customdesigned
|
||||
# Release 0.6.9
|
||||
#
|
||||
# Revision 2.3 2004/04/19 22:12:11 stuart
|
||||
# Release 0.6.9
|
||||
#
|
||||
# Revision 2.2 2004/04/18 03:29:35 stuart
|
||||
# Pass most tests except -local and -rcpt-to
|
||||
#
|
||||
# Revision 2.1 2004/04/08 18:41:15 stuart
|
||||
# Reject numeric hello names
|
||||
#
|
||||
# Driver for SPF test system
|
||||
|
||||
import spf
|
||||
import sys
|
||||
|
||||
from optparse import OptionParser
|
||||
|
||||
class PerlOptionParser(OptionParser):
|
||||
def _process_args (self, largs, rargs, values):
|
||||
"""_process_args(largs : [string],
|
||||
rargs : [string],
|
||||
values : Values)
|
||||
|
||||
Process command-line arguments and populate 'values', consuming
|
||||
options and arguments from 'rargs'. If 'allow_interspersed_args' is
|
||||
false, stop at the first non-option argument. If true, accumulate any
|
||||
interspersed non-option arguments in 'largs'.
|
||||
"""
|
||||
while rargs:
|
||||
arg = rargs[0]
|
||||
# We handle bare "--" explicitly, and bare "-" is handled by the
|
||||
# standard arg handler since the short arg case ensures that the
|
||||
# len of the opt string is greater than 1.
|
||||
if arg == "--":
|
||||
del rargs[0]
|
||||
return
|
||||
elif arg[0:2] == "--":
|
||||
# process a single long option (possibly with value(s))
|
||||
self._process_long_opt(rargs, values)
|
||||
elif arg[:1] == "-" and len(arg) > 1:
|
||||
# process a single perl style long option
|
||||
rargs[0] = '-' + arg
|
||||
self._process_long_opt(rargs, values)
|
||||
elif self.allow_interspersed_args:
|
||||
largs.append(arg)
|
||||
del rargs[0]
|
||||
else:
|
||||
return
|
||||
|
||||
def format(q):
|
||||
res,code,txt = q.check()
|
||||
print res
|
||||
if res in ('pass','neutral','unknown'): print
|
||||
else: print txt
|
||||
print 'spfquery:',q.get_header_comment(res)
|
||||
print 'Received-SPF:',q.get_header(res,'spfquery')
|
||||
|
||||
def main(argv):
|
||||
parser = PerlOptionParser()
|
||||
parser.add_option("--file",dest="file")
|
||||
parser.add_option("--ip",dest="ip")
|
||||
parser.add_option("--sender",dest="sender")
|
||||
parser.add_option("--helo",dest="hello_name")
|
||||
parser.add_option("--local",dest="local_policy")
|
||||
parser.add_option("--rcpt-to",dest="rcpt")
|
||||
parser.add_option("--default-explanation",dest="explanation")
|
||||
parser.add_option("--sanitize",type="int",dest="sanitize")
|
||||
parser.add_option("--debug",type="int",dest="debug")
|
||||
opts,args = parser.parse_args(argv)
|
||||
if opts.ip:
|
||||
q = spf.query(opts.ip,opts.sender,opts.hello_name,local=opts.local_policy)
|
||||
if opts.explanation:
|
||||
q.set_default_explanation(opts.explanation)
|
||||
format(q)
|
||||
if opts.file:
|
||||
if opts.file == '0':
|
||||
fp = sys.stdin
|
||||
else:
|
||||
fp = open(opts.file,'r')
|
||||
for ln in fp:
|
||||
ip,sender,helo,rcpt = ln.split(None,3)
|
||||
q = spf.query(ip,sender,helo,local=opts.local_policy)
|
||||
if opts.explanation:
|
||||
q.set_default_explanation(opts.explanation)
|
||||
format(q)
|
||||
fp.close()
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys
|
||||
main(sys.argv[1:])
|
||||
@@ -1,19 +0,0 @@
|
||||
#!/bin/sh
|
||||
appname="$1"
|
||||
script="${2:-${appname}}"
|
||||
datadir="/var/lib/milter"
|
||||
logdir="/var/log/milter"
|
||||
piddir="/var/run/milter"
|
||||
libdir="/usr/lib/pymilter"
|
||||
python="python2.4"
|
||||
exec >>${logdir}/${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
|
||||
else
|
||||
cd ${libdir}
|
||||
fi
|
||||
|
||||
${python} ${script}.py &
|
||||
echo $! >${piddir}/${appname}.pid
|
||||
+66
@@ -0,0 +1,66 @@
|
||||
Subject: Critical mail server configuration error
|
||||
|
||||
This is an automatically generated Delivery Status Notification.
|
||||
|
||||
THIS IS A WARNING MESSAGE ONLY.
|
||||
|
||||
YOU DO *NOT* NEED TO RESEND YOUR MESSAGE.
|
||||
|
||||
Delivery to the following recipients has been delayed.
|
||||
|
||||
%(rcpt)s
|
||||
|
||||
Subject: %(subject)s
|
||||
|
||||
Someone at IP address %(connectip)s sent an email claiming
|
||||
to be from %(sender)s.
|
||||
|
||||
If that wasn't you, then your domain, %(sender_domain)s,
|
||||
was forged - i.e. used without your knowlege or authorization by
|
||||
someone attempting to steal your mail identity. This is a very
|
||||
serious problem, and you need to provide authentication for your
|
||||
SMTP (email) servers to prevent criminals from forging your
|
||||
domain. The simplest step is usually to publish an SPF record
|
||||
with your Sender Policy.
|
||||
|
||||
For more information, see: http://spf.pobox.com
|
||||
|
||||
I hate to annoy you with a DSN (Delivery Status
|
||||
Notification) from a possibly forged email, but since you
|
||||
have not published a sender policy, there is no other way
|
||||
of bringing this to your attention.
|
||||
|
||||
If it *was* you that sent the email, then your email domain
|
||||
or configuration is in error. If you don't know anything
|
||||
about mail servers, then pass this on to your SMTP (mail)
|
||||
server administrator. We have accepted the email anyway, in
|
||||
case it is important, but we couldn't find anything about
|
||||
the mail submitter at %(connectip)s to distinguish it from a
|
||||
zombie (compromised/infected computer - usually a Windows
|
||||
PC). There was no PTR record for its IP address (PTR names
|
||||
that contain the IP address don't count). RFC2821 requires
|
||||
that your hello name be a FQN (Fully Qualified domain Name,
|
||||
i.e. at least one dot) that resolves to the IP address of
|
||||
the mail sender. In addition, just like for PTR, we don't
|
||||
accept a helo name that contains the IP, since this doesn't
|
||||
help to identify you. The hello name you used,
|
||||
%(heloname)s, was invalid.
|
||||
|
||||
Furthermore, there was no SPF record for the sending domain
|
||||
%(sender_domain)s. We even tried to find its IP in any A or
|
||||
MX records for your domain, but that failed also. We really
|
||||
should reject mail from anonymous mail clients, but in case
|
||||
it is important, we are accepting it anyway.
|
||||
|
||||
We are sending you this message to alert you to the fact that
|
||||
|
||||
Either - Someone is forging your domain.
|
||||
Or - You have problems with your email configuration.
|
||||
Or - Possibly both.
|
||||
|
||||
If you need further assistance, please do not hesitate to
|
||||
contact me again.
|
||||
|
||||
Kind regards,
|
||||
|
||||
postmaster@%(receiver)s
|
||||
@@ -1,16 +1,14 @@
|
||||
import unittest
|
||||
import testbms
|
||||
import testmime
|
||||
import testsample
|
||||
import testutils
|
||||
import testgrey
|
||||
import os
|
||||
|
||||
def suite():
|
||||
s = unittest.TestSuite()
|
||||
s.addTest(testbms.suite())
|
||||
s.addTest(testmime.suite())
|
||||
s.addTest(testsample.suite())
|
||||
s.addTest(testutils.suite())
|
||||
s.addTest(testgrey.suite())
|
||||
return s
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
+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,49 +0,0 @@
|
||||
From paulp@go2net.com Wed Jun 1 22:35:12 2005
|
||||
Return-Path: <paulp@go2net.com>
|
||||
Received: from mail.bmsi.com (spidey.bmsi.com [192.168.9.81])
|
||||
by bmsred.bmsi.com (8.13.1/8.12.10) with ESMTP id j522ZCQg014058
|
||||
for <stuart@bmsred.bmsi.com>; Wed, 1 Jun 2005 22:35:12 -0400
|
||||
Received: from 127.0.0.1 ([220.117.92.241])
|
||||
by mail.bmsi.com (8.13.1/8.13.1) with ESMTP id j522Ynjm028604
|
||||
for stuart@bmsi.com; Wed, 1 Jun 2005 22:34:51 -0400
|
||||
Message-Id: <200506020234.j522Ynjm028604@mail.bmsi.com>
|
||||
SUBJECT: urgent
|
||||
FROM: paulp@go2net.com
|
||||
TO: stuart@bmsi.com
|
||||
DATE: [[ ¸ñ, 02 6 2005 ¿ÀÀü 11:34:47 ]]
|
||||
MIME-Version: 1.0
|
||||
Content-Type: multipart/mixed; boundary="--------bound--"
|
||||
X-DSpam-Score: 0.081200
|
||||
Received-SPF: neutral (mail.bmsi.com: guessing: 220.117.92.241 is neither permitted nor denied by domain of go2net.com)
|
||||
Status: RO
|
||||
X-Status:
|
||||
X-Keywords: NonJunk
|
||||
|
||||
----------bound--
|
||||
Content-Type: text/plain; charset=us-ascii
|
||||
Content-Transfer-Encoding: 7bit
|
||||
|
||||
Hi
|
||||
|
||||
Sorry, I forgot to send an important
|
||||
document to you in that last email. I had an important phone call.
|
||||
Please checkout attached doc file when you have a moment.
|
||||
|
||||
Best Regards
|
||||
|
||||
<!DSPAM:1043AE6B6492860536935410>
|
||||
|
||||
|
||||
----------bound--
|
||||
Content-Type: application/octet-stream;
|
||||
name="Readme.zip"
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Content-Disposition: attachment;
|
||||
filename="Readme.zip"
|
||||
|
||||
|
||||
----------bound--
|
||||
|
||||
|
||||
----------bound----
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
From paulp@go2net.com Wed Jun 1 22:35:12 2005
|
||||
Return-Path: <paulp@go2net.com>
|
||||
Received: from mail.bmsi.com (spidey.bmsi.com [192.168.9.81])
|
||||
by bmsred.bmsi.com (8.13.1/8.12.10) with ESMTP id j522ZCQg014058
|
||||
for <stuart@bmsred.bmsi.com>; Wed, 1 Jun 2005 22:35:12 -0400
|
||||
Received: from 127.0.0.1 ([220.117.92.241])
|
||||
by mail.bmsi.com (8.13.1/8.13.1) with ESMTP id j522Ynjm028604
|
||||
for stuart@bmsi.com; Wed, 1 Jun 2005 22:34:51 -0400
|
||||
Message-Id: <200506020234.j522Ynjm028604@mail.bmsi.com>
|
||||
SUBJECT: urgent
|
||||
FROM: paulp@go2net.com
|
||||
TO: stuart@bmsi.com
|
||||
DATE: [[ ¸ñ, 02 6 2005 ¿ÀÀü 11:34:47 ]]
|
||||
MIME-Version: 1.0
|
||||
Content-Type: multipart/mixed; boundary="--------bound--"
|
||||
X-DSpam-Score: 0.081200
|
||||
Received-SPF: neutral (mail.bmsi.com: guessing: 220.117.92.241 is neither permitted nor denied by domain of go2net.com)
|
||||
Status: RO
|
||||
X-Status:
|
||||
X-Keywords: NonJunk
|
||||
|
||||
----------bound--
|
||||
Content-Type: text/plain; charset=us-ascii
|
||||
Content-Transfer-Encoding: 7bit
|
||||
|
||||
Hi
|
||||
|
||||
Sorry, I forgot to send an important
|
||||
document to you in that last email. I had an important phone call.
|
||||
Please checkout attached doc file when you have a moment.
|
||||
|
||||
Best Regards
|
||||
|
||||
<!DSPAM:1043AE6B6492860536935410>
|
||||
|
||||
|
||||
----------bound--
|
||||
Content-Type: application/x-msdownload; name="zip.zip"
|
||||
Content-Transfer-Encoding: base64
|
||||
Content-Disposition: attachment; filename="zip.zip"
|
||||
|
||||
USsDBAoBAAAAADVVwjLaV2nEGgAAABoAAAAzABUAemlwLmRvYyAgICAgICAgICAgICAgICAg
|
||||
ICAgICAgICAgICAgICAgICAgICAgICAuZXhlVVQJAAOmGp9CphqfQlV4BACGA2UAVGhpcyBw
|
||||
cm9ncmFtIHdhcyBhIHZpcnVzLgpQSwECFwMKAAAAAAA1VcIy2ldpxBoAAAAaAAAAMwANAAAA
|
||||
AAABAAAAtIEAAAAAemlwLmRvYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
|
||||
ICAgICAuZXhlVVQFAAOmGp9CVXgAAFBLBQYAAAAAAQABAG4AAACAAAAAAAA=
|
||||
----------bound--
|
||||
|
||||
|
||||
----------bound----
|
||||
|
||||
+299
@@ -0,0 +1,299 @@
|
||||
import unittest
|
||||
import Milter
|
||||
import bms
|
||||
import mime
|
||||
import rfc822
|
||||
import StringIO
|
||||
import email
|
||||
import sys
|
||||
#import pdb
|
||||
|
||||
class TestMilter(bms.bmsMilter):
|
||||
|
||||
def __init__(self):
|
||||
bms.bmsMilter.__init__(self)
|
||||
self.logfp = open("test/milter.log","a")
|
||||
self._delrcpt = [] # record deleted rcpts for testing
|
||||
self._addrcpt = [] # record added rcpts for testing
|
||||
|
||||
def log(self,*msg):
|
||||
for i in msg: print >>self.logfp, i,
|
||||
print >>self.logfp
|
||||
|
||||
def getsymval(self,name):
|
||||
if name == 'j': return 'test.milter.org'
|
||||
return bms.bmsMilter.getsymval(self,name)
|
||||
|
||||
def replacebody(self,chunk):
|
||||
if self._body:
|
||||
self._body.write(chunk)
|
||||
self.bodyreplaced = True
|
||||
else:
|
||||
raise IOError,"replacebody not called from eom()"
|
||||
|
||||
# FIXME: rfc822 indexing does not really reflect the way chg/add header
|
||||
# work for a milter
|
||||
def chgheader(self,field,idx,value):
|
||||
if not self._body:
|
||||
raise IOError,"chgheader not called from eom()"
|
||||
self.log('chgheader: %s[%d]=%s' % (field,idx,value))
|
||||
if value == '':
|
||||
del self._msg[field]
|
||||
else:
|
||||
self._msg[field] = value
|
||||
self.headerschanged = True
|
||||
|
||||
def addheader(self,field,value):
|
||||
if not self._body:
|
||||
raise IOError,"addheader not called from eom()"
|
||||
self.log('addheader: %s=%s' % (field,value))
|
||||
self._msg[field] = value
|
||||
self.headerschanged = True
|
||||
|
||||
def delrcpt(self,rcpt):
|
||||
if not self._body:
|
||||
raise IOError,"delrcpt not called from eom()"
|
||||
self._delrcpt.append(rcpt)
|
||||
|
||||
def addrcpt(self,rcpt):
|
||||
if not self._body:
|
||||
raise IOError,"addrcpt not called from eom()"
|
||||
self._addrcpt.append(rcpt)
|
||||
|
||||
def setreply(self,rcode,xcode,msg):
|
||||
self.reply = (rcode,xcode,msg)
|
||||
|
||||
def feedFile(self,fp,sender="spam@adv.com",rcpt="victim@lamb.com"):
|
||||
self._body = None
|
||||
self.bodyreplaced = False
|
||||
self.headerschanged = False
|
||||
self.reply = None
|
||||
msg = rfc822.Message(fp)
|
||||
rc = self.envfrom('<%s>'%sender)
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
rc = self.envrcpt('<%s>'%rcpt)
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
line = None
|
||||
for h in msg.headers:
|
||||
if h[:1].isspace():
|
||||
line = line + h
|
||||
continue
|
||||
if not line:
|
||||
line = h
|
||||
continue
|
||||
s = line.split(': ',1)
|
||||
if len(s) > 1: val = s[1].strip()
|
||||
else: val = ''
|
||||
rc = self.header(s[0],val)
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
line = h
|
||||
if line:
|
||||
s = line.split(': ',1)
|
||||
rc = self.header(s[0],s[1])
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
rc = self.eoh()
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
while 1:
|
||||
buf = fp.read(8192)
|
||||
if len(buf) == 0: break
|
||||
rc = self.body(buf)
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
self._msg = msg
|
||||
self._body = StringIO.StringIO()
|
||||
rc = self.eom()
|
||||
if self.bodyreplaced:
|
||||
body = self._body.getvalue()
|
||||
else:
|
||||
msg.rewindbody()
|
||||
body = msg.fp.read()
|
||||
self._body = StringIO.StringIO()
|
||||
self._body.writelines(msg.headers)
|
||||
self._body.write('\n')
|
||||
self._body.write(body)
|
||||
return rc
|
||||
|
||||
def feedMsg(self,fname,sender="spam@adv.com",rcpt="victim@lamb.com"):
|
||||
fp = open('test/'+fname,'r')
|
||||
rc = self.feedFile(fp,sender,rcpt)
|
||||
fp.close()
|
||||
return rc
|
||||
|
||||
def connect(self,host='localhost'):
|
||||
self._body = None
|
||||
self.bodyreplaced = False
|
||||
rc = bms.bmsMilter.connect(self,host,1,('1.2.3.4',1234))
|
||||
if rc != Milter.CONTINUE and rc != Milter.ACCEPT:
|
||||
self.close()
|
||||
return rc
|
||||
rc = self.hello('spamrelay')
|
||||
if rc != Milter.CONTINUE:
|
||||
self.close()
|
||||
return rc
|
||||
|
||||
class BMSMilterTestCase(unittest.TestCase):
|
||||
|
||||
def testDefang(self,fname='virus1'):
|
||||
milter = TestMilter()
|
||||
rc = milter.connect('testDefang')
|
||||
self.assertEqual(rc,Milter.CONTINUE)
|
||||
rc = milter.feedMsg(fname)
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
fp = milter._body
|
||||
open('test/'+fname+".tstout","w").write(fp.getvalue())
|
||||
#self.failUnless(fp.getvalue() == open("test/virus1.out","r").read())
|
||||
fp.seek(0)
|
||||
msg = mime.message_from_file(fp)
|
||||
str = msg.get_payload(1).get_payload()
|
||||
milter.log(str)
|
||||
milter.close()
|
||||
|
||||
# test some spams that crashed our parser
|
||||
def testParse(self,fname='spam7'):
|
||||
milter = TestMilter()
|
||||
milter.connect('testParse')
|
||||
rc = milter.feedMsg(fname)
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failIf(milter.bodyreplaced,"Milter needlessly replaced body.")
|
||||
fp = milter._body
|
||||
open('test/'+fname+".tstout","w").write(fp.getvalue())
|
||||
milter.connect('pro-send.com')
|
||||
rc = milter.feedMsg('spam8')
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failIf(milter.bodyreplaced,"Milter needlessly replaced body.")
|
||||
rc = milter.feedMsg('bounce')
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failIf(milter.bodyreplaced,"Milter needlessly replaced body.")
|
||||
rc = milter.feedMsg('bounce1')
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failIf(milter.bodyreplaced,"Milter needlessly replaced body.")
|
||||
milter.close()
|
||||
|
||||
def testDefang2(self):
|
||||
milter = TestMilter()
|
||||
milter.connect('testDefang2')
|
||||
rc = milter.feedMsg('samp1')
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failIf(milter.bodyreplaced,"Milter needlessly replaced body.")
|
||||
rc = milter.feedMsg("virus3")
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
fp = milter._body
|
||||
open("test/virus3.tstout","w").write(fp.getvalue())
|
||||
#self.failUnless(fp.getvalue() == open("test/virus3.out","r").read())
|
||||
rc = milter.feedMsg("virus6")
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
self.failUnless(milter.headerschanged,"Message headers not adjusted")
|
||||
fp = milter._body
|
||||
open("test/virus6.tstout","w").write(fp.getvalue())
|
||||
milter.close()
|
||||
|
||||
def testDefang3(self):
|
||||
milter = TestMilter()
|
||||
milter.connect('testDefang3')
|
||||
# test script removal on complex HTML attachment
|
||||
rc = milter.feedMsg('amazon')
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
fp = milter._body
|
||||
open("test/amazon.tstout","w").write(fp.getvalue())
|
||||
# test defanging Klez virus
|
||||
rc = milter.feedMsg("virus13")
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
fp = milter._body
|
||||
open("test/virus13.tstout","w").write(fp.getvalue())
|
||||
# test script removal on quoted-printable HTML attachment
|
||||
# sgmllib can't handle the <![if cond]> syntax
|
||||
rc = milter.feedMsg('spam44')
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failIf(milter.bodyreplaced,"Message body replaced")
|
||||
fp = milter._body
|
||||
open("test/spam44.tstout","w").write(fp.getvalue())
|
||||
milter.close()
|
||||
|
||||
def testRFC822(self):
|
||||
milter = TestMilter()
|
||||
milter.connect('testRFC822')
|
||||
# test encoded rfc822 attachment
|
||||
#pdb.set_trace()
|
||||
rc = milter.feedMsg('test8')
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
# python2.4 doesn't scan encoded message attachments
|
||||
if sys.hexversion < 0x02040000:
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
#self.failIf(milter.bodyreplaced,"Message body replaced")
|
||||
fp = milter._body
|
||||
open("test/test8.tstout","w").write(fp.getvalue())
|
||||
rc = milter.feedMsg('virus7')
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
#self.failIf(milter.bodyreplaced,"Message body replaced")
|
||||
fp = milter._body
|
||||
open("test/virus7.tstout","w").write(fp.getvalue())
|
||||
|
||||
def testSmartAlias(self):
|
||||
milter = TestMilter()
|
||||
milter.connect('testSmartAlias')
|
||||
# test smart alias feature
|
||||
key = ('foo@bar.com','baz@bat.com')
|
||||
bms.smart_alias[key] = ['ham@eggs.com']
|
||||
rc = milter.feedMsg('test8',key[0],key[1])
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
self.failUnless(milter._delrcpt == ['<baz@bat.com>'])
|
||||
self.failUnless(milter._addrcpt == ['<ham@eggs.com>'])
|
||||
# python2.4 email does not decode message attachments, so script
|
||||
# is not replaced
|
||||
if sys.hexversion < 0x02040000:
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
|
||||
def testBadBoundary(self):
|
||||
milter = TestMilter()
|
||||
milter.connect('testBadBoundary')
|
||||
# test rfc822 attachment with invalid boundaries
|
||||
#pdb.set_trace()
|
||||
rc = milter.feedMsg('bound')
|
||||
if sys.hexversion < 0x02040000:
|
||||
# python2.4 adds invalid boundaries to decects list and makes
|
||||
# payload a str
|
||||
self.assertEqual(rc,Milter.REJECT)
|
||||
self.assertEqual(milter.reply[0],'554')
|
||||
#self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
self.failIf(milter.bodyreplaced,"Message body replaced")
|
||||
fp = milter._body
|
||||
open("test/bound.tstout","w").write(fp.getvalue())
|
||||
|
||||
def testCompoundFilename(self):
|
||||
milter = TestMilter()
|
||||
milter.connect('testCompoundFilename')
|
||||
# test rfc822 attachment with invalid boundaries
|
||||
#pdb.set_trace()
|
||||
rc = milter.feedMsg('test1')
|
||||
self.assertEqual(rc,Milter.ACCEPT)
|
||||
#self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
self.failIf(milter.bodyreplaced,"Message body replaced")
|
||||
fp = milter._body
|
||||
open("test/test1.tstout","w").write(fp.getvalue())
|
||||
|
||||
# def testReject(self):
|
||||
# "Test content based spam rejection."
|
||||
# milter = TestMilter()
|
||||
# milter.connect('gogo-china.com')
|
||||
# rc = milter.feedMsg('big5');
|
||||
# self.failUnless(rc == Milter.REJECT)
|
||||
# milter.close();
|
||||
|
||||
def suite(): return unittest.makeSuite(BMSMilterTestCase,'test')
|
||||
|
||||
if __name__ == '__main__':
|
||||
if len(sys.argv) > 1:
|
||||
for fname in sys.argv[1:]:
|
||||
milter = TestMilter()
|
||||
milter.connect('main')
|
||||
fp = open(fname,'r')
|
||||
rc = milter.feedFile(fp)
|
||||
fp = milter._body
|
||||
sys.stdout.write(fp.getvalue())
|
||||
else:
|
||||
unittest.main()
|
||||
-55
@@ -1,55 +0,0 @@
|
||||
import unittest
|
||||
import doctest
|
||||
import os
|
||||
#from Milter.greylist import Greylist
|
||||
from Milter.greysql import Greylist
|
||||
|
||||
class GreylistTestCase(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.fname = 'test.db'
|
||||
os.remove(self.fname)
|
||||
|
||||
def tearDown(self):
|
||||
#os.remove(self.fname)
|
||||
pass
|
||||
|
||||
def testGrey(self):
|
||||
grey = Greylist(self.fname)
|
||||
# first time
|
||||
rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com')
|
||||
self.assertEqual(rc,0)
|
||||
# not in window yet
|
||||
rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com',timeinc=5*60)
|
||||
self.assertEqual(rc,0)
|
||||
# within window
|
||||
rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com',timeinc=15*60)
|
||||
self.assertEqual(rc,1)
|
||||
# new triple
|
||||
rc = grey.check('1.2.3.5','foo@bar.com','baz@spat.com',timeinc=15*60)
|
||||
self.assertEqual(rc,0)
|
||||
# seen again
|
||||
rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com',timeinc=5*3600)
|
||||
self.assertEqual(rc,2)
|
||||
# new one past expire
|
||||
rc = grey.check('1.2.3.5','foo@bar.com','baz@spat.com',timeinc=6*3600)
|
||||
self.assertEqual(rc,0)
|
||||
# original past retain
|
||||
rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com',timeinc=37*24*3600)
|
||||
self.assertEqual(rc,0)
|
||||
# new one for testing expire
|
||||
rc = grey.check('1.2.3.5','flub@bar.com','baz@spat.com',timeinc=20*24*3600)
|
||||
self.assertEqual(rc,0)
|
||||
grey.close()
|
||||
# test cleanup
|
||||
grey = Greylist(self.fname)
|
||||
rc = grey.clean(timeinc=37*24*3600)
|
||||
self.assertEqual(rc,1)
|
||||
grey.close()
|
||||
|
||||
def suite():
|
||||
s = unittest.makeSuite(GreylistTestCase,'test')
|
||||
return s
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.TextTestRunner().run(suite())
|
||||
-42
@@ -1,13 +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.
|
||||
#
|
||||
# Revision 1.2 2005/06/02 15:00:17 customdesigned
|
||||
# Configure banned extensions. Scan zipfile option with test case.
|
||||
#
|
||||
@@ -32,7 +23,6 @@ import socket
|
||||
import StringIO
|
||||
import email
|
||||
import sys
|
||||
import Milter
|
||||
from email import Errors
|
||||
|
||||
samp1_txt1 = """Dear Agent 1
|
||||
@@ -140,44 +130,12 @@ class MimeTestCase(unittest.TestCase):
|
||||
|
||||
def testZip(self,vname="zip1",fname='zip.zip'):
|
||||
self.testDefang(vname,1,'zip.zip')
|
||||
# test scan_zip flag
|
||||
msg = mime.message_from_file(open('test/'+vname,"r"))
|
||||
mime.defang(msg,scan_zip=False)
|
||||
self.failIf(msg.ismodified())
|
||||
# test ignoring empty zip (often found in DSNs)
|
||||
msg = mime.message_from_file(open('test/zip2','r'))
|
||||
mime.defang(msg,scan_zip=True)
|
||||
self.failIf(msg.ismodified())
|
||||
# test corrupt zip (often an EXE named as a ZIP)
|
||||
self.testDefang('zip3',1,'zip.zip')
|
||||
# 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)
|
||||
|
||||
+94
-10
@@ -4,12 +4,96 @@ import sample
|
||||
import mime
|
||||
import rfc822
|
||||
import StringIO
|
||||
from Milter.test import TestBase
|
||||
|
||||
class TestMilter(TestBase,sample.sampleMilter):
|
||||
class TestMilter(sample.sampleMilter):
|
||||
|
||||
def __init__(self):
|
||||
TestBase.__init__(self)
|
||||
sample.sampleMilter.__init__(self)
|
||||
self.logfp = open("test/milter.log","a")
|
||||
|
||||
def log(self,*msg):
|
||||
for i in msg: print >>self.logfp, i,
|
||||
print >>self.logfp
|
||||
|
||||
def replacebody(self,chunk):
|
||||
if self._body:
|
||||
self._body.write(chunk)
|
||||
self.bodyreplaced = True
|
||||
else:
|
||||
raise IOError,"replacebody not called from eom()"
|
||||
|
||||
# FIXME: rfc822 indexing does not really reflect the way chg/add header
|
||||
# work for a milter
|
||||
def chgheader(self,field,idx,value):
|
||||
self.log('chgheader: %s[%d]=%s' % (field,idx,value))
|
||||
if value == '':
|
||||
del self._msg[field]
|
||||
else:
|
||||
self._msg[field] = value
|
||||
self.headerschanged = True
|
||||
|
||||
def addheader(self,field,value):
|
||||
self.log('addheader: %s=%s' % (field,value))
|
||||
self._msg[field] = value
|
||||
self.headerschanged = True
|
||||
|
||||
def feedMsg(self,fname):
|
||||
self._body = None
|
||||
self.bodyreplaced = False
|
||||
self.headerschanged = 0
|
||||
fp = open('test/'+fname,'r')
|
||||
msg = rfc822.Message(fp)
|
||||
rc = self.envfrom('<spam@advertisements.com>')
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
rc = self.envrcpt('<victim@lamb.com>')
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
line = None
|
||||
for h in msg.headers:
|
||||
if h[:1].isspace():
|
||||
line = line + h
|
||||
continue
|
||||
if not line:
|
||||
line = h
|
||||
continue
|
||||
s = line.split(': ',1)
|
||||
rc = self.header(s[0],s[1].strip())
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
line = h
|
||||
if line:
|
||||
s = line.split(': ',1)
|
||||
rc = self.header(s[0],s[1])
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
rc = self.eoh()
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
while 1:
|
||||
buf = fp.read(8192)
|
||||
if len(buf) == 0: break
|
||||
rc = self.body(buf)
|
||||
if rc != Milter.CONTINUE: return rc
|
||||
self._msg = msg
|
||||
self._body = StringIO.StringIO()
|
||||
rc = self.eom()
|
||||
if self.bodyreplaced:
|
||||
body = self._body.getvalue()
|
||||
else:
|
||||
msg.rewindbody()
|
||||
body = msg.fp.read()
|
||||
self._body = StringIO.StringIO()
|
||||
self._body.writelines(msg.headers)
|
||||
self._body.write('\n')
|
||||
self._body.write(body)
|
||||
return rc
|
||||
|
||||
def connect(self,host='localhost'):
|
||||
self._body = None
|
||||
self.bodyreplaced = False
|
||||
rc = sample.sampleMilter.connect(self,host,1,0)
|
||||
if rc != Milter.CONTINUE and rc != Milter.ACCEPT:
|
||||
self.close()
|
||||
return rc
|
||||
rc = self.hello('spamrelay')
|
||||
if rc != Milter.CONTINUE:
|
||||
self.close()
|
||||
return rc
|
||||
|
||||
class BMSMilterTestCase(unittest.TestCase):
|
||||
|
||||
@@ -19,7 +103,7 @@ class BMSMilterTestCase(unittest.TestCase):
|
||||
self.failUnless(rc == Milter.CONTINUE)
|
||||
rc = milter.feedMsg(fname)
|
||||
self.failUnless(rc == Milter.ACCEPT)
|
||||
self.failUnless(milter._bodyreplaced,"Message body not replaced")
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
fp = milter._body
|
||||
open('test/'+fname+".tstout","w").write(fp.getvalue())
|
||||
#self.failUnless(fp.getvalue() == open("test/virus1.out","r").read())
|
||||
@@ -34,7 +118,7 @@ class BMSMilterTestCase(unittest.TestCase):
|
||||
milter.connect('somehost')
|
||||
rc = milter.feedMsg(fname)
|
||||
self.failUnless(rc == Milter.ACCEPT)
|
||||
self.failIf(milter._bodyreplaced,"Milter needlessly replaced body.")
|
||||
self.failIf(milter.bodyreplaced,"Milter needlessly replaced body.")
|
||||
fp = milter._body
|
||||
open('test/'+fname+".tstout","w").write(fp.getvalue())
|
||||
milter.close()
|
||||
@@ -44,17 +128,17 @@ class BMSMilterTestCase(unittest.TestCase):
|
||||
milter.connect('somehost')
|
||||
rc = milter.feedMsg('samp1')
|
||||
self.failUnless(rc == Milter.ACCEPT)
|
||||
self.failIf(milter._bodyreplaced,"Milter needlessly replaced body.")
|
||||
self.failIf(milter.bodyreplaced,"Milter needlessly replaced body.")
|
||||
rc = milter.feedMsg("virus3")
|
||||
self.failUnless(rc == Milter.ACCEPT)
|
||||
self.failUnless(milter._bodyreplaced,"Message body not replaced")
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
fp = milter._body
|
||||
open("test/virus3.tstout","w").write(fp.getvalue())
|
||||
#self.failUnless(fp.getvalue() == open("test/virus3.out","r").read())
|
||||
rc = milter.feedMsg("virus6")
|
||||
self.failUnless(rc == Milter.ACCEPT)
|
||||
self.failUnless(milter._bodyreplaced,"Message body not replaced")
|
||||
self.failUnless(milter._headerschanged,"Message headers not adjusted")
|
||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||
self.failUnless(milter.headerschanged,"Message headers not adjusted")
|
||||
fp = milter._body
|
||||
open("test/virus6.tstout","w").write(fp.getvalue())
|
||||
milter.close()
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
import unittest
|
||||
import doctest
|
||||
import os
|
||||
import Milter.utils
|
||||
from Milter.cache import AddrCache
|
||||
from Milter.dynip import is_dynip
|
||||
|
||||
class AddrCacheTestCase(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.fname = 'test.dat'
|
||||
|
||||
def tearDown(self):
|
||||
os.remove(self.fname)
|
||||
|
||||
def testAdd(self):
|
||||
cache = AddrCache(fname=self.fname)
|
||||
cache['foo@bar.com'] = None
|
||||
cache.addperm('baz@bar.com')
|
||||
cache['temp@bar.com'] = 'testing'
|
||||
self.failUnless(cache.has_key('foo@bar.com'))
|
||||
self.failUnless(not cache.has_key('hello@bar.com'))
|
||||
self.failUnless('baz@bar.com' in cache)
|
||||
self.assertEquals(cache['temp@bar.com'],'testing')
|
||||
s = open(self.fname).readlines()
|
||||
self.failUnless(len(s) == 2)
|
||||
self.failUnless(s[0].startswith('foo@bar.com '))
|
||||
self.assertEquals(s[1].strip(),'baz@bar.com')
|
||||
# check that new result overrides old
|
||||
cache['temp@bar.com'] = None
|
||||
self.failUnless(not cache['temp@bar.com'])
|
||||
|
||||
def testDomain(self):
|
||||
fp = open(self.fname,'w')
|
||||
print >>fp,'spammer.com'
|
||||
fp.close()
|
||||
cache = AddrCache(fname=self.fname)
|
||||
cache.load(self.fname,30)
|
||||
self.failUnless('spammer.com' in cache)
|
||||
|
||||
def suite():
|
||||
s = unittest.makeSuite(AddrCacheTestCase,'test')
|
||||
s.addTest(doctest.DocTestSuite(Milter.utils))
|
||||
s.addTest(doctest.DocTestSuite(Milter.dynip))
|
||||
return s
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.TextTestRunner().run(suite())
|
||||
Reference in New Issue
Block a user