use Util;
use English;
use URI::Escape;
-use Net::LDAP qw(:all);
+use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR);
my %config = &Util::ReadConfigFile;
# 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...
$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") {
} else {
$data{mailcallout} = "";
}
+
+ $data{maildefaultoptions} ||= 'TRUE';
+
+ if ($data{maildefaultoptions} eq "TRUE") {
+ $data{maildefaultoptions} = " checked";
+ } else {
+ $data{maildefaultoptions} = "";
+ }
+
+ $data{mailcontentinspectionaction} ||= 'reject';
- $data{email} = join(", ", @{$entry->{emailforward}});
+ $data{email} = CGI::escapeHTML(join(", ", @{$entry->{emailforward}}));
my $genderselect = '<select name="gender">'
. '<option value="9"'
. '>male<option value="2"'
. ($data{gender} == 2 ? ' selected' : '')
. '>female</select>';
+ my $mailcontentselect = '<select name="mailcontentinspection">'
+ . '<option value="blackhole"'
+ . ($data{mailcontentinspectionaction} eq 'blackhole' ? ' selected' : '')
+ . '>blackhole'
+ . '<option value="markup"'
+ . ($data{mailcontentinspectionaction} eq 'markup' ? ' selected' : '')
+ . '>markup'
+ . '<option value="reject"'
+ . ($data{mailcontentinspectionaction} eq 'reject' ? ' selected' : '')
+ . '>reject';
+
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 .= "<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>
+ if ($status =~ /^confirmed:/) {
+ my $data = join(':', 'password-is-confirmed', 'sudo', $data{'uid'}, $uuid, $hosts, $crypted);
+ my $hmac = hmac_sha1_hex( $data, $hmac_key);
+ if ($status eq "confirmed:$hmac") {
+ $status = 'confirmed';
+ } else {
+ $status = 'INVALID';
+ }
+ }
+ my $e = "<tr><td>".CGI::escapeHTML($hosts)."</td>
+ <td>".CGI::escapeHTML($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";
+ <!--<td><small><code>".CGI::escapeHTML($uuid)."</code></small></td>-->
+ <td><input name=\"sudopassword-delete-".CGI::escapeHTML($uuid)."\" type=\"checkbox\" value=\"delete\"> (delete)</td></tr>\n";
$sudopassword .= $e;
if ($status eq 'unconfirmed') {
- my $data = join(':', 'confirm-new-password', $uuid, $hosts, $crypted);
+ my $data = join(':', 'confirm-new-password', 'sudo', $data{'uid'}, $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 '') {
while (<F>) {
s/~(.+?)~/$data{$1}/g;
s/<\?genderselect>/$genderselect/;
+ s/<\?mailcontentselect>/$mailcontentselect/;
s/<\?sudopassword>/$sudopassword/;
s/<\?sudopasswordhosts>/$sudopasswordhosts/;
s/<\?confirmstring>/$confirmstring/;
}
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)) {
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));
my ($lat, $long);
($lat, $long) = &Util::CheckLatLong($query->param('latitude'),
$query->param('longitude'));
- my ($greylisting, $callout);
+ my ($greylisting, $callout, $mailcontentinspection, $defaultoptions);
$greylisting = $query->param('mailgreylisting');
if (!$greylisting or $greylisting ne "TRUE") {
$callout = "FALSE";
}
+ $mailcontentinspection = $query->param('mailcontentinspection');
+ if (!$mailcontentinspection or ($mailcontentinspection ne "blackhole" and $mailcontentinspection ne "markup")) {
+ $mailcontentinspection = "reject";
+ }
+
+ $defaultoptions = $query->param('maildefaultoptions');
+ if (!$defaultoptions or $defaultoptions ne "TRUE") {
+ $defaultoptions = "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'.");
}
+
+ 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;
&Util::LDAPUpdate($ldap, $editdn, 'postalCode', $query->param('postalcode'));
&Util::LDAPUpdate($ldap, $editdn, 'telephoneNumber', $query->param('telephonenumber'));
&Util::LDAPUpdate($ldap, $editdn, 'facsimileTelephoneNumber', $query->param('facsimiletelephonenumber'));
+ &Util::LDAPUpdate($ldap, $editdn, 'bATVToken', $query->param('bATVToken'));
&Util::LDAPUpdate($ldap, $editdn, 'VoIP', $query->param('VoIP'));
&Util::LDAPUpdate($ldap, $editdn, 'loginShell', $query->param('loginshell'));
&Util::LDAPUpdate($ldap, $editdn, 'emailForward', $query->param('email'));
&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, 'mailContentInspectionAction', $mailcontentinspection);
&Util::LDAPUpdate($ldap, $editdn, 'mailGreylisting', $greylisting);
+ &Util::LDAPUpdate($ldap, $editdn, 'mailDefaultOptions', $defaultoptions);
&Util::LDAPUpdate($ldap, $editdn, 'sudoPassword', \@keepsudo);
# when we are done, reload the page with the updated details.