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

Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes

This commit is contained in:
fbsanchez 2018-07-04 18:38:36 +02:00
parent f430b8998f 8d8b6ffe51
commit 9e028873be
40 changed files with 4915 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
pandora_agents/pc/tentacle_client
View File

@ -58,6 +58,8 @@ use strict;
use File::Basename;
use Getopt::Std;
use IO::Select;
use IO::Compress::Zip qw(zip $ZipError);
use IO::Uncompress::Unzip qw(unzip $UnzipError);
use Socket (qw(SOCK_STREAM AF_INET AF_INET6));
my $SOCKET_MODULE =
eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
@ -131,6 +133,12 @@ my $t_ssl_pwd = '';
# Timeout for socket read/write operations in seconds
my $t_timeout = 1;
# bind ipaddr
my $t_bind_address = undef;
# Compress data before sending it through the socket.
my $t_zip = 0;
################################################################################
## SUB print_help
## Print help screen.
@ -141,6 +149,7 @@ sub print_help {
print ("Tentacle client v$VERSION. See http://www.openideas.info/wiki for protocol description.\n\n");
print ("Options:\n");
print ("\t-a address\tServer address (default $t_address).\n");
print ("\t-b localaddress\tLocal address to bind.\n");
print ("\t-c\t\tEnable SSL without a client certificate.\n");
print ("\t-e cert\t\tOpenSSL certificate file. Enables SSL.\n");
print ("\t-f ca\t\tVerify that the peer certificate is signed by a ca.\n");
@ -154,7 +163,8 @@ sub print_help {
print ("\t-v\t\tBe verbose.\n");
print ("\t-w\t\tPrompt for OpenSSL private key password.\n");
print ("\t-x pwd\t\tServer password.\n");
print ("\t-y proxy\tProxy server string (user:password\@address:port).\n\n");
print ("\t-y proxy\tProxy server string (user:password\@address:port).\n");
print ("\t-z Compress data.\n\n");
}
################################################################################
@ -166,7 +176,7 @@ sub parse_options {
my $tmp;
# Get options
if (getopts ('a:ce:f:ghk:p:qr:t:vwx:y:', \%opts) == 0 || defined ($opts{'h'})) {
if (getopts ('a:b:ce:f:ghk:p:qr:t:vwx:y:z', \%opts) == 0 || defined ($opts{'h'})) {
print_help ();
exit 1;
}
@ -183,6 +193,18 @@ sub parse_options {
}
# Bind local address
if (defined ($opts{'b'})) {
$t_bind_address = $opts{'b'};
if (($t_bind_address !~ /^[a-zA-Z\.][a-zA-Z0-9\.\-]+$/ && ($t_bind_address !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255)) &&
($t_address !~ /^[0-9a-f:]+$/o)) {
error ("Local address $t_bind_address is not valid.");
}
}
# Enable SSL without a client certificate
if (defined ($opts{'c'})) {
require IO::Socket::SSL;
@ -299,6 +321,11 @@ sub parse_options {
error ("Proxy port $t_proxy_port is not valid.");
}
}
# Compress data
if (defined ($opts{'z'})) {
$t_zip = 1;
}
}
################################################################################
@ -309,20 +336,42 @@ sub start_client {
# Connect to server
if ($SOCKET_MODULE ne 'IO::Socket::INET') {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
LocalAddr => $t_bind_address,
Type => SOCK_STREAM
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
}
}
if (! defined ($t_socket)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
LocalAddr => $t_bind_address,
Type => SOCK_STREAM
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
}
}
if (! defined ($t_socket)) {
@ -344,18 +393,38 @@ sub start_client_proxy {
# Connect to proxy
if ($SOCKET_MODULE ne 'IO::Socket::INET') {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
LocalAddr => $t_bind_address,
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
}
}
if (! defined ($t_socket)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
LocalAddr => $t_bind_address,
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
}
}
if (! defined ($t_socket)) {
@ -408,6 +477,8 @@ sub start_ssl {
if ($t_ssl_cert eq ''){
IO::Socket::SSL->start_SSL (
$t_socket,
# No authentication
SSL_verify_mode => 0x00,
);
}
elsif ($t_ssl_ca eq '') {
@ -525,6 +596,46 @@ sub recv_file {
print_log ("Received file '$file'");
}
################################################################################
## SUB zrecv_file
## Receive a compressed file from the server
################################################################################
sub zrecv_file {
my $data = '';
my $file = $_[0];
my $response;
my $size;
my $zdata = '';
# Request file
send_data ("ZRECV <$file>\n");
# Wait for server response
$response = recv_command ();
if ($response !~ /^ZRECV SIZE (\d+)$/) {
error ("Server responded $response.");
}
$size = $1;
send_data ("ZRECV OK\n");
# Receive file
$zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError");
send_data ("ZRECV ERR\n");
return;
}
# Write it to disk
open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
binmode (FILE);
print (FILE $data);
close (FILE);
print_log ("Received compressed file '$file'");
}
################################################################################
## SUB send_file
## Send a file to the server
@ -578,6 +689,55 @@ sub send_file {
print_log ("File sent");
}
################################################################################
## SUB zsend_file
## Send a file to the server (compressed)
################################################################################
sub zsend_file {
my $base_name;
my $data = '';
my $response = '';
my $retries;
my $file = $_[0];
my $size;
my $written;
# Read the file and compress its contents
if (! zip($file => \$data)) {
send_data ("QUIT\n");
error ("Compression error: $ZipError");
return;
}
$size = length($data);
$base_name = basename ($file);
# Request to send file
send_data ("ZSEND <$base_name> SIZE $size\n");
print_log ("Request to send file '$base_name' size ${size}b (compressed)");
# Wait for server response
$response = recv_command ();
# Server rejected the file
if ($response ne "ZSEND OK") {
send_data ("QUIT\n");
error ("Server responded $response.");
}
print_log ("Server responded SEND OK");
send_data ($data);
# Wait for server response
$response = recv_command ();
if ($response ne "ZSEND OK") {
send_data ("QUIT\n");
error ("Server responded $response.");
}
print_log ("File sent");
}
################################################################################
# Common functions
################################################################################
@ -830,13 +990,21 @@ if ($t_recv == 0) {
# Send the files
foreach $file (@ARGV) {
send_file ($file);
if ($t_zip == 1) {
zsend_file($file);
} else {
send_file ($file);
}
}
}
else {
# Send the files
# Receive the files
foreach $file (@ARGV) {
recv_file ($file);
if ($t_zip == 1) {
zrecv_file ($file);
} else {
recv_file ($file);
}
}
}
@ -882,6 +1050,8 @@ __END__
=item I<-x pwd> B<Server password>.
=item I<-z> Compress data.
=back
=head1 EXIT STATUS

117
pandora_agents/pc/tentacle_server
View File

@ -60,6 +60,8 @@ use strict;
use warnings;
use Getopt::Std;
use IO::Select;
use IO::Compress::Zip qw(zip $ZipError);
use IO::Uncompress::Unzip qw(unzip $UnzipError);
use threads;
use Thread::Semaphore;
use POSIX ":sys_wait_h";
@ -959,6 +961,15 @@ sub serve_connection {
print_info ("Request to receive file '$1' from " . $t_client_socket->sockhost ());
send_file ($1);
}
elsif ($command =~ /^ZSEND <(.*)> SIZE (\d+)$/) {
print_info ("Request to send compressed file '$1' size ${2}b from " . $t_client_socket->sockhost ());
zrecv_file ($1, $2);
}
# Client wants to receive a file
elsif ($command =~ /^ZRECV <(.*)>$/) {
print_info ("Request to receive compressed file '$1' from " . $t_client_socket->sockhost ());
zsend_file ($1);
}
# Quit
elsif ($command =~ /^QUIT$/) {
print_info ("Connection closed from " . $t_client_socket->sockhost ());
@ -1070,6 +1081,61 @@ sub recv_file {
print_info ("Received file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
}
################################################################################
## SUB zrecv_file
## Receive a compressed file of size $_[1] and save it in $t_directory as $_[0].
################################################################################
sub zrecv_file {
my $base_name = $_[0];
my $data = '';
my $file;
my $size = $_[1];
my $zdata = '';
# Check file name
if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("ZSEND ERR (invalid file name)\n");
return;
}
# Check file size, empty files are not allowed
if ($size < 1 || $size > $t_max_size) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
send_data ("ZSEND ERR (file is too big)\n");
return;
}
# Apply filters
$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
# Check if file exists
if (-f $file && $t_overwrite == 0) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
send_data ("ZSEND ERR (file already exists)\n");
return;
}
send_data ("ZSEND OK\n");
# Receive file
$zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError");
send_data ("ZSEND ERR\n");
return;
}
# Write it to disk
open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
binmode (FILE);
print (FILE $data);
close (FILE);
send_data ("ZSEND OK\n");
print_info ("Received compressed file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
}
################################################################################
## SUB send_file
## Send a file to the client
@ -1122,6 +1188,57 @@ sub send_file {
print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " sent");
}
################################################################################
## SUB zsend_file
## Send a file to the client
################################################################################
sub zsend_file {
my $base_name = $_[0];
my $data = '';
my $file;
my $response;
my $size;
# Check file name
if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("Requested compressed file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("ZRECV ERR (file has an invalid file name)\n");
return;
}
# Apply filters
$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
# Check if file exists
if (! -f $file) {
print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " does not exist");
send_data ("ZRECV ERR (file does not exist)\n");
return;
}
# Read the file and compress its contents
if (! zip($file => \$data)) {
send_data ("QUIT\n");
error ("Compression error: $ZipError");
return;
}
$size = length($data);
send_data ("ZRECV SIZE $size\n");
# Wait for client response
$response = recv_command ($t_block_size);
if ($response ne "ZRECV OK") {
print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " not sent");
return;
}
# Send the file
send_data ($data);
print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " sent");
}
################################################################################
# Common functions
################################################################################

