r18867: change the group mapping code to use ldb instead of tdb

See the discussion of this on the samba-technical list
(This used to be commit 4ad1436ceae0128e187222fce0fc79adb3049d3f)

1 files changed, 1 insertions, 648 deletions

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 1d7934e9bf..ba1a7d1dee 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -22,116 +22,7 @@
  */
 
 #include "includes.h"
-
-static TDB_CONTEXT *tdb; /* used for driver files */
-
-#define DATABASE_VERSION_V1 1 /* native byte format. */
-#define DATABASE_VERSION_V2 2 /* le format. */
-
-#define GROUP_PREFIX "UNIXGROUP/"
-
-/* Alias memberships are stored reverse, as memberships. The performance
- * critical operation is to determine the aliases a SID is member of, not
- * listing alias members. So we store a list of alias SIDs a SID is member of
- * hanging of the member as key.
- */
-#define MEMBEROF_PREFIX "MEMBEROF/"
-
-
-static BOOL enum_group_mapping(const DOM_SID *sid, enum lsa_SidType sid_name_use, GROUP_MAP **pp_rmap,
-                               size_t *p_num_entries, BOOL unix_only);
-static BOOL group_map_remove(const DOM_SID *sid);
-			
-/****************************************************************************
- Open the group mapping tdb.
-****************************************************************************/
-
-static BOOL init_group_mapping(void)
-{
-	const char *vstring = "INFO/version";
-	int32 vers_id;
-	GROUP_MAP *map_table = NULL;
-	size_t num_entries = 0;
-	
-	if (tdb)
-		return True;
-		
-	tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-	if (!tdb) {
-		DEBUG(0,("Failed to open group mapping database\n"));
-		return False;
-	}
-
-	/* handle a Samba upgrade */
-	tdb_lock_bystring(tdb, vstring);
-
-	/* Cope with byte-reversed older versions of the db. */
-	vers_id = tdb_fetch_int32(tdb, vstring);
-	if ((vers_id == DATABASE_VERSION_V1) || (IREV(vers_id) == DATABASE_VERSION_V1)) {
-		/* Written on a bigendian machine with old fetch_int code. Save as le. */
-		tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
-		vers_id = DATABASE_VERSION_V2;
-	}
-
-	/* if its an unknown version we remove everthing in the db */
-	
-	if (vers_id != DATABASE_VERSION_V2) {
-		tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
-		tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
-	}
-
-	tdb_unlock_bystring(tdb, vstring);
-
-	/* cleanup any map entries with a gid == -1 */
-	
-	if ( enum_group_mapping( NULL, SID_NAME_UNKNOWN, &map_table, &num_entries, False ) ) {
-		int i;
-		
-		for ( i=0; i<num_entries; i++ ) {
-			if ( map_table[i].gid == -1 ) {
-				group_map_remove( &map_table[i].sid );
-			}
-		}
-		
-		SAFE_FREE( map_table );
-	}
-
-
-	return True;
-}
-
-/****************************************************************************
-****************************************************************************/
-static BOOL add_mapping_entry(GROUP_MAP *map, int flag)
-{
-	TDB_DATA kbuf, dbuf;
-	pstring key, buf;
-	fstring string_sid="";
-	int len;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-	
-	sid_to_string(string_sid, &map->sid);
-
-	len = tdb_pack(buf, sizeof(buf), "ddff",
-			map->gid, map->sid_name_use, map->nt_name, map->comment);
-
-	if (len > sizeof(buf))
-		return False;
-
-	slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
-
-	kbuf.dsize = strlen(key)+1;
-	kbuf.dptr = key;
-	dbuf.dsize = len;
-	dbuf.dptr = buf;
-	if (tdb_store(tdb, kbuf, dbuf, flag) != 0) return False;
-
-	return True;
-}
+#include "groupdb/mapping.h"
 
 /****************************************************************************
 initialise first time the mapping list
@@ -216,327 +107,11 @@ NTSTATUS map_unix_group(const struct group *grp, GROUP_MAP *pmap)
 	return status;
 }
 
-/****************************************************************************
- Return the sid and the type of the unix group.
-****************************************************************************/
-
-static BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
-{
-	TDB_DATA kbuf, dbuf;
-	pstring key;
-	fstring string_sid;
-	int ret = 0;
-	
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	/* the key is the SID, retrieving is direct */
-
-	sid_to_string(string_sid, &sid);
-	slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
-
-	kbuf.dptr = key;
-	kbuf.dsize = strlen(key)+1;
-		
-	dbuf = tdb_fetch(tdb, kbuf);
-	if (!dbuf.dptr)
-		return False;
-
-	ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-				&map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
-
-	SAFE_FREE(dbuf.dptr);
-	
-	if ( ret == -1 ) {
-		DEBUG(3,("get_group_map_from_sid: tdb_unpack failure\n"));
-		return False;
-	}
-	
-	sid_copy(&map->sid, &sid);
-	
-	return True;
-}
-
-/****************************************************************************
- Return the sid and the type of the unix group.
-****************************************************************************/
-
-static BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
-{
-	TDB_DATA kbuf, dbuf, newkey;
-	fstring string_sid;
-	int ret;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	/* we need to enumerate the TDB to find the GID */
-
-	for (kbuf = tdb_firstkey(tdb); 
-	     kbuf.dptr; 
-	     newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
-
-		if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0) continue;
-		
-		dbuf = tdb_fetch(tdb, kbuf);
-		if (!dbuf.dptr)
-			continue;
-
-		fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
-
-		string_to_sid(&map->sid, string_sid);
-		
-		ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-				 &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
-
-		SAFE_FREE(dbuf.dptr);
-
-		if ( ret == -1 ) {
-			DEBUG(3,("get_group_map_from_gid: tdb_unpack failure\n"));
-			return False;
-		}
-	
-		if (gid==map->gid) {
-			SAFE_FREE(kbuf.dptr);
-			return True;
-		}
-	}
-
-	return False;
-}
-
-/****************************************************************************
- Return the sid and the type of the unix group.
-****************************************************************************/
-
-static BOOL get_group_map_from_ntname(const char *name, GROUP_MAP *map)
-{
-	TDB_DATA kbuf, dbuf, newkey;
-	fstring string_sid;
-	int ret;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("get_group_map_from_ntname:failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	/* we need to enumerate the TDB to find the name */
 
-	for (kbuf = tdb_firstkey(tdb); 
-	     kbuf.dptr; 
-	     newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
 
-		if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0) continue;
-		
-		dbuf = tdb_fetch(tdb, kbuf);
-		if (!dbuf.dptr)
-			continue;
 
-		fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
 
-		string_to_sid(&map->sid, string_sid);
-		
-		ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-				 &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
 
-		SAFE_FREE(dbuf.dptr);
-		
-		if ( ret == -1 ) {
-			DEBUG(3,("get_group_map_from_ntname: tdb_unpack failure\n"));
-			return False;
-		}
-
-		if ( strequal(name, map->nt_name) ) {
-			SAFE_FREE(kbuf.dptr);
-			return True;
-		}
-	}
-
-	return False;
-}
-
-/****************************************************************************
- Remove a group mapping entry.
-****************************************************************************/
-
-static BOOL group_map_remove(const DOM_SID *sid)
-{
-	TDB_DATA kbuf, dbuf;
-	pstring key;
-	fstring string_sid;
-	
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	/* the key is the SID, retrieving is direct */
-
-	sid_to_string(string_sid, sid);
-	slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
-
-	kbuf.dptr = key;
-	kbuf.dsize = strlen(key)+1;
-		
-	dbuf = tdb_fetch(tdb, kbuf);
-	if (!dbuf.dptr)
-		return False;
-	
-	SAFE_FREE(dbuf.dptr);
-
-	if(tdb_delete(tdb, kbuf) != TDB_SUCCESS)
-		return False;
-
-	return True;
-}
-
-/****************************************************************************
- Enumerate the group mapping.
-****************************************************************************/
-
-static BOOL enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType sid_name_use, GROUP_MAP **pp_rmap,
-			size_t *p_num_entries, BOOL unix_only)
-{
-	TDB_DATA kbuf, dbuf, newkey;
-	fstring string_sid;
-	GROUP_MAP map;
-	GROUP_MAP *mapt;
-	int ret;
-	size_t entries=0;
-	DOM_SID grpsid;
-	uint32 rid;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	*p_num_entries=0;
-	*pp_rmap=NULL;
-
-	for (kbuf = tdb_firstkey(tdb); 
-	     kbuf.dptr; 
-	     newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
-
-		if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0)
-			continue;
-
-		dbuf = tdb_fetch(tdb, kbuf);
-		if (!dbuf.dptr)
-			continue;
-
-		fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
-				
-		ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-				 &map.gid, &map.sid_name_use, &map.nt_name, &map.comment);
-
-		SAFE_FREE(dbuf.dptr);
-
-		if ( ret == -1 ) {
-			DEBUG(3,("enum_group_mapping: tdb_unpack failure\n"));
-			continue;
-		}
-	
-		/* list only the type or everything if UNKNOWN */
-		if (sid_name_use!=SID_NAME_UNKNOWN  && sid_name_use!=map.sid_name_use) {
-			DEBUG(11,("enum_group_mapping: group %s is not of the requested type\n", map.nt_name));
-			continue;
-		}
-
-		if (unix_only==ENUM_ONLY_MAPPED && map.gid==-1) {
-			DEBUG(11,("enum_group_mapping: group %s is non mapped\n", map.nt_name));
-			continue;
-		}
-
-		string_to_sid(&grpsid, string_sid);
-		sid_copy( &map.sid, &grpsid );
-		
-		sid_split_rid( &grpsid, &rid );
-
-		/* Only check the domain if we were given one */
-
-		if ( domsid && !sid_equal( domsid, &grpsid ) ) {
-			DEBUG(11,("enum_group_mapping: group %s is not in domain %s\n", 
-				string_sid, sid_string_static(domsid)));
-			continue;
-		}
-
-		DEBUG(11,("enum_group_mapping: returning group %s of "
-			  "type %s\n", map.nt_name,
-			  sid_type_lookup(map.sid_name_use)));
-
-		(*pp_rmap) = SMB_REALLOC_ARRAY((*pp_rmap), GROUP_MAP, entries+1);
-		if (!(*pp_rmap)) {
-			DEBUG(0,("enum_group_mapping: Unable to enlarge group map!\n"));
-			return False;
-		}
-
-		mapt = (*pp_rmap);
-
-		mapt[entries].gid = map.gid;
-		sid_copy( &mapt[entries].sid, &map.sid);
-		mapt[entries].sid_name_use = map.sid_name_use;
-		fstrcpy(mapt[entries].nt_name, map.nt_name);
-		fstrcpy(mapt[entries].comment, map.comment);
-
-		entries++;
-
-	}
-
-	*p_num_entries=entries;
-
-	return True;
-}
-
-/* This operation happens on session setup, so it should better be fast. We
- * store a list of aliases a SID is member of hanging off MEMBEROF/SID. */
-
-static NTSTATUS one_alias_membership(const DOM_SID *member,
-				     DOM_SID **sids, size_t *num)
-{
-	fstring key, string_sid;
-	TDB_DATA kbuf, dbuf;
-	const char *p;
-
-	if (!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	sid_to_string(string_sid, member);
-	slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, string_sid);
-
-	kbuf.dsize = strlen(key)+1;
-	kbuf.dptr = key;
-
-	dbuf = tdb_fetch(tdb, kbuf);
-
-	if (dbuf.dptr == NULL) {
-		return NT_STATUS_OK;
-	}
-
-	p = dbuf.dptr;
-
-	while (next_token(&p, string_sid, " ", sizeof(string_sid))) {
-
-		DOM_SID alias;
-
-		if (!string_to_sid(&alias, string_sid))
-			continue;
-
-		add_sid_to_array_unique(NULL, &alias, sids, num);
-
-		if (sids == NULL)
-			return NT_STATUS_NO_MEMORY;
-	}
-
-	SAFE_FREE(dbuf.dptr);
-	return NT_STATUS_OK;
-}
 
 static NTSTATUS alias_memberships(const DOM_SID *members, size_t num_members,
 				  DOM_SID **sids, size_t *num)
