Monotone-Parent: 12ff4c07aa1f796a3312a4e79566255dbd94aece
Monotone-Revision: dd0644b62704e75dfed8a39a7e286d593f0014e0 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-11-17T18:39:42 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
601c63ae6f
commit
cb4341db75
|
@ -4,6 +4,8 @@
|
||||||
pertaining to the SamDB.
|
pertaining to the SamDB.
|
||||||
(MAPIStoreSamDBUserAttribute): new function that returns the value
|
(MAPIStoreSamDBUserAttribute): new function that returns the value
|
||||||
of a specified key from a user record matching one simple criteria.
|
of a specified key from a user record matching one simple criteria.
|
||||||
|
(MAPIStoreInternalEntrydId, MAPIStoreExternalEntryId): moved
|
||||||
|
functions from MAPIStoreMessage.m.
|
||||||
|
|
||||||
* OpenChange/MAPIStoreMessage.m (MAPIStoreInternalEntryId): now
|
* OpenChange/MAPIStoreMessage.m (MAPIStoreInternalEntryId): now
|
||||||
takes a ldb_context * parameter pointing to the samdb, which
|
takes a ldb_context * parameter pointing to the samdb, which
|
||||||
|
|
|
@ -37,8 +37,8 @@
|
||||||
#import <NGCards/NSString+NGCards.h>
|
#import <NGCards/NSString+NGCards.h>
|
||||||
#import <SOGo/SOGoUserManager.h>
|
#import <SOGo/SOGoUserManager.h>
|
||||||
|
|
||||||
#import "MAPIStoreMessage.h"
|
|
||||||
#import "MAPIStoreRecurrenceUtils.h"
|
#import "MAPIStoreRecurrenceUtils.h"
|
||||||
|
#import "MAPIStoreSamDBUtils.h"
|
||||||
#import "MAPIStoreTypes.h"
|
#import "MAPIStoreTypes.h"
|
||||||
#import "NSData+MAPIStore.h"
|
#import "NSData+MAPIStore.h"
|
||||||
#import "NSDate+MAPIStore.h"
|
#import "NSDate+MAPIStore.h"
|
||||||
|
|
|
@ -48,6 +48,7 @@
|
||||||
#import "MAPIStoreMailAttachment.h"
|
#import "MAPIStoreMailAttachment.h"
|
||||||
#import "MAPIStoreMailFolder.h"
|
#import "MAPIStoreMailFolder.h"
|
||||||
#import "MAPIStoreMapping.h"
|
#import "MAPIStoreMapping.h"
|
||||||
|
#import "MAPIStoreSamDBUtils.h"
|
||||||
#import "MAPIStoreTypes.h"
|
#import "MAPIStoreTypes.h"
|
||||||
|
|
||||||
#import "MAPIStoreMailMessage.h"
|
#import "MAPIStoreMailMessage.h"
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
#import "MAPIStoreMailFolder.h"
|
#import "MAPIStoreMailFolder.h"
|
||||||
#import "MAPIStoreMIME.h"
|
#import "MAPIStoreMIME.h"
|
||||||
#import "MAPIStoreMapping.h"
|
#import "MAPIStoreMapping.h"
|
||||||
|
#import "MAPIStoreSamDBUtils.h"
|
||||||
#import "MAPIStoreTypes.h"
|
#import "MAPIStoreTypes.h"
|
||||||
#import "NSData+MAPIStore.h"
|
#import "NSData+MAPIStore.h"
|
||||||
#import "NSObject+MAPIStore.h"
|
#import "NSObject+MAPIStore.h"
|
||||||
|
|
|
@ -35,13 +35,8 @@
|
||||||
@class MAPIStoreAttachmentTable;
|
@class MAPIStoreAttachmentTable;
|
||||||
@class MAPIStoreFolder;
|
@class MAPIStoreFolder;
|
||||||
|
|
||||||
struct ldb_context;
|
|
||||||
|
|
||||||
#import "MAPIStoreObject.h"
|
#import "MAPIStoreObject.h"
|
||||||
|
|
||||||
extern NSData *MAPIStoreInternalEntryId (struct ldb_context *, NSString *username);
|
|
||||||
extern NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email);
|
|
||||||
|
|
||||||
@interface MAPIStoreMessage : MAPIStoreObject
|
@interface MAPIStoreMessage : MAPIStoreObject
|
||||||
{
|
{
|
||||||
NSArray *attachmentKeys;
|
NSArray *attachmentKeys;
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#import "MAPIStoreContext.h"
|
#import "MAPIStoreContext.h"
|
||||||
#import "MAPIStoreFolder.h"
|
#import "MAPIStoreFolder.h"
|
||||||
#import "MAPIStorePropertySelectors.h"
|
#import "MAPIStorePropertySelectors.h"
|
||||||
|
#import "MAPIStoreSamDBUtils.h"
|
||||||
#import "MAPIStoreTypes.h"
|
#import "MAPIStoreTypes.h"
|
||||||
#import "NSData+MAPIStore.h"
|
#import "NSData+MAPIStore.h"
|
||||||
#import "NSObject+MAPIStore.h"
|
#import "NSObject+MAPIStore.h"
|
||||||
|
@ -54,116 +55,6 @@
|
||||||
|
|
||||||
static NSString *resourcesDir = nil;
|
static NSString *resourcesDir = nil;
|
||||||
|
|
||||||
NSData *
|
|
||||||
MAPIStoreInternalEntryId (struct ldb_context *samCtx, NSString *username)
|
|
||||||
{
|
|
||||||
NSMutableData *entryId = nil;
|
|
||||||
TALLOC_CTX *memCtx;
|
|
||||||
struct ldb_result *res = NULL;
|
|
||||||
const char * const attrs[] = { "legacyExchangeDN", NULL };
|
|
||||||
const char *legacyDn;
|
|
||||||
int ret;
|
|
||||||
static const uint8_t const providerUid[] = { 0xdc, 0xa7, 0x40, 0xc8,
|
|
||||||
0xc0, 0x42, 0x10, 0x1a,
|
|
||||||
0xb4, 0xb9, 0x08, 0x00,
|
|
||||||
0x2b, 0x2f, 0xe1, 0x82 };
|
|
||||||
|
|
||||||
/* structure:
|
|
||||||
flags: 32
|
|
||||||
provideruid: 32 * 4
|
|
||||||
version: 32
|
|
||||||
type: 32
|
|
||||||
X500DN: variable */
|
|
||||||
|
|
||||||
memCtx = talloc_zero(NULL, TALLOC_CTX);
|
|
||||||
|
|
||||||
/* Search mapistoreURI given partial URI */
|
|
||||||
ret = ldb_search (samCtx, memCtx, &res, ldb_get_default_basedn(samCtx),
|
|
||||||
LDB_SCOPE_SUBTREE, attrs,
|
|
||||||
"(&(objectClass=user)(sAMAccountName=%s))",
|
|
||||||
[username UTF8String]);
|
|
||||||
if (ret == LDB_SUCCESS && res->count == 1)
|
|
||||||
{
|
|
||||||
legacyDn = ldb_msg_find_attr_as_string (res->msgs[0], attrs[0], NULL);
|
|
||||||
if (legacyDn)
|
|
||||||
{
|
|
||||||
entryId = [NSMutableData dataWithCapacity: 256];
|
|
||||||
[entryId appendUInt32: 0]; // flags
|
|
||||||
[entryId appendBytes: providerUid length: 16]; // provideruid
|
|
||||||
[entryId appendUInt32: 1]; // version
|
|
||||||
[entryId appendUInt32: 0]; // type (local mail user)
|
|
||||||
[entryId appendBytes: legacyDn length: strlen (legacyDn) + 1]; // x500dn
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
talloc_free(memCtx);
|
|
||||||
|
|
||||||
return entryId;
|
|
||||||
}
|
|
||||||
|
|
||||||
NSData *
|
|
||||||
MAPIStoreExternalEntryId (NSString *cn, NSString *email)
|
|
||||||
{
|
|
||||||
NSMutableData *entryId;
|
|
||||||
static uint8_t providerUid[] = { 0x81, 0x2b, 0x1f, 0xa4,
|
|
||||||
0xbe, 0xa3, 0x10, 0x19,
|
|
||||||
0x9d, 0x6e, 0x00, 0xdd,
|
|
||||||
0x01, 0x0f, 0x54, 0x02 };
|
|
||||||
uint8_t flags21, flags22;
|
|
||||||
|
|
||||||
/* structure:
|
|
||||||
flags: 32
|
|
||||||
provideruid: 32 * 4
|
|
||||||
version: 16
|
|
||||||
{
|
|
||||||
PaD: 1
|
|
||||||
MAE: 2
|
|
||||||
Format: 4
|
|
||||||
M: 1
|
|
||||||
U: 1
|
|
||||||
R: 2
|
|
||||||
L: 1
|
|
||||||
Pad: 4
|
|
||||||
}
|
|
||||||
DisplayName: variable
|
|
||||||
AddressType: variable
|
|
||||||
EmailAddress: variable */
|
|
||||||
|
|
||||||
entryId = [NSMutableData dataWithCapacity: 256];
|
|
||||||
[entryId appendUInt32: 0]; // flags
|
|
||||||
[entryId appendBytes: providerUid length: 16]; // provideruid
|
|
||||||
[entryId appendUInt16: 0]; // version
|
|
||||||
|
|
||||||
flags21 = 0; /* PaD, MAE, R, Pad = 0 */
|
|
||||||
flags21 |= 0x16; /* Format: text and HTML */
|
|
||||||
flags21 |= 0x01; /* M: mime format */
|
|
||||||
|
|
||||||
flags22 = 0x90; /* U: unicode, L: no lookup */
|
|
||||||
[entryId appendUInt8: flags21];
|
|
||||||
[entryId appendUInt8: flags22];
|
|
||||||
|
|
||||||
/* DisplayName */
|
|
||||||
if (!cn)
|
|
||||||
cn = @"";
|
|
||||||
[entryId
|
|
||||||
appendData: [cn dataUsingEncoding: NSUTF16LittleEndianStringEncoding]];
|
|
||||||
[entryId appendUInt16: 0];
|
|
||||||
|
|
||||||
/* AddressType */
|
|
||||||
[entryId
|
|
||||||
appendData: [@"SMTP" dataUsingEncoding: NSUTF16LittleEndianStringEncoding]];
|
|
||||||
[entryId appendUInt16: 0];
|
|
||||||
|
|
||||||
/* EMailAddress */
|
|
||||||
if (!email)
|
|
||||||
email = @"";
|
|
||||||
[entryId
|
|
||||||
appendData: [email dataUsingEncoding: NSUTF16LittleEndianStringEncoding]];
|
|
||||||
[entryId appendUInt16: 0];
|
|
||||||
|
|
||||||
return entryId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* rtf conversion via unrtf */
|
/* rtf conversion via unrtf */
|
||||||
static int
|
static int
|
||||||
unrtf_data_output (void *data, const char *str, size_t str_len)
|
unrtf_data_output (void *data, const char *str, size_t str_len)
|
||||||
|
|
|
@ -24,11 +24,14 @@
|
||||||
#define MAPISTORESAMDBUTILS_H
|
#define MAPISTORESAMDBUTILS_H
|
||||||
|
|
||||||
@class NSString;
|
@class NSString;
|
||||||
|
|
||||||
struct ldb_context;
|
struct ldb_context;
|
||||||
|
|
||||||
NSString *MAPIStoreSamDBUserAttribute (struct ldb_context *samCtx,
|
NSString *MAPIStoreSamDBUserAttribute (struct ldb_context *samCtx,
|
||||||
NSString *userKey,
|
NSString *userKey,
|
||||||
NSString *value,
|
NSString *value,
|
||||||
NSString *attributeName);
|
NSString *attributeName);
|
||||||
|
NSData *MAPIStoreInternalEntryId (struct ldb_context *, NSString *username);
|
||||||
|
NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email);
|
||||||
|
|
||||||
#endif /* MAPISTORESAMDBUTILS_H */
|
#endif /* MAPISTORESAMDBUTILS_H */
|
||||||
|
|
|
@ -20,10 +20,13 @@
|
||||||
* Boston, MA 02111-1307, USA.
|
* Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#import <Foundation/NSData.h>
|
||||||
#import <Foundation/NSString.h>
|
#import <Foundation/NSString.h>
|
||||||
#include <talloc.h>
|
#include <talloc.h>
|
||||||
#include <ldb.h>
|
#include <ldb.h>
|
||||||
|
|
||||||
|
#import "NSData+MAPIStore.h"
|
||||||
|
|
||||||
#import "MAPIStoreSamDBUtils.h"
|
#import "MAPIStoreSamDBUtils.h"
|
||||||
|
|
||||||
NSString *
|
NSString *
|
||||||
|
@ -60,3 +63,103 @@ MAPIStoreSamDBUserAttribute (struct ldb_context *samCtx,
|
||||||
|
|
||||||
return resultValue;
|
return resultValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NSData *
|
||||||
|
MAPIStoreInternalEntryId (struct ldb_context *samCtx, NSString *username)
|
||||||
|
{
|
||||||
|
static const uint8_t const providerUid[] = { 0xdc, 0xa7, 0x40, 0xc8,
|
||||||
|
0xc0, 0x42, 0x10, 0x1a,
|
||||||
|
0xb4, 0xb9, 0x08, 0x00,
|
||||||
|
0x2b, 0x2f, 0xe1, 0x82 };
|
||||||
|
NSMutableData *entryId;
|
||||||
|
NSData *legacyDNData;
|
||||||
|
NSString *legacyDN;
|
||||||
|
|
||||||
|
/* structure:
|
||||||
|
flags: 32
|
||||||
|
provideruid: 32 * 4
|
||||||
|
version: 32
|
||||||
|
type: 32
|
||||||
|
X500DN: variable */
|
||||||
|
|
||||||
|
legacyDN = MAPIStoreSamDBUserAttribute (samCtx, @"sAMAccountName", username,
|
||||||
|
@"legacyExchangeDN");
|
||||||
|
if (legacyDN)
|
||||||
|
{
|
||||||
|
entryId = [NSMutableData dataWithCapacity: 256];
|
||||||
|
[entryId appendUInt32: 0]; // flags
|
||||||
|
[entryId appendBytes: providerUid length: 16]; // provideruid
|
||||||
|
[entryId appendUInt32: 1]; // version
|
||||||
|
[entryId appendUInt32: 0]; // type (local mail user)
|
||||||
|
legacyDNData = [legacyDN dataUsingEncoding: NSASCIIStringEncoding];
|
||||||
|
[entryId appendData: legacyDNData]; // x500dn
|
||||||
|
[entryId appendUInt8: 0]; // end of string
|
||||||
|
}
|
||||||
|
else
|
||||||
|
entryId = nil;
|
||||||
|
|
||||||
|
return entryId;
|
||||||
|
}
|
||||||
|
|
||||||
|
NSData *
|
||||||
|
MAPIStoreExternalEntryId (NSString *cn, NSString *email)
|
||||||
|
{
|
||||||
|
NSMutableData *entryId;
|
||||||
|
static uint8_t providerUid[] = { 0x81, 0x2b, 0x1f, 0xa4,
|
||||||
|
0xbe, 0xa3, 0x10, 0x19,
|
||||||
|
0x9d, 0x6e, 0x00, 0xdd,
|
||||||
|
0x01, 0x0f, 0x54, 0x02 };
|
||||||
|
uint8_t flags21, flags22;
|
||||||
|
|
||||||
|
/* structure:
|
||||||
|
flags: 32
|
||||||
|
provideruid: 32 * 4
|
||||||
|
version: 16
|
||||||
|
{
|
||||||
|
PaD: 1
|
||||||
|
MAE: 2
|
||||||
|
Format: 4
|
||||||
|
M: 1
|
||||||
|
U: 1
|
||||||
|
R: 2
|
||||||
|
L: 1
|
||||||
|
Pad: 4
|
||||||
|
}
|
||||||
|
DisplayName: variable
|
||||||
|
AddressType: variable
|
||||||
|
EmailAddress: variable */
|
||||||
|
|
||||||
|
entryId = [NSMutableData dataWithCapacity: 256];
|
||||||
|
[entryId appendUInt32: 0]; // flags
|
||||||
|
[entryId appendBytes: providerUid length: 16]; // provideruid
|
||||||
|
[entryId appendUInt16: 0]; // version
|
||||||
|
|
||||||
|
flags21 = 0; /* PaD, MAE, R, Pad = 0 */
|
||||||
|
flags21 |= 0x16; /* Format: text and HTML */
|
||||||
|
flags21 |= 0x01; /* M: mime format */
|
||||||
|
|
||||||
|
flags22 = 0x90; /* U: unicode, L: no lookup */
|
||||||
|
[entryId appendUInt8: flags21];
|
||||||
|
[entryId appendUInt8: flags22];
|
||||||
|
|
||||||
|
/* DisplayName */
|
||||||
|
if (!cn)
|
||||||
|
cn = @"";
|
||||||
|
[entryId
|
||||||
|
appendData: [cn dataUsingEncoding: NSUTF16LittleEndianStringEncoding]];
|
||||||
|
[entryId appendUInt16: 0];
|
||||||
|
|
||||||
|
/* AddressType */
|
||||||
|
[entryId
|
||||||
|
appendData: [@"SMTP" dataUsingEncoding: NSUTF16LittleEndianStringEncoding]];
|
||||||
|
[entryId appendUInt16: 0];
|
||||||
|
|
||||||
|
/* EMailAddress */
|
||||||
|
if (!email)
|
||||||
|
email = @"";
|
||||||
|
[entryId
|
||||||
|
appendData: [email dataUsingEncoding: NSUTF16LittleEndianStringEncoding]];
|
||||||
|
[entryId appendUInt16: 0];
|
||||||
|
|
||||||
|
return entryId;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue