github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v6.3.5.0 

Changelog: https://roxy-wi.org/changelog#6_3_5
pull/355/head
Aidaho 2023-02-14 19:46:41 +03:00
parent bf2223c1f3
commit 9259562776
14 changed files with 120 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/modules/alerting/alerting.py
View File

@ -223,9 +223,10 @@ def add_telegram_channel(token: str, channel: str, group: str, page: str) -> Non
print(error_mess) print(error_mess)
else: else:
if sql.insert_new_telegram(token, channel, group): if sql.insert_new_telegram(token, channel, group):
env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) lang = roxywi_common.get_user_lang()
template = env.get_template('/new_telegram.html') env = Environment(loader=FileSystemLoader('templates/'), autoescape=True)
output_from_parsed_template = template.render(groups=sql.select_groups(), template = env.get_template('ajax/new_telegram.html')
output_from_parsed_template = template.render(groups=sql.select_groups(), lang=lang,
telegrams=sql.select_telegram(token=token), page=page) telegrams=sql.select_telegram(token=token), page=page)
print(output_from_parsed_template) print(output_from_parsed_template)
roxywi_common.logging('Roxy-WI server', f'A new Telegram channel {channel} has been created ', roxywi=1, login=1) roxywi_common.logging('Roxy-WI server', f'A new Telegram channel {channel} has been created ', roxywi=1, login=1)
@ -236,12 +237,13 @@ def add_slack_channel(token: str, channel: str, group: str, page: str) -> None:
print(error_mess) print(error_mess)
else: else:
if sql.insert_new_slack(token, channel, group): if sql.insert_new_slack(token, channel, group):
env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) lang = roxywi_common.get_user_lang()
template = env.get_template('/new_slack.html') env = Environment(loader=FileSystemLoader('templates/'), autoescape=True)
output_from_parsed_template = template.render(groups=sql.select_groups(), template = env.get_template('ajax/new_slack.html')
output_from_parsed_template = template.render(groups=sql.select_groups(), lang=lang,
slacks=sql.select_slack(token=token), page=page) slacks=sql.select_slack(token=token), page=page)
print(output_from_parsed_template) print(output_from_parsed_template)
roxywi_common.logging('Roxy-WI server', 'A new Slack channel ' + channel + ' has been created ', roxywi=1, login=1) roxywi_common.logging('Roxy-WI server', f'A new Slack channel {channel} has been created ', roxywi=1, login=1)
def delete_telegram_channel(channel_id) -> None: def delete_telegram_channel(channel_id) -> None:

7
app/modules/roxywi/waf.py
View File

@ -13,10 +13,10 @@ form = common.form
def waf_overview(serv, waf_service) -> None: def waf_overview(serv, waf_service) -> None:
env = Environment( env = Environment(
loader=FileSystemLoader('templates/ajax'), autoescape=True, loader=FileSystemLoader('templates/'), autoescape=True,
extensions=['jinja2.ext.loopcontrols', 'jinja2.ext.do'] extensions=['jinja2.ext.loopcontrols', 'jinja2.ext.do']
) )
template = env.get_template('overivewWaf.html') template = env.get_template('ajax/overivewWaf.html')
servers = sql.select_servers(server=serv) servers = sql.select_servers(server=serv)
cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
@ -75,9 +75,10 @@ def waf_overview(serv, waf_service) -> None:
returned_servers.append(server_status) returned_servers.append(server_status)
lang = roxywi_common.get_user_lang()
servers_sorted = sorted(returned_servers, key=common.get_key) servers_sorted = sorted(returned_servers, key=common.get_key)
template = template.render(service_status=servers_sorted, role=sql.get_user_role_by_uuid(user_id.value), template = template.render(service_status=servers_sorted, role=sql.get_user_role_by_uuid(user_id.value),
waf_service=waf_service) waf_service=waf_service, lang=lang)
print(template) print(template)

7
app/modules/server/ssh.py
View File

