amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-18 11:38:53 +00:00
Code Issues Projects Releases Wiki Activity

fix(addressbook): handle LDIF file with headers when importing contacts

Browse Source
This commit is contained in:
Francis Lachapelle
2022-01-06 10:48:00 -05:00
parent 91e1aec6eb
commit fad52dd1b8
1 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
UI/Contacts/UIxContactFolderActions.m
View File

@@ -35,6 +35,7 @@
#import <NGExtensions/NGBase64Coding.h>
#import <NGHttp/NGHttpRequest.h>
#import <NGMime/NGMimeMultipartBody.h>
#import <NGMime/NGMimeHeaderFields.h>
#import <GDLAccess/EOAdaptorChannel.h>
#import <GDLAccess/EOAdaptorContext.h>
@@ -115,7 +116,7 @@ static NSArray *photoTags = nil;
WOResponse *response;
id data;
NSMutableDictionary *rc;
NSString *fileContent;
NSString *filename, *fileContent;
int imported = 0;
@@ -131,7 +132,9 @@ static NSArray *photoTags = nil;
return response;
}
data = [[[data parts] lastObject] body];
data = [[data parts] lastObject];
filename = [(NGMimeContentDispositionHeaderField *)[data headerForKey: @"content-disposition"] filename];
data = [data body];
fileContent = [[NSString alloc] initWithData: (NSData *) data
encoding: NSUTF8StringEncoding];
@@ -139,7 +142,7 @@ static NSArray *photoTags = nil;
if (fileContent && [fileContent length])
{
if ([fileContent hasPrefix: @"dn:"])
if ([fileContent hasPrefix: @"dn:"] || [filename hasSuffix: @".ldif"])
imported = [self importLdifData: fileContent];
else if ([fileContent hasPrefix: @"BEGIN:"])
imported = [self importVcardData: fileContent];
@@ -203,6 +206,9 @@ static NSArray *photoTags = nil;
continue;
}
if (j == 0)
line = [NSString stringWithFormat: @"dn%@", line];
/* handle continuation lines */
if ([line hasPrefix: @" "])
{
@@ -260,9 +266,9 @@ static NSArray *photoTags = nil;
if ([key hasSuffix: @":"])
{
key = [key substringToIndex: [key length] - 1];
if ([photoTags containsObject: key])
values = [values dataByDecodingBase64];
else if ([values isKindOfClass: [NSArray class]])
if ([photoTags containsObject: key])
values = [values dataByDecodingBase64];
else if ([values isKindOfClass: [NSArray class]])
{
for (j = 0; j < [values count]; j++)
{
@@ -276,33 +282,35 @@ static NSArray *photoTags = nil;
values = [values stringByDecodingBase64];
}
// Standard key recognized in NGCards
if ([photoTags containsObject: key])
key = @"photo";
// Standard key recognized in NGCards
if ([photoTags containsObject: key])
key = @"photo";
[entry setValue: values forKey: key];
}
uid = [folder globallyUniqueObjectId];
ldifEntry = [SOGoContactLDIFEntry contactEntryWithName: uid
withLDIFEntry: entry
inContainer: folder];
if (ldifEntry)
if ([entry objectForKey: @"dn"])
{
if ([ldifEntry isList])
uid = [folder globallyUniqueObjectId];
ldifEntry = [SOGoContactLDIFEntry contactEntryWithName: uid
withLDIFEntry: entry
inContainer: folder];
if (ldifEntry)
{
// Postpone importation of lists
[ldifListEntries addObject: ldifEntry];
}
else
{
vCard = [ldifEntry vCard];
if ([self importVcard: vCard])
if ([ldifEntry isList])
{
rc++;
// Postpone importation of lists
[ldifListEntries addObject: ldifEntry];
}
else
{
vCard = [ldifEntry vCard];
if ([self importVcard: vCard])
{
rc++;
}
}
}
}
}