224
pandora_agents/shellscript/linux/tentacle_client
View File

@ -58,6 +58,8 @@ use strict;
use File::Basename;
use Getopt::Std;
use IO::Select;
use IO::Compress::Zip qw(zip $ZipError);
use IO::Uncompress::Unzip qw(unzip $UnzipError);
use Socket (qw(SOCK_STREAM AF_INET AF_INET6));
my $SOCKET_MODULE =
eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
@ -131,6 +133,12 @@ my $t_ssl_pwd = '';
# Timeout for socket read/write operations in seconds
my $t_timeout = 1;
# bind ipaddr
my $t_bind_address = undef;
# Compress data before sending it through the socket.
my $t_zip = 0;
################################################################################
## SUB print_help
## Print help screen.
@ -141,6 +149,7 @@ sub print_help {
print ("Tentacle client v$VERSION. See http://www.openideas.info/wiki for protocol description.\n\n");
print ("Options:\n");
print ("\t-a address\tServer address (default $t_address).\n");
print ("\t-b localaddress\tLocal address to bind.\n");
print ("\t-c\t\tEnable SSL without a client certificate.\n");
print ("\t-e cert\t\tOpenSSL certificate file. Enables SSL.\n");
print ("\t-f ca\t\tVerify that the peer certificate is signed by a ca.\n");
@ -154,7 +163,8 @@ sub print_help {
print ("\t-v\t\tBe verbose.\n");
print ("\t-w\t\tPrompt for OpenSSL private key password.\n");
print ("\t-x pwd\t\tServer password.\n");
print ("\t-y proxy\tProxy server string (user:password\@address:port).\n\n");
print ("\t-y proxy\tProxy server string (user:password\@address:port).\n");
print ("\t-z Compress data.\n\n");
}
################################################################################
@ -166,7 +176,7 @@ sub parse_options {
my $tmp;
# Get options
if (getopts ('a:ce:f:ghk:p:qr:t:vwx:y:', \%opts) == 0 || defined ($opts{'h'})) {
if (getopts ('a:b:ce:f:ghk:p:qr:t:vwx:y:z', \%opts) == 0 || defined ($opts{'h'})) {
print_help ();
exit 1;
}
@ -183,6 +193,18 @@ sub parse_options {
}
# Bind local address
if (defined ($opts{'b'})) {
$t_bind_address = $opts{'b'};
if (($t_bind_address !~ /^[a-zA-Z\.][a-zA-Z0-9\.\-]+$/ && ($t_bind_address !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255)) &&
($t_address !~ /^[0-9a-f:]+$/o)) {
error ("Local address $t_bind_address is not valid.");
}
}
# Enable SSL without a client certificate
if (defined ($opts{'c'})) {
require IO::Socket::SSL;
@ -299,6 +321,11 @@ sub parse_options {
error ("Proxy port $t_proxy_port is not valid.");
}
}
# Compress data
if (defined ($opts{'z'})) {
$t_zip = 1;
}
}
################################################################################
@ -309,20 +336,42 @@ sub start_client {
# Connect to server
if ($SOCKET_MODULE ne 'IO::Socket::INET') {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
LocalAddr => $t_bind_address,
Type => SOCK_STREAM
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
}
}
if (! defined ($t_socket)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
LocalAddr => $t_bind_address,
Type => SOCK_STREAM
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
}
}
if (! defined ($t_socket)) {
@ -344,18 +393,38 @@ sub start_client_proxy {
# Connect to proxy
if ($SOCKET_MODULE ne 'IO::Socket::INET') {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
LocalAddr => $t_bind_address,
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
}
}
if (! defined ($t_socket)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
LocalAddr => $t_bind_address,
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
}
}
if (! defined ($t_socket)) {
@ -408,6 +477,8 @@ sub start_ssl {
if ($t_ssl_cert eq ''){
IO::Socket::SSL->start_SSL (
$t_socket,
# No authentication
SSL_verify_mode => 0x00,
);
}
elsif ($t_ssl_ca eq '') {
@ -525,6 +596,46 @@ sub recv_file {
print_log ("Received file '$file'");
}
################################################################################
## SUB zrecv_file
## Receive a compressed file from the server
################################################################################
sub zrecv_file {
my $data = '';
my $file = $_[0];
my $response;
my $size;
my $zdata = '';
# Request file
send_data ("ZRECV <$file>\n");
# Wait for server response
$response = recv_command ();
if ($response !~ /^ZRECV SIZE (\d+)$/) {
error ("Server responded $response.");
}
$size = $1;
send_data ("ZRECV OK\n");
# Receive file
$zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError");
send_data ("ZRECV ERR\n");
return;
}
# Write it to disk
open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
binmode (FILE);
print (FILE $data);
close (FILE);
print_log ("Received compressed file '$file'");
}
################################################################################
## SUB send_file
## Send a file to the server
@ -578,6 +689,55 @@ sub send_file {
print_log ("File sent");
}
################################################################################
## SUB zsend_file
## Send a file to the server (compressed)
################################################################################
sub zsend_file {
my $base_name;
my $data = '';
my $response = '';
my $retries;
my $file = $_[0];
my $size;
my $written;
# Read the file and compress its contents
if (! zip($file => \$data)) {
send_data ("QUIT\n");
error ("Compression error: $ZipError");
return;
}
$size = length($data);
$base_name = basename ($file);
# Request to send file
send_data ("ZSEND <$base_name> SIZE $size\n");
print_log ("Request to send file '$base_name' size ${size}b (compressed)");
# Wait for server response
$response = recv_command ();
# Server rejected the file
if ($response ne "ZSEND OK") {
send_data ("QUIT\n");
error ("Server responded $response.");
}
print_log ("Server responded SEND OK");
send_data ($data);
# Wait for server response
$response = recv_command ();
if ($response ne "ZSEND OK") {
send_data ("QUIT\n");
error ("Server responded $response.");
}
print_log ("File sent");
}
################################################################################
# Common functions
################################################################################
@ -830,13 +990,21 @@ if ($t_recv == 0) {
# Send the files
foreach $file (@ARGV) {
send_file ($file);
if ($t_zip == 1) {
zsend_file($file);
} else {
send_file ($file);
}
}
}
else {
# Send the files
# Receive the files
foreach $file (@ARGV) {
recv_file ($file);
if ($t_zip == 1) {
zrecv_file ($file);
} else {
recv_file ($file);
}
}
}
@ -882,6 +1050,8 @@ __END__
=item I<-x pwd> B<Server password>.
=item I<-z> Compress data.
=back
=head1 EXIT STATUS

224
pandora_agents/shellscript/mac_osx/tentacle_client
View File

@ -58,6 +58,8 @@ use strict;
use File::Basename;
use Getopt::Std;
use IO::Select;
use IO::Compress::Zip qw(zip $ZipError);
use IO::Uncompress::Unzip qw(unzip $UnzipError);
use Socket (qw(SOCK_STREAM AF_INET AF_INET6));
my $SOCKET_MODULE =
eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
@ -131,6 +133,12 @@ my $t_ssl_pwd = '';
# Timeout for socket read/write operations in seconds
my $t_timeout = 1;
# bind ipaddr
my $t_bind_address = undef;
# Compress data before sending it through the socket.
my $t_zip = 0;
################################################################################
## SUB print_help
## Print help screen.
@ -141,6 +149,7 @@ sub print_help {
print ("Tentacle client v$VERSION. See http://www.openideas.info/wiki for protocol description.\n\n");
print ("Options:\n");
print ("\t-a address\tServer address (default $t_address).\n");
print ("\t-b localaddress\tLocal address to bind.\n");
print ("\t-c\t\tEnable SSL without a client certificate.\n");
print ("\t-e cert\t\tOpenSSL certificate file. Enables SSL.\n");
print ("\t-f ca\t\tVerify that the peer certificate is signed by a ca.\n");
@ -154,7 +163,8 @@ sub print_help {
print ("\t-v\t\tBe verbose.\n");
print ("\t-w\t\tPrompt for OpenSSL private key password.\n");
print ("\t-x pwd\t\tServer password.\n");
print ("\t-y proxy\tProxy server string (user:password\@address:port).\n\n");
print ("\t-y proxy\tProxy server string (user:password\@address:port).\n");
print ("\t-z Compress data.\n\n");
}
################################################################################
@ -166,7 +176,7 @@ sub parse_options {
my $tmp;
# Get options
if (getopts ('a:ce:f:ghk:p:qr:t:vwx:y:', \%opts) == 0 || defined ($opts{'h'})) {
if (getopts ('a:b:ce:f:ghk:p:qr:t:vwx:y:z', \%opts) == 0 || defined ($opts{'h'})) {
print_help ();
exit 1;
}
@ -183,6 +193,18 @@ sub parse_options {
}
# Bind local address
if (defined ($opts{'b'})) {
$t_bind_address = $opts{'b'};
if (($t_bind_address !~ /^[a-zA-Z\.][a-zA-Z0-9\.\-]+$/ && ($t_bind_address !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255)) &&
($t_address !~ /^[0-9a-f:]+$/o)) {
error ("Local address $t_bind_address is not valid.");
}
}
# Enable SSL without a client certificate
if (defined ($opts{'c'})) {
require IO::Socket::SSL;
@ -299,6 +321,11 @@ sub parse_options {
error ("Proxy port $t_proxy_port is not valid.");
}
}
# Compress data
if (defined ($opts{'z'})) {
$t_zip = 1;
}
}
################################################################################
@ -309,20 +336,42 @@ sub start_client {
# Connect to server
if ($SOCKET_MODULE ne 'IO::Socket::INET') {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
LocalAddr => $t_bind_address,
Type => SOCK_STREAM
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
}
}
if (! defined ($t_socket)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
LocalAddr => $t_bind_address,
Type => SOCK_STREAM
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
}
}
if (! defined ($t_socket)) {
@ -344,18 +393,38 @@ sub start_client_proxy {
# Connect to proxy
if ($SOCKET_MODULE ne 'IO::Socket::INET') {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
LocalAddr => $t_bind_address,
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
}
}
if (! defined ($t_socket)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
LocalAddr => $t_bind_address,
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
}
}
if (! defined ($t_socket)) {
@ -408,6 +477,8 @@ sub start_ssl {
if ($t_ssl_cert eq ''){
IO::Socket::SSL->start_SSL (
$t_socket,
# No authentication
SSL_verify_mode => 0x00,
);
}
elsif ($t_ssl_ca eq '') {
@ -525,6 +596,46 @@ sub recv_file {
print_log ("Received file '$file'");
}
################################################################################
## SUB zrecv_file
## Receive a compressed file from the server
################################################################################
sub zrecv_file {
my $data = '';
my $file = $_[0];
my $response;
my $size;
my $zdata = '';
# Request file
send_data ("ZRECV <$file>\n");
# Wait for server response
$response = recv_command ();
if ($response !~ /^ZRECV SIZE (\d+)$/) {
error ("Server responded $response.");
}
$size = $1;
send_data ("ZRECV OK\n");
# Receive file
$zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError");
send_data ("ZRECV ERR\n");
return;
}
# Write it to disk
open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
binmode (FILE);
print (FILE $data);
close (FILE);
print_log ("Received compressed file '$file'");
}
################################################################################
## SUB send_file
## Send a file to the server
@ -578,6 +689,55 @@ sub send_file {
print_log ("File sent");
}
################################################################################
## SUB zsend_file
## Send a file to the server (compressed)
################################################################################
sub zsend_file {
my $base_name;
my $data = '';
my $response = '';
my $retries;
my $file = $_[0];
my $size;
my $written;
# Read the file and compress its contents
if (! zip($file => \$data)) {
send_data ("QUIT\n");
error ("Compression error: $ZipError");
return;
}
$size = length($data);
$base_name = basename ($file);
# Request to send file
send_data ("ZSEND <$base_name> SIZE $size\n");
print_log ("Request to send file '$base_name' size ${size}b (compressed)");
# Wait for server response
$response = recv_command ();
# Server rejected the file
if ($response ne "ZSEND OK") {
send_data ("QUIT\n");
error ("Server responded $response.");
}
print_log ("Server responded SEND OK");
send_data ($data);
# Wait for server response
$response = recv_command ();
if ($response ne "ZSEND OK") {
send_data ("QUIT\n");
error ("Server responded $response.");
}
print_log ("File sent");
}
################################################################################
# Common functions
################################################################################
@ -830,13 +990,21 @@ if ($t_recv == 0) {
# Send the files
foreach $file (@ARGV) {
send_file ($file);
if ($t_zip == 1) {
zsend_file($file);
} else {
send_file ($file);
}
}
}
else {
# Send the files
# Receive the files
foreach $file (@ARGV) {
recv_file ($file);
if ($t_zip == 1) {
zrecv_file ($file);
} else {
recv_file ($file);
}
}
}
@ -882,6 +1050,8 @@ __END__
=item I<-x pwd> B<Server password>.
=item I<-z> Compress data.
=back
=head1 EXIT STATUS

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.724-180703
Version: 7.0NG.724-180704
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-180703"
pandora_version="7.0NG.724-180704"
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 => '180703';
use constant AGENT_BUILD => '180704';
# 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 180703
%define release 180704
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 180703
%define release 180704
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="180703"
PI_BUILD="180704"
OS_NAME=`uname -s`
FORCE=0

224
pandora_agents/unix/tentacle_client
View File

@ -58,6 +58,8 @@ use strict;
use File::Basename;
use Getopt::Std;
use IO::Select;
use IO::Compress::Zip qw(zip $ZipError);
use IO::Uncompress::Unzip qw(unzip $UnzipError);
use Socket (qw(SOCK_STREAM AF_INET AF_INET6));
my $SOCKET_MODULE =
eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
@ -131,6 +133,12 @@ my $t_ssl_pwd = '';
# Timeout for socket read/write operations in seconds
my $t_timeout = 1;
# bind ipaddr
my $t_bind_address = undef;
# Compress data before sending it through the socket.
my $t_zip = 0;
################################################################################
## SUB print_help
## Print help screen.
@ -141,6 +149,7 @@ sub print_help {
print ("Tentacle client v$VERSION. See http://www.openideas.info/wiki for protocol description.\n\n");
print ("Options:\n");
print ("\t-a address\tServer address (default $t_address).\n");
print ("\t-b localaddress\tLocal address to bind.\n");
print ("\t-c\t\tEnable SSL without a client certificate.\n");
print ("\t-e cert\t\tOpenSSL certificate file. Enables SSL.\n");
print ("\t-f ca\t\tVerify that the peer certificate is signed by a ca.\n");
@ -154,7 +163,8 @@ sub print_help {
print ("\t-v\t\tBe verbose.\n");
print ("\t-w\t\tPrompt for OpenSSL private key password.\n");
print ("\t-x pwd\t\tServer password.\n");
print ("\t-y proxy\tProxy server string (user:password\@address:port).\n\n");
print ("\t-y proxy\tProxy server string (user:password\@address:port).\n");
print ("\t-z Compress data.\n\n");
}
################################################################################
@ -166,7 +176,7 @@ sub parse_options {
my $tmp;
# Get options
if (getopts ('a:ce:f:ghk:p:qr:t:vwx:y:', \%opts) == 0 || defined ($opts{'h'})) {
if (getopts ('a:b:ce:f:ghk:p:qr:t:vwx:y:z', \%opts) == 0 || defined ($opts{'h'})) {
print_help ();
exit 1;
}
@ -183,6 +193,18 @@ sub parse_options {
}
# Bind local address
if (defined ($opts{'b'})) {
$t_bind_address = $opts{'b'};
if (($t_bind_address !~ /^[a-zA-Z\.][a-zA-Z0-9\.\-]+$/ && ($t_bind_address !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255)) &&
($t_address !~ /^[0-9a-f:]+$/o)) {
error ("Local address $t_bind_address is not valid.");
}
}
# Enable SSL without a client certificate
if (defined ($opts{'c'})) {
require IO::Socket::SSL;
@ -299,6 +321,11 @@ sub parse_options {
error ("Proxy port $t_proxy_port is not valid.");
}
}
# Compress data
if (defined ($opts{'z'})) {
$t_zip = 1;
}
}
################################################################################
@ -309,20 +336,42 @@ sub start_client {
# Connect to server
if ($SOCKET_MODULE ne 'IO::Socket::INET') {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
LocalAddr => $t_bind_address,
Type => SOCK_STREAM
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
}
}
if (! defined ($t_socket)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
LocalAddr => $t_bind_address,
Type => SOCK_STREAM
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM
);
}
}
if (! defined ($t_socket)) {
@ -344,18 +393,38 @@ sub start_client_proxy {
# Connect to proxy
if ($SOCKET_MODULE ne 'IO::Socket::INET') {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
LocalAddr => $t_bind_address,
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET6,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
}
}
if (! defined ($t_socket)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
if (defined ($t_bind_address)) {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
LocalAddr => $t_bind_address,
);
}
else {
$t_socket = $SOCKET_MODULE->new (
Domain => AF_INET,
PeerAddr => $t_proxy_address,
PeerPort => $t_proxy_port,
);
}
}
if (! defined ($t_socket)) {
@ -408,6 +477,8 @@ sub start_ssl {
if ($t_ssl_cert eq ''){
IO::Socket::SSL->start_SSL (
$t_socket,
# No authentication
SSL_verify_mode => 0x00,
);
}
elsif ($t_ssl_ca eq '') {
@ -525,6 +596,46 @@ sub recv_file {
print_log ("Received file '$file'");
}
################################################################################
## SUB zrecv_file
## Receive a compressed file from the server
################################################################################
sub zrecv_file {
my $data = '';
my $file = $_[0];
my $response;
my $size;
my $zdata = '';
# Request file
send_data ("ZRECV <$file>\n");
# Wait for server response
$response = recv_command ();
if ($response !~ /^ZRECV SIZE (\d+)$/) {
error ("Server responded $response.");
}
$size = $1;
send_data ("ZRECV OK\n");
# Receive file
$zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError");
send_data ("ZRECV ERR\n");
return;
}
# Write it to disk
open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
binmode (FILE);
print (FILE $data);
close (FILE);
print_log ("Received compressed file '$file'");
}
################################################################################
## SUB send_file
## Send a file to the server
@ -578,6 +689,55 @@ sub send_file {
print_log ("File sent");
}
################################################################################
## SUB zsend_file
## Send a file to the server (compressed)
################################################################################
sub zsend_file {
my $base_name;
my $data = '';
my $response = '';
my $retries;
my $file = $_[0];
my $size;
my $written;
# Read the file and compress its contents
if (! zip($file => \$data)) {
send_data ("QUIT\n");
error ("Compression error: $ZipError");
return;
}
$size = length($data);
$base_name = basename ($file);
# Request to send file
send_data ("ZSEND <$base_name> SIZE $size\n");
print_log ("Request to send file '$base_name' size ${size}b (compressed)");
# Wait for server response
$response = recv_command ();
# Server rejected the file
if ($response ne "ZSEND OK") {
send_data ("QUIT\n");
error ("Server responded $response.");
}
print_log ("Server responded SEND OK");
send_data ($data);
# Wait for server response
$response = recv_command ();
if ($response ne "ZSEND OK") {
send_data ("QUIT\n");
error ("Server responded $response.");
}
print_log ("File sent");
}
################################################################################
# Common functions
################################################################################
@ -830,13 +990,21 @@ if ($t_recv == 0) {
# Send the files
foreach $file (@ARGV) {
send_file ($file);
if ($t_zip == 1) {
zsend_file($file);
} else {
send_file ($file);
}
}
}
else {
# Send the files
# Receive the files
foreach $file (@ARGV) {
recv_file ($file);
if ($t_zip == 1) {
zrecv_file ($file);
} else {
recv_file ($file);
}
}
}
@ -882,6 +1050,8 @@ __END__
=item I<-x pwd> B<Server password>.
=item I<-z> Compress data.
=back
=head1 EXIT STATUS

117
pandora_agents/unix/tentacle_server
View File

@ -60,6 +60,8 @@ use strict;
use warnings;
use Getopt::Std;
use IO::Select;
use IO::Compress::Zip qw(zip $ZipError);
use IO::Uncompress::Unzip qw(unzip $UnzipError);
use threads;
use Thread::Semaphore;
use POSIX ":sys_wait_h";
@ -959,6 +961,15 @@ sub serve_connection {
print_info ("Request to receive file '$1' from " . $t_client_socket->sockhost ());
send_file ($1);
}
elsif ($command =~ /^ZSEND <(.*)> SIZE (\d+)$/) {
print_info ("Request to send compressed file '$1' size ${2}b from " . $t_client_socket->sockhost ());
zrecv_file ($1, $2);
}
# Client wants to receive a file
elsif ($command =~ /^ZRECV <(.*)>$/) {
print_info ("Request to receive compressed file '$1' from " . $t_client_socket->sockhost ());
zsend_file ($1);
}
# Quit
elsif ($command =~ /^QUIT$/) {
print_info ("Connection closed from " . $t_client_socket->sockhost ());
@ -1070,6 +1081,61 @@ sub recv_file {
print_info ("Received file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
}
################################################################################
## SUB zrecv_file
## Receive a compressed file of size $_[1] and save it in $t_directory as $_[0].
################################################################################
sub zrecv_file {
my $base_name = $_[0];
my $data = '';
my $file;
my $size = $_[1];
my $zdata = '';
# Check file name
if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("ZSEND ERR (invalid file name)\n");
return;
}
# Check file size, empty files are not allowed
if ($size < 1 || $size > $t_max_size) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
send_data ("ZSEND ERR (file is too big)\n");
return;
}
# Apply filters
$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
# Check if file exists
if (-f $file && $t_overwrite == 0) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
send_data ("ZSEND ERR (file already exists)\n");
return;
}
send_data ("ZSEND OK\n");
# Receive file
$zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError");
send_data ("ZSEND ERR\n");
return;
}
# Write it to disk
open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
binmode (FILE);
print (FILE $data);
close (FILE);
send_data ("ZSEND OK\n");
print_info ("Received compressed file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
}
################################################################################
## SUB send_file
## Send a file to the client
@ -1122,6 +1188,57 @@ sub send_file {
print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " sent");
}
################################################################################
## SUB zsend_file
## Send a file to the client
################################################################################
sub zsend_file {
my $base_name = $_[0];
my $data = '';
my $file;
my $response;
my $size;
# Check file name
if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("Requested compressed file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("ZRECV ERR (file has an invalid file name)\n");
return;
}
# Apply filters
$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
# Check if file exists
if (! -f $file) {
print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " does not exist");
send_data ("ZRECV ERR (file does not exist)\n");
return;
}
# Read the file and compress its contents
if (! zip($file => \$data)) {
send_data ("QUIT\n");
error ("Compression error: $ZipError");
return;
}
$size = length($data);
send_data ("ZRECV SIZE $size\n");
# Wait for client response
$response = recv_command ($t_block_size);
if ($response ne "ZRECV OK") {
print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " not sent");
return;
}
# Send the file
send_data ($data);
print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " sent");
}
################################################################################
# Common functions
################################################################################

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{180703}
{180704}
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 180703)")
#define PANDORA_VERSION ("7.0NG.724(Build 180704)")
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 180703))"
VALUE "ProductVersion", "(7.0NG.724(Build 180704))"
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-180703
Version: 7.0NG.724-180704
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-180703"
pandora_version="7.0NG.724-180704"
package_pear=0
package_pandora=1

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

