X-Git-Url: http://git.rot13.org/?p=virtual-ldap;a=blobdiff_plain;f=bin%2Fldap-rewrite.pl;h=23e790bc68e6e9c5680166e6a0a8b3cf82a6b80a;hp=b3080f8579346ac58256da476f20d950bb108293;hb=af2a6460d3477b48c96ed89d4eb7805fba0663e9;hpb=d853814798e48e8675853eb45176472cbcd2c51b

diff --git a/bin/ldap-rewrite.pl b/bin/ldap-rewrite.pl
index b3080f8..23e790b 100755
--- a/bin/ldap-rewrite.pl
+++ b/bin/ldap-rewrite.pl
@@ -9,6 +9,7 @@ use warnings;
 
 use IO::Select;
 use IO::Socket;
+use IO::Socket::SSL;
 use warnings;
 use Data::Dump qw/dump/;
 use Convert::ASN1 qw(asn_read);
@@ -17,6 +18,21 @@ our $VERSION = '0.2';
 use fields qw(socket target);
 use YAML qw/LoadFile/;
 
+my $config = {
+	yaml_dir => './yaml/',
+	listen => 'localhost:1389',
+	upstream_ldap => 'ldap.ffzg.hr',
+	upstream_ssl => 1,
+	overlay_prefix => 'ffzg-',
+
+};
+
+if ( ! -d $config->{yaml_dir} ) {
+	warn "DISABLE ", $config->{yaml_dir}," data overlay";
+}
+
+warn "# config = ",dump( $config );
+
 sub handle {
  	my $clientsocket=shift;
 	my $serversocket=shift;
@@ -68,15 +84,23 @@ sub log_response {
 		my $uid = $response->{protocolOp}->{searchResEntry}->{objectName};
 		warn "## SEARCH $uid";
 
-if(0) {
+		my @attrs;
+
 		map {
-			if ( $_->{type} eq 'postalAddress' ) {
-				$_->{vals} = [ 'foobar' ];
+			if ( $_->{type} eq 'hrEduPersonUniqueNumber' ) {
+				foreach my $val ( @{ $_->{vals} } ) {
+					next if $val !~ m{.+:.+};
+					my ( $n, $v ) = split(/\s*:\s*/, $val );
+					push @attrs, { type => $_->{type} . '_' . $n, vals => [ $v ] };
+				}
 			}
 		} @{ $response->{protocolOp}->{searchResEntry}->{attributes} };
-}
 
-		my $path = "yaml/$uid.yaml";
+		warn "# ++ attrs ",dump( @attrs );
+
+		push @{ $response->{protocolOp}->{searchResEntry}->{attributes} }, $_ foreach @attrs;
+
+		my $path = $config->{yaml_dir} . "$uid.yaml";
 		if ( -e $path ) {
 			my $data = LoadFile($path);
 			warn "# yaml = ",dump($data);
@@ -84,12 +108,11 @@ if(0) {
 			foreach my $type ( keys %$data ) {
 
 				my $vals = $data->{$type};
-				$vals =~ s{#\s*$}{};
-				
-				my @vals = split(/\s*#\s*/, $vals);
 
-				push @{ $response->{protocolOp}->{searchResEntry}->{attributes} },
-					{ type => "ffzg-$type", vals => [ @vals ] };
+				push @{ $response->{protocolOp}->{searchResEntry}->{attributes} }, {
+					type => $config->{overlay_prefix} . $type,
+					vals => ref($vals) eq 'ARRAY' ? $vals : [ $vals ],
+				};
 			}
 		}
 
@@ -130,19 +153,24 @@ sub run_proxy {
 }
 
 
+$ENV{LANG} = 'C'; # so we don't double-encode utf-8 if LANG is utf-8
+
 my $listenersock = IO::Socket::INET->new(
 	Listen => 5,
 	Proto => 'tcp',
 	Reuse => 1,
-	LocalPort => 1389
+	LocalAddr => $config->{listen},
 );
 
 
-my $targetsock = new IO::Socket::INET (
-	Proto => 'tcp',
-	PeerAddr => 'ldap.ffzg.hr',
-	PeerPort => 389,
-);
+my $targetsock = $config->{upstream_ssl}
+	? IO::Socket::INET->new(
+		Proto => 'tcp',
+		PeerAddr => $config->{upstream_ldap},
+		PeerPort => 389,
+	)
+	: IO::Socket::SSL->new( $config->{upstream_ldap} . ':ldaps')
+	;
 
 run_proxy($listenersock,$targetsock);