X-Git-Url: http://git.rot13.org/?p=virtual-ldap;a=blobdiff_plain;f=bin%2Fldap-roundcube.pl;fp=bin%2Fldap-roundcube.pl;h=4af6f4f3cfcb0d0da6146d9e34aaa103e3247336;hp=b6f726f15aa6b9d0d948803aa39a38e86ad0de85;hb=04e2d78c1addc2ba3d2aae4b00c5b6eb26e2203c;hpb=c4162f5ca58f69071273ce5d37eb0ff288534320

diff --git a/bin/ldap-roundcube.pl b/bin/ldap-roundcube.pl
index b6f726f..4af6f4f 100755
--- a/bin/ldap-roundcube.pl
+++ b/bin/ldap-roundcube.pl
@@ -90,7 +90,7 @@ sub handle {
 			warn "server closed connection\n";
 			return 0;
 		}
-		$respdu = log_response($respdu);
+		$respdu = log_response($respdu, $reqpdu);
 		# and send the result to the client
 		print $clientsocket $respdu || return 0;
 	}
@@ -127,9 +127,20 @@ sub log_request {
 }
 
 sub log_response {
-	my $pdu=shift;
+	my ($pdu,$reqpdu)=@_;
 	die "empty pdu" unless $pdu;
 
+	my $search_uid = 0;
+	my $request = $LDAPRequest->decode($reqpdu);
+	if ( exists $request->{searchRequest}->{filter} ) {
+		my $filter = dump($request->{searchRequest}->{filter});
+warn "XXX $filter";
+		if ( $filter =~ m/attributeDesc => "uid"/ ) {
+			warn "got uid search";
+			$search_uid = 1;
+		}
+	}
+
 #	print '-' x 80,"\n";
 #	print "Response ASN 1:\n";
 #	Convert::ASN1::asn_hexdump(\*STDOUT,$pdu);
@@ -147,6 +158,7 @@ sub log_response {
 				foreach my $i ( 0 .. $#{ $attr->{vals} } ) {
 					$attr->{vals}->[$i] = "$1-$2-$3" if $attr->{vals}->[$i] =~ m/^([12]\d\d\d)([01]\d+)([0123]\d+)$/;
 				}
+=for disable
 			} elsif ( $attr->{type} eq 'hrEduPersonUniqueNumber' ) {
 				foreach my $val ( @{ $attr->{vals} } ) {
 					next if $val !~ m{.+:.+};
@@ -179,6 +191,27 @@ sub log_response {
 				foreach my $i ( 0 .. $#emails ) {
 					push @attrs, { type => $attr->{type} . '_' . ( $i + 1 ) , vals => [ $emails[$i] ] };
 				}
+=cut
+			} 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;
+					}
+				}
+				if ( $search_uid ) {	# only for new_user_identity plugin which does uid search
+					$attr->{vals} = [ grep { m/\@ffzg/ } @emails ];	# remote all emails not @ffzg.hr @ffzg.unizg.hr
+				}
+			} elsif ( $attr->{type} eq 'facsimileTelephoneNumber' ) {
+				my @fax;
+				foreach my $i ( 0 .. $#{ $attr->{vals} } ) {
+					my $e = $attr->{vals}->[$i];
+					push @fax, $e;
+				}
+				$attr->{vals} = [ grep { ! m/\Q+385 xx xxxx xxx\E/ } @fax ];
 			}
 		}
 
@@ -186,6 +219,7 @@ sub log_response {
 
 		push @{ $response->{protocolOp}->{searchResEntry}->{attributes} }, $_ foreach @attrs;
 
+=for removed
 		my @additional_yamls = ( $uid );
 		foreach my $attr ( @{ $response->{protocolOp}->{searchResEntry}->{attributes} } ) {
 			foreach my $v ( @{ $attr->{vals} } ) {
@@ -212,6 +246,7 @@ sub log_response {
 				};
 			}
 		}
+=cut
 
 		$pdu = $LDAPResponse->encode($response);
 	}