Skip to content

Commit

Permalink
spacing, remove unnecessary imports
Browse files Browse the repository at this point in the history
  • Loading branch information
dolevf committed Sep 30, 2020
1 parent d8b1d3c commit 05ac81b
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 30 deletions.
1 change: 0 additions & 1 deletion config.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

# Default scan configuration
# This will be used in the "Quick Start" scan.

DEFAULT_SCAN = {
'targets':{
'networks':[],
Expand Down
9 changes: 5 additions & 4 deletions main.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion views/view_console.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions views/view_dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion views/view_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions views/view_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/<file>')
@session_required
Expand Down
Empty file removed views/view_health.py
Empty file.
3 changes: 1 addition & 2 deletions views/view_index.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 7 additions & 1 deletion views/view_qs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion views/view_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion views/view_startover.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions views/view_stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
2 changes: 1 addition & 1 deletion views/view_vulns.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from core.redis import rds

vulns = Blueprint('vulnerabilities', __name__,
template_folder='templates')
template_folder='templates')

@vulns.route('/vulnerabilities')
@session_required
Expand Down
2 changes: 1 addition & 1 deletion views/view_welcome.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
@welcome.route('/welcome')
@session_required
def view_welcome():
return render_template('welcome.html', data=data)
return render_template('welcome.html')
14 changes: 5 additions & 9 deletions views_api/api_scan.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 05ac81b

Please sign in to comment.