WEBDIENSTE/rengine
1
0
Fork 0
mirror of https://github.com/yogeshojha/rengine.git synced 2026-09-29 13:14:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #443 from SiddharthBharadwaj/master

Browse Source 
Fixed multiple issues/errors
This commit is contained in:
Yogesh Ojha
2021-08-29 00:57:15 +05:30
committed by GitHub
parent d7e0a4618e aaa16b413e
commit 20cce14845
6 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.dev.yml
+4
View File
@@ -31,6 +31,7 @@ services:
volumes:
- ./web:/usr/src/app
- github_repos:/usr/src/github
- wordlist:/usr/src/wordlist
- scan_results:/usr/src/scan_results
- gf_patterns:/root/.gf
- nuclei_templates:/root/nuclei-templates
@@ -62,6 +63,7 @@ services:
volumes:
- ./web:/usr/src/app
- github_repos:/usr/src/github
- wordlist:/usr/src/wordlist
- scan_results:/usr/src/scan_results
- gf_patterns:/root/.gf
- nuclei_templates:/root/nuclei-templates
@@ -87,6 +89,7 @@ services:
volumes:
- ./web:/usr/src/app
- github_repos:/usr/src/github
- wordlist:/usr/src/wordlist
- scan_results:/usr/src/scan_results
- gf_patterns:/root/.gf
- nuclei_templates:/root/nuclei-templates
@@ -116,4 +119,5 @@ volumes:
gf_patterns:
nuclei_templates:
github_repos:
wordlist:
scan_results:
docker-compose.yml
+4
View File
@@ -31,6 +31,7 @@ services:
volumes:
- ./web:/usr/src/app
- github_repos:/usr/src/github
- wordlist:/usr/src/wordlist
- scan_results:/usr/src/scan_results
- gf_patterns:/root/.gf
- nuclei_templates:/root/nuclei-templates
@@ -66,6 +67,7 @@ services:
volumes:
- ./web:/usr/src/app
- github_repos:/usr/src/github
- wordlist:/usr/src/wordlist
- scan_results:/usr/src/scan_results
- gf_patterns:/root/.gf
- nuclei_templates:/root/nuclei-templates
@@ -91,6 +93,7 @@ services:
volumes:
- ./web:/usr/src/app
- github_repos:/usr/src/github
- wordlist:/usr/src/wordlist
- scan_results:/usr/src/scan_results
- gf_patterns:/root/.gf
- nuclei_templates:/root/nuclei-templates
@@ -150,6 +153,7 @@ volumes:
gf_patterns:
nuclei_templates:
github_repos:
wordlist:
scan_results:
static_volume:
web/celery-entrypoint.sh
+6 -1
View File
@@ -85,7 +85,12 @@ fi
# store scan_results
if [ ! -d "/usr/src/scan_results" ]
then
mkdir /usr/src/scan_results
mkdir /usr/src/scan_results
fi
# check if default wordlist for amass exists
if [ ! -f /usr/src/wordlist/deepmagic.com-prefixes-top50000.txt ]; then
wget https://raw.githubusercontent.com/danielmiessler/SecLists/master/Discovery/DNS/deepmagic.com-prefixes-top50000.txt -O /usr/src/wordlist/deepmagic.com-prefixes-top50000.txt
fi
# test tools, required for configuration
web/reNgine/tasks.py
+5 -6
View File
@@ -382,17 +382,16 @@ def subdomain_scan(task, domain, yaml_configuration, results_dir, activity_id, o
if AMASS_WORDLIST in yaml_configuration[SUBDOMAIN_DISCOVERY]:
wordlist = yaml_configuration[SUBDOMAIN_DISCOVERY][AMASS_WORDLIST]
if wordlist == 'default':
wordlist_path = settings.TOOL_LOCATION + AMASS_DEFAULT_WORDLIST_PATH
wordlist_path = '/usr/src/wordlist/deepmagic.com-prefixes-top50000.txt'
else:
wordlist_path = settings.TOOL_LOCATION + 'wordlist/' + wordlist + '.txt'
wordlist_path = '/usr/src/wordlist/' + wordlist + '.txt'
if not os.path.exists(wordlist_path):
wordlist_path = settings.TOOL_LOCATION + AMASS_WORDLIST
wordlist_path = '/usr/src/' + AMASS_WORDLIST
amass_command = amass_command + \
' -brute -w {}'.format(wordlist_path)
if amass_config_path:
amass_command = amass_command + \
' -config {}'.format(settings.TOOL_LOCATION +
'scan_results/' + amass_config_path)
' -config {}'.format('/usr/src/scan_results/' + amass_config_path)
# Run Amass Active
logging.info(amass_command)
@@ -878,7 +877,7 @@ def directory_brute(task, domain, yaml_configuration, results_dir, activity_id):
'default' in yaml_configuration[DIR_FILE_SEARCH][WORDLIST]):
wordlist_location = '/usr/src/github/dirsearch/db/dicc.txt'
else:
wordlist_location = settings.TOOL_LOCATION + 'wordlist/' + \
wordlist_location = '/usr/src/wordlist/' + \
yaml_configuration[DIR_FILE_SEARCH][WORDLIST] + '.txt'
dirsearch_command += ' -w {}'.format(wordlist_location)
web/scanEngine/views.py
+3 -3
View File
@@ -97,10 +97,10 @@ def add_wordlist(request):
if form.is_valid() and 'upload_file' in request.FILES:
txt_file = request.FILES['upload_file']
if txt_file.content_type == 'text/plain':
wordlist_content = txt_file.read().decode('UTF-8')
wordlist_path = '/app/tools/wordlist/'
wordlist_content = txt_file.read().decode('UTF-8', "ignore")
wordlist_file = open(
wordlist_path +
'/usr/src/' +
'wordlist/' +
form.cleaned_data['short_name'] + '.txt',
'w')
wordlist_file.write(wordlist_content)
web/startScan/templates/startScan/detail_scan.html
+8 -4
View File
@@ -1508,8 +1508,12 @@ $("#pills-directories-tab").click(function() {
data = JSON.parse(data)['results'];
var html_treeview = `<ul class="file-tree">`;
data = data[0];
main_url = Object.keys(data)[0];
var json_obj = data[main_url];
// if main url has trailing / then we need to omit, otherwise it should be okay to append path
// preserve original url to access json object
url = Object.keys(data)[0]
http_url = url.substring(url.length - 1) == '/' ? url.slice(0, -1): url;
console.log(http_url);
var json_obj = data[url];
for(var i = 0; i < json_obj.length; i++)
{
if(json_obj[i].status==200)
@@ -1518,10 +1522,10 @@ $("#pills-directories-tab").click(function() {
var contentlength = (json_obj[i]["content-length"]/1000).toFixed(2);
// id path has / the its a directory else consider as file
if (path.substr(path.length - 1) == '/') {
html_treeview += `<li class="file-tree-empty-folder"><a href="` + main_url + path + `" target="_blank">` + path + ` (` + contentlength.toString() + ` Kb)</a></li>`;
html_treeview += `<li class="file-tree-empty-folder"><a href="` + http_url + path + `" target="_blank">` + path + ` (` + contentlength.toString() + ` Kb)</a></li>`;
}
else {
html_treeview += `<li id='filePath'><a href="` + main_url + path + `" target="_blank">` + path + ` (` + contentlength.toString() + ` Kb)</a></li>`;
html_treeview += `<li id='filePath'><a href="` + http_url + path + `" target="_blank">` + path + ` (` + contentlength.toString() + ` Kb)</a></li>`;
}
}
}