[Rt-commit] rt branch, 4.2/smime-v2-strict, created. rt-4.0.4-502-g00778d7

[Jason May]

The branch, 4.2/smime-v2-strict has been created
        at  00778d76abf07b0527f6d357bcbf544bb14134ec (commit)

- Log -----------------------------------------------------------------
commit 00778d76abf07b0527f6d357bcbf544bb14134ec
Author: Jason May <jasonmay at bestpractical.com>
Date:   Tue Jan 17 20:38:29 2012 -0500

    Ensure that all the message's parts are encrypted in strict mode

diff --git a/lib/RT/Interface/Email/Auth/Crypt.pm b/lib/RT/Interface/Email/Auth/Crypt.pm
index 3c9c957..788af11 100644
--- a/lib/RT/Interface/Email/Auth/Crypt.pm
+++ b/lib/RT/Interface/Email/Auth/Crypt.pm
@@ -186,6 +186,15 @@ sub GetCurrentUser {
             }
         }
 
+        if (RT->Config->Get('Crypt')->{'Strict'} and !$decrypted) {
+            EmailErrorToSender(
+                %args,
+                Template  => 'NotEncryptedMessage',
+                Arguments => { Message  => $args{'Message'} },
+            );
+            return (-1, 'rejected because the message is unencrypted with Strict mode enabled');
+        }
+
         $part->head->replace(
             'X-RT-Incoming-Encryption' => 
                 $decrypted ? 'Success' : 'Not encrypted'

-----------------------------------------------------------------------