DandelionNStuff/pymilter
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't check rcpt user list when signed MFROM.

Browse Source
This commit is contained in:
Stuart Gathman
2006-02-12 01:13:58 +00:00
parent ce51034f69
commit 56c1cbd0fd
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms.py
+11 -3
View File
@@ -1,6 +1,9 @@
#!/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.50 2006/02/09 20:39:43 customdesigned
# Use CIDR notation for trusted_relay iplist
#
# Revision 1.49 2006/01/30 23:14:48 customdesigned # Revision 1.49 2006/01/30 23:14:48 customdesigned
# put back eom condition # put back eom condition
# #
@@ -710,7 +713,8 @@ class bmsMilter(Milter.Milter):
return Milter.REJECT return Milter.REJECT
if not self.internal_connection and hostname in hello_blacklist: if not self.internal_connection and hostname in hello_blacklist:
self.log("REJECT: spam from self:",hostname) self.log("REJECT: spam from self:",hostname)
self.setreply('550','5.7.1','I hate talking to myself.') self.setreply('550','5.7.1',
'Your mail server lies. Its name is *not* %s.' % hostname)
return Milter.REJECT return Milter.REJECT
if hostname == 'GC': if hostname == 'GC':
n = gc.collect() n = gc.collect()
@@ -1007,6 +1011,7 @@ class bmsMilter(Milter.Milter):
return Milter.DISCARD return Milter.DISCARD
self.log("rcpt to",to,str) self.log("rcpt to",to,str)
t = parse_addr(to) t = parse_addr(to)
newaddr = False
if len(t) == 2: if len(t) == 2:
t[1] = t[1].lower() t[1] = t[1].lower()
user,domain = t user,domain = t
@@ -1018,7 +1023,8 @@ class bmsMilter(Milter.Milter):
else: else:
newaddr = oldaddr, newaddr = oldaddr,
if len(newaddr) > 1: if len(newaddr) > 1:
self.log("ses rcpt:",newaddr[0]) newaddr = newaddr[0]
self.log("ses rcpt:",newaddr)
else: else:
newaddr = srs.reverse(oldaddr) newaddr = srs.reverse(oldaddr)
# Currently, a sendmail map reverses SRS. We just log it here. # Currently, a sendmail map reverses SRS. We just log it here.
@@ -1039,10 +1045,12 @@ class bmsMilter(Milter.Milter):
# non DSN mail to SRS address will bounce due to invalid local part # non DSN mail to SRS address will bounce due to invalid local part
canon_to = '@'.join(t) canon_to = '@'.join(t)
self.recipients.append(canon_to) self.recipients.append(canon_to)
# FIXME: use newaddr to check rcpt
users = check_user.get(domain) users = check_user.get(domain)
if self.discard: if self.discard:
self.del_recipient(to) self.del_recipient(to)
if users and not user.lower() in users: # don't check userlist if signed MFROM for now
if users and not newaddr and not user.lower() in users:
self.log('REJECT: RCPT TO:',to) self.log('REJECT: RCPT TO:',to)
return Milter.REJECT return Milter.REJECT
if user in block_forward.get(domain,()): if user in block_forward.get(domain,()):