Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 351c70b

Browse files
stamparmstamparm
committed
Locale module screws string.letters, etc. in some cases (e.g. IDLE run)
1 parent ca53dfa commit 351c70b

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎lib/core/common.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -931,9 +931,9 @@ def randomStr(length=4, lowercase=False, alphabet=None):
931931
if alphabet:
932932
retVal = "".join(random.choice(alphabet) for _ in xrange(0, length))
933933
elif lowercase:
934-
retVal = "".join(random.choice(string.lowercase) for _ in xrange(0, length))
934+
retVal = "".join(random.choice(string.ascii_lowercase) for _ in xrange(0, length))
935935
else:
936-
retVal = "".join(random.choice(string.letters) for _ in xrange(0, length))
936+
retVal = "".join(random.choice(string.ascii_letters) for _ in xrange(0, length))
937937

938938
return retVal
939939

‎lib/core/purge.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def purge(directory):
6060
logger.debug("renaming filenames to random values")
6161
for filepath in filepaths:
6262
try:
63-
os.rename(filepath, os.path.join(os.path.dirname(filepath), "".join(random.sample(string.letters, random.randint(4, 8)))))
63+
os.rename(filepath, os.path.join(os.path.dirname(filepath), "".join(random.sample(string.ascii_letters, random.randint(4, 8)))))
6464
except:
6565
pass
6666

@@ -69,7 +69,7 @@ def purge(directory):
6969
logger.debug("renaming directory names to random values")
7070
for dirpath in dirpaths:
7171
try:
72-
os.rename(dirpath, os.path.join(os.path.dirname(dirpath), "".join(random.sample(string.letters, random.randint(4, 8)))))
72+
os.rename(dirpath, os.path.join(os.path.dirname(dirpath), "".join(random.sample(string.ascii_letters, random.randint(4, 8)))))
7373
except:
7474
pass
7575

‎lib/core/settings.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447
HASHDB_FLUSH_RETRIES = 3
448448

449449
# Unique milestone value used for forced deprecation of old HashDB values (e.g. when changing hash/pickle mechanism)
450-
HASHDB_MILESTONE_VALUE = "cAWxkLYCQT" # r5129 "".join(random.sample(string.letters, 10))
450+
HASHDB_MILESTONE_VALUE = "cAWxkLYCQT" # r5129 "".join(random.sample(string.ascii_letters, 10))
451451

452452
# Warn user of possible delay due to large page dump in full UNION query injections
453453
LARGE_OUTPUT_THRESHOLD = 1024 ** 2
@@ -468,7 +468,7 @@
468468
MAX_DNS_LABEL = 63
469469

470470
# Alphabet used for prefix and suffix strings of name resolution requests in DNS technique (excluding hexadecimal chars for not mixing with inner content)
471-
DNS_BOUNDARIES_ALPHABET = re.sub("[a-fA-F]", "", string.letters)
471+
DNS_BOUNDARIES_ALPHABET = re.sub("[a-fA-F]", "", string.ascii_letters)
472472

473473
# Alphabet used for heuristic checks
474474
HEURISTIC_CHECK_ALPHABET = ('"', '\'', ')', '(', '[', ']', ',', '.')

‎tamper/space2dash.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def tamper(payload, **kwargs):
3636
if payload:
3737
for i in xrange(len(payload)):
3838
if payload[i].isspace():
39-
randomStr = ''.join(random.choice(string.ascii_uppercase + string.lowercase) for _ in xrange(random.randint(6, 12)))
39+
randomStr = ''.join(random.choice(string.ascii_uppercase + string.ascii_lowercase) for _ in xrange(random.randint(6, 12)))
4040
retVal += "--%s%%0A" % randomStr
4141
elif payload[i] == '#' or payload[i:i + 3] == '-- ':
4242
retVal += payload[i:]

‎tamper/space2hash.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def tamper(payload, **kwargs):
4444
if payload:
4545
for i in xrange(len(payload)):
4646
if payload[i].isspace():
47-
randomStr = ''.join(random.choice(string.ascii_uppercase + string.lowercase) for _ in xrange(random.randint(6, 12)))
47+
randomStr = ''.join(random.choice(string.ascii_uppercase + string.ascii_lowercase) for _ in xrange(random.randint(6, 12)))
4848
retVal += "%%23%s%%0A" % randomStr
4949
elif payload[i] == '#' or payload[i:i + 3] == '-- ':
5050
retVal += payload[i:]

‎tamper/space2morehash.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def tamper(payload, **kwargs):
4444

4545
def process(match):
4646
word = match.group('word')
47-
randomStr = ''.join(random.choice(string.ascii_uppercase + string.lowercase) for _ in xrange(random.randint(6, 12)))
47+
randomStr = ''.join(random.choice(string.ascii_uppercase + string.ascii_lowercase) for _ in xrange(random.randint(6, 12)))
4848

4949
if word.upper() in kb.keywords and word.upper() not in IGNORE_SPACE_AFFECTED_KEYWORDS:
5050
return match.group().replace(word, "%s%%23%s%%0A" % (word, randomStr))
@@ -58,7 +58,7 @@ def process(match):
5858

5959
for i in xrange(len(payload)):
6060
if payload[i].isspace():
61-
randomStr = ''.join(random.choice(string.ascii_uppercase + string.lowercase) for _ in xrange(random.randint(6, 12)))
61+
randomStr = ''.join(random.choice(string.ascii_uppercase + string.ascii_lowercase) for _ in xrange(random.randint(6, 12)))
6262
retVal += "%%23%s%%0A" % randomStr
6363
elif payload[i] == '#' or payload[i:i + 3] == '-- ':
6464
retVal += payload[i:]

0 commit comments

Comments
 (0)