Merge pull request #2 from infinition/master

fixes by @infinition

Author: SECUREFOREST

api.py

@@ -143,7 +143,7 @@ def getCVE(request):
 		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)
+			r = requests.get('http://cve.circl.lu/api/#cvefor/'+cpestr)
 			cvejson = r.json()
 
 			for host in cpe[cpestr]:
@@ -156,7 +156,7 @@ def getCVE(request):
 
 		return HttpResponse(json.dumps(res), content_type="application/json")
 
-		r = requests.get('http://cve.circl.lu/api/cvefor/'+request.POST['cpe'])
+		r = requests.get('http://cve.circl.lu/api/#cvefor/'+request.POST['cpe'])
 
 		if request.POST['host'] not in res:
 			res[request.POST['host']] = {}

docker/Dockerfile

@@ -15,27 +15,29 @@
 #   $ mv /tmp/myscan.xml /opt/WebMap/docker/xml
 #
 # Now you can point your browser to http://localhost:8000
+#python3 python3-pip curl wget git wkhtmltopdf libssl1.0-dev vim nmap tzdata
 
 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 vim nmap tzdata
+    python3 python3-pip curl wget git wkhtmltopdf libssl1.1 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 && \
     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/SECUREFOREST/WebMap.git nmapreport 
-
-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
+    git clone https://github.com/infinition/WebMap-1.git nmapreport && \
+    cd nmapreport && git checkout master
+    
+
+RUN cp /opt/nmapdashboard/nmapreport/docker/settings.py /opt/nmapdashboard/nmapdashboard/
+RUN cp /opt/nmapdashboard/nmapreport/docker/urls.py /opt/nmapdashboard/nmapdashboard/
+RUN cp /opt/nmapdashboard/nmapreport/docker/tzdata.sh /root/tzdata.sh
+RUN cp /opt/nmapdashboard/nmapreport/docker/startup.sh /startup.sh
 
 RUN cd /opt/nmapdashboard && python3 manage.py migrate
 RUN apt-get autoremove -y

nmap/cve.py

@@ -77,7 +77,7 @@ def getcve(xmlfile):
 		for cpestr in cpecve['cpe'][i]:
 			print(cpestr)
 			if re.search('^cpe:[^:]+:[^:]+:[^:]+:.+$', cpestr):
-				r = requests.get('http://cve.circl.lu/api/cvefor/'+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())
@@ -92,7 +92,7 @@ def getcve(xmlfile):
 
 		for cvestr in cpecve['cve'][i]:
 			print(cvestr)
-			r = requests.get('http://cve.circl.lu/api/cve/'+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())