groupdb: don't leak state_path onto talloc tos
[samba.git] / source3 / groupdb / mapping_tdb.c
index cf8857cda541990cff878745933d5ea41b361999..ab79b687e16babe8ddfc87a7b0f4f2c54270608b 100644 (file)
 #include "system/filesys.h"
 #include "passdb.h"
 #include "groupdb/mapping.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
 #include "util_tdb.h"
 #include "../libcli/security/security.h"
+#include "groupdb/mapping_tdb.h"
 
 static struct db_context *db; /* used for driver files */
 
 static bool enum_group_mapping(const struct dom_sid *domsid,
                               enum lsa_SidType sid_name_use,
-                              GROUP_MAP **pp_rmap,
+                              GROUP_MAP ***pp_rmap,
                               size_t *p_num_entries,
                               bool unix_only);
 static bool group_map_remove(const struct dom_sid *sid);
@@ -44,23 +46,35 @@ static bool mapping_switch(const char *ldb_path);
 ****************************************************************************/
 static bool init_group_mapping(void)
 {
-       const char *ldb_path;
+       char *tdb_path;
+       char *ldb_path;
 
        if (db != NULL) {
                return true;
        }
 
-       db = db_open(NULL, state_path("group_mapping.tdb"), 0,
-                          TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+       tdb_path = state_path("group_mapping.tdb");
+       if (tdb_path == NULL) {
+               return false;
+       }
+       db = db_open(NULL, tdb_path, 0,
+                    TDB_DEFAULT, O_RDWR|O_CREAT, 0600,
+                    DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
        if (db == NULL) {
                DEBUG(0, ("Failed to open group mapping database: %s\n",
                          strerror(errno)));
+               talloc_free(tdb_path);
                return false;
        }
 
        ldb_path = state_path("group_mapping.ldb");
+       if (ldb_path == NULL) {
+               return false;
+       }
        if (file_exist(ldb_path) && !mapping_switch(ldb_path)) {
-               unlink(state_path("group_mapping.tdb"));
+               unlink(tdb_path);
+               talloc_free(tdb_path);
+               talloc_free(ldb_path);
                return false;
 
        } else {
@@ -111,22 +125,22 @@ static bool init_group_mapping(void)
                }
 #endif
        }
+       talloc_free(tdb_path);
+       talloc_free(ldb_path);
        return true;
 }
 
 static char *group_mapping_key(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
 {
-       char *sidstr, *result;
+       char sidstr[DOM_SID_STR_BUFLEN];
+       int len;
 
-       sidstr = sid_string_talloc(talloc_tos(), sid);
-       if (sidstr == NULL) {
+       len = dom_sid_string_buf(sid, sidstr, sizeof(sidstr));
+       if (len >= sizeof(sidstr)) {
                return NULL;
        }
 
-       result = talloc_asprintf(mem_ctx, "%s%s", GROUP_PREFIX, sidstr);
-
-       TALLOC_FREE(sidstr);
-       return result;
+       return talloc_asprintf(mem_ctx, "%s%s", GROUP_PREFIX, sidstr);
 }
 
 /****************************************************************************
@@ -172,6 +186,9 @@ static bool get_group_map_from_sid(struct dom_sid sid, GROUP_MAP *map)
        TDB_DATA dbuf;
        char *key;
        int ret = 0;
+       NTSTATUS status;
+       fstring nt_name;
+       fstring comment;
 
        /* the key is the SID, retrieving is direct */
 
@@ -180,15 +197,15 @@ static bool get_group_map_from_sid(struct dom_sid sid, GROUP_MAP *map)
                return false;
        }
 
-       dbuf = dbwrap_fetch_bystring(db, key, key);
-       if (dbuf.dptr == NULL) {
+       status = dbwrap_fetch_bystring(db, key, key, &dbuf);
+       if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(key);
                return false;
        }
 
        ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
                        &map->gid, &map->sid_name_use,
-                       &map->nt_name, &map->comment);
+                       &nt_name, &comment);
 
        TALLOC_FREE(key);
 
@@ -199,25 +216,56 @@ static bool get_group_map_from_sid(struct dom_sid sid, GROUP_MAP *map)
 
        sid_copy(&map->sid, &sid);
 
+       map->nt_name = talloc_strdup(map, nt_name);
+       if (!map->nt_name) {
+               return false;
+       }
+       map->comment = talloc_strdup(map, comment);
+       if (!map->comment) {
+               return false;
+       }
+
        return true;
 }
 
 static bool dbrec2map(const struct db_record *rec, GROUP_MAP *map)
 {
-       if ((rec->key.dsize < strlen(GROUP_PREFIX))
-           || (strncmp((char *)rec->key.dptr, GROUP_PREFIX,
+       TDB_DATA key = dbwrap_record_get_key(rec);
+       TDB_DATA value = dbwrap_record_get_value(rec);
+       int ret = 0;
+       fstring nt_name;
+       fstring comment;
+
+       if ((key.dsize < strlen(GROUP_PREFIX))
+           || (strncmp((char *)key.dptr, GROUP_PREFIX,
                        GROUP_PREFIX_LEN) != 0)) {
                return False;
        }
 
-       if (!string_to_sid(&map->sid, (const char *)rec->key.dptr
+       if (!string_to_sid(&map->sid, (const char *)key.dptr
                           + GROUP_PREFIX_LEN)) {
                return False;
        }
 
-       return tdb_unpack(rec->value.dptr, rec->value.dsize, "ddff",
-                         &map->gid, &map->sid_name_use, &map->nt_name,
-                         &map->comment) != -1;
+       ret = tdb_unpack(value.dptr, value.dsize, "ddff",
+                         &map->gid, &map->sid_name_use,
+                         &nt_name, &comment);
+
+       if (ret == -1) {
+               DEBUG(3, ("dbrec2map: tdb_unpack failure\n"));
+               return false;
+       }
+
+       map->nt_name = talloc_strdup(map, nt_name);
+       if (!map->nt_name) {
+               return false;
+       }
+       map->comment = talloc_strdup(map, comment);
+       if (!map->comment) {
+               return false;
+       }
+
+       return true;
 }
 
 struct find_map_state {
@@ -265,7 +313,7 @@ static bool get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
        state.gid = gid;
        state.map = map;
 
-       db->traverse_read(db, find_map, (void *)&state);
+       dbwrap_traverse_read(db, find_map, (void *)&state, NULL);
 
        return state.found;
 }
@@ -282,7 +330,7 @@ static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
        state.name = name;
        state.map = map;
 
-       db->traverse_read(db, find_map, (void *)&state);
+       dbwrap_traverse_read(db, find_map, (void *)&state, NULL);
 
        return state.found;
 }
@@ -317,58 +365,71 @@ struct enum_map_state {
        bool unix_only;
 
        size_t num_maps;
-       GROUP_MAP *maps;
+       GROUP_MAP **maps;
 };
 
 static int collect_map(struct db_record *rec, void *private_data)
 {
        struct enum_map_state *state = (struct enum_map_state *)private_data;
-       GROUP_MAP map;
-       GROUP_MAP *tmp;
+       GROUP_MAP *map;
+       GROUP_MAP **tmp;
 
-       if (!dbrec2map(rec, &map)) {
+       map = talloc_zero(NULL, GROUP_MAP);
+       if (!map) {
+               DEBUG(0, ("Unable to allocate group map!\n"));
+               return 1;
+       }
+
+       if (!dbrec2map(rec, map)) {
+               TALLOC_FREE(map);
                return 0;
        }
        /* list only the type or everything if UNKNOWN */
        if (state->sid_name_use != SID_NAME_UNKNOWN
-           && state->sid_name_use != map.sid_name_use) {
+           && state->sid_name_use != map->sid_name_use) {
                DEBUG(11,("enum_group_mapping: group %s is not of the "
-                         "requested type\n", map.nt_name));
+                         "requested type\n", map->nt_name));
+               TALLOC_FREE(map);
                return 0;
        }
 
-       if ((state->unix_only == ENUM_ONLY_MAPPED) && (map.gid == -1)) {
+       if ((state->unix_only == ENUM_ONLY_MAPPED) && (map->gid == -1)) {
                DEBUG(11,("enum_group_mapping: group %s is non mapped\n",
-                         map.nt_name));
+                         map->nt_name));
+               TALLOC_FREE(map);
                return 0;
        }
 
        if ((state->domsid != NULL) &&
-           (dom_sid_compare_domain(state->domsid, &map.sid) != 0)) {
+           (dom_sid_compare_domain(state->domsid, &map->sid) != 0)) {
                DEBUG(11,("enum_group_mapping: group %s is not in domain\n",
-                         sid_string_dbg(&map.sid)));
+                         sid_string_dbg(&map->sid)));
+               TALLOC_FREE(map);
                return 0;
        }
 
-       if (!(tmp = SMB_REALLOC_ARRAY(state->maps, GROUP_MAP,
-                                     state->num_maps+1))) {
+       tmp = talloc_realloc(NULL, state->maps, GROUP_MAP *,
+                                       state->num_maps + 1);
+       if (!tmp) {
                DEBUG(0,("enum_group_mapping: Unable to enlarge group "
                         "map!\n"));
+               TALLOC_FREE(map);
                return 1;
        }
 
        state->maps = tmp;
-       state->maps[state->num_maps] = map;
+       state->maps[state->num_maps] = talloc_move(state->maps, &map);
        state->num_maps++;
        return 0;
 }
 
 static bool enum_group_mapping(const struct dom_sid *domsid,
                               enum lsa_SidType sid_name_use,
-                              GROUP_MAP **pp_rmap,
+                              GROUP_MAP ***pp_rmap,
                               size_t *p_num_entries, bool unix_only)
 {
        struct enum_map_state state;
+       NTSTATUS status;
 
        state.domsid = domsid;
        state.sid_name_use = sid_name_use;
@@ -376,7 +437,9 @@ static bool enum_group_mapping(const struct dom_sid *domsid,
        state.num_maps = 0;
        state.maps = NULL;
 
-       if (db->traverse_read(db, collect_map, (void *)&state) < 0) {
+       status = dbwrap_traverse_read(db, collect_map, (void *)&state, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(state.maps);
                return false;
        }
 
@@ -403,8 +466,8 @@ static NTSTATUS one_alias_membership(const struct dom_sid *member,
        slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX,
                 sid_to_fstring(tmp, member));
 
-       dbuf = dbwrap_fetch_bystring(db, frame, key);
-       if (dbuf.dptr == NULL) {
+       status = dbwrap_fetch_bystring(db, frame, key, &dbuf);
+       if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(frame);
                return NT_STATUS_OK;
        }
@@ -471,19 +534,31 @@ static bool is_aliasmem(const struct dom_sid *alias, const struct dom_sid *membe
 
 static NTSTATUS add_aliasmem(const struct dom_sid *alias, const struct dom_sid *member)
 {
-       GROUP_MAP map;
+       GROUP_MAP *map;
        char *key;
        fstring string_sid;
        char *new_memberstring;
        struct db_record *rec;
        NTSTATUS status;
+       TDB_DATA value;
+
+       map = talloc_zero(talloc_tos(), GROUP_MAP);
+       if (!map) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       if (!get_group_map_from_sid(*alias, &map))
+       if (!get_group_map_from_sid(*alias, map)) {
+               TALLOC_FREE(map);
                return NT_STATUS_NO_SUCH_ALIAS;
+       }
 
-       if ( (map.sid_name_use != SID_NAME_ALIAS) &&
-            (map.sid_name_use != SID_NAME_WKN_GRP) )
+       if ((map->sid_name_use != SID_NAME_ALIAS) &&
+           (map->sid_name_use != SID_NAME_WKN_GRP)) {
+               TALLOC_FREE(map);
                return NT_STATUS_NO_SUCH_ALIAS;
+       }
+
+       TALLOC_FREE(map);
 
        if (is_aliasmem(alias, member))
                return NT_STATUS_MEMBER_IN_ALIAS;
@@ -496,12 +571,12 @@ static NTSTATUS add_aliasmem(const struct dom_sid *alias, const struct dom_sid *
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (db->transaction_start(db) != 0) {
+       if (dbwrap_transaction_start(db) != 0) {
                DEBUG(0, ("transaction_start failed\n"));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
-       rec = db->fetch_locked(db, key, string_term_tdb_data(key));
+       rec = dbwrap_fetch_locked(db, key, string_term_tdb_data(key));
 
        if (rec == NULL) {
                DEBUG(10, ("fetch_lock failed\n"));
@@ -510,11 +585,13 @@ static NTSTATUS add_aliasmem(const struct dom_sid *alias, const struct dom_sid *
                goto cancel;
        }
 
+       value = dbwrap_record_get_value(rec);
+
        sid_to_fstring(string_sid, alias);
 
-       if (rec->value.dptr != NULL) {
+       if (value.dptr != NULL) {
                new_memberstring = talloc_asprintf(
-                       key, "%s %s", (char *)(rec->value.dptr), string_sid);
+                       key, "%s %s", (char *)(value.dptr), string_sid);
        } else {
                new_memberstring = talloc_strdup(key, string_sid);
        }
@@ -525,7 +602,7 @@ static NTSTATUS add_aliasmem(const struct dom_sid *alias, const struct dom_sid *
                goto cancel;
        }
 
-       status = rec->store(rec, string_term_tdb_data(new_memberstring), 0);
+       status = dbwrap_record_store(rec, string_term_tdb_data(new_memberstring), 0);
 
        TALLOC_FREE(key);
 
@@ -534,7 +611,7 @@ static NTSTATUS add_aliasmem(const struct dom_sid *alias, const struct dom_sid *
                goto cancel;
        }
 
-       if (db->transaction_commit(db) != 0) {
+       if (dbwrap_transaction_commit(db) != 0) {
                DEBUG(0, ("transaction_commit failed\n"));
                status = NT_STATUS_INTERNAL_DB_CORRUPTION;
                return status;
@@ -543,7 +620,7 @@ static NTSTATUS add_aliasmem(const struct dom_sid *alias, const struct dom_sid *
        return NT_STATUS_OK;
 
  cancel:
-       if (db->transaction_cancel(db) != 0) {
+       if (dbwrap_transaction_cancel(db) != 0) {
                smb_panic("transaction_cancel failed");
        }
 
@@ -563,12 +640,14 @@ static int collect_aliasmem(struct db_record *rec, void *priv)
        const char *p;
        char *alias_string;
        TALLOC_CTX *frame;
+       TDB_DATA key = dbwrap_record_get_key(rec);
+       TDB_DATA value = dbwrap_record_get_value(rec);
 
-       if (strncmp((const char *)rec->key.dptr, MEMBEROF_PREFIX,
+       if (strncmp((const char *)key.dptr, MEMBEROF_PREFIX,
                    MEMBEROF_PREFIX_LEN) != 0)
                return 0;
 
-       p = (const char *)rec->value.dptr;
+       p = (const char *)value.dptr;
 
        frame = talloc_stackframe();
 
@@ -587,7 +666,7 @@ static int collect_aliasmem(struct db_record *rec, void *priv)
                 * list currently scanned. The key represents the alias
                 * member. Add that. */
 
-               member_string = strchr((const char *)rec->key.dptr, '/');
+               member_string = strchr((const char *)key.dptr, '/');
 
                /* Above we tested for MEMBEROF_PREFIX which includes the
                 * slash. */
@@ -616,15 +695,26 @@ static int collect_aliasmem(struct db_record *rec, void *priv)
 static NTSTATUS enum_aliasmem(const struct dom_sid *alias, TALLOC_CTX *mem_ctx,
                              struct dom_sid **sids, size_t *num)
 {
-       GROUP_MAP map;
+       GROUP_MAP *map;
        struct aliasmem_state state;
 
-       if (!get_group_map_from_sid(*alias, &map))
+       map = talloc_zero(talloc_tos(), GROUP_MAP);
+       if (!map) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (!get_group_map_from_sid(*alias, map)) {
+               TALLOC_FREE(map);
                return NT_STATUS_NO_SUCH_ALIAS;
+       }
 
-       if ( (map.sid_name_use != SID_NAME_ALIAS) &&
-            (map.sid_name_use != SID_NAME_WKN_GRP) )
+       if ((map->sid_name_use != SID_NAME_ALIAS) &&
+           (map->sid_name_use != SID_NAME_WKN_GRP)) {
+               TALLOC_FREE(map);
                return NT_STATUS_NO_SUCH_ALIAS;
+       }
+
+       TALLOC_FREE(map);
 
        *sids = NULL;
        *num = 0;
@@ -634,7 +724,7 @@ static NTSTATUS enum_aliasmem(const struct dom_sid *alias, TALLOC_CTX *mem_ctx,
        state.num = num;
        state.mem_ctx = mem_ctx;
 
-       db->traverse_read(db, collect_aliasmem, &state);
+       dbwrap_traverse_read(db, collect_aliasmem, &state, NULL);
        return NT_STATUS_OK;
 }
 
@@ -648,7 +738,7 @@ static NTSTATUS del_aliasmem(const struct dom_sid *alias, const struct dom_sid *
        char *key;
        fstring sid_string;
 
-       if (db->transaction_start(db) != 0) {
+       if (dbwrap_transaction_start(db) != 0) {
                DEBUG(0, ("transaction_start failed\n"));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
@@ -723,7 +813,7 @@ static NTSTATUS del_aliasmem(const struct dom_sid *alias, const struct dom_sid *
                goto cancel;
        }
 
-       if (db->transaction_commit(db) != 0) {
+       if (dbwrap_transaction_commit(db) != 0) {
                DEBUG(0, ("transaction_commit failed\n"));
                status = NT_STATUS_INTERNAL_DB_CORRUPTION;
                return status;
@@ -732,7 +822,7 @@ static NTSTATUS del_aliasmem(const struct dom_sid *alias, const struct dom_sid *
        return NT_STATUS_OK;
 
  cancel:
-       if (db->transaction_cancel(db) != 0) {
+       if (dbwrap_transaction_cancel(db) != 0) {
                smb_panic("transaction_cancel failed");
        }
        return status;
@@ -761,7 +851,7 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key,
                              TDB_DATA data, void *ptr)
 {
        TALLOC_CTX *tmp_ctx = talloc_tos();
-       GROUP_MAP map;
+       GROUP_MAP *map = NULL;
        uint8_t *p;
        uint32_t format;
        uint32_t num_el;
@@ -826,7 +916,11 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key,
                goto failed;
        }
 
-       ZERO_STRUCT(map);
+       map = talloc_zero(NULL, GROUP_MAP);
+       if (!map) {
+               errno = ENOMEM;
+               goto failed;
+       }
 
        for (i = 0; i < num_el; i++) {
                uint32_t num_vals;
@@ -883,28 +977,34 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key,
                        /* we ignore unknown or uninteresting attributes
                         * (objectclass, etc.) */
                        if (strcasecmp_m(name, "gidNumber") == 0) {
-                               map.gid = strtoul(val, &q, 10);
+                               map->gid = strtoul(val, &q, 10);
                                if (*q) {
                                        errno = EIO;
                                        goto failed;
                                }
                        } else if (strcasecmp_m(name, "sid") == 0) {
-                               if (!string_to_sid(&map.sid, val)) {
+                               if (!string_to_sid(&map->sid, val)) {
                                        errno = EIO;
                                        goto failed;
                                }
                        } else if (strcasecmp_m(name, "sidNameUse") == 0) {
-                               map.sid_name_use = strtoul(val, &q, 10);
+                               map->sid_name_use = strtoul(val, &q, 10);
                                if (*q) {
                                        errno = EIO;
                                        goto failed;
                                }
                        } else if (strcasecmp_m(name, "ntname") == 0) {
-                               strlcpy(map.nt_name, val,
-                                       sizeof(map.nt_name));
+                               map->nt_name = talloc_strdup(map, val);
+                               if (!map->nt_name) {
+                                       errno = ENOMEM;
+                                       goto failed;
+                               }
                        } else if (strcasecmp_m(name, "comment") == 0) {
-                               strlcpy(map.comment, val,
-                                       sizeof(map.comment));
+                               map->comment = talloc_strdup(map, val);
+                               if (!map->comment) {
+                                       errno = ENOMEM;
+                                       goto failed;
+                               }
                        } else if (strcasecmp_m(name, "member") == 0) {
                                if (!string_to_sid(&members[j], val)) {
                                        errno = EIO;
@@ -918,7 +1018,20 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key,
                TALLOC_FREE(name);
        }
 
-       if (!add_mapping_entry(&map, 0)) {
+       if (map->nt_name == NULL) {
+               errno = EIO;
+               goto failed;
+       }
+
+       if (map->comment == NULL) {
+               map->comment = talloc_strdup(map, "");
+       }
+       if (map->comment == NULL) {
+               errno = ENOMEM;
+               goto failed;
+       }
+
+       if (!add_mapping_entry(map, 0)) {
                errno = EIO;
                goto failed;
        }
@@ -926,7 +1039,7 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key,
        if (num_mem) {
                for (j = 0; j < num_mem; j++) {
                        NTSTATUS status;
-                       status = add_aliasmem(&map.sid, &members[j]);
+                       status = add_aliasmem(&map->sid, &members[j]);
                        if (!NT_STATUS_IS_OK(status)) {
                                errno = EIO;
                                goto failed;
@@ -939,9 +1052,11 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key,
                          remaining));
        }
 
+       TALLOC_FREE(map);
        return 0;
 
 failed:
+       TALLOC_FREE(map);
        return -1;
 }
 
@@ -960,7 +1075,7 @@ static bool mapping_switch(const char *ldb_path)
        /* ldb is just a very fancy tdb, read out raw data and perform
         * conversion */
        ret = tdb_traverse(ltdb, convert_ldb_record, NULL);
-       if (ret == -1) goto failed;
+       if (ret < 0) goto failed;
 
        if (ltdb) {
                tdb_close(ltdb);