use strict;
use warnings;
-use Data::Dump qw/dump/;
use lib '../lib';
+
use Net::LDAP::Constant qw(LDAP_SUCCESS);
use Net::LDAP::Server;
use base 'Net::LDAP::Server';
use fields qw();
use DBI;
+use File::Slurp;
+
+use Data::Dump qw/dump/;
# XXX test with:
#
our $user = 'unconfigured-user';
our $passwd = 'unconfigured-password';
-our $max_results = 10; # 100; # FIXME
+our $max_results = 15; # 100; # FIXME
+
+our $objectclass = 'HrEduPerson';
+
+$SIG{__DIE__} = sub {
+ warn "!!! DIE ", @_;
+ die @_;
+};
require 'config.pl' if -e 'config.pl';
my $dbh = DBI->connect($dsn . $database, $user,$passwd, { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr;
-# Net::LDAP::Entry will lc all our attribute names anyway, so
-# we don't really care about correctCapitalization for LDAP
-# attributes which won't pass through DBI
-my $sql_select = q{
- select
- trim(userid) as uid,
- firstname as givenName,
- surname as sn,
- concat(firstname,' ',surname) as cn,
-
- -- SAFEQ specific mappings from UMgr-LDAP.conf
- surname as displayName,
- rfid_sid as pager,
- email as mail,
- categorycode as organizationalUnit,
- borrowernumber as objectGUID,
- concat('/home/',borrowernumber) as homeDirectory
- from borrowers
-};
-
# we need reverse LDAP -> SQL mapping for where clause
+
my $ldap_sql_mapping = {
'uid' => 'userid',
'objectGUID' => 'borrowernumber',
'pager' => 'rfid_sid',
};
-# attributes which are same for whole set, but somehow
-# LDAP clients are sending they anyway and we don't
-# have them in database
-my $ldap_ignore = {
- 'objectclass' => 1,
-};
-
sub __sql_column {
my $name = shift;
$ldap_sql_mapping->{$name} || $name;
sub __ldap_search_to_sql {
my ( $how, $what ) = @_;
- warn "### how $how\n";
+ warn "### __ldap_search_to_sql $how ",dump( $what ),"\n";
if ( $how eq 'equalityMatch' && defined $what ) {
my $name = $what->{attributeDesc} || warn "ERROR: no attributeDesc?";
my $value = $what->{assertionValue} || warn "ERROR: no assertionValue?";
- if ( ! $ldap_ignore->{ $name } ) {
+
+ if ( lc $name eq 'objectclass' ) {
+ $objectclass = $value;
+ } else {
push @limits, __sql_column($name) . ' = ?';
push @values, $value;
}
push @limits, "$name IS NOT NULL and length($name) > 1";
## XXX length(foo) > 1 to avoid empty " " strings
} else {
- warn "UNSUPPORTED: how $how what ",dump( $what );
+ warn "UNSUPPORTED: $how ",dump( $what );
}
}
+
+# my ( $dn,$attributes ) = _dn_attributes( $row, $base );
+
+sub _dn_attributes {
+ my ($row,$base) = @_;
+
+ warn "## row = ",dump( $row );
+
+ die "no objectClass column in ",dump( $row ) unless defined $row->{objectClass};
+
+ $row->{objectClass} = [ split(/\s+/, $row->{objectClass}) ] if $row->{objectClass} =~ m{\n};
+
+ warn "## row = ",dump( $row );
+
+ my $dn = delete( $row->{dn} ) || die "no dn in ",dump( $row );
+
+ # this does some sanity cleanup for our data
+ my $base_as_domain = $base;
+ $base_as_domain =~ s{dn=}{.};
+ $base_as_domain =~ s{^\.}{@};
+ $dn =~ s{$base_as_domain$}{};
+
+ $dn .= ',' . $base unless $dn =~ m{,}; # add base if none present
+
+ return ($dn, $row);
+}
+
+
# the search operation
sub search {
my $self = shift;
my $sql_where = '';
@values = ();
- foreach my $join_with ( keys %{ $reqData->{'filter'} } ) {
+ foreach my $filter ( keys %{ $reqData->{'filter'} } ) {
- warn "## join_with $join_with\n";
+ warn "## filter $filter ", dump( $reqData->{'filter'}->{ $filter } ), "\n";
@limits = ();
- if ( ref $reqData->{'filter'}->{ $join_with } ) {
+ if ( ref $reqData->{'filter'}->{ $filter } eq 'ARRAY' ) {
- foreach my $filter ( @{ $reqData->{'filter'}->{ $join_with } } ) {
+ foreach my $filter ( @{ $reqData->{'filter'}->{ $filter } } ) {
warn "### filter ",dump($filter),$/;
foreach my $how ( keys %$filter ) {
if ( $how eq 'or' ) {
}
}
- $sql_where .= ' ' . join( " $join_with ", @limits );
+ $sql_where .= ' ' . join( " $filter ", @limits );
} else {
- __ldap_search_to_sql( $join_with, $reqData->{'filter'}->{$join_with} );
+ __ldap_search_to_sql( $filter, $reqData->{'filter'}->{$filter} );
}
}
$sql_where = " where $sql_where";
}
- warn "# SQL:\n$sql_select $sql_where\n# DATA: ",dump( @values );
+ my $sql_select = read_file( lc "sql/$objectclass.sql" );
+
+ warn "# SQL:\n$sql_select\n", $sql_where ? $sql_where : '-- no where', "\n# DATA: ",dump( @values );
my $sth = $dbh->prepare( $sql_select . $sql_where . " LIMIT $max_results" ); # XXX remove limit?
$sth->execute( @values );
while (my $row = $sth->fetchrow_hashref) {
- warn "## row = ",dump( $row );
-
- my $dn = 'uid=' . $row->{uid} || die "no uid";
- $dn =~ s{[@\.]}{,dc=}g;
- $dn .= ',' . $base unless $dn =~ m{dc}i;
+ my ( $dn, $attributes ) = _dn_attributes( $row, $base );
my $entry = Net::LDAP::Entry->new;
$entry->dn( $dn );
- $entry->add( objectClass => [
- "person",
- "organizationalPerson",
- "inetOrgPerson",
- "hrEduPerson",
- ] );
- $entry->add( %$row );
+ $entry->add( %$attributes );
#$entry->changetype( 'modify' );