From 0ffd81bd69760b4d536e143fcb4e0ac176483e91 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Mon, 11 May 2020 18:41:54 +0200 Subject: [PATCH] v4.3.0.0 Changelog: https://haproxy-wi.org/changelog.py#4_3 --- app/options.py | 3 +++ app/sql.py | 12 ++++++--- app/templates/hapservers.html | 25 +++++-------------- app/templates/servers.html | 4 +-- app/viewlogs.py | 1 + .../fail2ban/filter.d/haproxy-wi.conf | 17 +++++++++++++ config_other/fail2ban/jail.d/apache.conf | 21 ++++++++++++++++ config_other/fail2ban/jail.d/haproxy-wi.conf | 9 +++++++ config_other/fail2ban/jail.d/sshd.conf | 8 ++++++ inc/awesome.css | 3 +++ inc/script.js | 2 +- 11 files changed, 80 insertions(+), 25 deletions(-) create mode 100644 config_other/fail2ban/filter.d/haproxy-wi.conf create mode 100644 config_other/fail2ban/jail.d/apache.conf create mode 100644 config_other/fail2ban/jail.d/haproxy-wi.conf create mode 100644 config_other/fail2ban/jail.d/sshd.conf diff --git a/app/options.py b/app/options.py index 902573bb..1a7f7063 100644 --- a/app/options.py +++ b/app/options.py @@ -429,12 +429,15 @@ if serv is not None and form.getvalue('rows1') is not None: cmd="cat %s| awk -F\"/|:\" '$3>\"%s:00\" && $3<\"%s:00\"' |tail -%s %s %s" % (apache_log_path+"/"+serv, date, date1, rows, grep_act, grep) elif serv == 'haproxy-wi.error.log': cmd="cat %s| awk '$4>\"%s:00\" && $4<\"%s:00\"' |tail -%s %s %s" % (apache_log_path+"/"+serv, date, date1, rows, grep_act, grep) + elif serv == 'fail2ban.log': + cmd="cat %s| awk -F\"/|:\" '$3>\"%s:00\" && $3<\"%s:00\"' |tail -%s %s %s" % ("/var/log/"+serv, date, date1, rows, grep_act, grep) output, stderr = funct.subprocess_execute(cmd) print(funct.show_log(output)) print(stderr) + if form.getvalue('viewlogs') is not None: viewlog = form.getvalue('viewlogs') diff --git a/app/sql.py b/app/sql.py index e1a21db0..23670d66 100644 --- a/app/sql.py +++ b/app/sql.py @@ -656,7 +656,7 @@ def get_dick_permit(**kwargs): if grp == '1': sql = """ select * from servers where enable = 1 %s %s %s """ % (disable, type_ip, nginx) else: - sql = """ select * from servers where groups like '%{group}%' and (enable = 1 {disable}) {type_ip} {ip} {haproxy} {nginx} {keepalived} + sql = """ select * from servers where groups = '{group}' and (enable = 1 {disable}) {type_ip} {ip} {haproxy} {nginx} {keepalived} """.format(group=grp, disable=disable, type_ip=type_ip, ip=ip, haproxy=haproxy, nginx=nginx, keepalived=keepalived) try: @@ -1140,7 +1140,10 @@ def select_waf_servers_metrics(uuid, **kwargs): def select_waf_metrics(serv, **kwargs): con, cur = get_cur() - sql = """ select * from (select * from waf_metrics where serv = '%s' order by `date` desc limit 60) order by `date`""" % serv + if mysql_enable == '1': + sql = """ select * from waf_metrics where serv = '%s' order by `date` desc limit 60 """ % serv + else: + sql = """ select * from (select * from waf_metrics where serv = '%s' order by `date` desc limit 60) order by `date`""" % serv try: cur.execute(sql) except sqltool.Error as e: @@ -1240,7 +1243,10 @@ def delete_mentrics(): def select_metrics(serv, **kwargs): con, cur = get_cur() - sql = """ select * from (select * from metrics where serv = '%s' order by `date` desc limit 60) order by `date` """ % serv + if mysql_enable == '1': + sql = """ select * from metrics where serv = '%s' order by `date` desc limit 60 """ % serv + else: + sql = """ select * from (select * from metrics where serv = '%s' order by `date` desc limit 60) order by `date` """ % serv try: cur.execute(sql) except sqltool.Error as e: diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html index de0f5ea4..8a9f2234 100644 --- a/app/templates/hapservers.html +++ b/app/templates/hapservers.html @@ -30,22 +30,6 @@ host = host.replace(/\./g, '\\.'); hostnamea.push(host) {% endfor %} - $( function() { - $( ".sortable" ).sortable({ - revert: true, - placeholder: "ui-state-highlight" - }); - $( ".sortable" ).disableSelection(); - - $( ".sortable" ).sortable({ - stop: function(event, ui) { - var itemOrder = $('.sortable').sortable("toArray"); - for (var i = 0; i < itemOrder.length; i++) { - console.log("Position: " + i + " ID: " + itemOrder[i]); - } - } - }); - });
{% if servers|length == 0 %} @@ -112,11 +96,14 @@ - - + + - + + + + {% endif %} diff --git a/app/templates/servers.html b/app/templates/servers.html index c480e083..66829d87 100644 --- a/app/templates/servers.html +++ b/app/templates/servers.html @@ -291,8 +291,8 @@ {% set values = dict() %} - {% set values = {'2.0.5-1':'2.0.5-1','2.0.6-1':'2.0.6-1', '2.0.7-1':'2.0.7-1', '2.0.9-1':'2.0.9-1', '2.0.11-1':'2.0.11-1', '2.0.12-1':'2.0.12-1', '2.0.13-1':'2.0.13-1'} %} - {{ select('hapver', values=values, selected='2.0.13-1', required='required') }} + {% set values = {'2.0.5-1':'2.0.5-1','2.0.6-1':'2.0.6-1', '2.0.7-1':'2.0.7-1', '2.0.9-1':'2.0.9-1', '2.0.11-1':'2.0.11-1', '2.0.12-1':'2.0.12-1', '2.0.13-1':'2.0.13-1', '2.0.14-1':'2.0.14-1'} %} + {{ select('hapver', values=values, selected='2.0.14-1', required='required') }}