amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-03 12:47:16 +00:00
Code Issues Projects Releases Wiki Activity

(feat) added S/MIME support for body key lookups

Browse Source
This commit is contained in:
Ludovic Marcotte
2017-12-23 05:47:31 -05:00
parent 915fad335a
commit f880d1aa54
2 changed files with 82 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoMailObject.h
+12 -10
View File
@@ -1,15 +1,15 @@
/*
Copyright (C) 2009-2016 Inverse inc.
Copyright (C) 2009-2017 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of OpenGroupware.org.
This file is part of SOGo.
OGo is free software; you can redistribute it and/or modify it under
SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -118,12 +118,14 @@ NSArray *SOGoMailCoreInfoKeys;
- (NSException *) addFlags:(id)_f;
- (NSException *) removeFlags:(id)_f;
- (BOOL) isNewMail; /* \Recent */
- (BOOL) flagged; /* \Flagged */
- (BOOL) read; /* \Unseen */
- (BOOL) replied; /* \Answered */
- (BOOL) forwarded; /* $forwarded */
- (BOOL) deleted; /* \Deleted */
- (BOOL) isNewMail; /* \Recent */
- (BOOL) flagged; /* \Flagged */
- (BOOL) read; /* \Unseen */
- (BOOL) replied; /* \Answered */
- (BOOL) forwarded; /* $forwarded */
- (BOOL) deleted; /* \Deleted */
- (BOOL) isSigned; /* S/MIME signed message */
- (BOOL) isEncrypted; /* S/MIME encrypted message */
/* deletion */
SoObjects/Mailer/SOGoMailObject.m
+70 -16
View File
@@ -1,5 +1,5 @@
/*
Copyright (C) 2007-2016 Inverse inc.
Copyright (C) 2007-2017 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of SOGo.
@@ -37,6 +37,9 @@
#import <NGImap4/NGImap4Envelope.h>
#import <NGImap4/NGImap4EnvelopeAddress.h>
#import <NGMail/NGMimeMessageParser.h>
#import <NGMime/NGMimeMultipartBody.h>
#import <NGMime/NGMimeType.h>
#import <SOGo/NSArray+Utilities.h>
#import <SOGo/NSDictionary+Utilities.h>
@@ -49,7 +52,9 @@
#import "NSString+Mail.h"
#import "NSData+Mail.h"
#import "NSData+SMIME.h"
#import "NSDictionary+Mail.h"
#import "SOGoMailAccount.h"
#import "SOGoMailFolder.h"
#import "SOGoMailManager.h"
#import "SOGoMailBodyPart.h"
@@ -102,9 +107,9 @@ static BOOL debugSoParts = NO;
- (void) dealloc
{
[headers release];
[headers release];
[headerPart release];
[coreInfos release];
[coreInfos release];
[super dealloc];
}
@@ -117,7 +122,8 @@ static BOOL debugSoParts = NO;
/* hierarchy */
- (SOGoMailObject *)mailObject {
- (SOGoMailObject *) mailObject
{
return self;
}
@@ -332,11 +338,6 @@ static BOOL debugSoParts = NO;
return [[self fetchCoreInfos] valueForKey: @"header"];
}
- (BOOL) hasMailHeaderInCoreInfos
{
return [[self mailHeaderData] length] > 0 ? YES : NO;
}
- (id) mailHeaderPart
{
NGMimeMessageParser *parser;
@@ -350,7 +351,7 @@ static BOOL debugSoParts = NO;
// TODO: do we need to set some delegate method which stops parsing the body?
parser = [[NGMimeMessageParser alloc] init];
headerPart = [[parser parsePartFromData:data] retain];
headerPart = [[parser parsePartFromData: data] retain];
[parser release]; parser = nil;
if (headerPart == nil) {
@@ -885,7 +886,7 @@ static BOOL debugSoParts = NO;
{
path = @"1";
// We set the path to 0 in case of a smime mail if not provided.
// We set the path to 0 in case of a S/MIME mail if not provided.
subtype = [[part objectForKey: @"subtype"] lowercaseString];
if ([subtype isEqualToString: @"pkcs7-mime"] || [subtype isEqualToString: @"x-pkcs7-mime"])
path = @"0";
@@ -913,7 +914,9 @@ static BOOL debugSoParts = NO;
keys = [NSMutableArray array];
[self _fetchFileAttachmentKeysInPart: [self bodyStructure]
intoArray: keys withPath: nil andPrefix: prefix];
intoArray: keys
withPath: nil
andPrefix: prefix];
return keys;
}
@@ -1183,11 +1186,28 @@ static BOOL debugSoParts = NO;
inContext: (id) _ctx
{
// TODO: we might want to check for existence prior controller creation
Class clazz;
NSArray *parts;
int part;
NSDictionary *partDesc;
NSString *mimeType;
NSArray *parts;
Class clazz;
int part;
if ([self isEncrypted])
{
NSData *certificate;
NGMimeMessage *m;
id part;
certificate = [[self mailAccountFolder] certificate];
m = [[self content] messageFromEncryptedDataAndCertificate: certificate];
part = [[[m body] parts] objectAtIndex: ([_key intValue]-1)];
mimeType = [[part contentType] stringValue];
clazz = [SOGoMailBodyPart bodyPartClassForMimeType: mimeType
inContext: _ctx];
return [clazz objectWithName:_key inContainer: self];
}
parts = [[self bodyStructure] objectForKey: @"parts"];
@@ -1410,7 +1430,7 @@ static BOOL debugSoParts = NO;
- (NSException *) moveToFolderNamed: (NSString *) folderName
inContext: (id)_ctx
{
NSException *error;
NSException *error;
if (![self copyToFolderNamed: folderName
inContext: _ctx])
@@ -1709,6 +1729,40 @@ static BOOL debugSoParts = NO;
return [self _hasFlag: @"deleted"];
}
- (BOOL) isSigned
{
NSString *type, *subtype;
type = [[[[self mailHeaders] objectForKey: @"content-type"] type] lowercaseString];
subtype = [[[[self mailHeaders] objectForKey: @"content-type"] subType] lowercaseString];
if ([type isEqualToString: @"application"])
{
if ([subtype isEqualToString: @"x-pkcs7-signature"] ||
[subtype isEqualToString: @"pkcs7-signature"])
return YES;
}
return NO;
}
- (BOOL) isEncrypted
{
NSString *type, *subtype;
type = [[[[self mailHeaders] objectForKey: @"content-type"] type] lowercaseString];
subtype = [[[[self mailHeaders] objectForKey: @"content-type"] subType] lowercaseString];
if ([type isEqualToString: @"application"])
{
if ([subtype isEqualToString: @"x-pkcs7-mime"] ||
[subtype isEqualToString: @"pkcs7-mime"])
return YES;
}
return NO;
}
- (NSString *) textDescription
{
#warning We should send the content as an NSData