Added masscan GUI support, added missing static files, updated .gitignore

Author: derpadoo

.gitignore

@@ -19,11 +19,9 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/
@@ -110,4 +108,4 @@ venv.bak/
 /site
 
 # mypy
-.mypy_cache/
+.mypy_cache/

agent/modules/nmap_scanner.py

@@ -119,11 +119,16 @@ def scan_site(scan_job_dict):
         process.wait()
 
         # nmap process completed successfully.
+        # Move files from "pending" directory to "complete" directory.
         if process.returncode == 0:
-            # Move files from "pending" directory to "complete" directory.
-            shutil.move(nmap_file, os.path.join(complete_files_dir, os.path.basename(nmap_file)))
-            shutil.move(gnmap_file, os.path.join(complete_files_dir, os.path.basename(gnmap_file)))
-            shutil.move(xml_file, os.path.join(complete_files_dir, os.path.basename(xml_file)))
+
+            if scan_binary == "masscan":
+                shutil.move(json_file, os.path.join(complete_files_dir, os.path.basename(json_file)))
+
+            elif scan_binary == "nmap":
+                shutil.move(nmap_file, os.path.join(complete_files_dir, os.path.basename(nmap_file)))
+                shutil.move(gnmap_file, os.path.join(complete_files_dir, os.path.basename(gnmap_file)))
+                shutil.move(xml_file, os.path.join(complete_files_dir, os.path.basename(xml_file)))
 
             # Update completed_time, scan_status, and result_file_base_name.
             now_datetime = utils.get_current_time()
@@ -136,6 +141,6 @@ def scan_site(scan_job_dict):
             api.update_scan_information(config_data, scan_job, update_info)
 
     except Exception as e:
-        logger.ROOT_LOGGER.error("Error with scan ID {}.  Exception: {}".format(scan_job["id"], e))
+        logger.ROOT_LOGGER.exception("Error with scan ID {}.  Exception: {}".format(scan_job["id"], e))
         update_info = {"scan_status": "error"}
         api.update_scan_information(config_data, scan_job, update_info)

ansible-playbooks/roles/agent/tasks/main.yml

@@ -19,6 +19,7 @@
     repo: "https://github.com/robertdavidgraham/masscan.git"
     dest: "{{ agent_dir }}/masscan"
     version: master
+  ignore_errors: true  # For re-runs only.
 
 - name: Run make for masscan.
   command: make -j

master/django_scantron/results/views.py

@@ -4,17 +4,28 @@
 from django_scantron.models import ScheduledScan
 
 
-@login_required(login_url='login')
+@login_required(login_url="login")
 def retrieve_scan_file(request, id):
     # Lookup result_file_base_name based of scan ID.
-    result_file_base_name = ScheduledScan.objects.get(id=id).result_file_base_name
-    file_extension = 'nmap'
-    scan_file = '{}.{}'.format(result_file_base_name, file_extension)
+    requested_scan = ScheduledScan.objects.get(id=id)
+
+    result_file_base_name = requested_scan.result_file_base_name
+    scan_binary = requested_scan.scan_binary
+
+    file_extension = ""
+
+    if scan_binary == "nmap":
+        file_extension = "nmap"
+
+    elif scan_binary == "masscan":
+        file_extension = "json"
+
+    scan_file = "{}.{}".format(result_file_base_name, file_extension)
 
     # Serve file using nginx X-Accel-Redirect.
     # https://wellfire.co/learn/nginx-django-x-accel-redirects/
     response = HttpResponse()
-    response['Content-Type'] = 'text/plain'
-    response['Content-Disposition'] = 'inline; filename={}'.format(scan_file)
-    response['X-Accel-Redirect'] = '/protected/complete/{}'.format(scan_file)
+    response["Content-Type"] = "text/plain"
+    response["Content-Disposition"] = "inline; filename={}".format(scan_file)
+    response["X-Accel-Redirect"] = "/protected/complete/{}".format(scan_file)
     return response

master/django_scantron/templates/django_scantron/scheduled_scan_list.html

@@ -22,7 +22,8 @@ <h3>
                     <th>Site Name</th>
                     <th>Scan Agent</th>
                     <th>Scheduled Start Time</th>
-                    <th>nmap Command</th>
+                    <th>Scan Binary</th>
+                    <th>Scan Command</th>
                     <th>Scan Status</th>
                     <th>Completion Time</th>
                     <th>Results File</th>
@@ -36,10 +37,17 @@ <h3>
                     <td>{{ scan.site_name }}</td>
                     <td>{{ scan.scan_agent }}</td>
                     <td>{{ scan.start_time|date:"Y-m-j H:i:s" }}</td>
-                    <td>{{ scan.nmap_command }}</td>
+                    <td>{{ scan.scan_binary }}</td>
+                    <td>{{ scan.scan_binary }} {{ scan.nmap_command }}</td>
                     <td>{{ scan.scan_status }}</td>
                     <td>{{ scan.completed_time|date:"Y-m-j H:i:s" }}</td>
-                    <td><a href={% url "retrieve_scan_file" scan.id %}>{{ scan.result_file_base_name }}.nmap</a></td>
+                    {% if scan.scan_binary == "nmap" %}
+                        <td><a href={% url "retrieve_scan_file" scan.id %}>{{ scan.result_file_base_name }}.nmap</a></td>
+                    {% elif scan.scan_binary == "masscan" %}
+                        <td><a href={% url "retrieve_scan_file" scan.id %}>{{ scan.result_file_base_name }}.json</a></td>
+                    {% else %}
+                        <td>Unknown scan_binary</td>
+                    {% endif %}
                 </tr>
                 {% endfor %}
             </tbody>