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 Net::LDAP qw(:all);
+use Crypt::PasswdMD5;
+use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR);
+use Net::LDAP::Util qw(ldap_explode_dn);
my %config = &Util::ReadConfigFile;
$ldap->unbind if (defined($ldap));
}
-$SIG{__DIE__} = \&DieHandler;
+#$SIG{__DIE__} = \&DieHandler;
$ldap = Net::LDAP->new($config{ldaphost});
&Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False';
$data{mailcallout} = "";
}
+ $data{maildefaultoptions} ||= 'TRUE';
+
+ if ($data{maildefaultoptions} eq "TRUE") {
+ $data{maildefaultoptions} = " checked";
+ } else {
+ $data{maildefaultoptions} = "";
+ }
+
$data{mailcontentinspectionaction} ||= 'reject';
$data{email} = CGI::escapeHTML(join(", ", @{$entry->{emailforward}}));
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;
# Actually update stuff...
- my ($newpassword, $newstaddress);
+ 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
&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 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 for web-password: $msg. Please go back and try again.");
+ }
+
+ # create a md5 crypted password
+ $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 ($lat, $long);
($lat, $long) = &Util::CheckLatLong($query->param('latitude'),
$query->param('longitude'));
- my ($greylisting, $callout, $mailcontentinspection);
+ my ($greylisting, $callout, $mailcontentinspection, $defaultoptions);
$greylisting = $query->param('mailgreylisting');
if (!$greylisting or $greylisting ne "TRUE") {
$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')) {
&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, '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.