projects
/
mirror
/
userdir-ldap-cgi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New version number
[mirror/userdir-ldap-cgi.git]
/
update.cgi
diff --git
a/update.cgi
b/update.cgi
index
60a2040
..
d109bf7
100755
(executable)
--- a/
update.cgi
+++ b/
update.cgi
@@
-25,8
+25,16
@@
my $proto = ($ENV{HTTPS} ? "https" : "http");
my $id = $query->param('id');
my $authtoken = $query->param('authtoken');
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";
if ($proto eq "http" || !($id && $password)) {
print "Location: https://$ENV{SERVER_NAME}/$config{webloginhtml}\n\n";
@@
-45,6
+53,7
@@
sub DieHandler {
}
#$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';
$ldap = Net::LDAP->new($config{ldaphost});
&Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False';
@@
-146,7
+155,7
@@
if (!($query->param('doupdate'))) {
my $confirmstring = '';
my $sudopassword = '';
for my $e(@{$entry->{'sudopassword'}}) {
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;
unless (defined $uuid) {
$sudopassword .= "<tr><td>Unparseable line!</td></tr>\n";
next;
@@
-266,7
+275,7
@@
if (!($query->param('doupdate'))) {
&Util::HTMLError("Password check failed for rtc-password: $msg. Please go back and try again.");
}
# create a md5 crypted password
&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($edit
id
)->[0]{UID} . '@debian.org:rtc.debian.org:' . $query->param('newrtcpass') );
+ $newrtcpassword = &md5_hex( ldap_explode_dn($edit
dn
)->[0]{UID} . '@debian.org:rtc.debian.org:' . $query->param('newrtcpass') );
&Util::LDAPUpdate($ldap, $editdn, 'rtcPassword', $newrtcpassword);
}
&Util::LDAPUpdate($ldap, $editdn, 'rtcPassword', $newrtcpassword);
}
@@
-399,8
+408,7
@@
if (!($query->param('doupdate'))) {
&Util::LDAPUpdate($ldap, $editdn, 'sudoPassword', \@keepsudo);
# when we are done, reload the page with the updated details.
&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");
+ my $url = "https://$ENV{SERVER_NAME}/$config{webupdateurl}?id=$id;authtoken=$authtoken";
print "Location: $url\n\n";
}
print "Location: $url\n\n";
}