# $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>
+# Copyright (c) 2008, 2011, 2012, 2014, 2015 Peter Palfrader
use lib '.';
use strict vars;
use CGI;
use Data::UUID;
use Digest::HMAC_SHA1 qw(hmac_sha1_hex);
+use Digest::MD5 qw(md5_hex);
use Util;
use English;
use URI::Escape;
use Crypt::PasswdMD5;
use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR);
+use Net::LDAP::Util qw(ldap_explode_dn);
my %config = &Util::ReadConfigFile;
my $id = $query->param('id');
my $authtoken = $query->param('authtoken');
-my $password = &Util::CheckAuthToken($authtoken);
-my $editdn = $query->param('editdn');
+
+my $password = undef;
+
+if ($authtoken || $id) {
+ $password = Util::TouchAuthToken($authtoken, $id);
+} else {
+ $password = '';
+ $id = '';
+ $authtoken = '';
+}
if ($proto eq "http" || !($id && $password)) {
print "Location: https://$ENV{SERVER_NAME}/$config{webloginhtml}\n\n";
exit;
-}
+}
my $ldap;
$ldap->unbind if (defined($ldap));
}
-$SIG{__DIE__} = \&DieHandler;
+#$SIG{__DIE__} = \&DieHandler;
+my $editdn = "uid=$id,$config{basedn}";
$ldap = Net::LDAP->new($config{ldaphost});
&Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False';
$mesg = $ldap->search(base => $editdn,
filter => "uid=*");
$mesg->code && &Util::HTMLError($mesg->error);
-
+
my $entries = $mesg->as_struct;
if ($mesg->count != 1) {
# complain and quit
if (!($query->param('doupdate'))) {
# Not yet update, just fill in the form with the current values
my %data;
-
+
# Fill in %data
# First do the easy stuff - this catches most of the cases
foreach (keys(%$entry)) {
$data{$_} = CGI::escapeHTML($data{$_}) if defined $data{$_};
}
- $data{gender} = 9 if not $data{gender};
-
# Now we have to fill in the rest that needs some processing...
$data{id} = $id;
$data{authtoken} = $authtoken;
}
$data{mailcontentinspectionaction} ||= 'reject';
-
+
$data{email} = CGI::escapeHTML(join(", ", @{$entry->{emailforward}}));
- my $genderselect = '<select name="gender">'
- . '<option value="9"'
- . ($data{gender} == 9 ? ' selected' : '')
- . '>unspecified'
- . '<option value="1"'
- . ($data{gender} == 1 ? ' selected' : '')
- . '>male<option value="2"'
- . ($data{gender} == 2 ? ' selected' : '')
- . '>female</select>';
my $mailcontentselect = '<select name="mailcontentinspection">'
. '<option value="blackhole"'
. ($data{mailcontentinspectionaction} eq 'blackhole' ? ' selected' : '')
my $confirmstring = '';
my $sudopassword = '';
for my $e(@{$entry->{'sudopassword'}}) {
- my ($uuid, $status, $hosts, $crypted) = ($e =~ /^([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.,*]+) ([^ ]+)$/);
+ my ($uuid, $status, $hosts, $crypted) = ($e =~ /^([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;
}
};
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>";
+ $confirmstring = "<br>To confirm your new sudo passwords send signed mail to changes\@
$config{maildomain} with a signed body containing these lines:<br><pre>$confirmstring</pre>";
}
my $sudopasswordhosts = '<select name="newsudopass-host"> <option value="*">ALL';
open (F, "<$config{webupdatehtml}") || &Util::HTMLError($!);
while (<F>) {
s/~(.+?)~/$data{$1}/g;
- s/<\?genderselect>/$genderselect/;
s/<\?mailcontentselect>/$mailcontentselect/;
s/<\?sudopassword>/$sudopassword/;
s/<\?sudopasswordhosts>/$sudopasswordhosts/;
# Actually update stuff...
- my ($newpassword, $newstaddress, $newwebpassword);
-
+ my ($newpassword, $newstaddress, $newwebpassword, $newrtcpassword);
+
# Good god, why would we want to do that here? it breaks password setting
# etc, and it doesn't prevent people from setting eveil stuff in ldap
# directly.
# &Util::FixParams($query);
- if (($query->param('labeleduri')) &&
+ if (($query->param('labeleduri')) &&
($query->param('labeleduri') !~ /^https?:\/\//i)) {
&Util::HTMLError("Your homepage URL is invalid");
}
-
+
if ($query->param('newpass') && $query->param('newpassvrfy')) {
if ($query->param('newpass') ne $query->param('newpassvrfy')) {
# passwords don't match...
# create a md5 crypted password
$newpassword = '{crypt}'.crypt($query->param('newpass'), &Util::CreateCryptSalt(1));
-
+
&Util::LDAPUpdate($ldap, $editdn, 'userPassword', $newpassword);
&Util::UpdateAuthToken($authtoken, $query->param('newpass'));
- }
+ }
if ($query->param('newwebpass') && $query->param('newwebpassvrfy')) {
if ($query->param('newwebpass') ne $query->param('newwebpassvrfy')) {
# passwords don't match...
- &Util::HTMLError("The passwords you specified do not match. Please go back and try again.");
+ &Util::HTMLError("The web-passwords you specified do not match. Please go back and try again.");
}
my ($r, $msg) = &Util::checkPasswordQuality($query->param('newwebpass'), undef, [@ldapinfo_for_pwcheck]);
if ($r) {
- &Util::HTMLError("Password check failed: $msg. Please go back and try again.");
+ &Util::HTMLError("Password check failed for web-password: $msg. Please go back and try again.");
}
# create a md5 crypted password
- $newwebpassword = apache_md5_crypt($query->param('newwebpass'), &Util::CreateMD5Salt());
-
+ $newwebpassword = apache_md5_crypt($query->param('newwebpass'), &Util::CreateCryptSalt(1, 1));
+
&Util::LDAPUpdate($ldap, $editdn, 'webPassword', $newwebpassword);
- }
+ }
+ if ($query->param('newrtcpass') && $query->param('newrtcpassvrfy')) {
+ if ($query->param('newrtcpass') ne $query->param('newrtcpassvrfy')) {
+ # passwords don't match...
+ &Util::HTMLError("The rtc-passwords you specified do not match. Please go back and try again.");
+ }
+
+ my ($r, $msg) = &Util::checkPasswordQuality($query->param('newrtcpass'), undef, [@ldapinfo_for_pwcheck]);
+ if ($r) {
+ &Util::HTMLError("Password check failed for rtc-password: $msg. Please go back and try again.");
+ }
+ # create a md5 crypted password
+ $newrtcpassword = &md5_hex( ldap_explode_dn($editdn)->[0]{UID} . '@debian.org:rtc.debian.org:' . $query->param('newrtcpass') );
+
+ &Util::LDAPUpdate($ldap, $editdn, 'rtcPassword', $newrtcpassword);
+ }
$newstaddress = $query->param('staddress');
$newstaddress =~ s/\n/\$/m;
- my $gender = $query->param('gender');
- if ($gender != 1 && $gender != 2) {
- $gender = 9; # unspecified
- }
-
my ($bd_ok, $bd_yr, $bd_mo, $bd_day);
if ($query->param('birthdate') =~ /^([1-9][0-9]{3})([01][0-9])([0-3][0-9])$/) {
$bd_ok = 1;
}
my ($lat, $long);
- ($lat, $long) = &Util::CheckLatLong($query->param('latitude'),
+ ($lat, $long) = &Util::CheckLatLong($query->param('latitude'),
$query->param('longitude'));
my ($greylisting, $callout, $mailcontentinspection, $defaultoptions);
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.,*]+) ([^ ]+)$/);
+ 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);
&Util::LDAPUpdate($ldap, $editdn, 'jabberJID', $query->param('jabberjid'));
&Util::LDAPUpdate($ldap, $editdn, 'labeledURI', $query->param('labeleduri'));
&Util::LDAPUpdate($ldap, $editdn, 'onVacation', $query->param('onvacation'));
- &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, '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=";
- $url .= uri_escape($editdn, "\x00-\x40\x7f-\xff");
- print "Location: $url\n\n";
+ my $url = "https://$ENV{SERVER_NAME}/$config{webupdateurl}?id=$id;authtoken=$authtoken";
+ print "Location: $url\n\n";
}
$ldap->unbind;
projects / mirror / userdir-ldap-cgi.git / blobdiff