projects
/
mirror
/
userdir-ldap-cgi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b8d3e83
)
Whitespace cleanup
author
Tollef Fog Heen
<tfheen@err.no>
Tue, 23 Jul 2019 15:50:54 +0000
(17:50 +0200)
committer
Tollef Fog Heen
<tfheen@err.no>
Tue, 23 Jul 2019 15:50:54 +0000
(17:50 +0200)
update.cgi
patch
|
blob
|
history
diff --git
a/update.cgi
b/update.cgi
index
e6ba638
..
3cf1900
100755
(executable)
--- a/
update.cgi
+++ b/
update.cgi
@@
-40,7
+40,7
@@
if ($authtoken || $id) {
if ($proto eq "http" || !($id && $password)) {
print "Location: https://$ENV{SERVER_NAME}/$config{webloginhtml}\n\n";
exit;
if ($proto eq "http" || !($id && $password)) {
print "Location: https://$ENV{SERVER_NAME}/$config{webloginhtml}\n\n";
exit;
-}
+}
my $ldap;
my $ldap;
@@
-74,7
+74,7
@@
if (!$auth) {
$mesg = $ldap->search(base => $editdn,
filter => "uid=*");
$mesg->code && &Util::HTMLError($mesg->error);
$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
my $entries = $mesg->as_struct;
if ($mesg->count != 1) {
# complain and quit
@@
-90,7
+90,7
@@
my $entry = $entries->{$dns[0]};
if (!($query->param('doupdate'))) {
# Not yet update, just fill in the form with the current values
my %data;
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)) {
# Fill in %data
# First do the easy stuff - this catches most of the cases
foreach (keys(%$entry)) {
@@
-128,7
+128,7
@@
if (!($query->param('doupdate'))) {
}
$data{mailcontentinspectionaction} ||= 'reject';
}
$data{mailcontentinspectionaction} ||= 'reject';
-
+
$data{email} = CGI::escapeHTML(join(", ", @{$entry->{emailforward}}));
my $mailcontentselect = '<select name="mailcontentinspection">'
$data{email} = CGI::escapeHTML(join(", ", @{$entry->{emailforward}}));
my $mailcontentselect = '<select name="mailcontentinspection">'
@@
-208,17
+208,17
@@
if (!($query->param('doupdate'))) {
# Actually update stuff...
my ($newpassword, $newstaddress, $newwebpassword, $newrtcpassword);
# Actually update stuff...
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);
# 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");
}
($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...
if ($query->param('newpass') && $query->param('newpassvrfy')) {
if ($query->param('newpass') ne $query->param('newpassvrfy')) {
# passwords don't match...
@@
-232,10
+232,10
@@
if (!($query->param('doupdate'))) {
# create a md5 crypted password
$newpassword = '{crypt}'.crypt($query->param('newpass'), &Util::CreateCryptSalt(1));
# 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'));
&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')) {
if ($query->param('newwebpass') && $query->param('newwebpassvrfy')) {
if ($query->param('newwebpass') ne $query->param('newwebpassvrfy')) {
@@
-250,9
+250,9
@@
if (!($query->param('doupdate'))) {
# create a md5 crypted password
$newwebpassword = apache_md5_crypt($query->param('newwebpass'), &Util::CreateCryptSalt(1, 1));
# create a md5 crypted password
$newwebpassword = apache_md5_crypt($query->param('newwebpass'), &Util::CreateCryptSalt(1, 1));
-
+
&Util::LDAPUpdate($ldap, $editdn, 'webPassword', $newwebpassword);
&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...
if ($query->param('newrtcpass') && $query->param('newrtcpassvrfy')) {
if ($query->param('newrtcpass') ne $query->param('newrtcpassvrfy')) {
# passwords don't match...
@@
-267,7
+267,7
@@
if (!($query->param('doupdate'))) {
$newrtcpassword = &md5_hex( ldap_explode_dn($editdn)->[0]{UID} . '@debian.org:rtc.debian.org:' . $query->param('newrtcpass') );
&Util::LDAPUpdate($ldap, $editdn, 'rtcPassword', $newrtcpassword);
$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;
$newstaddress = $query->param('staddress');
$newstaddress =~ s/\n/\$/m;
@@
-297,7
+297,7
@@
if (!($query->param('doupdate'))) {
$bd_ok = 1;
}
my ($lat, $long);
$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);
$query->param('longitude'));
my ($greylisting, $callout, $mailcontentinspection, $defaultoptions);
@@
-392,7
+392,7
@@
if (!($query->param('doupdate'))) {
# when we are done, reload the page with the updated details.
my $url = "https://$ENV{SERVER_NAME}/$config{webupdateurl}?id=$id;authtoken=$authtoken";
# when we are done, reload the page with the updated details.
my $url = "https://$ENV{SERVER_NAME}/$config{webupdateurl}?id=$id;authtoken=$authtoken";
- print "Location: $url\n\n";
+ print "Location: $url\n\n";
}
$ldap->unbind;
}
$ldap->unbind;