Changeset 745 for trunk/server/source4/dsdb/samdb/samdb.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/dsdb/samdb/samdb.c (modified) (6 diffs)

trunk/server/source4/dsdb/samdb/samdb.c

@@ -24 +24 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
-#include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/events/events.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include "lib/ldb-samba/ldb_wrap.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
@@ -42 +42 @@
 #include "auth/credentials/credentials.h"
 #include "param/secrets.h"
-
-char *samdb_relative_path(struct ldb_context *ldb,
-                                 TALLOC_CTX *mem_ctx, 
-                                 const char *name) 
-{
-        const char *base_url = 
-                (const char *)ldb_get_opaque(ldb, "ldb_url");
-        char *path, *p, *full_name;
-        if (name == NULL) {
-                return NULL;
-        }
-        if (name[0] == 0 || name[0] == '/' || strstr(name, ":/")) {
-                return talloc_strdup(mem_ctx, name);
-        }
-        path = talloc_strdup(mem_ctx, base_url);
-        if (path == NULL) {
-                return NULL;
-        }
-        if ( (p = strrchr(path, '/')) != NULL) {
-                p[0] = '\0';
-                full_name = talloc_asprintf(mem_ctx, "%s/%s", path, name);
-        } else {
-                full_name = talloc_asprintf(mem_ctx, "./%s", name);
-        }
-        talloc_free(path);
-        return full_name;
-}
-
-struct cli_credentials *samdb_credentials(TALLOC_CTX *mem_ctx, 
-                                          struct tevent_context *event_ctx, 
-                                          struct loadparm_context *lp_ctx) 
-{
-        struct cli_credentials *cred = cli_credentials_init(mem_ctx);
+#include "auth/auth.h"
+
+/*
+  make sure the static credentials are not freed
+ */
+static int samdb_credentials_destructor(struct cli_credentials *creds)
+{
+        return -1;
+}
+
+/*
+  this returns a static set of system credentials. It is static so
+  that we always get the same pointer in ldb_wrap_connect()
+ */
+struct cli_credentials *samdb_credentials(struct loadparm_context *lp_ctx)
+{
+        static struct cli_credentials *static_credentials;
+        struct cli_credentials *cred;
+        char *error_string;
+
+        if (static_credentials) {
+                return static_credentials;
+        }
+
+        cred = cli_credentials_init(talloc_autofree_context());
         if (!cred) {
                 return NULL;
@@ -85 +77 @@
         cli_credentials_set_kerberos_state(cred, CRED_DONT_USE_KERBEROS);
 
-        if (!NT_STATUS_IS_OK(cli_credentials_set_secrets(cred, event_ctx, lp_ctx, NULL, NULL,
-                                                         SECRETS_LDAP_FILTER))) {
+        if (!NT_STATUS_IS_OK(cli_credentials_set_secrets(cred, lp_ctx, NULL, NULL,
+                                                         SECRETS_LDAP_FILTER, &error_string))) {
+                DEBUG(5, ("(normal if no LDAP backend) %s", error_string));
                 /* Perfectly OK - if not against an LDAP backend */
-                return NULL;
-        }
+                talloc_free(cred);
+                return NULL;
+        }
+        static_credentials = cred;
+        talloc_set_destructor(cred, samdb_credentials_destructor);
         return cred;
 }
@@ -100 +96 @@
                                   struct tevent_context *ev_ctx,
                                   struct loadparm_context *lp_ctx,
-                                  struct auth_session_info *session_info)
+                                  struct auth_session_info *session_info,
+                                  int flags)
 {
         struct ldb_context *ldb;
-        ldb = ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, 
-                               lp_sam_url(lp_ctx), session_info,
-                               samdb_credentials(mem_ctx, ev_ctx, lp_ctx), 
-                               0, NULL);
-        if (!ldb) {
-                return NULL;
-        }
-        dsdb_make_schema_global(ldb);
+        struct dsdb_schema *schema;
+        const char *url;
+        struct cli_credentials *credentials;
+        int ret;
+
+        url  = lpcfg_sam_url(lp_ctx);
+        credentials = samdb_credentials(lp_ctx);
+
+        ldb = ldb_wrap_find(url, ev_ctx, lp_ctx, session_info, credentials, flags);
+        if (ldb != NULL)
+                return talloc_reference(mem_ctx, ldb);
+
+        ldb = samba_ldb_init(mem_ctx, ev_ctx, lp_ctx, session_info, credentials);
+
+        if (ldb == NULL)
+                return NULL;
+
+        dsdb_set_global_schema(ldb);
+
+        ret = samba_ldb_connect(ldb, lp_ctx, url, flags);
+        if (ret != LDB_SUCCESS) {
+                talloc_free(ldb);
+                return NULL;
+        }
+
+        schema = dsdb_get_schema(ldb, NULL);
+        /* make the resulting schema global */
+        if (schema) {
+                dsdb_make_schema_global(ldb, schema);
+        }
+
+        if (!ldb_wrap_add(url, ev_ctx, lp_ctx, session_info, credentials, flags, ldb)) {
+                talloc_free(ldb);
+                return NULL;
+        }
+
         return ldb;
 }
