Hopiu/django-defender
1
0
Fork 0
mirror of https://github.com/jazzband/django-defender.git synced 2026-03-16 22:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix strip_keys method (returns wrong response method when there is string containing in key_list)

Browse source
This commit is contained in:
Dashgin 2022-05-22 00:19:13 +04:00 committed by Ken Cochrane
parent ac36751561
commit 428968b238
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
defender/utils.py
View file

@ -1,6 +1,7 @@
from ipaddress import ip_address
import logging
import re
import sys
from django.http import HttpResponse
from django.http import HttpResponseRedirect
@ -127,20 +128,42 @@ def get_username_blocked_cache_key(username):
)
def remove_prefix(string, prefix):
# backwards compatibility for str.removeprefix for python < 3.9
if sys.version_info < (3, 9):
if string.startswith(prefix):
return string[len(prefix) :]
return string
return string.removeprefix(prefix)
def strip_keys(key_list):
""" Given a list of keys, remove the prefix and remove just
the data we care about.
for example:
['defender:blocked:ip:ken', 'defender:blocked:ip:joffrey']
[
'defender:blocked:ip:192.168.24.24',
'defender:blocked:ip:::ffff:192.168.24.24',
'defender:blocked:username:joffrey'
]
would result in:
['ken', 'joffrey']
[
'192.168.24.24',
'::ffff:192.168.24.24',
'joffrey'
]
"""
return [key.split(":")[-1] for key in key_list]
return [
# key.removeprefix(f"{config.CACHE_PREFIX}:blocked:").partition(":")[2]
remove_prefix(key, f"{config.CACHE_PREFIX}:blocked:").partition(":")[2]
for key in key_list
]
def get_blocked_ips():