X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=update.cgi;h=f1f82f9e81ae38e8d62fd6bfa6fdd3246fdbb654;hb=375608726c73fb2c8f55f4fae332235e987bf559;hp=f78a7ebeae7df753610e759db64fb08ef9036f6b;hpb=00a6b3538e567017f85d7e92174d15e248133bf0;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/update.cgi b/update.cgi
index f78a7eb..f1f82f9 100755
--- a/update.cgi
+++ b/update.cgi
@@ -13,7 +13,8 @@ use Digest::HMAC_SHA1 qw(hmac_sha1_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);
 
 my %config = &Util::ReadConfigFile;
 
@@ -107,6 +108,16 @@ if (!($query->param('doupdate'))) {
   } else {
     $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}}));
 
@@ -119,6 +130,17 @@ if (!($query->param('doupdate'))) {
 		   . '>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 $e(@{$entry->{'sudopassword'}}) {
@@ -128,7 +150,7 @@ if (!($query->param('doupdate'))) {
       next;
     }
     if ($status =~ /^confirmed:/) {
-      my $data = join(':', 'password-is-confirmed', $uuid, $hosts, $crypted);
+      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';
@@ -143,7 +165,7 @@ if (!($query->param('doupdate'))) {
                  <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 .= CGI::escapeHTML("confirm sudopassword $uuid $hosts $hmac\n");
     }
@@ -168,6 +190,7 @@ if (!($query->param('doupdate'))) {
   while (<F>) {
     s/~(.+?)~/$data{$1}/g;
     s/<\?genderselect>/$genderselect/;
+    s/<\?mailcontentselect>/$mailcontentselect/;
     s/<\?sudopassword>/$sudopassword/;
     s/<\?sudopasswordhosts>/$sudopasswordhosts/;
     s/<\?confirmstring>/$confirmstring/;
@@ -184,7 +207,7 @@ if (!($query->param('doupdate'))) {
 
 
   # Actually update stuff...
-  my ($newpassword, $newstaddress);
+  my ($newpassword, $newstaddress, $newwebpassword);
   
   # 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
@@ -214,6 +237,23 @@ if (!($query->param('doupdate'))) {
     &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);
+  }  
+
   $newstaddress = $query->param('staddress');
   $newstaddress =~ s/\n/\$/m;
 
@@ -249,7 +289,7 @@ if (!($query->param('doupdate'))) {
   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") {
@@ -261,6 +301,16 @@ if (!($query->param('doupdate'))) {
      $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')) {
@@ -312,6 +362,7 @@ if (!($query->param('doupdate'))) {
   &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'));
@@ -325,7 +376,9 @@ if (!($query->param('doupdate'))) {
   &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.