nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 14:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change regex matching to exact

Browse Source
This commit is contained in:
Andrew Williams
2011-07-25 22:31:35 +01:00
parent eec811cc90
commit 36566588e9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/hr/utils.py
View File

@@ -47,19 +47,19 @@ def blacklist_values(user):
# Check Character blacklists # Check Character blacklists
characters = [re.escape(x) for x in evechars.values_list('name', flat=True) if x] characters = [re.escape(x) for x in evechars.values_list('name', flat=True) if x]
if len(characters): if len(characters):
objs = bl_items.filter(type=BLACKLIST_TYPE_CHARACTER, value__iregex=r'(' + '|'.join(characters) + ')') objs = bl_items.filter(type=BLACKLIST_TYPE_CHARACTER, value__iregex=r'^(' + '|'.join(characters) + ')$')
blacklist.extend(objs) blacklist.extend(objs)
# Check Corporation blacklists # Check Corporation blacklists
corporations = [re.escape(x) for x in evechars.values_list('corporation__name', flat=True) if x] corporations = [re.escape(x) for x in evechars.values_list('corporation__name', flat=True) if x]
if len(corporations): if len(corporations):
objs = bl_items.filter(type=BLACKLIST_TYPE_CORPORATION, value__iregex=r'(' + '|'.join(corporations) + ')') objs = bl_items.filter(type=BLACKLIST_TYPE_CORPORATION, value__iregex=r'^(' + '|'.join(corporations) + ')$')
blacklist.extend(objs) blacklist.extend(objs)
# Check Alliance blacklists # Check Alliance blacklists
alliances = [re.escape(x) for x in evechars.values_list('corporation__alliance__name', flat=True) if x] alliances = [re.escape(x) for x in evechars.values_list('corporation__alliance__name', flat=True) if x]
if len(alliances): if len(alliances):
objs = bl_items.filter(type=BLACKLIST_TYPE_ALLIANCE, value__iregex=r'(' + '|'.join([x for x in alliances if x]) + ')') objs = bl_items.filter(type=BLACKLIST_TYPE_ALLIANCE, value__iregex=r'^(' + '|'.join([x for x in alliances if x]) + ')$')
blacklist.extend(objs) blacklist.extend(objs)
# Check API Key blacklists # Check API Key blacklists