Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pymilter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
misc
pymilter
Commits
febf56b0
Commit
febf56b0
authored
20 years ago
by
Stuart Gathman
Browse files
Options
Downloads
Patches
Plain Diff
Always log trusted Received and Received-SPF headers.
parent
e9f67730
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
bms.py
+11
-7
11 additions, 7 deletions
bms.py
with
11 additions
and
7 deletions
bms.py
+
11
−
7
View file @
febf56b0
#!/usr/bin/env python
#!/usr/bin/env python
# A simple milter that has grown quite a bit.
# A simple milter that has grown quite a bit.
# $Log$
# $Log$
# Revision 1.12 2005/06/20 22:35:35 customdesigned
# Setreply for rejectvirus.
#
# Revision 1.11 2005/06/17 02:07:20 customdesigned
# Revision 1.11 2005/06/17 02:07:20 customdesigned
# Release 0.8.1
# Release 0.8.1
#
#
...
@@ -669,7 +672,8 @@ class bmsMilter(Milter.Milter):
...
@@ -669,7 +672,8 @@ class bmsMilter(Milter.Milter):
if
len
(
t
)
==
2
:
t
[
1
]
=
t
[
1
].
lower
()
if
len
(
t
)
==
2
:
t
[
1
]
=
t
[
1
].
lower
()
receiver
=
self
.
receiver
receiver
=
self
.
receiver
q
=
spf
.
query
(
self
.
connectip
,
'
@
'
.
join
(
t
),
self
.
hello_name
,
receiver
=
receiver
)
q
=
spf
.
query
(
self
.
connectip
,
'
@
'
.
join
(
t
),
self
.
hello_name
,
receiver
=
receiver
)
q
.
set_default_explanation
(
'
SPF fail: see http://spf.pobox.com/why.html
'
)
q
.
set_default_explanation
(
'
SPF fail: see http://spf.pobox.com/why.html?sender=%s&ip=%s
'
%
(
q
.
s
,
q
.
i
))
res
,
code
,
txt
=
q
.
check
()
res
,
code
,
txt
=
q
.
check
()
if
res
in
(
'
none
'
,
'
softfail
'
):
if
res
in
(
'
none
'
,
'
softfail
'
):
if
self
.
mailfrom
!=
'
<>
'
:
if
self
.
mailfrom
!=
'
<>
'
:
...
@@ -861,12 +865,6 @@ class bmsMilter(Milter.Milter):
...
@@ -861,12 +865,6 @@ class bmsMilter(Milter.Milter):
or
mailer
.
find
(
'
optin
'
)
>=
0
:
or
mailer
.
find
(
'
optin
'
)
>=
0
:
self
.
log
(
'
REJECT: %s: %s
'
%
(
name
,
val
))
self
.
log
(
'
REJECT: %s: %s
'
%
(
name
,
val
))
return
Milter
.
REJECT
return
Milter
.
REJECT
elif
self
.
trust_received
and
lname
==
'
received
'
:
self
.
trust_received
=
False
self
.
log
(
'
%s: %s
'
%
(
name
,
val
.
splitlines
()[
0
]))
elif
self
.
trust_spf
and
lname
==
'
received-spf
'
:
self
.
trust_spf
=
False
self
.
log
(
'
%s: %s
'
%
(
name
,
val
.
splitlines
()[
0
]))
return
Milter
.
CONTINUE
return
Milter
.
CONTINUE
def
forged_bounce
(
self
):
def
forged_bounce
(
self
):
...
@@ -901,6 +899,12 @@ class bmsMilter(Milter.Milter):
...
@@ -901,6 +899,12 @@ class bmsMilter(Milter.Milter):
# log selected headers
# log selected headers
if
log_headers
or
lname
in
(
'
subject
'
,
'
x-mailer
'
):
if
log_headers
or
lname
in
(
'
subject
'
,
'
x-mailer
'
):
self
.
log
(
'
%s: %s
'
%
(
name
,
val
))
self
.
log
(
'
%s: %s
'
%
(
name
,
val
))
elif
self
.
trust_received
and
lname
==
'
received
'
:
self
.
trust_received
=
False
self
.
log
(
'
%s: %s
'
%
(
name
,
val
.
splitlines
()[
0
]))
elif
self
.
trust_spf
and
lname
==
'
received-spf
'
:
self
.
trust_spf
=
False
self
.
log
(
'
%s: %s
'
%
(
name
,
val
.
splitlines
()[
0
]))
if
self
.
fp
:
if
self
.
fp
:
try
:
try
:
val
=
val
.
encode
(
'
us-ascii
'
)
val
=
val
.
encode
(
'
us-ascii
'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment