tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7596-ocultar-campos-http-auth-en-modulos-web' into 'develop' 

Ocultar campos http auth en modulos web en campo Web Checks

See merge request artica/pandorafms!4162
This commit is contained in:
Daniel Rodriguez 2021-05-31 11:25:25 +00:00
parent ff3eb72420 b253a01841
commit 844f583b0c
2 changed files with 36 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -1668,47 +1668,30 @@ if ($update_module) {
'module_macros' => $module_macros, 'module_macros' => $module_macros,
]; ];
if (preg_match('/http_auth_user/m', $values['plugin_parameter'])) {
$http_user_conf = true;
}
if (preg_match('/http_auth_pass/m', $values['plugin_parameter'])) { if ($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33) {
$http_pass_conf = true; $plugin_parameter_split = explode('
', $values['plugin_parameter']);
}
$values['plugin_parameter'] = '';
if (!$http_user_conf || !$http_pass_conf) { foreach ($plugin_parameter_split as $key => $value) {
if ($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33) { if ($key == 1) {
$plugin_parameter_split = explode('
', $values['plugin_parameter']); if ($http_user) {
$values['plugin_parameter'] .= 'http_auth_user '.$http_user.'
';
$values['plugin_parameter'] = '';
foreach ($plugin_parameter_split as $key => $value) {
if ($key == 1) {
if ($http_user) {
if ($http_user_conf) {
continue;
}
$values['plugin_parameter'] .= 'http_auth_user '.$http_user.'
';
}
if ($http_pass) {
if ($http_user_pass) {
continue;
}
$values['plugin_parameter'] .= 'http_auth_pass '.$http_pass.'
';
}
$values['plugin_parameter'] .= $value.'
';
} else {
$values['plugin_parameter'] .= $value.'
';
} }
if ($http_pass) {
$values['plugin_parameter'] .= 'http_auth_pass '.$http_pass.'
';
}
$values['plugin_parameter'] .= $value.'
';
} else {
$values['plugin_parameter'] .= $value.'
';
} }
} }
} }
// In local modules, the interval is updated by agent. // In local modules, the interval is updated by agent.
$module_kind = (int) get_parameter('moduletype'); $module_kind = (int) get_parameter('moduletype');
if ($module_kind == MODULE_DATA) { if ($module_kind == MODULE_DATA) {

90
pandora_console/godmode/agentes/module_manager_editor_web.php
View File

@ -101,12 +101,29 @@ if ($id_policy_module) {
$plugin_parameter = $module['plugin_parameter']; $plugin_parameter = $module['plugin_parameter'];
} }
$plugin_parameter_split = explode('
', $plugin_parameter);
$plugin_parameter_final_split = '';
foreach ($plugin_parameter_split as $key => $value) {
if (strpos($value, 'http_auth_user') === false && strpos($value, 'http_auth_pass') === false) {
$plugin_parameter_final_split .= $value.'
';
}
if (strpos($value, 'http_auth_user') !== false) {
$plugin_parameter_http_user = str_replace('http_auth_user ', '', $value);
}
if (strpos($value, 'http_auth_pass') !== false) {
$plugin_parameter_http_pass = str_replace('http_auth_pass ', '', $value);
}
}
if ((bool) $adopt === false) { if ((bool) $adopt === false) {
$data[1] = html_print_textarea( $data[1] = html_print_textarea(
'plugin_parameter', 'plugin_parameter',
15, 15,
65, 65,
$plugin_parameter, $plugin_parameter_final_split,
$disabledTextBecauseInPolicy, $disabledTextBecauseInPolicy,
true, true,
'resizev' 'resizev'
@ -116,7 +133,7 @@ if ((bool) $adopt === false) {
'plugin_parameter', 'plugin_parameter',
15, 15,
65, 65,
$plugin_parameter, $plugin_parameter_final_split,
false, false,
true true
); );
@ -259,16 +276,12 @@ foreach ($texts as $code => $text) {
"get_content", "get_content",
"debug", "debug",
"task_end", "task_end",
"head", "head"
"http_auth_user",
"http_auth_pass"
]; ];
$(document).ready(function() { $(document).ready(function() {
var plugin_parameter = $("#textarea_plugin_parameter"); var plugin_parameter = $("#textarea_plugin_parameter");
var http_auth_user = $('#text-http_user');
var http_auth_pass = $('#password-http_pass');
$(plugin_parameter).keyup(function() { $(plugin_parameter).keyup(function() {
@ -278,18 +291,6 @@ foreach ($texts as $code => $text) {
} else { } else {
$('#button-btn_loadbasic').attr('disabled', 'disabled'); $('#button-btn_loadbasic').attr('disabled', 'disabled');
} }
// Update http_auth_user from conf data
var http_auth_user_value = get_module_token_from_config('http_auth_user', plugin_parameter, "\n");
if (http_auth_user_value != "") {
http_auth_user.val(http_auth_user_value);
}
// Update http_auth_pass from conf data
var http_auth_pass_value = get_module_token_from_config('http_auth_pass', plugin_parameter, "\n");
if (http_auth_pass_value != "") {
http_auth_pass.val(http_auth_pass_value);
}
}); });
$('#button-btn_loadbasic').click(function() { $('#button-btn_loadbasic').click(function() {
@ -413,57 +414,6 @@ foreach ($texts as $code => $text) {
}); });
$(plugin_parameter).trigger('keyup'); $(plugin_parameter).trigger('keyup');
http_auth_user.keyup(function() {
config = plugin_parameter.val();
if (config.search("http_auth_user") == -1) {
var http_auth_user_end =
"http_auth_user " + this.value + "\n" + "task_end" + "\n";
plugin_parameter.val(config.replace(/^task_end.*$/m, http_auth_user_end));
} else {
plugin_parameter.val(
config.replace(/^http_auth_user.*$/m, "http_auth_user " + this.value)
);
// Hide success and error indicators
$(".checks").hide();
}
});
http_auth_pass.keyup(function() {
config = plugin_parameter.val();
if (config.search("http_auth_pass") == -1) {
var http_auth_pass_end =
"http_auth_pass " + this.value + "\n" + "task_end" + "\n";
plugin_parameter.val(config.replace(/^task_end.*$/m, http_auth_pass_end));
} else {
plugin_parameter.val(
config.replace(/^http_auth_pass.*$/m, "http_auth_pass " + this.value)
);
// Hide success and error indicators
$(".checks").hide();
}
});
}); });
function get_module_token_from_config(token_name, plugin_parameter, separator) {
var return_var = "";
if(token_name == null || token_name == '') {
return '';
}
data = plugin_parameter.val().split(separator);
len = data.length;
for (i = 0; i < len; i++) {
if (data[i][0] == "#") continue;
tokens = data[i].split(" ");
if (tokens.length == 0) continue;
token = tokens.shift();
if (token == token_name ) return_var = tokens.join(" ");
}
return_var = $.trim(return_var);
return return_var;
}
</script> </script>