[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.4-164-gef729ae7ea

[? sunnavy]

The branch, 4.4-trunk has been updated
       via  ef729ae7ea410435cb2be551ceb1996425da9b36 (commit)
       via  9f603a421277f558231a387ea06872a3aa7fe59f (commit)
       via  006676e5f0091ab18a9bbb9bdffb682f8334f1fc (commit)
      from  a3c5c3f073598d4c008c7a49ef0ec63229827bfa (commit)

Summary of changes:
 lib/RT/Crypt/SMIME.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 9f603a421277f558231a387ea06872a3aa7fe59f
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Tue Nov 3 09:47:46 2020 -0500

    Report the S/MIME signer correctly when there is no EmailAddress
    
    There are many cases when a cert doesn't include an email address. On
    the other hand, CN is guaranteed to be present

diff --git a/lib/RT/Crypt/SMIME.pm b/lib/RT/Crypt/SMIME.pm
index 22cfa9a198..15f2661027 100644
--- a/lib/RT/Crypt/SMIME.pm
+++ b/lib/RT/Crypt/SMIME.pm
@@ -496,6 +496,7 @@ sub Verify {
         }
 
         my ($address) = Email::Address->parse($signer->{User}[0]{String});
+        last unless $address;
         my $user = RT::User->new( $RT::SystemUser );
         $user->LoadOrCreateByEmail(
             EmailAddress => $address->address,
@@ -933,8 +934,11 @@ sub GetCertificateInfo {
             my $method = $type . "_" . $USER_MAP{$_};
             $data{$_} = $cert->$method if $cert->can($method);
         }
-        $data{String} = Email::Address->new( @data{'Name', 'EmailAddress'} )->format
-            if $data{EmailAddress};
+        if ($data{EmailAddress}) {
+            $data{String} = Email::Address->new( @data{'Name', 'EmailAddress'} )->format;
+        } else {
+            $data{String} = $data{Name};
+        }
         return \%data;
     };
 

commit ef729ae7ea410435cb2be551ceb1996425da9b36
Merge: a3c5c3f073 9f603a4212
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Nov 18 01:00:38 2020 +0800

    Merge branch '4.4/report-smime-signer-and-issuer-correctly' into 4.4-trunk


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