X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=search.cgi;h=fade2a7d6c487334c38922dfaec332f8cc6f6fa8;hp=3c21fb7402eef82f4b8d0191b803aad648adba09;hb=5cea731d1b6f9504bd695fd2f201761c35f71a2c;hpb=e6df6b1b8d41c41c712173d0d3ff4cda5f9fa315 diff --git a/search.cgi b/search.cgi index 3c21fb7..fade2a7 100755 --- a/search.cgi +++ b/search.cgi @@ -1,6 +1,9 @@ #!/usr/bin/perl -# (c) 1999 Debian and Randolph Chung. Licensed under the GPL. +# $Id: search.cgi,v 1.14 2006/12/22 08:58:50 rmurray Exp $ +# (c) 1999 Randolph Chung. Licensed under the GPL. +# (c) 2004 Martin Schulze. Licensed under the GPL. +# (c) 2006 Ryan Murray. Licensed under the GPL. use lib '.'; use strict vars; @@ -8,17 +11,17 @@ use strict vars; use CGI; use Util; use URI::Escape; -use Net::LDAP qw(:all); +use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR); # Global settings... my %config = &Util::ReadConfigFile; my $query = new CGI; -my $id = $query->param('id'); +my $id = uri_escape($query->param('id')); my $authtoken = $query->param('authtoken'); my $password = &Util::CheckAuthToken($authtoken); -my $dosearch = $query->param('dosearch'); -my $searchdn = $query->param('searchdn'); +my $dosearch = uri_escape($query->param('dosearch')); +my $searchdn = uri_escape($query->param('searchdn')); my $ldap = undef; my $proto = ($ENV{HTTPS} ? "https" : "http"); @@ -27,11 +30,11 @@ sub DieHandler { $ldap->unbind if (defined($ldap)); } -$SIG{__DIE__} = \&DieHandler; +#$SIG{__DIE__} = \&DieHandler; if (!$dosearch) { # No action yet, send back the search form... - print "Content-type: text/html\n\n"; + &Util::HTMLSendHeader; open (F, "<$config{websearchhtml}") || &Util::HTMLError($!); while () { s/~id~/$id/g; @@ -58,7 +61,7 @@ if (!$dosearch) { # go through %searchdata and pull out all the search criteria the user # specified... - my $filter = undef; + my $filter = "(objectclass=inetOrgPerson)"; foreach (keys(%searchdata)) { if ($query->param($searchdata{$_}{formname})) { if ($query->param($searchdata{$_}{fuzzy})) { @@ -70,8 +73,8 @@ if (!$dosearch) { } } - # Vacation is a special case - $filter .= "(onvacation=*)" if ($query->param('vacation')); + # Vacation is a special case, support it only when user is authenticated + $filter .= "(onvacation=*)" if ($query->param('vacation') && $authtoken && $id); # AND all the search terms together $filter = "(&$filter)"; @@ -81,6 +84,7 @@ if (!$dosearch) { # Now, we are ready to connect to the LDAP server. $ldap = Net::LDAP->new($config{ldaphost}) || &Util::HTMLError($!); + &Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False'; my $auth = 0; my $mesg; @@ -112,16 +116,25 @@ if (!$dosearch) { # Format the output.... foreach $dn (sort {$entries->{$a}->{sn}->[0] <=> $entries->{$b}->{sn}->[0]} keys(%$entries)) { - $data = $entries->{$dn}; - + my $ok = 0; # These are local variables.. i have enough global vars as it is... - my ($ufdn, $login, $name, $email, $fingerprint, $address, $latlong, $vacation, $created, $modified) = undef; + my ($ufdn, $login, $name, $icquin, $jabberjid, $email, $fingerprint, + $address, $latlong, $vacation, $created, $modified, $lastseen, $gender) = undef; + + # Last seen information (Echelon) + $lastseen = &Util::FormatLastSeen($entries->{$dn}->{"activity-pgp"}->[0], + $entries->{$dn}->{"activity-from"}->[0]); + + $data = $entries->{$dn}; + for my $key (keys %{$data}) { + @{$data->{$key}} = map { CGI::escapeHTML($_); } @{$data->{$key}}; + } $ufdn = $dn; # Net::LDAP does not have a dn2ufn function, but this is close enough :) # Assemble name, attach web page link if present. $name = $data->{cn}->[0]." ".$data->{mn}->[0]." ".$data->{sn}->[0]; - if (my $url = $data->{labeledurl}->[0]) { + if (my $url = $data->{labeleduri}->[0]) { $name = "$name"; } @@ -131,6 +144,11 @@ if (!$dosearch) { $email .= "$_"; } + # ICQ + if ($data->{icquin}->[0]) { + $icquin = sprintf("%s", $data->{icquin}->[0], $data->{icquin}->[0]); + } + # Format PGP/GPG key fingerprints my $fi; foreach (@{$data->{keyfingerprint}}) { @@ -148,19 +166,32 @@ if (!$dosearch) { $latlong .= " / "; $latlong .= $data->{longitude}->[0] || "none"; + # Gender + if ($data->{gender}->[0]) { + if ($data->{gender}->[0] == 1) { + $gender = $dataspecref->{male}; + } elsif ($data->{gender}->[0] == 2) { + $gender = $dataspecref->{female}; + } else { + $gender = $dataspecref->{unspecified}; + } + } else { + $gender = $dataspecref->{unspecified}; + } + # Modified/created time. TODO: maybe add is the name of the creator/modifier $modified = &Util::FormatTimestamp($data->{modifytimestamp}->[0]); $created = &Util::FormatTimestamp($data->{createtimestamp}->[0]); # Link in the debian login id - $login = $data->{uid}->[0]."\@debian.org"; - $login = "$login"; + $login = $data->{uid}->[0]; + $login = "$login"; - # See if the user has a vacation message - $vacation = $data->{onvacation}->[0]; + # See if the user has a vacation message, non-public + $vacation = $data->{onvacation}->[0] if ($authtoken && $id); # OK, now generate output... (i.e. put the output into the buffer ) - $outsub{searchresults} .= ''; + $outsub{searchresults} .= '
'; $outsub{searchresults} .= '\n"; @@ -169,28 +200,43 @@ if (!$dosearch) { } $outsub{searchresults} .= FormatEntry($dataspecref->{uid}, $login); - $outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]); + $outsub{searchresults} .= FormatEntry($dataspecref->{gender}, $gender); + if ($data->{ircnick}->[0]) { + $outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]); + } + if ($data->{jabberjid}->[0]) { + $outsub{searchresults} .= FormatEntry($dataspecref->{jabberjid}, $data->{jabberjid}->[0]); + } + if ($icquin) { + $outsub{searchresults} .= FormatEntry($dataspecref->{icquin}, $icquin); + } $outsub{searchresults} .= FormatEntry($dataspecref->{loginshell}, $data->{loginshell}->[0]); $outsub{searchresults} .= FormatEntry($dataspecref->{fingerprint}, $fingerprint); - + if ($data->{maildisablemessage}->[0]) { + $outsub{searchresults} .= FormatEntry($dataspecref->{maildisablemessage}, $data->{maildisablemessage}->[0]); + } + if ($auth) { # Some data should only be available to authorized users... if ($id eq $data->{uid}->[0]) { $outsub{searchresults} .= FormatEntry($dataspecref->{email}, $email); } + $outsub{searchresults} .= FormatEntry($dataspecref->{birthdate}, $data->{birthdate}->[0]); $outsub{searchresults} .= FormatEntry($dataspecref->{address}, $address); $outsub{searchresults} .= FormatEntry($dataspecref->{latlong}, $latlong); $outsub{searchresults} .= FormatEntry($dataspecref->{phone}, $data->{telephonenumber}->[0] || "- unlisted -"); $outsub{searchresults} .= FormatEntry($dataspecref->{fax}, $data->{fascimiletelephonenumber}->[0] || "- unlisted -"); + $outsub{searchresults} .= FormatEntry($dataspecref->{VoIP}, $data->{voip}->[0] || "- unlisted -"); + $outsub{searchresults} .= FormatEntry($dataspecref->{lastseen}, $lastseen); +# $outsub{searchresults} .= FormatEntry($dataspecref->{created}, $created); +# $outsub{searchresults} .= FormatEntry($dataspecref->{modified}, $modified); } - $outsub{searchresults} .= FormatEntry($dataspecref->{created}, $created); - $outsub{searchresults} .= FormatEntry($dataspecref->{modified}, $modified); $outsub{searchresults} .= "
'."$name "; $outsub{searchresults} .= "($ufdn)
"; # If this is ourselves, present a link to do mods if ($auth && ($id eq $data->{uid}->[0])) { #TODO: extract this string into a url for translation... - $outsub{searchresults} .= "Edit my settings\n"; + $outsub{searchresults} .= "Edit my settings\n"; } $outsub{searchresults} .= "


\n"; @@ -253,3 +299,5 @@ sub FormatEntry { return "$key: $val\n"; } + +exit 0;