mirror of https://github.com/Aidaho12/haproxy-wi
v7.3.1.0: Refactor and optimize server applications for better error handling and accuracy
The code changes focus on enhancing the server application's functionality by improving the error handling mechanism and streamlining the logic. Modifications include refining how servers get created, updated, and deleted, optimizing how ssh related actions are performed, and ensuring more accurate server scanning. The changes help reduce potential errors and make the application more efficient.pull/390/head
Aidaho
parent
112ecd5ce6
commit
70765749b9
|
|
@ -0,0 +1,446 @@
|
|||
var cur_url = window.location.href.split('/app/').pop();
|
||||
cur_url = cur_url.split('/');
|
||||
$( function() {
|
||||
$('#add-user-button').click(function() {
|
||||
addUserDialog.dialog('open');
|
||||
});
|
||||
let user_tabel_title = $( "#user-add-table-overview" ).attr('title');
|
||||
let addUserDialog = $( "#user-add-table" ).dialog({
|
||||
autoOpen: false,
|
||||
resizable: false,
|
||||
height: "auto",
|
||||
width: 600,
|
||||
modal: true,
|
||||
title: user_tabel_title,
|
||||
show: {
|
||||
effect: "fade",
|
||||
duration: 200
|
||||
},
|
||||
hide: {
|
||||
effect: "fade",
|
||||
duration: 200
|
||||
},
|
||||
buttons: [{
|
||||
text: add_word,
|
||||
click: function () {
|
||||
addUser(this);
|
||||
}
|
||||
}, {
|
||||
text: cancel_word,
|
||||
click: function () {
|
||||
$(this).dialog("close");
|
||||
clearTips();
|
||||
}
|
||||
}]
|
||||
});
|
||||
$( "#ajax-users input" ).change(function() {
|
||||
let id = $(this).attr('id').split('-');
|
||||
updateUser(id[1])
|
||||
});
|
||||
$( "#ajax-users select" ).on('selectmenuchange',function() {
|
||||
let id = $(this).attr('id').split('-');
|
||||
updateUser(id[1])
|
||||
});
|
||||
$('#search_ldap_user').click(function() {
|
||||
toastr.clear();
|
||||
let username_div = $('#new-username')
|
||||
let valid = true;
|
||||
let allFields = $([]).add(username_div);
|
||||
allFields.removeClass("ui-state-error");
|
||||
valid = valid && checkLength(username_div, "user name", 1);
|
||||
let user = username_div.val()
|
||||
if (valid) {
|
||||
$.ajax({
|
||||
url: "/app/user/ldap/" + user,
|
||||
success: function (data) {
|
||||
data = data.replace(/\s+/g, ' ');
|
||||
if (data.indexOf('error:') != '-1') {
|
||||
toastr.error(data);
|
||||
$('#new-email').val('');
|
||||
username_div.attr('readonly', false);
|
||||
username_div.val('');
|
||||
} else {
|
||||
let json = $.parseJSON(data);
|
||||
toastr.clear();
|
||||
if (!user.includes('@')) {
|
||||
username_div.val(user + '@' + json[1]);
|
||||
}
|
||||
$('#new-email').val(json[0]);
|
||||
$('#new-password').val('aduser');
|
||||
$('#new-password').attr('readonly', true);
|
||||
}
|
||||
}
|
||||
});
|
||||
clearTips();
|
||||
}
|
||||
});
|
||||
} );
|
||||
function addUser(dialog_id) {
|
||||
let valid = true;
|
||||
toastr.clear();
|
||||
let allFields = $([]).add($('#new-username')).add($('#new-password')).add($('#new-email'))
|
||||
allFields.removeClass("ui-state-error");
|
||||
valid = valid && checkLength($('#new-username'), "user name", 1);
|
||||
valid = valid && checkLength($('#new-password'), "password", 1);
|
||||
valid = valid && checkLength($('#new-email'), "Email", 1);
|
||||
let enabled = 0;
|
||||
if ($('#activeuser').is(':checked')) {
|
||||
enabled = '1';
|
||||
}
|
||||
if (valid) {
|
||||
let jsonData = {
|
||||
"username": $('#new-username').val(),
|
||||
"password": $('#new-password').val(),
|
||||
"email": $('#new-email').val(),
|
||||
"role": $('#new-role').val(),
|
||||
"enabled": enabled,
|
||||
"user_group": $('#new-group').val(),
|
||||
}
|
||||
$.ajax({
|
||||
url: "/app/user",
|
||||
type: "POST",
|
||||
data: JSON.stringify(jsonData),
|
||||
contentType: "application/json; charset=utf-8",
|
||||
success: function (data) {
|
||||
if (data.status === 'failed') {
|
||||
toastr.error(data.error);
|
||||
} else {
|
||||
let user_id = data.id;
|
||||
common_ajax_action_after_success(dialog_id, 'user-' + user_id, 'ajax-users', data.data);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
function confirmDeleteUser(id) {
|
||||
$( "#dialog-confirm" ).dialog({
|
||||
resizable: false,
|
||||
height: "auto",
|
||||
width: 400,
|
||||
modal: true,
|
||||
title: delete_word + " " +$('#login-'+id).val() + "?",
|
||||
buttons: [{
|
||||
text: delete_word,
|
||||
click: function () {
|
||||
$(this).dialog("close");
|
||||
removeUser(id);
|
||||
}
|
||||
}, {
|
||||
text: cancel_word,
|
||||
click: function () {
|
||||
$(this).dialog("close");
|
||||
}
|
||||
}]
|
||||
});
|
||||
}
|
||||
function removeUser(id) {
|
||||
$("#user-" + id).css("background-color", "#f2dede");
|
||||
$.ajax({
|
||||
url: "/app/user",
|
||||
data: JSON.stringify({'user_id': id}),
|
||||
contentType: "application/json; charset=utf-8",
|
||||
type: "DELETE",
|
||||
success: function (data) {
|
||||
if (data.status === 'failed') {
|
||||
toastr.error(data.error);
|
||||
} else {
|
||||
$("#user-" + id).remove();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
function updateUser(id) {
|
||||
toastr.remove();
|
||||
let enabled = 0;
|
||||
if ($('#activeuser-' + id).is(':checked')) {
|
||||
enabled = '1';
|
||||
}
|
||||
toastr.remove();
|
||||
let jsonData = {
|
||||
"username": $('#login-' + id).val(),
|
||||
"email": $('#email-' + id).val(),
|
||||
"enabled": enabled,
|
||||
"user_id": id
|
||||
}
|
||||
$.ajax({
|
||||
url: "/app/user",
|
||||
type: "PUT",
|
||||
data: JSON.stringify(jsonData),
|
||||
contentType: "application/json; charset=utf-8",
|
||||
success: function (data) {
|
||||
if (data.status === 'failed') {
|
||||
toastr.error(data.error);
|
||||
} else {
|
||||
toastr.remove();
|
||||
$("#user-" + id).addClass("update", 1000);
|
||||
setTimeout(function () {
|
||||
$("#user-" + id).removeClass("update");
|
||||
}, 2500);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
function openChangeUserPasswordDialog(id) {
|
||||
changeUserPasswordDialog(id);
|
||||
}
|
||||
function openChangeUserServiceDialog(id) {
|
||||
changeUserServiceDialog(id);
|
||||
}
|
||||
function changeUserPasswordDialog(id) {
|
||||
let superAdmin_pass = translate_div.attr('data-superAdmin_pass');
|
||||
let change_word = translate_div.attr('data-change2');
|
||||
let password_word = translate_div.attr('data-password');
|
||||
if ($('#role-'+id + ' option:selected' ).val() == 'Select a role') {
|
||||
toastr.warning(superAdmin_pass);
|
||||
return false;
|
||||
}
|
||||
$( "#user-change-password-table" ).dialog({
|
||||
autoOpen: true,
|
||||
resizable: false,
|
||||
height: "auto",
|
||||
width: 600,
|
||||
modal: true,
|
||||
title: change_word + " " + $('#login-' + id).val() + " " + password_word,
|
||||
show: {
|
||||
effect: "fade",
|
||||
duration: 200
|
||||
},
|
||||
hide: {
|
||||
effect: "fade",
|
||||
duration: 200
|
||||
},
|
||||
buttons: [{
|
||||
text: change_word,
|
||||
click: function () {
|
||||
changeUserPassword(id, $(this));
|
||||
}
|
||||
}, {
|
||||
text: cancel_word,
|
||||
click: function () {
|
||||
$(this).dialog("close");
|
||||
$('#missmatchpass').hide();
|
||||
}
|
||||
}]
|
||||
});
|
||||
}
|
||||
function changeUserPassword(id, d) {
|
||||
let pass = $('#change-password').val();
|
||||
let pass2 = $('#change2-password').val();
|
||||
if (pass != pass2) {
|
||||
$('#missmatchpass').show();
|
||||
} else {
|
||||
$('#missmatchpass').hide();
|
||||
toastr.clear();
|
||||
$.ajax({
|
||||
url: "/app/user/password",
|
||||
data: {
|
||||
updatepassowrd: pass,
|
||||
id: id
|
||||
},
|
||||
type: "POST",
|
||||
success: function (data) {
|
||||
data = data.replace(/\s+/g, ' ');
|
||||
if (data.indexOf('error:') != '-1') {
|
||||
toastr.error(data);
|
||||
} else {
|
||||
toastr.clear();
|
||||
$("#user-" + id).addClass("update", 1000);
|
||||
setTimeout(function () {
|
||||
$("#user-" + id).removeClass("update");
|
||||
}, 2500);
|
||||
d.dialog("close");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
function changeUserServiceDialog(id) {
|
||||
let manage_word = translate_div.attr('data-manage');
|
||||
let services_word = translate_div.attr('data-services3');
|
||||
let save_word = translate_div.attr('data-save');
|
||||
let superAdmin_services = translate_div.attr('data-superAdmin_services');
|
||||
if ($('#role-' + id + ' option:selected').val() == 'Select a role') {
|
||||
toastr.warning(superAdmin_services);
|
||||
return false;
|
||||
}
|
||||
$.ajax({
|
||||
url: "/app/user/services/" + id,
|
||||
success: function (data) {
|
||||
if (data.indexOf('danger') != '-1') {
|
||||
toastr.error(data);
|
||||
} else {
|
||||
toastr.clear();
|
||||
$('#change-user-service-form').html(data);
|
||||
$("#change-user-service-dialog").dialog({
|
||||
resizable: false,
|
||||
height: "auto",
|
||||
width: 700,
|
||||
modal: true,
|
||||
title: manage_word + " " + $('#login-' + id).val() + " " + services_word,
|
||||
buttons: [{
|
||||
text: save_word,
|
||||
click: function () {
|
||||
$(this).dialog("close");
|
||||
changeUserServices(id);
|
||||
}
|
||||
}, {
|
||||
text: cancel_word,
|
||||
click: function () {
|
||||
$(this).dialog("close");
|
||||
}
|
||||
}]
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
function changeUserServices(user_id) {
|
||||
let jsonData = {};
|
||||
jsonData['services'] = {};
|
||||
jsonData['services'][user_id] = {};
|
||||
jsonData['username'] = $('#login-'+user_id).val();
|
||||
$('#checked_services tbody tr').each(function () {
|
||||
let this_id = $(this).attr('id').split('-')[1];
|
||||
jsonData['services'][user_id][this_id] = {}
|
||||
});
|
||||
$.ajax( {
|
||||
url: "/app/user/services/" + user_id,
|
||||
data: JSON.stringify(jsonData),
|
||||
contentType: "application/json; charset=utf-8",
|
||||
type: "POST",
|
||||
success: function( data ) {
|
||||
if (data.status === 'failed') {
|
||||
toastr.error(data);
|
||||
} else {
|
||||
$("#user-" + user_id).addClass("update", 1000);
|
||||
setTimeout(function () {
|
||||
$("#user-" + user_id).removeClass("update");
|
||||
}, 2500);
|
||||
}
|
||||
}
|
||||
} );
|
||||
}
|
||||
function addServiceToUser(service_id) {
|
||||
let service_name = $('#add_service-'+service_id).attr('data-service_name');
|
||||
let length_tr = $('#checked_services tbody tr').length;
|
||||
let tr_class = 'odd';
|
||||
if (length_tr % 2 != 0) {
|
||||
tr_class = 'even';
|
||||
}
|
||||
let html_tag = '<tr class="'+tr_class+'" id="remove_service-'+service_id+'" data-service_name="'+service_name+'">' +
|
||||
'<td class="padding20" style="width: 100%;">'+service_name+'</td>' +
|
||||
'<td><span class="add_user_group" onclick="removeServiceFromUser('+service_id+')" title="'+delete_word+' '+service_word+'">-</span></td></tr>';
|
||||
$('#add_service-'+service_id).remove();
|
||||
$("#checked_services tbody").append(html_tag);
|
||||
}
|
||||
function removeServiceFromUser(service_id) {
|
||||
let service_name = $('#remove_service-'+service_id).attr('data-service_name');
|
||||
let length_tr = $('#all_services tbody tr').length;
|
||||
let tr_class = 'odd';
|
||||
if (length_tr % 2 != 0) {
|
||||
tr_class = 'even';
|
||||
}
|
||||
let html_tag = '<tr class="'+tr_class+'" id="add_service-'+service_id+'" data-service_name="'+service_name+'">' +
|
||||
'<td class="padding20" style="width: 100%;">'+service_name+'</td>' +
|
||||
'<td><span class="add_user_group" onclick="addServiceToUser('+service_id+')" title="'+add_word+' '+service_word+'">+</span></td></tr>';
|
||||
$('#remove_service-'+service_id).remove();
|
||||
$("#all_services tbody").append(html_tag);
|
||||
}
|
||||
function confirmChangeGroupsAndRoles(user_id) {
|
||||
let user_groups_word = translate_div.attr('data-user_groups');
|
||||
let username = $('#login-' + user_id).val();
|
||||
$.ajax({
|
||||
url: "/app/user/groups/" + user_id,
|
||||
success: function (data) {
|
||||
$("#groups-roles").html(data);
|
||||
$("#groups-roles").dialog({
|
||||
resizable: false,
|
||||
height: "auto",
|
||||
width: 700,
|
||||
modal: true,
|
||||
title: user_groups_word + ' ' + username,
|
||||
buttons: [{
|
||||
text: save_word,
|
||||
click: function () {
|
||||
saveGroupsAndRoles(user_id);
|
||||
$(this).dialog("close");
|
||||
}
|
||||
}, {
|
||||
text: cancel_word,
|
||||
click: function () {
|
||||
$(this).dialog("close");
|
||||
}
|
||||
}]
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
function addGroupToUser(group_id) {
|
||||
let group_name = $('#add_group-'+group_id).attr('data-group_name');
|
||||
let group2_word = translate_div.attr('data-group2');
|
||||
let length_tr = $('#all_groups tbody tr').length;
|
||||
const roles = {1: 'superAdmin', 2: 'admin', 3: 'user', 4: 'guest'};
|
||||
let options_roles = '';
|
||||
for (const [role_id, role_name] of Object.entries(roles)) {
|
||||
options_roles += '<option value="'+role_id+'">'+role_name+'</option>';
|
||||
}
|
||||
let tr_class = 'odd';
|
||||
if (length_tr % 2 != 0) {
|
||||
tr_class = 'even';
|
||||
}
|
||||
let html_tag = '<tr class="'+tr_class+'" id="remove_group-'+group_id+'" data-group_name="'+group_name+'">\n' +
|
||||
' <td class="padding20" style="width: 50%;">'+group_name+'</td>\n' +
|
||||
' <td style="width: 50%;">\n' +
|
||||
' <select id="add_role-'+group_id+'">'+options_roles+'</select></td>\n' +
|
||||
' <td><span class="remove_user_group" onclick="removeGroupFromUser('+group_id+')" title="'+delete_word+' '+group2_word+'">-</span></td></tr>'
|
||||
$('#add_group-'+group_id).remove();
|
||||
$("#checked_groups tbody").append(html_tag);
|
||||
}
|
||||
function removeGroupFromUser(group_id) {
|
||||
let group_name = $('#remove_group-'+group_id).attr('data-group_name');
|
||||
let group2_word = translate_div.attr('data-group2');
|
||||
let length_tr = $('#all_groups tbody tr').length;
|
||||
let tr_class = 'odd';
|
||||
if (length_tr % 2 != 0) {
|
||||
tr_class = 'even';
|
||||
}
|
||||
let html_tag = '<tr class="'+tr_class+'" id="add_group-'+group_id+'" data-group_name='+group_name+'>\n' +
|
||||
' <td class="padding20" style="width: 100%">'+group_name+'</td>\n' +
|
||||
' <td><span class="add_user_group" title="'+add_word+' '+group2_word+'" onclick="addGroupToUser('+group_id+')">+</span></td></tr>'
|
||||
$('#remove_group-'+group_id).remove();
|
||||
$("#all_groups tbody").append(html_tag);
|
||||
}
|
||||
function saveGroupsAndRoles(user_id) {
|
||||
let length_tr = $('#checked_groups tbody tr').length;
|
||||
let jsonData = {};
|
||||
jsonData[user_id] = {};
|
||||
$('#checked_groups tbody tr').each(function () {
|
||||
let this_id = $(this).attr('id').split('-')[1];
|
||||
let role_id = $('#add_role-' + this_id).val();
|
||||
jsonData[user_id][this_id] = {'role_id': role_id};
|
||||
});
|
||||
for (const [key, value] of Object.entries(jsonData)) {
|
||||
if (Object.keys(value).length === 0) {
|
||||
toastr.error('error: User must have at least one group');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
$.ajax({
|
||||
url: "/app/user/groups/save",
|
||||
data: {
|
||||
changeUserGroupsUser: $('#login-' + user_id).val(),
|
||||
jsonDatas: JSON.stringify(jsonData)
|
||||
},
|
||||
type: "POST",
|
||||
success: function (data) {
|
||||
if (data.indexOf('error: ') != '-1') {
|
||||
toastr.warning(data);
|
||||
} else {
|
||||
$("#user-" + user_id).addClass("update", 1000);
|
||||
setTimeout(function () {
|
||||
$("#user-" + user_id).removeClass("update");
|
||||
}, 2500);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue