Changelog: https://roxy-wi.org/changelog#7.0.1
pull/364/head
Aidaho 2023-10-16 13:48:38 +03:00
parent 9ce85fdff0
commit ec6db8265c
14 changed files with 23 additions and 37 deletions

View File

@ -1,8 +1,6 @@
import os
import datetime
from flask_apscheduler import APScheduler
from app import scheduler
import app.modules.db.sql as sql
import app.modules.roxywi.roxy as roxy
@ -16,7 +14,6 @@ get_config = roxy_wi_tools.GetConfigVar()
def update_user_status():
app = scheduler.app
with app.app_context():
print('update plan')
roxy.update_plan()
@ -26,7 +23,6 @@ def check_new_version():
with app.app_context():
tools = sql.get_roxy_tools()
for tool in tools:
print(f'update ver for {tool}')
ver = roxy.check_new_version(tool)
sql.update_tool_new_version(tool, ver)
@ -35,7 +31,6 @@ def check_new_version():
def update_cur_tool_versions():
app = scheduler.app
with app.app_context():
print('update update_cur_tool_versions')
tools_common.update_cur_tool_versions()
@ -43,7 +38,6 @@ def update_cur_tool_versions():
def delete_old_uuid():
app = scheduler.app
with app.app_context():
print('update delete_old_uuid()')
sql.delete_old_uuid()
@ -51,7 +45,6 @@ def delete_old_uuid():
def delete_action_history_for_period():
app = scheduler.app
with app.app_context():
print('update delete_action_history_for_period()')
sql.delete_action_history_for_period()
@ -59,7 +52,6 @@ def delete_action_history_for_period():
def delete_old_logs():
app = scheduler.app
with app.app_context():
print('update delete_old_logs()')
time_storage = sql.get_setting('log_time_storage')
log_path = get_config.get_config_var('main', 'log_path')
try:

View File

@ -25,7 +25,7 @@ def get_user_params(virt=0, disable=0):
try:
user_params = roxywi_common.get_users_params(virt=virt, disable=disable, service=kwargs.get('service'))
g.user_params = user_params
except Exception as e:
except Exception:
return redirect(url_for('login_page'))
return fn(*args, **kwargs)
return decorated_views

View File

