X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=update.cgi;h=1a66b753b7932faa7883fadffebb7164c241cccd;hb=7186c5b0dbf23f02d1564637b55c5f45fbb44193;hp=7dd776b5672a43e6548ea2e51367828a90ba8f15;hpb=632ec5349cd7921ebb17a4693a27d36424e64d74;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/update.cgi b/update.cgi
index 7dd776b..1a66b75 100755
--- a/update.cgi
+++ b/update.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: update.cgi,v 1.12 2006/12/22 08:58:50 rmurray Exp $
+# $Id: update.cgi,v 1.13 2006/12/28 02:44:02 rmurray Exp $
 # (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
 # (c) 2006 Ryan Murray. Licensed under the GPL. <rmurray@debian.org>
 
@@ -8,7 +8,10 @@ use lib '.';
 use strict vars;
 #use Apache::Registry;
 use CGI;
+use Data::UUID;
+use Digest::HMAC_SHA1 qw(hmac_sha1_hex);
 use Util;
+use English;
 use URI::Escape;
 use Net::LDAP qw(:all);
 
@@ -29,6 +32,11 @@ if ($proto eq "http" || !($id && $password)) {
 
 my $ldap;
 
+open (F, "<$config{passdir}/key-hmac-$UID") || &Util::HTMLError($!);
+my $hmac_key = <F>;
+close(F);
+chomp($hmac_key);
+
 sub DieHandler {
   $ldap->unbind if (defined($ldap));
 }
@@ -36,6 +44,7 @@ sub DieHandler {
 $SIG{__DIE__} = \&DieHandler;
 
 $ldap = Net::LDAP->new($config{ldaphost});
+&Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False';
 my $auth = 0;
 my $mesg;
 $mesg = $ldap->bind($editdn, password => $password);
@@ -57,7 +66,11 @@ my $entries = $mesg->as_struct;
 if ($mesg->count != 1) {
   # complain and quit
 }
-  
+
+$mesg = $ldap->search(base  => $config{hostbasedn}, filter => 'host=*');
+$mesg->code && &Util::HTMLError($mesg->error);
+my $host_entries = $mesg->as_struct;
+
 my @dns = keys(%$entries);
 my $entry = $entries->{$dns[0]};
 
@@ -80,6 +93,18 @@ if (!($query->param('doupdate'))) {
   $data{staddress} = $entry->{postaladdress}->[0];
   $data{staddress} =~ s/\$/\n/;
   $data{countryname} = &Util::LookupCountry($data{c});
+
+  if ($data{mailgreylisting} eq "TRUE") {
+    $data{mailgreylisting} = " checked";
+  } else {
+    $data{mailgreylisting} = "";
+  }
+
+  if ($data{mailcallout} eq "TRUE") {
+    $data{mailcallout} = " checked";
+  } else {
+    $data{mailcallout} = "";
+  }
   
   $data{email} = join(", ", @{$entry->{emailforward}});  
 
@@ -92,6 +117,39 @@ if (!($query->param('doupdate'))) {
 		   . '>male<option value="2"'
 		   . ($data{gender} == 2 ? ' selected' : '')
                    . '>female</select>';
+  my $confirmstring = '';
+  my $sudopassword = '';
+  for my $entry (@{$entry->{'sudopassword'}}) {
+    my ($uuid, $status, $hosts, $crypted) = ($entry =~ /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}) (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$/);
+    unless (defined $uuid) {
+      $sudopassword .= "<tr><td>Unparseable line!</td></tr>\n";
+      next;
+    }
+    $status =~ s/:.*//; # remove verification hmac, it's just noise here.
+    my $e = "<tr><td>$hosts</td>
+                 <td>$status</td>
+                 <td><small>not shown</small></td>
+                 <!--<td><small><code>$uuid</code></small></td>-->
+                 <td><input name=\"sudopassword-delete-$uuid\" type=\"checkbox\" value=\"delete\"> (delete)</td></tr>\n";
+    $sudopassword .= $e;
+    if ($status eq 'unconfirmed') {
+      my $data = join(':', 'confirm-new-password', $uuid, $hosts, $crypted);
+      my $hmac = hmac_sha1_hex( $data, $hmac_key);
+      $confirmstring .= "confirm sudopassword $uuid $hosts $hmac\n";
+    }
+  };
+  if ($confirmstring ne '') {
+    $confirmstring = "<br>To confirm your new sudo passwords send signed mail to changes\@db.debian.org with a signed body containing these lines:<br><pre>$confirmstring</pre>";
+  }
+
+  my $sudopasswordhosts = '<select name="newsudopass-host"> <option value="*">ALL';
+  for my $dn (sort {$host_entries->{$a}->{host}->[0] cmp $host_entries->{$b}->{host}->[0]} keys(%$host_entries)) {
+      my $data = $host_entries->{$dn};
+      my $host = $data->{'host'}->[0];
+      my $hostname = $data->{'hostname'}->[0];
+      $sudopasswordhosts .= "<option value=\"$hostname\">$host\n";
+  };
+  $sudopasswordhosts .= '</select>';
 
   # finally we can send output...
   my ($sub, $substr);
@@ -100,10 +158,12 @@ if (!($query->param('doupdate'))) {
   while (<F>) {
     s/~(.+?)~/$data{$1}/g;
     s/<\?genderselect>/$genderselect/;
+    s/<\?sudopassword>/$sudopassword/;
+    s/<\?sudopasswordhosts>/$sudopasswordhosts/;
+    s/<\?confirmstring>/$confirmstring/;
     print;
   }
   close F;
-  
 } else {
   # Actually update stuff...
   my ($newpassword, $newstaddress);
@@ -162,7 +222,51 @@ if (!($query->param('doupdate'))) {
   my ($lat, $long);
   ($lat, $long) = &Util::CheckLatLong($query->param('latitude'), 
                                       $query->param('longitude'));
-  
+  my ($greylisting, $callout);
+
+  $greylisting = $query->param('mailgreylisting');
+  if (!$greylisting or $greylisting ne "TRUE") {
+     $greylisting = "FALSE";
+  }
+
+  $callout = $query->param('mailcallout');
+  if (!$callout or $callout ne "TRUE") {
+     $callout = "FALSE";
+  }
+
+  my $newsudo;
+  my $newsudo_hosts;
+  if ($query->param('newsudopass') && $query->param('newsudopassvrfy')) {
+    if ($query->param('newsudopass') ne $query->param('newsudopassvrfy')) {
+      &Util::HTMLError("The sudo passwords you specified do not match. Please go back and try again.");
+    }
+    my $host = $query->param('newsudopass-host');
+    if ($host =~ /[^a-z0-9.-]/ and $host ne '*') {
+      &Util::HTMLError("The sudo host has weird characters '$host'.");
+    }
+    # create a md5 crypted password
+    my $newsudopassword = crypt($query->param('newsudopass'), &Util::CreateCryptSalt(1));
+    my $ug = new Data::UUID;
+    my $uuid = $ug->create_str();
+
+    $newsudo = "$uuid unconfirmed $host $newsudopassword";
+    $newsudo_hosts = $host;
+  }
+
+  my %delete_uuids = map { s/^sudopassword-delete-//; $_ => 1} grep { $query->param($_) eq 'delete' } grep { /^sudopassword-delete-/ } $query->param;
+  my @keepsudo;
+  for my $entry (@{$entry->{'sudopassword'}}) {
+    my ($uuid, $status, $hosts, $crypted) = ($entry =~ /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}) (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$/);
+    next unless defined ($uuid);
+    next if (defined $delete_uuids{$uuid});
+    my %hosts = map { $_ => 1 } split(/,/, $hosts);
+    next if ($hosts{$newsudo_hosts});
+    push @keepsudo, $entry;
+  };
+  if ($newsudo ne '') {
+    push @keepsudo, $newsudo;
+  }
+
   &Util::LDAPUpdate($ldap, $editdn, 'postalAddress', $newstaddress);
   &Util::LDAPUpdate($ldap, $editdn, 'l', $query->param('l'));
   &Util::LDAPUpdate($ldap, $editdn, 'latitude', $lat);
@@ -171,6 +275,7 @@ if (!($query->param('doupdate'))) {
   &Util::LDAPUpdate($ldap, $editdn, 'postalCode', $query->param('postalcode'));
   &Util::LDAPUpdate($ldap, $editdn, 'telephoneNumber', $query->param('telephonenumber'));
   &Util::LDAPUpdate($ldap, $editdn, 'facsimileTelephoneNumber', $query->param('facsimiletelephonenumber'));
+  &Util::LDAPUpdate($ldap, $editdn, 'VoIP', $query->param('VoIP'));
   &Util::LDAPUpdate($ldap, $editdn, 'loginShell', $query->param('loginshell'));
   &Util::LDAPUpdate($ldap, $editdn, 'emailForward', $query->param('email'));
   &Util::LDAPUpdate($ldap, $editdn, 'privateSub', $query->param('privatesub'));
@@ -182,6 +287,9 @@ if (!($query->param('doupdate'))) {
   &Util::LDAPUpdate($ldap, $editdn, 'gender', $gender);
   &Util::LDAPUpdate($ldap, $editdn, 'birthDate', $query->param('birthdate')) if $bd_ok;
   &Util::LDAPUpdate($ldap, $editdn, 'mailDisableMessage', $query->param('maildisablemessage'));
+  &Util::LDAPUpdate($ldap, $editdn, 'mailCallout', $callout);
+  &Util::LDAPUpdate($ldap, $editdn, 'mailGreylisting', $greylisting);
+  &Util::LDAPUpdate($ldap, $editdn, 'sudoPassword', \@keepsudo);
 
   # when we are done, reload the page with the updated details.
   my $url = "https://$ENV{SERVER_NAME}/$config{webupdateurl}?id=$id&authtoken=$authtoken&editdn=";