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

Merge branch '3052-tentacle-zip-libs-en-entornos-sin-disponibilidad' into 'develop'

Browse Source 
if compress option is select but no libraries are present, tentacle will send the data uncompressed

See merge request artica/pandorafms!1950
This commit is contained in:
vgilc 2018-11-30 13:05:55 +01:00
commit e78f290653
4 changed files with 68 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_agents/pc/tentacle_client
View File

@ -58,8 +58,17 @@ use strict;
use File::Basename; use File::Basename;
use Getopt::Std; use Getopt::Std;
use IO::Select; use IO::Select;
use IO::Compress::Zip qw(zip $ZipError); my $zlib_available = 1;
use IO::Uncompress::Unzip qw(unzip $UnzipError);
eval {
eval "use IO::Compress::Zip qw(zip);1" or die($@);
eval "use IO::Uncompress::Unzip qw(unzip);1" or die($@);
};
if ($@) {
print_log ("Zip transfer not available, required libraries not found (IO::Compress::Zip, IO::Uncompress::Unzip).");
$zlib_available = 0;
}
use Socket (qw(SOCK_STREAM AF_INET AF_INET6)); use Socket (qw(SOCK_STREAM AF_INET AF_INET6));
my $SOCKET_MODULE = my $SOCKET_MODULE =
eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6' eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
@ -324,7 +333,9 @@ sub parse_options {
# Compress data # Compress data
if (defined ($opts{'z'})) { if (defined ($opts{'z'})) {
$t_zip = 1; if ($zlib_available == 1) {
$t_zip = 1;
}
} }
} }
@ -622,7 +633,7 @@ sub zrecv_file {
# Receive file # Receive file
$zdata = recv_data_block ($size); $zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) { if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError"); print_log ("Uncompress error: $IO::Uncompress::Unzip::UnzipError");
send_data ("ZRECV ERR\n"); send_data ("ZRECV ERR\n");
return; return;
} }
@ -705,7 +716,7 @@ sub zsend_file {
# Read the file and compress its contents # Read the file and compress its contents
if (! zip($file => \$data)) { if (! zip($file => \$data)) {
send_data ("QUIT\n"); send_data ("QUIT\n");
error ("Compression error: $ZipError"); error ("Compression error: $IO::Compress::Zip::ZipError");
return; return;
} }
@ -725,7 +736,7 @@ sub zsend_file {
error ("Server responded $response."); error ("Server responded $response.");
} }
print_log ("Server responded SEND OK"); print_log ("Server responded ZSEND OK");
send_data ($data); send_data ($data);
# Wait for server response # Wait for server response

23
pandora_agents/shellscript/linux/tentacle_client
View File

@ -58,8 +58,17 @@ use strict;
use File::Basename; use File::Basename;
use Getopt::Std; use Getopt::Std;
use IO::Select; use IO::Select;
use IO::Compress::Zip qw(zip $ZipError); my $zlib_available = 1;
use IO::Uncompress::Unzip qw(unzip $UnzipError);
eval {
eval "use IO::Compress::Zip qw(zip);1" or die($@);
eval "use IO::Uncompress::Unzip qw(unzip);1" or die($@);
};
if ($@) {
print_log ("Zip transfer not available, required libraries not found (IO::Compress::Zip, IO::Uncompress::Unzip).");
$zlib_available = 0;
}
use Socket (qw(SOCK_STREAM AF_INET AF_INET6)); use Socket (qw(SOCK_STREAM AF_INET AF_INET6));
my $SOCKET_MODULE = my $SOCKET_MODULE =
eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6' eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
@ -324,7 +333,9 @@ sub parse_options {
# Compress data # Compress data
if (defined ($opts{'z'})) { if (defined ($opts{'z'})) {
$t_zip = 1; if ($zlib_available == 1) {
$t_zip = 1;
}
} }
} }
@ -622,7 +633,7 @@ sub zrecv_file {
# Receive file # Receive file
$zdata = recv_data_block ($size); $zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) { if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError"); print_log ("Uncompress error: $IO::Uncompress::Unzip::UnzipError");
send_data ("ZRECV ERR\n"); send_data ("ZRECV ERR\n");
return; return;
} }
@ -705,7 +716,7 @@ sub zsend_file {
# Read the file and compress its contents # Read the file and compress its contents
if (! zip($file => \$data)) { if (! zip($file => \$data)) {
send_data ("QUIT\n"); send_data ("QUIT\n");
error ("Compression error: $ZipError"); error ("Compression error: $IO::Compress::Zip::ZipError");
return; return;
} }
@ -725,7 +736,7 @@ sub zsend_file {
error ("Server responded $response."); error ("Server responded $response.");
} }
print_log ("Server responded SEND OK"); print_log ("Server responded ZSEND OK");
send_data ($data); send_data ($data);
# Wait for server response # Wait for server response