@ -60,14 +60,15 @@ def create_ssh_cred() -> None:
password = common.checkAjaxInput(form.getvalue('ssh_pass')) password = common.checkAjaxInput(form.getvalue('ssh_pass'))
page = common.checkAjaxInput(form.getvalue('page')) page = common.checkAjaxInput(form.getvalue('page'))
page = page.split("#")[0] page = page.split("#")[0]
lang = roxywi_common.get_user_lang()
if username is None or name is None: if username is None or name is None:
print(error_mess) print(error_mess)
else: else:
if sql.insert_new_ssh(name, enable, group, username, password): if sql.insert_new_ssh(name, enable, group, username, password):
env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) env = Environment(loader=FileSystemLoader('templates/'), autoescape=True)
template = env.get_template('/new_ssh.html') template = env.get_template('ajax/new_ssh.html')
output_from_parsed_template = template.render(groups=sql.select_groups(), sshs=sql.select_ssh(name=name), page=page) output_from_parsed_template = template.render(groups=sql.select_groups(), sshs=sql.select_ssh(name=name), page=page, lang=lang)
print(output_from_parsed_template) print(output_from_parsed_template)
roxywi_common.logging('Roxy-WI server', f'New SSH credentials {name} has been created', roxywi=1, login=1) roxywi_common.logging('Roxy-WI server', f'New SSH credentials {name} has been created', roxywi=1, login=1)

8
app/options.py
View File

@ -824,6 +824,7 @@ if form.getvalue('newuser') is not None:
page = common.checkAjaxInput(form.getvalue('page')) page = common.checkAjaxInput(form.getvalue('page'))
activeuser = common.checkAjaxInput(form.getvalue('activeuser')) activeuser = common.checkAjaxInput(form.getvalue('activeuser'))
group = common.checkAjaxInput(form.getvalue('newgroupuser')) group = common.checkAjaxInput(form.getvalue('newgroupuser'))
lang = roxywi_common.get_user_lang()
if roxywi_user.create_user(new_user, email, password, role, activeuser, group): if roxywi_user.create_user(new_user, email, password, role, activeuser, group):
env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) env = Environment(loader=FileSystemLoader('templates/'), autoescape=True)
@ -833,7 +834,8 @@ if form.getvalue('newuser') is not None:
groups=sql.select_groups(), groups=sql.select_groups(),
page=page, page=page,
roles=sql.select_roles(), roles=sql.select_roles(),
adding=1) adding=1,
lang=lang)
print(template) print(template)
if form.getvalue('userdel') is not None: if form.getvalue('userdel') is not None:
@ -868,6 +870,7 @@ if form.getvalue('newserver') is not None:
page = page.split("#")[0] page = page.split("#")[0]
port = common.checkAjaxInput(form.getvalue('newport')) port = common.checkAjaxInput(form.getvalue('newport'))
desc = common.checkAjaxInput(form.getvalue('desc')) desc = common.checkAjaxInput(form.getvalue('desc'))
lang = roxywi_common.get_user_lang()
if ip == '': if ip == '':
print('error: IP or DNS name is not valid') print('error: IP or DNS name is not valid')
@ -890,7 +893,8 @@ if form.getvalue('newserver') is not None:
page=page, page=page,
user_status=user_subscription['user_status'], user_status=user_subscription['user_status'],
user_plan=user_subscription['user_plan'], user_plan=user_subscription['user_plan'],
adding=1) adding=1,
lang=lang)
print(template) print(template)
roxywi_common.logging(ip, f'A new server {hostname} has been created', roxywi=1, login=1, roxywi_common.logging(ip, f'A new server {hostname} has been created', roxywi=1, login=1,
keep_history=1, service='server') keep_history=1, service='server')

2
app/templates/add_nginx.html
View File

