[Rt-commit] r7643 - rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email/Auth

[clkao at bestpractical.com]

Author: clkao
Date: Mon Apr 23 14:16:10 2007
New Revision: 7643

Modified:
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email/Auth/GnuPGNG.pm

Log:
Add common RT::Crypt headers.

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email/Auth/GnuPGNG.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email/Auth/GnuPGNG.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email/Auth/GnuPGNG.pm	Mon Apr 23 14:16:10 2007
@@ -29,16 +29,42 @@
         @_
     );
 
-    $args{'Message'}->head->delete('X-RT-GnuPG-Status');
+    $args{'Message'}->head->delete($_)
+        for qw(X-RT-GnuPG-Status X-RT-Incoming-Encrypton
+               X-RT-Incoming-Signature X-RT-Privacy);
 
     my ($status, @res) = VerifyDecrypt( Entity => $args{'Message'} );
-    return @args{qw(CurrentUser AuthLevel)} if $status && !@res;
+    if ( $status && !@res ) {
+        $args{'Message'}
+            ->head->add( 'X-RT-Incoming-Encryption' => 'Not encrypted' );
+
+        return @args{qw(CurrentUser AuthLevel)};
+    }
 
     $RT::Logger->error("Had a problem during decrypting and verifying")
         unless $status;
 
     $args{'Message'}->head->add( 'X-RT-GnuPG-Status' => $_->{'status'} )
         foreach @res;
+    $args{'Message'}->head->add( 'X-RT-Privacy' => 'PGP' );
+
+    # XXX: first entity only for now
+    if (@res) {
+        my $decrypted;
+        my @status = RT::Crypt::GnuPG::ParseStatus( $res[0]->{'status'} );
+        for (@status) {
+            if ( $_->{Operation} eq 'Decrypt' && $_->{Status} eq 'DONE' ) {
+                $decrypted = 1;
+            }
+            if ( $_->{Operation} eq 'Verify' && $_->{Status} eq 'DONE' ) {
+                $args{'Message'}->head->add(
+                    'X-RT-Incoming-Signature' => $_->{UserString} );
+            }
+        }
+        $args{'Message'}->head->add( 'X-RT-Incoming-Encryption' => $decrypted
+            ? 'Success'
+            : 'Not encrypted' );
+    }
 
     return @args{qw(CurrentUser AuthLevel)};
 }