![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e8cbc5f8d54a07f0c0b9d5f8552d8b6757c29384..bb2809fdb9e954beaf3c5eeff3be70a327cb01f2 100644 (file)
# Don't start if some of the modules are missing
my $start_service=1;
+my $lookup_vendor=1;
BEGIN{
unless(eval('use Socket qw(PF_INET SOCK_DGRAM inet_ntoa sockaddr_in)')) {
$start_service=0;
unless(eval('use POE qw(Component::Pcap Component::ArpWatch)')) {
$start_service=0;
}
+ unless(eval('use Net::MAC::Vendor')) {
+ $lookup_vendor=0;
+ }
}
END{}
my $hosts_database={};
my $resolver=Net::DNS::Resolver->new;
my $ldap;
+if($lookup_vendor) {
+ eval("Net::MAC::Vendor::load_cache('file:///usr/lib/gosa-si/modules/oui.txt')");
+ if($@) {
+ &main::daemon_log("Loading OUI cache file failed! MAC Vendor lookup disabled", 1);
+ $lookup_vendor=0;
+ } else {
+ &main::daemon_log("Loading OUI cache file suceeded!", 6);
+ }
+}
my %cfg_defaults =
(
&read_configfile();
# Don't start if some of the modules are missing
if(($arp_activ eq 'on') && $start_service) {
- eval {
- $ldap = Net::LDAP->new($ldap_uri);
- };
+ $ldap = Net::LDAP->new($ldap_uri);
if (!$ldap) {
- &main::daemon_log("Could not connect to LDAP Server!\n$@", 1);
+ &main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);
} else {
- eval {
- $ldap->bind($ldap_admin_dn, password => $ldap_admin_password);
- };
- if($@) {
- &main::daemon_log("LDAP bind as $ldap_admin_dn failed! Trying anonymous bind", 1);
- $ldap->bind();
- }
+ $ldap->bind($ldap_admin_dn, password => $ldap_admin_password);
}
# When interface is not configured (or 'all'), start arpwatch on all possible interfaces
},
_stop => sub {
$ldap->unbind if (defined($ldap));
+ $ldap->disconnect if (defined($ldap));
$_[KERNEL]->post( sprintf("arp_watch_$device") => 'shutdown' )
},
got_packet => \&got_packet,
},
_stop => sub {
$ldap->unbind if (defined($ldap));
+ $ldap->disconnect if (defined($ldap));
$_[KERNEL]->post( sprintf("arp_watch_$device") => 'shutdown' )
},
got_packet => \&got_packet,
my $ldap_result=&get_host_from_ldap($packet->{source_haddr});
if(exists($ldap_result->{dn})) {
$hosts_database->{$packet->{source_haddr}}=$ldap_result;
+ $hosts_database->{$packet->{source_haddr}}->{dnsname}= $dnsname;
if(!exists($ldap_result->{ipHostNumber})) {
$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}=$packet->{source_ipaddr};
} else {
if(!($ldap_result->{ipHostNumber} eq $packet->{source_ipaddr})) {
&main::daemon_log(
"Current IP Address ".$packet->{source_ipaddr}.
- " of host ".$ldap_result->{dnsname}.
+ " of host ".$hosts_database->{$packet->{source_haddr}}->{dnsname}.
" differs from LDAP (".$ldap_result->{ipHostNumber}.")", 4);
}
}
macAddress => $packet->{source_haddr},
ipHostNumber => $packet->{source_ipaddr},
dnsname => $dnsname,
- cn => ($dnsname =~ /^(\d){1,3}\.(\d){1,3}\.(\d){1,3}\.(\d){1,3}/) ? $dnsname : sprintf "%s", $dnsname =~ /([^\.]+)\./,
+ cn => (($dnsname =~ /^(\d){1,3}\.(\d){1,3}\.(\d){1,3}\.(\d){1,3}/) ? $dnsname : sprintf "%s", $dnsname =~ /([^\.]+)\./),
+ macVendor => (($lookup_vendor) ? &get_vendor_for_mac($packet->{source_haddr}) : "Unknown Vendor"),
};
&main::daemon_log("Host was not found in LDAP (".($hosts_database->{$packet->{source_haddr}}->{dnsname}).")",6);
&main::daemon_log(
$ldap_base,
$hosts_database->{$packet->{source_haddr}}->{macAddress},
'new-system',
- $hosts_database->{$packet->{source_haddr}}->{ipHostNumber});
- #,
-# #$hosts_database->{$packet->{source_haddr}}->{dnsName});
-#
-# case 8 {&add_ldap_entry($ldap, $ldap_base,
-# $mac, $ip, "new-system",
-# )}
+ $hosts_database->{$packet->{source_haddr}}->{ipHostNumber},
+ 'interface',
+ $hosts_database->{$packet->{source_haddr}}->{macVendor});
}
$hosts_database->{$packet->{source_haddr}}->{device}= $capture_device;
} else {
": ".$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}.
"->".$packet->{source_ipaddr}, 4);
$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}= $packet->{source_ipaddr};
+ &change_ldap_entry(
+ $ldap,
+ $ldap_base,
+ $hosts_database->{$packet->{source_haddr}}->{macAddress},
+ 'ip-changed',
+ $hosts_database->{$packet->{source_haddr}}->{ipHostNumber},
+ );
+
}
&main::daemon_log("Host already in cache (".($hosts_database->{$packet->{source_haddr}}->{device})."->".($hosts_database->{$packet->{source_haddr}}->{dnsname}).")",6);
}
my $mac=shift;
my $result={};
- my $ldap_result= search_ldap_entry(
+ my $ldap_result= &search_ldap_entry(
$ldap,
$ldap_base,
"(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))"
return $result;
}
+sub get_vendor_for_mac {
+ my $mac=shift;
+ my $result="Unknown Vendor";
+
+ if(defined($mac)) {
+ my $vendor= Net::MAC::Vendor::fetch_oui_from_cache(Net::MAC::Vendor::normalize_mac($mac));
+ if(length($vendor) > 0) {
+ $result= @{$vendor}[0];
+ }
+ &main::daemon_log("Looking up Vendor for MAC ".$mac.": $result", 4);
+ }
+
+ return $result;
+}
+
#=== FUNCTION ================================================================
# NAME: add_ldap_entry
# PURPOSE: adds an element to ldap-tree
if(defined $desc) {$entry->add("description" => $desc) }
# submit entry to LDAP
- my $result = $entry->update ($ldap_tree);
+ my $result = $entry->update ($ldap_tree);
# for $result->code constants please look at Net::LDAP::Constant
- my $log_time = localtime( time );
if($result->code == 68) { # entry already exists
- &main::daemon_log("WARNING: $log_time: $dn ".$result->error, 3);
+ &main::daemon_log("WARNING: $dn ".$result->error, 3);
} elsif($result->code == 0) { # everything went fine
- &main::daemon_log("$log_time: add entry $dn to ldap", 1);
+ &main::daemon_log("add entry $dn to ldap", 1);
} else { # if any other error occur
- &main::daemon_log("ERROR: $log_time: $dn, ".$result->code.", ".$result->error, 1);
+ &main::daemon_log("ERROR: $dn, ".$result->code.", ".$result->error, 1);
}
return;
}
# SEE ALSO: n/a
#===============================================================================
sub change_ldap_entry {
- my ($ldap_tree, $ldap_base, $mac, $gotoSysStatus ) = @_;
+ my ($ldap_tree, $ldap_base, $mac, $gotoSysStatus, $ip) = @_;
# check if ldap_entry exists or not
my $s_res = &search_ldap_entry($ldap_tree, $ldap_base, "(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))");
- my $c_res = $s_res->count;
+ my $c_res = (defined $s_res)?$s_res->count:0;
if($c_res == 0) {
- daemon_log("WARNING: macAddress $mac not in LDAP", 1);
+ &main::daemon_log("WARNING: macAddress $mac not in LDAP", 1);
return;
} elsif($c_res > 1) {
- daemon_log("ERROR: macAddress $mac exists $c_res times in LDAP", 1);
+ &main::daemon_log("ERROR: macAddress $mac exists $c_res times in LDAP", 1);
return;
}
my $s_res_entry = $s_res->pop_entry();
my $dn = $s_res_entry->dn();
- my $result = $ldap->modify( $dn, replace => {'gotoSysStatus' => $gotoSysStatus } );
+ my $replace = {
+ 'gotoSysStatus' => $gotoSysStatus,
+ };
+ if (defined($ip)) {
+ $replace->{'ipHostNumber'} = $ip;
+ }
+ my $result = $ldap->modify( $dn, replace => $replace );
# for $result->code constants please look at Net::LDAP::Constant
- my $log_time = localtime( time );
if($result->code == 32) { # entry doesnt exists
&add_ldap_entry($mac, $gotoSysStatus);
} elsif($result->code == 0) { # everything went fine
- daemon_log("$log_time: entry $dn changed successful", 1);
+ &main::daemon_log("entry $dn changed successful", 1);
} else { # if any other error occur
- daemon_log("ERROR: $log_time: $dn, ".$result->code.", ".$result->error, 1);
+ &main::daemon_log("ERROR: $dn, ".$result->code.", ".$result->error, 1);
}
return;
my ($ldap_tree, $sub_tree, $search_string) = @_;
my $msg;
if(defined($ldap_tree)) {
- my $msg = $ldap_tree->search( # perform a search
+ $msg = $ldap_tree->search( # perform a search
base => $sub_tree,
filter => $search_string,
- ) or daemon_log("cannot perform search at ldap: $@", 1);
-# if(defined $msg) {
-# print $sub_tree."\t".$search_string."\t";
-# print $msg->count."\n";
-# foreach my $entry ($msg->entries) { $entry->dump; };
-# }
+ ) or &main::daemon_log("cannot perform search at ldap: $@", 1);
+ #if(defined $msg) {
+ # print $sub_tree."\t".$search_string."\t";
+ # print $msg->count."\n";
+ # foreach my $entry ($msg->entries) { $entry->dump; };
+ #}
}
return $msg;
}