@ -4,7 +4,7 @@
{% block content %} {% block content %}
{% from 'include/input_macros.html' import input, checkbox, select %} {% from 'include/input_macros.html' import input, checkbox, select %}
{% set balance_params = dict() %} {% set balance_params = dict() %}
{% set balance_params = {'ip_hash':'ip_hash','least_conn':'least_conn','random':'random', 'round-robin': 'round-robin'} %} {% set balance_params = {'ip_hash':'ip_hash','least_conn':'least_conn','random':'random', 'round_robin': 'round-robin'} %}
<script src="/inc/add_nginx.js"></script> <script src="/inc/add_nginx.js"></script>
<div id="tabs"> <div id="tabs">
<ul> <ul>

2
app/templates/ajax/new_git.html
View File

@ -54,7 +54,7 @@
</span> </span>
</td> </td>
<td> <td>
<a class="delete" onclick="confirmDeleteGit({{b.id}})" title="{{lang.words.delete|title()}} git {{b.server}}" style="cursor: pointer;"></a> <a class="delete" onclick="confirmDeleteGit({{b.id}})" style="cursor: pointer;"></a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}

1
app/templates/ajax/new_server.html
View File

@ -1,3 +1,4 @@
{% import 'languages/'+lang|default('en')+'.html' as lang %}
{% for server in servers %} {% for server in servers %}
{% include 'include/admin_servers.html' %} {% include 'include/admin_servers.html' %}
<script> <script>

5
app/templates/ajax/new_slack.html
View File

@ -1,3 +1,4 @@
{% import 'languages/'+lang|default('en')+'.html' as lang %}
{% for slack in slacks %} {% for slack in slacks %}
<tr style="width: 50%;" id="slack-table-{{slack.id}}" class="newgroup"> <tr style="width: 50%;" id="slack-table-{{slack.id}}" class="newgroup">
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
@ -21,10 +22,10 @@
</td> </td>
{% endif %} {% endif %}
<td> <td>
<button title="Send test message" onclick="checkSlack({{slack.id}})">Test</button> <button title="{{lang.phrases.send_test_mes}}" onclick="checkSlack({{slack.id}})">{{lang.words.test|title()}}</button>
</td> </td>
<td> <td>
<a class="add" onclick="cloneSlack({{slack.id}})" id="clone-{{slack.id}}" title="Copy the settings from {{slack.chanel_name}}" style="cursor: pointer;"></a> <a class="add" onclick="cloneSlack({{slack.id}})" id="clone-{{slack.id}}" title="{{lang.words.clone|title()}} {{slack.chanel_name}}" style="cursor: pointer;"></a>
</td> </td>
<td> <td>
<a class="delete" onclick="confirmDeleteSlack({{slack.id}})" style="cursor: pointer;"></a> <a class="delete" onclick="confirmDeleteSlack({{slack.id}})" style="cursor: pointer;"></a>

7
app/templates/ajax/new_ssh.html
View File

@ -1,3 +1,4 @@
{% import 'languages/'+lang|default('en')+'.html' as lang %}
{% for ssh in sshs %} {% for ssh in sshs %}
<tr style="width: 50%;" id="ssh-table-{{ssh.id}}" class="ssh-table-{{ssh.id}}"> <tr style="width: 50%;" id="ssh-table-{{ssh.id}}" class="ssh-table-{{ssh.id}}">
<td class="first-collumn"> <td class="first-collumn">
@ -5,9 +6,9 @@
</td> </td>
<td class="first-collumn" valign="top" style="padding-top: 15px;"> <td class="first-collumn" valign="top" style="padding-top: 15px;">
{% if ssh.enable == 1 %} {% if ssh.enable == 1 %}
<label for="ssh_enable-{{ssh.id}}">Enable SSH key</label><input type="checkbox" id="ssh_enable-{{ssh.id}}" checked> <label for="ssh_enable-{{ssh.id}}">{{lang.words.enable|title()}} SSH {{lang.words.key}}</label><input type="checkbox" id="ssh_enable-{{ssh.id}}" checked>
{% else %} {% else %}
<label for="ssh_enable-{{ssh.id}}">Enable SSH key</label><input type="checkbox" id="ssh_enable-{{ssh.id}}"> <label for="ssh_enable-{{ssh.id}}">{{lang.words.enable|title()}} SSH {{lang.words.key}}</label><input type="checkbox" id="ssh_enable-{{ssh.id}}">
{% endif %} {% endif %}
</td> </td>
{% if page != "servers.py" %} {% if page != "servers.py" %}
@ -35,7 +36,7 @@
<br> <br>
</td> </td>
<td> <td>
<a class="delete" onclick="confirmDeleteSsh({{ssh.id}})" style="cursor: pointer;"></a> <a class="delete" onclick="confirmDeleteSsh({{ssh.id}})" title="{{lang.words.delete|title()}} {{ssh.name}}" style="cursor: pointer;"></a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

