![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 255022e3d9262f09f3d39f16fd5bfa9e5576642e..d8942c9e6b1c629b1b3e714134a981d19ed8631d 100644 (file)
use GOSA::DBsqlite;
use MIME::Base64;
+
BEGIN{}
END{}
-my ($server_activ, $server_port, $server_passwd, $max_clients, $server_event_dir);
+my ($server_activ, $server_ip, $server_mac_address, $server_port, $server_passwd, $max_clients, $server_event_dir);
my ($bus_activ, $bus_passwd, $bus_ip, $bus_port);
-my ($gosa_activ, $gosa_ip, $gosa_port, $gosa_passwd);
+my ($gosa_activ, $gosa_ip, $gosa_mac_address, $gosa_port, $gosa_passwd, $network_interface);
my ($job_queue_timeout, $job_queue_file_name);
my $gosa_server;
},
"server" =>
{"server_activ" => [\$server_activ, "on"],
+ "server_ip" => [\$server_ip, "0.0.0.0"],
"server_port" => [\$server_port, "20081"],
"server_passwd" => [\$server_passwd, ""],
"max_clients" => [\$max_clients, 100],
"bus" =>
{"bus_activ" => [\$bus_activ, "on"],
"bus_passwd" => [\$bus_passwd, ""],
- "bus_ip" => [\$bus_ip, ""],
+ "bus_ip" => [\$bus_ip, "0.0.0.0"],
"bus_port" => [\$bus_port, "20080"],
},
"gosa" =>
{"gosa_activ" => [\$gosa_activ, "on"],
- "gosa_ip" => [\$gosa_ip, ""],
+ "gosa_ip" => [\$gosa_ip, "0.0.0.0"],
"gosa_port" => [\$gosa_port, "20082"],
"gosa_passwd" => [\$gosa_passwd, "none"],
},
# read configfile and import variables
&read_configfile();
-
-# detect own ip and mac address
-my ($server_ip, $server_mac_address) = &get_ip_and_mac();
+$network_interface= &get_interface_for_ip($server_ip);
+$gosa_mac_address= &get_mac($network_interface);
# complete addresses
my $server_address = "$server_ip:$server_port";
my $gosa_cipher = &create_ciphering($gosa_passwd);
my $xml = new XML::Simple();
-# open gosa socket
-if ($gosa_activ eq "on") {
- &main::daemon_log(" ",1);
- $gosa_server = IO::Socket::INET->new(LocalPort => $gosa_port,
- Type => SOCK_STREAM,
- Reuse => 1,
- Listen => 1,
- );
- if (not defined $gosa_server) {
- &main::daemon_log("cannot start tcp server at $gosa_port for communication to gosa: $@", 1);
- } else {
- &main::daemon_log("start server for communication to gosa: $gosa_address", 1);
-
- }
-}
-
-# create gosa job queue as a SQLite DB
-my $table_name = "jobs";
-my $sqlite = GOSA::DBsqlite->new($job_queue_file_name);
-
-
-
## FUNCTIONS #################################################################
}
}
+#=== FUNCTION ================================================================
+# NAME: get_interface_for_ip
+# PARAMETERS: ip address (i.e. 192.168.0.1)
+# RETURNS: array: list of interfaces if ip=0.0.0.0, matching interface if found, undef else
+# DESCRIPTION: Uses proc fs (/proc/net/dev) to get list of interfaces.
+#===============================================================================
+sub get_interface_for_ip {
+ my $result;
+ my $ip= shift;
+ if ($ip && length($ip) > 0) {
+ my @ifs= &get_interfaces();
+ if($ip eq "0.0.0.0") {
+ $result = "all";
+ } else {
+ foreach (@ifs) {
+ my $if=$_;
+ if(get_ip($if) eq $ip) {
+ $result = $if;
+ }
+ }
+ }
+ }
+ return $result;
+}
#=== FUNCTION ================================================================
-# NAME: get_ip_and_mac
-# PARAMETERS: nothing
-# RETURNS: (ip, mac)
-# DESCRIPTION: executes /sbin/ifconfig and parses the output, the first occurence
-# of a inet address is returned as well as the mac address in the line
-# above the inet address
+# NAME: get_interfaces
+# PARAMETERS: none
+# RETURNS: (list of interfaces)
+# DESCRIPTION: Uses proc fs (/proc/net/dev) to get list of interfaces.
#===============================================================================
-sub get_ip_and_mac {
- my $ip = "0.0.0.0.0"; # Defualt-IP
- my $mac = "00:00:00:00:00:00"; # Default-MAC
- my @ifconfig = qx(/sbin/ifconfig);
- foreach(@ifconfig) {
- if (/Hardware Adresse (\S{2}):(\S{2}):(\S{2}):(\S{2}):(\S{2}):(\S{2})/) {
- $mac = "$1:$2:$3:$4:$5:$6";
- next;
+sub get_interfaces {
+ my @result;
+ my $PROC_NET_DEV= ('/proc/net/dev');
+
+ open(PROC_NET_DEV, "<$PROC_NET_DEV")
+ or die "Could not open $PROC_NET_DEV";
+
+ my @ifs = <PROC_NET_DEV>;
+
+ close(PROC_NET_DEV);
+
+ # Eat first two line
+ shift @ifs;
+ shift @ifs;
+
+ chomp @ifs;
+ foreach my $line(@ifs) {
+ my $if= (split /:/, $line)[0];
+ $if =~ s/^\s+//;
+ push @result, $if;
}
- if (/inet Adresse:(\d+).(\d+).(\d+).(\d+)/) {
- $ip = "$1.$2.$3.$4";
- last;
+
+ return @result;
+}
+
+#=== FUNCTION ================================================================
+# NAME: get_mac
+# PARAMETERS: interface name (i.e. eth0)
+# RETURNS: (mac address)
+# DESCRIPTION: Uses ioctl to get mac address directly from system.
+#===============================================================================
+sub get_mac {
+ my $ifreq= shift;
+ my $result;
+ if ($ifreq && length($ifreq) > 0) {
+ if($ifreq eq "all") {
+ $result = "00:00:00:00:00:00";
+ } else {
+ my $SIOCGIFHWADDR= 0x8927; # man 2 ioctl_list
+
+ # A configured MAC Address should always override a guessed value
+ if ($gosa_mac_address and length($gosa_mac_address) > 0) {
+ $result= $gosa_mac_address;
+ }
+
+ socket SOCKET, PF_INET, SOCK_DGRAM, getprotobyname('ip')
+ or die "socket: $!";
+
+ if(ioctl SOCKET, $SIOCGIFHWADDR, $ifreq) {
+ my ($if, $mac)= unpack 'h36 H12', $ifreq;
+
+ if (length($mac) > 0) {
+ $mac=~ m/^([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])$/;
+ $mac= sprintf("%s:%s:%s:%s:%s:%s", $1, $2, $3, $4, $5, $6);
+ $result = $mac;
+ }
+ }
+ }
}
- }
- return ($ip, $mac);
+ return $result;
}
+#=== FUNCTION ================================================================
+# NAME: get_ip
+# PARAMETERS: interface name (i.e. eth0)
+# RETURNS: (ip address)
+# DESCRIPTION: Uses ioctl to get ip address directly from system.
+#===============================================================================
+sub get_ip {
+ my $ifreq= shift;
+ my $result= "";
+ my $SIOCGIFADDR= 0x8915; # man 2 ioctl_list
+ my $proto= getprotobyname('ip');
+
+ socket SOCKET, PF_INET, SOCK_DGRAM, $proto
+ or die "socket: $!";
+
+ if(ioctl SOCKET, $SIOCGIFADDR, $ifreq) {
+ my ($if, $sin) = unpack 'a16 a16', $ifreq;
+ my ($port, $addr) = sockaddr_in $sin;
+ my $ip = inet_ntoa $addr;
+
+ if ($ip && length($ip) > 0) {
+ $result = $ip;
+ }
+ }
+
+ return $result;
+}
#=== FUNCTION ================================================================
# NAME: open_socket
# RETURNS: socket IO::Socket::INET
# DESCRIPTION: open a socket to PeerAddr
#===============================================================================
-sub open_socket {
- my ($PeerAddr, $PeerPort) = @_ ;
- if(defined($PeerPort)){
- $PeerAddr = $PeerAddr.":".$PeerPort;
- }
- my $socket;
- $socket = new IO::Socket::INET(PeerAddr => $PeerAddr ,
- Porto => "tcp" ,
- Type => SOCK_STREAM,
- Timeout => 5,
- );
- if(not defined $socket) {
- return;
- }
- &main::daemon_log("open_socket to: $PeerAddr", 7);
- return $socket;
-}
+#sub open_socket {
+# my ($PeerAddr, $PeerPort) = @_ ;
+# if(defined($PeerPort)){
+# $PeerAddr = $PeerAddr.":".$PeerPort;
+# }
+# my $socket;
+# $socket = new IO::Socket::INET(PeerAddr => $PeerAddr ,
+# Porto => "tcp" ,
+# Type => SOCK_STREAM,
+# Timeout => 5,
+# );
+# if(not defined $socket) {
+# return;
+# }
+# &main::daemon_log("open_socket to: $PeerAddr", 7);
+# return $socket;
+#}
#=== FUNCTION ================================================================
#===============================================================================
sub process_incoming_msg {
my ($crypted_msg) = @_ ;
- if(not defined $crypted_msg) {
+ if( (not(defined($crypted_msg))) || (length($crypted_msg) <= 0)) {
&main::daemon_log("function 'process_incoming_msg': got no msg", 7);
+ return;
}
- &main::daemon_log("GosaPackages: incoming msg: \n$crypted_msg", 7);
$crypted_msg =~ /^([\s\S]*?)\.(\d{1,3}?)\.(\d{1,3}?)\.(\d{1,3}?)\.(\d{1,3}?)$/;
$crypted_msg = $1;
- my $host = sprintf("%s.%s.%s.%s", $2, $3, $4, $5);
+ my $host = sprintf("%s.%s.%s.%s", $2, $3, $4, $5);
# collect addresses from possible incoming clients
# only gosa is allowd as incoming client
my $msg_hash;
eval{
$msg = &decrypt_msg($crypted_msg, $gosa_cipher);
- &main::daemon_log("GosaPackages: decrypted_msg: \n$msg", 7);
+ &main::daemon_log("GosaPackages: decrypted_msg: \n$msg", 8);
$msg_hash = $xml->XMLin($msg, ForceArray=>1);
};
my $header = @{$msg_hash->{header}}[0];
- &main::daemon_log("recieve '$header' at GosaPackages from $host", 1);
- &main::daemon_log("$msg", 7);
+ &main::daemon_log("GosaPackages: receive '$header' from $host", 1);
my $out_msg;
if ($header =~ /^job_/) {
} else {
&main::daemon_log("ERROR: $header is not a valid GosaPackage-header, need a 'job_' or a 'gosa_' prefix");
}
-
+
if (not defined $out_msg) {
return;
}
if ($out_msg =~ /<jobdb_id>(\d*?)<\/jobdb_id>/) {
my $job_id = $1;
- my $sql = "UPDATE '$main::job_queue_table_name' SET status='done', result='$out_msg' WHERE id='$job_id'";
+ my $sql = "UPDATE '".$main::job_queue_table_name.
+ "' SET status='done', result='".$out_msg.
+ "' WHERE id='$job_id'";
my $res = $main::job_db->exec_statement($sql);
return;
} else {
+
my $out_cipher = &create_ciphering($gosa_passwd);
$out_msg = &encrypt_msg($out_msg, $out_cipher);
return $out_msg;
- }
+ }
}
my ($msg, $header) = @_ ;
my $out_msg;
$header =~ s/gosa_//;
- &main::daemon_log("GosaPackages: got a gosa msg $header", 5);
# decide wether msg is a core function or a event handler
if ( $header eq 'query_jobdb') { $out_msg = &query_jobdb }
elsif ($header eq 'delete_jobdb_entry') { $out_msg = &delete_jobdb_entry }
elsif ($header eq 'clear_jobdb') { $out_msg = &clear_jobdb }
elsif ($header eq 'update_status_jobdb_entry' ) { $out_msg = &update_status_jobdb_entry }
- elsif ($header eq 'update_timestamp_jobdb_entry' ) { $out_msg = &update_timestamp_jobdb_entry }
+ elsif ($header eq 'count_jobdb' ) { $out_msg = &count_jobdb }
else {
# msg could not be assigned to core function
# fetch all available eventhandler under $server_event_dir
my $header = @{$msg_hash->{header}}[0];
$header =~ s/job_//;
- &main::daemon_log("GosaPackages: got a job msg $header", 5);
# check wether mac address is already known in known_daemons or known_clients
- my $target = 'not known until now';
+ my $target = 'none';
# add job to job queue
my $func_dic = {table=>$main::job_queue_table_name,
+ primkey=>'id',
timestamp=>@{$msg_hash->{timestamp}}[0],
status=>'waiting',
result=>'none',
}
&main::daemon_log("GosaPackages: $header job successfully added to job queue", 3);
- return "<xml><1>$res</1></xml>";
+ return "<xml><answer1>$res</answer1></xml>";
}
sub db_res_2_xml {
my ($db_res) = @_ ;
+
my $xml = "<xml>";
- while ( my ($hit, $hash) = each %{ $db_res } ) {
- $xml .= "<$hit>";
+ my $len_db_res= keys %{$db_res};
+ for( my $i= 1; $i<= $len_db_res; $i++ ) {
+ $xml .= "\n<answer$i>";
+ my $hash= $db_res->{$i};
while ( my ($column_name, $column_value) = each %{$hash} ) {
$xml .= "<$column_name>";
- my $xml_content = $column_value;
- if( $column_name eq "xml" ) {
+ my $xml_content;
+ if( $column_name eq "xmlmessage" ) {
$xml_content = &encode_base64($column_value);
+ } else {
+ $xml_content = $column_value;
}
$xml .= $xml_content;
$xml .= "</$column_name>";
}
+ $xml .= "</answer$i>";
- $xml .= "</$hit>";
}
$xml .= "</xml>";
my $msg_hash = &transform_msg2hash($msg);
# prepare query sql statement
- my @where = @{$msg_hash->{where}};
- my $where_hash = {table=>$main::job_queue_table_name };
- foreach my $where_pram (@where) {
- my $where_val = @{$msg_hash->{$where_pram}}[0];
- if (defined $where_val) {
- $where_hash->{$where_pram} = $where_val;
- }
- }
-
- # execute db query
- my $res_hash = $main::job_db->select_dbentry($where_hash);
+ my $select= &get_select_statement($msg, $msg_hash);
+ my $table= $main::job_queue_table_name;
+ my $where= &get_where_statement($msg, $msg_hash);
+ my $limit= &get_limit_statement($msg, $msg_hash);
+ my $orderby= &get_orderby_statement($msg, $msg_hash);
+ my $sql_statement= "SELECT $select FROM $table $where $orderby $limit";
+ # execute db query
+ my $res_hash = $main::job_db->select_dbentry($sql_statement);
my $out_xml = &db_res_2_xml($res_hash);
+
return $out_xml;
}
+
+sub count_jobdb {
+ my ($msg)= @_;
+ my $out_xml= "<xml><count>error</count></xml>";
+
+ # prepare query sql statement
+ my $table= $main::job_queue_table_name;
+ my $sql_statement= "SELECT * FROM $table ";
+
+ # execute db query
+ my $res_hash = $main::job_db->select_dbentry($sql_statement);
+
+ my $count = keys(%{$res_hash});
+ $out_xml= "<xml><count>$count</count></xml>";
+
+ return $out_xml;
+}
+
+
sub delete_jobdb_entry {
my ($msg) = @_ ;
my $msg_hash = &transform_msg2hash($msg);
# prepare query sql statement
- my @where = @{$msg_hash->{where}};
- my $where_hash = {table=>$main::job_queue_table_name };
- foreach my $where_pram (@where) {
- my $where_val = @{$msg_hash->{$where_pram}}[0];
- if (defined $where_val) {
- $where_hash->{$where_pram} = $where_val;
- }
- }
+ my $table= $main::job_queue_table_name;
+ my $where= &get_where_statement($msg, $msg_hash);
+ my $sql_statement = "DELETE FROM $table $where";
# execute db query
- my $db_res = $main::job_db->del_dbentry($where_hash);
+ my $db_res = $main::job_db->del_dbentry($sql_statement);
my $res;
if( $db_res > 0 ) {
}
# prepare xml answer
- my $out_xml = "<xml><1>$res</1></xml>";
+ my $out_xml = "<xml><answer1>$res</answer1></xml>";
return $out_xml;
}
+
sub clear_jobdb {
my ($msg) = @_ ;
my $msg_hash = &transform_msg2hash($msg);
+ my $error= 0;
+ my $out_xml= "<xml><answer1>1</answer1></xml>";
+
+ my $table= $main::job_queue_table_name;
- my $where_hash = {table=>$main::job_queue_table_name };
+ my $sql_statement = "DELETE FROM $table";
+ my $db_res = $main::job_db->del_dbentry($sql_statement);
+ if( not $db_res > 0 ) { $error++; };
- # execute db query
- my $db_res = $main::job_db->del_dbentry($where_hash);
- print STDERR "db_res=$db_res\n";
- my $res;
- if( $db_res eq '0E0' ) {
- $res = 0 ;
- } else {
- $res = 1;
+ if( $error == 0 ) {
+ $out_xml = "<xml><answer1>0</answer1></xml>";
}
-
- # prepare xml answer
- my $out_xml = "<xml><1>$res</1></xml>";
+
return $out_xml;
}
+
sub update_status_jobdb_entry {
my ($msg) = @_ ;
my $msg_hash = &transform_msg2hash($msg);
-
- # prepare query sql statement
- my $update_hash = {table=>$main::job_queue_table_name };
- if( exists $msg_hash->{where} ) {
- $update_hash->{where} = $msg_hash->{where};
- } else {
- $update_hash->{where} = [];
- }
-
- if( not exists $msg_hash->{update}[0]->{status} ) {
- return "<xml><1>1</1></xml>";
- }
- $update_hash->{update} = [ { status=>$msg_hash->{update}[0]->{status} } ];
+ my $error= 0;
+ my $out_xml= "<xml><answer1>1</answer1></xml>";
- # execute db query
- my $db_res = $main::job_db->update_dbentry($update_hash);
-
- # transform db answer to error returnment
- my $res;
- if( $db_res > 0 ) {
- $res = 0 ;
- } else {
- $res = 1;
- }
-
- # prepare xml answer
- my $out_xml = "<xml><1>$res</1></xml>";
- return $out_xml;
-}
-
-sub update_timestamp_jobdb_entry {
- my ($msg) = @_ ;
- my $msg_hash = &transform_msg2hash($msg);
+ my @len_hash = keys %{$msg_hash};
+ if( 0 == @len_hash) { $error++; };
# prepare query sql statement
- my $update_hash = {table=>$main::job_queue_table_name };
- if( exists $msg_hash->{where} ) {
- $update_hash->{where} = $msg_hash->{where};
- } else {
- $update_hash->{where} = [];
- }
+ if( $error == 0) {
+ my $table= $main::job_queue_table_name;
+ my $where= &get_where_statement($msg, $msg_hash);
+ my $update= &get_update_statement($msg, $msg_hash);
- if( not exists $msg_hash->{update}[0]->{timestamp} ) {
- return "<xml><1>1</1></xml>";
- }
+ my $sql_statement = "UPDATE $table $update $where";
- $update_hash->{update} = [ { timestamp=>$msg_hash->{update}[0]->{timestamp} } ];
+ # execute db query
+ my $db_res = $main::job_db->update_dbentry($sql_statement);
- # execute db query
- my $db_res = $main::job_db->update_dbentry($update_hash);
+ # check success of db update
+ if( not $db_res > 0 ) { $error++; };
+ }
- # transform db answer to error returnment
- my $res;
- if( $db_res > 0 ) {
- $res = 0 ;
- } else {
- $res = 1;
+ if( $error == 0) {
+ $out_xml = "<xml><answer1>0</answer1></xml>";
}
- # prepare xml answer
- my $out_xml = "<xml><1>$res</1></xml>";
return $out_xml;
-
}
+#sub update_timestamp_jobdb_entry {
+# my ($msg) = @_ ;
+# my $msg_hash = &transform_msg2hash($msg);
+#
+# # prepare query sql statement
+# my $update_hash = {table=>$main::job_queue_table_name };
+# if( exists $msg_hash->{where} ) {
+# $update_hash->{where} = $msg_hash->{where};
+# } else {
+# $update_hash->{where} = [];
+# }
+#
+# if( not exists $msg_hash->{update}[0]->{timestamp} ) {
+# return "<xml><answer1>1</answer1></xml>";
+# }
+#
+# $update_hash->{update} = [ { timestamp=>$msg_hash->{update}[0]->{timestamp} } ];
+#
+# # execute db query
+# my $db_res = $main::job_db->update_dbentry($update_hash);
+#
+# # transform db answer to error returnment
+# my $res;
+# if( $db_res > 0 ) {
+# $res = 0 ;
+# } else {
+# $res = 1;
+# }
+#
+# # prepare xml answer
+# my $out_xml = "<xml><answer1>$res</answer1></xml>";
+# return $out_xml;
+#
+#}
+
1;