See ChangeLog

Monotone-Parent: 6daecf153c7b456921285f46297f307b36b5ceb7
Monotone-Revision: 4cbfa058c2199806b08f5a11ac5cebf02316041f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-04-30T21:17:55
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/GNUmakefile

@@ -49,6 +49,7 @@ SOGo_HEADER_FILES = \
 	SOGoWebDAVAclManager.h		\
 	SOGoWebDAVValue.h		\
 	SOGoMailer.h			\
+	SOGoGroup.h			\
 	SOGoUser.h			\
 	\
 	NSDictionary+BSJSONAdditions.h	\
@@ -94,6 +95,7 @@ SOGo_OBJC_FILES = \
 	SOGoWebDAVAclManager.m		\
 	SOGoWebDAVValue.m		\
 	SOGoMailer.m			\
+	SOGoGroup.m			\
 	SOGoUser.m			\
 	\
 	NSDictionary+BSJSONAdditions.m	\

SoObjects/SOGo/LDAPSource.h

@@ -28,6 +28,7 @@
 @class NSDictionary;
 @class NSString;
 @class NGLdapConnection;
+@class NGLdapEntry;
 
 @interface LDAPSource : NSObject
 {
@@ -62,6 +63,7 @@
 	  hostname: (NSString *) newBindHostname
 	      port: (NSString *) newBindPort
 	encryption: (NSString *) newEncryption;
+
 - (void) setBaseDN: (NSString *) newBaseDN
 	   IDField: (NSString *) newIDField
 	   CNField: (NSString *) newCNField
@@ -69,11 +71,15 @@
 	mailFields: (NSArray *) newMailFields
      andBindFields: (NSString *) newBindFields;
 
+- (NSString *) loginForDN: (NSString *) theDN;
+
 - (BOOL) checkLogin: (NSString *) login
 	andPassword: (NSString *) password;
 
 - (NSDictionary *) lookupContactEntry: (NSString *) theID;
 - (NSDictionary *) lookupContactEntryWithUIDorEmail: (NSString *) entryID;
+- (NGLdapEntry *) lookupGroupEntry: (NSString *) theID;
+
 - (NSArray *) allEntryIDs;
 - (NSArray *) fetchContactsMatching: (NSString *) filter;
 - (NSString *) sourceID;

SoObjects/SOGo/LDAPSource.m

@@ -377,6 +377,21 @@ static NSLock *lock;
   return userDN;
 }
 
+- (NSString *) loginForDN: (NSString *) theDN
+{
+  NGLdapEntry *entry;
+  
+  entry = [ldapConnection entryAtDN: theDN
+			  attributes: [NSArray arrayWithObject: IDField]];
+  
+  if (entry)
+    {
+      return [[entry attributeWithName: IDField] stringValueAtIndex: 0];
+    }
+
+  return nil;
+}
+
 - (BOOL) checkLogin: (NSString *) loginToCheck
 	andPassword: (NSString *) passwordToCheck
 {
@@ -822,6 +837,61 @@ static NSLock *lock;
   return contactEntry;
 }
 
