Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 cvs2svn
|
b7ce19d71a | ||
|
Stuart Gathman
|
9fb3ad70d4 | ||
|
Stuart Gathman
|
20fb6efab0 | ||
|
Stuart Gathman
|
16dea6e187 | ||
|
Stuart Gathman
|
802dc01c84 |
@@ -0,0 +1,340 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 2, June 1991
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The licenses for most software are designed to take away your
|
||||||
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
License is intended to guarantee your freedom to share and change free
|
||||||
|
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 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
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
this service if you wish), that you receive source code or can get it
|
||||||
|
if you want it, that you can change the software or use pieces of it
|
||||||
|
in new free programs; and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
anyone to deny you these rights or to ask you to surrender the rights.
|
||||||
|
These restrictions translate to certain responsibilities for you if you
|
||||||
|
distribute copies of the software, or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must give the recipients all the rights that
|
||||||
|
you have. You must make sure that they, too, receive or can get the
|
||||||
|
source code. And you must show them these terms so they know their
|
||||||
|
rights.
|
||||||
|
|
||||||
|
We protect your rights with two steps: (1) copyright the software, and
|
||||||
|
(2) offer you this license which gives you legal permission to copy,
|
||||||
|
distribute and/or modify the software.
|
||||||
|
|
||||||
|
Also, for each author's protection and ours, we want to make certain
|
||||||
|
that everyone understands that there is no warranty for this free
|
||||||
|
software. If the software is modified by someone else and passed on, we
|
||||||
|
want its recipients to know that what they have is not the original, so
|
||||||
|
that any problems introduced by others will not reflect on the original
|
||||||
|
authors' reputations.
|
||||||
|
|
||||||
|
Finally, any free program is threatened constantly by software
|
||||||
|
patents. We wish to avoid the danger that redistributors of a free
|
||||||
|
program will individually obtain patent licenses, in effect making the
|
||||||
|
program proprietary. To prevent this, we have made it clear that any
|
||||||
|
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
|
||||||
|
|
||||||
|
0. This License applies to any program or other work which contains
|
||||||
|
a notice placed by the copyright holder saying it may be distributed
|
||||||
|
under the terms of this General Public License. The "Program", below,
|
||||||
|
refers to any such program or work, and a "work based on the Program"
|
||||||
|
means either the Program or any derivative work under copyright law:
|
||||||
|
that is to say, a work containing the Program or a portion of it,
|
||||||
|
either verbatim or with modifications and/or translated into another
|
||||||
|
language. (Hereinafter, translation is included without limitation in
|
||||||
|
the term "modification".) Each licensee is addressed as "you".
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running the Program is not restricted, and the output from the Program
|
||||||
|
is covered only if its contents constitute a work based on the
|
||||||
|
Program (independent of having been made by running the Program).
|
||||||
|
Whether that is true depends on what the Program does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Program's
|
||||||
|
source code as you receive it, in any medium, provided that you
|
||||||
|
conspicuously and appropriately publish on each copy an appropriate
|
||||||
|
copyright notice and disclaimer of warranty; keep intact all the
|
||||||
|
notices that refer to this License and to the absence of any warranty;
|
||||||
|
and give any other recipients of the Program a copy of this License
|
||||||
|
along with the Program.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy, and
|
||||||
|
you may at your option offer warranty protection in exchange for a fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Program or any portion
|
||||||
|
of it, thus forming a work based on the Program, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) You must cause the modified files to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
b) You must cause any work that you distribute or publish, that in
|
||||||
|
whole or in part contains or is derived from the Program or any
|
||||||
|
part thereof, to be licensed as a whole at no charge to all third
|
||||||
|
parties under the terms of this License.
|
||||||
|
|
||||||
|
c) If the modified program normally reads commands interactively
|
||||||
|
when run, you must cause it, when started running for such
|
||||||
|
interactive use in the most ordinary way, to print or display an
|
||||||
|
announcement including an appropriate copyright notice and a
|
||||||
|
notice that there is no warranty (or else, saying that you provide
|
||||||
|
a warranty) and that users may redistribute the program under
|
||||||
|
these conditions, and telling the user how to view a copy of this
|
||||||
|
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
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Program, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Program.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Program
|
||||||
|
with the Program (or with a work based on the Program) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may copy and distribute the Program (or a work based on it,
|
||||||
|
under Section 2) in object code or executable form under the terms of
|
||||||
|
Sections 1 and 2 above provided that you also do one of the following:
|
||||||
|
|
||||||
|
a) Accompany it with the complete corresponding machine-readable
|
||||||
|
source code, which must be distributed under the terms of Sections
|
||||||
|
1 and 2 above on a medium customarily used for software interchange; or,
|
||||||
|
|
||||||
|
b) Accompany it with a written offer, valid for at least three
|
||||||
|
years, to give any third party, for a charge no more than your
|
||||||
|
cost of physically performing source distribution, a complete
|
||||||
|
machine-readable copy of the corresponding source code, to be
|
||||||
|
distributed under the terms of Sections 1 and 2 above on a medium
|
||||||
|
customarily used for software interchange; or,
|
||||||
|
|
||||||
|
c) Accompany it with the information you received as to the offer
|
||||||
|
to distribute corresponding source code. (This alternative is
|
||||||
|
allowed only for noncommercial distribution and only if you
|
||||||
|
received the program in object code or executable form with such
|
||||||
|
an offer, in accord with Subsection b above.)
|
||||||
|
|
||||||
|
The source code for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For an executable work, complete source
|
||||||
|
code means all the source code for all modules it contains, plus any
|
||||||
|
associated interface definition files, plus the scripts used to
|
||||||
|
control compilation and installation of the executable. However, as a
|
||||||
|
special exception, the source code distributed need not include
|
||||||
|
anything that is normally distributed (in either source or binary
|
||||||
|
form) with the major components (compiler, kernel, and so on) of the
|
||||||
|
operating system on which the executable runs, unless that component
|
||||||
|
itself accompanies the executable.
|
||||||
|
|
||||||
|
If distribution of executable or object code is made by offering
|
||||||
|
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
|
||||||
|
void, and will automatically terminate your rights under this License.
|
||||||
|
However, parties who have received copies, or rights, from you under
|
||||||
|
this License will not have their licenses terminated so long as such
|
||||||
|
parties remain in full compliance.
|
||||||
|
|
||||||
|
5. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Program or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Program (or any work based on the
|
||||||
|
Program), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Program or works based on it.
|
||||||
|
|
||||||
|
6. Each time you redistribute the Program (or any work based on the
|
||||||
|
Program), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute or modify the Program subject to
|
||||||
|
these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties to
|
||||||
|
this License.
|
||||||
|
|
||||||
|
7. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Program at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Program by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Program.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under
|
||||||
|
any particular circumstance, the balance of the section is intended to
|
||||||
|
apply and the section as a whole is intended to apply in other
|
||||||
|
circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system, which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
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
|
||||||
|
may add an explicit geographical distribution limitation excluding
|
||||||
|
those countries, so that distribution is permitted only in or among
|
||||||
|
countries not thus excluded. In such case, this License incorporates
|
||||||
|
the limitation as if written in the body of this License.
|
||||||
|
|
||||||
|
9. The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Program
|
||||||
|
specifies a version number of this License which applies to it and "any
|
||||||
|
later version", you have the option of following the terms and conditions
|
||||||
|
either of that version or of any later version published by the Free
|
||||||
|
Software Foundation. If the Program does not specify a version number of
|
||||||
|
this License, you may choose any version ever published by the Free Software
|
||||||
|
Foundation.
|
||||||
|
|
||||||
|
10. If you wish to incorporate parts of the Program into other free
|
||||||
|
programs whose distribution conditions are different, write to the author
|
||||||
|
to ask for permission. For software which is copyrighted by the Free
|
||||||
|
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||||
|
make exceptions for this. Our decision will be guided by the two goals
|
||||||
|
of preserving the free status of all derivatives of our free software and
|
||||||
|
of promoting the sharing and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||||
|
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||||
|
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||||
|
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||||
|
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||||
|
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||||
|
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||||
|
REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||||
|
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||||
|
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||||
|
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||||
|
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||||
|
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
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
convey the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program is interactive, make it output a short notice like this
|
||||||
|
when it starts in an interactive mode:
|
||||||
|
|
||||||
|
Gnomovision version 69, Copyright (C) year name of author
|
||||||
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, the commands you use may
|
||||||
|
be called something other than `show w' and `show c'; they could even be
|
||||||
|
mouse-clicks or menu items--whatever suits your program.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or your
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||||
|
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||||
|
|
||||||
|
<signature of Ty Coon>, 1 April 1989
|
||||||
|
Ty Coon, President of Vice
|
||||||
|
|
||||||
|
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 Library General
|
||||||
|
Public License instead of this License.
|
||||||
@@ -9,6 +9,9 @@ Other contributors:
|
|||||||
|
|
||||||
Terence Way
|
Terence Way
|
||||||
for providing a Python port of SPF
|
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
|
Alexander Kourakos
|
||||||
for plugging several memory leaks
|
for plugging several memory leaks
|
||||||
George Graf at Vienna University of Economics and Business Administration
|
George Graf at Vienna University of Economics and Business Administration
|
||||||
@@ -22,6 +25,9 @@ John Draper
|
|||||||
then pointing out that it would be easier to just write the MTA in Python.
|
then pointing out that it would be easier to just write the MTA in Python.
|
||||||
Eric S. Johansson
|
Eric S. Johansson
|
||||||
for helpful design discussions while working on camram
|
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
|
Business Management Systems - http://www.bmsi.com
|
||||||
for hosting the website, and providing paying clients who need milter service
|
for hosting the website, and providing paying clients who need milter service
|
||||||
so I can work on it as part of my day job.
|
so I can work on it as part of my day job.
|
||||||
|
|||||||
@@ -8,14 +8,20 @@ include testsample.py
|
|||||||
include testmime.py
|
include testmime.py
|
||||||
include testbms.py
|
include testbms.py
|
||||||
include testdspam.py
|
include testdspam.py
|
||||||
|
include rejects.py
|
||||||
include bms.py
|
include bms.py
|
||||||
include spf.py
|
include spf.py
|
||||||
|
include cid2spf.py
|
||||||
include spfquery.py
|
include spfquery.py
|
||||||
include test.py
|
include test.py
|
||||||
include sample.py
|
include sample.py
|
||||||
include test/*
|
include test/*
|
||||||
|
include Milter/*.py
|
||||||
include *.spec
|
include *.spec
|
||||||
include start.sh
|
include start.sh
|
||||||
include milter.rc
|
include milter.rc
|
||||||
include milter.rc7
|
include milter.rc7
|
||||||
include milter.cfg
|
include milter.cfg
|
||||||
|
include rhsbl.m4
|
||||||
|
include softfail.txt
|
||||||
|
include strike3.txt
|
||||||
|
|||||||
@@ -8,15 +8,12 @@ import milter
|
|||||||
import thread
|
import thread
|
||||||
|
|
||||||
from milter import ACCEPT,CONTINUE,REJECT,DISCARD,TEMPFAIL, \
|
from milter import ACCEPT,CONTINUE,REJECT,DISCARD,TEMPFAIL, \
|
||||||
set_flags, setdbg, \
|
set_flags, setdbg, setbacklog, settimeout, \
|
||||||
ADDHDRS, CHGBODY, ADDRCPT, DELRCPT, CHGHDRS, \
|
ADDHDRS, CHGBODY, ADDRCPT, DELRCPT, CHGHDRS, \
|
||||||
V1_ACTS, V2_ACTS, CURR_ACTS
|
V1_ACTS, V2_ACTS, CURR_ACTS
|
||||||
|
|
||||||
try:
|
try: from milter import QUARANTINE
|
||||||
from milter import QUARANTINE
|
except: pass
|
||||||
except:
|
|
||||||
#print 'No QUARANTINE support'
|
|
||||||
pass
|
|
||||||
|
|
||||||
_seq_lock = thread.allocate_lock()
|
_seq_lock = thread.allocate_lock()
|
||||||
_seq = 0
|
_seq = 0
|
||||||
@@ -100,8 +97,10 @@ class Milter:
|
|||||||
def getsymval(self,sym):
|
def getsymval(self,sym):
|
||||||
return self.__ctx.getsymval(sym)
|
return self.__ctx.getsymval(sym)
|
||||||
|
|
||||||
def setreply(self,rcode,xcode,msg):
|
# If sendmail does not support setmlreply, then only the
|
||||||
return self.__ctx.setreply(rcode,xcode,msg)
|
# 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.
|
# Milter methods which can only be called from eom callback.
|
||||||
def addheader(self,field,value):
|
def addheader(self,field,value):
|
||||||
@@ -119,6 +118,8 @@ class Milter:
|
|||||||
def replacebody(self,body):
|
def replacebody(self,body):
|
||||||
return self.__ctx.replacebody(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):
|
def quarantine(self,reason):
|
||||||
return self.__ctx.quarantine(reason)
|
return self.__ctx.quarantine(reason)
|
||||||
|
|
||||||
|
|||||||
Executable
+220
@@ -0,0 +1,220 @@
|
|||||||
|
# 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.
|
||||||
|
|
||||||
|
# A thin OO wrapper for the milter module
|
||||||
|
|
||||||
|
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 dictfromlist(args):
|
||||||
|
"Convert ESMTP parm list to keyword dictionary."
|
||||||
|
kw = {}
|
||||||
|
for s in args:
|
||||||
|
pos = s.find('=')
|
||||||
|
if pos > 0:
|
||||||
|
kw[s[:pos].upper()] = s[pos+1:]
|
||||||
|
return kw
|
||||||
|
|
||||||
|
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
|
||||||
|
ESMTP parameters as python keyword parameters."""
|
||||||
|
kw = {}
|
||||||
|
pargs = [args[0]]
|
||||||
|
for s in args[1:]:
|
||||||
|
pos = s.find('=')
|
||||||
|
if pos > 0:
|
||||||
|
kw[s[:pos].upper()] = s[pos+1:]
|
||||||
|
else:
|
||||||
|
pargs.append(s)
|
||||||
|
return c(*pargs,**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))
|
||||||
|
# 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
|
||||||
|
# arbitrary keywords without crashing. We do provide envcallback and
|
||||||
|
# dictfromlist to make parsing the ESMTP args convenient.
|
||||||
|
milter.set_envfrom_callback(lambda ctx,*str: ctx.getpriv().envfrom(*str))
|
||||||
|
milter.set_envrcpt_callback(lambda ctx,*str: 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")
|
||||||
|
|
||||||
|
__all__ = globals().copy()
|
||||||
|
for priv in ('os','milter','thread','factory','_seq','_seq_lock'):
|
||||||
|
del __all__[priv]
|
||||||
|
__all__ = __all__.keys()
|
||||||
+188
@@ -0,0 +1,188 @@
|
|||||||
|
# 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.
|
||||||
|
|
||||||
|
# Send DSNs, do call back verification,
|
||||||
|
# and generate DSN messages from a template
|
||||||
|
|
||||||
|
import smtplib
|
||||||
|
import spf
|
||||||
|
import socket
|
||||||
|
from email.Message import Message
|
||||||
|
|
||||||
|
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.split('@')
|
||||||
|
q = spf.query(None,None,None)
|
||||||
|
mxlist = q.dns(domain,'MX')
|
||||||
|
if not mxlist:
|
||||||
|
mxlist = (0,domain),
|
||||||
|
else:
|
||||||
|
mxlist.sort()
|
||||||
|
smtp = smtplib.SMTP()
|
||||||
|
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
|
||||||
|
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('<>',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: <>')
|
||||||
|
if code != 250:
|
||||||
|
raise smtplib.SMTPSenderRefused(code, resp, '<>')
|
||||||
|
code,resp = smtp.rcpt(mailfrom)
|
||||||
|
if code not in (250,251):
|
||||||
|
return (code,resp) # permanent error
|
||||||
|
smtp.quit()
|
||||||
|
return None # success
|
||||||
|
except smtplib.SMTPRecipientsRefused,x:
|
||||||
|
return x.recipients[mailfrom] # permanent error
|
||||||
|
except smtplib.SMTPSenderRefused,x:
|
||||||
|
return x.args[:2] # does not accept DSN
|
||||||
|
except smtplib.SMTPDataError,x:
|
||||||
|
return x.args # permanent error
|
||||||
|
except smtplib.SMTPException:
|
||||||
|
pass # any other error, try next MX
|
||||||
|
except socket.error:
|
||||||
|
pass # MX didn't accept connections, try next one
|
||||||
|
smtp.close()
|
||||||
|
return (450,'No MX servers available') # temp error
|
||||||
|
|
||||||
|
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:
|
||||||
|
spf_result = origmsg['Received-SPF']
|
||||||
|
if not spf_result.startswith('softfail'):
|
||||||
|
spf_result = None
|
||||||
|
except: spf_result = None
|
||||||
|
|
||||||
|
msg = Message()
|
||||||
|
|
||||||
|
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')
|
||||||
|
|
||||||
|
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 % locals()).strip())
|
||||||
|
msg.set_payload(body % locals())
|
||||||
|
|
||||||
|
return msg
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
q = spf.query('192.168.9.50',
|
||||||
|
'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.bmsi.com',msg.as_string())
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
# 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.
|
||||||
|
|
||||||
|
# Heuristically determine whether a domain name is for a dynamic IP.
|
||||||
|
|
||||||
|
# examples we don't yet recognize:
|
||||||
|
#
|
||||||
|
# wiley-268-8196.roadrunner.nf.net at ('205.251.174.46', 4810)
|
||||||
|
# cbl-sd-02-79.aster.com.do at ('200.88.62.79', 4153)
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
|
ip3 = re.compile('[0-9]{1,3}')
|
||||||
|
hpats = (
|
||||||
|
'h[0-9a-f]{12}[.]',
|
||||||
|
'h\d*n\d*c\d*o\d*\.',
|
||||||
|
'pcp\d{6,10}pcs[.]',
|
||||||
|
'no-reverse',
|
||||||
|
'S[0-9a-f]{16}[.][a-z]{2}[.]',
|
||||||
|
'user<3>\.',
|
||||||
|
'[Cc]ust<3>\.',
|
||||||
|
'^<3>\.',
|
||||||
|
'ppp[^.]*<3>\.',
|
||||||
|
'-ppp\d*\.',
|
||||||
|
'\d*-<3>\.',
|
||||||
|
'[0-9a-f]{1,3}-<3>\.',
|
||||||
|
'p<3>\.pool',
|
||||||
|
'h<3>\.',
|
||||||
|
'xdsl-\d*\.',
|
||||||
|
'-\d*-\d*\.',
|
||||||
|
'\.adsl\.',
|
||||||
|
'\.cable\.'
|
||||||
|
)
|
||||||
|
rehmac = re.compile('|'.join(hpats))
|
||||||
|
|
||||||
|
def is_dynip(host,addr):
|
||||||
|
"""Return True if hostname is for a dynamic ip.
|
||||||
|
Examples:
|
||||||
|
|
||||||
|
>>> is_dynip('post3.fabulousdealz.com','69.60.99.112')
|
||||||
|
False
|
||||||
|
>>> is_dynip('adsl-69-208-201-177.dsl.emhril.ameritech.net','69.208.201.177')
|
||||||
|
True
|
||||||
|
>>> is_dynip('[1.2.3.4]','1.2.3.4')
|
||||||
|
True
|
||||||
|
"""
|
||||||
|
if host.startswith('[') and host.endswith(']'):
|
||||||
|
return True
|
||||||
|
if addr:
|
||||||
|
if host.find(addr) >= 0: return True
|
||||||
|
a = addr.split('.')
|
||||||
|
ia = map(int,a)
|
||||||
|
h = host
|
||||||
|
m = ip3.findall(host)
|
||||||
|
if m:
|
||||||
|
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
|
||||||
|
if g[-2:] == ia[2:]: return True
|
||||||
|
g.reverse()
|
||||||
|
if g[:3] in ia3: return True
|
||||||
|
if g[:2] == ia[2:]: return True
|
||||||
|
if ia[2:] in (g[:2],g[-2:]): return True
|
||||||
|
for m in ip3.finditer(host):
|
||||||
|
if int(m.group()) == ia[3]:
|
||||||
|
h = host[:m.start()] + '<3>' + host[m.end():]
|
||||||
|
break
|
||||||
|
if rehmac.search(h): return True
|
||||||
|
if host.find(''.join(a[:3])) >= 0: return True
|
||||||
|
if host.find(''.join(a[1:])) >= 0: return True
|
||||||
|
x = "%02x%02x%02x%02x" % tuple(ia)
|
||||||
|
if host.lower().find(x) >= 0: return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
import fileinput
|
||||||
|
import sets
|
||||||
|
seen = sets.Set()
|
||||||
|
for ln in fileinput.input():
|
||||||
|
a = ln.split()
|
||||||
|
if a[3:5] == ['connect','from']:
|
||||||
|
host = a[5]
|
||||||
|
if host.startswith('[') and host.endswith(']'):
|
||||||
|
continue # no PTR
|
||||||
|
ip = a[7][2:-2]
|
||||||
|
if ip in seen: continue
|
||||||
|
seen.add(ip)
|
||||||
|
if is_dynip(host,ip):
|
||||||
|
print '%s\t%s DYN' % (ip,host)
|
||||||
|
else:
|
||||||
|
print '%s\t%s' % (ip,host)
|
||||||
@@ -1,5 +1,43 @@
|
|||||||
Here is a history of user visible changes to Python milter.
|
Here is a history of user visible changes to Python milter.
|
||||||
|
|
||||||
|
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
|
||||||
|
Fix inconsistent results from send_dsn
|
||||||
|
0.8.0 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.
|
||||||
|
Properly log pydspam exceptions
|
||||||
|
0.7.3 Experimental release with python2.4 support
|
||||||
|
0.7.2 Return unknown for invalid ip address in mechanism
|
||||||
|
Recognize dynamic PTR names, and don't count them as authentication.
|
||||||
|
Three strikes and yer out rule.
|
||||||
|
Block softfail by default when no PTR or HELO
|
||||||
|
Return unknown for null mechanism
|
||||||
|
Try best guess on HELO also
|
||||||
|
Expand setreply for common errors
|
||||||
|
make rhsbl.m4 hack available for sendmail.mc
|
||||||
|
0.7.1 Handle modifying mislabeled multipart messages without an exception
|
||||||
|
Support setbacklog, setmlreply
|
||||||
|
Allow multi-recipient CBV
|
||||||
|
Return TEMPFAIL for SPF softfail
|
||||||
|
0.7.0 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
|
||||||
0.6.9 Reject invalid SRS immediately for benefit of callback verifiers
|
0.6.9 Reject invalid SRS immediately for benefit of callback verifiers
|
||||||
Fix include bug in spf.py
|
Fix include bug in spf.py
|
||||||
Fix check_header bug
|
Fix check_header bug
|
||||||
|
|||||||
@@ -92,7 +92,6 @@ milter. This milter's socket is a unix-domain socket in the filesystem.
|
|||||||
See libmilter/README for the definitive list of options.
|
See libmilter/README for the definitive list of options.
|
||||||
NB: The name is specified in two places: here, in sendmail's cf file, and
|
NB: The name is specified in two places: here, in sendmail's cf file, and
|
||||||
in the milter itself. Make sure the two match.
|
in the milter itself. Make sure the two match.
|
||||||
NB: OpenBSD must use an inet socket. See the web page for details.
|
|
||||||
NB: The above lines can be added in your .mc file with this line:
|
NB: The above lines can be added in your .mc file with this line:
|
||||||
|
|
||||||
INPUT_MAIL_FILTER(`pythonfilter', `S=local:/home/username/pythonsock')
|
INPUT_MAIL_FILTER(`pythonfilter', `S=local:/home/username/pythonsock')
|
||||||
@@ -124,16 +123,6 @@ and headers at
|
|||||||
|
|
||||||
http://www.bmsi.com/linux/sendmail-rh72.spec
|
http://www.bmsi.com/linux/sendmail-rh72.spec
|
||||||
|
|
||||||
OpenBSD Notes
|
|
||||||
-------------
|
|
||||||
|
|
||||||
Sendmail is broken on OpenBSD for unix domain sockets. You must use an
|
|
||||||
inet socket for milter. The sendmail.cf 'X' config line would look like:
|
|
||||||
|
|
||||||
Xpythonfilter, S=inet:1234@localhost
|
|
||||||
|
|
||||||
and the sample milter needs to be modified accordingly.
|
|
||||||
|
|
||||||
IPv6 Notes
|
IPv6 Notes
|
||||||
----------
|
----------
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,40 @@
|
|||||||
|
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
|
Web admin interface
|
||||||
RHBL
|
|
||||||
Check valid domains allowed by internal senders to detect PCs infected
|
Check valid domains allowed by internal senders to detect PCs infected
|
||||||
with spam trojans.
|
with spam trojans.
|
||||||
Do CBV (callback verification) for mail with no published SPF record.
|
Do CBV (callback verification) for mail with no published SPF record.
|
||||||
message log for automated stats and blacklisting
|
message log for automated stats and blacklisting
|
||||||
adapt init script to work on RH9
|
|
||||||
Skip dspam when SPF pass?
|
Skip dspam when SPF pass?
|
||||||
Report 551 with rcpt on SPF fail?
|
Report 551 with rcpt on SPF fail?
|
||||||
check spam keywords with character classes, e.g.
|
check spam keywords with character classes, e.g.
|
||||||
@@ -48,3 +78,4 @@ Wrap smfi_setbacklog(int) - but it is only available in sendmail >= 8.12.3,
|
|||||||
Need a test module to feed sample messages to a milter though a live
|
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,
|
sendmail and SMTP. The mockup currently used is probably not very accurate,
|
||||||
and doesn't test the threading code.
|
and doesn't test the threading code.
|
||||||
|
|
||||||
|
|||||||
+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)
|
||||||
@@ -72,6 +72,9 @@ milter-0.4.5 or later to remove this dependency.
|
|||||||
<code>set_flags()</code> before calling <code>runmilter()</code>. For
|
<code>set_flags()</code> before calling <code>runmilter()</code>. For
|
||||||
instance, <code>Milter.set_flags(Milter.ADDRCPT)</code>. You must add together
|
instance, <code>Milter.set_flags(Milter.ADDRCPT)</code>. You must add together
|
||||||
all of <code>ADDHDRS, CHGBODY, ADDRCPT, DELRCPT, CHGHDRS</code> that apply.
|
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>
|
<p>
|
||||||
|
|
||||||
<li> Q. Why does sendmail sometimes print something like:
|
<li> Q. Why does sendmail sometimes print something like:
|
||||||
@@ -94,14 +97,19 @@ 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
|
code out of the sample as the project evolves. Think of sample.py as
|
||||||
an active config file.
|
an active config file.
|
||||||
<p>
|
<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?
|
<li> Q. Why does sendmail coredump with milters on OpenBSD?
|
||||||
<p> A. Sendmail has a problem with unix sockets on OpenBSD. Use
|
<p> A. Sendmail has a problem with unix sockets on old versions of OpenBSD.
|
||||||
an internet domain socket instead. For example, in <code>sendmail.cf</code> use
|
Use an internet domain socket instead. For example, in
|
||||||
|
<code>sendmail.cf</code> use
|
||||||
<pre>
|
<pre>
|
||||||
Xpythonfilter, S=inet:1234@localhost
|
Xpythonfilter, S=inet:1234@localhost
|
||||||
</pre>
|
</pre>
|
||||||
and change sample.py accordingly.
|
and change sample.py accordingly.
|
||||||
|
<p> OpenBSD users report that this problem has been fixed.
|
||||||
<p>
|
<p>
|
||||||
|
|
||||||
<li> Q. How can I change the bounce message for an invalid recipient?
|
<li> Q. How can I change the bounce message for an invalid recipient?
|
||||||
@@ -133,6 +141,57 @@ is a milter declaration for sendmail.cf with all timeouts specified:
|
|||||||
<pre>
|
<pre>
|
||||||
Xpythonfilter, S=local:/var/log/milter/pythonsock, F=T, T=C:5m;S:20s;R:60s;E:5m
|
Xpythonfilter, S=local:/var/log/milter/pythonsock, F=T, T=C:5m;S:20s;R:60s;E:5m
|
||||||
</pre>
|
</pre>
|
||||||
|
<li> Q. There is a Python traceback in the log file! What happened to
|
||||||
|
my email?
|
||||||
|
<p> A. When the milter fails with an untrapped exception, a TEMPFAIL
|
||||||
|
result (451) is returned to the sender. The sender will then retry every
|
||||||
|
hour or so for several days. Hopefully, someone will notice the
|
||||||
|
traceback, and workaround or fix the problem.
|
||||||
|
|
||||||
|
<li> Q. I read some notes such as "Check valid domains allowed by internal
|
||||||
|
senders to detect PCs infected with spam trojans." but could not
|
||||||
|
understand the idea. Could you clarify the content ?
|
||||||
|
|
||||||
|
<p> A. The <code>internal_domains</code> configuration specifies which
|
||||||
|
MAIL FROM domains are used by internal connections. If an internal
|
||||||
|
PC tries to use some other domain, it is assumed to be a "Zombie".
|
||||||
|
<p>
|
||||||
|
Here is a sample log line:
|
||||||
|
<pre>
|
||||||
|
2005Jun22 12:01:04 [12430] REJECT: zombie PC at 192.168.100.171 sending MAIL FROM debby@fedex.com
|
||||||
|
</pre>
|
||||||
|
No, fedex.com does not use pymilter, and there is no one named debby at my
|
||||||
|
client. But the idiot using the PC at 192.168.100.171 has downloaded and
|
||||||
|
installed some stupid weatherbar/hotbar/aquariumscreensaver that is actually a
|
||||||
|
spam bot.
|
||||||
|
<p>
|
||||||
|
The <code>internal_domains</code> option is simplistic, it assumes all
|
||||||
|
valid senders of the domains are internal. SPF provides a much more general
|
||||||
|
check of IP and MAIL FROM for external email. Pymilter should soon
|
||||||
|
have a local policy feature for more general checking of internal mail.
|
||||||
|
|
||||||
|
<h3> Using SPF </h3>
|
||||||
|
|
||||||
|
<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>
|
</ol>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
+77
-35
@@ -1,63 +1,96 @@
|
|||||||
# features intended to filter or block incoming mail
|
|
||||||
[milter]
|
[milter]
|
||||||
;socket=/var/log/milter/pythonsock
|
# 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
|
tempdir = /var/log/milter/save
|
||||||
|
# how long to wait for a response from sendmail before giving up
|
||||||
;timeout=600
|
;timeout=600
|
||||||
|
|
||||||
scan_rfc822 = 1
|
|
||||||
# can be CPU intensive
|
|
||||||
scan_html = 0
|
|
||||||
# reject asian fonts because we can't read them
|
|
||||||
block_chinese = 1
|
|
||||||
# users who hate forwarded mail
|
|
||||||
;block_forward = egghead@mycorp.com, busybee@mycorp.com
|
|
||||||
log_headers = 0
|
log_headers = 0
|
||||||
# Reject mail for domains mentioned unless user is mentioned here also
|
|
||||||
;check_user = joe@mycorp.com, mary@mycorp.com, file:bigcorp.com
|
|
||||||
# porn words are case insensitive
|
|
||||||
porn_words = penis, breast, pussy, horse cock, porn, xenical, diet pill, d1ck,
|
|
||||||
vi*gra, vi-a-gra, viag, tits, p0rn, hunza, horny, sexy, c0ck,
|
|
||||||
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, v|c0d1n, phentermine, en1arge, dip1oma, v1codin
|
|
||||||
# spam words are case sensitive
|
|
||||||
spam_words = $$$, !!!, XXX, FREE, HGH
|
|
||||||
|
|
||||||
# connection ips and hostnames are matched against this glob style list
|
# connection ips and hostnames are matched against this glob style list
|
||||||
# to recognize internal senders
|
# to recognize internal senders.
|
||||||
;internal_connect = 192.168.*.*
|
;internal_connect = 192.168.*.*
|
||||||
|
|
||||||
# mail that is not an internal_connect and claims to be from an
|
# mail that is not an internal_connect and claims to be from an
|
||||||
# internal domain is rejected.
|
# 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
|
;internal_domains = mycorp.com
|
||||||
|
|
||||||
# connections from a trusted relay can trust the first Received header
|
# 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
|
;trusted_relay = 1.2.3.4, 66.12.34.56
|
||||||
# reject external senders with hello names no legit external sender would use
|
|
||||||
|
# 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
|
;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, adv1t
|
||||||
|
# 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]
|
[srs]
|
||||||
config=/etc/mail/pysrs.cfg
|
config=/etc/mail/pysrs.cfg
|
||||||
|
# SRS options can be set here also, but must match the sendmail plugin
|
||||||
;secret="shhhh!"
|
;secret="shhhh!"
|
||||||
;maxage=21
|
;maxage=21
|
||||||
;hashlength=4
|
;hashlength=4
|
||||||
;database=/var/log/milter/srsdata
|
;database=/var/log/milter/srsdata
|
||||||
;fwdomain = mydomain.com
|
;fwdomain = mydomain.com
|
||||||
# turn this on after a grace period
|
# turn this on after a grace period to reject spoofed DSNs
|
||||||
reject_spoofed = 0
|
reject_spoofed = 0
|
||||||
|
|
||||||
|
# See http://spf.pobox.com for more info on SPF.
|
||||||
[spf]
|
[spf]
|
||||||
# namespace where SPF records can be supplied for domains without one
|
# namespace where SPF records can be supplied for domains without one
|
||||||
# records are search for under _spf.domain.com
|
# records are searched for under _spf.domain.com
|
||||||
;delegate = domain.com
|
;delegate = domain.com
|
||||||
# domains where a neutral SPF result should cause mail to be rejected
|
# domains where a neutral SPF result should cause mail to be rejected
|
||||||
;reject_neutral = aol.com
|
;reject_neutral = aol.com
|
||||||
# use a default (v=spf1 a/24 mx/24 ptr) when no SPF records are published
|
# use a default (v=spf1 a/24 mx/24 ptr) when no SPF records are published
|
||||||
;best_guess = 0
|
;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
|
# features intended to clean up outgoing mail
|
||||||
[scrub]
|
[scrub]
|
||||||
# domains that stupidly block visible private nodes
|
# domains that block visible private nodes
|
||||||
;hide_path = jcpenney.com
|
;hide_path = jcpenney.com
|
||||||
# block, don't just replace with warning, viruses from these domains
|
# reject, don't just replace with warning, viruses from these domains
|
||||||
;reject_virus_from = mycorp.com
|
;reject_virus_from = mycorp.com
|
||||||
|
|
||||||
# features intended for spying on users and coworkers
|
# features intended for spying on users and coworkers
|
||||||
@@ -85,18 +118,24 @@ blind = 1
|
|||||||
# additional copies can be added
|
# additional copies can be added
|
||||||
;walter1 = cust@othercorp.com,walter@bigcorp.com,boss@bigcorp.com,
|
;walter1 = cust@othercorp.com,walter@bigcorp.com,boss@bigcorp.com,
|
||||||
; walter@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]
|
[dspam]
|
||||||
# Select a well moderated dspam dictionary to reject spammy headers
|
# Select a well moderated dspam dictionary to reject spammy headers.
|
||||||
# dspam-python must be installed to use: http://bmsi.com/python/dspam.html
|
# To filter on the entire message, use the full setup below.
|
||||||
# only EXTERNAL messages are dspam filtered
|
# only EXTERNAL messages are dspam filtered
|
||||||
;dspam_dict=/var/lib/dspam/moderator.dict
|
;dspam_dict=/var/lib/dspam/moderator.dict
|
||||||
|
|
||||||
# Opt-opt recipients from dspam screening and header triage
|
# Opt-opt recipients from dspam screening and header triage
|
||||||
;dspam_exempt=getitall@mycorp.com
|
;dspam_exempt=getitall@mycorp.com
|
||||||
# Do not scan mail (ostensibly) from these senders
|
# Do not scan mail (ostensibly) from these senders
|
||||||
;dspam_whitelist=getitall@sender.com
|
;dspam_whitelist=getitall@sender.com
|
||||||
# Reject spam to these domains, perhaps because we are a backup MX server
|
# Reject spam to these domains instead of quarantining it.
|
||||||
;dspam_reject=othercorp.com
|
;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
|
# directory for dspam user quarantine, signature db, and dictionaries
|
||||||
# defining this activates the dspam application
|
# defining this activates the dspam application
|
||||||
@@ -113,8 +152,11 @@ blind = 1
|
|||||||
;spam=spam@foocorp.com
|
;spam=spam@foocorp.com
|
||||||
# address to forward false positives to. milter will process and not deliver
|
# address to forward false positives to. milter will process and not deliver
|
||||||
;falsepositive=ham@foocorp.com
|
;falsepositive=ham@foocorp.com
|
||||||
# the dspam_screener is used to screen mail for all recipients who are
|
# account which receives only spam: all received messages are marked as spam.
|
||||||
# not dspam_users. Spam goes to the screeners quarantine, and the original
|
;honeypot=spam-me@example.com
|
||||||
# recipients saved so that false positives can be properly delivered.
|
# 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
|
# The dspam CGI can also be used: logins must match dspam users
|
||||||
|
|||||||
+123
-270
@@ -13,8 +13,8 @@ ALT="Viewable With Any Browser" BORDER="0"></A>
|
|||||||
usemap="#banner_4" alt="Your vote?">
|
usemap="#banner_4" alt="Your vote?">
|
||||||
<map name="banner_4">
|
<map name="banner_4">
|
||||||
<area shape="rect" coords="330,25,426,59"
|
<area shape="rect" coords="330,25,426,59"
|
||||||
href="http://www.sepschool.org/survey/" alt="I Disagree">
|
href="http://education-survey.org/" alt="I Disagree">
|
||||||
<area shape="rect" coords="234,28,304,57" href="http://sepschool.org/" alt="I Agree">
|
<area shape="rect" coords="234,28,304,57" href="http://www.honestEd.com/" alt="I Agree">
|
||||||
</map>
|
</map>
|
||||||
|
|
||||||
</P>
|
</P>
|
||||||
@@ -24,12 +24,16 @@ ALT="Viewable With Any Browser" BORDER="0"></A>
|
|||||||
Stuart D. Gathman</a><br>
|
Stuart D. Gathman</a><br>
|
||||||
This web page is written by Stuart D. Gathman<br>and<br>sponsored by
|
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>
|
<a href="http://www.bmsi.com">Business Management Systems, Inc.</a> <br>
|
||||||
Last updated Apr 21, 2004</h4>
|
Last updated Jun 09, 2005</h4>
|
||||||
|
|
||||||
See the <a href="faq.html">FAQ</a> | <a href="#download">Download now</a> |
|
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="/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>
|
<p>
|
||||||
<img src="python55.gif" align=left alt="A Python">
|
<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="//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 -
|
<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>
|
libmilter. The milter module for <a href="//www.python.org">Python</a>
|
||||||
@@ -37,30 +41,107 @@ provides a python interface to libmilter that exploits all its features.
|
|||||||
<p>
|
<p>
|
||||||
Sendmail 8.12 officially releases libmilter.
|
Sendmail 8.12 officially releases libmilter.
|
||||||
Version 8.12 seems to be more robust, and includes new privilege
|
Version 8.12 seems to be more robust, and includes new privilege
|
||||||
separation features to enhance security.
|
separation features to enhance security. Even better, sendmail 8.13
|
||||||
I recommend upgrading.
|
supports socket maps, which makes <a href="pysrs.html">pysrs</a> much more
|
||||||
|
efficient and secure. I recommend upgrading.
|
||||||
|
|
||||||
<h2> <a name=dspam>Bayesian Filtering</a> </h2>
|
<h2> Recent Changes </h2>
|
||||||
|
|
||||||
I have selected the <a href="http://www.nuclearelephant.com/projects/dspam/">
|
Python milter is being moved to
|
||||||
dspam bayes filter project</a> and <a href="dspam.html">
|
<a href="http://sourceforge.net/projects/pymilter/">pymilter Sourceforge
|
||||||
packaged it for python</a>.
|
project</a> for development.
|
||||||
Release 0.6.6 adds support for <a href="http://spf.pobox.com/">SPF</a>,
|
<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://openspf.com">
|
||||||
|
<img src="SPF.gif" align=left alt="SPF logo"></a>
|
||||||
|
Release 0.6.6 adds support for <a href="http://openspf.com/">SPF</a>,
|
||||||
a protocol to prevent forging of the envelope from address.
|
a protocol to prevent forging of the envelope from address.
|
||||||
SPF support requires <a href="http://pydns.sourceforge.net/">pydns</a>.
|
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
|
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>.
|
version at <a href="http://www.wayforward.net/spf/">wayforward.net</a>.
|
||||||
The updated version tracks the draft RFC and test suite.
|
The updated version tracks the draft RFC and test suite.
|
||||||
<p>
|
<p>
|
||||||
Release 0.6.0 offers a simple application of dspam I call "header triage",
|
The FAQ addresses <a href="faq.html#spf">how to get started with SPF</a>.
|
||||||
which rejects messages with spammy headers. Since sendmail has to
|
|
||||||
read the entire message anyway once we start reading headers, it
|
|
||||||
would probably be better to scan the whole message - except that
|
|
||||||
we replace dangerous attachments elsewhere in the milter - which screws up the
|
|
||||||
body statistics for messages with dangerous attachments.
|
|
||||||
<p>
|
<p>
|
||||||
Release 0.6.1 adds a full milter based dspam application.
|
Release 0.6.1 adds a full milter based dspam application.
|
||||||
<p>
|
<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,
|
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
|
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
|
lots of spam. That dictionary can be used to block spam that is
|
||||||
@@ -109,7 +190,7 @@ 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
|
mail should be copied. How should "outgoing" be defined? Implementing it is
|
||||||
easy once the configuration is designed.
|
easy once the configuration is designed.
|
||||||
|
|
||||||
<h3>Overview</h3>
|
<h3><a name=overview>Overview</a></h3>
|
||||||
|
|
||||||
This package provides a robust toolkit for Python <a
|
This package provides a robust toolkit for Python <a
|
||||||
href="#milter">milters</a>, and the beginnings of a general purpose mail
|
href="#milter">milters</a>, and the beginnings of a general purpose mail
|
||||||
@@ -141,244 +222,24 @@ methods that
|
|||||||
do nothing, and also provides wrappers for the libmilter methods to mutate
|
do nothing, and also provides wrappers for the libmilter methods to mutate
|
||||||
the message.
|
the message.
|
||||||
<p>
|
<p>
|
||||||
|
The 'spf' module provides an implementation of <a href="http://openspf.com">
|
||||||
|
SPF</a> useful for detecting email forgery.
|
||||||
|
<p>
|
||||||
|
The 'mime' module provides a wrapper for the Python email package that
|
||||||
|
fixes some bugs, and simplifies modifying selected parts of a MIME message.
|
||||||
|
<p>
|
||||||
Finally, the bms.py application is both a sample of how to use the
|
Finally, the bms.py application is both a sample of how to use the
|
||||||
Milter module, and the beginnings of a general purpose SPAM filtering,
|
Milter and spf modules, and the beginnings of a general purpose SPAM filtering,
|
||||||
wiretapping, and Win32 virus protection milter.
|
wiretapping, SPF checking, and Win32 virus protecting milter. It can
|
||||||
|
make use of the <a href="pysrs.html">pysrs</a> package when available for
|
||||||
<h3><a name=download>Downloading</a></h3>
|
SRS/SES checking and the <a href="dspam.html">pydspam</a> package for Bayesian
|
||||||
|
content filtering. SPF checking
|
||||||
The latest stable release is <a href="#stable">0.6.9</a>. A stable
|
requires <a href="http://pydns.sourceforge.net/">
|
||||||
release is one which has been installed (and working correctly) on
|
pydns</a>. Configuration documentation is currently included as comments
|
||||||
production systems long enough to convince me that it is stable. As
|
in the <a href="milter.cfg">sample config file</a> for the bms.py milter.
|
||||||
the package gains more features and complexity, stable will mean no
|
|
||||||
bug reports from outside users either.
|
|
||||||
<p>
|
|
||||||
The latest version is 0.6.9-1. See the <a href=NEWS>Change Log</a>.
|
|
||||||
<p>
|
|
||||||
<a name="stable"><b>Stable</b></a>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.9.tar.gz">
|
|
||||||
milter-0.6.9.tar.gz</a> Add SPF test suite driver, and validate
|
|
||||||
spf.py against test suite. Add best_guess and get_header to spf.py.
|
|
||||||
Libmilter timeout option in config.
|
|
||||||
<br>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.9-1.i386.rpm">
|
|
||||||
milter-0.6.9-1.i386.rpm</a> Binary RPM for Redhat 7.x, now requires
|
|
||||||
sendmail-8.12 and <a href="http://www.python.org/2.3.3/rpms.html">
|
|
||||||
python2.3</a>.
|
|
||||||
<br>
|
|
||||||
<a href="http://bmsi.com/linux/rh9/milter-0.6.9-1.src.rpm">
|
|
||||||
milter-0.6.9-1.src.rpm</a> Source RPM for Redhat 9,7.x.
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.8.tar.gz">
|
|
||||||
milter-0.6.8.tar.gz</a> Include Received-SPF headers in Dspam analysis.
|
|
||||||
Fix sysv init for Redhat 9 and later. Reject bounces with multiple
|
|
||||||
recipients.
|
|
||||||
<br>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.8.patch">milter-0.6.8.patch</a>
|
|
||||||
Last minutes fixes from production testing.
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.8-3.i386.rpm">
|
|
||||||
milter-0.6.8-3.i386.rpm</a> Binary RPM for Redhat 7.x, now requires
|
|
||||||
sendmail-8.12 and <a href="http://www.python.org/2.3.3/rpms.html">
|
|
||||||
python2.3</a>.
|
|
||||||
<br>
|
|
||||||
<a href="http://bmsi.com/linux/rh9/milter-0.6.8-3.src.rpm">
|
|
||||||
milter-0.6.8-3.src.rpm</a> Source RPM for Redhat 9,7.x.
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.7.tar.gz">
|
|
||||||
milter-0.6.7.tar.gz</a> Explicit local socket bug,
|
|
||||||
<a href="http://spf.pobox.com/srs.html">SRS</a> forgery detection,
|
|
||||||
thread resource starvation detection.
|
|
||||||
SRS support requires <a href="http://bmsi.com/python/pysrs.html">pysrs</a>.
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.7-3.i386.rpm">
|
|
||||||
milter-0.6.7-3.i386.rpm</a> Binary RPM for Redhat 7.x, now requires
|
|
||||||
sendmail-8.12 and <a href="http://www.python.org/2.3.3/rpms.html">
|
|
||||||
python2.3</a>.
|
|
||||||
<br>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.7-3.src.rpm">
|
|
||||||
milter-0.6.7-3.src.rpm</a> Source RPM for Redhat 7.x.
|
|
||||||
Release 0.6.7-3 patches:
|
|
||||||
<ul>
|
|
||||||
<li> Defang message/rfc822 content_type with boundary
|
|
||||||
<li> Support SPF delegation
|
|
||||||
<li> Reject neutral SPF result for selected domains
|
|
||||||
</ul>
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.6.tar.gz">
|
|
||||||
milter-0.6.6.tar.gz</a> Plug another memory leak,
|
|
||||||
<a href="http://spf.pobox.com/">SPF</a> support, hello blacklist.
|
|
||||||
SPF support requires <a href="http://pydns.sourceforge.net/">pydns</a>.
|
|
||||||
NOTE - the spf.py module included is modified from the official 1.6
|
|
||||||
version at <a href="http://www.wayforward.net/spf/">wayforward.net</a>.
|
|
||||||
I neglected to add the CVS log. The changes are expanded result codes
|
|
||||||
and tolerating common method misspellings in SPF records. I have notified the
|
|
||||||
author, but haven't heard back. At some point, the RPM will
|
|
||||||
include the official pyspf tarball and apply patches.
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.6-2.i386.rpm">
|
|
||||||
milter-0.6.6-2.i386.rpm</a> Binary RPM for Redhat 7.x, now requires
|
|
||||||
sendmail-8.12 and <a href="http://www.python.org/2.3.3/rpms.html">
|
|
||||||
python2.3</a>. Release 2 fixes sysv init script bug for python2.3.
|
|
||||||
<br>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.6-2.src.rpm">
|
|
||||||
milter-0.6.6-2.src.rpm</a> Source RPM for Redhat 7.x
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.5.tar.gz">
|
|
||||||
milter-0.6.5.tar.gz</a> Plug memory leak, progress reporting, trusted relay.
|
|
||||||
Redhat RPM now requires sendmail-8.12.
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.5-2.i386.rpm">
|
|
||||||
milter-0.6.5-2.i386.rpm</a> Binary RPM for Redhat 7.x
|
|
||||||
<br>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.5-2.src.rpm">
|
|
||||||
milter-0.6.5-2.src.rpm</a> Source RPM for Redhat 7.x
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.4.tar.gz">
|
|
||||||
milter-0.6.4.tar.gz</a> Numerous Dspam fixes. Requires
|
|
||||||
<a href="dspam.html">pydspam-1.1.5</a> and
|
|
||||||
<a href="/libdspam/dspam.html">dspam-2.6.5.2</a>
|
|
||||||
for Dspam features. The dspam-python RPM has been replaced by pydspam.
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.4-1.i386.rpm">
|
|
||||||
milter-0.6.4-1.i386.rpm</a> Binary RPM for Redhat 7.x
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.3.1.tar.gz">
|
|
||||||
milter-0.6.3.1.tar.gz</a> New dspam SCREENER feature with pydspam-1.1.4.
|
|
||||||
Don't save a defang copy of false positives. Fixed an oops from last fix,
|
|
||||||
rejecting false positives. BUG: sendmail-8.11 doesn't invoke milter
|
|
||||||
when sending mail via sendmail from command line (8.12 works). Therefore,
|
|
||||||
the supplied falsepositive script for milter based dspam doesn't work
|
|
||||||
with stock RedHat 7.x. I am writing a HOWTO for configuring milter
|
|
||||||
based dspam that will address this (and a fix in the next version).
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.3-1.i386.rpm">
|
|
||||||
milter-0.6.3-1.i386.rpm</a> Binary RPM for Redhat 7.x
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.2.tar.gz">
|
|
||||||
milter-0.6.2.tar.gz</a> work around email.Message.get_filename bug,
|
|
||||||
dspam_exempt list, REJECT messages with missing MIME boundaries (which
|
|
||||||
are almost always spam),
|
|
||||||
DISCARD messages which any dspam user flags as spam,
|
|
||||||
start.sh was calling python instead of python2 on Linux.
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.2-1.src.rpm">
|
|
||||||
milter-0.6.2-1.src.rpm</a> Source RPM for Redhat 7.x (and likely
|
|
||||||
higher versions)
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.1.tar.gz">
|
|
||||||
milter-0.6.1.tar.gz</a> dspam milter application, python-2.2.3 support.
|
|
||||||
<p>
|
|
||||||
You must have <a href=dspam.html>dspam and dspam-python</a> loaded for
|
|
||||||
the dspam feature to work. Brief instructions for configuring are
|
|
||||||
in the default config file. This is working at a customer, but I'm
|
|
||||||
sure a few more iterations will be required to make setup as smooth
|
|
||||||
as possible.
|
|
||||||
<p>
|
|
||||||
NOTE: Outlook destroys dspam tags when forwarding mail (while converting
|
|
||||||
HTML to text). Perhaps some config option will turn this abominable
|
|
||||||
"feature" off. Working around this by making dspam tags visble on
|
|
||||||
HTML mail is ugly. My suggestion is to not use Outlook, for this and
|
|
||||||
many other reasons - especially security. Any other suggestions for
|
|
||||||
those married to Microsoft are welcome. The DSPAM LDA works around this
|
|
||||||
by making the tags visible in HTML attachments. This is ugly, and
|
|
||||||
occasionally corrupts attachments.
|
|
||||||
<p>
|
|
||||||
We have to supply workarounds for bugs in the email module (reported
|
|
||||||
to sourceforge). The workarounds reference some internal variables
|
|
||||||
which change with python versions.
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.1-1.i386.rpm">
|
|
||||||
milter-0.6.1-1.i386.rpm</a> Binary RPM for Redhat 7.x
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.1-1.src.rpm">
|
|
||||||
milter-0.6.1-1.src.rpm</a> Source RPM for Redhat 7.x (and likely
|
|
||||||
higher versions)
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/python/milter-0.6.0.tar.gz">
|
|
||||||
milter-0.6.0.tar.gz</a> simple dspam pre-filtering, use email module,
|
|
||||||
requires python >= 2.2.2.
|
|
||||||
<ul>
|
|
||||||
<li> The milter.so module from 0.5.4
|
|
||||||
is needed to run this release on AIX. Haven't tracked this down yet.
|
|
||||||
<li> The patches to fix the email packages in mime.py don't work
|
|
||||||
on python-2.2.3. The email package is still broken in 2.3, and patches
|
|
||||||
required for that will likely be different still.
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.0-1.i386.rpm">
|
|
||||||
milter-0.6.0-1.i386.rpm</a> Binary RPM for Redhat 7.x
|
|
||||||
<p>
|
|
||||||
<a href="http://bmsi.com/linux/rh72/milter-0.6.0-1.src.rpm">
|
|
||||||
milter-0.6.0-1.src.rpm</a> Source RPM for Redhat 7.x (and likely
|
|
||||||
higher versions)
|
|
||||||
<p>
|
|
||||||
<a href="http://www.bmsi.com/python/milter-0.5.5.tar.gz">
|
|
||||||
milter-0.5.5.tar.gz</a> IPV6 support, passing None to set_XXX_callback,
|
|
||||||
set_reply, chg_header, detect internal connections. Note, this release
|
|
||||||
did not work on AIX4.1.5, probably due to IPV6 support breaking something.
|
|
||||||
The milter.so module from 0.5.4 can be installed to use this release
|
|
||||||
with AIX.
|
|
||||||
<p>
|
|
||||||
<a href="http://www.bmsi.com/python/milter-0.5.4.tar.gz">
|
|
||||||
milter-0.5.4.tar.gz</a> wiretap, smart alias features, quarantine support.
|
|
||||||
<p>
|
|
||||||
The name of the production "sample" milter "bms.py" now
|
|
||||||
stands for "Basic Milter System" until someone suggests a better name.
|
|
||||||
The test coverage is rather
|
|
||||||
sparse at present.
|
|
||||||
Please <a href="mailto:%73%74%75%61%72%74%40%62%6D%73%69%2E%63%6F%6D">email</a> with proposals for what
|
|
||||||
to name the milter application.
|
|
||||||
<h4>NOTES</h4>
|
|
||||||
<ul>
|
|
||||||
<li>
|
|
||||||
Quarantine support requires that you define _FFR_QUARANTINE
|
|
||||||
when compiling miltermodule.c. I am not sure how to make setup.py
|
|
||||||
do that for you iff sendmail was actually compiled with _FFR_QUARANTINE.
|
|
||||||
<li>
|
|
||||||
While 0.6.0 will use the new email package in Python-2.2, that
|
|
||||||
package seems to be buggy in Python-2.2.1. The list example in the docs
|
|
||||||
doesn't find all MIME parts. Update: Python-2.2.2 has fixed the email
|
|
||||||
package. It can now parse my test cases.
|
|
||||||
<li>
|
|
||||||
Preliminary testing with python-2.2 shows that most things work after
|
|
||||||
adding <code>self.readahead = ""</code> to <code>mimepart.seek</code>.
|
|
||||||
Python-2.2 <code>multifile</code> reads one less newline per section than
|
|
||||||
2.1. I'm not not sure which is correct. After adding some calls to
|
|
||||||
<code>rstrip()</code> in testmime.py, all milter modules pass unit testing
|
|
||||||
with python-2.2. Python-2.2 patches have been released since 0.5.3.
|
|
||||||
<li>
|
|
||||||
sgmlop-1.1a3 has a memory leak (at least Python milter has a
|
|
||||||
memory leak when using sgmlop instead of sgmllib). Do not make Python
|
|
||||||
milter use sgmlop-1.1a2 or a3 in a production
|
|
||||||
system unless you can restart your milter periodically. The amount
|
|
||||||
of memory leaked seems roughly proportional to the amount of HTML
|
|
||||||
parsed.
|
|
||||||
<li>
|
|
||||||
There are a number of ways that malformed MIME attachments
|
|
||||||
can cause a python traceback. Uncaught exceptions cause a 415
|
|
||||||
error to be returned to sendmail. So far, all the malformed messages
|
|
||||||
I've investigated have been SPAM - so good riddance. I would prefer,
|
|
||||||
however, that the mime handling libraries were more precise. Beginning
|
|
||||||
with 0.5.1, bms.py will save messages that cause a traceback during
|
|
||||||
scanning in the tempfile directory with a ".fail" extension. This
|
|
||||||
makes it easier to get samples of mail that causes parsing problems
|
|
||||||
for incorporation into the unit tests.
|
|
||||||
</ul>
|
|
||||||
<p>
|
|
||||||
<a href="http://www.bmsi.com/python/milter-0.5.2.tar.gz">
|
|
||||||
milter-0.5.2.tar.gz</a> Fix and unittest another HTML parsing bug.<br>
|
|
||||||
<a href="http://www.bmsi.com/python/milter-0.5.1.tar.gz">
|
|
||||||
milter-0.5.1.tar.gz</a> Handle encoded rfc822 attachments.<br>
|
|
||||||
<a href="http://www.bmsi.com/python/milter-0.5.0.tar.gz">
|
|
||||||
milter-0.5.0.tar.gz</a> Use a config file so users don't have to
|
|
||||||
keep syncing with bms.py. <br>
|
|
||||||
<a href="http://www.bmsi.com/python/milter-0.4.5.tar.gz">
|
|
||||||
milter-0.4.5.tar.gz</a> Work with sgmlop. Reduce local hacks to config variables.
|
|
||||||
<p>
|
<p>
|
||||||
Python milter is under GPL. The authors can probably be convinced to
|
Python milter is under GPL. The authors can probably be convinced to
|
||||||
change this to LGPL.
|
change this to LGPL if needed.
|
||||||
|
|
||||||
<h3>What is a <a name="milter">milter</a>?</h3>
|
<h3>What is a <a name="milter">milter</a>?</h3>
|
||||||
|
|
||||||
@@ -429,7 +290,7 @@ The "defang" function of the sample milter was inspired by
|
|||||||
a Perl milter with flexible attachment processing options. The latest
|
a Perl milter with flexible attachment processing options. The latest
|
||||||
version of MIMEDefang uses an apache style process pool to avoid reloading
|
version of MIMEDefang uses an apache style process pool to avoid reloading
|
||||||
the Perl interpreter for each message. This makes it fast enough for
|
the Perl interpreter for each message. This makes it fast enough for
|
||||||
production and does not use Perl threading.
|
production without using Perl threading.
|
||||||
<p>
|
<p>
|
||||||
<a href="http://sourceforge.net/projects/mailchecker">mailchecker</a> is
|
<a href="http://sourceforge.net/projects/mailchecker">mailchecker</a> is
|
||||||
a Python project to provide flexible attachment processing for mail. I
|
a Python project to provide flexible attachment processing for mail. I
|
||||||
@@ -503,18 +364,10 @@ me if you successfully install milter on a system not mentioned below.
|
|||||||
<td>0.5.4</td><tr>
|
<td>0.5.4</td><tr>
|
||||||
<td>RedHat 7.1</td><td>gcc-2.96</td><td>?</td><td>8.12.1</td>
|
<td>RedHat 7.1</td><td>gcc-2.96</td><td>?</td><td>8.12.1</td>
|
||||||
<td>0.3.5</td><tr>
|
<td>0.3.5</td><tr>
|
||||||
<td>RedHat 7.2</td><td>gcc-2.96</td><td>2.1.1</td><td>8.11.6</td>
|
|
||||||
<td>0.4.1</td><tr>
|
|
||||||
<td>RedHat 7.2</td><td>gcc-2.96</td><td>2.2.1</td><td>8.11.6</td>
|
|
||||||
<td>0.4.5</td><tr>
|
|
||||||
<td>RedHat 7.2</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.2</td><td>gcc-2.96</td><td>2.3.3</td><td>8.12.10</td>
|
|
||||||
<td>0.6.6</td><tr>
|
|
||||||
<td>RedHat 7.3</td><td>gcc-2.96</td><td>2.2.2</td><td>8.11.6</td>
|
<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>0.5.5</td><tr>
|
||||||
<td>RedHat 7.3</td><td>gcc-2.96</td><td>2.3.3</td><td>8.12.10</td>
|
<td>RedHat 7.3</td><td>gcc-2.96</td><td>2.3.3</td><td>8.13.1</td>
|
||||||
<td>0.6.6</td><tr>
|
<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>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>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>Debian Linux</td><td>gcc-2.95.2</td><td>2.1.1</td><td>8.12.0</td>
|
||||||
@@ -527,14 +380,14 @@ me if you successfully install milter on a system not mentioned below.
|
|||||||
<td>0.3.4</td><tr>
|
<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>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>0.4.2</td><tr>
|
||||||
<td>AIX-4.1.5</td><td>gcc-2.95.2</td><td>2.2.2</td><td>8.12.6</td>
|
<td>AIX-4.1.5</td><td>gcc-2.95.2</td><td>2.2.3</td><td>8.13.1</td>
|
||||||
<td>0.5.4</td><tr>
|
<td>0.7.1</td><tr>
|
||||||
<td>Slackware 7.1</td><td>?</td><td>?</td><td>8.12.1</td>
|
<td>Slackware 7.1</td><td>?</td><td>?</td><td>8.12.1</td>
|
||||||
<td>0.3.8</td><tr>
|
<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>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>0.5.4</td><tr>
|
||||||
<td>OpenBSD</td><td>?</td><td>2.1.1</td><td>8.11.6</td>
|
<td>OpenBSD</td><td>?</td><td>2.3.3?</td><td>8.13.1?</td>
|
||||||
<td>0.3.9</td><tr>
|
<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>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>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>FreeBSD</td><td>gcc-2.95.3</td><td>2.2.1</td><td>8.12.3</td>
|
||||||
|
|||||||
+98
-10
@@ -1,12 +1,27 @@
|
|||||||
%define name milter
|
%define name milter
|
||||||
%define version 0.6.9
|
%define version 0.8.2
|
||||||
%define release 1
|
%define release 2.RH7
|
||||||
# Redhat 7.x and earlier (multiple ps lines per thread)
|
# 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
|
%define sysvinit milter.rc7
|
||||||
|
%endif
|
||||||
# RH9, other systems (single ps line per process)
|
# RH9, other systems (single ps line per process)
|
||||||
#define sysvinit milter.rc
|
|
||||||
%ifos Linux
|
%ifos Linux
|
||||||
%define python python2.3
|
%define python python2.4
|
||||||
%else
|
%else
|
||||||
%define python python
|
%define python python
|
||||||
%endif
|
%endif
|
||||||
@@ -24,8 +39,11 @@ Prefix: %{_prefix}
|
|||||||
Vendor: Stuart D. Gathman <stuart@bmsi.com>
|
Vendor: Stuart D. Gathman <stuart@bmsi.com>
|
||||||
Packager: Stuart D. Gathman <stuart@bmsi.com>
|
Packager: Stuart D. Gathman <stuart@bmsi.com>
|
||||||
Url: http://www.bmsi.com/python/milter.html
|
Url: http://www.bmsi.com/python/milter.html
|
||||||
Requires: %{python} >= 2.2.2, sendmail >= 8.12
|
Requires: %{python} >= 2.4, sendmail >= 8.12.10
|
||||||
BuildRequires: %{python}-devel >= 2.2.2, sendmail-devel >= 8.12
|
%ifos Linux
|
||||||
|
Requires: chkconfig
|
||||||
|
%endif
|
||||||
|
BuildRequires: %{python}-devel , sendmail-devel >= 8.12.10
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This is a python extension module to enable python scripts to
|
This is a python extension module to enable python scripts to
|
||||||
@@ -43,8 +61,10 @@ env CFLAGS="$RPM_OPT_FLAGS" %{python} setup.py build
|
|||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
%{python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
|
%{python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
|
||||||
mkdir -p $RPM_BUILD_ROOT/var/log/milter
|
mkdir -p $RPM_BUILD_ROOT/var/log/milter
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/etc/mail
|
||||||
mkdir $RPM_BUILD_ROOT/var/log/milter/save
|
mkdir $RPM_BUILD_ROOT/var/log/milter/save
|
||||||
cp bms.py milter.cfg $RPM_BUILD_ROOT/var/log/milter
|
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
|
# logfile rotation
|
||||||
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
||||||
@@ -57,10 +77,15 @@ EOF
|
|||||||
|
|
||||||
# purge saved defanged message copies
|
# purge saved defanged message copies
|
||||||
mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
|
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'
|
cat >$RPM_BUILD_ROOT/etc/cron.daily/milter <<'EOF'
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
find /var/log/milter/save -mtime +7 | xargs -r rm
|
find /var/log/milter/save -mtime +7 | xargs $R rm
|
||||||
EOF
|
EOF
|
||||||
chmod a+x $RPM_BUILD_ROOT/etc/cron.daily/milter
|
chmod a+x $RPM_BUILD_ROOT/etc/cron.daily/milter
|
||||||
|
|
||||||
@@ -94,6 +119,8 @@ EOF
|
|||||||
chmod a+x $RPM_BUILD_ROOT/var/log/milter/start.sh
|
chmod a+x $RPM_BUILD_ROOT/var/log/milter/start.sh
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/var/run/milter
|
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
|
%ifos aix4.1
|
||||||
%post
|
%post
|
||||||
@@ -103,6 +130,15 @@ mkssys -s milter -p /var/log/milter/start.sh -u 25 -S -n 15 -f 9 -G mail || :
|
|||||||
if [ $1 = 0 ]; then
|
if [ $1 = 0 ]; then
|
||||||
rmssys -s milter || :
|
rmssys -s milter || :
|
||||||
fi
|
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
|
%endif
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
@@ -124,9 +160,61 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%dir /var/log/milter/save
|
%dir /var/log/milter/save
|
||||||
%config /var/log/milter/start.sh
|
%config /var/log/milter/start.sh
|
||||||
%config /var/log/milter/bms.py
|
%config /var/log/milter/bms.py
|
||||||
%config /var/log/milter/milter.cfg
|
%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
|
%changelog
|
||||||
|
* Fri Jul 15 2005 Stuart Gathman <stuart@bmsi.com> 0.8.2-1
|
||||||
|
- 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 local bounce protection (requires pysrs-0.30.10)
|
||||||
|
- Callback exception processing option in milter module
|
||||||
|
- Handle corrupt ZIP attachments
|
||||||
|
* 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
|
* 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
|
- Validate spf.py against test suite, and add Received-SPF support to spf.py
|
||||||
- Support best_guess for SPF
|
- Support best_guess for SPF
|
||||||
|
|||||||
+182
-37
@@ -1,4 +1,5 @@
|
|||||||
/* Copyright (C) 2001 James Niemira (niemira@colltech.com, urmane@urmane.org)
|
/* Copyright (C) 2001 James Niemira (niemira@colltech.com, urmane@urmane.org)
|
||||||
|
* Portions Copyright (C) 2001,2002,2003,2004 Stuart Gathman (stuart@bmsi.com)
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
@@ -33,6 +34,33 @@ $ python setup.py help
|
|||||||
libraries=["milter","smutil","resolv"]
|
libraries=["milter","smutil","resolv"]
|
||||||
|
|
||||||
* $Log$
|
* $Log$
|
||||||
|
* Revision 1.5 2005/06/24 04:20:07 customdesigned
|
||||||
|
* Report context allocation error.
|
||||||
|
*
|
||||||
|
* Revision 1.4 2005/06/24 04:12:43 customdesigned
|
||||||
|
* Remove unused name argument to generic wrappers.
|
||||||
|
*
|
||||||
|
* Revision 1.3 2005/06/24 03:57:35 customdesigned
|
||||||
|
* Handle close called before connect.
|
||||||
|
*
|
||||||
|
* Revision 1.2 2005/06/02 04:18:55 customdesigned
|
||||||
|
* Update copyright notices after reading article on /.
|
||||||
|
*
|
||||||
|
* Revision 1.1.1.2 2005/05/31 18:09:06 customdesigned
|
||||||
|
* Release 0.7.1
|
||||||
|
*
|
||||||
|
* Revision 2.31 2004/08/23 02:24:36 stuart
|
||||||
|
* Support setbacklog
|
||||||
|
*
|
||||||
|
* Revision 2.30 2004/08/21 20:29:53 stuart
|
||||||
|
* Support option of 11 lines max for mlreply.
|
||||||
|
*
|
||||||
|
* Revision 2.29 2004/08/21 04:14:29 stuart
|
||||||
|
* mlreply support
|
||||||
|
*
|
||||||
|
* Revision 2.28 2004/08/21 02:45:21 stuart
|
||||||
|
* Don't leak int constants if module unloaded.
|
||||||
|
*
|
||||||
* Revision 2.27 2004/04/06 03:19:59 stuart
|
* Revision 2.27 2004/04/06 03:19:59 stuart
|
||||||
* Release 0.6.8
|
* Release 0.6.8
|
||||||
*
|
*
|
||||||
@@ -127,11 +155,20 @@ $ python setup.py help
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef MAX_ML_REPLY
|
||||||
|
#define MAX_ML_REPLY 32
|
||||||
|
#endif
|
||||||
|
#if MAX_ML_REPLY != 1 && MAX_ML_REPLY != 32 && MAX_ML_REPLY != 11
|
||||||
|
#error MAX_ML_REPLY must be 1 or 11 or 32
|
||||||
|
#endif
|
||||||
|
#define _FFR_MULTILINE (MAX_ML_REPLY > 1)
|
||||||
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <Python.h>
|
#include <Python.h>
|
||||||
#include <libmilter/mfapi.h>
|
#include <libmilter/mfapi.h>
|
||||||
|
|
||||||
|
|
||||||
/* See if we have IPv4 and/or IPv6 support in this OS and in
|
/* See if we have IPv4 and/or IPv6 support in this OS and in
|
||||||
* libmilter. We need to make several macro tests because some OS's
|
* libmilter. We need to make several macro tests because some OS's
|
||||||
* may define some if IPv6 is only partially supported, and we may
|
* may define some if IPv6 is only partially supported, and we may
|
||||||
@@ -169,7 +206,7 @@ $ python setup.py help
|
|||||||
|
|
||||||
|
|
||||||
/* Yes, these are static. If you need multiple different callbacks, */
|
/* Yes, these are static. If you need multiple different callbacks, */
|
||||||
/* it's cleaner to use multiple filters. */
|
/* it's cleaner to use multiple filters, or convert to OO method calls. */
|
||||||
static PyObject *connect_callback = NULL;
|
static PyObject *connect_callback = NULL;
|
||||||
static PyObject *helo_callback = NULL;
|
static PyObject *helo_callback = NULL;
|
||||||
static PyObject *envfrom_callback = NULL;
|
static PyObject *envfrom_callback = NULL;
|
||||||
@@ -214,8 +251,11 @@ _get_context(SMFICTX *ctx) {
|
|||||||
PyEval_AcquireThread(t); /* lock interp */
|
PyEval_AcquireThread(t); /* lock interp */
|
||||||
self = PyObject_New(milter_ContextObject,&milter_ContextType);
|
self = PyObject_New(milter_ContextObject,&milter_ContextType);
|
||||||
if (!self) {
|
if (!self) {
|
||||||
/* Can't pass on exception since we are called from libmilter */
|
/* Report and clear exception since we are called from libmilter */
|
||||||
PyErr_Clear();
|
if (PyErr_Occurred()) {
|
||||||
|
PyErr_Print();
|
||||||
|
PyErr_Clear();
|
||||||
|
}
|
||||||
PyThreadState_Clear(t);
|
PyThreadState_Clear(t);
|
||||||
PyEval_ReleaseThread(t);
|
PyEval_ReleaseThread(t);
|
||||||
PyThreadState_Delete(t);
|
PyThreadState_Delete(t);
|
||||||
@@ -306,7 +346,8 @@ CHGHDRS - filter may change/delete headers";
|
|||||||
|
|
||||||
static PyObject *
|
static PyObject *
|
||||||
milter_set_flags(PyObject *self, PyObject *args) {
|
milter_set_flags(PyObject *self, PyObject *args) {
|
||||||
if (!PyArg_ParseTuple(args, "i", &description.xxfi_flags)) return NULL;
|
if (!PyArg_ParseTuple(args, "i:set_flags", &description.xxfi_flags))
|
||||||
|
return NULL;
|
||||||
Py_INCREF(Py_None);
|
Py_INCREF(Py_None);
|
||||||
return Py_None;
|
return Py_None;
|
||||||
}
|
}
|
||||||
@@ -472,6 +513,28 @@ milter_set_close_callback(PyObject *self, PyObject *args) {
|
|||||||
return generic_set_callback(args, "O:set_close_callback", &close_callback);
|
return generic_set_callback(args, "O:set_close_callback", &close_callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int exception_policy = SMFIS_TEMPFAIL;
|
||||||
|
|
||||||
|
static char milter_set_exception_policy__doc__[] =
|
||||||
|
"set_exception_policy(i) -> None\n\
|
||||||
|
Sets the policy for untrapped Python exceptions during a callback.\n\
|
||||||
|
Must be one of TEMPFAIL,REJECT,CONTINUE";
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
milter_set_exception_policy(PyObject *self, PyObject *args) {
|
||||||
|
int i;
|
||||||
|
if (!PyArg_ParseTuple(args, "i:set_exception_policy", &i))
|
||||||
|
return NULL;
|
||||||
|
switch (i) {
|
||||||
|
case SMFIS_REJECT: case SMFIS_TEMPFAIL: case SMFIS_CONTINUE:
|
||||||
|
exception_policy = i;
|
||||||
|
Py_INCREF(Py_None);
|
||||||
|
return Py_None;
|
||||||
|
}
|
||||||
|
PyErr_SetString(MilterError,"invalid exception policy");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/** Report and clear any python exception before returning to libmilter.
|
/** Report and clear any python exception before returning to libmilter.
|
||||||
The interpreter is locked when we are called, and we unlock it. */
|
The interpreter is locked when we are called, and we unlock it. */
|
||||||
static int _report_exception(milter_ContextObject *self) {
|
static int _report_exception(milter_ContextObject *self) {
|
||||||
@@ -479,8 +542,15 @@ static int _report_exception(milter_ContextObject *self) {
|
|||||||
PyErr_Print();
|
PyErr_Print();
|
||||||
PyErr_Clear(); /* must clear since not returning to python */
|
PyErr_Clear(); /* must clear since not returning to python */
|
||||||
PyEval_ReleaseThread(self->t);
|
PyEval_ReleaseThread(self->t);
|
||||||
smfi_setreply(self->ctx, "451", "4.3.0", "Filter failure");
|
switch (exception_policy) {
|
||||||
return SMFIS_TEMPFAIL;
|
case SMFIS_REJECT:
|
||||||
|
smfi_setreply(self->ctx, "554", "5.3.0", "Filter failure");
|
||||||
|
return SMFIS_REJECT;
|
||||||
|
case SMFIS_TEMPFAIL:
|
||||||
|
smfi_setreply(self->ctx, "451", "4.3.0", "Filter failure");
|
||||||
|
return SMFIS_TEMPFAIL;
|
||||||
|
}
|
||||||
|
return SMFIS_CONTINUE;
|
||||||
}
|
}
|
||||||
PyEval_ReleaseThread(self->t);
|
PyEval_ReleaseThread(self->t);
|
||||||
return SMFIS_CONTINUE;
|
return SMFIS_CONTINUE;
|
||||||
@@ -591,7 +661,7 @@ milter_wrap_helo(SMFICTX *ctx, char *helohost) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
generic_env_wrapper(SMFICTX *ctx, PyObject*cb, char **argv, const char *name) {
|
generic_env_wrapper(SMFICTX *ctx, PyObject*cb, char **argv) {
|
||||||
PyObject *arglist;
|
PyObject *arglist;
|
||||||
milter_ContextObject *self;
|
milter_ContextObject *self;
|
||||||
int count = 0;
|
int count = 0;
|
||||||
@@ -628,12 +698,12 @@ generic_env_wrapper(SMFICTX *ctx, PyObject*cb, char **argv, const char *name) {
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
milter_wrap_envfrom(SMFICTX *ctx, char **argv) {
|
milter_wrap_envfrom(SMFICTX *ctx, char **argv) {
|
||||||
return generic_env_wrapper(ctx,envfrom_callback,argv,"milter_wrap_envfrom");
|
return generic_env_wrapper(ctx,envfrom_callback,argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
milter_wrap_envrcpt(SMFICTX *ctx, char **argv) {
|
milter_wrap_envrcpt(SMFICTX *ctx, char **argv) {
|
||||||
return generic_env_wrapper(ctx,envrcpt_callback,argv,"milter_wrap_envrcpt");
|
return generic_env_wrapper(ctx,envrcpt_callback,argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
@@ -649,7 +719,7 @@ milter_wrap_header(SMFICTX *ctx, char *headerf, char *headerv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
generic_noarg_wrapper(SMFICTX *ctx,PyObject *cb,const char *name) {
|
generic_noarg_wrapper(SMFICTX *ctx,PyObject *cb) {
|
||||||
PyObject *arglist;
|
PyObject *arglist;
|
||||||
milter_ContextObject *c;
|
milter_ContextObject *c;
|
||||||
if (cb == NULL) return SMFIS_CONTINUE;
|
if (cb == NULL) return SMFIS_CONTINUE;
|
||||||
@@ -661,7 +731,7 @@ generic_noarg_wrapper(SMFICTX *ctx,PyObject *cb,const char *name) {
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
milter_wrap_eoh(SMFICTX *ctx) {
|
milter_wrap_eoh(SMFICTX *ctx) {
|
||||||
return generic_noarg_wrapper(ctx,eoh_callback,"milter_wrap_eoh");
|
return generic_noarg_wrapper(ctx,eoh_callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
@@ -679,18 +749,31 @@ milter_wrap_body(SMFICTX *ctx, u_char *bodyp, size_t bodylen) {
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
milter_wrap_eom(SMFICTX *ctx) {
|
milter_wrap_eom(SMFICTX *ctx) {
|
||||||
return generic_noarg_wrapper(ctx,eom_callback,"milter_wrap_eom");
|
return generic_noarg_wrapper(ctx,eom_callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
milter_wrap_abort(SMFICTX *ctx) {
|
milter_wrap_abort(SMFICTX *ctx) {
|
||||||
/* libmilter still calls close after abort */
|
/* libmilter still calls close after abort */
|
||||||
return generic_noarg_wrapper(ctx,abort_callback,"milter_wrap_abort");
|
return generic_noarg_wrapper(ctx,abort_callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
milter_wrap_close(SMFICTX *ctx) {
|
milter_wrap_close(SMFICTX *ctx) {
|
||||||
int r = generic_noarg_wrapper(ctx,close_callback,"milter_wrap_close");
|
/* xxfi_close can be called out of order - even before connect.
|
||||||
|
* There may not yet be a private context pointer. To avoid
|
||||||
|
* creating a ThreadContext and allocating a milter context only
|
||||||
|
* to destroy them, and to avoid invoking the python close_callback when
|
||||||
|
* connect has never been called, we don't use generic_noarg_wrapper here. */
|
||||||
|
PyObject *cb = close_callback;
|
||||||
|
milter_ContextObject *self = smfi_getpriv(ctx);
|
||||||
|
int r = SMFIS_CONTINUE;
|
||||||
|
if (self != NULL && cb != NULL && self->ctx == ctx) {
|
||||||
|
PyObject *arglist;
|
||||||
|
PyEval_AcquireThread(self->t);
|
||||||
|
arglist = Py_BuildValue("(O)", self);
|
||||||
|
r = _generic_wrapper(self, cb, arglist);
|
||||||
|
}
|
||||||
/* FIXME: It is inefficient to have released the interp lock only to
|
/* FIXME: It is inefficient to have released the interp lock only to
|
||||||
acquire it again in _clear_context. We can tell _generic_return and
|
acquire it again in _clear_context. We can tell _generic_return and
|
||||||
friends not to release the lock by, for instance, setting self->t to NULL.
|
friends not to release the lock by, for instance, setting self->t to NULL.
|
||||||
@@ -746,6 +829,18 @@ milter_setdbg(PyObject *self, PyObject *args) {
|
|||||||
return _generic_return(smfi_setdbg(val), "cannot set debug value");
|
return _generic_return(smfi_setdbg(val), "cannot set debug value");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static char milter_setbacklog__doc__[] =
|
||||||
|
"setbacklog(int) -> None\n\
|
||||||
|
Set the TCP connection queue size for the milter socket.";
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
milter_setbacklog(PyObject *self, PyObject *args) {
|
||||||
|
int val;
|
||||||
|
|
||||||
|
if (!PyArg_ParseTuple(args, "i:setbacklog", &val)) return NULL;
|
||||||
|
return _generic_return(smfi_setbacklog(val), "cannot set backlog");
|
||||||
|
}
|
||||||
|
|
||||||
static char milter_settimeout__doc__[] =
|
static char milter_settimeout__doc__[] =
|
||||||
"settimeout(int) -> None\n\
|
"settimeout(int) -> None\n\
|
||||||
Set the time (in seconds) that sendmail will wait before\n\
|
Set the time (in seconds) that sendmail will wait before\n\
|
||||||
@@ -820,13 +915,54 @@ static PyObject *
|
|||||||
milter_setreply(PyObject *self, PyObject *args) {
|
milter_setreply(PyObject *self, PyObject *args) {
|
||||||
char *rcode;
|
char *rcode;
|
||||||
char *xcode;
|
char *xcode;
|
||||||
char *message;
|
char *message[MAX_ML_REPLY];
|
||||||
|
char fmt[MAX_ML_REPLY + 16];
|
||||||
SMFICTX *ctx;
|
SMFICTX *ctx;
|
||||||
if (!PyArg_ParseTuple(args, "szz:setreply", &rcode, &xcode, &message))
|
int i;
|
||||||
|
strcpy(fmt,"sz|");
|
||||||
|
for (i = 0; i < MAX_ML_REPLY; ++i) {
|
||||||
|
message[i] = 0;
|
||||||
|
fmt[i+3] = 's';
|
||||||
|
}
|
||||||
|
strcpy(fmt+i+3,":setreply");
|
||||||
|
if (!PyArg_ParseTuple(args, fmt,
|
||||||
|
&rcode, &xcode, message
|
||||||
|
#if MAX_ML_REPLY > 1
|
||||||
|
,message+1,message+2,message+3,message+4,message+5,message+6,
|
||||||
|
message+7,message+8,message+9,message+10
|
||||||
|
#if MAX_ML_REPLY > 11
|
||||||
|
,message+11,message+12,message+13,message+14,message+15,
|
||||||
|
message+16,message+17,message+18,message+19,message+20,
|
||||||
|
message+21,message+22,message+23,message+24,message+25,
|
||||||
|
message+26,message+27,message+28,message+29,message+30,
|
||||||
|
message+31
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
))
|
||||||
return NULL;
|
return NULL;
|
||||||
ctx = _find_context(self);
|
ctx = _find_context(self);
|
||||||
if (ctx == NULL) return NULL;
|
if (ctx == NULL) return NULL;
|
||||||
return _generic_return(smfi_setreply(ctx, rcode, xcode, message),
|
#if MAX_ML_REPLY > 1
|
||||||
|
/*
|
||||||
|
* C varargs might be convenient for some things, but they sure are a pain
|
||||||
|
* when the number of args is not known at compile time.
|
||||||
|
*/
|
||||||
|
if (message[0] && message[1])
|
||||||
|
return _generic_return(smfi_setmlreply(ctx, rcode, xcode,
|
||||||
|
message[0],
|
||||||
|
message[1],message[2],message[3],message[4],message[5],
|
||||||
|
message[6],message[7],message[8],message[9],message[10],
|
||||||
|
#if MAX_ML_REPLY > 11
|
||||||
|
message[11],message[12],message[13],message[14],message[15],
|
||||||
|
message[16],message[17],message[18],message[19],message[20],
|
||||||
|
message[21],message[22],message[23],message[24],message[25],
|
||||||
|
message[26],message[27],message[28],message[29],message[30],
|
||||||
|
message[31],
|
||||||
|
#endif
|
||||||
|
(char *)0
|
||||||
|
), "cannot set reply");
|
||||||
|
#endif
|
||||||
|
return _generic_return(smfi_setreply(ctx, rcode, xcode, message[0]),
|
||||||
"cannot set reply");
|
"cannot set reply");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -986,7 +1122,7 @@ milter_getpriv(PyObject *self, PyObject *args) {
|
|||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if _FFR_QUARANTINE
|
#ifdef SMFIF_QUARANTINE
|
||||||
static char milter_quarantine__doc__[] =
|
static char milter_quarantine__doc__[] =
|
||||||
"quarantine(string) -> None\n\
|
"quarantine(string) -> None\n\
|
||||||
Place the message in quarantine. A string with a description of the reason\n\
|
Place the message in quarantine. A string with a description of the reason\n\
|
||||||
@@ -1035,7 +1171,7 @@ static PyMethodDef context_methods[] = {
|
|||||||
{ "replacebody", milter_replacebody, METH_VARARGS, milter_replacebody__doc__},
|
{ "replacebody", milter_replacebody, METH_VARARGS, milter_replacebody__doc__},
|
||||||
{ "setpriv", milter_setpriv, METH_VARARGS, milter_setpriv__doc__},
|
{ "setpriv", milter_setpriv, METH_VARARGS, milter_setpriv__doc__},
|
||||||
{ "getpriv", milter_getpriv, METH_VARARGS, milter_getpriv__doc__},
|
{ "getpriv", milter_getpriv, METH_VARARGS, milter_getpriv__doc__},
|
||||||
#if _FFR_QUARANTINE
|
#ifdef SMFIF_QUARANTINE
|
||||||
{ "quarantine", milter_quarantine, METH_VARARGS, milter_quarantine__doc__},
|
{ "quarantine", milter_quarantine, METH_VARARGS, milter_quarantine__doc__},
|
||||||
#endif
|
#endif
|
||||||
#if _FFR_SMFI_PROGRESS
|
#if _FFR_SMFI_PROGRESS
|
||||||
@@ -1077,10 +1213,13 @@ static PyMethodDef milter_methods[] = {
|
|||||||
{ "set_eom_callback", milter_set_eom_callback, METH_VARARGS, milter_set_eom_callback__doc__},
|
{ "set_eom_callback", milter_set_eom_callback, METH_VARARGS, milter_set_eom_callback__doc__},
|
||||||
{ "set_abort_callback", milter_set_abort_callback, METH_VARARGS, milter_set_abort_callback__doc__},
|
{ "set_abort_callback", milter_set_abort_callback, METH_VARARGS, milter_set_abort_callback__doc__},
|
||||||
{ "set_close_callback", milter_set_close_callback, METH_VARARGS, milter_set_close_callback__doc__},
|
{ "set_close_callback", milter_set_close_callback, METH_VARARGS, milter_set_close_callback__doc__},
|
||||||
|
{ "set_exception_policy", milter_set_exception_policy,METH_VARARGS, milter_set_exception_policy__doc__},
|
||||||
|
{ "register", milter_register, METH_VARARGS, milter_register__doc__},
|
||||||
{ "register", milter_register, METH_VARARGS, milter_register__doc__},
|
{ "register", milter_register, METH_VARARGS, milter_register__doc__},
|
||||||
{ "main", milter_main, METH_VARARGS, milter_main__doc__},
|
{ "main", milter_main, METH_VARARGS, milter_main__doc__},
|
||||||
{ "setdbg", milter_setdbg, METH_VARARGS, milter_setdbg__doc__},
|
{ "setdbg", milter_setdbg, METH_VARARGS, milter_setdbg__doc__},
|
||||||
{ "settimeout", milter_settimeout, METH_VARARGS, milter_settimeout__doc__},
|
{ "settimeout", milter_settimeout, METH_VARARGS, milter_settimeout__doc__},
|
||||||
|
{ "setbacklog", milter_setbacklog, METH_VARARGS, milter_setbacklog__doc__},
|
||||||
{ "setconn", milter_setconn, METH_VARARGS, milter_setconn__doc__},
|
{ "setconn", milter_setconn, METH_VARARGS, milter_setconn__doc__},
|
||||||
{ "stop", milter_stop, METH_VARARGS, milter_stop__doc__},
|
{ "stop", milter_stop, METH_VARARGS, milter_stop__doc__},
|
||||||
{ NULL, NULL }
|
{ NULL, NULL }
|
||||||
@@ -1116,6 +1255,12 @@ allowing one to write email filters directly in Python.\n\
|
|||||||
Libmilter is currently marked FFR, and needs to be explicitly installed.\n\
|
Libmilter is currently marked FFR, and needs to be explicitly installed.\n\
|
||||||
See <sendmailsource>/libmilter/README for details on setting it up.\n";
|
See <sendmailsource>/libmilter/README for details on setting it up.\n";
|
||||||
|
|
||||||
|
static void setitem(PyObject *d,const char *name,long val) {
|
||||||
|
PyObject *v = PyInt_FromLong(val);
|
||||||
|
PyDict_SetItemString(d,name,v);
|
||||||
|
Py_DECREF(v);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
initmilter(void) {
|
initmilter(void) {
|
||||||
PyObject *m, *d;
|
PyObject *m, *d;
|
||||||
@@ -1125,24 +1270,24 @@ initmilter(void) {
|
|||||||
d = PyModule_GetDict(m);
|
d = PyModule_GetDict(m);
|
||||||
MilterError = PyErr_NewException("milter.error", NULL, NULL);
|
MilterError = PyErr_NewException("milter.error", NULL, NULL);
|
||||||
PyDict_SetItemString(d,"error", MilterError);
|
PyDict_SetItemString(d,"error", MilterError);
|
||||||
PyDict_SetItemString(d,"SUCCESS", PyInt_FromLong((long) MI_SUCCESS));
|
setitem(d,"SUCCESS", MI_SUCCESS);
|
||||||
PyDict_SetItemString(d,"FAILURE", PyInt_FromLong((long) MI_FAILURE));
|
setitem(d,"FAILURE", MI_FAILURE);
|
||||||
PyDict_SetItemString(d,"VERSION", PyInt_FromLong((long) SMFI_VERSION));
|
setitem(d,"VERSION", SMFI_VERSION);
|
||||||
PyDict_SetItemString(d,"ADDHDRS", PyInt_FromLong((long) SMFIF_ADDHDRS));
|
setitem(d,"ADDHDRS", SMFIF_ADDHDRS);
|
||||||
PyDict_SetItemString(d,"CHGBODY", PyInt_FromLong((long) SMFIF_CHGBODY));
|
setitem(d,"CHGBODY", SMFIF_CHGBODY);
|
||||||
PyDict_SetItemString(d,"MODBODY", PyInt_FromLong((long) SMFIF_MODBODY));
|
setitem(d,"MODBODY", SMFIF_MODBODY);
|
||||||
PyDict_SetItemString(d,"ADDRCPT", PyInt_FromLong((long) SMFIF_ADDRCPT));
|
setitem(d,"ADDRCPT", SMFIF_ADDRCPT);
|
||||||
PyDict_SetItemString(d,"DELRCPT", PyInt_FromLong((long) SMFIF_DELRCPT));
|
setitem(d,"DELRCPT", SMFIF_DELRCPT);
|
||||||
PyDict_SetItemString(d,"CHGHDRS", PyInt_FromLong((long) SMFIF_CHGHDRS));
|
setitem(d,"CHGHDRS", SMFIF_CHGHDRS);
|
||||||
PyDict_SetItemString(d,"V1_ACTS", PyInt_FromLong((long) SMFI_V1_ACTS));
|
setitem(d,"V1_ACTS", SMFI_V1_ACTS);
|
||||||
PyDict_SetItemString(d,"V2_ACTS", PyInt_FromLong((long) SMFI_V2_ACTS));
|
setitem(d,"V2_ACTS", SMFI_V2_ACTS);
|
||||||
PyDict_SetItemString(d,"CURR_ACTS", PyInt_FromLong((long) SMFI_CURR_ACTS));
|
setitem(d,"CURR_ACTS", SMFI_CURR_ACTS);
|
||||||
#ifdef SMFIF_QUARANTINE
|
#ifdef SMFIF_QUARANTINE
|
||||||
PyDict_SetItemString(d,"QUARANTINE",PyInt_FromLong((long)SMFIF_QUARANTINE));
|
setitem(d,"QUARANTINE",SMFIF_QUARANTINE);
|
||||||
#endif
|
#endif
|
||||||
PyDict_SetItemString(d,"CONTINUE", PyInt_FromLong((long) SMFIS_CONTINUE));
|
setitem(d,"CONTINUE", SMFIS_CONTINUE);
|
||||||
PyDict_SetItemString(d,"REJECT", PyInt_FromLong((long) SMFIS_REJECT));
|
setitem(d,"REJECT", SMFIS_REJECT);
|
||||||
PyDict_SetItemString(d,"DISCARD", PyInt_FromLong((long) SMFIS_DISCARD));
|
setitem(d,"DISCARD", SMFIS_DISCARD);
|
||||||
PyDict_SetItemString(d,"ACCEPT", PyInt_FromLong((long) SMFIS_ACCEPT));
|
setitem(d,"ACCEPT", SMFIS_ACCEPT);
|
||||||
PyDict_SetItemString(d,"TEMPFAIL", PyInt_FromLong((long) SMFIS_TEMPFAIL));
|
setitem(d,"TEMPFAIL", SMFIS_TEMPFAIL);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,50 @@
|
|||||||
# $Log$
|
# $Log$
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
# Revision 1.2 2005/06/02 04:18:55 customdesigned
|
||||||
|
# Update copyright notices after reading article on /.
|
||||||
|
#
|
||||||
|
# Revision 1.1.1.4 2005/05/31 18:23:49 customdesigned
|
||||||
|
# Development changes since 0.7.2
|
||||||
|
#
|
||||||
|
# Revision 1.62 2005/02/14 22:31:17 stuart
|
||||||
|
# _parseparam replacement not needed for python2.4
|
||||||
|
#
|
||||||
|
# Revision 1.61 2005/02/12 02:11:11 stuart
|
||||||
|
# Pass unit tests with python2.4.
|
||||||
|
#
|
||||||
|
# Revision 1.60 2005/02/11 18:34:14 stuart
|
||||||
|
# Handle garbage after quote in boundary.
|
||||||
|
#
|
||||||
|
# Revision 1.59 2005/02/10 01:10:59 stuart
|
||||||
|
# Fixed MimeMessage.ismodified()
|
||||||
|
#
|
||||||
|
# Revision 1.58 2005/02/10 00:56:49 stuart
|
||||||
|
# Runs with python2.4. Defang not working correctly - more work needed.
|
||||||
|
#
|
||||||
|
# Revision 1.57 2004/11/20 16:37:52 stuart
|
||||||
|
# fix regex for splitting header and body
|
||||||
|
#
|
||||||
|
# Revision 1.56 2004/11/09 20:33:51 stuart
|
||||||
|
# Recognize more dynamic PTR variations.
|
||||||
|
#
|
||||||
|
# Revision 1.55 2004/10/06 21:39:20 stuart
|
||||||
|
# Handle message attachments with boundary errors by not parsing them
|
||||||
|
# until needed.
|
||||||
|
#
|
||||||
|
# Revision 1.54 2004/08/18 01:59:46 stuart
|
||||||
|
# Handle mislabeled multipart messages
|
||||||
|
#
|
||||||
|
# Revision 1.53 2004/04/24 22:53:20 stuart
|
||||||
|
# Rename some local variables to avoid shadowing builtins
|
||||||
|
#
|
||||||
|
# Revision 1.52 2004/04/24 22:47:13 stuart
|
||||||
|
# Convert header values to str
|
||||||
|
#
|
||||||
# Revision 1.51 2004/03/25 03:19:10 stuart
|
# Revision 1.51 2004/03/25 03:19:10 stuart
|
||||||
# Correctly defang rfc822 attachments when boundary specified with
|
# Correctly defang rfc822 attachments when boundary specified with
|
||||||
# content-type message/rfc822.
|
# content-type message/rfc822.
|
||||||
@@ -28,183 +74,61 @@
|
|||||||
# with a warning message.
|
# with a warning message.
|
||||||
|
|
||||||
# Author: Stuart D. Gathman <stuart@bmsi.com>
|
# Author: Stuart D. Gathman <stuart@bmsi.com>
|
||||||
# Copyright 2001 Business Management Systems, Inc.
|
# Copyright 2001,2002,2003,2004,2005 Business Management Systems, Inc.
|
||||||
# This code is under GPL. See COPYING for details.
|
# This code is under the GNU General Public License. See COPYING for details.
|
||||||
|
|
||||||
import StringIO
|
import StringIO
|
||||||
import socket
|
import socket
|
||||||
import Milter
|
import Milter
|
||||||
|
import zipfile
|
||||||
|
|
||||||
import email
|
import email
|
||||||
import email.Message
|
import email.Message
|
||||||
from email.Message import Message
|
from email.Message import Message
|
||||||
from email.Generator import Generator
|
from email.Generator import Generator
|
||||||
from email.Utils import quote
|
from email.Utils import quote
|
||||||
from email import Utils
|
from email import Utils
|
||||||
|
from email.Parser import Parser
|
||||||
|
from email import Errors
|
||||||
|
|
||||||
from types import ListType,StringType
|
from types import ListType,StringType
|
||||||
|
|
||||||
# Enhance email.Parser
|
def zipnames(txt):
|
||||||
# - Fix _parsebody to decode message attachments before parsing
|
fp = StringIO.StringIO(txt)
|
||||||
|
zipf = zipfile.ZipFile(fp,'r')
|
||||||
|
names = []
|
||||||
|
for nm in zipf.namelist():
|
||||||
|
names.append(('zipname',nm))
|
||||||
|
if nm.lower().endswith('.zip'):
|
||||||
|
names += zipnames(zipf.read(nm))
|
||||||
|
return names
|
||||||
|
|
||||||
from email.Parser import Parser
|
class MimeGenerator(Generator):
|
||||||
try: from email.Parser import NLCRE
|
def _dispatch(self, msg):
|
||||||
except: from email.Parser import nlcre as NLCRE
|
# Get the Content-Type: for the message, then try to dispatch to
|
||||||
|
# self._handle_<maintype>_<subtype>(). If there's no handler for the
|
||||||
|
# full MIME type, then dispatch to self._handle_<maintype>(). If
|
||||||
|
# that's missing too, then dispatch to self._writeBody().
|
||||||
|
main = msg.get_content_maintype()
|
||||||
|
if msg.is_multipart() and main.lower() != 'multipart':
|
||||||
|
self._handle_multipart(msg)
|
||||||
|
else:
|
||||||
|
Generator._dispatch(self,msg)
|
||||||
|
|
||||||
from email import Errors
|
def unquote(s):
|
||||||
|
|
||||||
class MimeParser(Parser):
|
|
||||||
|
|
||||||
# This is a copy of _parsebody from email.Parser, with a fix
|
|
||||||
# for message attachments. I couldn't find a smaller way to patch it
|
|
||||||
# in a subclass.
|
|
||||||
|
|
||||||
def _parsebody(self, container, fp, firstbodyline=None):
|
|
||||||
# Parse the body, but first split the payload on the content-type
|
|
||||||
# boundary if present.
|
|
||||||
boundary = container.get_boundary()
|
|
||||||
isdigest = (container.get_content_type() == 'multipart/digest')
|
|
||||||
# If there's a boundary, split the payload text into its constituent
|
|
||||||
# parts and parse each separately. Otherwise, just parse the rest of
|
|
||||||
# the body as a single message. Note: any exceptions raised in the
|
|
||||||
# recursive parse need to have their line numbers coerced.
|
|
||||||
if boundary:
|
|
||||||
preamble = epilogue = None
|
|
||||||
# Split into subparts. The first boundary we're looking for won't
|
|
||||||
# always have a leading newline since we're at the start of the
|
|
||||||
# body text, and there's not always a preamble before the first
|
|
||||||
# boundary.
|
|
||||||
separator = '--' + boundary
|
|
||||||
payload = fp.read()
|
|
||||||
if firstbodyline is not None:
|
|
||||||
payload = firstbodyline + '\n' + payload
|
|
||||||
# We use an RE here because boundaries can have trailing
|
|
||||||
# whitespace.
|
|
||||||
mo = re.search(
|
|
||||||
r'(?P<sep>' + re.escape(separator) + r')(?P<ws>[ \t]*)',
|
|
||||||
payload)
|
|
||||||
if not mo:
|
|
||||||
if self._strict:
|
|
||||||
raise Errors.BoundaryError(
|
|
||||||
"Couldn't find starting boundary: %s" % boundary)
|
|
||||||
container.set_payload(payload)
|
|
||||||
return
|
|
||||||
start = mo.start()
|
|
||||||
if start > 0:
|
|
||||||
# there's some pre-MIME boundary preamble
|
|
||||||
preamble = payload[0:start]
|
|
||||||
# Find out what kind of line endings we're using
|
|
||||||
start += len(mo.group('sep')) + len(mo.group('ws'))
|
|
||||||
mo = NLCRE.search(payload, start)
|
|
||||||
if mo:
|
|
||||||
start += len(mo.group(0))
|
|
||||||
# We create a compiled regexp first because we need to be able to
|
|
||||||
# specify the start position, and the module function doesn't
|
|
||||||
# support this signature. :(
|
|
||||||
cre = re.compile('(?P<sep>\r\n|\r|\n)' +
|
|
||||||
re.escape(separator) + '--')
|
|
||||||
mo = cre.search(payload, start)
|
|
||||||
if mo:
|
|
||||||
terminator = mo.start()
|
|
||||||
linesep = mo.group('sep')
|
|
||||||
if mo.end() < len(payload):
|
|
||||||
# There's some post-MIME boundary epilogue
|
|
||||||
epilogue = payload[mo.end():]
|
|
||||||
elif self._strict:
|
|
||||||
raise Errors.BoundaryError(
|
|
||||||
"Couldn't find terminating boundary: %s" % boundary)
|
|
||||||
else:
|
|
||||||
# Handle the case of no trailing boundary. Check that it ends
|
|
||||||
# in a blank line. Some cases (spamspamspam) don't even have
|
|
||||||
# that!
|
|
||||||
mo = re.search('(?P<sep>\r\n|\r|\n){2}$', payload)
|
|
||||||
if not mo:
|
|
||||||
mo = re.search('(?P<sep>\r\n|\r|\n)$', payload)
|
|
||||||
if not mo:
|
|
||||||
raise Errors.BoundaryError(
|
|
||||||
'No terminating boundary and no trailing empty line')
|
|
||||||
linesep = mo.group('sep')
|
|
||||||
terminator = len(payload)
|
|
||||||
# We split the textual payload on the boundary separator, which
|
|
||||||
# includes the trailing newline. If the container is a
|
|
||||||
# multipart/digest then the subparts are by default message/rfc822
|
|
||||||
# instead of text/plain. In that case, they'll have a optional
|
|
||||||
# block of MIME headers, then an empty line followed by the
|
|
||||||
# message headers.
|
|
||||||
parts = re.split(
|
|
||||||
linesep + re.escape(separator) + r'[ \t]*' + linesep,
|
|
||||||
payload[start:terminator])
|
|
||||||
for part in parts:
|
|
||||||
if isdigest:
|
|
||||||
if part.startswith(linesep):
|
|
||||||
# There's no header block so create an empty message
|
|
||||||
# object as the container, and lop off the newline so
|
|
||||||
# we can parse the sub-subobject
|
|
||||||
msgobj = self._class()
|
|
||||||
part = part[len(linesep):]
|
|
||||||
else:
|
|
||||||
parthdrs, part = part.split(linesep+linesep, 1)
|
|
||||||
# msgobj in this case is the "message/rfc822" container
|
|
||||||
msgobj = self.parsestr(parthdrs, headersonly=1)
|
|
||||||
# while submsgobj is the message itself
|
|
||||||
msgobj.set_default_type('message/rfc822')
|
|
||||||
maintype = msgobj.get_content_maintype()
|
|
||||||
if maintype in ('message', 'multipart'):
|
|
||||||
submsgobj = self.parsestr(part)
|
|
||||||
msgobj.attach(submsgobj)
|
|
||||||
else:
|
|
||||||
msgobj.set_payload(part)
|
|
||||||
else:
|
|
||||||
msgobj = self.parsestr(part)
|
|
||||||
container.preamble = preamble
|
|
||||||
container.epilogue = epilogue
|
|
||||||
container.attach(msgobj)
|
|
||||||
elif container.get_main_type() == 'multipart':
|
|
||||||
# Very bad. A message is a multipart with no boundary!
|
|
||||||
raise Errors.BoundaryError(
|
|
||||||
'multipart message with no defined boundary')
|
|
||||||
elif container.get_type() == 'message/delivery-status':
|
|
||||||
# This special kind of type contains blocks of headers separated
|
|
||||||
# by a blank line. We'll represent each header block as a
|
|
||||||
# separate Message object
|
|
||||||
blocks = []
|
|
||||||
while True:
|
|
||||||
blockmsg = self._class()
|
|
||||||
self._parseheaders(blockmsg, fp)
|
|
||||||
if not len(blockmsg):
|
|
||||||
# No more header blocks left
|
|
||||||
break
|
|
||||||
blocks.append(blockmsg)
|
|
||||||
container.set_payload(blocks)
|
|
||||||
elif container.get_main_type() == 'message':
|
|
||||||
# Create a container for the payload, but watch out for there not
|
|
||||||
# being any headers left
|
|
||||||
container.set_payload(fp.read())
|
|
||||||
fp = StringIO.StringIO(container.get_payload(decode=True))
|
|
||||||
try:
|
|
||||||
msg = self.parse(fp)
|
|
||||||
except Errors.HeaderParseError:
|
|
||||||
msg = self._class()
|
|
||||||
self._parsebody(msg, fp)
|
|
||||||
container.set_payload([msg])
|
|
||||||
else:
|
|
||||||
text = fp.read()
|
|
||||||
if firstbodyline is not None:
|
|
||||||
text = firstbodyline + '\n' + text
|
|
||||||
container.set_payload(text)
|
|
||||||
|
|
||||||
def unquote(str):
|
|
||||||
"""Remove quotes from a string."""
|
"""Remove quotes from a string."""
|
||||||
if len(str) > 1:
|
if len(s) > 1:
|
||||||
if str.startswith('"'):
|
if s.startswith('"'):
|
||||||
if str.endswith('"'):
|
if s.endswith('"'):
|
||||||
str = str[1:-1]
|
s = s[1:-1]
|
||||||
else: # remove garbage after trailing quote
|
else: # remove garbage after trailing quote
|
||||||
try: str = str[1:str[1:].index('"')+1]
|
try: s = s[1:s[1:].index('"')+1]
|
||||||
except: return str
|
except:
|
||||||
return str.replace('\\\\', '\\').replace('\\"', '"')
|
return s
|
||||||
if str.startswith('<') and str.endswith('>'):
|
return s.replace('\\\\', '\\').replace('\\"', '"')
|
||||||
return str[1:-1]
|
if s.startswith('<') and s.endswith('>'):
|
||||||
return str
|
return s[1:-1]
|
||||||
|
return s
|
||||||
|
|
||||||
from types import TupleType
|
from types import TupleType
|
||||||
|
|
||||||
@@ -214,27 +138,11 @@ def _unquotevalue(value):
|
|||||||
else:
|
else:
|
||||||
return unquote(value)
|
return unquote(value)
|
||||||
|
|
||||||
email.Message._unquotevalue = _unquotevalue
|
#email.Message._unquotevalue = _unquotevalue
|
||||||
|
|
||||||
def _parseparam(str):
|
from email.Message import _parseparam
|
||||||
plist = []
|
|
||||||
while str[:1] == ';':
|
|
||||||
str = str[1:]
|
|
||||||
end = str.find(';')
|
|
||||||
while end > 0 and (str.count('"',0,end) & 1):
|
|
||||||
end = str.find(';',end + 1)
|
|
||||||
if end < 0: end = len(str)
|
|
||||||
f = str[:end]
|
|
||||||
if '=' in f:
|
|
||||||
i = f.index('=')
|
|
||||||
f = f[:i].strip().lower() + \
|
|
||||||
'=' + f[i+1:].strip()
|
|
||||||
plist.append(f.strip())
|
|
||||||
str = str[end:]
|
|
||||||
return plist
|
|
||||||
|
|
||||||
# Enhance email.Message
|
# Enhance email.Message
|
||||||
# - Fix getparam to parse attributes IE style
|
|
||||||
# - Provide a headerchange event for integration with Milter
|
# - Provide a headerchange event for integration with Milter
|
||||||
# Headerchange attribute can be assigned a function to be called when
|
# Headerchange attribute can be assigned a function to be called when
|
||||||
# changing headers. The signature is:
|
# changing headers. The signature is:
|
||||||
@@ -245,64 +153,19 @@ class MimeMessage(Message):
|
|||||||
"""Version of email.Message.Message compatible with old mime module
|
"""Version of email.Message.Message compatible with old mime module
|
||||||
"""
|
"""
|
||||||
def __init__(self,fp=None,seekable=1):
|
def __init__(self,fp=None,seekable=1):
|
||||||
|
Message.__init__(self)
|
||||||
self.headerchange = None
|
self.headerchange = None
|
||||||
self.submsg = None
|
self.submsg = None
|
||||||
Message.__init__(self)
|
self.modified = False
|
||||||
self.fp = fp
|
|
||||||
if fp:
|
|
||||||
parser = MimeParser(MimeMessage)
|
|
||||||
self.startofheaders = fp.tell()
|
|
||||||
parser._parseheaders(self,fp)
|
|
||||||
self.startofbody = fp.tell()
|
|
||||||
parser._parsebody(self,fp)
|
|
||||||
for part in self.walk():
|
|
||||||
part.modified = False
|
|
||||||
|
|
||||||
def rewindbody(self):
|
def get_param(self, param, failobj=None, header='content-type', unquote=True):
|
||||||
return self.fp.seek(self.startofbody)
|
val = Message.get_param(self,param,failobj,header,unquote)
|
||||||
|
if val != failobj and param == 'boundary' and unquote:
|
||||||
|
# unquote boundaries an extra time, test case testDefang5
|
||||||
|
return _unquotevalue(val)
|
||||||
|
return val
|
||||||
|
|
||||||
# override param parsing to handle quotes
|
getfilename = Message.get_filename
|
||||||
def _get_params_preserve(self,failobj=None,header='content-type'):
|
|
||||||
"Return all parameter names and values. Use parser that handles quotes."
|
|
||||||
missing = []
|
|
||||||
value = self.get(header, missing)
|
|
||||||
if value is missing:
|
|
||||||
return failobj
|
|
||||||
params = []
|
|
||||||
for p in _parseparam(';' + value):
|
|
||||||
try:
|
|
||||||
name, val = p.split('=', 1)
|
|
||||||
name = name.strip()
|
|
||||||
val = val.strip()
|
|
||||||
except ValueError:
|
|
||||||
# Must have been a bare attribute
|
|
||||||
name = p.strip()
|
|
||||||
val = ''
|
|
||||||
params.append((name, val))
|
|
||||||
params = Utils.decode_params(params)
|
|
||||||
return params
|
|
||||||
|
|
||||||
def get_filename(self, failobj=None):
|
|
||||||
"""Return the filename associated with the payload if present.
|
|
||||||
|
|
||||||
The filename is extracted from the Content-Disposition header's
|
|
||||||
`filename' parameter, and it is unquoted.
|
|
||||||
"""
|
|
||||||
missing = []
|
|
||||||
filename = self.get_param('filename', missing, 'content-disposition')
|
|
||||||
if filename is missing:
|
|
||||||
return failobj
|
|
||||||
if isinstance(filename, TupleType):
|
|
||||||
# It's an RFC 2231 encoded parameter
|
|
||||||
newvalue = _unquotevalue(filename)
|
|
||||||
if newvalue[0]:
|
|
||||||
return unicode(newvalue[2], newvalue[0])
|
|
||||||
return unicode(newvalue[2])
|
|
||||||
else:
|
|
||||||
newvalue = _unquotevalue(filename.strip())
|
|
||||||
return newvalue
|
|
||||||
|
|
||||||
getfilename = get_filename
|
|
||||||
ismultipart = Message.is_multipart
|
ismultipart = Message.is_multipart
|
||||||
getheaders = Message.get_all
|
getheaders = Message.get_all
|
||||||
gettype = Message.get_content_type
|
gettype = Message.get_content_type
|
||||||
@@ -313,11 +176,11 @@ class MimeMessage(Message):
|
|||||||
def getname(self):
|
def getname(self):
|
||||||
return self.get_param('name')
|
return self.get_param('name')
|
||||||
|
|
||||||
def getnames(self):
|
def getnames(self,scan_zip=False):
|
||||||
"""Return a list of (attr,name) pairs of attributes that IE might
|
"""Return a list of (attr,name) pairs of attributes that IE might
|
||||||
interpret as a name - and hence decide to execute this message."""
|
interpret as a name - and hence decide to execute this message."""
|
||||||
names = []
|
names = []
|
||||||
for attr,val in self.get_params([]):
|
for attr,val in self._get_params_preserve([],'content-type'):
|
||||||
if isinstance(val, TupleType):
|
if isinstance(val, TupleType):
|
||||||
# It's an RFC 2231 encoded parameter
|
# It's an RFC 2231 encoded parameter
|
||||||
newvalue = _unquotevalue(val)
|
newvalue = _unquotevalue(val)
|
||||||
@@ -328,12 +191,19 @@ class MimeMessage(Message):
|
|||||||
else:
|
else:
|
||||||
val = _unquotevalue(val.strip())
|
val = _unquotevalue(val.strip())
|
||||||
names.append((attr,val))
|
names.append((attr,val))
|
||||||
return names + [("filename",self.get_filename())]
|
names += [("filename",self.get_filename())]
|
||||||
|
if scan_zip:
|
||||||
|
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
|
||||||
|
|
||||||
def ismodified(self):
|
def ismodified(self):
|
||||||
"True if this message or a subpart has been modified."
|
"True if this message or a subpart has been modified."
|
||||||
if not self.is_multipart():
|
if not self.is_multipart():
|
||||||
if self.submsg:
|
if isinstance(self.submsg,Message):
|
||||||
return self.submsg.ismodified()
|
return self.submsg.ismodified()
|
||||||
return self.modified
|
return self.modified
|
||||||
if self.modified: return True
|
if self.modified: return True
|
||||||
@@ -343,16 +213,22 @@ class MimeMessage(Message):
|
|||||||
|
|
||||||
def dump(self,file,unixfrom=False):
|
def dump(self,file,unixfrom=False):
|
||||||
"Write this message (and all subparts) to a file"
|
"Write this message (and all subparts) to a file"
|
||||||
g = Generator(file)
|
g = MimeGenerator(file)
|
||||||
g.flatten(self,unixfrom=unixfrom)
|
g.flatten(self,unixfrom=unixfrom)
|
||||||
|
|
||||||
|
def as_string(self, unixfrom=False):
|
||||||
|
"Return the entire formatted message as a string."
|
||||||
|
fp = StringIO.StringIO()
|
||||||
|
self.dump(fp,unixfrom=unixfrom)
|
||||||
|
return fp.getvalue()
|
||||||
|
|
||||||
def getencoding(self):
|
def getencoding(self):
|
||||||
return self.get('content-transfer-encoding',None)
|
return self.get('content-transfer-encoding',None)
|
||||||
|
|
||||||
# Decode body to stream according to transfer encoding, return encoding name
|
# Decode body to stream according to transfer encoding, return encoding name
|
||||||
def decode(self,filter):
|
def decode(self,filt):
|
||||||
try:
|
try:
|
||||||
filter.write(self.get_payload(decode=True))
|
filt.write(self.get_payload(decode=True))
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
return self.getencoding()
|
return self.getencoding()
|
||||||
@@ -363,7 +239,7 @@ class MimeMessage(Message):
|
|||||||
def __setitem__(self, name, value):
|
def __setitem__(self, name, value):
|
||||||
rc = Message.__setitem__(self,name,value)
|
rc = Message.__setitem__(self,name,value)
|
||||||
self.modified = True
|
self.modified = True
|
||||||
if self.headerchange: self.headerchange(self,name,value)
|
if self.headerchange: self.headerchange(self,name,str(value))
|
||||||
return rc
|
return rc
|
||||||
|
|
||||||
def __delitem__(self, name):
|
def __delitem__(self, name):
|
||||||
@@ -374,7 +250,7 @@ class MimeMessage(Message):
|
|||||||
|
|
||||||
def get_payload(self,i=None,decode=False):
|
def get_payload(self,i=None,decode=False):
|
||||||
msg = self.submsg
|
msg = self.submsg
|
||||||
if msg and msg.ismodified():
|
if isinstance(msg,Message) and msg.ismodified():
|
||||||
self.set_payload([msg])
|
self.set_payload([msg])
|
||||||
return Message.get_payload(self,i,decode)
|
return Message.get_payload(self,i,decode)
|
||||||
|
|
||||||
@@ -388,18 +264,27 @@ class MimeMessage(Message):
|
|||||||
self.submsg = None
|
self.submsg = None
|
||||||
|
|
||||||
def get_submsg(self):
|
def get_submsg(self):
|
||||||
if self.get_content_type().lower() == 'message/rfc822':
|
t = self.get_content_type().lower()
|
||||||
|
if t == 'message/rfc822' or t.startswith('multipart/'):
|
||||||
if not self.submsg:
|
if not self.submsg:
|
||||||
txt = self.get_payload()
|
txt = self.get_payload()
|
||||||
if type(txt) == str:
|
if type(txt) == str:
|
||||||
txt = self.get_payload(decode=True)
|
txt = self.get_payload(decode=True)
|
||||||
parser = MimeParser(MimeMessage)
|
self.submsg = email.message_from_string(txt,MimeMessage)
|
||||||
self.submsg = parser.parsestr(txt)
|
for part in self.submsg.walk():
|
||||||
|
part.modified = False
|
||||||
else:
|
else:
|
||||||
self.submsg = txt[0]
|
self.submsg = txt[0]
|
||||||
return self.submsg
|
return self.submsg
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def message_from_file(fp):
|
||||||
|
msg = email.message_from_file(fp,MimeMessage)
|
||||||
|
for part in msg.walk():
|
||||||
|
part.modified = False
|
||||||
|
assert not msg.ismodified()
|
||||||
|
return msg
|
||||||
|
|
||||||
extlist = ''.join("""
|
extlist = ''.join("""
|
||||||
ade,adp,asd,asx,asp,bas,bat,chm,cmd,com,cpl,crt,dll,exe,hlp,hta,inf,ins,isp,js,
|
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,
|
jse,lnk,mdb,mde,msc,msi,msp,mst,ocx,pcd,pif,reg,scr,sct,shs,url,vb,vbe,vbs,wsc,
|
||||||
@@ -421,19 +306,27 @@ A copy of your original message was saved as '%s:%s'.
|
|||||||
See your administrator.
|
See your administrator.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def check_name(msg,savname=None,ckname=check_ext):
|
def check_name(msg,savname=None,ckname=check_ext,scan_zip=False):
|
||||||
"Replace attachment with a warning if its name is suspicious."
|
"Replace attachment with a warning if its name is suspicious."
|
||||||
for (key,name) in msg.getnames():
|
try:
|
||||||
badname = ckname(name)
|
for key,name in msg.getnames(scan_zip):
|
||||||
if badname:
|
badname = ckname(name)
|
||||||
hostname = socket.gethostname()
|
if badname:
|
||||||
msg.set_payload(virus_msg % (badname,hostname,savname))
|
if key == 'zipname':
|
||||||
del msg["content-type"]
|
badname = msg.get_filename()
|
||||||
del msg["content-disposition"]
|
break
|
||||||
del msg["content-transfer-encoding"]
|
else:
|
||||||
name = "WARNING.TXT"
|
return Milter.CONTINUE
|
||||||
msg["Content-Type"] = "text/plain; name="+name
|
except zipfile.BadZipfile:
|
||||||
break
|
# 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
|
||||||
return Milter.CONTINUE
|
return Milter.CONTINUE
|
||||||
|
|
||||||
import email.Iterators
|
import email.Iterators
|
||||||
@@ -444,7 +337,7 @@ msg MimeMessage
|
|||||||
check function(MimeMessage): int
|
check function(MimeMessage): int
|
||||||
Return CONTINUE, REJECT, ACCEPT
|
Return CONTINUE, REJECT, ACCEPT
|
||||||
"""
|
"""
|
||||||
if msg.ismultipart() and not msg.get_content_type() == 'message/rfc822':
|
if msg.is_multipart():
|
||||||
for i in msg.get_payload():
|
for i in msg.get_payload():
|
||||||
rc = check_attachments(i,check)
|
rc = check_attachments(i,check)
|
||||||
if rc != Milter.CONTINUE: return rc
|
if rc != Milter.CONTINUE: return rc
|
||||||
@@ -453,28 +346,35 @@ check function(MimeMessage): int
|
|||||||
|
|
||||||
# save call context for Python without nested_scopes
|
# save call context for Python without nested_scopes
|
||||||
class _defang:
|
class _defang:
|
||||||
def __init__(self,savname,check):
|
|
||||||
self._savname = savname
|
def __init__(self,scan_html=True):
|
||||||
self._check = check
|
self.scan_html = scan_html
|
||||||
self.scan_rfc822 = True
|
|
||||||
self.scan_html = True
|
|
||||||
def _chk_name(self,msg):
|
def _chk_name(self,msg):
|
||||||
rc = check_name(msg,self._savname,self._check)
|
rc = check_name(msg,self._savname,self._check,self.scan_zip)
|
||||||
if self.scan_html:
|
if self.scan_html:
|
||||||
check_html(msg,self._savname) # remove scripts from HTML
|
check_html(msg,self._savname) # remove scripts from HTML
|
||||||
if self.scan_rfc822:
|
if self.scan_rfc822:
|
||||||
msg = msg.get_submsg()
|
msg = msg.get_submsg()
|
||||||
if msg: return check_attachments(msg,self._chk_name)
|
if isinstance(msg,Message):
|
||||||
|
return check_attachments(msg,self._chk_name)
|
||||||
return rc
|
return rc
|
||||||
|
|
||||||
|
def __call__(self,msg,savname=None,check=check_ext,scan_rfc822=True,
|
||||||
|
scan_zip=False):
|
||||||
|
"""Compatible entry point.
|
||||||
|
Replace all attachments with dangerous names."""
|
||||||
|
self._savname = savname
|
||||||
|
self._check = check
|
||||||
|
self.scan_rfc822 = scan_rfc822
|
||||||
|
self.scan_zip = scan_zip
|
||||||
|
check_attachments(msg,self._chk_name)
|
||||||
|
if msg.ismodified():
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
# emulate old defang function
|
# emulate old defang function
|
||||||
def defang(msg,savname=None,check=check_ext):
|
defang = _defang()
|
||||||
"""Compatible entry point.
|
|
||||||
Replace all attachments with dangerous names."""
|
|
||||||
check_attachments(msg,_defang(savname,check)._chk_name)
|
|
||||||
if msg.ismodified():
|
|
||||||
return 1;
|
|
||||||
return 0
|
|
||||||
|
|
||||||
import sgmllib
|
import sgmllib
|
||||||
|
|
||||||
@@ -571,7 +471,6 @@ class HTMLScriptFilter(SGMLFilter):
|
|||||||
def handle_comment(self,comment):
|
def handle_comment(self,comment):
|
||||||
if not self.ignoring: SGMLFilter.handle_comment(self,comment)
|
if not self.ignoring: SGMLFilter.handle_comment(self,comment)
|
||||||
|
|
||||||
|
|
||||||
def check_html(msg,savname=None):
|
def check_html(msg,savname=None):
|
||||||
"Remove scripts from HTML attachments."
|
"Remove scripts from HTML attachments."
|
||||||
msgtype = msg.get_content_type().lower()
|
msgtype = msg.get_content_type().lower()
|
||||||
@@ -582,14 +481,14 @@ def check_html(msg,savname=None):
|
|||||||
msgtype = 'text/html'
|
msgtype = 'text/html'
|
||||||
if msgtype == 'text/html':
|
if msgtype == 'text/html':
|
||||||
out = StringIO.StringIO()
|
out = StringIO.StringIO()
|
||||||
filter = HTMLScriptFilter(out)
|
htmlfilter = HTMLScriptFilter(out)
|
||||||
try:
|
try:
|
||||||
filter.write(msg.get_payload(decode=True))
|
htmlfilter.write(msg.get_payload(decode=True))
|
||||||
filter.close()
|
htmlfilter.close()
|
||||||
#except sgmllib.SGMLParseError:
|
#except sgmllib.SGMLParseError:
|
||||||
except:
|
except:
|
||||||
#mimetools.copyliteral(msg.get_payload(),open('debug.out','w')
|
#mimetools.copyliteral(msg.get_payload(),open('debug.out','w')
|
||||||
filter.close()
|
htmlfilter.close()
|
||||||
hostname = socket.gethostname()
|
hostname = socket.gethostname()
|
||||||
msg.set_payload(
|
msg.set_payload(
|
||||||
"An HTML attachment could not be parsed. The original is saved as '%s:%s'"
|
"An HTML attachment could not be parsed. The original is saved as '%s:%s'"
|
||||||
@@ -600,8 +499,25 @@ def check_html(msg,savname=None):
|
|||||||
name = "WARNING.TXT"
|
name = "WARNING.TXT"
|
||||||
msg["Content-Type"] = "text/plain; name="+name
|
msg["Content-Type"] = "text/plain; name="+name
|
||||||
return Milter.CONTINUE
|
return Milter.CONTINUE
|
||||||
if filter.modified:
|
if htmlfilter.modified:
|
||||||
msg.set_payload(out) # remove embedded scripts
|
msg.set_payload(out) # remove embedded scripts
|
||||||
del msg["content-transfer-encoding"]
|
del msg["content-transfer-encoding"]
|
||||||
email.Encoders.encode_quopri(msg)
|
email.Encoders.encode_quopri(msg)
|
||||||
return Milter.CONTINUE
|
return Milter.CONTINUE
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
import sys
|
||||||
|
def _list_attach(msg):
|
||||||
|
t = msg.get_content_type()
|
||||||
|
p = msg.get_payload(decode=True)
|
||||||
|
print msg.get_filename(),msg.get_content_type(),type(p)
|
||||||
|
msg = msg.get_submsg()
|
||||||
|
if isinstance(msg,Message):
|
||||||
|
return check_attachments(msg,_list_attach)
|
||||||
|
return Milter.CONTINUE
|
||||||
|
|
||||||
|
for fname in sys.argv[1:]:
|
||||||
|
fp = open(fname)
|
||||||
|
msg = message_from_file(fp)
|
||||||
|
email.Iterators._structure(msg)
|
||||||
|
check_attachments(msg,_list_attach)
|
||||||
|
|||||||
+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_
|
||||||
@@ -126,7 +126,7 @@ class sampleMilter(Milter.Milter):
|
|||||||
def eom(self):
|
def eom(self):
|
||||||
if not self.fp: return Milter.ACCEPT
|
if not self.fp: return Milter.ACCEPT
|
||||||
self.fp.seek(0)
|
self.fp.seek(0)
|
||||||
msg = mime.MimeMessage(self.fp)
|
msg = mime.message_from_file(self.fp)
|
||||||
msg.headerchange = self._headerChange
|
msg.headerchange = self._headerChange
|
||||||
if not mime.defang(msg,self.tempname):
|
if not mime.defang(msg,self.tempname):
|
||||||
os.remove(self.tempname)
|
os.remove(self.tempname)
|
||||||
|
|||||||
@@ -2,3 +2,4 @@
|
|||||||
python=python2
|
python=python2
|
||||||
doc_files=README NEWS TODO
|
doc_files=README NEWS TODO
|
||||||
packager=Stuart D. Gathman <stuart@bmsi.com>
|
packager=Stuart D. Gathman <stuart@bmsi.com>
|
||||||
|
release=2.4
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ if sys.version < '2.2.3':
|
|||||||
DistributionMetadata.classifiers = None
|
DistributionMetadata.classifiers = None
|
||||||
DistributionMetadata.download_url = None
|
DistributionMetadata.download_url = None
|
||||||
|
|
||||||
setup(name = "milter", version = "0.6.9",
|
setup(name = "milter", version = "0.8.2",
|
||||||
description="Python interface to sendmail milter API",
|
description="Python interface to sendmail milter API",
|
||||||
long_description="""\
|
long_description="""\
|
||||||
This is a python extension module to enable python scripts to
|
This is a python extension module to enable python scripts to
|
||||||
@@ -26,9 +26,13 @@ querying SPF records.
|
|||||||
maintainer_email="stuart@bmsi.com",
|
maintainer_email="stuart@bmsi.com",
|
||||||
license="GPL",
|
license="GPL",
|
||||||
url="http://www.bmsi.com/python/milter.html",
|
url="http://www.bmsi.com/python/milter.html",
|
||||||
py_modules=["Milter","mime","spf"],
|
py_modules=["mime","spf"],
|
||||||
|
packages = ['Milter'],
|
||||||
ext_modules=[
|
ext_modules=[
|
||||||
Extension("milter", ["miltermodule.c"],libraries=libs),
|
Extension("milter", ["miltermodule.c"],
|
||||||
|
libraries=libs,
|
||||||
|
define_macros = [ ('MAX_ML_REPLY',32) ]
|
||||||
|
),
|
||||||
],
|
],
|
||||||
keywords = ['sendmail','milter'],
|
keywords = ['sendmail','milter'],
|
||||||
classifiers = [
|
classifiers = [
|
||||||
@@ -39,6 +43,7 @@ querying SPF records.
|
|||||||
'Natural Language :: English',
|
'Natural Language :: English',
|
||||||
'Operating System :: POSIX',
|
'Operating System :: POSIX',
|
||||||
'Programming Language :: Python',
|
'Programming Language :: Python',
|
||||||
'Topic :: Communications :: Email :: Mail Transport Agents'
|
'Topic :: Communications :: Email :: Mail Transport Agents',
|
||||||
|
'Topic :: Communications :: Email :: Filters'
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
"""SPF (Sender-Permitted From) implementation.
|
"""SPF (Sender Policy Framework) implementation.
|
||||||
|
|
||||||
Copyright (c) 2003, Terence Way
|
Copyright (c) 2003, Terence Way
|
||||||
|
Portions Copyright (c) 2004,2005 Stuart Gathman <stuart@bmsi.com>
|
||||||
This module is free software, and you may redistribute it and/or modify
|
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
|
it under the same terms as Python itself, so long as this copyright message
|
||||||
and disclaimer are retained in their original form.
|
and disclaimer are retained in their original form.
|
||||||
@@ -18,10 +19,11 @@ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
|
|||||||
SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||||
|
|
||||||
For more information about SPF, a tool against email forgery, see
|
For more information about SPF, a tool against email forgery, see
|
||||||
http://spf.pobox.com
|
http://spf.pobox.com/
|
||||||
|
|
||||||
For news, bugfixes, etc. visit the home page for this implementation at
|
For news, bugfixes, etc. visit the home page for this implementation at
|
||||||
http://www.wayforward.net/spf/
|
http://www.wayforward.net/spf/
|
||||||
|
http://sourceforge.net/projects/pymilter/
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Changes:
|
# Changes:
|
||||||
@@ -45,6 +47,154 @@ For news, bugfixes, etc. visit the home page for this implementation at
|
|||||||
# Terrence is not responding to email.
|
# Terrence is not responding to email.
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
|
# Revision 1.26 2005/07/20 03:12:40 customdesigned
|
||||||
|
# When not in strict mode, don't give PermErr for bad mechanism until
|
||||||
|
# encountered during evaluation.
|
||||||
|
#
|
||||||
|
# Revision 1.25 2005/07/19 23:24:42 customdesigned
|
||||||
|
# Validate all mechanisms before evaluating.
|
||||||
|
#
|
||||||
|
# Revision 1.24 2005/07/19 18:11:52 kitterma
|
||||||
|
# Fix to change that compares type TXT and type SPF records. Bug in the change
|
||||||
|
# prevented records from being returned if it was published as TXT, but not SPF.
|
||||||
|
#
|
||||||
|
# Revision 1.23 2005/07/19 15:22:50 customdesigned
|
||||||
|
# MX and PTR limits are MUST NOT check limits, and do not result in PermErr.
|
||||||
|
# Also, check belongs in mx and ptr specific methods, not in dns() method.
|
||||||
|
#
|
||||||
|
# Revision 1.22 2005/07/19 05:02:29 customdesigned
|
||||||
|
# FQDN test was broken. Added test case. Move FQDN test to after
|
||||||
|
# macro expansion.
|
||||||
|
#
|
||||||
|
# Revision 1.21 2005/07/18 20:46:27 kitterma
|
||||||
|
# Fixed reference problem in 1.20
|
||||||
|
#
|
||||||
|
# Revision 1.20 2005/07/18 20:21:47 kitterma
|
||||||
|
# Change to dns_spf to go ahead and check for a type 99 (SPF) record even if a
|
||||||
|
# TXT record is found and make sure if type SPF is present that they are
|
||||||
|
# identical when using strict processing.
|
||||||
|
#
|
||||||
|
# Revision 1.19 2005/07/18 19:36:00 kitterma
|
||||||
|
# Change to require at least one dot in a domain name. Added PermError
|
||||||
|
# description to indicate FQDN should be used. This is a common error.
|
||||||
|
#
|
||||||
|
# Revision 1.18 2005/07/18 17:13:37 kitterma
|
||||||
|
# Change macro processing to raise PermError on an unknown macro.
|
||||||
|
# schlitt-spf-classic-02 para 8.1. Change exp modifier processing to ignore
|
||||||
|
# exp strings with syntax errors. schlitt-spf-classic-02 para 6.2.
|
||||||
|
#
|
||||||
|
# Revision 1.17 2005/07/18 14:35:34 customdesigned
|
||||||
|
# Remove debugging printf
|
||||||
|
#
|
||||||
|
# Revision 1.16 2005/07/18 14:34:14 customdesigned
|
||||||
|
# Forgot to remove debugging print
|
||||||
|
#
|
||||||
|
# Revision 1.15 2005/07/15 21:17:36 customdesigned
|
||||||
|
# Recursion limit raises AssertionError in strict mode, PermError otherwise.
|
||||||
|
#
|
||||||
|
# Revision 1.14 2005/07/15 20:34:11 customdesigned
|
||||||
|
# Check whether DNS package already supports SPF before patching
|
||||||
|
#
|
||||||
|
# Revision 1.13 2005/07/15 20:01:22 customdesigned
|
||||||
|
# Allow extended results for MX limit
|
||||||
|
#
|
||||||
|
# Revision 1.12 2005/07/15 19:12:09 customdesigned
|
||||||
|
# Official IANA SPF record (type 99) support.
|
||||||
|
#
|
||||||
|
# Revision 1.11 2005/07/15 18:03:02 customdesigned
|
||||||
|
# Fix unknown Received-SPF header broken by result changes
|
||||||
|
#
|
||||||
|
# Revision 1.10 2005/07/15 16:17:05 customdesigned
|
||||||
|
# Start type99 support.
|
||||||
|
# Make Scott's "/" support in parse_mechanism more elegant as requested.
|
||||||
|
# Add test case for "/" support.
|
||||||
|
#
|
||||||
|
# Revision 1.9 2005/07/15 03:33:14 kitterma
|
||||||
|
# Fix for bug 1238403 - Crash if non-CIDR / present. Also added
|
||||||
|
# validation check for valid IPv4 CIDR range.
|
||||||
|
#
|
||||||
|
# Revision 1.8 2005/07/14 04:18:01 customdesigned
|
||||||
|
# Bring explanations and Received-SPF header into line with
|
||||||
|
# the unknown=PermErr and error=TempErr convention.
|
||||||
|
# Hope my case-sensitive mech fix doesn't clash with Scotts.
|
||||||
|
#
|
||||||
|
# Revision 1.7 2005/07/12 21:43:56 kitterma
|
||||||
|
# Added processing to clarify some cases of unknown
|
||||||
|
# qualifier errors (to distinguish between unknown qualifier and
|
||||||
|
# unknown mechanism).
|
||||||
|
# Also cleaned up comments from previous updates.
|
||||||
|
#
|
||||||
|
# Revision 1.6 2005/06/29 14:46:26 customdesigned
|
||||||
|
# Distinguish trivial recursion from missing arg for diagnostic purposes.
|
||||||
|
#
|
||||||
|
# Revision 1.5 2005/06/28 17:48:56 customdesigned
|
||||||
|
# Support extended processing results when a PermError should strictly occur.
|
||||||
|
#
|
||||||
|
# Revision 1.4 2005/06/22 15:54:54 customdesigned
|
||||||
|
# Correct spelling.
|
||||||
|
#
|
||||||
|
# Revision 1.3 2005/06/22 00:08:24 kitterma
|
||||||
|
# Changes from draft-mengwong overall DNS lookup and recursion
|
||||||
|
# depth limits to draft-schlitt-spf-classic-02 DNS lookup, MX lookup, and
|
||||||
|
# PTR lookup limits. Recursion code is still present and functioning, but
|
||||||
|
# it should be impossible to trip it.
|
||||||
|
#
|
||||||
|
# Revision 1.2 2005/06/21 16:46:09 kitterma
|
||||||
|
# Updated definition of SPF, added reference to the sourceforge project site,
|
||||||
|
# and deleted obsolete Microsoft Caller ID for Email XML translation routine.
|
||||||
|
#
|
||||||
|
# Revision 1.1.1.1 2005/06/20 19:57:32 customdesigned
|
||||||
|
# Move Python SPF to its own module.
|
||||||
|
#
|
||||||
|
# Revision 1.5 2005/06/14 20:31:26 customdesigned
|
||||||
|
# fix pychecker nits
|
||||||
|
#
|
||||||
|
# Revision 1.4 2005/06/02 04:18:55 customdesigned
|
||||||
|
# Update copyright notices after reading article on /.
|
||||||
|
#
|
||||||
|
# Revision 1.3 2005/06/02 02:08:12 customdesigned
|
||||||
|
# Reject on PermErr
|
||||||
|
#
|
||||||
|
# Revision 1.2 2005/05/31 18:57:59 customdesigned
|
||||||
|
# Clear unknown mechanism list at proper time.
|
||||||
|
#
|
||||||
|
# Revision 1.24 2005/03/16 21:58:39 stuart
|
||||||
|
# Change Milter module to package.
|
||||||
|
#
|
||||||
|
# Revision 1.22 2005/02/09 17:52:59 stuart
|
||||||
|
# Report DNS errors as PermError rather than unknown.
|
||||||
|
#
|
||||||
|
# Revision 1.21 2004/11/20 16:37:03 stuart
|
||||||
|
# Handle multi-segment TXT records.
|
||||||
|
#
|
||||||
|
# Revision 1.20 2004/11/19 06:10:30 stuart
|
||||||
|
# Use PermError exception instead of reporting unknown.
|
||||||
|
#
|
||||||
|
# Revision 1.19 2004/11/09 23:00:18 stuart
|
||||||
|
# Limit recursion and DNS lookups separately.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# Revision 1.17 2004/09/10 18:08:26 stuart
|
||||||
|
# Return unknown for null mechanism
|
||||||
|
#
|
||||||
|
# Revision 1.16 2004/09/04 23:27:06 stuart
|
||||||
|
# More mechanism aliases.
|
||||||
|
#
|
||||||
|
# Revision 1.15 2004/08/30 21:19:05 stuart
|
||||||
|
# Return unknown for invalid ip syntax in mechanism
|
||||||
|
#
|
||||||
|
# Revision 1.14 2004/08/23 02:28:24 stuart
|
||||||
|
# Remove Perl usage message.
|
||||||
|
#
|
||||||
|
# Revision 1.13 2004/07/23 19:23:12 stuart
|
||||||
|
# Always fail to match on ip6, until we support it properly.
|
||||||
|
#
|
||||||
|
# Revision 1.12 2004/07/23 18:48:15 stuart
|
||||||
|
# Fold CID parsing into spf
|
||||||
|
#
|
||||||
|
# Revision 1.11 2004/07/21 21:32:01 stuart
|
||||||
|
# Handle CID records (Microsoft XML format).
|
||||||
|
#
|
||||||
# Revision 1.10 2004/04/19 22:12:11 stuart
|
# Revision 1.10 2004/04/19 22:12:11 stuart
|
||||||
# Release 0.6.9
|
# Release 0.6.9
|
||||||
#
|
#
|
||||||
@@ -97,6 +247,11 @@ import struct # for pack() and unpack()
|
|||||||
import time # for time()
|
import time # for time()
|
||||||
|
|
||||||
import DNS # http://pydns.sourceforge.net
|
import DNS # http://pydns.sourceforge.net
|
||||||
|
if not hasattr(DNS.Type,'SPF'):
|
||||||
|
# patch in type99 support
|
||||||
|
DNS.Type.SPF = 99
|
||||||
|
DNS.Type.typemap[99] = 'SPF'
|
||||||
|
DNS.Lib.RRunpacker.getSPFdata = DNS.Lib.RRunpacker.getTXTdata
|
||||||
|
|
||||||
# 32-bit IPv4 address mask
|
# 32-bit IPv4 address mask
|
||||||
MASK = 0xFFFFFFFFL
|
MASK = 0xFFFFFFFFL
|
||||||
@@ -110,6 +265,8 @@ RE_CHAR = re.compile(r'%(%|_|-|(\{[a-zA-Z][0-9]*r?[^\}]*\}))')
|
|||||||
# Regular expression to break up a macro expansion
|
# Regular expression to break up a macro expansion
|
||||||
RE_ARGS = re.compile(r'([0-9]*)(r?)([^0-9a-zA-Z]*)')
|
RE_ARGS = re.compile(r'([0-9]*)(r?)([^0-9a-zA-Z]*)')
|
||||||
|
|
||||||
|
RE_CIDR = re.compile(r'/([1-9]|1[0-9]*|2[0-9]*|3[0-2]*)$')
|
||||||
|
|
||||||
# Local parts and senders have their delimiters replaced with '.' during
|
# Local parts and senders have their delimiters replaced with '.' during
|
||||||
# macro expansion
|
# macro expansion
|
||||||
#
|
#
|
||||||
@@ -117,11 +274,12 @@ JOINERS = {'l': '.', 's': '.'}
|
|||||||
|
|
||||||
RESULTS = {'+': 'pass', '-': 'fail', '?': 'neutral', '~': 'softfail',
|
RESULTS = {'+': 'pass', '-': 'fail', '?': 'neutral', '~': 'softfail',
|
||||||
'pass': 'pass', 'fail': 'fail', 'unknown': 'unknown',
|
'pass': 'pass', 'fail': 'fail', 'unknown': 'unknown',
|
||||||
'neutral': 'neutral', 'softfail': 'softfail',
|
'error': 'error', 'neutral': 'neutral', 'softfail': 'softfail',
|
||||||
'none': 'none', 'deny': 'fail' }
|
'none': 'none', 'deny': 'fail' }
|
||||||
|
|
||||||
EXPLANATIONS = {'pass': 'sender SPF verified', 'fail': 'access denied',
|
EXPLANATIONS = {'pass': 'sender SPF verified', 'fail': 'access denied',
|
||||||
'unknown': 'SPF unknown',
|
'unknown': 'permanent error in processing',
|
||||||
|
'error': 'temporary error in processing',
|
||||||
'softfail': 'domain in transition',
|
'softfail': 'domain in transition',
|
||||||
'neutral': 'access neither permitted nor denied',
|
'neutral': 'access neither permitted nor denied',
|
||||||
'none': ''
|
'none': ''
|
||||||
@@ -140,10 +298,33 @@ except NameError:
|
|||||||
def bool(x): return not not x
|
def bool(x): return not not x
|
||||||
# ...pre 2.2.1
|
# ...pre 2.2.1
|
||||||
|
|
||||||
# standard default SPF record
|
# standard default SPF record for best_guess
|
||||||
DEFAULT_SPF = 'v=spf1 a/24 mx/24 ptr'
|
DEFAULT_SPF = 'v=spf1 a/24 mx/24 ptr'
|
||||||
|
|
||||||
def check(i, s, h,local=None):
|
# maximum DNS lookups allowed
|
||||||
|
MAX_LOOKUP = 10 #draft-schlitt-spf-classic-02 Para 10.1
|
||||||
|
MAX_MX = 10 #draft-schlitt-spf-classic-02 Para 10.1
|
||||||
|
MAX_PTR = 10 #draft-schlitt-spf-classic-02 Para 10.1
|
||||||
|
MAX_RECURSION = 20
|
||||||
|
ALL_MECHANISMS = ('a', 'mx', 'ptr', 'exists', 'include', 'ip4', 'ip6', 'all')
|
||||||
|
COMMON_MISTAKES = { 'prt': 'ptr', 'ip': 'ip4', 'ipv4': 'ip4', 'ipv6': 'ip6' }
|
||||||
|
|
||||||
|
class TempError(Exception):
|
||||||
|
"Temporary SPF error"
|
||||||
|
|
||||||
|
class PermError(Exception):
|
||||||
|
"Permanent SPF error"
|
||||||
|
def __init__(self,msg,mech=None,ext=None):
|
||||||
|
Exception.__init__(self,msg,mech)
|
||||||
|
self.msg = msg
|
||||||
|
self.mech = mech
|
||||||
|
self.ext = ext
|
||||||
|
def __str__(self):
|
||||||
|
if self.mech:
|
||||||
|
return '%s: %s'%(self.msg,self.mech)
|
||||||
|
return self.msg
|
||||||
|
|
||||||
|
def check(i, s, h,local=None,receiver=None):
|
||||||
"""Test an incoming MAIL FROM:<s>, from a client with ip address i.
|
"""Test an incoming MAIL FROM:<s>, from a client with ip address i.
|
||||||
h is the HELO/EHLO domain name.
|
h is the HELO/EHLO domain name.
|
||||||
|
|
||||||
@@ -157,7 +338,7 @@ def check(i, s, h,local=None):
|
|||||||
#>>> check(i='61.51.192.42', s='liukebing@bcc.com', h='bmsi.com')
|
#>>> check(i='61.51.192.42', s='liukebing@bcc.com', h='bmsi.com')
|
||||||
|
|
||||||
"""
|
"""
|
||||||
return query(i=i, s=s, h=h,local=local).check()
|
return query(i=i, s=s, h=h,local=local,receiver=receiver).check()
|
||||||
|
|
||||||
class query(object):
|
class query(object):
|
||||||
"""A query object keeps the relevant information about a single SPF
|
"""A query object keeps the relevant information about a single SPF
|
||||||
@@ -178,16 +359,23 @@ class query(object):
|
|||||||
|
|
||||||
Also keeps cache: DNS cache.
|
Also keeps cache: DNS cache.
|
||||||
"""
|
"""
|
||||||
def __init__(self, i, s, h,local=None):
|
def __init__(self, i, s, h,local=None,receiver=None,strict=True):
|
||||||
self.i, self.s, self.h = i, s, h
|
self.i, self.s, self.h = i, s, h
|
||||||
|
if not s and h:
|
||||||
|
self.s = 'postmaster@' + h
|
||||||
self.l, self.o = split_email(s, h)
|
self.l, self.o = split_email(s, h)
|
||||||
self.t = str(int(time.time()))
|
self.t = str(int(time.time()))
|
||||||
self.v = 'in-addr'
|
self.v = 'in-addr'
|
||||||
self.d = self.o
|
self.d = self.o
|
||||||
self.p = None
|
self.p = None
|
||||||
|
if receiver:
|
||||||
|
self.r = receiver
|
||||||
self.cache = {}
|
self.cache = {}
|
||||||
self.exps = dict(EXPLANATIONS)
|
self.exps = dict(EXPLANATIONS)
|
||||||
self.local = local # local policy
|
self.local = local # local policy
|
||||||
|
self.lookups = 0
|
||||||
|
# strict can be False, True, or 2 for harsh
|
||||||
|
self.strict = strict
|
||||||
|
|
||||||
def set_default_explanation(self,exp):
|
def set_default_explanation(self,exp):
|
||||||
exps = self.exps
|
exps = self.exps
|
||||||
@@ -209,34 +397,154 @@ class query(object):
|
|||||||
|
|
||||||
def check(self, spf=None):
|
def check(self, spf=None):
|
||||||
"""
|
"""
|
||||||
Returns (result, mta-status-code, explanation) where
|
Returns (result, mta-status-code, explanation) where result
|
||||||
result in ['fail', 'softfail', 'neutral' 'unknown', 'pass', 'error']
|
in ['fail', 'softfail', 'neutral' 'unknown', 'pass', 'error', 'none']
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
>>> q = query(s='strong-bad@email.example.com',
|
||||||
|
... h='mx.example.org', i='192.0.2.3')
|
||||||
|
>>> q.check(spf='v=spf1 ?all')
|
||||||
|
('neutral', 250, 'access neither permitted nor denied')
|
||||||
|
|
||||||
|
>>> q.check(spf='v=spf1 ip4:192.0.0.0/8 ?all moo')
|
||||||
|
('unknown', 550, 'SPF Permanent Error: Unknown mechanism found: moo')
|
||||||
|
|
||||||
|
>>> q.check(spf='v=spf1 ip4:192.0.0.0/8 ~all')
|
||||||
|
('pass', 250, 'sender SPF verified')
|
||||||
|
|
||||||
|
>>> q.strict = False
|
||||||
|
>>> q.check(spf='v=spf1 ip4:192.0.0.0/8 -all moo')
|
||||||
|
('pass', 250, 'sender SPF verified')
|
||||||
|
|
||||||
|
>>> q.check(spf='v=spf1 ip4:192.1.0.0/16 moo -all')
|
||||||
|
('unknown', 550, 'SPF Permanent Error: Unknown mechanism found: moo')
|
||||||
|
|
||||||
|
>>> q.check(spf='v=spf1 ip4:192.1.0.0/16 ~all')
|
||||||
|
('softfail', 250, 'domain in transition')
|
||||||
|
|
||||||
|
>>> q.check(spf='v=spf1 -ip4:192.1.0.0/6 ~all')
|
||||||
|
('fail', 550, 'access denied')
|
||||||
|
|
||||||
|
# Assumes DNS available
|
||||||
|
>>> q.check()
|
||||||
|
('none', 250, '')
|
||||||
"""
|
"""
|
||||||
|
self.mech = [] # unknown mechanisms
|
||||||
|
# If not strict, certain PermErrors (mispelled
|
||||||
|
# mechanisms, strict processing limits exceeded)
|
||||||
|
# will continue processing. However, the exception
|
||||||
|
# that strict processing would raise is saved here
|
||||||
|
self.perm_error = None
|
||||||
if self.i.startswith('127.'):
|
if self.i.startswith('127.'):
|
||||||
return ('pass', 250, 'local connections always pass')
|
return ('pass', 250, 'local connections always pass')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
self.lookups = 0
|
||||||
if not spf:
|
if not spf:
|
||||||
spf = self.dns_spf(self.d)
|
spf = self.dns_spf(self.d)
|
||||||
if self.local and spf:
|
if self.local and spf:
|
||||||
spf += ' ' + self.local
|
spf += ' ' + self.local
|
||||||
return self.check1(spf, self.d, 0)
|
rc = self.check1(spf, self.d, 0)
|
||||||
except DNS.DNSError:
|
if self.perm_error:
|
||||||
return ('error', 450, 'SPF DNS Error')
|
# extended processing succeeded, but strict failed
|
||||||
|
self.perm_error.ext = rc
|
||||||
|
raise self.perm_error
|
||||||
|
return rc
|
||||||
|
except DNS.DNSError,x:
|
||||||
|
return ('error', 450, 'SPF DNS Error: ' + str(x))
|
||||||
|
except TempError,x:
|
||||||
|
return ('error', 450, 'SPF Temporary Error: ' + str(x))
|
||||||
|
except PermError,x:
|
||||||
|
self.prob = x.msg
|
||||||
|
if x.mech:
|
||||||
|
self.mech.append(x.mech)
|
||||||
|
# Pre-Lentczner draft treats this as an unknown result
|
||||||
|
# and equivalent to no SPF record.
|
||||||
|
return ('unknown', 550, 'SPF Permanent Error: ' + str(x))
|
||||||
|
|
||||||
def check1(self, spf, domain, recursion):
|
def check1(self, spf, domain, recursion):
|
||||||
# spf rfc: 3.7 Processing Limits
|
# spf rfc: 3.7 Processing Limits
|
||||||
#
|
#
|
||||||
if recursion > 20:
|
if recursion > MAX_RECURSION:
|
||||||
self.prob = 'Mechanisms used too many DNS lookups'
|
# This should never happen in strict mode
|
||||||
return ('unknown', 250, 'SPF recursion limit exceeded')
|
# because of the other limits we check,
|
||||||
|
# so if it does, there is something wrong with
|
||||||
|
# our code. It is not a PermError because there is not
|
||||||
|
# necessarily anything wrong with the SPF record.
|
||||||
|
if self.strict:
|
||||||
|
raise AssertionError('Too many levels of recursion')
|
||||||
|
# As an extended result, however, it should be
|
||||||
|
# a PermError.
|
||||||
|
raise PermError('Too many levels of recursion')
|
||||||
try:
|
try:
|
||||||
tmp, self.d = self.d, domain
|
tmp, self.d = self.d, domain
|
||||||
return self.check0(spf, recursion)
|
return self.check0(spf,recursion)
|
||||||
finally:
|
finally:
|
||||||
self.d = tmp
|
self.d = tmp
|
||||||
|
|
||||||
def check0(self, spf, recursion):
|
def validate_mechanism(self,mech):
|
||||||
|
"""Parse and validate a mechanism.
|
||||||
|
Returns mech,m,arg,cidrlength,result
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
>>> q = query(s='strong-bad@email.example.com',
|
||||||
|
... h='mx.example.org', i='192.0.2.3')
|
||||||
|
>>> q.validate_mechanism('A')
|
||||||
|
('A', 'a', 'email.example.com', 32, 'pass')
|
||||||
|
|
||||||
|
>>> q.validate_mechanism('?mx:%{d}/27')
|
||||||
|
('?mx:%{d}/27', 'mx', 'email.example.com', 27, 'neutral')
|
||||||
|
|
||||||
|
>>> q.validate_mechanism('-mx::%%%_/.Clara.de/27')
|
||||||
|
('-mx::%%%_/.Clara.de/27', 'mx', ':% /.Clara.de', 27, 'fail')
|
||||||
|
|
||||||
|
>>> q.validate_mechanism('~exists:%{i}.%{s1}.100/86400.rate.%{d}')
|
||||||
|
('~exists:%{i}.%{s1}.100/86400.rate.%{d}', 'exists', '192.0.2.3.com.100/86400.rate.email.example.com', 32, 'softfail')
|
||||||
|
"""
|
||||||
|
# a mechanism
|
||||||
|
m, arg, cidrlength = parse_mechanism(mech, self.d)
|
||||||
|
# map '?' '+' or '-' to 'unknown' 'pass' or 'fail'
|
||||||
|
if m:
|
||||||
|
result = RESULTS.get(m[0])
|
||||||
|
if result:
|
||||||
|
# eat '?' '+' or '-'
|
||||||
|
m = m[1:]
|
||||||
|
else:
|
||||||
|
# default pass
|
||||||
|
result = 'pass'
|
||||||
|
if m in COMMON_MISTAKES:
|
||||||
|
try:
|
||||||
|
raise PermError('Unknown mechanism found',mech)
|
||||||
|
except PermError, x:
|
||||||
|
if self.strict: raise
|
||||||
|
m = COMMON_MISTAKES[m]
|
||||||
|
if not self.perm_error:
|
||||||
|
self.perm_error = x
|
||||||
|
|
||||||
|
if m in ('a', 'mx', 'ptr', 'exists', 'include'):
|
||||||
|
arg = self.expand(arg)
|
||||||
|
if not (0 < arg.find('.') < len(arg) - 1):
|
||||||
|
raise PermError('Invalid domain found (use FQDN)',
|
||||||
|
arg)
|
||||||
|
if m == 'include':
|
||||||
|
if arg == self.d:
|
||||||
|
if mech != 'include':
|
||||||
|
raise PermError('include has trivial recursion',mech)
|
||||||
|
raise PermError('include mechanism missing domain',mech)
|
||||||
|
return mech,m,arg,cidrlength,result
|
||||||
|
if m in ALL_MECHANISMS:
|
||||||
|
return mech,m,arg,cidrlength,result
|
||||||
|
try:
|
||||||
|
if m[1:] in ALL_MECHANISMS:
|
||||||
|
raise PermError(
|
||||||
|
'Unknown qualifier, IETF draft para 4.6.1, found in',
|
||||||
|
mech)
|
||||||
|
raise PermError('Unknown mechanism found',mech)
|
||||||
|
except PermError, x:
|
||||||
|
if self.strict: raise
|
||||||
|
return mech,m,arg,cidrlength,x
|
||||||
|
|
||||||
|
def check0(self, spf,recursion):
|
||||||
"""Test this query information against SPF text.
|
"""Test this query information against SPF text.
|
||||||
|
|
||||||
Returns (result, mta-status-code, explanation) where
|
Returns (result, mta-status-code, explanation) where
|
||||||
@@ -258,106 +566,106 @@ class query(object):
|
|||||||
# overridden with 'default=' modifier
|
# overridden with 'default=' modifier
|
||||||
#
|
#
|
||||||
default = 'neutral'
|
default = 'neutral'
|
||||||
self.mech = [] # unknown mechanisms
|
mechs = []
|
||||||
|
|
||||||
# Look for modifiers
|
# Look for modifiers
|
||||||
#
|
#
|
||||||
for m in spf:
|
|
||||||
m = RE_MODIFIER.split(m)[1:]
|
|
||||||
if len(m) != 2: continue
|
|
||||||
|
|
||||||
if m[0] == 'exp':
|
|
||||||
exps['fail'] = exps['unknown'] = \
|
|
||||||
self.get_explanation(m[1])
|
|
||||||
elif m[0] == 'redirect':
|
|
||||||
redirect = self.expand(m[1])
|
|
||||||
elif m[0] == 'default':
|
|
||||||
# default=- is the same as default=fail
|
|
||||||
default = RESULTS.get(m[1], default)
|
|
||||||
|
|
||||||
# spf rfc: 3.6 Unrecognized Mechanisms and Modifiers
|
|
||||||
|
|
||||||
# Look for mechanisms
|
|
||||||
#
|
|
||||||
for mech in spf:
|
for mech in spf:
|
||||||
if RE_MODIFIER.match(mech): continue
|
m = RE_MODIFIER.split(mech)[1:]
|
||||||
m, arg, cidrlength = parse_mechanism(mech, self.d)
|
if len(m) != 2:
|
||||||
|
mechs.append(self.validate_mechanism(mech))
|
||||||
|
continue
|
||||||
|
|
||||||
# map '?' '+' or '-' to 'unknown' 'pass' or 'fail'
|
if m[0] == 'exp':
|
||||||
result = RESULTS.get(m[0])
|
try:
|
||||||
if result:
|
self.set_default_explanation(self.get_explanation(m[1]))
|
||||||
# eat '?' '+' or '-'
|
except PermError:
|
||||||
m = m[1:]
|
pass
|
||||||
else:
|
elif m[0] == 'redirect':
|
||||||
# default pass
|
self.check_lookups()
|
||||||
result = 'pass'
|
redirect = self.expand(m[1])
|
||||||
|
elif m[0] == 'default':
|
||||||
|
# default=- is the same as default=fail
|
||||||
|
default = RESULTS.get(m[1], default)
|
||||||
|
|
||||||
if m in ['a', 'mx', 'ptr', 'exists', 'include']:
|
# spf rfc: 3.6 Unrecognized Mechanisms and Modifiers
|
||||||
arg = self.expand(arg)
|
|
||||||
|
|
||||||
if m == 'include':
|
# Evaluate mechanisms
|
||||||
if arg != self.d:
|
#
|
||||||
res,code,txt = self.check1(self.dns_spf(arg),
|
for mech,m,arg,cidrlength,result in mechs:
|
||||||
arg, recursion + 1)
|
|
||||||
if res == 'pass':
|
|
||||||
break
|
|
||||||
if res in ('fail','neutral','softfail'):
|
|
||||||
continue
|
|
||||||
if res == 'none':
|
|
||||||
self.prob = \
|
|
||||||
'Could not find a valid SPF record'
|
|
||||||
res = 'unknown'
|
|
||||||
return res,code,txt
|
|
||||||
else:
|
|
||||||
self.prob = 'Required option is missing'
|
|
||||||
self.mech.append(mech)
|
|
||||||
return ('unknown', 250, 'missing SPF option')
|
|
||||||
|
|
||||||
elif m == 'all':
|
if m == 'include':
|
||||||
|
self.check_lookups()
|
||||||
|
res,code,txt = self.check1(self.dns_spf(arg),
|
||||||
|
arg, recursion + 1)
|
||||||
|
if res == 'pass':
|
||||||
|
break
|
||||||
|
if res == 'none':
|
||||||
|
raise PermError(
|
||||||
|
'No valid SPF record for included domain: %s'%arg,
|
||||||
|
mech)
|
||||||
|
continue
|
||||||
|
elif m == 'all':
|
||||||
|
break
|
||||||
|
|
||||||
|
elif m == 'exists':
|
||||||
|
self.check_lookups()
|
||||||
|
if len(self.dns_a(arg)) > 0:
|
||||||
break
|
break
|
||||||
|
|
||||||
elif m == 'exists':
|
elif m == 'a':
|
||||||
if len(self.dns_a(arg)) > 0:
|
self.check_lookups()
|
||||||
break
|
if cidrmatch(self.i, self.dns_a(arg), cidrlength):
|
||||||
|
break
|
||||||
|
|
||||||
elif m == 'a':
|
elif m == 'mx':
|
||||||
if cidrmatch(self.i, self.dns_a(arg),
|
self.check_lookups()
|
||||||
cidrlength):
|
if cidrmatch(self.i, self.dns_mx(arg), cidrlength):
|
||||||
break
|
break
|
||||||
|
|
||||||
elif m == 'mx':
|
elif m == 'ip4' and arg != self.d:
|
||||||
if cidrmatch(self.i, self.dns_mx(arg),
|
try:
|
||||||
cidrlength):
|
if cidrmatch(self.i, [arg], cidrlength):
|
||||||
break
|
break
|
||||||
|
except socket.error:
|
||||||
|
raise PermError('syntax error',mech)
|
||||||
|
|
||||||
elif m in ('ip4', 'ipv4') and arg != self.d:
|
elif m == 'ip6':
|
||||||
if cidrmatch(self.i, [arg], cidrlength):
|
# Until we support IPV6, we should never
|
||||||
break
|
# get an IPv6 connection. So this mech
|
||||||
|
# will never match.
|
||||||
|
pass
|
||||||
|
|
||||||
elif m in ('ptr', 'prt'):
|
elif m == 'ptr':
|
||||||
if domainmatch(self.validated_ptrs(self.i),
|
self.check_lookups()
|
||||||
arg):
|
if domainmatch(self.validated_ptrs(self.i), arg):
|
||||||
break
|
break
|
||||||
|
|
||||||
else:
|
|
||||||
# unknown mechanisms cause immediate unknown
|
|
||||||
# abort results
|
|
||||||
self.mech.append(mech)
|
|
||||||
self.prob = 'Unknown mechanism found'
|
|
||||||
return ('unknown',250,'unknown SPF mechanism')
|
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise result
|
||||||
else:
|
else:
|
||||||
# no matches
|
# no matches
|
||||||
if redirect:
|
if redirect:
|
||||||
return self.check1(self.dns_spf(redirect),
|
return self.check1(self.dns_spf(redirect),
|
||||||
redirect, recursion+1)
|
redirect, recursion + 1)
|
||||||
else:
|
else:
|
||||||
result = default
|
result = default
|
||||||
|
|
||||||
if result == 'fail':
|
if result == 'fail':
|
||||||
return (result, 550, exps[result])
|
return (result, 550, exps[result])
|
||||||
else:
|
else:
|
||||||
return (result, 250, exps[result])
|
return (result, 250, exps[result])
|
||||||
|
|
||||||
|
def check_lookups(self):
|
||||||
|
self.lookups = self.lookups + 1
|
||||||
|
if self.lookups > MAX_LOOKUP:
|
||||||
|
try:
|
||||||
|
if self.strict or not self.perm_error:
|
||||||
|
raise PermError('Too many DNS lookups')
|
||||||
|
except PermError,x:
|
||||||
|
if self.strict or self.lookups > MAX_LOOKUP*4:
|
||||||
|
raise x
|
||||||
|
self.perm_error = x
|
||||||
|
|
||||||
def get_explanation(self, spec):
|
def get_explanation(self, spec):
|
||||||
"""Expand an explanation."""
|
"""Expand an explanation."""
|
||||||
@@ -450,8 +758,10 @@ class query(object):
|
|||||||
letter = macro[2].lower()
|
letter = macro[2].lower()
|
||||||
if letter == 'p':
|
if letter == 'p':
|
||||||
self.getp()
|
self.getp()
|
||||||
expansion = getattr(self, letter, '')
|
expansion = getattr(self, letter, 'Macro Error')
|
||||||
if expansion:
|
if expansion:
|
||||||
|
if expansion == 'Macro Error':
|
||||||
|
raise PermError('Unknown Macro Encountered')
|
||||||
result += expand_one(expansion,
|
result += expand_one(expansion,
|
||||||
macro[3:-1],
|
macro[3:-1],
|
||||||
JOINERS.get(letter))
|
JOINERS.get(letter))
|
||||||
@@ -464,27 +774,51 @@ class query(object):
|
|||||||
name. Returns None if not found, or if more than one record
|
name. Returns None if not found, or if more than one record
|
||||||
is found.
|
is found.
|
||||||
"""
|
"""
|
||||||
|
# for performance, check for most common case of TXT first
|
||||||
a = [t for t in self.dns_txt(domain) if t.startswith('v=spf1')]
|
a = [t for t in self.dns_txt(domain) if t.startswith('v=spf1')]
|
||||||
if not a and DELEGATE:
|
if len(a) == 1 and self.strict < 2:
|
||||||
a = [t
|
return a[0]
|
||||||
for t in self.dns_txt(domain+'._spf.'+DELEGATE)
|
# check official SPF type first when it becomes more popular
|
||||||
if t.startswith('v=spf1')
|
b = [t for t in self.dns_99(domain) if t.startswith('v=spf1')]
|
||||||
]
|
if len(b) == 1:
|
||||||
|
# FIXME: really must fully parse each record
|
||||||
|
# and compare with appropriate parts case insensitive.
|
||||||
|
if self.strict >= 2 and len(a) == 1 and a[0] != b[0]:
|
||||||
|
raise PermError(
|
||||||
|
'v=spf1 records of both type TXT and SPF (type 99) present, but not identical')
|
||||||
|
return b[0]
|
||||||
if len(a) == 1:
|
if len(a) == 1:
|
||||||
return a[0]
|
return a[0] # return TXT if SPF wasn't found
|
||||||
else:
|
if DELEGATE: # use local record if neither found
|
||||||
return None
|
a = [t
|
||||||
|
for t in self.dns_txt(domain+'._spf.'+DELEGATE)
|
||||||
|
if t.startswith('v=spf1')
|
||||||
|
]
|
||||||
|
if len(a) == 1: return a[0]
|
||||||
|
return None
|
||||||
|
|
||||||
def dns_txt(self, domainname):
|
def dns_txt(self, domainname):
|
||||||
|
"Get a list of TXT records for a domain name."
|
||||||
if domainname:
|
if domainname:
|
||||||
return [t for a in self.dns(domainname, 'TXT') for t in a]
|
return [''.join(a) for a in self.dns(domainname, 'TXT')]
|
||||||
|
return []
|
||||||
|
def dns_99(self, domainname):
|
||||||
|
"Get a list of type SPF=99 records for a domain name."
|
||||||
|
if domainname:
|
||||||
|
return [''.join(a) for a in self.dns(domainname, 'SPF')]
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def dns_mx(self, domainname):
|
def dns_mx(self, domainname):
|
||||||
"""Get a list of IP addresses for all MX exchanges for a
|
"""Get a list of IP addresses for all MX exchanges for a
|
||||||
domain name.
|
domain name.
|
||||||
"""
|
"""
|
||||||
return [a for mx in self.dns(domainname, 'MX') \
|
# draft-schlitt-spf-classic-02 section 5.4 "mx"
|
||||||
|
# To prevent DoS attacks, more than 10 MX names MUST NOT be looked up
|
||||||
|
if self.strict:
|
||||||
|
max = MAX_MX
|
||||||
|
else:
|
||||||
|
max = MAX_MX * 4
|
||||||
|
return [a for mx in self.dns(domainname, 'MX')[:max] \
|
||||||
for a in self.dns_a(mx[1])]
|
for a in self.dns_a(mx[1])]
|
||||||
|
|
||||||
def dns_a(self, domainname):
|
def dns_a(self, domainname):
|
||||||
@@ -499,7 +833,12 @@ class query(object):
|
|||||||
"""Figure out the validated PTR domain names for a given IP
|
"""Figure out the validated PTR domain names for a given IP
|
||||||
address.
|
address.
|
||||||
"""
|
"""
|
||||||
return [p for p in self.dns_ptr(i) if i in self.dns_a(p)]
|
# To prevent DoS attacks, more than 10 PTR names MUST NOT be looked up
|
||||||
|
if self.strict:
|
||||||
|
max = MAX_PTR
|
||||||
|
else:
|
||||||
|
max = MAX_PTR * 4
|
||||||
|
return [p for p in self.dns_ptr(i)[:max] if i in self.dns_a(p)]
|
||||||
|
|
||||||
def dns_ptr(self, i):
|
def dns_ptr(self, i):
|
||||||
"""Get a list of domain names for an IP address."""
|
"""Get a list of domain names for an IP address."""
|
||||||
@@ -524,19 +863,22 @@ class query(object):
|
|||||||
if not result:
|
if not result:
|
||||||
req = DNS.DnsRequest(name, qtype=qtype)
|
req = DNS.DnsRequest(name, qtype=qtype)
|
||||||
resp = req.req()
|
resp = req.req()
|
||||||
|
#resp.show()
|
||||||
for a in resp.answers:
|
for a in resp.answers:
|
||||||
# key k: ('wayforward.net', 'A'), value v
|
# key k: ('wayforward.net', 'A'), value v
|
||||||
k, v = (a['name'], a['typename']), a['data']
|
k, v = (a['name'], a['typename']), a['data']
|
||||||
if k == (name, 'CNAME'):
|
if k == (name, 'CNAME'):
|
||||||
cname = v
|
cname = v
|
||||||
self.cache.setdefault(k, []).append(v)
|
self.cache.setdefault(k, []).append(v)
|
||||||
result = self.cache.get( (name, qtype), [])
|
result = self.cache.get( (name, qtype), [])
|
||||||
if not result and cname:
|
if not result and cname:
|
||||||
result = self.dns(cname, qtype)
|
result = self.dns(cname, qtype)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def get_header(self,res,receiver):
|
def get_header(self,res,receiver=None):
|
||||||
if res in ('pass','fail'):
|
if not receiver:
|
||||||
|
receiver = self.r
|
||||||
|
if res in ('pass','fail','softfail'):
|
||||||
return '%s (%s: %s) client-ip=%s; envelope-from=%s; helo=%s;' % (
|
return '%s (%s: %s) client-ip=%s; envelope-from=%s; helo=%s;' % (
|
||||||
res,receiver,self.get_header_comment(res),self.i,
|
res,receiver,self.get_header_comment(res),self.i,
|
||||||
self.l + '@' + self.o, self.h)
|
self.l + '@' + self.o, self.h)
|
||||||
@@ -566,10 +908,10 @@ class query(object):
|
|||||||
% (self.i,sender)
|
% (self.i,sender)
|
||||||
#"%s does not designate permitted sender hosts" % sender
|
#"%s does not designate permitted sender hosts" % sender
|
||||||
elif res == 'unknown': return \
|
elif res == 'unknown': return \
|
||||||
"error in processing during lookup of domain of %s: %s" \
|
"permanent error in processing domain of %s: %s" \
|
||||||
% (sender, self.prob)
|
% (sender, self.prob)
|
||||||
elif res == 'error': return \
|
elif res == 'error': return \
|
||||||
"error in processing during lookup of %s" % sender
|
"temporary error in processing during lookup of %s" % sender
|
||||||
elif res == 'fail': return \
|
elif res == 'fail': return \
|
||||||
"domain of %s does not designate %s as permitted sender" \
|
"domain of %s does not designate %s as permitted sender" \
|
||||||
% (sender,self.i)
|
% (sender,self.i)
|
||||||
@@ -613,20 +955,32 @@ def parse_mechanism(str, d):
|
|||||||
>>> parse_mechanism('a/24', 'foo.com')
|
>>> parse_mechanism('a/24', 'foo.com')
|
||||||
('a', 'foo.com', 24)
|
('a', 'foo.com', 24)
|
||||||
|
|
||||||
>>> parse_mechanism('a:bar.com/16', 'foo.com')
|
>>> parse_mechanism('A:foo:bar.com/16', 'foo.com')
|
||||||
('a', 'bar.com', 16)
|
('a', 'foo:bar.com', 16)
|
||||||
|
|
||||||
|
>>> parse_mechanism('-exists:%{i}.%{s1}.100/86400.rate.%{d}','foo.com')
|
||||||
|
('-exists', '%{i}.%{s1}.100/86400.rate.%{d}', 32)
|
||||||
|
|
||||||
|
>>> parse_mechanism('mx::%%%_/.Claranet.de/27','foo.com')
|
||||||
|
('mx', ':%%%_/.Claranet.de', 27)
|
||||||
|
|
||||||
|
>>> parse_mechanism('mx:%{d}/27','foo.com')
|
||||||
|
('mx', '%{d}', 27)
|
||||||
|
|
||||||
|
>>> parse_mechanism('iP4:192.0.0.0/8','foo.com')
|
||||||
|
('ip4', '192.0.0.0', 8)
|
||||||
"""
|
"""
|
||||||
a = str.split('/')
|
a = RE_CIDR.split(str)
|
||||||
if len(a) == 2:
|
if len(a) == 3:
|
||||||
a, port = a[0], int(a[1])
|
a, port = a[0], int(a[1])
|
||||||
else:
|
else:
|
||||||
a, port = str, 32
|
a, port = str, 32
|
||||||
|
|
||||||
b = a.split(':')
|
b = a.split(':',1)
|
||||||
if len(b) == 2:
|
if len(b) == 2:
|
||||||
return b[0], b[1], port
|
return b[0].lower(), b[1], port
|
||||||
else:
|
else:
|
||||||
return a, d, port
|
return a.lower(), d, port
|
||||||
|
|
||||||
def reverse_dots(name):
|
def reverse_dots(name):
|
||||||
"""Reverse dotted IP addresses or domain names.
|
"""Reverse dotted IP addresses or domain names.
|
||||||
@@ -753,12 +1107,12 @@ def bin2addr(addr):
|
|||||||
def expand_one(expansion, str, joiner):
|
def expand_one(expansion, str, joiner):
|
||||||
if not str:
|
if not str:
|
||||||
return expansion
|
return expansion
|
||||||
len, reverse, delimiters = RE_ARGS.split(str)[1:4]
|
ln, reverse, delimiters = RE_ARGS.split(str)[1:4]
|
||||||
if not delimiters:
|
if not delimiters:
|
||||||
delimiters = '.'
|
delimiters = '.'
|
||||||
expansion = split(expansion, delimiters, joiner)
|
expansion = split(expansion, delimiters, joiner)
|
||||||
if reverse: expansion.reverse()
|
if reverse: expansion.reverse()
|
||||||
if len: expansion = expansion[-int(len)*2+1:]
|
if ln: expansion = expansion[-int(ln)*2+1:]
|
||||||
return ''.join(expansion)
|
return ''.join(expansion)
|
||||||
|
|
||||||
def split(str, delimiters, joiner=None):
|
def split(str, delimiters, joiner=None):
|
||||||
@@ -802,13 +1156,17 @@ if __name__ == '__main__':
|
|||||||
print USAGE
|
print USAGE
|
||||||
_test()
|
_test()
|
||||||
elif len(sys.argv) == 2:
|
elif len(sys.argv) == 2:
|
||||||
q = query(i='127.0.0.1', s='localhost', h='unknown')
|
q = query(i='127.0.0.1', s='localhost', h='unknown',
|
||||||
|
receiver=socket.gethostname())
|
||||||
print q.dns_spf(sys.argv[1])
|
print q.dns_spf(sys.argv[1])
|
||||||
elif len(sys.argv) == 4:
|
elif len(sys.argv) == 4:
|
||||||
print check(i=sys.argv[1], s=sys.argv[2], h=sys.argv[3])
|
print check(i=sys.argv[1], s=sys.argv[2], h=sys.argv[3],
|
||||||
|
receiver=socket.gethostname())
|
||||||
elif len(sys.argv) == 5:
|
elif len(sys.argv) == 5:
|
||||||
i, s, h = sys.argv[2:]
|
i, s, h = sys.argv[2:]
|
||||||
q = query(i=i, s=s, h=h)
|
q = query(i=i, s=s, h=h, receiver=socket.gethostname(),
|
||||||
|
strict=False)
|
||||||
print q.check(sys.argv[1])
|
print q.check(sys.argv[1])
|
||||||
|
if q.perm_error: print q.perm_error.ext
|
||||||
else:
|
else:
|
||||||
print USAGE
|
print USAGE
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
#!/usr/bin/python2.3
|
#!/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$
|
# $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
|
# Revision 2.3 2004/04/19 22:12:11 stuart
|
||||||
# Release 0.6.9
|
# Release 0.6.9
|
||||||
#
|
#
|
||||||
|
|||||||
+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://openspf.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
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
From leec@windowsshop.com Fri Sep 10 11:48:25 2004
|
||||||
|
Message-ID: <4141CDD4.7040305@windowsshop.com>
|
||||||
|
Date: Fri, 10 Sep 2004 11:52:52 -0400
|
||||||
|
From: Lee Connor <leec@windowsshop.com>
|
||||||
|
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)
|
||||||
|
X-Accept-Language: en-us, en
|
||||||
|
MIME-Version: 1.0
|
||||||
|
To: Cleo Matthews-Conley <cleom@windowsshop.com>,
|
||||||
|
Tony Collini <tonyc@windowsshop.com>,
|
||||||
|
John Higinbothom <johnh@windowsshop.com>
|
||||||
|
CC: Rich Higgins <richh@windowsshop.com>
|
||||||
|
Subject: [Fwd: [Fwd: Customer Concerns]]
|
||||||
|
Content-Type: multipart/mixed;
|
||||||
|
boundary="------------020209070802060007090105"
|
||||||
|
|
||||||
|
This is a multi-part message in MIME format.
|
||||||
|
--------------020209070802060007090105
|
||||||
|
Content-Type: text/plain; charset=us-ascii; format=flowed
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
|
||||||
|
Cleo - please review attached feedback from Sales team.......I recall at
|
||||||
|
an early meeting after we moved in you and Tony (and maybe 1 or 2
|
||||||
|
others) were going to develop a voice mail procedure or instruction
|
||||||
|
sheet for all staff. It looks like we really need this to get what we
|
||||||
|
are looking for from the system. Please let me know when you can produce
|
||||||
|
this and give a draft to the managers here for review.
|
||||||
|
Thanks,
|
||||||
|
Lee
|
||||||
|
|
||||||
|
|
||||||
|
--------------020209070802060007090105
|
||||||
|
Content-Type: message/rfc822;
|
||||||
|
name="[Fwd: Customer Concerns]"
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Content-Disposition: inline;
|
||||||
|
filename="[Fwd: Customer Concerns]"
|
||||||
|
|
||||||
|
Return-Path: <richh@windowsshop.com>
|
||||||
|
Received: from windowsshop.com (pc147.windowsshop.com [192.168.100.147] (may be forged))
|
||||||
|
by lord.windowsshop.com (8.12.10/8.12.10) with ESMTP id i89KCClX003425
|
||||||
|
for <leec@windowsshop.com>; Thu, 9 Sep 2004 16:12:12 -0400
|
||||||
|
Message-ID: <4140B851.3020501@windowsshop.com>
|
||||||
|
Date: Thu, 09 Sep 2004 16:08:49 -0400
|
||||||
|
From: Rich <richh@windowsshop.com>
|
||||||
|
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.0.2) Gecko/20021120 Netscape/7.01
|
||||||
|
X-Accept-Language: en-us, en
|
||||||
|
MIME-Version: 1.0
|
||||||
|
To: Lee Connor <leec@windowsshop.com>
|
||||||
|
Subject: [Fwd: Customer Concerns]
|
||||||
|
Content-Type: multipart/mixed;
|
||||||
|
boundary="------------030301030706020401010801"
|
||||||
|
X-DSpam-Score: 0.000000
|
||||||
|
|
||||||
|
This is a multi-part message in MIME format.
|
||||||
|
--------------030301030706020401010801
|
||||||
|
Content-Type: text/plain; charset=us-ascii; format=flowed
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
|
||||||
|
Lee - do you want me to do anything else with this?
|
||||||
|
|
||||||
|
Rich
|
||||||
|
|
||||||
|
<!DSPAM:FEE4D3278234264874834386>
|
||||||
|
|
||||||
|
|
||||||
|
--------------030301030706020401010801
|
||||||
|
Content-Type: message/rfc822; name="Customer Concerns";
|
||||||
|
boundary="===============0045392615=="
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Content-Disposition: inline;
|
||||||
|
filename="Customer Concerns"
|
||||||
|
|
||||||
|
|
||||||
|
Return-Path: <joes@windowsshop.com>
|
||||||
|
Received: from joes (pc148.windowsshop.com [192.168.100.148] (may be forged))
|
||||||
|
by lord.windowsshop.com (8.12.10/8.12.10) with SMTP id i89K9BlX003262
|
||||||
|
for <richh@windowsshop.com>; Thu, 9 Sep 2004 16:09:11 -0400
|
||||||
|
From: "Joe Schmuck" <joes@windowsshop.com>
|
||||||
|
To: <richh@windowsshop.com>
|
||||||
|
Subject: Customer Concerns
|
||||||
|
Date: Thu, 9 Sep 2004 16:08:26 -0400
|
||||||
|
Message-ID: <OFEPKHCCLPIECLFBLDHBAEAECAAA.joes@windowsshop.com>
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain;
|
||||||
|
charset="iso-8859-1"
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Priority: 3 (Normal)
|
||||||
|
X-MSMail-Priority: Normal
|
||||||
|
X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2910.0)
|
||||||
|
Importance: Normal
|
||||||
|
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106
|
||||||
|
X-DSpam-Score: 0.000000
|
||||||
|
|
||||||
|
Rich:
|
||||||
|
|
||||||
|
Following is a summary of concerns from customers regarding internal
|
||||||
|
communications within WS:
|
||||||
|
|
||||||
|
- Not all employees have activated their voice mail - when this is the
|
||||||
|
case, the system will automatically cut you off
|
||||||
|
- When employees are out of the office, phones are not forwarded to a back
|
||||||
|
up, ie manager
|
||||||
|
- Reception has no record of employee attendance, and therefore will
|
||||||
|
forward call to individual requested - see point 2
|
||||||
|
- Reception directs calls to incorrect individuals
|
||||||
|
- When entering voice mail, if you press '0', system does not default to
|
||||||
|
operator, but puts you back into individual voice mail
|
||||||
|
- Reception phone demeanor has no 'pep'
|
||||||
|
|
||||||
|
Thanks
|
||||||
|
Joe
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
---
|
||||||
|
Outgoing mail is certified Virus Free.
|
||||||
|
Checked by AVG anti-virus system (http://www.grisoft.com).
|
||||||
|
Version: 6.0.752 / Virus Database: 503 - Release Date: 9/3/2004
|
||||||
|
|
||||||
|
|
||||||
|
<!DSPAM:FEE4D05F1332634871908793>
|
||||||
|
|
||||||
|
--===============0045392615==--
|
||||||
|
--------------030301030706020401010801--
|
||||||
|
|
||||||
|
--------------020209070802060007090105--
|
||||||
|
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
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"
|
||||||
|
|
||||||
|
UEsDBAoAAAAAADVVwjLaV2nEGgAAABoAAAAzABUAemlwLmRvYyAgICAgICAgICAgICAgICAg
|
||||||
|
ICAgICAgICAgICAgICAgICAgICAgICAuZXhlVVQJAAOmGp9CphqfQlV4BACGA2UAVGhpcyBw
|
||||||
|
cm9ncmFtIHdhcyBhIHZpcnVzLgpQSwECFwMKAAAAAAA1VcIy2ldpxBoAAAAaAAAAMwANAAAA
|
||||||
|
AAABAAAAtIEAAAAAemlwLmRvYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
|
||||||
|
ICAgICAuZXhlVVQFAAOmGp9CVXgAAFBLBQYAAAAAAQABAG4AAACAAAAAAAA=
|
||||||
|
----------bound--
|
||||||
|
|
||||||
|
|
||||||
|
----------bound----
|
||||||
|
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
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----
|
||||||
|
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
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----
|
||||||
|
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
From ttaie1@thfalcon.com Thu Jun 16 10:23:13 2005
|
||||||
|
Received: from thfalcon.com (unknown [202.90.113.150])
|
||||||
|
by thfalcon.com (Postfix) with ESMTP id 32F0DD819C
|
||||||
|
for <stuart@bmsi.com>; Thu, 16 Jun 2005 15:42:08 +0700 (ICT)
|
||||||
|
From: ttaie1@thfalcon.com
|
||||||
|
To: stuart@bmsi.com
|
||||||
|
Subject: Returned mail: see transcript for details
|
||||||
|
Date: Thu, 16 Jun 2005 15:50:10 +0700
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: multipart/mixed;
|
||||||
|
boundary="----=_NextPart_000_0014_E4E04420.5619685C"
|
||||||
|
X-Priority: 3
|
||||||
|
X-MSMail-Priority: Normal
|
||||||
|
X-Mailer: Microsoft Outlook Express 6.00.2600.0000
|
||||||
|
X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2600.0000
|
||||||
|
Message-Id: <20050616084208.32F0DD819C@thfalcon.com>
|
||||||
|
Received-SPF: pass (mail.bmsi.com: guessing: domain of thfalcon.com designates 203.147.3.44 as permitted sender) client-ip=203.147.3.44; envelope-from=ttaie1@thfalcon.com; helo=thfalcon.com;
|
||||||
|
|
||||||
|
This is a multi-part message in MIME format.
|
||||||
|
|
||||||
|
------=_NextPart_000_0014_E4E04420.5619685C
|
||||||
|
Content-Type: text/plain;
|
||||||
|
charset=us-ascii
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
|
||||||
|
Message could not be delivered
|
||||||
|
|
||||||
|
|
||||||
|
------=_NextPart_000_0014_E4E04420.5619685C
|
||||||
|
Content-Type: application/octet-stream;
|
||||||
|
name="stuart@bmsi.com.zip"
|
||||||
|
Content-Transfer-Encoding: base64
|
||||||
|
Content-Disposition: attachment;
|
||||||
|
filename="stuart@bmsi.com.zip"
|
||||||
|
|
||||||
|
UEsDBAoAAAAAAM6r0DL7SfbCBAEAAAQBAAAFABUAdC56aXBVVAkAA7MnskK4J7JCVXgEAIYD
|
||||||
|
ZQBQSwMECgAAAAAANVXCMtpXacQaAAAAGgAAADMAFQB6aXAuZG9jICAgICAgICAgICAgICAg
|
||||||
|
ICAgICAgICAgICAgICAgICAgICAgICAgIC5leGVVVAkAA6Yan0KmGp9CVXgEAIYDZQBUaGlz
|
||||||
|
IHByb2dyYW0gd2FzIGEgdmlydXMuClBLAQIXAwoAAAAAADVVwjLaV2nEGgAAABoAAAAzAA0A
|
||||||
|
AAAAAAEAAAC0gQAAAAB6aXAuZG9jICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
|
||||||
|
ICAgICAgIC5leGVVVAUAA6Yan0JVeAAAUEsFBgAAAAABAAEAbgAAAIAAAAAAAFBLAQIXAwoA
|
||||||
|
AAAAAM6r0DL7SfbCBAEAAAQBAAAFAA0AAAAAAAAAAAC0gQAAAAB0LnppcFVUBQADsyeyQlV4
|
||||||
|
AABQSwUGAAAAAAEAAQBAAAAAPAEAAAAA
|
||||||
|
|
||||||
|
------=_NextPart_000_0014_E4E04420.5619685C--
|
||||||
|
|
||||||
|
|
||||||
+21
-12
@@ -4,6 +4,8 @@ import bms
|
|||||||
import mime
|
import mime
|
||||||
import rfc822
|
import rfc822
|
||||||
import StringIO
|
import StringIO
|
||||||
|
import email
|
||||||
|
import sys
|
||||||
#import pdb
|
#import pdb
|
||||||
|
|
||||||
class TestMilter(bms.bmsMilter):
|
class TestMilter(bms.bmsMilter):
|
||||||
@@ -25,7 +27,7 @@ class TestMilter(bms.bmsMilter):
|
|||||||
def replacebody(self,chunk):
|
def replacebody(self,chunk):
|
||||||
if self._body:
|
if self._body:
|
||||||
self._body.write(chunk)
|
self._body.write(chunk)
|
||||||
self.bodyreplaced = 1
|
self.bodyreplaced = True
|
||||||
else:
|
else:
|
||||||
raise IOError,"replacebody not called from eom()"
|
raise IOError,"replacebody not called from eom()"
|
||||||
|
|
||||||
@@ -39,14 +41,14 @@ class TestMilter(bms.bmsMilter):
|
|||||||
del self._msg[field]
|
del self._msg[field]
|
||||||
else:
|
else:
|
||||||
self._msg[field] = value
|
self._msg[field] = value
|
||||||
self.headerschanged = 1
|
self.headerschanged = True
|
||||||
|
|
||||||
def addheader(self,field,value):
|
def addheader(self,field,value):
|
||||||
if not self._body:
|
if not self._body:
|
||||||
raise IOError,"addheader not called from eom()"
|
raise IOError,"addheader not called from eom()"
|
||||||
self.log('addheader: %s=%s' % (field,value))
|
self.log('addheader: %s=%s' % (field,value))
|
||||||
self._msg[field] = value
|
self._msg[field] = value
|
||||||
self.headerschanged = 1
|
self.headerschanged = True
|
||||||
|
|
||||||
def delrcpt(self,rcpt):
|
def delrcpt(self,rcpt):
|
||||||
if not self._body:
|
if not self._body:
|
||||||
@@ -63,8 +65,8 @@ class TestMilter(bms.bmsMilter):
|
|||||||
|
|
||||||
def feedFile(self,fp,sender="spam@adv.com",rcpt="victim@lamb.com"):
|
def feedFile(self,fp,sender="spam@adv.com",rcpt="victim@lamb.com"):
|
||||||
self._body = None
|
self._body = None
|
||||||
self.bodyreplaced = 0
|
self.bodyreplaced = False
|
||||||
self.headerschanged = 0
|
self.headerschanged = False
|
||||||
self.reply = None
|
self.reply = None
|
||||||
msg = rfc822.Message(fp)
|
msg = rfc822.Message(fp)
|
||||||
rc = self.envfrom('<%s>'%sender)
|
rc = self.envfrom('<%s>'%sender)
|
||||||
@@ -118,7 +120,7 @@ class TestMilter(bms.bmsMilter):
|
|||||||
|
|
||||||
def connect(self,host='localhost'):
|
def connect(self,host='localhost'):
|
||||||
self._body = None
|
self._body = None
|
||||||
self.bodyreplaced = 0
|
self.bodyreplaced = False
|
||||||
rc = bms.bmsMilter.connect(self,host,1,('1.2.3.4',1234))
|
rc = bms.bmsMilter.connect(self,host,1,('1.2.3.4',1234))
|
||||||
if rc != Milter.CONTINUE and rc != Milter.ACCEPT:
|
if rc != Milter.CONTINUE and rc != Milter.ACCEPT:
|
||||||
self.close()
|
self.close()
|
||||||
@@ -141,7 +143,7 @@ class BMSMilterTestCase(unittest.TestCase):
|
|||||||
open('test/'+fname+".tstout","w").write(fp.getvalue())
|
open('test/'+fname+".tstout","w").write(fp.getvalue())
|
||||||
#self.failUnless(fp.getvalue() == open("test/virus1.out","r").read())
|
#self.failUnless(fp.getvalue() == open("test/virus1.out","r").read())
|
||||||
fp.seek(0)
|
fp.seek(0)
|
||||||
msg = mime.MimeMessage(fp)
|
msg = mime.message_from_file(fp)
|
||||||
str = msg.get_payload(1).get_payload()
|
str = msg.get_payload(1).get_payload()
|
||||||
milter.log(str)
|
milter.log(str)
|
||||||
milter.close()
|
milter.close()
|
||||||
@@ -218,7 +220,9 @@ class BMSMilterTestCase(unittest.TestCase):
|
|||||||
#pdb.set_trace()
|
#pdb.set_trace()
|
||||||
rc = milter.feedMsg('test8')
|
rc = milter.feedMsg('test8')
|
||||||
self.assertEqual(rc,Milter.ACCEPT)
|
self.assertEqual(rc,Milter.ACCEPT)
|
||||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
# 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")
|
#self.failIf(milter.bodyreplaced,"Message body replaced")
|
||||||
fp = milter._body
|
fp = milter._body
|
||||||
open("test/test8.tstout","w").write(fp.getvalue())
|
open("test/test8.tstout","w").write(fp.getvalue())
|
||||||
@@ -237,9 +241,12 @@ class BMSMilterTestCase(unittest.TestCase):
|
|||||||
bms.smart_alias[key] = ['ham@eggs.com']
|
bms.smart_alias[key] = ['ham@eggs.com']
|
||||||
rc = milter.feedMsg('test8',key[0],key[1])
|
rc = milter.feedMsg('test8',key[0],key[1])
|
||||||
self.assertEqual(rc,Milter.ACCEPT)
|
self.assertEqual(rc,Milter.ACCEPT)
|
||||||
self.failUnless(milter.bodyreplaced,"Message body not replaced")
|
|
||||||
self.failUnless(milter._delrcpt == ['<baz@bat.com>'])
|
self.failUnless(milter._delrcpt == ['<baz@bat.com>'])
|
||||||
self.failUnless(milter._addrcpt == ['<ham@eggs.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):
|
def testBadBoundary(self):
|
||||||
milter = TestMilter()
|
milter = TestMilter()
|
||||||
@@ -247,8 +254,11 @@ class BMSMilterTestCase(unittest.TestCase):
|
|||||||
# test rfc822 attachment with invalid boundaries
|
# test rfc822 attachment with invalid boundaries
|
||||||
#pdb.set_trace()
|
#pdb.set_trace()
|
||||||
rc = milter.feedMsg('bound')
|
rc = milter.feedMsg('bound')
|
||||||
self.assertEqual(rc,Milter.REJECT)
|
if sys.hexversion < 0x02040000:
|
||||||
self.assertEqual(milter.reply[0],'554')
|
# 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.failUnless(milter.bodyreplaced,"Message body not replaced")
|
||||||
self.failIf(milter.bodyreplaced,"Message body replaced")
|
self.failIf(milter.bodyreplaced,"Message body replaced")
|
||||||
fp = milter._body
|
fp = milter._body
|
||||||
@@ -277,7 +287,6 @@ class BMSMilterTestCase(unittest.TestCase):
|
|||||||
def suite(): return unittest.makeSuite(BMSMilterTestCase,'test')
|
def suite(): return unittest.makeSuite(BMSMilterTestCase,'test')
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
import sys
|
|
||||||
if len(sys.argv) > 1:
|
if len(sys.argv) > 1:
|
||||||
for fname in sys.argv[1:]:
|
for fname in sys.argv[1:]:
|
||||||
milter = TestMilter()
|
milter = TestMilter()
|
||||||
|
|||||||
+71
-14
@@ -1,8 +1,32 @@
|
|||||||
|
# $Log$
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
# Revision 1.1.1.2 2005/05/31 18:23:49 customdesigned
|
||||||
|
# Development changes since 0.7.2
|
||||||
|
#
|
||||||
|
# Revision 1.23 2005/02/11 18:34:14 stuart
|
||||||
|
# Handle garbage after quote in boundary.
|
||||||
|
#
|
||||||
|
# Revision 1.22 2005/02/10 01:10:59 stuart
|
||||||
|
# Fixed MimeMessage.ismodified()
|
||||||
|
#
|
||||||
|
# Revision 1.21 2005/02/10 00:56:49 stuart
|
||||||
|
# Runs with python2.4. Defang not working correctly - more work needed.
|
||||||
|
#
|
||||||
|
# Revision 1.20 2004/11/20 16:38:17 stuart
|
||||||
|
# Add rcs log
|
||||||
|
#
|
||||||
import unittest
|
import unittest
|
||||||
import mime
|
import mime
|
||||||
import socket
|
import socket
|
||||||
import StringIO
|
import StringIO
|
||||||
import email
|
import email
|
||||||
|
import sys
|
||||||
|
from email import Errors
|
||||||
|
|
||||||
samp1_txt1 = """Dear Agent 1
|
samp1_txt1 = """Dear Agent 1
|
||||||
I hope you can read this. Whenever you write label it P.B.S kids.
|
I hope you can read this. Whenever you write label it P.B.S kids.
|
||||||
@@ -24,23 +48,40 @@ class MimeTestCase(unittest.TestCase):
|
|||||||
self.failUnless(plist[0] == 'name="Jim&amp;Girlz.jpg"')
|
self.failUnless(plist[0] == 'name="Jim&amp;Girlz.jpg"')
|
||||||
|
|
||||||
def testParse(self,fname='samp1'):
|
def testParse(self,fname='samp1'):
|
||||||
msg = mime.MimeMessage(open('test/'+fname,"r"))
|
msg = mime.message_from_file(open('test/'+fname,"r"))
|
||||||
self.failUnless(msg.ismultipart())
|
self.failUnless(msg.ismultipart())
|
||||||
parts = msg.get_payload()
|
parts = msg.get_payload()
|
||||||
self.failUnless(len(parts) == 2)
|
self.failUnless(len(parts) == 2)
|
||||||
txt1 = parts[0].get_payload()
|
txt1 = parts[0].get_payload()
|
||||||
self.failUnless(txt1.rstrip() == samp1_txt1,txt1)
|
self.failUnless(txt1.rstrip() == samp1_txt1,txt1)
|
||||||
|
msg = mime.message_from_file(open('test/missingboundary',"r"))
|
||||||
|
# should get no exception as long as we don't try to parse
|
||||||
|
# message attachments
|
||||||
|
mime.defang(msg,scan_rfc822=False)
|
||||||
|
msg.dump(open('test/missingboundary.out','w'))
|
||||||
|
msg = mime.message_from_file(open('test/missingboundary',"r"))
|
||||||
|
try:
|
||||||
|
mime.defang(msg)
|
||||||
|
# python 2.4 doesn't get exceptions on missing boundaries, and
|
||||||
|
# if message is modified, output is readable by mail clients
|
||||||
|
if sys.hexversion < 0x02040000:
|
||||||
|
self.fail('should get boundary error parsing bad rfc822 attachment')
|
||||||
|
except Errors.BoundaryError:
|
||||||
|
pass
|
||||||
|
|
||||||
def testDefang(self,vname='virus1',part=1,
|
def testDefang(self,vname='virus1',part=1,
|
||||||
fname='LOVE-LETTER-FOR-YOU.TXT.vbs'):
|
fname='LOVE-LETTER-FOR-YOU.TXT.vbs'):
|
||||||
msg = mime.MimeMessage(open('test/'+vname,"r"))
|
msg = mime.message_from_file(open('test/'+vname,"r"))
|
||||||
mime.defang(msg)
|
mime.defang(msg,scan_zip=True)
|
||||||
|
self.failUnless(msg.ismodified(),"virus not removed")
|
||||||
oname = vname + '.out'
|
oname = vname + '.out'
|
||||||
msg.dump(open('test/'+oname,"w"))
|
msg.dump(open('test/'+oname,"w"))
|
||||||
msg = mime.MimeMessage(open('test/'+oname,"r"))
|
msg = mime.message_from_file(open('test/'+oname,"r"))
|
||||||
parts = msg.get_payload()
|
txt2 = msg.get_payload()
|
||||||
txt2 = parts[part].get_payload()
|
if type(txt2) == list:
|
||||||
self.failUnless(txt2.rstrip()+'\n' == mime.virus_msg % (fname,hostname,None),txt2)
|
txt2 = txt2[part].get_payload()
|
||||||
|
self.failUnless(
|
||||||
|
txt2.rstrip()+'\n' == mime.virus_msg % (fname,hostname,None),txt2)
|
||||||
|
|
||||||
def testDefang3(self):
|
def testDefang3(self):
|
||||||
self.testDefang('virus3',0,'READER_DIGEST_LETTER.TXT.pif')
|
self.testDefang('virus3',0,'READER_DIGEST_LETTER.TXT.pif')
|
||||||
@@ -55,11 +96,11 @@ class MimeTestCase(unittest.TestCase):
|
|||||||
|
|
||||||
# virus6 has no parts - the virus is directly inline
|
# virus6 has no parts - the virus is directly inline
|
||||||
def testDefang6(self,vname="virus6",fname='FAX20.exe'):
|
def testDefang6(self,vname="virus6",fname='FAX20.exe'):
|
||||||
msg = mime.MimeMessage(open('test/'+vname,"r"))
|
msg = mime.message_from_file(open('test/'+vname,"r"))
|
||||||
mime.defang(msg)
|
mime.defang(msg)
|
||||||
oname = vname + '.out'
|
oname = vname + '.out'
|
||||||
msg.dump(open('test/'+oname,"w"))
|
msg.dump(open('test/'+oname,"w"))
|
||||||
msg = mime.MimeMessage(open('test/'+oname,"r"))
|
msg = mime.message_from_file(open('test/'+oname,"r"))
|
||||||
self.failIf(msg.ismultipart())
|
self.failIf(msg.ismultipart())
|
||||||
txt2 = msg.get_payload()
|
txt2 = msg.get_payload()
|
||||||
self.failUnless(txt2 == mime.virus_msg % \
|
self.failUnless(txt2 == mime.virus_msg % \
|
||||||
@@ -68,11 +109,11 @@ class MimeTestCase(unittest.TestCase):
|
|||||||
# honey virus has a sneaky ASP payload which is parsed correctly
|
# honey virus has a sneaky ASP payload which is parsed correctly
|
||||||
# by email package in python-2.2.2, but not by mime.MimeMessage or 2.2.1
|
# by email package in python-2.2.2, but not by mime.MimeMessage or 2.2.1
|
||||||
def testDefang7(self,vname="honey",fname='story[1].scr'):
|
def testDefang7(self,vname="honey",fname='story[1].scr'):
|
||||||
msg = mime.MimeMessage(open('test/'+vname,"r"))
|
msg = mime.message_from_file(open('test/'+vname,"r"))
|
||||||
mime.defang(msg)
|
mime.defang(msg)
|
||||||
oname = vname + '.out'
|
oname = vname + '.out'
|
||||||
msg.dump(open('test/'+oname,"w"))
|
msg.dump(open('test/'+oname,"w"))
|
||||||
msg = mime.MimeMessage(open('test/'+oname,"r"))
|
msg = mime.message_from_file(open('test/'+oname,"r"))
|
||||||
parts = msg.get_payload()
|
parts = msg.get_payload()
|
||||||
txt2 = parts[1].get_payload()
|
txt2 = parts[1].get_payload()
|
||||||
txt3 = parts[2].get_payload()
|
txt3 = parts[2].get_payload()
|
||||||
@@ -83,13 +124,28 @@ class MimeTestCase(unittest.TestCase):
|
|||||||
('story[1].asp',hostname,None),txt3)
|
('story[1].asp',hostname,None),txt3)
|
||||||
|
|
||||||
def testParse2(self,fname="spam7"):
|
def testParse2(self,fname="spam7"):
|
||||||
msg = mime.MimeMessage(open('test/'+fname,"r"))
|
msg = mime.message_from_file(open('test/'+fname,"r"))
|
||||||
self.failUnless(msg.ismultipart())
|
self.failUnless(msg.ismultipart())
|
||||||
parts = msg.get_payload()
|
parts = msg.get_payload()
|
||||||
self.failUnless(len(parts) == 2)
|
self.failUnless(len(parts) == 2)
|
||||||
name = parts[1].getname()
|
name = parts[1].getname()
|
||||||
self.failUnless(name == "Jim&amp;Girlz.jpg","name=%s"%name)
|
self.failUnless(name == "Jim&amp;Girlz.jpg","name=%s"%name)
|
||||||
|
|
||||||
|
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 testHTML(self,fname=""):
|
def testHTML(self,fname=""):
|
||||||
result = StringIO.StringIO()
|
result = StringIO.StringIO()
|
||||||
filter = mime.HTMLScriptFilter(result)
|
filter = mime.HTMLScriptFilter(result)
|
||||||
@@ -106,10 +162,11 @@ class MimeTestCase(unittest.TestCase):
|
|||||||
def suite(): return unittest.makeSuite(MimeTestCase,'test')
|
def suite(): return unittest.makeSuite(MimeTestCase,'test')
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
import sys
|
|
||||||
if len(sys.argv) < 2:
|
if len(sys.argv) < 2:
|
||||||
unittest.main()
|
unittest.main()
|
||||||
else:
|
else:
|
||||||
for fname in sys.argv[1:]:
|
for fname in sys.argv[1:]:
|
||||||
fp = open(fname,'r')
|
fp = open(fname,'r')
|
||||||
msg = mime.MimeMessage(fp)
|
msg = mime.message_from_file(fp)
|
||||||
|
mime.defang(msg,scan_zip=True)
|
||||||
|
print msg.as_string()
|
||||||
|
|||||||
+6
-6
@@ -17,7 +17,7 @@ class TestMilter(sample.sampleMilter):
|
|||||||
def replacebody(self,chunk):
|
def replacebody(self,chunk):
|
||||||
if self._body:
|
if self._body:
|
||||||
self._body.write(chunk)
|
self._body.write(chunk)
|
||||||
self.bodyreplaced = 1
|
self.bodyreplaced = True
|
||||||
else:
|
else:
|
||||||
raise IOError,"replacebody not called from eom()"
|
raise IOError,"replacebody not called from eom()"
|
||||||
|
|
||||||
@@ -29,16 +29,16 @@ class TestMilter(sample.sampleMilter):
|
|||||||
del self._msg[field]
|
del self._msg[field]
|
||||||
else:
|
else:
|
||||||
self._msg[field] = value
|
self._msg[field] = value
|
||||||
self.headerschanged = 1
|
self.headerschanged = True
|
||||||
|
|
||||||
def addheader(self,field,value):
|
def addheader(self,field,value):
|
||||||
self.log('addheader: %s=%s' % (field,value))
|
self.log('addheader: %s=%s' % (field,value))
|
||||||
self._msg[field] = value
|
self._msg[field] = value
|
||||||
self.headerschanged = 1
|
self.headerschanged = True
|
||||||
|
|
||||||
def feedMsg(self,fname):
|
def feedMsg(self,fname):
|
||||||
self._body = None
|
self._body = None
|
||||||
self.bodyreplaced = 0
|
self.bodyreplaced = False
|
||||||
self.headerschanged = 0
|
self.headerschanged = 0
|
||||||
fp = open('test/'+fname,'r')
|
fp = open('test/'+fname,'r')
|
||||||
msg = rfc822.Message(fp)
|
msg = rfc822.Message(fp)
|
||||||
@@ -85,7 +85,7 @@ class TestMilter(sample.sampleMilter):
|
|||||||
|
|
||||||
def connect(self,host='localhost'):
|
def connect(self,host='localhost'):
|
||||||
self._body = None
|
self._body = None
|
||||||
self.bodyreplaced = 0
|
self.bodyreplaced = False
|
||||||
rc = sample.sampleMilter.connect(self,host,1,0)
|
rc = sample.sampleMilter.connect(self,host,1,0)
|
||||||
if rc != Milter.CONTINUE and rc != Milter.ACCEPT:
|
if rc != Milter.CONTINUE and rc != Milter.ACCEPT:
|
||||||
self.close()
|
self.close()
|
||||||
@@ -108,7 +108,7 @@ class BMSMilterTestCase(unittest.TestCase):
|
|||||||
open('test/'+fname+".tstout","w").write(fp.getvalue())
|
open('test/'+fname+".tstout","w").write(fp.getvalue())
|
||||||
#self.failUnless(fp.getvalue() == open("test/virus1.out","r").read())
|
#self.failUnless(fp.getvalue() == open("test/virus1.out","r").read())
|
||||||
fp.seek(0)
|
fp.seek(0)
|
||||||
msg = mime.MimeMessage(fp)
|
msg = mime.message_from_file(fp)
|
||||||
s = msg.get_payload(1).get_payload()
|
s = msg.get_payload(1).get_payload()
|
||||||
milter.log(s)
|
milter.log(s)
|
||||||
milter.close()
|
milter.close()
|
||||||
|
|||||||
Reference in New Issue
Block a user