@@ -554,235 +129,13 @@ static NTSTATUS alias_memberships(const DOM_SID *members, size_t num_members,
 	return NT_STATUS_OK;
 }
 
-static BOOL is_aliasmem(const DOM_SID *alias, const DOM_SID *member)
-{
-	DOM_SID *sids;
-	size_t i, num;
-
-	/* This feels the wrong way round, but the on-disk data structure
-	 * dictates it this way. */
-	if (!NT_STATUS_IS_OK(alias_memberships(member, 1, &sids, &num)))
-		return False;
-
-	for (i=0; i<num; i++) {
-		if (sid_compare(alias, &sids[i]) == 0) {
-			SAFE_FREE(sids);
-			return True;
-		}
-	}
-	SAFE_FREE(sids);
-	return False;
-}
-
-static NTSTATUS add_aliasmem(const DOM_SID *alias, const DOM_SID *member)
-{
-	GROUP_MAP map;
-	TDB_DATA kbuf, dbuf;
-	pstring key;
-	fstring string_sid;
-	char *new_memberstring;
-	int result;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	if (!get_group_map_from_sid(*alias, &map))
-		return NT_STATUS_NO_SUCH_ALIAS;
-
-	if ( (map.sid_name_use != SID_NAME_ALIAS) &&
-	     (map.sid_name_use != SID_NAME_WKN_GRP) )
-		return NT_STATUS_NO_SUCH_ALIAS;
-
-	if (is_aliasmem(alias, member))
-		return NT_STATUS_MEMBER_IN_ALIAS;
-
-	sid_to_string(string_sid, member);
-	slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, string_sid);
-
-	kbuf.dsize = strlen(key)+1;
-	kbuf.dptr = key;
-
-	dbuf = tdb_fetch(tdb, kbuf);
-
-	sid_to_string(string_sid, alias);
-
-	if (dbuf.dptr != NULL) {
-		asprintf(&new_memberstring, "%s %s", (char *)(dbuf.dptr),
-			 string_sid);
-	} else {
-		new_memberstring = SMB_STRDUP(string_sid);
-	}
-
-	if (new_memberstring == NULL)
-		return NT_STATUS_NO_MEMORY;
-
-	SAFE_FREE(dbuf.dptr);
-	dbuf.dsize = strlen(new_memberstring)+1;
-	dbuf.dptr = new_memberstring;
-
-	result = tdb_store(tdb, kbuf, dbuf, 0);
-
-	SAFE_FREE(new_memberstring);
-
-	return (result == 0 ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED);
-}
-
 struct aliasmem_closure {
 	const DOM_SID *alias;
 	DOM_SID **sids;
 	size_t *num;
 };
 
-static int collect_aliasmem(TDB_CONTEXT *tdb_ctx, TDB_DATA key, TDB_DATA data,
-			    void *state)
-{
-	struct aliasmem_closure *closure = (struct aliasmem_closure *)state;
-	const char *p;
-	fstring alias_string;
-
-	if (strncmp(key.dptr, MEMBEROF_PREFIX,
-		    strlen(MEMBEROF_PREFIX)) != 0)
-		return 0;
-
-	p = data.dptr;
-
-	while (next_token(&p, alias_string, " ", sizeof(alias_string))) {
-
-		DOM_SID alias, member;
-		const char *member_string;
-		
-
-		if (!string_to_sid(&alias, alias_string))
-			continue;
-
-		if (sid_compare(closure->alias, &alias) != 0)
-			continue;
-
-		/* Ok, we found the alias we're looking for in the membership
-		 * list currently scanned. The key represents the alias
-		 * member. Add that. */
-
-		member_string = strchr(key.dptr, '/');
-
-		/* Above we tested for MEMBEROF_PREFIX which includes the
-		 * slash. */
-
-		SMB_ASSERT(member_string != NULL);
-		member_string += 1;
-
-		if (!string_to_sid(&member, member_string))
-			continue;
-		
-		add_sid_to_array(NULL, &member, closure->sids, closure->num);
-	}
-
-	return 0;
-}
-
-static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num)
-{
-	GROUP_MAP map;
-	struct aliasmem_closure closure;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	if (!get_group_map_from_sid(*alias, &map))
-		return NT_STATUS_NO_SUCH_ALIAS;
-
-	if ( (map.sid_name_use != SID_NAME_ALIAS) &&
-	     (map.sid_name_use != SID_NAME_WKN_GRP) )
-		return NT_STATUS_NO_SUCH_ALIAS;
-
-	*sids = NULL;
-	*num = 0;
-
-	closure.alias = alias;
-	closure.sids = sids;
-	closure.num = num;
-
-	tdb_traverse(tdb, collect_aliasmem, &closure);
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
-{
-	NTSTATUS result;
-	DOM_SID *sids;
-	size_t i, num;
-	BOOL found = False;
-	char *member_string;
-	TDB_DATA kbuf, dbuf;
-	pstring key;
-	fstring sid_string;
-
-	result = alias_memberships(member, 1, &sids, &num);
-
-	if (!NT_STATUS_IS_OK(result))
-		return result;
-
-	for (i=0; i<num; i++) {
-		if (sid_compare(&sids[i], alias) == 0) {
-			found = True;
-			break;
-		}
-	}
 
-	if (!found) {
-		SAFE_FREE(sids);
-		return NT_STATUS_MEMBER_NOT_IN_ALIAS;
-	}
-
-	if (i < num)
-		sids[i] = sids[num-1];
-
-	num -= 1;
-
-	sid_to_string(sid_string, member);
-	slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, sid_string);
-
-	kbuf.dsize = strlen(key)+1;
-	kbuf.dptr = key;
-
-	if (num == 0)
-		return tdb_delete(tdb, kbuf) == 0 ?
-			NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-
-	member_string = SMB_STRDUP("");
-
-	if (member_string == NULL) {
-		SAFE_FREE(sids);
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	for (i=0; i<num; i++) {
-		char *s = member_string;
-
-		sid_to_string(sid_string, &sids[i]);
-		asprintf(&member_string, "%s %s", s, sid_string);
-
-		SAFE_FREE(s);
-		if (member_string == NULL) {
-			SAFE_FREE(sids);
-			return NT_STATUS_NO_MEMORY;
-		}
-	}
-
-	dbuf.dsize = strlen(member_string)+1;
-	dbuf.dptr = member_string;
-
-	result = tdb_store(tdb, kbuf, dbuf, 0) == 0 ?
-		NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
-
-	SAFE_FREE(sids);
-	SAFE_FREE(member_string);
-
-	return result;
-}
 
 /*
  *