@ -1972,7 +1972,7 @@ switch ($tab) {
draggable: true,
modal: true,
height: 280,
width: 630,
width: 670,
title: 'Changing snmp module name',
open: function(){
$('#dialog').html('<br><img src="images/icono-warning-triangulo.png" style="float:left;margin-left:25px;margin-top:30px;"><p style="float:right;font-style:nunito;font-size:11pt;margin-right:50px;"><span style="font-weight:bold;font-size:12pt;">Warning</span> <br> If you change the name of this module, various features <br> associated with this module, such as network maps, <br> interface graphs or other network modules, may no longer <br> work. If you are not completely sure of the process, please <br> do not change the name of the module. </p>');

6
pandora_console/godmode/events/event_edit_filter.php
View File

@ -224,9 +224,9 @@ $table->data[1][1] = html_print_select_groups(
'', false, '', false, false, 'id_grupo', $strict_user);
$table->data[2][0] = '<b>' . __('Group').'</b>';
$table->data[2][1] = html_print_select_groups($config["id_user"], $access,
true, 'id_group', $id_group, '', '', -1, true, false, false, '',
false, false, false, false, 'id_grupo', $strict_user);
$display_all_group = (users_is_admin() || users_can_manage_group_all("AR"));
$table->data[2][1] = html_print_select_groups($config['id_user'], "AR",
$display_all_group, 'id_group', $idGroup, '', '', '', true);
$types = get_event_types ();
// Expand standard array to add not_normal (not exist in the array, used only for searches)

4
pandora_console/godmode/reporting/graph_builder.main.php
View File

@ -119,9 +119,9 @@ $own_info = get_user_info ($config['id_user']);
echo "<td><b>".__('Group')."</b></td><td>";
if (check_acl ($config['id_user'], 0, "RW"))
echo html_print_select_groups($config['id_user'], 'RW', true, 'graph_id_group', $id_group, '', '', '', true);
echo html_print_select_groups($config['id_user'], 'RW', $display_all_group, 'graph_id_group', $id_group, '', '', '', true);
elseif (check_acl ($config['id_user'], 0, "RM"))
echo html_print_select_groups($config['id_user'], 'RM', true, 'graph_id_group', $id_group, '', '', '', true);
echo html_print_select_groups($config['id_user'], 'RM', $display_all_group, 'graph_id_group', $id_group, '', '', '', true);
echo "</td></tr>";
echo "<tr>";
echo "<td class='datos2'><b>".__('Description')."</b></td>";

8
pandora_console/godmode/reporting/reporting_builder.main.php
View File

@ -67,10 +67,14 @@ $table->data['name'][1] = html_print_input_text('name', $reportName,
__('Name'), 80, 100, true, false, true);
$table->data['group'][0] = __('Group');
$display_all_group = (users_is_admin() || users_can_manage_group_all("AR"));
$write_groups = users_get_groups_for_select(false, "AR", $display_all_group, true, false, 'id_grupo');
$write_groups = users_get_groups_for_select(false, "RW",
true, true, false, 'id_grupo');
html_print_select_groups($config['id_user'], "AR",
$display_all_group, 'id_group', $idGroup, '', '', '', true);
// If the report group is not among the RW groups (special permission) we add it
if (!isset($write_groups[$idGroupReport]) && $idGroupReport) {
$write_groups[$idGroupReport] = groups_get_name($idGroupReport);

2
pandora_console/include/config_process.php
View File

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

13
pandora_console/include/functions_agents.php
View File

@ -25,16 +25,19 @@ require_once($config['homedir'] . '/include/functions_users.php');
/**
* Check the agent exists in the DB.
*
*
* @param int $id_agent The agent id.
* @param boolean $show_disabled Show the agent found althought it is disabled. By default false.
*
*
* @return boolean The result to check if the agent is in the DB.
*/
function agents_check_agent_exists($id_agent, $show_disabled = true) {
$agent = db_get_value_filter('id_agente', 'tagente',
array('id_agente' => $id_agent, 'disabled' => !$show_disabled));
$agent = db_get_value_filter(
'id_agente',
'tagente',
array('id_agente' => $id_agent, 'disabled' => !$show_disabled)
);
if (!empty($agent)) {
return true;
}

8
pandora_console/include/functions_api.php
View File

@ -180,7 +180,13 @@ function returnData($returnType, $data, $separator = ';') {
if ($separator == ";") {
$separator = null;
}
echo json_encode ($data, $separator);
if(empty($separator)){
echo json_encode ($data);
} else {
echo json_encode ($data, $separator);
}
break;
}
}

28
pandora_console/include/functions_modules.php
View File

@ -290,7 +290,7 @@ function modules_change_disabled($id_agent_module, $new_value = 1) {
return ERR_GENERIC;
}
}
/**
* Deletes a module from an agent.
*
@ -299,20 +299,20 @@ function modules_change_disabled($id_agent_module, $new_value = 1) {
* @return True if the module was deleted. False if not.
*/
function modules_delete_agent_module ($id_agent_module) {
if (empty($id_agent_module))
if (empty($id_agent_module))
return false;
if (is_array($id_agent_module)) {
$id_agents = db_get_all_rows_sql(
sprintf('SELECT id_agente
FROM tagente_modulo
WHERE id_agente_modulo IN (%s)
GROUP BY id_agente', implode(',', $id_agent_module)));
foreach($id_agents as $k => $v) {
$id_agents[$k] = $v['id_agente'];
}
// Update update flags to server side
db_process_sql (sprintf('UPDATE tagente
SET update_module_count=1, update_alert_count=1
@ -321,18 +321,18 @@ function modules_delete_agent_module ($id_agent_module) {
else {
// Read module data
$id_agent = modules_get_agentmodule_agent($id_agent_module);
// Update update flags to server side
db_process_sql (sprintf('UPDATE tagente
SET update_module_count=1, update_alert_count=1
WHERE id_agente = %s', $id_agent));
}
$where = array ('id_agent_module' => $id_agent_module);
$enterprise_include = enterprise_include_once(
'include/functions_config_agents.php');
enterprise_include_once("include/functions_agents.php");
$enterprise_include = enterprise_include_once('include/functions_config_agents.php');
if ($enterprise_include !== ENTERPRISE_NOT_HOOK) {
if (is_array($id_agent_module)) {
foreach ($id_agent_module as $id_agent_module_item) {
@ -347,9 +347,9 @@ function modules_delete_agent_module ($id_agent_module) {
modules_get_agentmodule_name($id_agent_module));
}
}
alerts_delete_alert_agent_module (0, $where);
db_process_sql_delete ('tgraph_source', $where);
db_process_sql_delete ('treport_content', $where);
db_process_sql_delete ('tevento',
@ -361,7 +361,7 @@ function modules_delete_agent_module ($id_agent_module) {
array ('nombre' => 'delete_pending', 'delete_pending' => 1, 'disabled' => 1),
$where);
db_process_sql_delete('ttag_module', $where);
return true;
}

2
pandora_console/install.php
View File

@ -71,7 +71,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.724';
$build = '180703';
$build = '180704';
$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 180703
%define release 180704
# 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 180703
%define release 180704
%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-180703
Version: 7.0NG.724-180704
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-180703"
pandora_version="7.0NG.724-180704"
package_cpan=0
package_pandora=1

1892
pandora_server/FreeBSD/tentacle_server
View File

File diff suppressed because it is too large Load Diff

1891
pandora_server/NetBSD/tentacle_server
View File

File diff suppressed because it is too large Load Diff

117
pandora_server/bin/tentacle_server
View File

@ -60,6 +60,8 @@ use strict;
use warnings;
use Getopt::Std;
use IO::Select;
use IO::Compress::Zip qw(zip $ZipError);
use IO::Uncompress::Unzip qw(unzip $UnzipError);
use threads;
use Thread::Semaphore;
use POSIX ":sys_wait_h";
@ -959,6 +961,15 @@ sub serve_connection {
print_info ("Request to receive file '$1' from " . $t_client_socket->sockhost ());
send_file ($1);
}
elsif ($command =~ /^ZSEND <(.*)> SIZE (\d+)$/) {
print_info ("Request to send compressed file '$1' size ${2}b from " . $t_client_socket->sockhost ());
zrecv_file ($1, $2);
}
# Client wants to receive a file
elsif ($command =~ /^ZRECV <(.*)>$/) {
print_info ("Request to receive compressed file '$1' from " . $t_client_socket->sockhost ());
zsend_file ($1);
}
# Quit
elsif ($command =~ /^QUIT$/) {
print_info ("Connection closed from " . $t_client_socket->sockhost ());
@ -1070,6 +1081,61 @@ sub recv_file {
print_info ("Received file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
}
################################################################################
## SUB zrecv_file
## Receive a compressed file of size $_[1] and save it in $t_directory as $_[0].
################################################################################
sub zrecv_file {
my $base_name = $_[0];
my $data = '';
my $file;
my $size = $_[1];
my $zdata = '';
# Check file name
if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("ZSEND ERR (invalid file name)\n");
return;
}
# Check file size, empty files are not allowed
if ($size < 1 || $size > $t_max_size) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
send_data ("ZSEND ERR (file is too big)\n");
return;
}
# Apply filters
$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
# Check if file exists
if (-f $file && $t_overwrite == 0) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
send_data ("ZSEND ERR (file already exists)\n");
return;
}
send_data ("ZSEND OK\n");
# Receive file
$zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError");
send_data ("ZSEND ERR\n");
return;
}
# Write it to disk
open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
binmode (FILE);
print (FILE $data);
close (FILE);
send_data ("ZSEND OK\n");
print_info ("Received compressed file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
}
################################################################################
## SUB send_file
## Send a file to the client
@ -1122,6 +1188,57 @@ sub send_file {
print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " sent");
}
################################################################################
## SUB zsend_file
## Send a file to the client
################################################################################
sub zsend_file {
my $base_name = $_[0];
my $data = '';
my $file;
my $response;
my $size;
# Check file name
if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("Requested compressed file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("ZRECV ERR (file has an invalid file name)\n");
return;
}
# Apply filters
$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
# Check if file exists
if (! -f $file) {
print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " does not exist");
send_data ("ZRECV ERR (file does not exist)\n");
return;
}
# Read the file and compress its contents
if (! zip($file => \$data)) {
send_data ("QUIT\n");
error ("Compression error: $ZipError");
return;
}
$size = length($data);
send_data ("ZRECV SIZE $size\n");
# Wait for client response
$response = recv_command ($t_block_size);
if ($response ne "ZRECV OK") {
print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " not sent");
return;
}
# Send the file
send_data ($data);
print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " sent");
}
################################################################################
# Common functions
################################################################################

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 = "180703";
my $pandora_build = "180704";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

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

@ -32,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 = "180703";
my $pandora_build = "180704";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.724
%define release 180703
%define release 180704
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 180703
%define release 180704
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="180703"
PI_BUILD="180704"
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 PS180703";
my $version = "7.0NG.724 PS180704";
# 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 PS180703";
my $version = "7.0NG.724 PS180704";
# save program name for logging
my $progname = basename($0);