diff --git a/app/modules/roxywi/auth.py b/app/modules/roxywi/auth.py index 8856ffff..56433786 100644 --- a/app/modules/roxywi/auth.py +++ b/app/modules/roxywi/auth.py @@ -1,4 +1,4 @@ -from flask import request, redirect, url_for, abort +from flask import request, abort import modules.db.sql as sql diff --git a/app/modules/roxywi/roxy.py b/app/modules/roxywi/roxy.py index 61c029e7..d59d6724 100644 --- a/app/modules/roxywi/roxy.py +++ b/app/modules/roxywi/roxy.py @@ -1,7 +1,6 @@ import os import re -import distro import requests from requests.adapters import HTTPAdapter from requests.packages.urllib3.util.retry import Retry diff --git a/app/modules/tools/common.py b/app/modules/tools/common.py index 038e02bc..d9db02cb 100644 --- a/app/modules/tools/common.py +++ b/app/modules/tools/common.py @@ -1,9 +1,7 @@ import distro -import modules.db.sql as sql import modules.roxywi.roxy as roxywi_mod import modules.server.server as server_mod -import modules.roxywi.common as roxywi_common def get_services_status(): diff --git a/app/routes/logs/routes.py b/app/routes/logs/routes.py index cda5a560..161dc7dc 100644 --- a/app/routes/logs/routes.py +++ b/app/routes/logs/routes.py @@ -1,3 +1,5 @@ +import os + from flask import render_template, request, redirect, url_for from flask_login import login_required @@ -55,9 +57,10 @@ def logs_internal(): selects.append(['roxy-wi.error.log', 'error.log']) selects.append(['roxy-wi.access.log', 'access.log']) - return render_template('logs_internal.html', h2=1, autorefresh=1, role=user_params['role'], user=user, - user_services=user_params['user_services'], token=user_params['token'], - lang=user_params['lang'], selects=selects, serv='viewlogs' + return render_template( + 'logs_internal.html', h2=1, autorefresh=1, role=user_params['role'], user=user, + user_services=user_params['user_services'], token=user_params['token'], lang=user_params['lang'], + selects=selects, serv='viewlogs' ) @@ -74,8 +77,10 @@ def logs(service, waf): minute1 = request.args.get('minute1') log_file = request.args.get('file') - if rows is None: rows=10 - if grep is None: grep='' + if rows is None: + rows = 10 + if grep is None: + grep = '' try: user_params = roxywi_common.get_users_params(virt=1, haproxy=1) @@ -149,8 +154,10 @@ def show_logs(service, serv, rows, waf): if roxywi_common.check_user_group_for_flask(): try: - out = roxy_logs.show_roxy_log(serv=serv, rows=rows, waf=waf, grep=grep, exgrep=exgrep, hour=hour, minute=minute, - hour1=hour1, minute1=minute1, service=service, log_file=log_file) + out = roxy_logs.show_roxy_log( + serv=serv, rows=rows, waf=waf, grep=grep, exgrep=exgrep, hour=hour, minute=minute, + hour1=hour1, minute1=minute1, service=service, log_file=log_file + ) except Exception as e: return str(e) else: diff --git a/app/routes/overview/routes.py b/app/routes/overview/routes.py index 67dd4fa3..c442dcd3 100644 --- a/app/routes/overview/routes.py +++ b/app/routes/overview/routes.py @@ -1,10 +1,9 @@ -from flask import render_template, request, redirect, url_for +from flask import render_template, redirect, url_for from flask_login import login_required from app import cache from app.routes.overview import bp import app.modules.db.sql as sql -from app.modules.db.db_model import * import app.modules.roxywi.logs as roxy_logs import app.modules.roxywi.common as roxywi_common import app.modules.roxywi.overview as roxy_overview diff --git a/app/routes/portscanner/routes.py b/app/routes/portscanner/routes.py index e7d277ec..75a5b7a4 100644 --- a/app/routes/portscanner/routes.py +++ b/app/routes/portscanner/routes.py @@ -1,4 +1,4 @@ -from flask import render_template, request +from flask import render_template, request, redirect, url_for from flask_login import login_required from app.routes.portscanner import bp @@ -105,4 +105,3 @@ def scan_port(server_id): else: lang = roxywi_common.get_user_lang_for_flask() return render_template('ajax/scan_ports.html', ports=stdout, info=stdout1, lang=lang) - diff --git a/app/routes/server/routes.py b/app/routes/server/routes.py index 31a91d8b..9041bb69 100644 --- a/app/routes/server/routes.py +++ b/app/routes/server/routes.py @@ -1,6 +1,5 @@ import json -import distro from flask import render_template, request from flask_login import login_required @@ -10,15 +9,11 @@ import app.modules.common.common as common import app.modules.roxywi.group as group_mod import app.modules.roxywi.auth as roxywi_auth import app.modules.roxywi.common as roxywi_common -import app.modules.roxy_wi_tools as roxy_wi_tools import app.modules.server.ssh as ssh_mod import app.modules.server.server as server_mod import app.modules.tools.smon as smon_mod import app.modules.service.backup as backup_mod -get_config = roxy_wi_tools.GetConfigVar() -time_zone = sql.get_setting('time_zone') -get_date = roxy_wi_tools.GetDate(time_zone) error_mess = roxywi_common.return_error_message() diff --git a/app/routes/waf/routes.py b/app/routes/waf/routes.py index aa501081..b673777b 100644 --- a/app/routes/waf/routes.py +++ b/app/routes/waf/routes.py @@ -1,3 +1,5 @@ +import os + from flask import render_template, request from flask_login import login_required