X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=update.cgi;h=8e74b3e4a90408d45c098301b5de2ee06151e719;hb=f9609dae4f7fce6ca978c830f8e6311b7a94723c;hp=223559f276b32786f05c8604892b29be428a1db2;hpb=cf6454a1b253861a7167037e07cc2693bf4fe66a;p=mirror%2Fuserdir-ldap-cgi.git
diff --git a/update.cgi b/update.cgi
index 223559f..8e74b3e 100755
--- a/update.cgi
+++ b/update.cgi
@@ -82,8 +82,9 @@ if (!($query->param('doupdate'))) {
# First do the easy stuff - this catches most of the cases
foreach (keys(%$entry)) {
$data{$_} = $entry->{$_}->[0];
+ $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...
@@ -92,6 +93,7 @@ if (!($query->param('doupdate'))) {
$data{editdn} = $editdn;
$data{staddress} = $entry->{postaladdress}->[0];
$data{staddress} =~ s/\$/\n/;
+ $data{staddress} = CGI::escapeHTML($data{staddress});
$data{countryname} = &Util::LookupCountry($data{c});
if ($data{mailgreylisting} eq "TRUE") {
@@ -106,7 +108,7 @@ if (!($query->param('doupdate'))) {
$data{mailcallout} = "";
}
- $data{email} = join(", ", @{$entry->{emailforward}});
+ $data{email} = CGI::escapeHTML(join(", ", @{$entry->{emailforward}}));
my $genderselect = '';
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.,*]+) ([^ ]+)$/);
+ 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.,*]+) ([^ ]+)$/);
unless (defined $uuid) {
$sudopassword .= "
Unparseable line!
\n";
next;
}
$status =~ s/:.*//; # remove verification hmac, it's just noise here.
- my $e = "
$hosts
-
$status
+ my $e = "
".CGI::escapeHTML($hosts)."
+
".CGI::escapeHTML($status)."
not shown
-
$uuid
-
(delete)
\n";
+
+
(delete)
\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";
+ $confirmstring .= CGI::escapeHTML("confirm sudopassword $uuid $hosts $hmac\n");
}
};
if ($confirmstring ne '') {
@@ -165,10 +167,21 @@ if (!($query->param('doupdate'))) {
}
close F;
} else {
+ my @ldapinfo_for_pwcheck;
+ for my $a (qw{cn sn md gecos uid}) {
+ for my $e (@{$entry->{$a}}) {
+ push @ldapinfo_for_pwcheck, $e;
+ }
+ }
+
+
# Actually update stuff...
my ($newpassword, $newstaddress);
- &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')) &&
($query->param('labeleduri') !~ /^https?:\/\//i)) {
@@ -179,7 +192,13 @@ if (!($query->param('doupdate'))) {
if ($query->param('newpass') ne $query->param('newpassvrfy')) {
# passwords don't match...
&Util::HTMLError("The passwords you specified do not match. Please go back and try again.");
- }
+ }
+
+ my ($r, $msg) = &Util::checkPasswordQuality($query->param('newpass'), undef, [@ldapinfo_for_pwcheck]);
+ if ($r) {
+ &Util::HTMLError("Password check failed: $msg. Please go back and try again.");
+ }
+
# create a md5 crypted password
$newpassword = '{crypt}'.crypt($query->param('newpass'), &Util::CreateCryptSalt(1));
@@ -237,13 +256,23 @@ if (!($query->param('doupdate'))) {
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'.");
}
+
+ 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 $ldappass = $password;
+ $ldappass = $query->param('newpass') if $query->param('newpass');
+ push @ldapinfo_for_pwcheck, $host, split(/\./, $host);
+ my ($r, $msg) = &Util::checkPasswordQuality($query->param('newsudopass'), $ldappass, [@ldapinfo_for_pwcheck]);
+ if ($r) {
+ &Util::HTMLError("Password check failed for new sudo pass: $msg. Please go back and try again.");
+ }
+
# create a md5 crypted password
my $newsudopassword = crypt($query->param('newsudopass'), &Util::CreateCryptSalt(1));
my $ug = new Data::UUID;