[Da-tools-commits] ./debian/userdir-ldap-cgi r103: Allow setting of userpassword
Peter Palfrader
peter at palfrader.org
Sun Sep 14 21:42:48 UTC 2008
------------------------------------------------------------
revno: 103
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap-cgi
timestamp: Sun 2008-09-14 23:42:48 +0200
message:
Allow setting of userpassword
modified:
debian/changelog
debian/control
update.cgi
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-07-15 19:46:23 +0000
+++ b/debian/changelog 2008-09-14 21:42:48 +0000
@@ -1,3 +1,9 @@
+userdir-ldap-cgi (0.3.15) unstable; urgency=low
+
+ * Allow setting of userpassword.
+
+ -- Peter Palfrader <weasel at debian.org> Sun, 14 Sep 2008 23:42:20 +0200
+
userdir-ldap-cgi (0.3.14) unstable; urgency=low
* Hide hosts on website whose status starts with unlisted.
=== modified file 'debian/control'
--- a/debian/control 2008-05-25 16:27:04 +0000
+++ b/debian/control 2008-09-14 21:42:48 +0000
@@ -8,7 +8,7 @@
Package: userdir-ldap-cgi
Architecture: all
-Depends: userdir-ldap, perl5, libnet-ldap-perl, libcrypt-blowfish-perl, gnupg (>= 1.0.3), libdate-manip-perl, liburi-perl, libio-socket-ssl-perl
+Depends: userdir-ldap, perl5, libnet-ldap-perl, libcrypt-blowfish-perl, gnupg (>= 1.0.3), libdate-manip-perl, liburi-perl, libio-socket-ssl-perl, libuuid-perl, libdigest-hmac-perl
Replaces: userdir-ldap
Description: CGI programs for the db.debian.org
These programs are run on http://db.debian.org/ to simplify the
=== modified file 'update.cgi'
--- a/update.cgi 2008-05-25 16:27:04 +0000
+++ b/update.cgi 2008-09-14 21:42:48 +0000
@@ -8,7 +8,10 @@
use strict vars;
#use Apache::Registry;
use CGI;
+use 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 @@
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));
}
@@ -58,7 +66,11 @@
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]};
@@ -105,6 +117,38 @@
. '>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 $hmac = hmac_sha1_hex( join(':', 'confirm-new-password', $uuid, $hosts, $crypted), $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=\"$host\">$hostname\n";
+ };
+ $sudopasswordhosts .= '</select>';
# finally we can send output...
my ($sub, $substr);
@@ -113,10 +157,12 @@
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);
@@ -187,6 +233,40 @@
$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 ($uuidbin, $uuid);
+ UUID::generate($uuidbin);
+ UUID::unparse($uuidbin, $uuid);
+
+ $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);
@@ -209,6 +289,7 @@
&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=";
More information about the Da-tools-commits
mailing list