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

Now tentacle server errors are more descriptives

Browse Source
This commit is contained in:
fermin831 2018-04-26 13:35:05 +02:00
parent 21f6c7e650
commit 45daae5b64
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_agents/pc/tentacle_server
View File

@ -929,14 +929,14 @@ sub recv_file {
# Check file name # Check file name
if ($base_name =~ /[$t_invalid_chars]/) { if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name"); print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("SEND ERR\n"); send_data ("SEND ERR (invalid file name)\n");
return; return;
} }
# Check file size, empty files are not allowed # Check file size, empty files are not allowed
if ($size < 1 || $size > $t_max_size) { if ($size < 1 || $size > $t_max_size) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big"); print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
send_data ("SEND ERR\n"); send_data ("SEND ERR (file is too big)\n");
return; return;
} }
@ -946,7 +946,7 @@ sub recv_file {
# Check if file exists # Check if file exists
if (-f $file && $t_overwrite == 0) { if (-f $file && $t_overwrite == 0) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists"); print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
send_data ("SEND ERR\n"); send_data ("SEND ERR (file already exists)\n");
return; return;
} }
@ -979,7 +979,7 @@ sub send_file {
# Check file name # Check file name
if ($base_name =~ /[$t_invalid_chars]/) { if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name"); print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("RECV ERR\n"); send_data ("RECV ERR (file has an invalid file name)\n");
return; return;
} }
@ -989,7 +989,7 @@ sub send_file {
# Check if file exists # Check if file exists
if (! -f $file) { if (! -f $file) {
print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist"); print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist");
send_data ("RECV ERR\n"); send_data ("RECV ERR (file does not exist)\n");
return; return;
} }

10
pandora_agents/unix/tentacle_server
View File

@ -929,14 +929,14 @@ sub recv_file {
# Check file name # Check file name
if ($base_name =~ /[$t_invalid_chars]/) { if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name"); print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("SEND ERR\n"); send_data ("SEND ERR (invalid file name)\n");
return; return;
} }
# Check file size, empty files are not allowed # Check file size, empty files are not allowed
if ($size < 1 || $size > $t_max_size) { if ($size < 1 || $size > $t_max_size) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big"); print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
send_data ("SEND ERR\n"); send_data ("SEND ERR (file is too big)\n");
return; return;
} }
@ -946,7 +946,7 @@ sub recv_file {
# Check if file exists # Check if file exists
if (-f $file && $t_overwrite == 0) { if (-f $file && $t_overwrite == 0) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists"); print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
send_data ("SEND ERR\n"); send_data ("SEND ERR (file already exists)\n");
return; return;
} }
@ -979,7 +979,7 @@ sub send_file {
# Check file name # Check file name
if ($base_name =~ /[$t_invalid_chars]/) { if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name"); print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("RECV ERR\n"); send_data ("RECV ERR (file has an invalid file name)\n");
return; return;
} }
@ -989,7 +989,7 @@ sub send_file {
# Check if file exists # Check if file exists
if (! -f $file) { if (! -f $file) {
print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist"); print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist");
send_data ("RECV ERR\n"); send_data ("RECV ERR (file does not exist)\n");
return; return;
} }

10
pandora_server/bin/tentacle_server
View File

@ -929,14 +929,14 @@ sub recv_file {
# Check file name # Check file name
if ($base_name =~ /[$t_invalid_chars]/) { if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name"); print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("SEND ERR\n"); send_data ("SEND ERR (invalid file name)\n");
return; return;
} }
# Check file size, empty files are not allowed # Check file size, empty files are not allowed
if ($size < 1 || $size > $t_max_size) { if ($size < 1 || $size > $t_max_size) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big"); print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
send_data ("SEND ERR\n"); send_data ("SEND ERR (file is too big)\n");
return; return;
} }
@ -946,7 +946,7 @@ sub recv_file {
# Check if file exists # Check if file exists
if (-f $file && $t_overwrite == 0) { if (-f $file && $t_overwrite == 0) {
print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists"); print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
send_data ("SEND ERR\n"); send_data ("SEND ERR (file already exists)\n");
return; return;
} }
@ -979,7 +979,7 @@ sub send_file {
# Check file name # Check file name
if ($base_name =~ /[$t_invalid_chars]/) { if ($base_name =~ /[$t_invalid_chars]/) {
print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name"); print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
send_data ("RECV ERR\n"); send_data ("RECV ERR (file has an invalid file name)\n");
return; return;
} }
@ -989,7 +989,7 @@ sub send_file {
# Check if file exists # Check if file exists
if (! -f $file) { if (! -f $file) {
print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist"); print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist");
send_data ("RECV ERR\n"); send_data ("RECV ERR (file does not exist)\n");
return; return;
} }