#!/usr/bin/perl
-# $Id: ud-fingerserv,v 1.13 1999/11/29 02:44:53 tausq Exp $
+# $Id: ud-fingerserv,v 1.19 2004/11/18 19:10:57 joey Exp $
# (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
+# (c) 2004 Martin Schulze. Licensed under the GPL. <joey@debian.org>
+# Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
use lib '/var/www/userdir-ldap/';
#use lib '/home/randolph/projects/userdir-ldap/web';
use POSIX qw(:sys_wait_h);
use Getopt::Std;
use Util;
-use Net::LDAP qw(:all);
+use Net::LDAP;
# Global settings...
my %config = &Util::ReadConfigFile;
my %opts;
-getopts("iqhv", \%opts);
+getopts("fiqhvl:", \%opts);
my $use_inetd = $config{use_inetd} || $opts{i};
$| = 1;
'keyfingerprint' => 'Fingerprint',
'key' => 'Key block',
'ircnick' => 'IRC nickname',
- 'labeledurl' => 'URL'
+ 'icquin' => 'ICQ UIN',
+ 'jabberjid' => 'Jabber ID',
+ 'labeleduri' => 'URL'
);
-my @summarykeys = ('cn', 'mn', 'sn', 'email', 'labeledurl', 'ircnick', 'keyfingerprint', 'key');
+my @summarykeys = ('cn', 'mn', 'sn', 'email', 'labeleduri', 'ircnick', 'icquin', 'jabberjid', 'keyfingerprint', 'key');
$SIG{__DIE__} = \&DieHandler;
$SIG{INT} = \&DieHandler;
$SIG{CHLD} = \&Reaper;
&help if (defined($opts{h}));
-#my $logfh = STDOUT; #TODO
+
+my $logfh;
+unless ($opts{i} || $opts{f}) {
+ die "Need logfile unless running foreground\n" unless (defined($opts{l}));
+ open ($logfh, $opts{l}) or die "Can't open logfile: $!\n";
+} else {
+ $logfh = \*STDOUT;
+}
&log("Binding to LDAP server at $config{ldaphost}") if (defined($opts{v}));
my $ldap = Net::LDAP->new($config{ldaphost}) || die $1;
$ldap->bind;
if (!$use_inetd) {
+
+ unless ($opts{f}) {
+ use POSIX 'setsid';
+ chdir '/' or die "Can't chdir to /: $!";
+ open STDIN, '/dev/null' or die "Can't read /dev/null: $!";
+ open STDOUT, '>/dev/null' or die "Can't write to /dev/null: $!";
+ my $pid;
+ defined($pid = fork) or die "Can't fork: $!";
+ exit if $pid;
+ setsid or die "Can't start a new session: $!";
+ defined($pid = fork) or die "Can't fork: $!";
+ exit if $pid;
+ open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+ }
+
&log("Binding to port 79") if (defined($opts{v}));
my $server = IO::Socket::INET->new(Proto => 'tcp',
LocalPort => 'finger(79)',
Listen => SOMAXCONN,
Reuse => 1);
- die "Cannot listen on finger port" unless $server;
+ mydie("Cannot listen on finger port") unless $server;
&log("[Server listening for connections]");
my ($pid, $client, $hostinfo);
while ($client = $server->accept()) {
&log("Forking to handle client request") if (defined($opts{v}));
next if $pid = fork; # parent
- die "fork: $!" unless defined $pid;
+ mydie("fork: $!") unless defined $pid;
# child
$client->autoflush(1);
my $hostinfo = gethostbyaddr($client->peeraddr, AF_INET);
&log(sprintf("[Connect from %s]", $hostinfo || $client->peerhost));
my $query = &readdata($client);
- &ProcessQuery($client, $query);
+ &ProcessQuery($client, $query) if (defined($query));
$client->close;
exit;
} continue {
} else { # inetd
&log("inetd mode");
my $sockaddr = getpeername(STDIN);
- my ($port, $addr) = unpack_sockaddr_in(getpeername(STDIN));
- &log(sprintf("[Connect from %s (%s)]", gethostbyaddr($addr, AF_INET), inet_ntoa($addr)));
+ if ($sockaddr) {
+ my ($port, $addr) = unpack_sockaddr_in(getpeername(STDIN));
+ &log(sprintf("[Connect from %s (%s)]", gethostbyaddr($addr, AF_INET), inet_ntoa($addr)));
+ } else {
+ &log("[Connect via terminal]");
+ }
my $query = &readdata(\*STDIN);
- &ProcessQuery(\*STDOUT, $query);
+ &ProcessQuery(\*STDOUT, $query) if (defined($query));
exit;
}
&log("Looking up $uid at $config{basedn}, uid=$uid");
$mesg = $ldap->search(base => $config{basedn}, filter => "uid=$uid");
- $mesg->code && die $mesg->error;
+ $mesg->code && mydie $mesg->error;
$entries = $mesg->as_struct;
if ($mesg->count == 0) {
foreach $dn (sort {$entries->{$a}->{sn}->[0] <=> $entries->{$b}->{sn}->[0]} keys(%$entries)) {
$data = $entries->{$dn};
- $data->{key} = [];
- foreach (@{$data->{keyfingerprint}}) {
- push (@{$data->{key}}, "\n".&Util::FetchKey($_));
- }
-
$data->{email}->[0] = sprintf("%s %s %s <%s>", $data->{cn}->[0],
$data->{mn}->[0], $data->{sn}->[0],
$data->{uid}->[0]."\@$config{emailappend}");
$data->{email}->[0] =~ s/\s+/ /g;
+ my @keyfingerprint = ();
+ for (my $i=0; $i <= $#{$data->{'keyfingerprint'}}; $i++) {
+ push (@keyfingerprint, $data->{keyfingerprint}->[$i]);
+ $data->{keyfingerprint}->[$i] = &Util::FormatFingerPrint($data->{keyfingerprint}->[$i]);
+ $data->{keyfingerprint}->[$i] =~ s, , ,;
+ }
print $client "$dn\n";
if (!$fields) {
+ push (@{$data->{key}}, sprintf ("finger %s/key\@db.debian.org", $uid));
foreach $key (@summarykeys) {
foreach (@{$data->{$key}}) {
print $client "$attrs{$key}: ";
} else {
# print "$fields\n";
foreach $key (split(/,/, $fields)) {
+ if ($key eq 'key') {
+ foreach (@keyfingerprint) {
+ push (@{$data->{key}}, "\n".&Util::FetchKey($_), 0);
+ }
+ }
foreach (@{$data->{$key}}) {
print $client "$attrs{$key}: ";
print $client "$_\n";
}
sub help {
- print "fingerserv [-i | -q | -v | -h]\n";
+ print "fingerserv [-f | -l | -i | -q | -v | -h]\n";
+ print "-f = foreground; do not detach from tty\n";
print "-i = inetd mode; otherwise runs standalone\n";
print "-q = quiet mode; no output\n";
print "-v = verbose mode\n";
print "-h = this help message\n";
+ print "-l = log file. Necessary if not using -f or -i\n";
exit 0;
}
return if (defined($opts{q}));
my $time = localtime;
- print STDERR "$time $msg\n";
+ print $logfh "$time $msg\n";
+}
+
+sub mydie {
+ my $msg = shift;
+ log($msg);
+ exit 1;
}
sub readdata {
my $in = undef;
my $out = undef;
my $bytesread = 0;
+ my $ret;
my $flags= fcntl($fh, F_GETFL, 0)
- or die "Can't get flags for socket: $!\n";
+ or mydie "Can't get flags for socket: $!\n";
fcntl($fh, F_SETFL, $flags | O_NONBLOCK)
- or die "Can't make socket nonblocking: $!\n";
+ or mydie "Can't make socket nonblocking: $!\n";
while (($bytesread < 1024) && ($out !~ /\n/)) {
- $bytesread += sysread($fh, $in, 1024);
+ $ret = sysread($fh, $in, 1024);
+ return undef if (!defined($ret) || ($ret == 0));
+ $bytesread += $ret;
$out .= $in;
}
projects / mirror / userdir-ldap.git / blobdiff