23
pandora_agents/shellscript/mac_osx/tentacle_client
View File

@ -58,8 +58,17 @@ use strict;
use File::Basename; use File::Basename;
use Getopt::Std; use Getopt::Std;
use IO::Select; use IO::Select;
use IO::Compress::Zip qw(zip $ZipError); my $zlib_available = 1;
use IO::Uncompress::Unzip qw(unzip $UnzipError);
eval {
eval "use IO::Compress::Zip qw(zip);1" or die($@);
eval "use IO::Uncompress::Unzip qw(unzip);1" or die($@);
};
if ($@) {
print_log ("Zip transfer not available, required libraries not found (IO::Compress::Zip, IO::Uncompress::Unzip).");
$zlib_available = 0;
}
use Socket (qw(SOCK_STREAM AF_INET AF_INET6)); use Socket (qw(SOCK_STREAM AF_INET AF_INET6));
my $SOCKET_MODULE = my $SOCKET_MODULE =
eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6' eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
@ -324,7 +333,9 @@ sub parse_options {
# Compress data # Compress data
if (defined ($opts{'z'})) { if (defined ($opts{'z'})) {
$t_zip = 1; if ($zlib_available == 1) {
$t_zip = 1;
}
} }
} }
@ -622,7 +633,7 @@ sub zrecv_file {
# Receive file # Receive file
$zdata = recv_data_block ($size); $zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) { if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError"); print_log ("Uncompress error: $IO::Uncompress::Unzip::UnzipError");
send_data ("ZRECV ERR\n"); send_data ("ZRECV ERR\n");
return; return;
} }
@ -705,7 +716,7 @@ sub zsend_file {
# Read the file and compress its contents # Read the file and compress its contents
if (! zip($file => \$data)) { if (! zip($file => \$data)) {
send_data ("QUIT\n"); send_data ("QUIT\n");
error ("Compression error: $ZipError"); error ("Compression error: $IO::Compress::Zip::ZipError");
return; return;
} }
@ -725,7 +736,7 @@ sub zsend_file {
error ("Server responded $response."); error ("Server responded $response.");
} }
print_log ("Server responded SEND OK"); print_log ("Server responded ZSEND OK");
send_data ($data); send_data ($data);
# Wait for server response # Wait for server response

23
pandora_agents/unix/tentacle_client
View File

@ -58,8 +58,17 @@ use strict;
use File::Basename; use File::Basename;
use Getopt::Std; use Getopt::Std;
use IO::Select; use IO::Select;
use IO::Compress::Zip qw(zip $ZipError); my $zlib_available = 1;
use IO::Uncompress::Unzip qw(unzip $UnzipError);
eval {
eval "use IO::Compress::Zip qw(zip);1" or die($@);
eval "use IO::Uncompress::Unzip qw(unzip);1" or die($@);
};
if ($@) {
print_log ("Zip transfer not available, required libraries not found (IO::Compress::Zip, IO::Uncompress::Unzip).");
$zlib_available = 0;
}
use Socket (qw(SOCK_STREAM AF_INET AF_INET6)); use Socket (qw(SOCK_STREAM AF_INET AF_INET6));
my $SOCKET_MODULE = my $SOCKET_MODULE =
eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6' eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
@ -324,7 +333,9 @@ sub parse_options {
# Compress data # Compress data
if (defined ($opts{'z'})) { if (defined ($opts{'z'})) {
$t_zip = 1; if ($zlib_available == 1) {
$t_zip = 1;
}
} }
} }
@ -622,7 +633,7 @@ sub zrecv_file {
# Receive file # Receive file
$zdata = recv_data_block ($size); $zdata = recv_data_block ($size);
if (!unzip(\$zdata => \$data)) { if (!unzip(\$zdata => \$data)) {
print_log ("Uncompress error: $UnzipError"); print_log ("Uncompress error: $IO::Uncompress::Unzip::UnzipError");
send_data ("ZRECV ERR\n"); send_data ("ZRECV ERR\n");
return; return;
} }
@ -705,7 +716,7 @@ sub zsend_file {
# Read the file and compress its contents # Read the file and compress its contents
if (! zip($file => \$data)) { if (! zip($file => \$data)) {
send_data ("QUIT\n"); send_data ("QUIT\n");
error ("Compression error: $ZipError"); error ("Compression error: $IO::Compress::Zip::ZipError");
return; return;
} }
@ -725,7 +736,7 @@ sub zsend_file {
error ("Server responded $response."); error ("Server responded $response.");
} }
print_log ("Server responded SEND OK"); print_log ("Server responded ZSEND OK");
send_data ($data); send_data ($data);
# Wait for server response # Wait for server response