Skip to content
Snippets Groups Projects
Commit a2fe1079 authored by Tomáš Plesník's avatar Tomáš Plesník
Browse files

pridan preklad typu undef na _any_

parent bcb47abe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/warden-server/lib/Warden.pm
+ 36
− 36
View file @ a2fe1079
...@@ -161,14 +161,14 @@ sub authorizeClient ...@@ -161,14 +161,14 @@ sub authorizeClient
# check if client is registered # check if client is registered
if ($sth->rows == 0) { if ($sth->rows == 0) {
write2log ("err", "Unauthorized access to $function_name from: $ip; CN(AN): $alt_names; used service: '$service_type' - client is not registered"); write2log ("err", "Unauthorized access to '$function_name' from: '$ip'; CN(AN): $alt_names; used service: '$service_type' - client is not registered");
die("Access denied - client is not registered at warden server!"); die("Access denied - client is not registered at warden server!");
return undef; return undef;
} }
# check if client has IP from registered CIDR # check if client has IP from registered CIDR
if (!$correct_ip_source) { if (!$correct_ip_source) {
write2log ("err", "Unauthorized access to $function_name from: $ip; CN(AN): $alt_names; used service: '$service_type' - access from bad subnet: Registered subnet '" . $ret{'cidr'} . "'"); write2log ("err", "Unauthorized access to '$function_name' from: '$ip'; CN(AN): $alt_names; used service: '$service_type' - access from bad subnet: Registered subnet '" . $ret{'cidr'} . "'");
die("Access denied - access from unauthorized subnet!"); die("Access denied - access from unauthorized subnet!");
return undef; return undef;
} }
...@@ -223,7 +223,7 @@ sub saveNewEvent ...@@ -223,7 +223,7 @@ sub saveNewEvent
$sth->execute(undef, $client{'dns'}, $service, $detected, $received, $type, $source_type, $source, $target_proto, $target_port, $attack_scale, $note, $priority, $timeout, $valid); $sth->execute(undef, $client{'dns'}, $service, $detected, $received, $type, $source_type, $source, $target_proto, $target_port, $attack_scale, $note, $priority, $timeout, $valid);
return 1; return 1;
} else { } else {
write2log ("err", "Unknown event type - client from: $ip; CN(AN): $alt_names; used type: '$type'"); write2log ("err", "Unknown event type - client from: '$ip'; CN(AN): $alt_names; used type: '$type'");
die("Unknown event type - client sent event with unknown type '$type'!"); die("Unknown event type - client sent event with unknown type '$type'!");
} }
} }
...@@ -248,7 +248,7 @@ sub getNewEvents ...@@ -248,7 +248,7 @@ sub getNewEvents
my $function_name = 'getNewEvents'; my $function_name = 'getNewEvents';
# parse SOAP data object # parse SOAP data object
my $requested_type = $data->{'REQUESTED_TYPE'}; my $requested_type = $data->{'REQUESTED_TYPE'} or '_any_';
my $last_id = $data->{'LAST_ID'}; my $last_id = $data->{'LAST_ID'};
my $max_rcv_events_limit = $data->{'MAX_RCV_EVENTS_LIMIT'}; my $max_rcv_events_limit = $data->{'MAX_RCV_EVENTS_LIMIT'};
...@@ -319,9 +319,9 @@ sub getNewEvents ...@@ -319,9 +319,9 @@ sub getNewEvents
# log sent ID of events # log sent ID of events
if (scalar @events != 0) { if (scalar @events != 0) {
if (scalar @ids == 1) { if (scalar @ids == 1) {
write2log("info", "Sent 1 event [#$ids[0]] to $ip (CN(AN): $alt_names) with client limit $max_rcv_events_limit events"); write2log("info", "Sent 1 event [#$ids[0]] to '$ip' (CN(AN): $alt_names) with client limit '$max_rcv_events_limit' events");
} else { } else {
write2log("info", "Sent " . scalar @ids . " events [#$ids[0] - #$ids[-1]] to $ip (CN(AN): $alt_names) with client limit $max_rcv_events_limit events"); write2log("info", "Sent " . scalar @ids . " events [#$ids[0] - #$ids[-1]] to '$ip' (CN(AN): $alt_names) with client limit '$max_rcv_events_limit' events");
} }
} }
return @events; return @events;
...@@ -338,7 +338,7 @@ sub getLastId ...@@ -338,7 +338,7 @@ sub getLastId
my $function_name = 'getLastId'; my $function_name = 'getLastId';
my $sth = $DBH->prepare("SELECT max(id) FROM events;"); my $sth = $DBH->prepare("SELECT max(id) FROM events;");
if ( !defined $sth ) { die("Cannot prepare statement in $function_name: $DBI::errstr\n") } if ( !defined $sth ) { die("Cannot prepare statement in '$function_name': $DBI::errstr\n") }
$sth->execute; $sth->execute;
my $result = $sth->fetchrow(); my $result = $sth->fetchrow();
...@@ -362,7 +362,7 @@ sub registerSender ...@@ -362,7 +362,7 @@ sub registerSender
my $function_name = 'registerSender'; my $function_name = 'registerSender';
if ($local_ip ne $ip) { if ($local_ip ne $ip) {
write2log ("err", "Unauthorized access to $function_name from: $ip ($cn) - access allowed only from localhost"); write2log ("err", "Unauthorized access to '$function_name' from: '$ip' ('$cn') - access allowed only from localhost");
die("Access denied - access allowed only from localhost!"); die("Access denied - access allowed only from localhost!");
} else { } else {
# defined variables by method # defined variables by method
...@@ -380,19 +380,19 @@ sub registerSender ...@@ -380,19 +380,19 @@ sub registerSender
# check if sender has been already registered # check if sender has been already registered
$sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND service = ? AND client_type = ? AND type = ? AND receive_own_events = ? AND description_tags = ? AND ip_net_client = ? LIMIT 1;"); $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND service = ? AND client_type = ? AND type = ? AND receive_own_events = ? AND description_tags = ? AND ip_net_client = ? LIMIT 1;");
if (!defined $sth) {die("Cannot prepare check statement in $function_name: $DBI::errstr\n")} if (!defined $sth) {die("Cannot prepare check statement in '$function_name': $DBI::errstr\n")}
$sth->execute($hostname, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client); $sth->execute($hostname, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
my $result = $sth->fetchrow(); my $result = $sth->fetchrow();
# register new sender # register new sender
if (defined $result) { if (defined $result) {
write2log ("err", "Attempt to re-register the sender"); write2log ("err", "Attempt to re-register the sender");
die("Error - sender has already been registered at $result"); die("Error - sender has already been registered at '$result'");
} else { } else {
$sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);"); $sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);");
if (!defined $sth) {die("Cannot do statement in $function_name: $DBI::errstr\n")} if (!defined $sth) {die("Cannot do statement in '$function_name': $DBI::errstr\n")}
$sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client); $sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
write2log("info", "New sender $hostname (service: $service, cidr: $ip_net_client) was registered"); write2log("info", "New sender '$hostname' (service: '$service', cidr: '$ip_net_client') was registered");
return 1; return 1;
} }
} }
...@@ -415,7 +415,7 @@ sub registerReceiver ...@@ -415,7 +415,7 @@ sub registerReceiver
my $function_name = 'registerReceiver'; my $function_name = 'registerReceiver';
if ($local_ip ne $ip) { if ($local_ip ne $ip) {
write2log ("err", "Unauthorized access to $function_name from: $ip ($cn) - access allowed only from localhost"); write2log ("err", "Unauthorized access to '$function_name' from: '$ip' ('$cn') - access allowed only from localhost");
die("Access denied - access allowed only from localhost!"); die("Access denied - access allowed only from localhost!");
} else { } else {
# variables defined by method # variables defined by method
...@@ -433,19 +433,19 @@ sub registerReceiver ...@@ -433,19 +433,19 @@ sub registerReceiver
# check if receiver has been already registered # check if receiver has been already registered
$sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND service = ? AND client_type = ? AND type = ? AND receive_own_events = ? AND description_tags = ? AND ip_net_client = ? LIMIT 1;"); $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND service = ? AND client_type = ? AND type = ? AND receive_own_events = ? AND description_tags = ? AND ip_net_client = ? LIMIT 1;");
if (!defined $sth) {die("Cannot prepare check statement in $function_name: $DBI::errstr\n")} if (!defined $sth) {die("Cannot prepare check statement in '$function_name': $DBI::errstr\n")}
$sth->execute($hostname, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client); $sth->execute($hostname, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
my $result = $sth->fetchrow(); my $result = $sth->fetchrow();
# register new receiver # register new receiver
if (defined $result) { if (defined $result) {
write2log ("err", "Attempt to re-register the receiver"); write2log ("err", "Attempt to re-register the receiver");
die("Error - receiver has already been registered at $result"); die("Error - receiver has already been registered at '$result'");
} else { } else {
$sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);"); $sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);");
if (!defined($sth)) {die("Cannot do statement in $function_name: $DBI::errstr\n")} if (!defined($sth)) {die("Cannot do statement in '$function_name': $DBI::errstr\n")}
$sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client); $sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
write2log("info", "New receiver $hostname (type: $type, cidr: $ip_net_client: receive_own_events: $receive_own_events) was registered"); write2log("info", "New receiver '$hostname' (type: '$type', cidr: '$ip_net_client', receive_own_events: '$receive_own_events') was registered");
return 1; return 1;
} }
} }
...@@ -468,7 +468,7 @@ sub unregisterClient ...@@ -468,7 +468,7 @@ sub unregisterClient
my $function_name = 'unregisterClient'; my $function_name = 'unregisterClient';
if ($local_ip ne $ip) { if ($local_ip ne $ip) {
write2log ("err", "Unauthorized access to $function_name from: $ip ($cn) - access allowed only from localhost"); write2log ("err", "Unauthorized access to '$function_name' from: '$ip' ('$cn') - access allowed only from localhost");
die("Access denied - access allowed only from localhost!"); die("Access denied - access allowed only from localhost!");
} else { } else {
# parse SOAP data oject # parse SOAP data oject
...@@ -476,7 +476,7 @@ sub unregisterClient ...@@ -476,7 +476,7 @@ sub unregisterClient
# check if receiver has been already registered # check if receiver has been already registered
$sth = $DBH->prepare("SELECT client_id, hostname, service, client_type FROM clients WHERE client_id = ? LIMIT 1;"); $sth = $DBH->prepare("SELECT client_id, hostname, service, client_type FROM clients WHERE client_id = ? LIMIT 1;");
if (!defined $sth) {die("Cannot prepare check statement in $function_name: $DBI::errstr\n")} if (!defined $sth) {die("Cannot prepare check statement in '$function_name': $DBI::errstr\n")}
$sth->execute($client_id); $sth->execute($client_id);
my ($id, $hostname, $service, $client_type) = $sth->fetchrow(); my ($id, $hostname, $service, $client_type) = $sth->fetchrow();
...@@ -487,21 +487,21 @@ sub unregisterClient ...@@ -487,21 +487,21 @@ sub unregisterClient
} else { } else {
if ($client_type eq 's') { if ($client_type eq 's') {
$sth = $DBH->prepare("DELETE FROM clients WHERE client_id = ?;"); $sth = $DBH->prepare("DELETE FROM clients WHERE client_id = ?;");
if (!defined $sth) {die("Cannot do delete statement of sender in $function_name: $DBI::errstr\n")} if (!defined $sth) {die("Cannot do delete statement of sender in '$function_name': $DBI::errstr\n")}
$sth->execute($client_id); $sth->execute($client_id);
$sth = $DBH->prepare("UPDATE events SET valid = 'f' where hostname = ? AND service = ?;"); $sth = $DBH->prepare("UPDATE events SET valid = 'f' where hostname = ? AND service = ?;");
if (!defined $sth) {die("Cannot do unvalidation statement in $function_name: $DBI::errstr\n")} if (!defined $sth) {die("Cannot do unvalidation statement in '$function_name': $DBI::errstr\n")}
$sth->execute($hostname, $service); $sth->execute($hostname, $service);
write2log("info", "Sender $hostname (client_id: $client_id, service: $service) was deleted and its data were invalidated" ); write2log("info", "Sender '$hostname' (client_id: '$client_id', service: '$service') was deleted and its data were invalidated" );
return 1; return 1;
} else { } else {
$sth = $DBH->prepare("DELETE FROM clients WHERE client_id = ?;"); $sth = $DBH->prepare("DELETE FROM clients WHERE client_id = ?;");
if (!defined $sth) {die("Cannot do delete statement of receiver in $function_name: $DBI::errstr\n")} if (!defined $sth) {die("Cannot do delete statement of receiver in '$function_name': $DBI::errstr\n")}
$sth->execute($client_id); $sth->execute($client_id);
write2log("info", "Receiver $hostname (client_id: $client_id) was deleted" ); write2log("info", "Receiver '$hostname' (client_id: '$client_id') was deleted" );
return 1; return 1;
} }
} }
...@@ -524,13 +524,13 @@ sub getClients ...@@ -524,13 +524,13 @@ sub getClients
my $function_name = 'getClients'; my $function_name = 'getClients';
if ($local_ip ne $ip) { if ($local_ip ne $ip) {
write2log ("err", "Unauthorized access to $function_name from: $ip ($cn) - access allowed only from localhost"); write2log ("err", "Unauthorized access to '$function_name' from: '$ip' ('$cn') - access allowed only from localhost");
die("Access denied - access allowed only from localhost!"); die("Access denied - access allowed only from localhost!");
} else { } else {
my (@clients, $client); my (@clients, $client);
my ($client_id, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client); my ($client_id, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
my $sth = $DBH->prepare("SELECT * FROM clients ORDER BY client_id ASC;"); my $sth = $DBH->prepare("SELECT * FROM clients ORDER BY client_id ASC;");
if (!defined $sth) { die("Cannot prepare statement in $function_name: $DBI::errstr\n") } if (!defined $sth) { die("Cannot prepare statement in '$function_name': $DBI::errstr\n") }
$sth->execute; $sth->execute;
while ( my @result = $sth->fetchrow() ) { while ( my @result = $sth->fetchrow() ) {
...@@ -560,7 +560,7 @@ sub getClients ...@@ -560,7 +560,7 @@ sub getClients
push(@clients, $client); push(@clients, $client);
} }
my $sum = scalar @clients; my $sum = scalar @clients;
write2log("info", "Sending information about $sum registered clients"); write2log("info", "Sending information about '$sum' registered clients");
return @clients; return @clients;
} }
} # END of getClients } # END of getClients
...@@ -581,7 +581,7 @@ sub getStatus ...@@ -581,7 +581,7 @@ sub getStatus
my $function_name = 'getStatus'; my $function_name = 'getStatus';
if ($local_ip ne $ip) { if ($local_ip ne $ip) {
write2log ("err", "Unauthorized access to $function_name from: $ip ($cn) - access allowed only from localhost"); write2log ("err", "Unauthorized access to '$function_name' from: '$ip' ('$cn') - access allowed only from localhost");
die("Access denied - access allowed only from localhost!"); die("Access denied - access allowed only from localhost!");
} else { } else {
my ($sth, @status); my ($sth, @status);
...@@ -603,35 +603,35 @@ sub getStatus ...@@ -603,35 +603,35 @@ sub getStatus
# sum of records in table events # sum of records in table events
$sth = $DBH->prepare("SELECT count(*) FROM events WHERE valid = 't';"); $sth = $DBH->prepare("SELECT count(*) FROM events WHERE valid = 't';");
if (!defined $sth) { die("Cannot prepare statement in $function_name: $DBI::errstr\n") } if (!defined $sth) { die("Cannot prepare statement in '$function_name': $DBI::errstr\n") }
$sth->execute; $sth->execute;
my $events_sum = $sth->fetchrow(); my $events_sum = $sth->fetchrow();
if (!defined $events_sum) { $events_sum = "none" } if (!defined $events_sum) { $events_sum = "none" }
# id of last record in table events # id of last record in table events
$sth = $DBH->prepare("SELECT max(id) FROM events;"); $sth = $DBH->prepare("SELECT max(id) FROM events;");
if (!defined $sth) { die("Cannot prepare statement in $function_name: $DBI::errstr\n") } if (!defined $sth) { die("Cannot prepare statement in '$function_name': $DBI::errstr\n") }
$sth->execute; $sth->execute;
my $events_last_id = $sth->fetchrow(); my $events_last_id = $sth->fetchrow();
if (!defined $events_last_id) { $events_last_id = "none" } if (!defined $events_last_id) { $events_last_id = "none" }
# timestamp of first record in table events # timestamp of first record in table events
$sth = $DBH->prepare("SELECT received FROM events WHERE id = (SELECT min(id) FROM events);"); $sth = $DBH->prepare("SELECT received FROM events WHERE id = (SELECT min(id) FROM events);");
if (!defined $sth) { die("Cannot prepare statement in $function_name: $DBI::errstr\n") } if (!defined $sth) { die("Cannot prepare statement in '$function_name': $DBI::errstr\n") }
$sth->execute; $sth->execute;
my $events_first_timestamp = $sth->fetchrow(); my $events_first_timestamp = $sth->fetchrow();
if (!defined $events_first_timestamp) { $events_first_timestamp = "none" } if (!defined $events_first_timestamp) { $events_first_timestamp = "none" }
# timestamp of last record in table events # timestamp of last record in table events
$sth = $DBH->prepare("SELECT received FROM events WHERE id = (SELECT max(id) FROM events);"); $sth = $DBH->prepare("SELECT received FROM events WHERE id = (SELECT max(id) FROM events);");
if (!defined $sth) { die("Cannot prepare statement in $function_name: $DBI::errstr\n") } if (!defined $sth) { die("Cannot prepare statement in '$function_name': $DBI::errstr\n") }
$sth->execute; $sth->execute;
my $events_last_timestamp = $sth->fetchrow(); my $events_last_timestamp = $sth->fetchrow();
if (!defined $events_last_timestamp) { $events_last_timestamp = "none" } if (!defined $events_last_timestamp) { $events_last_timestamp = "none" }
# sum of records in table clients # sum of records in table clients
$sth = $DBH->prepare("SELECT count(*) FROM clients;"); $sth = $DBH->prepare("SELECT count(*) FROM clients;");
if (!defined $sth) { die("Cannot prepare statement in $function_name: $DBI::errstr\n") } if (!defined $sth) { die("Cannot prepare statement in '$function_name': $DBI::errstr\n") }
$sth->execute; $sth->execute;
my $clients_sum = $sth->fetchrow(); my $clients_sum = $sth->fetchrow();
if (!defined $clients_sum) { $clients_sum = "none" } if (!defined $clients_sum) { $clients_sum = "none" }
...@@ -657,7 +657,7 @@ sub getStatus ...@@ -657,7 +657,7 @@ sub getStatus
# statistics of senders # statistics of senders
if ($clients_sum != 0) { if ($clients_sum != 0) {
$sth = $DBH->prepare("SELECT client_id, hostname, service FROM clients WHERE client_type = 's' ORDER BY client_id ASC;"); $sth = $DBH->prepare("SELECT client_id, hostname, service FROM clients WHERE client_type = 's' ORDER BY client_id ASC;");
if (!defined $sth) {die("Cannot prepare statement in $function_name: $DBI::errstr\n")} if (!defined $sth) {die("Cannot prepare statement in '$function_name': $DBI::errstr\n")}
$sth->execute; $sth->execute;
my ($client_id, $hostname, $service); my ($client_id, $hostname, $service);
my $client_status; my $client_status;
...@@ -665,13 +665,13 @@ sub getStatus ...@@ -665,13 +665,13 @@ sub getStatus
my $sth2; my $sth2;
# sum of stored events # sum of stored events
$sth2 = $DBH->prepare("SELECT count(*) FROM events WHERE hostname = ? AND service = ?;"); $sth2 = $DBH->prepare("SELECT count(*) FROM events WHERE hostname = ? AND service = ?;");
if (!defined $sth2) {die("Cannot prepare statement in $function_name: $DBI::errstr\n")} if (!defined $sth2) {die("Cannot prepare statement in '$function_name': $DBI::errstr\n")}
$sth2->execute($hostname, $service); $sth2->execute($hostname, $service);
my $count = $sth2->fetchrow(); my $count = $sth2->fetchrow();
if (!defined $count) {$count = "none"} if (!defined $count) {$count = "none"}
# timestamp of last stored event # timestamp of last stored event
$sth2 = $DBH->prepare("SELECT max(received) FROM events WHERE hostname = ? AND service = ?;"); $sth2 = $DBH->prepare("SELECT max(received) FROM events WHERE hostname = ? AND service = ?;");
if (!defined $sth2) {die("Cannot prepare statement in $function_name: $DBI::errstr\n")} if (!defined $sth2) {die("Cannot prepare statement in '$function_name': $DBI::errstr\n")}
$sth2->execute($hostname, $service); $sth2->execute($hostname, $service);
my $timestamp = $sth2->fetchrow(); my $timestamp = $sth2->fetchrow();
if (!defined $timestamp) {$timestamp = "none"} if (!defined $timestamp) {$timestamp = "none"}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment