diff --git a/config.py b/config.py index dbc141a..8f68da5 100644 --- a/config.py +++ b/config.py @@ -36,7 +36,6 @@ # Default scan configuration # This will be used in the "Quick Start" scan. - DEFAULT_SCAN = { 'targets':{ 'networks':[], diff --git a/main.py b/main.py index 4da6311..f9188f2 100644 --- a/main.py +++ b/main.py @@ -1,11 +1,12 @@ import config import os -from flask import Flask -from flask_restful import Api -from core.redis import rds -from core.workers import start_workers +from core.redis import rds +from core.workers import start_workers + from version import VERSION +from flask import Flask +from flask_restful import Api # Import Blueprints from views.view_index import index diff --git a/views/view_console.py b/views/view_console.py index 531a530..4c005b7 100644 --- a/views/view_console.py +++ b/views/view_console.py @@ -2,7 +2,7 @@ from flask import Blueprint, render_template console = Blueprint('console', __name__, - template_folder='templates') + template_folder='templates') @console.route('/console') @session_required diff --git a/views/view_dashboard.py b/views/view_dashboard.py index e2aefb0..93a10c3 100644 --- a/views/view_dashboard.py +++ b/views/view_dashboard.py @@ -4,9 +4,8 @@ from flask import Blueprint, render_template - dashboard = Blueprint('dashboard', __name__, - template_folder='templates') + template_folder='templates') @dashboard.route('/dashboard') @session_required diff --git a/views/view_docs.py b/views/view_docs.py index af165ab..177435e 100644 --- a/views/view_docs.py +++ b/views/view_docs.py @@ -2,7 +2,7 @@ from flask import Blueprint, render_template documentation = Blueprint('documentation', __name__, - template_folder='templates') + template_folder='templates') @documentation.route('/documentation') @session_required diff --git a/views/view_download.py b/views/view_download.py index 4e86699..b402c6c 100644 --- a/views/view_download.py +++ b/views/view_download.py @@ -10,15 +10,14 @@ ) from flask import ( - Blueprint, - request, + Blueprint, flash, redirect, send_from_directory ) download = Blueprint('download', __name__, - template_folder='templates') + template_folder='templates') @download.route('/download/') @session_required diff --git a/views/view_health.py b/views/view_health.py deleted file mode 100644 index e69de29..0000000 diff --git a/views/view_index.py b/views/view_index.py index 5a62546..b5b3cd4 100644 --- a/views/view_index.py +++ b/views/view_index.py @@ -1,14 +1,13 @@ from core.security import session_required from flask import ( Blueprint, - render_template, request, redirect, make_response ) index = Blueprint('index', __name__, - template_folder='templates') + template_folder='templates') @index.route('/') @session_required diff --git a/views/view_qs.py b/views/view_qs.py index 17f5acb..2f7963a 100644 --- a/views/view_qs.py +++ b/views/view_qs.py @@ -7,7 +7,13 @@ from core.register import Register from core.logging import logger -from flask import Blueprint, render_template, flash, request, redirect +from flask import ( + Blueprint, + render_template, + flash, + request, + redirect +) qs = Blueprint('qs', __name__, template_folder='templates') diff --git a/views/view_settings.py b/views/view_settings.py index 2f44e86..5b38251 100644 --- a/views/view_settings.py +++ b/views/view_settings.py @@ -6,7 +6,7 @@ from flask import Blueprint, render_template, request settings = Blueprint('settings', __name__, - template_folder='templates') + template_folder='templates') @settings.route('/settings', methods=['GET', 'POST', 'DELETE']) @session_required diff --git a/views/view_startover.py b/views/view_startover.py index fb997f1..5d3dd1e 100644 --- a/views/view_startover.py +++ b/views/view_startover.py @@ -3,7 +3,7 @@ from flask import Blueprint, flash, redirect startover = Blueprint('startover', __name__, - template_folder='templates') + template_folder='templates') @startover.route('/startover') @session_required diff --git a/views/view_stream.py b/views/view_stream.py index b5de325..40f4c61 100644 --- a/views/view_stream.py +++ b/views/view_stream.py @@ -14,6 +14,4 @@ def generate(): while True: yield f.read() time.sleep(1) - - #return stream.view_stream.response_class(generate(), mimetype='text/plain') return Response(stream_with_context(generate()), mimetype='text/plain') diff --git a/views/view_vulns.py b/views/view_vulns.py index 9fba75d..d78cc3d 100644 --- a/views/view_vulns.py +++ b/views/view_vulns.py @@ -3,7 +3,7 @@ from core.redis import rds vulns = Blueprint('vulnerabilities', __name__, - template_folder='templates') + template_folder='templates') @vulns.route('/vulnerabilities') @session_required diff --git a/views/view_welcome.py b/views/view_welcome.py index 721f152..fadf706 100644 --- a/views/view_welcome.py +++ b/views/view_welcome.py @@ -8,4 +8,4 @@ @welcome.route('/welcome') @session_required def view_welcome(): - return render_template('welcome.html', data=data) \ No newline at end of file + return render_template('welcome.html') \ No newline at end of file diff --git a/views_api/api_scan.py b/views_api/api_scan.py index ca42109..2668bd2 100644 --- a/views_api/api_scan.py +++ b/views_api/api_scan.py @@ -1,14 +1,10 @@ -from core.redis import rds -from core.parser import SchemaParser -from core.register import Register -#from core.security import auth, session_required, verify_password +from core.redis import rds +from core.parser import SchemaParser +from core.register import Register from core.security import auth -from flask_restful import Resource - -from flask import ( - request -) +from flask_restful import Resource +from flask import request class Scan(Resource): @auth.login_required