@ -4,7 +4,6 @@ from flask import render_template, request
import modules.db.sql as sql
import modules.common.common as common
import modules.roxywi.logs as roxy_logs
import modules.tools.common as tools_common
import modules.roxywi.common as roxywi_common
import modules.server.server as server_mod
@ -63,36 +62,36 @@ def show_overview(serv) -> str:
cmd = f'echo "show info" |nc {server[0][2]} {sql.get_setting("haproxy_sock_port")} -w 1|grep -e "Process_num"'
try:
haproxy_process = service_common.server_status(server_mod.subprocess_execute(cmd))
except Exception:
return f'{e} for server {server[0][2]}'
except Exception as e:
return f'error: {e} for server {server[0][2]}'
if nginx:
nginx_cmd = f'echo "something" |nc {server[0][2]} {sql.get_setting("nginx_stats_port")} -w 1'
try:
nginx_process = service_common.server_status(server_mod.subprocess_execute(nginx_cmd))
except Exception:
return f'{e} for server {server[0][2]}'
except Exception as e:
return f'error: {e} for server {server[0][2]}'
if apache:
apache_cmd = f'echo "something" |nc {server[0][2]} {sql.get_setting("apache_stats_port")} -w 1'
try:
apache_process = service_common.server_status(server_mod.subprocess_execute(apache_cmd))
except Exception:
return f'{e} for server {server[0][2]}'
except Exception as e:
return f'error: {e} for server {server[0][2]}'
if keepalived:
command = ["ps ax |grep keepalived|grep -v grep|wc -l|tr -d '\n'"]
try:
keepalived_process = server_mod.ssh_command(server[0][2], command)
except Exception as e:
return f'{e} for server {server[0][2]}'
return f'error: {e} for server {server[0][2]}'
if waf_len >= 1:
command = ["ps ax |grep waf/bin/modsecurity |grep -v grep |wc -l"]
try:
waf_process = server_mod.ssh_command(server[0][2], command)
except Exception as e:
return f'{e} for server {server[0][2]}'
return f'error: {e} for server {server[0][2]}'
server_status = (
server[0][1], server[0][2], haproxy, haproxy_process, waf_process, waf, keepalived, keepalived_process, nginx,

View File

@ -2,7 +2,7 @@ import os
import pytz
import distro
from flask import render_template, request, redirect, url_for, g
from flask import render_template, request, g
from flask_login import login_required
from app import scheduler

View File

@ -1,4 +1,4 @@
from flask import render_template, request, redirect, url_for, g
from flask import render_template, request, g
from flask_login import login_required
from app.routes.checker import bp

View File

@ -1,6 +1,6 @@
import os
from flask import render_template, request, redirect, url_for, g
from flask import render_template, request, g
from flask_login import login_required
from app.routes.config import bp

View File

@ -1,4 +1,4 @@
from flask import render_template, request, redirect, url_for, g, abort
from flask import render_template, request, g, abort
from flask_login import login_required
from app.routes.install import bp
@ -40,7 +40,7 @@ def install_monitoring():
@get_user_params()
def ha():
if not roxywi_auth.is_access_permit_to_service('keepalived'):
abort(403, f'You do not have needed permissions to access to Keepalived service')
abort(403, 'You do not have needed permissions to access to Keepalived service')
roxywi_auth.page_for_admin(level=2)
user_params = g.user_params

View File

@ -2,7 +2,7 @@ import os
import sys
import pytz
from flask import render_template, request, redirect, url_for, session, g, abort
from flask import render_template, request, session, g, abort
from flask_login import login_required
sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/app'))
@ -26,7 +26,7 @@ import modules.service.haproxy as service_haproxy
def page_is_forbidden(e):
user_params = g.user_params
return render_template(
'error.html', user=user_params['user'], role=user_params['role'], user_services=user_params['user_services'],
'error.html', user=user_params['user'], role=user_params['role'], user_services=user_params['user_services'],
title=e, e=e
), 403
@ -56,7 +56,7 @@ def method_not_allowed(e):
def internal_error(e):
user_params = g.user_params
return render_template(
'error.html', user=user_params['user'], role=user_params['role'], user_services=user_params['user_services'],
'error.html', user=user_params['user'], role=user_params['role'], user_services=user_params['user_services'],
title=e, e=e
), 500
@ -114,7 +114,6 @@ def show_stats(service, server_ip):
@login_required
@get_user_params(1)
def nettools():
import time
user_params = g.user_params
return render_template(
'nettools.html', autorefresh=0, role=user_params['role'], user=user_params['user'], servers=user_params['servers'],

View File

@ -1,5 +1,5 @@
import distro
from flask import render_template, request, jsonify, redirect, url_for, g
from flask import render_template, request, jsonify, g
from flask_login import login_required
from app.routes.metric import bp
@ -8,7 +8,6 @@ from middleware import check_services, get_user_params
import app.modules.common.common as common
import app.modules.server.server as server_mod
import app.modules.roxywi.metrics as metric
import app.modules.roxywi.auth as roxywi_auth
import app.modules.roxywi.common as roxywi_common

View File

@ -1,4 +1,4 @@
from flask import render_template, redirect, url_for, g
from flask import render_template, g
from flask_login import login_required
from app import cache
@ -6,7 +6,6 @@ from app.routes.overview import bp
from middleware import get_user_params
import app.modules.db.sql as sql
import app.modules.roxywi.logs as roxy_logs
import app.modules.roxywi.common as roxywi_common
import app.modules.roxywi.overview as roxy_overview

View File

@ -1,4 +1,4 @@
from flask import render_template, request, redirect, url_for, g
from flask import render_template, request, g
from flask_login import login_required
from app.routes.portscanner import bp

View File

@ -1,10 +1,9 @@
from flask import render_template, request, redirect, url_for, g
from flask import render_template, request, g
from flask_login import login_required
from app.routes.runtime import bp
from middleware import get_user_params
import app.modules.common.common as common
import app.modules.roxywi.common as roxywi_common
import app.modules.config.runtime as runtime
import app.modules.service.haproxy as service_haproxy

View File

@ -1,5 +1,5 @@
import distro
from flask import render_template, request, redirect, url_for, g
from flask import render_template, request, g
from flask_login import login_required
from app import cache
@ -10,7 +10,6 @@ import app.modules.common.common as common
import app.modules.server.server as server_mod
import app.modules.service.action as service_action
import app.modules.service.common as service_common
import app.modules.roxywi.auth as roxywi_auth
import app.modules.roxywi.common as roxywi_common
import app.modules.roxywi.overview as roxy_overview

View File

@ -1,5 +1,5 @@
from pytz import timezone
from flask import render_template, request, redirect, url_for, jsonify, g
from flask import render_template, request, jsonify, g
from flask_login import login_required
from datetime import datetime