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

fix(addressbook(dav)): improve handling of addressbook-query

Browse Source
This commit is contained in:
Francis Lachapelle
2022-02-28 17:07:39 -05:00
parent 3f93e6ebc4
commit 7faab9117a
12 changed files with 744 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/LDAPSource.m
+73 -2
View File
@@ -919,6 +919,29 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
return [EOQualifier qualifierWithQualifierFormat: qs];
}
- (void) addVCardProperty: (NSString *) property
toCriteria: (NSMutableArray *) criteria
{
static NSDictionary *vCardLDAPFieldsTable = nil;
NSString *field;
if (!vCardLDAPFieldsTable)
vCardLDAPFieldsTable = [[NSDictionary alloc] initWithObjectsAndKeys:
@"cn", @"fn",
@"cn", @"n",
@"mail", @"email",
@"telephonenumber", @"tel",
@"o", @"org",
@"l", @"adr",
nil];
field = [vCardLDAPFieldsTable objectForKey: property];
if (field)
{
[criteria addObjectUniquely: field];
}
}
/*
- (NSArray *) _constraintsFields
{
@@ -1326,8 +1349,7 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
pool = [NSAutoreleasePool new];
while ((currentEntry = [entries nextObject]))
{
[contacts addObject:
[self _convertLDAPEntryToContact: currentEntry]];
[contacts addObject: [self _convertLDAPEntryToContact: currentEntry]];
i++;
if (i % 10 == 0)
{
@@ -1524,6 +1546,55 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
andValue: theEmail];
}
- (NSArray *) lookupContactsWithQualifier: (EOQualifier *) qualifier
andSortOrdering: (EOSortOrdering *) ordering
inDomain: (NSString *) domain
{
NSAutoreleasePool *pool;
NGLdapConnection *ldapConnection;
NGLdapEntry *currentEntry;
NSEnumerator *entries;
NSMutableArray *contacts;
unsigned int i;
contacts = [NSMutableArray array];
if ([qualifier count] > 0 || !_listRequiresDot)
{
ldapConnection = [self _ldapConnection];
// Perform the query if the qualifier is defined or if no critera was defined
if ([_scope caseInsensitiveCompare: @"BASE"] == NSOrderedSame)
entries = [ldapConnection baseSearchAtBaseDN: _baseDN
qualifier: qualifier
attributes: _lookupFields];
else if ([_scope caseInsensitiveCompare: @"ONE"] == NSOrderedSame)
entries = [ldapConnection flatSearchAtBaseDN: _baseDN
qualifier: qualifier
attributes: _lookupFields];
else /* we do it like before */
entries = [ldapConnection deepSearchAtBaseDN: _baseDN
qualifier: qualifier
attributes: _lookupFields];
i = 0;
pool = [NSAutoreleasePool new];
while ((currentEntry = [entries nextObject]))
{
[contacts addObject: [self _convertLDAPEntryToContact: currentEntry]];
i++;
if (i % 10 == 0)
{
[pool release];
pool = [NSAutoreleasePool new];
}
}
[pool release];
}
return contacts;
}
- (void) setSourceID: (NSString *) newSourceID
{
ASSIGN(_sourceID, newSourceID);
SoObjects/SOGo/SOGoSource.h
+8
View File
@@ -24,6 +24,8 @@
#import "SOGoConstants.h"
@class EOQualifier;
@class EOSortOrdering;
@class NSDictionary;
@class NSException;
@class NSString;
@@ -70,6 +72,9 @@
- (NSArray *) fetchContactsMatching: (NSString *) filter
withCriteria: (NSArray *) criteria
inDomain: (NSString *) domain;
- (NSArray *) lookupContactsWithQualifier: (EOQualifier *) qualifier
andSortOrdering: (EOSortOrdering *) ordering
inDomain: (NSString *) domain;
- (void) setSourceID: (NSString *) newSourceID;
- (NSString *) sourceID;
@@ -88,6 +93,9 @@
- (NSException *) updateContactEntry: (NSDictionary *) ldifRecord;
- (NSException *) removeContactEntryWithID: (NSString *) aId;
- (void) addVCardProperty: (NSString *) property
toCriteria: (NSMutableArray *) criteria;
/* user address books */
- (NSArray *) addressBookSourcesForUser: (NSString *) user;
SoObjects/SOGo/SQLSource.m
+112 -5
View File
@@ -30,7 +30,12 @@
#import <GDLContentStore/GCSChannelManager.h>
#import <GDLContentStore/NSURL+GCS.h>
#import <GDLContentStore/EOQualifier+GCS.h>
#import <GDLAccess/EOAdaptor.h>
#import <GDLAccess/EOAdaptorChannel.h>
#import <GDLAccess/EOAdaptorContext.h>
#import <GDLAccess/EOAttribute.h>
#import <GDLAccess/EOEntity.h>
#import <GDLAccess/EOSQLQualifier.h>
#import <SOGo/SOGoSystemDefaults.h>
@@ -290,7 +295,7 @@
nil];
[qualifier autorelease];
}
[qualifier _gcsAppendToString: sql];
[qualifier appendSQLToString: sql];
ex = [channel evaluateExpressionX: sql];
if (!ex)
@@ -535,7 +540,7 @@
qualifier = [[EOOrQualifier alloc] initWithQualifierArray: qualifiers];
if (domainQualifier)
qualifier = [[EOAndQualifier alloc] initWithQualifiers: domainQualifier, qualifier, nil];
[qualifier _gcsAppendToString: sql];
[qualifier appendSQLToString: sql];
ex = [channel evaluateExpressionX: sql];
if (!ex)
@@ -623,7 +628,7 @@
qualifier = [[EOAndQualifier alloc] initWithQualifiers: q_uid, q_auth, nil];
[qualifier autorelease];
[qualifier _gcsAppendToString: sql];
[qualifier appendSQLToString: sql];
ex = [channel evaluateExpressionX: sql];
if (!ex)
@@ -727,6 +732,29 @@
return [self _lookupContactEntry: entryID considerEmail: YES inDomain: domain];
}
- (void) addVCardProperty: (NSString *) property
toCriteria: (NSMutableArray *) criteria
{
static NSDictionary *vCardSQLFieldsTable = nil;
NSString *field;
if (!vCardSQLFieldsTable)
vCardSQLFieldsTable = [[NSDictionary alloc] initWithObjectsAndKeys:
@"c_cn", @"fn",
@"c_cn", @"n",
@"mail", @"email",
@"c_telephonenumber", @"tel",
@"c_o", @"org",
@"c_l", @"adr",
nil];
field = [vCardSQLFieldsTable objectForKey: property];
if (field)
{
[criteria addObjectUniquely: field];
}
}
/* Returns an EOQualifier of the following form:
* (_domainField = domain OR _domainField = visibleDomain1 [...])
* Should only be called on SQL sources using _domainField name.
@@ -802,7 +830,7 @@
if (domainQualifier)
{
[sql appendString: @" WHERE "];
[domainQualifier _gcsAppendToString: sql];
[domainQualifier appendSQLToString: sql];
}
}
else
@@ -911,7 +939,7 @@
if (domainQualifier)
{
[sql appendFormat: @" AND ("];
[domainQualifier _gcsAppendToString: sql];
[domainQualifier appendSQLToString: sql];
[sql appendFormat: @")"];
}
}
@@ -948,6 +976,85 @@
return results;
}
- (NSArray *) lookupContactsWithQualifier: (EOQualifier *) qualifier
andSortOrdering: (EOSortOrdering *) ordering
inDomain: (NSString *) domain
{
static EOAdaptor *adaptor = nil;
NSException *ex;
NSMutableArray *results;
NSMutableString *sql;
EOAdaptorChannel *channel;
GCSChannelManager *cm;
results = [NSMutableArray array];
if (qualifier || !_listRequiresDot)
{
cm = [GCSChannelManager defaultChannelManager];
channel = [cm acquireOpenChannelForURL: _viewURL];
if (channel)
{
if (!adaptor)
{
EOAdaptorContext *adaptorCtx;
adaptorCtx = [channel adaptorContext];
adaptor = [adaptorCtx adaptor];
}
sql = [NSMutableString stringWithFormat: @"SELECT c_uid FROM %@ WHERE (", [_viewURL gcsTableName]];
if (qualifier)
[qualifier appendSQLToString: sql
withAdaptor: adaptor];
else
[sql appendString: @"1 = 1"];
[sql appendString: @")"];
if (_domainField)
{
if ([domain length])
{
EOQualifier *domainQualifier;
domainQualifier = [self visibleDomainsQualifierFromDomain: domain];
if (domainQualifier)
{
[sql appendFormat: @" AND ("];
[domainQualifier appendSQLToString: sql];
[sql appendFormat: @")"];
}
}
else
[sql appendFormat: @" AND %@ IS NULL", _domainField];
}
ex = [channel evaluateExpressionX: sql];
if (!ex)
{
NSDictionary *row;
NSMutableDictionary *mutableRow;
NSArray *attrs;
attrs = [channel describeResults: NO];
while ((row = [channel fetchAttributes: attrs withZone: NULL]))
{
mutableRow = [row mutableCopy];
// [mutableRow setObject: self forKey: @"source"];
[results addObject: mutableRow];
[mutableRow release];
}
}
else
[self errorWithFormat: @"could not run SQL '%@': %@", sql, ex];
[cm releaseChannel: channel];
}
[self errorWithFormat:@"failed to acquire channel for URL: %@",
[_viewURL absoluteString]];
}
return results;
}
- (void) setSourceID: (NSString *) newSourceID
{
}