empty search response for jpegphoto without upstream ldap

[virtual-ldap] / bin / ldap-rewrite.pl

diff --git a/bin/ldap-rewrite.pl b/bin/ldap-rewrite.pl
index 6d455bd..b6f726f 100755 (executable)
--- a/bin/ldap-rewrite.pl
+++ b/bin/ldap-rewrite.pl
@@ -24,7 +24,8 @@ our $VERSION = '0.3';
 use fields qw(socket target);
 use YAML qw/LoadFile/;
 
-my $debug = 0;
+my $debug = $ENV{DEBUG} || 0;
+$|=1; # flush STDOUT
 
 my $config = {
        yaml_dir => './yaml/',
@@ -39,6 +40,11 @@ my $config = {
 my $log_fh;
 
 sub log {
+       my $level = $1 if $_[0] =~ m/^(#+)/;
+       return if defined($level) && length($level) > $debug;
+
+       warn join("\n", @_);
+
        return unless $config->{log_file};
 
        if ( ! $log_fh ) {
@@ -50,7 +56,7 @@ sub log {
 }
 
 BEGIN {
-       $SIG{'__WARN__'} = sub { warn @_; main::log(@_); }
+       $SIG{'__WARN__'} = sub { main::log(@_); }
 }
 
 
@@ -67,7 +73,7 @@ sub handle {
        # read from client
        asn_read($clientsocket, my $reqpdu);
        if ( ! $reqpdu ) {
-               warn "client closed connection\n";
+               warn "# client closed connection\n";
                return 0;
        }
        $reqpdu = log_request($reqpdu);
@@ -132,7 +138,7 @@ sub log_response {
 
        if ( defined $response->{protocolOp}->{searchResEntry} ) {
                my $uid = $response->{protocolOp}->{searchResEntry}->{objectName};
-               print "rewrite objectName $uid\n";
+               warn "# rewrite objectName $uid\n";
 
                my @attrs;
 
@@ -151,6 +157,28 @@ sub log_response {
                                foreach my $i ( 0 .. $#{ $attr->{vals} } ) {
                                        $attr->{vals}->[$i] =~ s/^u2010/p2010/gs && warn "FIXME group";
                                }
+                       } elsif ( $attr->{type} eq 'homePostalAddress' ) {
+                               foreach my $val ( @{ $attr->{vals} } ) {
+                                       next if $val !~ m{^(.+)\s*,\s*(\d+)\s+(.+)};
+                                       push @attrs,
+                                               { type => 'homePostalAddress_address', vals => [ $1 ] },
+                                               { type => 'homePostalAddress_zipcode', vals => [ $2 ] },
+                                               { type => 'homePostalAddress_city', vals => [ $3 ] };
+                               }
+                       } elsif ( $attr->{type} eq 'mail' ) {
+                               my @emails;
+                               foreach my $i ( 0 .. $#{ $attr->{vals} } ) {
+                                       my $e = $attr->{vals}->[$i];
+                                       if ( $e =~ m/\s+/ ) {
+                                               push @emails, split(/\s+/, $e);
+                                       } else {
+                                               push @emails, $e;
+                                       }
+                               }
+                               $attr->{vals} = [ shift @emails ];
+                               foreach my $i ( 0 .. $#emails ) {
+                                       push @attrs, { type => $attr->{type} . '_' . ( $i + 1 ) , vals => [ $emails[$i] ] };
+                               }
                        }
                }