+// Use the email address for now...
+- (NGLdapEntry *) lookupGroupEntry: (NSString *) theID
+{
+  NGLdapEntry *ldapEntry;
+
+#if defined(THREADSAFE)
+  [lock lock];
+#endif
+
+  ldapEntry = nil;
+
+  if ([theID length] > 0)
+    {
+      if ([self _initLDAPConnection])
+	{
+	  NSMutableArray *attributes;
+	  NSEnumerator *entries;
+	  EOQualifier *qualifier;
+	  NSString *s;
+	  
+	  // FIXME
+	  s = [NSString stringWithFormat: @"(mail='%@')", theID];
+	  qualifier = [EOQualifier qualifierWithQualifierFormat: s];
+	  
+	  // We look for additional attributes - the ones related to group membership
+	  attributes = [NSMutableArray arrayWithArray: [self _searchAttributes]];
+	  [attributes addObject: @"member"];
+	  [attributes addObject: @"memberOf"];
+
+	  if ([_scope caseInsensitiveCompare: @"BASE"] == NSOrderedSame)
+	    entries = [ldapConnection baseSearchAtBaseDN: baseDN
+				      qualifier: qualifier
+				      attributes: attributes];
+	  else if ([_scope caseInsensitiveCompare: @"ONE"] == NSOrderedSame)
+	    entries = [ldapConnection flatSearchAtBaseDN: baseDN
+				      qualifier: qualifier
+				      attributes: attributes];
+	  else
+	    entries = [ldapConnection deepSearchAtBaseDN: baseDN
+				      qualifier: qualifier
+				      attributes: attributes];
+	  
+	  ldapEntry = [entries nextObject];
+	}
+
+      [ldapConnection autorelease];
+    }
+
+#if defined(THREADSAFE)
+  [lock unlock];
+#endif
+
+  return ldapEntry;
+}
+
 - (NSString *) sourceID
 {
   return sourceID;

SoObjects/SOGo/LDAPUserManager.h

@@ -29,6 +29,7 @@
 @class NSMutableDictionary;
 @class NSString;
 @class NSTimer;
+@class NGLdapEntry;
 
 @class LDAPSource;
 

SoObjects/SOGo/LDAPUserManager.m

@@ -164,6 +164,7 @@ static NSLock *lock = nil;
 - (void) dealloc
 {
   [sources release];
+  [sourcesMetadata release];
   [super dealloc];
 }
 

SoObjects/SOGo/SOGoFolder.m

@@ -1,6 +1,6 @@
 /* SOGoFolder.m - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
+ * Copyright (C) 2007-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *

SoObjects/SOGo/SOGoGroup.h

@@ -0,0 +1,47 @@
+/* SOGoGroup.h - this file is part of SOGo
+ *
+ * Copyright (C) 2009 Inverse inc.
+ *
+ * Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __SOGOGROUP_H__
+#define __SOGOGROUP_H__
+
+#import <Foundation/NSObject.h>
+
+@class LDAPSource;
+@class NSArray;
+@class NSString;
+@class NGLdapEntry;
+
+@interface SOGoGroup : NSObject
+{
+  @private 
+    NSString *_identifier;
+    NGLdapEntry *_entry;
+    LDAPSource *_source;
+}
+
++ (id) groupWithIdentifier: (NSString *) theID;
+
+- (NSArray *) members;
+
+@end
+
+#endif // __SOGOGROUP_H__

SoObjects/SOGo/SOGoGroup.m

@@ -0,0 +1,215 @@
+/* SOGoGroup.m - this file is part of SOGo
+ *
+ * Copyright (C) 2009 Inverse inc.
+ *
+ * Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+  Here are some group samples:
+
+
+  [ POSIX group ]
+
+  dn: cn=it-staff,ou=Group,dc=zzz,dc=xxx,dc=yyy
+  objectClass: posixGroup
+  objectClass: top
+  cn: it-staff
+  userPassword: {crypt}x
+  gidNumber: 8000
+  memberUid: lsa
+  memberUid: mrm
+  memberUid: ij
+  memberUid: no
+  memberUid: ld
+  memberUid: db
+  memberUid: rgl
+  memberUid: ja
+  memberUid: hbt
+  memberUid: hossein
+
+ */
+
+#include "SOGoGroup.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+
+#include "LDAPSource.h"
+#include "LDAPUserManager.h"
+#include "SOGoUser.h"
+
+#import <NGLdap/NGLdapConnection.h>
+#import <NGLdap/NGLdapAttribute.h>
+#import <NGLdap/NGLdapEntry.h>
+
+@implementation SOGoGroup
+
+- (id) initWithIdentifier: (NSString *) theID
+		   source: (LDAPSource *) theSource
+		    entry: (NGLdapEntry *) theEntry
+{
+  self = [super init];
+
+  if (self)
+    {
+      ASSIGN(_identifier, theID);
+      ASSIGN(_source, theSource);
+      ASSIGN(_entry, theEntry);
+    }
+
+  return self;
+}
+
+- (void) dealloc
+{
+  RELEASE(_identifier);
+  RELEASE(_source);
+  RELEASE(_entry);
+
+  [super dealloc];
+}
+
+//
+// Returns nil if theID (which is an email address) doesn't
+// actually match to a group (so its objectClass isn't really a group)
+//
++ (id) groupWithIdentifier: (NSString *) theID
+{
+  NSArray *allSources;
+  NGLdapEntry *entry;
+  LDAPSource *source;
+  id o;
+  
+  int i;
+
+  // Don't bother looking in all sources if the
+  // supplied email address is nil.
+  if (!theID)
+    return nil;
+
+  allSources = [[LDAPUserManager sharedUserManager] sourceIDs];
+  o = nil;
+
+  for (i = 0; i < [allSources count]; i++)
+    {
+      source = [[LDAPUserManager sharedUserManager] sourceWithID: [allSources objectAtIndex: i]];
+      entry = [source lookupGroupEntry: theID];
+
+      if (entry)
+	break;
+
+      entry = nil;
+    }
+  
+  if (entry)
+    {
+      NSArray *classes;
+      
+      // We check to see if it's a group
+      classes = [[entry attributeWithName: @"objectClass"] allStringValues];
+      NSLog(@"classes = %@", classes);
+
+      // Found a group, let's return it.
+      if ([classes containsObject: @"group"] ||
+	  [classes containsObject: @"groupOfNames"] ||
+	  [classes containsObject: @"groupOfUniqueNames"] ||
+	  [classes containsObject: @"posixGroup"])
+	{
+	  o = [[self alloc] initWithIdentifier: theID
+			    source: source
+			    entry: entry];
+	  AUTORELEASE(o);
+	}
+    }
+  
+  return o;
+}
+
+//
+// This method actually try to obtain all members
+// from either dynamic of static groups.
+//
+- (NSArray *) members
+{
+  NSMutableArray *dns, *uids;
+  NSMutableArray *array;
+  NSString *login;
+  SOGoUser *user;
+  NSArray *o;
+  int i, c;
+
+  array = [NSMutableArray array];
+  uids = [NSMutableArray array];
+  dns = [NSMutableArray array];
+
+  // We check if it's a static group
+  NSLog(@"attributes = %@", [_entry attributes]);
+  
+  // Fetch "members" - we get DNs
+  o = [[_entry attributeWithName: @"member"] allStringValues];
+  if (o) [dns addObjectsFromArray: o];
+
+  // Fetch "uniqueMembers" - we get DNs
+  o = [[_entry attributeWithName: @"uniqueMember"] allStringValues];
+  if (o) [dns addObjectsFromArray: o];
+  
+  // Fetch "memberUid" - we get UID (like login names)
+  o = [[_entry attributeWithName: @"memberUid"] allStringValues];
+  if (o) [uids addObjectsFromArray: o];
+
+  c = [dns count] + [uids count];
+
+  NSLog(@"members count (static group): %d", c);
+
+  // We deal with a static group, let's add the members
+  if (c)
+    {
+      // We add members for whom we have their associated DN
+      for (i = 0; i < [dns count]; i++)
+	{
+	  login = [_source loginForDN: [dns objectAtIndex: i]];
+	  NSLog(@"member = %@", login);
+	  user = [SOGoUser userWithLogin: login  roles: nil];
+	  
+	  if (user)
+	    [array addObject: user];
+	}
+
+      // We add members for whom we have their associated login name
+      for (i = 0; i < [uids count]; i++)
+	{
+	  login = [uids objectAtIndex: i];
+	  NSLog(@"member = %@", login);
+	  user = [SOGoUser userWithLogin: login  roles: nil];
+	  
+	  if (user)
+	    [array addObject: user];
+	}
+    }
+  else
+    {
+      // We deal with a dynamic group, let's search all users for whom
+      // memberOf is equal to our group's DN.
+      // We also need to look for labelelURI?
+    }
+  
+  return array;
+}
+
+@end