diff options
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Utils.py | 48 |
1 files changed, 38 insertions, 10 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py index 70ef34e8..2404c445 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2015 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -1247,22 +1247,50 @@ def IsDMARCProhibited(mlist, email): # Check a known list in order to auto-moderate verbose members -recentMemberPostings = {}; +# dictionary to remember recent posts. +recentMemberPostings = {} +# counter of times through +clean_count = 0 def IsVerboseMember(mlist, email): + """For lists that request it, we keep track of recent posts by address. +A message from an address to a list, if the list requests it, is remembered +for a specified time whether or not the address is a list member, and if the +address is a member and the member is over the threshold for the list, that +fact is returned.""" + + global clean_count if mlist.member_verbosity_threshold == 0: return False email = email.lower() - t = time.time() - recentMemberPostings.setdefault(email,[]).append(t) - - for t in recentMemberPostings[email]: - if t < time.time() - float(mlist.member_verbosity_interval): - recentMemberPostings[email].remove(t) - - return len(recentMemberPostings[email]) >= mlist.member_verbosity_threshold + now = time.time() + recentMemberPostings.setdefault(email,[]).append(now + + float(mlist.member_verbosity_interval) + ) + x = range(len(recentMemberPostings[email])) + x.reverse() + for i in x: + if recentMemberPostings[email][i] < now: + del recentMemberPostings[email][i] + + clean_count += 1 + if clean_count >= mm_cfg.VERBOSE_CLEAN_LIMIT: + clean_count = 0 + for addr in recentMemberPostings.keys(): + x = range(len(recentMemberPostings[addr])) + x.reverse() + for i in x: + if recentMemberPostings[addr][i] < now: + del recentMemberPostings[addr][i] + if not recentMemberPostings[addr]: + del recentMemberPostings[addr] + if not mlist.isMember(email): + return False + return (len(recentMemberPostings.get(email, [])) >= + mlist.member_verbosity_threshold + ) def check_eq_domains(email, domains_list): |