![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 009d23cb5be67ebf6464a30f7979eec31d29f2aa..89871783d747d79998ffbc767882e219dcd58f7f 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 ($timeout, $mailto, $mailfrom, $user, $group);
-my ($arp_activ, $arp_interface, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
+my ($arp_enabled, $arp_interface, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
my $hosts_database={};
my $resolver=Net::DNS::Resolver->new;
my $ldap;
my %cfg_defaults =
(
- "arp" => {
- "arp_activ" => [\$arp_activ, "on"],
- "arp_interface" => [\$arp_interface, "all"],
+ "ArpHandler" => {
+ "enabled" => [\$arp_enabled, "true"],
+ "interface" => [\$arp_interface, "all"],
},
"server" => {
- "ldap_uri" => [\$ldap_uri, ""],
- "ldap_base" => [\$ldap_base, ""],
- "ldap_admin_dn" => [\$ldap_admin_dn, ""],
- "ldap_admin_password" => [\$ldap_admin_password, ""],
+ "ldap-uri" => [\$ldap_uri, ""],
+ "ldap-base" => [\$ldap_base, ""],
+ "ldap-admin-dn" => [\$ldap_admin_dn, ""],
+ "ldap-admin-password" => [\$ldap_admin_password, ""],
},
);
sub get_module_info {
my @info = (undef,
undef,
- undef,
- undef,
- "socket",
);
&read_configfile();
# Don't start if some of the modules are missing
- if(($arp_activ eq 'on') && $start_service) {
- $ldap = Net::LDAP->new($ldap_uri);
- if (!$ldap) {
- &main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);
+ if(($arp_enabled eq 'true') && $start_service) {
+ 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);
+ }
+ }
+ if(defined($ldap_uri) && length($ldap_uri)>0) {
+ $ldap = Net::LDAP->new($ldap_uri);
+ if (!$ldap) {
+ &main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);
+ } else {
+ $ldap->bind($ldap_admin_dn, password => $ldap_admin_password);
+ }
} else {
- $ldap->bind($ldap_admin_dn, password => $ldap_admin_password);
+ $ldap=undef;
}
# When interface is not configured (or 'all'), start arpwatch on all possible interfaces
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);
}
}
$hosts_database->{$packet->{source_haddr}}->{dnsname}=$dnsname;
- &main::daemon_log("Host was found in LDAP as ".$ldap_result->{dn}, 6);
+ &main::daemon_log("Host was found in LDAP as ".$ldap_result->{dn}, 8);
} else {
$hosts_database->{$packet->{source_haddr}}={
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});
- # TODO add mac vendor as description
+ $hosts_database->{$packet->{source_haddr}}->{ipHostNumber},
+ 'interface',
+ $hosts_database->{$packet->{source_haddr}}->{macVendor});
}
$hosts_database->{$packet->{source_haddr}}->{device}= $capture_device;
} else {
);
}
- &main::daemon_log("Host already in cache (".($hosts_database->{$packet->{source_haddr}}->{device})."->".($hosts_database->{$packet->{source_haddr}}->{dnsname}).")",6);
+ &main::daemon_log("Host already in cache (".($hosts_database->{$packet->{source_haddr}}->{device})."->".($hosts_database->{$packet->{source_haddr}}->{dnsname}).")",8);
}
}
my $mac=shift;
my $result={};
- my $ldap_result= &search_ldap_entry(
- $ldap,
- $ldap_base,
- "(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))"
- );
-
- if(defined($ldap_result) && $ldap_result->count==1) {
- if(exists($ldap_result->{entries}[0]) &&
- exists($ldap_result->{entries}[0]->{asn}->{objectName}) &&
- exists($ldap_result->{entries}[0]->{asn}->{attributes})) {
-
- for my $attribute(@{$ldap_result->{entries}[0]->{asn}->{attributes}}) {
- if($attribute->{type} eq 'cn') {
- $result->{cn} = $attribute->{vals}[0];
- }
- if($attribute->{type} eq 'macAddress') {
- $result->{macAddress} = $attribute->{vals}[0];
- }
- if($attribute->{type} eq 'dhcpHWAddress') {
- $result->{dhcpHWAddress} = $attribute->{vals}[0];
- }
- if($attribute->{type} eq 'ipHostNumber') {
- $result->{ipHostNumber} = $attribute->{vals}[0];
+ if(defined($ldap)) {
+ my $ldap_result= &search_ldap_entry(
+ $ldap,
+ $ldap_base,
+ "(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))"
+ );
+
+ if(defined($ldap_result) && $ldap_result->count==1) {
+ if(exists($ldap_result->{entries}[0]) &&
+ exists($ldap_result->{entries}[0]->{asn}->{objectName}) &&
+ exists($ldap_result->{entries}[0]->{asn}->{attributes})) {
+
+ for my $attribute(@{$ldap_result->{entries}[0]->{asn}->{attributes}}) {
+ if($attribute->{type} eq 'cn') {
+ $result->{cn} = $attribute->{vals}[0];
+ }
+ if($attribute->{type} eq 'macAddress') {
+ $result->{macAddress} = $attribute->{vals}[0];
+ }
+ if($attribute->{type} eq 'dhcpHWAddress') {
+ $result->{dhcpHWAddress} = $attribute->{vals}[0];
+ }
+ if($attribute->{type} eq 'ipHostNumber') {
+ $result->{ipHostNumber} = $attribute->{vals}[0];
+ }
}
}
+ $result->{dn} = $ldap_result->{entries}[0]->{asn}->{objectName};
}
- $result->{dn} = $ldap_result->{entries}[0]->{asn}->{objectName};
}
return $result;
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
# SEE ALSO: n/a/bin
#===============================================================================
sub add_ldap_entry {
- my ($ldap_tree, $ldap_base, $mac, $gotoSysStatus, $ip, $interface, $desc) = @_;
- my $dn = "cn=".$hosts_database->{$mac}->{cn}.",ou=incoming,$ldap_base";
- my $s_res = &search_ldap_entry($ldap_tree, $ldap_base, "(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))");
- my $c_res = (defined($s_res))?$s_res->count:0;
- if($c_res == 1) {
- &main::daemon_log("WARNING: macAddress $mac already in LDAP", 1);
- return;
- } elsif($c_res > 0) {
- &main::daemon_log("ERROR: macAddress $mac exists $c_res times in LDAP", 1);
- return;
- }
-
- # create LDAP entry
- my $entry = Net::LDAP::Entry->new( $dn );
- $entry->dn($dn);
- $entry->add("objectClass" => "goHard");
- $entry->add("cn" => $hosts_database->{$mac}->{cn});
- $entry->add("macAddress" => $mac);
- if(defined $gotoSysStatus) {$entry->add("gotoSysStatus" => $gotoSysStatus)}
- if(defined $ip) {$entry->add("ipHostNumber" => $ip) }
- #if(defined $interface) { }
- if(defined $desc) {$entry->add("description" => $desc) }
-
- # submit entry to LDAP
- my $result = $entry->update ($ldap_tree);
-
- # for $result->code constants please look at Net::LDAP::Constant
- if($result->code == 68) { # entry already exists
- &main::daemon_log("WARNING: $dn ".$result->error, 3);
- } elsif($result->code == 0) { # everything went fine
- &main::daemon_log("add entry $dn to ldap", 1);
- } else { # if any other error occur
- &main::daemon_log("ERROR: $dn, ".$result->code.", ".$result->error, 1);
- }
- return;
+ my ($ldap_tree, $ldap_base, $mac, $gotoSysStatus, $ip, $interface, $desc) = @_;
+ if(defined($ldap_tree)) {
+ my $dn = "cn=".$hosts_database->{$mac}->{cn}.",ou=incoming,$ldap_base";
+ my $s_res = &search_ldap_entry($ldap_tree, $ldap_base, "(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))");
+ my $c_res = (defined($s_res))?$s_res->count:0;
+ if($c_res == 1) {
+ &main::daemon_log("WARNING: macAddress $mac already in LDAP", 1);
+ return;
+ } elsif($c_res > 0) {
+ &main::daemon_log("ERROR: macAddress $mac exists $c_res times in LDAP", 1);
+ return;
+ }
+
+ # create LDAP entry
+ my $entry = Net::LDAP::Entry->new( $dn );
+ $entry->dn($dn);
+ $entry->add("objectClass" => "goHard");
+ $entry->add("cn" => $hosts_database->{$mac}->{cn});
+ $entry->add("macAddress" => $mac);
+ if(defined $gotoSysStatus) {$entry->add("gotoSysStatus" => $gotoSysStatus)}
+ if(defined $ip) {$entry->add("ipHostNumber" => $ip) }
+ #if(defined $interface) { }
+ if(defined $desc) {$entry->add("description" => $desc) }
+
+ # submit entry to LDAP
+ my $result = $entry->update ($ldap_tree);
+
+ # for $result->code constants please look at Net::LDAP::Constant
+ if($result->code == 68) { # entry already exists
+ &main::daemon_log("WARNING: $dn ".$result->error, 3);
+ } elsif($result->code == 0) { # everything went fine
+ &main::daemon_log("add entry $dn to ldap", 1);
+ } else { # if any other error occur
+ &main::daemon_log("ERROR: $dn, ".$result->code.", ".$result->error, 1);
+ }
+ } else {
+ &main::daemon_log("Not adding new Entry: LDAP disabled", 6);
+ }
+ return;
}
# SEE ALSO: n/a
#===============================================================================
sub change_ldap_entry {
- 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 = (defined $s_res)?$s_res->count:0;
- if($c_res == 0) {
- &main::daemon_log("WARNING: macAddress $mac not in LDAP", 1);
- return;
- } elsif($c_res > 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 $replace = {
- 'gotoSysStatus' => $gotoSysStatus,
- };
- if (defined($ip)) {
- $replace->{'ip'} = $ip;
+ my ($ldap_tree, $ldap_base, $mac, $gotoSysStatus, $ip) = @_;
+
+ if(defined($ldap_tree)) {
+ # 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 = (defined $s_res)?$s_res->count:0;
+ if($c_res == 0) {
+ &main::daemon_log("WARNING: macAddress $mac not in LDAP", 1);
+ return;
+ } elsif($c_res > 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 $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
+ if($result->code == 32) { # entry doesnt exists
+ &add_ldap_entry($mac, $gotoSysStatus);
+ } elsif($result->code == 0) { # everything went fine
+ &main::daemon_log("entry $dn changed successful", 1);
+ } else { # if any other error occur
+ &main::daemon_log("ERROR: $dn, ".$result->code.", ".$result->error, 1);
+ }
+ } else {
+ &main::daemon_log("Not changing Entry: LDAP disabled", 6);
}
- my $result = $ldap->modify( $dn, replace => $replace );
-
- # for $result->code constants please look at Net::LDAP::Constant
- if($result->code == 32) { # entry doesnt exists
- &add_ldap_entry($mac, $gotoSysStatus);
- } elsif($result->code == 0) { # everything went fine
- &main::daemon_log("entry $dn changed successful", 1);
- } else { # if any other error occur
- &main::daemon_log("ERROR: $dn, ".$result->code.", ".$result->error, 1);
- }
-
- return;
+
+ return;
}
#=== FUNCTION ================================================================