![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index af77b7f4add9a5ea4bf193c3a67f4fa8cf1577a9..1301f6605f51f48e7b584d3117d6e5a2d22ad9bb 100644 (file)
"create_xml_string",
"transform_msg2hash",
"get_time",
+ "get_utc_time",
"build_msg",
"db_res2xml",
"db_res2si_msg",
"get_interfaces",
"get_mac_for_interface",
"get_local_ip_for_remote_ip",
- "get_local_mac_for_remote_ip",
"is_local",
"run_as",
"inform_all_other_si_server",
"read_configfile",
"check_opsi_res",
+ "calc_timestamp",
+ "opsi_callobj2string",
);
@EXPORT = @functions;
use strict;
use XML::Simple;
use Data::Dumper;
use Net::DNS;
+use DateTime;
my $op_hash = {
sub get_time {
- my ($seconds, $minutes, $hours, $monthday, $month,
- $year, $weekday, $yearday, $sommertime) = localtime(time);
- $hours = $hours < 10 ? $hours = "0".$hours : $hours;
- $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
- $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
- $month+=1;
- $month = $month < 10 ? $month = "0".$month : $month;
- $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
- $year+=1900;
- return "$year$month$monthday$hours$minutes$seconds";
+ my ($seconds, $minutes, $hours, $monthday, $month,
+ $year, $weekday, $yearday, $sommertime) = localtime;
+ $hours = $hours < 10 ? $hours = "0".$hours : $hours;
+ $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
+ $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
+ $month+=1;
+ $month = $month < 10 ? $month = "0".$month : $month;
+ $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
+ $year+=1900;
+ return "$year$month$monthday$hours$minutes$seconds";
+}
+
+sub get_utc_time {
+ my $utc_time = qx(date --utc +%Y%m%d%H%M%S);
+ $utc_time =~ s/\s$//;
+ return $utc_time;
}
my $len_db_res= keys %{$db_res};
for( my $i= 1; $i<= $len_db_res; $i++ ) {
- $xml .= "\n<answer>";
+ $xml .= "\n<answer$i>";
my $hash= $db_res->{$i};
while ( my ($column_name, $column_value) = each %{$hash} ) {
$xml .= "<$column_name>";
if( $column_name eq "xmlmessage" ) {
$xml_content = &encode_base64($column_value);
} else {
- $xml_content = $column_value;
+ $xml_content = defined $column_value ? $column_value : "";
}
$xml .= $xml_content;
$xml .= "</$column_name>";
if ($error == 0) {
while (defined (my $event = readdir ($DIR))) {
- if( $event eq "." || $event eq ".." ) { next; }
+ if( $event eq "." || $event eq ".." || ($event =~ /^\.pm$/)) { next; }
+
+ # Check config file to exclude disabled event plugins (i.e. Opsi)
+ if ($event eq "opsi_com.pm" && $main::opsi_enabled ne "true") {
+ &main::daemon_log("0 WARNING: opsi-module is installed but not enabled in config file, please set under section '[OPSI]': 'enabled=true'", 3);
+ next;
+ }
# try to import event module
eval{ require $event; };
my $remote_ip= shift;
my $result="0.0.0.0";
- if($remote_ip =~ /^(\d\d?\d?\.){3}\d\d?\d?$/) {
- if($remote_ip eq "127.0.0.1") {
- $result = "127.0.0.1";
- } else {
- my $PROC_NET_ROUTE= ('/proc/net/route');
-
- open(PROC_NET_ROUTE, "<$PROC_NET_ROUTE")
- or die "Could not open $PROC_NET_ROUTE";
-
- my @ifs = <PROC_NET_ROUTE>;
-
- close(PROC_NET_ROUTE);
-
- # Eat header line
- shift @ifs;
- chomp @ifs;
- foreach my $line(@ifs) {
- my ($Iface,$Destination,$Gateway,$Flags,$RefCnt,$Use,$Metric,$Mask,$MTU,$Window,$IRTT)=split(/\s/, $line);
- my $destination;
- my $mask;
- my ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Destination);
- $destination= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
- ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Mask);
- $mask= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
- if(new NetAddr::IP($remote_ip)->within(new NetAddr::IP($destination, $mask))) {
- # destination matches route, save mac and exit
- $result= &get_ip($Iface);
- last;
- }
- }
- }
- } else {
- daemon_log("0 WARNING: get_local_ip_for_remote_ip() was called with a non-ip parameter: '$remote_ip'", 1);
- }
+ if($remote_ip =~ /^(\d\d?\d?\.){3}\d\d?\d?$/) {
+ my $PROC_NET_ROUTE= ('/proc/net/route');
+
+ open(PROC_NET_ROUTE, "<$PROC_NET_ROUTE")
+ or die "Could not open $PROC_NET_ROUTE";
+
+ my @ifs = <PROC_NET_ROUTE>;
+
+ close(PROC_NET_ROUTE);
+
+ # Eat header line
+ shift @ifs;
+ chomp @ifs;
+ my $iffallback = '';
+
+ # linux-vserver might have * as Iface due to hidden interfaces, set a default
+ foreach my $line(@ifs) {
+ my ($Iface,$Destination,$Gateway,$Flags,$RefCnt,$Use,$Metric,$Mask,$MTU,$Window,$IRTT)=split(/\s/, $line);
+ if ($Iface =~ m/^[^\*]+$/) {
+ $iffallback = $Iface;
+ }
+ }
+
+ foreach my $line(@ifs) {
+ my ($Iface,$Destination,$Gateway,$Flags,$RefCnt,$Use,$Metric,$Mask,$MTU,$Window,$IRTT)=split(/\s/, $line);
+ my $destination;
+ my $mask;
+ my ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Destination);
+ if ($Iface =~ m/^[^\*]+$/) {
+ $iffallback = $Iface;
+ }
+ $destination= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
+ ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Mask);
+ $mask= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
+ if(new NetAddr::IP($remote_ip)->within(new NetAddr::IP($destination, $mask))) {
+ # destination matches route, save mac and exit
+ #$result= &get_ip($Iface);
+
+ if ($Iface =~ m/^\*$/ ) {
+ $result= &get_ip($iffallback);
+ } else {
+ $result= &get_ip($Iface);
+ }
+ last;
+ }
+ }
+ }
+
return $result;
}
}
-sub get_local_mac_for_remote_ip {
- my $ip = shift;
-
- my $local_ip = &get_local_ip_for_remote_ip($ip);
- my $network_interface= &get_interface_for_ip($local_ip);
- my $mac = &get_mac_for_interface($network_interface);
-
- return $mac
-}
-
-
#=== FUNCTION ================================================================
# NAME: is_local
# PARAMETERS: Server Address
}
my $cmd_line= "$sudo_cmd su - $uid -c '$command'";
open(PIPE, "$cmd_line |");
- my $result = {'resultCode' => $?};
- $result->{'command'} = $cmd_line;
+ my $result = {'command' => $cmd_line};
push @{$result->{'output'}}, <PIPE>;
+ close(PIPE);
+ my $exit_value = $? >> 8;
+ $result->{'resultCode'} = $exit_value;
return $result;
}
my $cfg;
if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
if( -r $cfg_file ) {
- $cfg = Config::IniFiles->new( -file => $cfg_file );
+ $cfg = Config::IniFiles->new( -file => $cfg_file, -nocase => 1 );
} else {
print STDERR "Couldn't read config file!";
}
return 0;
}
+sub calc_timestamp {
+ my ($timestamp, $operation, $value, $entity) = @_ ;
+ $entity = defined $entity ? $entity : "seconds";
+ my $res_timestamp = 0;
+
+ $value = int($value);
+ $timestamp = int($timestamp);
+ $timestamp =~ /(\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)/;
+ my $dt = DateTime->new( year => $1,
+ month => $2,
+ day => $3,
+ hour => $4,
+ minute => $5,
+ second => $6,
+ );
+
+ if ($operation eq "plus" || $operation eq "+") {
+ $dt->add($entity => $value);
+ $res_timestamp = $dt->ymd('').$dt->hms('');
+ }
+
+ if ($operation eq "minus" || $operation eq "-") {
+ $dt->subtract($entity => $value);
+ $res_timestamp = $dt->ymd('').$dt->hms('');
+ }
+
+ return $res_timestamp;
+}
+
+sub opsi_callobj2string {
+ my ($callobj) = @_;
+ my @callobj_string;
+ while(my ($key, $value) = each(%$callobj)) {
+ my $value_string = "";
+ if (ref($value) eq "ARRAY") {
+ $value_string = join(",", @$value);
+ } else {
+ $value_string = $value;
+ }
+ push(@callobj_string, "$key=$value_string")
+ }
+ return join(", ", @callobj_string);
+}
1;