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

diff --git a/update.cgi b/update.cgi
index f78a7eb..6ddfd9c 100755
--- a/update.cgi
+++ b/update.cgi
@@ -107,6 +107,8 @@ if (!($query->param('doupdate'))) {
   } else {
     $data{mailcallout} = "";
   }
+
+  $data{mailcontentinspectionaction} ||= 'reject';
   
   $data{email} = CGI::escapeHTML(join(", ", @{$entry->{emailforward}}));
 
@@ -119,6 +121,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 +141,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 +156,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 +181,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/;
@@ -249,7 +263,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);
 
   $greylisting = $query->param('mailgreylisting');
   if (!$greylisting or $greylisting ne "TRUE") {
@@ -261,6 +275,11 @@ if (!($query->param('doupdate'))) {
      $callout = "FALSE";
   }
 
+  $mailcontentinspection = $query->param('mailcontentinspection');
+  if (!$mailcontentinspection or ($mailcontentinspection ne "blackhole" and $mailcontentinspection ne "markup")) {
+     $mailcontentinspection = "reject";
+  }
+
   my $newsudo;
   my $newsudo_hosts;
   if ($query->param('newsudopass') && $query->param('newsudopassvrfy')) {
@@ -325,6 +344,7 @@ 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, 'sudoPassword', \@keepsudo);