@@ -119 +144 @@
 ****************************************************************************/
 NTSTATUS security_token_create(TALLOC_CTX *mem_ctx, 
-                               struct tevent_context *ev_ctx, 
                                struct loadparm_context *lp_ctx,
-                               struct dom_sid *user_sid,
-                               struct dom_sid *group_sid, 
-                               int n_groupSIDs,
-                               struct dom_sid **groupSIDs, 
-                               bool is_authenticated,
+                               unsigned int num_sids,
+                               struct dom_sid *sids,
+                               uint32_t session_info_flags,
                                struct security_token **token)
 {
         struct security_token *ptoken;
-        int i;
+        unsigned int i;
         NTSTATUS status;
 
@@ -135 +157 @@
         NT_STATUS_HAVE_NO_MEMORY(ptoken);
 
-        ptoken->sids = talloc_array(ptoken, struct dom_sid *, n_groupSIDs + 5);
+        ptoken->sids = talloc_array(ptoken, struct dom_sid, num_sids + 6 /* over-allocate */);
         NT_STATUS_HAVE_NO_MEMORY(ptoken->sids);
 
-        ptoken->user_sid = talloc_reference(ptoken, user_sid);
-        ptoken->group_sid = talloc_reference(ptoken, group_sid);
-        ptoken->privilege_mask = 0;
-
-        ptoken->sids[0] = ptoken->user_sid;
-        ptoken->sids[1] = ptoken->group_sid;
+        ptoken->num_sids = 0;
+
+        for (i = 0; i < num_sids; i++) {
+                size_t check_sid_idx;
+                for (check_sid_idx = 0;
+                     check_sid_idx < ptoken->num_sids;
+                     check_sid_idx++) {
+                        if (dom_sid_equal(&ptoken->sids[check_sid_idx], &sids[i])) {
+                                break;
+                        }
+                }
+
+                if (check_sid_idx == ptoken->num_sids) {
+                        ptoken->sids = talloc_realloc(ptoken, ptoken->sids, struct dom_sid, ptoken->num_sids + 1);
+                        NT_STATUS_HAVE_NO_MEMORY(ptoken->sids);
+
+                        ptoken->sids[ptoken->num_sids] = sids[i];
+                        ptoken->num_sids++;
+                }
+        }
 
         /*
-         * Finally add the "standard" SIDs.
+         * Finally add the "standard" sids.
          * The only difference between guest and "anonymous"
          * is the addition of Authenticated_Users.
          */
-        ptoken->sids[2] = dom_sid_parse_talloc(ptoken->sids, SID_WORLD);
-        NT_STATUS_HAVE_NO_MEMORY(ptoken->sids[2]);
-        ptoken->sids[3] = dom_sid_parse_talloc(ptoken->sids, SID_NT_NETWORK);
-        NT_STATUS_HAVE_NO_MEMORY(ptoken->sids[3]);
-        ptoken->num_sids = 4;
-
-        if (is_authenticated) {
-                ptoken->sids[4] = dom_sid_parse_talloc(ptoken->sids, SID_NT_AUTHENTICATED_USERS);
-                NT_STATUS_HAVE_NO_MEMORY(ptoken->sids[4]);
+
+        if (session_info_flags & AUTH_SESSION_INFO_DEFAULT_GROUPS) {
+                ptoken->sids = talloc_realloc(ptoken, ptoken->sids, struct dom_sid, ptoken->num_sids + 2);
+                NT_STATUS_HAVE_NO_MEMORY(ptoken->sids);
+
+                if (!dom_sid_parse(SID_WORLD, &ptoken->sids[ptoken->num_sids])) {
+                        return NT_STATUS_INTERNAL_ERROR;
+                }
                 ptoken->num_sids++;
-        }
-
-        for (i = 0; i < n_groupSIDs; i++) {
-                size_t check_sid_idx;
-                for (check_sid_idx = 1; 
-                     check_sid_idx < ptoken->num_sids; 
-                     check_sid_idx++) {
-                        if (dom_sid_equal(ptoken->sids[check_sid_idx], groupSIDs[i])) {
-                                break;
-                        }
-                }
-
-                if (check_sid_idx == ptoken->num_sids) {
-                        ptoken->sids[ptoken->num_sids++] = talloc_reference(ptoken->sids, groupSIDs[i]);
-                }
-        }
-
-        /* setup the privilege mask for this token */
-        status = samdb_privilege_setup(ev_ctx, lp_ctx, ptoken);
-        if (!NT_STATUS_IS_OK(status)) {
-                talloc_free(ptoken);
-                return status;
-        }
-
-        security_token_debug(10, ptoken);
+
+                if (!dom_sid_parse(SID_NT_NETWORK, &ptoken->sids[ptoken->num_sids])) {
+                        return NT_STATUS_INTERNAL_ERROR;
+                }
+                ptoken->num_sids++;
+        }
+
+        if (session_info_flags & AUTH_SESSION_INFO_AUTHENTICATED) {
+                ptoken->sids = talloc_realloc(ptoken, ptoken->sids, struct dom_sid, ptoken->num_sids + 1);
+                NT_STATUS_HAVE_NO_MEMORY(ptoken->sids);
+
+                if (!dom_sid_parse(SID_NT_AUTHENTICATED_USERS, &ptoken->sids[ptoken->num_sids])) {
+                        return NT_STATUS_INTERNAL_ERROR;
+                }
+                ptoken->num_sids++;
+        }
+
+        /* The caller may have requested simple privilages, for example if there isn't a local DB */
+        if (session_info_flags & AUTH_SESSION_INFO_SIMPLE_PRIVILEGES) {
+                /* Shortcuts to prevent recursion and avoid lookups */
+                if (ptoken->sids == NULL) {
+                        ptoken->privilege_mask = 0;
+                } else if (security_token_is_system(ptoken)) {
+                        ptoken->privilege_mask = ~0;
+                } else if (security_token_is_anonymous(ptoken)) {
+                        ptoken->privilege_mask = 0;
+                } else if (security_token_has_builtin_administrators(ptoken)) {
+                        ptoken->privilege_mask = ~0;
+                } else {
+                        /* All other 'users' get a empty priv set so far */
+                        ptoken->privilege_mask = 0;
+                }
+        } else {
+                /* setup the privilege mask for this token */
+                status = samdb_privilege_setup(lp_ctx, ptoken);
+                if (!NT_STATUS_IS_OK(status)) {
+                        talloc_free(ptoken);
+                        DEBUG(1,("Unable to access privileges database\n"));
+                        return status;
+                }
+        }
+
+        security_token_debug(0, 10, ptoken);
 
         *token = ptoken;