amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-19 10:25:27 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): check if smime certificate matches sender address

Browse Source 
Fixes #5407
This commit is contained in:
Francis Lachapelle
2021-11-02 11:04:02 -04:00
parent 9622a1ea07
commit ab67e7d279
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailPartViewers/UIxMailPartSignedViewer.m
+6 -2
View File
@@ -202,11 +202,15 @@
if (validSignature)
{
BOOL hasMatchingAddress;
NSArray *pair;
NSArray *pair, *attributes;
NSDictionary *certificate, *values;
NSEnumerator *certificatesList, *subjectList;
NSString *senderAddress, *label, *value;
// See https://datatracker.ietf.org/doc/html/rfc8550#section-3
// See https://datatracker.ietf.org/doc/html/rfc8550#section-4.4.3
// TODO: handle multiple email addresses in SubjectAltName
attributes = [NSArray arrayWithObjects: @"commonname", @"subjectaltname", @"emailaddress", nil];
validationMessage = [self labelForKey: @"Message is signed"];
hasMatchingAddress = NO;
value = nil;
@@ -219,7 +223,7 @@
{
label = [[pair objectAtIndex: 0] lowercaseString];
value = [[pair objectAtIndex: 1] lowercaseString];
if ([label isEqualToString: @"commonname"] && [value isEqualToString: senderAddress])
if ([attributes containsObject: label] && [value isEqualToString: senderAddress])
{
hasMatchingAddress = 1;
}