5
app/templates/ajax/new_telegram.html
View File

@ -1,3 +1,4 @@
{% import 'languages/'+lang|default('en')+'.html' as lang %}
{% for telegram in telegrams %} {% for telegram in telegrams %}
<tr style="width: 50%;" id="telegram-table-{{telegram.id}}" class="newgroup"> <tr style="width: 50%;" id="telegram-table-{{telegram.id}}" class="newgroup">
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
@ -21,10 +22,10 @@
</td> </td>
{% endif %} {% endif %}
<td> <td>
<button title="Send a test message" onclick="checkTelegram({{telegram.id}})">Test</button> <button title="{{lang.phrases.send_test_mes}}" onclick="checkTelegram({{telegram.id}})">{{lang.words.test|title()}}</button>
</td> </td>
<td> <td>
<a class="add" onclick="cloneTelegram({{telegram.id}})" id="clone-{{telegram.id}}" title="Clone {{telegram.chanel_name}}" style="cursor: pointer;"></a> <a class="add" onclick="cloneTelegram({{telegram.id}})" id="clone-{{telegram.id}}" title="{{lang.words.clone|title()}} {{telegram.chanel_name}}" style="cursor: pointer;"></a>
</td> </td>
<td> <td>
<a class="delete" onclick="confirmDeleteTelegram({{telegram.id}})" style="cursor: pointer;"></a> <a class="delete" onclick="confirmDeleteTelegram({{telegram.id}})" style="cursor: pointer;"></a>

1
app/templates/ajax/new_user.html
View File

@ -1,3 +1,4 @@
{% import 'languages/'+lang|default('en')+'.html' as lang %}
{% for user in users %} {% for user in users %}
{% include 'include/admin_users.html' %} {% include 'include/admin_users.html' %}
<script> <script>

2
app/templates/include/admins_dialogs.html
View File

@ -146,7 +146,7 @@
</td> </td>
<td> <td>
<p style="width: 100px;"> <p style="width: 100px;">
{{ input('ssh_user', value=ssh_user, title='SSH {{lang.words.username|title()}}') }} {{ input('ssh_user', value=ssh_user, title='SSH ' + lang.words.username|title()) }}
</p> </p>
{{ input('ssh_pass', type='password', style="display: none;", title="User password, if SSH key is disabled") }} {{ input('ssh_pass', type='password', style="display: none;", title="User password, if SSH key is disabled") }}
</td> </td>

1
app/templates/languages/en.html
View File

@ -810,5 +810,6 @@
"rule_name": "Rule name", "rule_name": "Rule name",
"rule": "rule", "rule": "rule",
"rules": "rules", "rules": "rules",
"send": "send",
} }
%} %}

138
inc/users.js
View File

