tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 2290-seguridad-en-la-api-3

Browse Source
This commit is contained in:
fermin831 2018-06-19 13:38:13 +02:00
commit c11a8b3d2e
26 changed files with 390 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.724-180618
Version: 7.0NG.724-180619
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.724-180618"
pandora_version="7.0NG.724-180619"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -42,7 +42,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.724';
use constant AGENT_BUILD => '180618';
use constant AGENT_BUILD => '180619';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.724
%define release 180618
%define release 180619
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.724
%define release 180618
%define release 180619
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.724"
PI_BUILD="180618"
PI_BUILD="180619"
OS_NAME=`uname -s`
FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{180618}
{180619}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.724(Build 180618)")
#define PANDORA_VERSION ("7.0NG.724(Build 180619)")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.724(Build 180618))"
VALUE "ProductVersion", "(7.0NG.724(Build 180619))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.724-180618
Version: 7.0NG.724-180619
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.724-180618"
pandora_version="7.0NG.724-180619"
package_pear=0
package_pandora=1

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC180618';
$build_version = 'PC180619';
$pandora_version = 'v7.0NG.724';
// Do not overwrite default timezone set if defined.

173
pandora_console/include/functions_api.php
View File

@ -176,7 +176,11 @@ function returnData($returnType, $data, $separator = ';') {
case 'json':
$data = array_apply_io_safe_output($data);
header('Content-type: application/json');
echo json_encode ($data);
// Allows extra parameters to json_encode, like JSON_FORCE_OBJECT
if ($separator == ";") {
$separator = null;
}
echo json_encode ($data, $separator);
break;
}
}
@ -10811,10 +10815,12 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
$description = $other['data'][2];
$idGroup = $other['data'][3];
if (!users_is_admin($config['id_user'])) {
if(!check_acl($config['id_user'], $idGroup, "AW")) {
returnError('forbidden', 'string');
return;
}
}
$name_exist = db_process_sql('select count(name) as already_exist from tcluster as already_exist where name = "'.$name.'"');
@ -10837,9 +10843,14 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
'modo' => 1
);
if (!isset($name)) { // avoid warnings
$name = "";
}
if (trim($name) != "") {
$id_agent = agents_create_agent($values_agent['nombre'],$values_agent['id_grupo'],300,'',$values_agent);
if ($id_agent !== false) {
// Create cluster
$values_cluster = array(
'name' => $name,
@ -10851,29 +10862,38 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
$id_cluster = db_process_sql_insert('tcluster', $values_cluster);
if ($id_cluster === false) {
// failed to create cluster, rollback previously created agent
agents_delete_agent($id_agent, true);
}
$values_module = array(
'nombre' => 'Cluster status',
'nombre' => io_safe_input('Cluster status'),
'id_modulo' => 5,
'prediction_module' => 5,
'id_agente' => $id_agent,
'custom_integer_1' => $id_cluster,
'id_tipo_modulo' => 1,
'descripcion' => 'Cluster status information module',
'descripcion' => io_safe_input('Cluster status information module'),
'min_warning' => 1,
'min_critical' => 2
);
$id_module = modules_create_agent_module($values_module['id_agente'],$values_module['nombre'],$values_module);
$id_module = modules_create_agent_module($id_agent, $values_module['nombre'], $values_module, true);
if ($id_module === false) {
db_pandora_audit("Report management", "Failed to create cluster status module in cluster $name (#$id_agent)");
}
}
if ($id_cluster !== false)
db_pandora_audit("Report management", "Create cluster #$id_cluster");
db_pandora_audit("Report management", "Created cluster $name (#$id_cluster)");
else
db_pandora_audit("Report management", "Fail try to create cluster");
db_pandora_audit("Report management", "Failed to create cluster $name");
if ($id_agent !== false)
db_pandora_audit("Report management", "Create cluster #$id_agent");
db_pandora_audit("Report management", "Created new cluster agent $name (#$id_agent)");
else
db_pandora_audit("Report management", "Fail try to create agent");
db_pandora_audit("Report management", "Failed to create cluster agent $name");
returnData('string',
array('type' => 'string', 'data' => (int)$id_cluster));
@ -10888,28 +10908,20 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
$array_json = json_decode(base64_decode(io_safe_output($other['data'][0])), true);
if(!empty($array_json)){
$results = false;
foreach ($array_json as $key => $element) {
$check_cluster_group = clusters_get_group ($element['id']);
if(!$check_cluster_group ||
!check_acl($config['id_user'], $check_cluster_group, "AW") ||
!agents_check_access_agent($element['id_agent'], "AW")
){
if (!users_is_admin($config['id_user'])) {
if (!$check_cluster_group
|| (!check_acl($config['id_user'], $check_cluster_group, "AW"))
|| (!agents_check_access_agent($element['id_agent'], "AW"))) {
continue;
}
}
$tcluster_agent = db_process_sql('insert into tcluster_agent values ('.$element["id"].','.$element["id_agent"].')');
}
if($result && !$results){
$results = $result;
}
}
if($tcluster_agent){
if($tcluster_agent !== false){
returnData('string', array('type' => 'string', 'data' => 1));
} else {
returnError('error_add_cluster_element', __('Error adding elements to cluster'));
@ -10918,36 +10930,36 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
}
function api_set_add_cluster_item($thrash1, $thrash2, $other, $thrash3) {
global $config;
$array_json = json_decode(base64_decode(io_safe_output($other['data'][0])), true);
if(!empty($array_json)){
$results = false;
if (defined ('METACONSOLE')) {
return;
}
//
$array_json = json_decode(base64_decode(io_safe_output($other['data'][0])), true);
if (is_array($array_json)) {
foreach ($array_json as $key => $element) {
$cluster_group = clusters_get_group ($element['id']);
if (!users_is_admin($config["id_user"])) {
if(!$cluster_group || !check_acl($config['id_user'], $cluster_group, "AW")){
continue;
}
}
if($element["type"] == "AA"){
$tcluster_module = db_process_sql_insert('tcluster_item',array('name'=>io_safe_input($element["name"]),'id_cluster'=>$element["id_cluster"],'critical_limit'=>$element["critical_limit"],'warning_limit'=>$element["warning_limit"]));
$id_agent = db_process_sql('select id_agent from tcluster where id = '.$element["id_cluster"]);
$id_parent_modulo = db_process_sql('select id_agente_modulo from tagente_modulo where id_agente = '.$id_agent[0]['id_agent'].' and nombre = "Cluster status"');
$id_parent_modulo = db_process_sql('select id_agente_modulo from tagente_modulo where id_agente = ' . $id_agent[0]['id_agent']
. ' and nombre = "' . io_safe_input("Cluster status") . '"');
$get_module_type = db_process_sql('select id_tipo_modulo,descripcion,min_warning,min_critical,module_interval from tagente_modulo where nombre = "'.io_safe_input($element["name"]).'" limit 1');
$get_module_type_value = $get_module_type[0]['id_tipo_modulo'];
$get_module_description_value = $get_module_type[0]['descripcion'];
$get_module_warning_value = $get_module_type[0]['min_warning'];
$get_module_critical_value = $get_module_type[0]['min_critical'];
$get_module_interval_value = $get_module_type[0]['module_interval'];
$values_module = array(
@ -10966,42 +10978,35 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
'module_interval' => $get_module_interval_value
);
$id_module = modules_create_agent_module($values_module['id_agente'],$values_module['nombre'],$values_module, true);
$id_module = modules_create_agent_module($values_module['id_agente'],$values_module['nombre'],$values_module);
$launch_cluster = db_process_sql('update tagente_modulo set flag = 1 where custom_integer_1 = '.$element["id_cluster"].' and nombre = "Cluster status"');
$launch_cluster = db_process_sql('update tagente_modulo set flag = 1 where custom_integer_1 = '.$element["id_cluster"]
. ' and nombre = "' . io_safe_input("Cluster status") . '"');
if ($tcluster_module !== false){
db_pandora_audit("Report management", "Module #".$element["name"]." assigned to cluster #".$element["id_cluster"]);
}
else{
db_pandora_audit("Report management", "Fail try to assign module to cluster");
db_pandora_audit("Report management", "Failed to assign AA item module to cluster " . $element["name"]);
}
}
elseif ($element["type"] == "AP") {
$id_agent = db_process_sql('select id_agent from tcluster where id = '.$element["id_cluster"]);
$id_parent_modulo = db_process_sql('select id_agente_modulo from tagente_modulo where id_agente = '.$id_agent[0]['id_agent'].' and nombre = "Cluster status"');
$id_parent_modulo = db_process_sql('select id_agente_modulo from tagente_modulo where id_agente = '.$id_agent[0]['id_agent']
. ' and nombre = "' . io_safe_input("Cluster status") . '"');
$tcluster_balanced_module = db_process_sql_insert('tcluster_item',array('name'=>$element["name"],'id_cluster'=>$element["id_cluster"],'item_type'=>"AP",'is_critical'=>$element["is_critical"]));
$get_module_type = db_process_sql('select id_tipo_modulo,descripcion,min_warning,min_critical,module_interval from tagente_modulo where nombre = "'.io_safe_input($element["name"]).'" limit 1');
$get_module_type_value = $get_module_type[0]['id_tipo_modulo'];
$get_module_description_value = $get_module_type[0]['descripcion'];
$get_module_warning_value = $get_module_type[0]['min_warning'];
$get_module_critical_value = $get_module_type[0]['min_critical'];
$get_module_interval_value = $get_module_type[0]['module_interval'];
$get_module_type_nombre = db_process_sql('select nombre from ttipo_modulo where id_tipo = '.$get_module_type_value);
$get_module_type_nombre_value = $get_module_type_nombre[0]['nombre'];
@ -11037,9 +11042,10 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
'module_interval' => $get_module_interval_value
);
$id_module = modules_create_agent_module($values_module['id_agente'],$values_module['nombre'],$values_module);
$id_module = modules_create_agent_module($values_module['id_agente'],$values_module['nombre'],$values_module, true);
$launch_cluster = db_process_sql('update tagente_modulo set flag = 1 where custom_integer_1 = '.$element["id_cluster"].' and nombre = "Cluster status"');
$launch_cluster = db_process_sql('update tagente_modulo set flag = 1 where custom_integer_1 = '.$element["id_cluster"]
. ' and nombre = "' . io_safe_input("Cluster status") . '"');
if ($tcluster_balanced_module !== false){
db_pandora_audit("Report management", "Module #".$element["name"]." assigned to cluster #".$element["id_cluster"]);
@ -11047,16 +11053,14 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
else{
db_pandora_audit("Report management", "Fail try to assign module to cluster");
}
}
}
}
else {
$id_module = false;
}
}
if($result && !$results){
$results = $result;
}
if($id_module){
if($id_module !== false){
returnData('string', array('type' => 'string', 'data' => 1));
} else {
returnError('error_add_cluster_element', __('Error adding elements to cluster'));
@ -11087,13 +11091,9 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
}
$tcluster_modules_delete = modules_delete_agent_module($tcluster_modules_delete_get_values);
$tcluster_items_delete = db_process_sql('delete from tcluster_item where id_cluster = '.$id);
$tcluster_agents_delete = db_process_sql('delete from tcluster_agent where id_cluster = '.$id);
$tcluster_delete = db_process_sql('delete from tcluster where id = '.$id);
$tcluster_agent_delete = agents_delete_agent($temp_id_cluster[0]['id_agent']);
if (!$tcluster_modules_delete || !$tcluster_items_delete || !$tcluster_agents_delete || !$tcluster_delete || !$tcluster_agent_delete)
@ -11103,8 +11103,7 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
}
function api_set_delete_cluster_agent($thrash1, $thrast2, $other, $thrash3) {
function api_set_delete_cluster_agents($thrash1, $thrast2, $other, $thrash3) {
global $config;
if (defined ('METACONSOLE')) {
@ -11114,21 +11113,43 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
$id_agent = $other['data'][0];
$id_cluster = $other['data'][1];
$target_agents = json_decode(base64_decode(io_safe_output($other['data'][0])), true);
$cluster_group = clusters_get_group($id_agent);
if (!users_is_admin($config['id_user'])) {
if (!$cluster_group
|| !check_acl($config['id_user'], $cluster_group, "AW")
|| !agents_check_access_agent($id_agent, "AW")){
|| (!check_acl($config['id_user'], $cluster_group, "AW"))
|| (!agents_check_access_agent($id_agent, "AW"))) {
returnError('error_set_delete_cluster_agent', __('The user cannot access to the cluster'));
return;
}
}
$tcluster_agent_delete = db_process_sql('delete from tcluster_agent where id_agent = '.$id_agent.' and id_cluster = '.$id_cluster);
$n_agents_deleted = 0;
$n_agents = 0;
if (is_array($target_agents)) {
$target_clusters = array();
foreach ($target_agents as $data) {
$n_agents++;
if (!isset($target_clusters[$data["id"]])) {
$target_clusters[$data["id"]] = array();
}
array_push($target_clusters[$data["id"]], $data["id_agent"]);
}
if (!$tcluster_agent_delete)
foreach ($target_clusters as $id_cluster => $id_agent_array) {
$rs = cluster_delete_agents($id_cluster, $id_agent_array);
if ($rs !== false){
$n_agents_deleted += $rs;
}
}
}
if ($n_agents > $n_agents_deleted)
returnError('error_delete', 'Error in delete operation.');
else
returnData('string', array('type' => 'string', 'data' => __('Correct Delete')));
returnData('string', array('type' => 'string', 'data' => $n_agents_deleted));
}
@ -11147,9 +11168,7 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
}
$delete_module_aa_get = db_process_sql('select id_agente_modulo from tagente_modulo where custom_integer_2 = '.$id);
$delete_module_aa_get_result = modules_delete_agent_module($delete_module_aa_get[0]['id_agente_modulo']);
$delete_item = db_process_sql('delete from tcluster_item where id = '.$id);
if (!$delete_item)
@ -11313,7 +11332,9 @@ function api_get_cluster_status($id_cluster, $trash1, $trash2, $returnType) {
return;
}
$sql = "select estado from tagente_estado INNER JOIN tagente_modulo ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo and tagente_modulo.nombre = 'Cluster status' and tagente_modulo.id_agente = (select id_agent from tcluster where id = ".$id_cluster.")";
$sql = 'select estado from tagente_estado INNER JOIN tagente_modulo ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo '
. ' and tagente_modulo.nombre = "' . io_safe_input("Cluster status") . '" '
. ' and tagente_modulo.id_agente = (select id_agent from tcluster where id = ".$id_cluster.")';
$value = db_get_value_sql($sql);
@ -11333,20 +11354,20 @@ function api_get_cluster_id_by_name($cluster_name, $trash1, $trash2, $returnType
return;
}
$cluster_name = io_safe_output($cluster_name);
$value = cluster_get_id_by_name($cluster_name);
if ($value === false) {
if(($value === false) || ($value === null)){
returnError('id_not_found', $returnType);
}
$cluster_group = clusters_get_group($value);
if (!users_is_admin($config['id_user'])) {
if(!$cluster_group || !check_acl($config['id_user'], $cluster_group, "AR")) {
returnError('error_get_cluster_status', __('The user cannot access to the cluster'));
return;
}
}
$data = array('type' => 'string', 'data' => $value);
@ -11360,10 +11381,10 @@ function api_get_agents_id_name_by_cluster_id($cluster_id, $trash1, $trash2, $re
$all_agents = cluster_get_agents_id_name_by_cluster_id($cluster_id);
if (count($all_agents) > 0 and $all_agents !== false) {
if ($all_agents !== false) {
$data = array('type' => 'json', 'data' => $all_agents);
returnData('json', $data);
returnData('json', $data, JSON_FORCE_OBJECT);
}
else {
returnError('error_agents', 'No agents retrieved.');
@ -11380,7 +11401,7 @@ function api_get_agents_id_name_by_cluster_name($cluster_name, $trash1, $trash2,
if (count($all_agents) > 0 and $all_agents !== false) {
$data = array('type' => 'json', 'data' => $all_agents);
returnData('json', $data);
returnData('json', $data, JSON_FORCE_OBJECT);
}
else {
returnError('error_agents', 'No agents retrieved.');
@ -11430,7 +11451,7 @@ function api_get_modules_id_name_by_cluster_name ($cluster_name){
function util_api_check_agent_and_print_error($id_agent, $returnType, $access = "AR") {
global $config;
$check_agent = agents_check_access_agent($id_agent, $access);
$check_agent = agents_check_access_agent($id_agent["id_agente"], $access);
if ($check_agent === true) return true;
if ($check_agent === false || !check_acl($config['id_user'], 0, $access)) {

2
pandora_console/install.php
View File

@ -71,7 +71,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.724';
$build = '180618';
$build = '180619';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.724
%define release 180618
%define release 180619
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.724
%define release 180618
%define release 180619
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.724-180618
Version: 7.0NG.724-180619
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.724-180618"
pandora_version="7.0NG.724-180619"
package_cpan=0
package_pandora=1

6
pandora_server/conf/pandora_server.conf.new
View File

@ -630,3 +630,9 @@ syslog_max 65535
#logstash_host ip
#logstash_port 10514
# Pandora FMS Database HA Tool execution interval in seconds (PANDORA FMS ENTERPRISE ONLY).
ha_interval 30
# Pandora FMS Database HA Tool monitoring interval in seconds. Must be a multiple of ha_interval (PANDORA FMS ENTERPRISE ONLY).
ha_monitoring_interval 60

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.724";
my $pandora_build = "180618";
my $pandora_build = "180619";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

46
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -24,6 +24,7 @@ use Scalar::Util qw(looks_like_number);
use Time::HiRes qw(time);
use POSIX qw(strftime setsid floor);
use MIME::Base64;
use JSON qw(decode_json encode_json);
use base 'Exporter';
@ -31,7 +32,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.724";
my $pandora_build = "180618";
my $pandora_build = "180619";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
@ -62,6 +63,7 @@ our @EXPORT = qw(
in_array
init
is_enabled
join_by_field
load_perl_modules
logger
merge_hashes
@ -1003,6 +1005,22 @@ sub init_system {
return $conf;
}
################################################################################
# Return a string with the concatenation of a hash array based on a field
################################################################################
sub join_by_field {
my ($separator, $field, $array_hashref) = @_;
$separator = ',' if empty($separator);
my $str = '';
foreach my $item (@{$array_hashref}) {
$str .= (defined($item->{$field})?$item->{$field}:'') . $separator;
}
chop($str);
return $str;
}
################################################################################
# Return system environment
################################################################################
@ -1500,14 +1518,14 @@ sub api_available {
# apidata->{other} = [field1,field2,...,fieldi,...,fieldn]
#########################################################################################
sub api_call {
my ($conf, $apidata) = @_;
my ($conf, $apidata, $decode_json) = @_;
my ($api_url, $api_pass, $api_user, $api_user_pass,
$op, $op2, $other_mode, $other, $return_type);
$op, $op2, $id, $id2, $other_mode, $other, $return_type);
my $separator;
if (ref $apidata eq "ARRAY") {
($api_url, $api_pass, $api_user, $api_user_pass,
$op, $op2, $return_type, $other_mode, $other) = @{$apidata};
$op, $op2, $id, $id2, $return_type, $other_mode, $other) = @{$apidata};
}
if (ref $apidata eq "HASH") {
$api_url = $apidata->{'api_url'};
@ -1516,6 +1534,8 @@ sub api_call {
$api_user_pass = $apidata->{'api_user_pass'};
$op = $apidata->{'op'};
$op2 = $apidata->{'op2'};
$id = $apidata->{'id'};
$id2 = $apidata->{'id2'};
$return_type = $apidata->{'return_type'};
$other_mode = "url_encode_separator_" . $apidata->{'url_encode_separator'} unless empty($apidata->{'url_encode_separator'});
$other_mode = "url_encode_separator_|" if empty($other_mode);
@ -1528,6 +1548,8 @@ sub api_call {
$api_user_pass = $conf->{'api_user_pass'} if empty($api_user_pass);
$op = $conf->{'op'} if empty($op);
$op2 = $conf->{'op2'} if empty($op2);
$id = $conf->{'id'} if empty($id);
$id2 = $conf->{'id2'} if empty($id2);
$return_type = $conf->{'return_type'} if empty($return_type);
$return_type = 'json' if empty($return_type);
if (ref ($apidata->{'other'}) eq "ARRAY") {
@ -1545,18 +1567,30 @@ sub api_call {
$other = $apidata->{'other'};
}
$other = '' if empty($other);
$id = '' if empty($id);
$id2 = '' if empty($id2);
my $call;
$call = $api_url . '?';
$call .= 'op=' . $op . '&op2=' . $op2;
$call .= 'op=' . $op . '&op2=' . $op2 . '&id=' . $id;
$call .= '&other_mode=url_encode_separator_' . $separator;
$call .= '&other=' . $other;
$call .= '&apipass=' . $api_pass . '&user=' . $api_user . '&pass=' . $api_user_pass;
$call .= '&return_type=' . $return_type;
my $rs = call_url($conf, "$call");
if (ref($rs) ne "HASH") {
if (is_enabled($decode_json)) {
eval {
my $tmp = decode_json($rs);
$rs = $tmp;
};
if ($@) {
print_stderror($conf, "Error: " . $@);
}
}
return {
rs => (empty($rs)?1:0),
error => (empty($rs)?"Empty response.":undef),

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.724
%define release 180618
%define release 180619
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.724
%define release 180618
%define release 180619
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.724"
PI_BUILD="180618"
PI_BUILD="180619"
MODE=$1
if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.724 PS180618";
my $version = "7.0NG.724 PS180619";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.724 PS180618";
my $version = "7.0NG.724 PS180619";
# save program name for logging
my $progname = basename($0);