Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upload from python 2 to python 3 #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

upload from python 2 to python 3 #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions upload-fuzz-dic-builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import argparse
import copy
import urllib
import urllib.parse

## 各类语言可解析的后缀
html_parse_suffix = ['html','htm','phtml','pht','Html','Htm','pHtml']
Expand All @@ -30,7 +31,7 @@ def apache_suffix_creater(suffix):
for l in suffix:
str = '%s.xxx' % l
res.append(str)
str = '%s%s' % (l,urllib.unquote('%0a')) #CVE-2017-15715
str = '%s%s' % (l,urllib.parse.unquote('%0a')) #CVE-2017-15715
res.append(str)
return res

Expand All @@ -49,7 +50,7 @@ def str_81_to_ff():
for i in range(129,256):
str = '%x' % i
str = '%' + str
str = urllib.unquote(str)
str = urllib.parse.unquote(str)
res.append(str)
return res

Expand All @@ -69,7 +70,7 @@ def str_00_truncation(suffix,allow_suffix):
for i in suffix:
str = '%s%s.%s' % (i,'%00',allow_suffix)
res.append(str)
str = '%s%s.%s' % (i,urllib.unquote('%00'),allow_suffix)
str = '%s%s.%s' % (i,urllib.parse.unquote('%00'),allow_suffix)
res.append(str)
return res

Expand Down Expand Up @@ -203,7 +204,7 @@ def parse_args():
parse_suffix = jsp_parse_suffix
else: # language == 'all'
parse_suffix = html_parse_suffix + asp_parse_suffix + php_parse_suffix + jsp_parse_suffix
print u'[+] 收集%d条可解析后缀完毕！' % len(parse_suffix)
print('[+] 收集%d条可解析后缀完毕！' % len(parse_suffix))

# 可解析后缀 + 大小写混合
if os == 'win' or os == 'all':
Expand All @@ -212,7 +213,7 @@ def parse_args():
case_php_parse_suffix = list_case_mixing(php_parse_suffix)
case_jsp_parse_suffix = list_case_mixing(jsp_parse_suffix)
case_parse_suffix = list_case_mixing(parse_suffix)
print u'[+] 加入%d条可解析后缀大小写混合完毕！' % len(case_parse_suffix)
print('[+] 加入%d条可解析后缀大小写混合完毕！' % len(case_parse_suffix))
else: # os == 'linux'
case_html_parse_suffix = html_parse_suffix
case_asp_parse_suffix = asp_parse_suffix
Expand Down Expand Up @@ -242,15 +243,15 @@ def parse_args():
middleware_parse_suffix = iis_parse_suffix + apache_parse_suffix + tomcat_parse_suffix

middleware_parse_suffix = duplicate_removal(middleware_parse_suffix)
print u'[+] 加入%d条中间件漏洞完毕！' % len(middleware_parse_suffix)
print('[+] 加入%d条中间件漏洞完毕！' % len(middleware_parse_suffix))

# .htaccess
if (middleware == 'apache' or middleware == 'all') and (os == 'win' or os == 'all'):
htaccess_suffix = str_case_mixing(".htaccess")
print u'[+] 加入%d条.htaccess完毕！' % len(htaccess_suffix)
print('[+] 加入%d条.htaccess完毕！' % len(htaccess_suffix))
elif (middleware == 'apache' or middleware == 'all') and os == 'linux':
htaccess_suffix = ['.htaccess']
print u'[+] 加入1条.htaccess'
print('[+] 加入1条.htaccess')
else:
htaccess_suffix = []

Expand All @@ -265,7 +266,7 @@ def parse_args():
os_parse_suffix = win_suffix + linux_suffix

os_parse_suffix = duplicate_removal(os_parse_suffix)
print u'[+] 加入%d条系统特性完毕！' % len(os_parse_suffix)
print('[+] 加入%d条系统特性完毕！' % len(os_parse_suffix))

# 语言漏洞

Expand All @@ -274,7 +275,7 @@ def parse_args():
# 双后缀 + 大小写混合
if double_suffix:
double_parse_suffix = list_double_suffix_creater(case_parse_suffix)
print u'[+] 加入%d条双后缀完毕！' % len(double_parse_suffix)
print('[+] 加入%d条双后缀完毕！' % len(double_parse_suffix))
else:
double_parse_suffix = []

Expand All @@ -293,4 +294,4 @@ def parse_args():
f.write(i)
f.write('\n')
f.close()
print u'[+] 去重后共%s条数据写入%s文件' % (num,output_filename)
print('[+] 去重后共%s条数据写入%s文件' % (num,output_filename))