@ -1449,16 +1449,19 @@ function confirmDeleteUser(id) {
height: "auto", height: "auto",
width: 400, width: 400,
modal: true, modal: true,
title: "Are you sure you want to delete " +$('#login-'+id).val() + "?", title: delete_word + " " +$('#login-'+id).val() + "?",
buttons: { buttons: [{
"Delete": function() { text: delete_word,
$( this ).dialog( "close" ); click: function () {
removeUser(id); $(this).dialog("close");
}, removeUser(id);
Cancel: function() { }
$( this ).dialog( "close" ); }, {
} text: cancel_word,
} click: function () {
$(this).dialog("close");
}
}]
}); });
} }
function confirmDeleteGroup(id) { function confirmDeleteGroup(id) {
@ -1469,16 +1472,19 @@ function confirmDeleteGroup(id) {
height: "auto", height: "auto",
width: 400, width: 400,
modal: true, modal: true,
title: "Are you sure you want to delete " +$('#name-'+id).val() + "?", title: delete_word+ " " +$('#name-'+id).val() + "?",
buttons: { buttons: [{
"Delete": function() { text: delete_word,
$( this ).dialog( "close" ); click: function() {
removeGroup(id); $(this).dialog("close");
}, removeGroup(id);
Cancel: function() { }
$( this ).dialog( "close" ); }, {
} text: cancel_word,
} click: function () {
$(this).dialog("close");
}
}]
}); });
} }
function confirmDeleteServer(id) { function confirmDeleteServer(id) {
@ -1535,16 +1541,19 @@ function confirmDeleteTelegram(id) {
height: "auto", height: "auto",
width: 400, width: 400,
modal: true, modal: true,
title: "Are you sure you want to delete " +$('#telegram-chanel-'+id).val() + "?", title: delete_word + " " +$('#telegram-chanel-'+id).val() + "?",
buttons: { buttons: [{
"Delete": function() { text: delete_word,
$( this ).dialog( "close" ); click: function() {
removeTelegram(id); $(this).dialog("close");
}, removeTelegram(id);
Cancel: function() { }
$( this ).dialog( "close" ); }, {
} text: cancel_word,
} click: function () {
$(this).dialog("close");
}
}]
}); });
} }
function confirmDeleteSlack(id) { function confirmDeleteSlack(id) {
@ -1555,16 +1564,19 @@ function confirmDeleteSlack(id) {
height: "auto", height: "auto",
width: 400, width: 400,
modal: true, modal: true,
title: "Are you sure you want to delete " +$('#slack-chanel-'+id).val() + "?", title: delete_word + " " +$('#slack-chanel-'+id).val() + "?",
buttons: { buttons: [{
"Delete": function() { text: delete_word,
$( this ).dialog( "close" ); click: function () {
removeSlack(id); $(this).dialog("close");
}, removeSlack(id);
Cancel: function() { }
$( this ).dialog( "close" ); }, {
} text: cancel_word,
} click: function () {
$(this).dialog("close");
}
}]
}); });
} }
function confirmDeleteBackup(id) { function confirmDeleteBackup(id) {
@ -1575,16 +1587,19 @@ function confirmDeleteBackup(id) {
height: "auto", height: "auto",
width: 400, width: 400,
modal: true, modal: true,
title: "Are you sure you want to delete job for " +$('#backup-server-'+id).val() + "?", title: delete_word + " " +$('#backup-server-'+id).val() + "?",
buttons: { buttons: [{
"Delete": function() { text: delete_word,
$( this ).dialog( "close" ); click: function () {
removeBackup(id); $(this).dialog("close");
}, removeBackup(id);
Cancel: function() { }
$( this ).dialog( "close" ); }, {
} text: cancel_word,
} click: function () {
$(this).dialog("close");
}
}]
}); });
} }
function confirmDeleteGit(id) { function confirmDeleteGit(id) {
@ -1595,16 +1610,19 @@ function confirmDeleteGit(id) {
height: "auto", height: "auto",
width: 400, width: 400,
modal: true, modal: true,
title: "Are you sure you want to delete job for " +$('#git-server-'+id).text() + "?", title: delete_word + " " +$('#git-server-'+id).text() + "?",
buttons: { buttons: [{
"Delete": function() { text: delete_word,
$( this ).dialog( "close" ); click: function () {
removeGit(id); $(this).dialog("close");
}, removeGit(id);
Cancel: function() { }
$( this ).dialog( "close" ); },{
} text: cancel_word,
} click: function () {
$(this).dialog("close");
}
}]
}); });
} }
function cloneServer(id) { function cloneServer(id) {