s4-auth Rework auth subsystem to remove struct auth_serversupplied_info
[sfrench/samba-autobuild/.git] / source4 / auth / session.c
index dce00b9043ec528f3e1e68c307da00dcb7904c31..a6b8b2688ce5080afda53b88bd00c75ca24b2a6c 100644 (file)
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
 #include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "dsdb/samdb/samdb.h"
@@ -41,44 +42,41 @@ _PUBLIC_ struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx,
 }
 
 _PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
-                                            struct auth_context *auth_context, /* Optional if the domain SID is in the NT AUTHORITY domain */
-                                            struct auth_serversupplied_info *server_info,
+                                            struct loadparm_context *lp_ctx, /* Optional, if you don't want privilages */
+                                            struct ldb_context *sam_ctx, /* Optional, if you don't want local groups */
+                                            struct auth_user_info_dc *user_info_dc,
                                             uint32_t session_info_flags,
                                             struct auth_session_info **_session_info)
 {
        struct auth_session_info *session_info;
        NTSTATUS nt_status;
-       unsigned int i, num_groupSIDs = 0;
-       const char *account_sid_string;
-       const char *account_sid_dn;
-       DATA_BLOB account_sid_blob;
-       const char *primary_group_string;
-       const char *primary_group_dn;
-       DATA_BLOB primary_group_blob;
+       unsigned int i, num_sids = 0;
 
        const char *filter;
 
-       struct dom_sid **groupSIDs = NULL;
+       struct dom_sid *sids = NULL;
        const struct dom_sid *anonymous_sid, *system_sid;
 
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
        NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
 
-       /* For now, we don't have trusted domains, so we do a very
-        * simple check to see that the user's SID is in *this*
-        * domain, and then trust the user account control.  When we
-        * get trusted domains, we should check it's a trusted domain
-        * in this forest.  This elaborate check is to try and avoid a
-        * nasty security bug if we forget about this later... */
-
        session_info = talloc(tmp_ctx, struct auth_session_info);
        NT_STATUS_HAVE_NO_MEMORY_AND_FREE(session_info, tmp_ctx);
 
-       session_info->server_info = talloc_reference(session_info, server_info);
+       session_info->info = talloc_reference(session_info, user_info_dc->info);
+
+       session_info->torture = talloc_zero(session_info, struct auth_user_info_torture);
+       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(session_info->torture, tmp_ctx);
+       session_info->torture->num_dc_sids = user_info_dc->num_sids;
+       session_info->torture->dc_sids = talloc_reference(session_info, user_info_dc->sids);
+       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(session_info->torture->dc_sids, tmp_ctx);
 
        /* unless set otherwise, the session key is the user session
         * key from the auth subsystem */ 
-       session_info->session_key = server_info->user_session_key;
+       session_info->session_key = data_blob_talloc(session_info, user_info_dc->user_session_key.data, user_info_dc->user_session_key.length);
+       if (!session_info->session_key.data && session_info->session_key.length) {
+               NT_STATUS_HAVE_NO_MEMORY_AND_FREE(session_info->session_key.data, tmp_ctx);
+       }
 
        anonymous_sid = dom_sid_parse_talloc(tmp_ctx, SID_NT_ANONYMOUS);
        NT_STATUS_HAVE_NO_MEMORY_AND_FREE(anonymous_sid, tmp_ctx);
@@ -86,96 +84,50 @@ _PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
        system_sid = dom_sid_parse_talloc(tmp_ctx, SID_NT_SYSTEM);
        NT_STATUS_HAVE_NO_MEMORY_AND_FREE(system_sid, tmp_ctx);
 
-       if (dom_sid_equal(anonymous_sid, server_info->account_sid)) {
+       sids = talloc_array(tmp_ctx, struct dom_sid, user_info_dc->num_sids);
+       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(sids, tmp_ctx);
+       if (!sids) {
+               talloc_free(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       num_sids = user_info_dc->num_sids;
+
+       for (i=0; i < user_info_dc->num_sids; i++) {
+               sids[i] = user_info_dc->sids[i];
+       }
+
+       if (user_info_dc->num_sids > PRIMARY_USER_SID_INDEX && dom_sid_equal(anonymous_sid, &user_info_dc->sids[PRIMARY_USER_SID_INDEX])) {
                /* Don't expand nested groups of system, anonymous etc*/
-       } else if (dom_sid_equal(system_sid, server_info->account_sid)) {
+       } else if (user_info_dc->num_sids > PRIMARY_USER_SID_INDEX && dom_sid_equal(system_sid, &user_info_dc->sids[PRIMARY_USER_SID_INDEX])) {
                /* Don't expand nested groups of system, anonymous etc*/
-       } else if (auth_context) {
-               groupSIDs = talloc_array(tmp_ctx, struct dom_sid *, server_info->n_domain_groups);
-               NT_STATUS_HAVE_NO_MEMORY_AND_FREE(groupSIDs, tmp_ctx);
-               if (!groupSIDs) {
-                       talloc_free(tmp_ctx);
-                       return NT_STATUS_NO_MEMORY;
-               }
-               
-               num_groupSIDs = server_info->n_domain_groups;
-               
-               for (i=0; i < server_info->n_domain_groups; i++) {
-                       groupSIDs[i] = server_info->domain_groups[i];
-               }
-               
+       } else if (sam_ctx) {
                filter = talloc_asprintf(tmp_ctx, "(&(objectClass=group)(groupType:1.2.840.113556.1.4.803:=%u))",
                                         GROUP_TYPE_BUILTIN_LOCAL_GROUP);
 
                /* Search for each group in the token */
-
-               /* Expands the account SID - this function takes in
-                * memberOf-like values, so we fake one up with the
-                * <SID=S-...> format of DN and then let it expand
-                * them, as long as they meet the filter - so only
-                * builtin groups
-                *
-                * We already have the primary group in the token, so set
-                * 'only childs' flag to true
-                */
-               account_sid_string = dom_sid_string(tmp_ctx, server_info->account_sid);
-               NT_STATUS_HAVE_NO_MEMORY_AND_FREE(account_sid_string, server_info);
-               
-               account_sid_dn = talloc_asprintf(tmp_ctx, "<SID=%s>", account_sid_string);
-               NT_STATUS_HAVE_NO_MEMORY_AND_FREE(account_sid_dn, server_info);
-               
-               account_sid_blob = data_blob_string_const(account_sid_dn);
-               
-               nt_status = authsam_expand_nested_groups(auth_context->sam_ctx, &account_sid_blob, true, filter,
-                                                        tmp_ctx, &groupSIDs, &num_groupSIDs);
-               if (!NT_STATUS_IS_OK(nt_status)) {
-                       talloc_free(tmp_ctx);
-                       return nt_status;
-               }
-
-               /* Expands the primary group - this function takes in
-                * memberOf-like values, so we fake one up with the
-                * <SID=S-...> format of DN and then let it expand
-                * them, as long as they meet the filter - so only
-                * builtin groups
-                *
-                * We already have the primary group in the token, so set
-                * 'only childs' flag to true
-                */
-               primary_group_string = dom_sid_string(tmp_ctx, server_info->primary_group_sid);
-               NT_STATUS_HAVE_NO_MEMORY_AND_FREE(primary_group_string, server_info);
-               
-               primary_group_dn = talloc_asprintf(tmp_ctx, "<SID=%s>", primary_group_string);
-               NT_STATUS_HAVE_NO_MEMORY_AND_FREE(primary_group_dn, server_info);
-               
-               primary_group_blob = data_blob_string_const(primary_group_dn);
-               
-               nt_status = authsam_expand_nested_groups(auth_context->sam_ctx, &primary_group_blob, true, filter,
-                                                        tmp_ctx, &groupSIDs, &num_groupSIDs);
-               if (!NT_STATUS_IS_OK(nt_status)) {
-                       talloc_free(tmp_ctx);
-                       return nt_status;
-               }
-               
-               for (i = 0; i < server_info->n_domain_groups; i++) {
-                       char *group_string;
-                       const char *group_dn;
-                       DATA_BLOB group_blob;
+               for (i = 0; i < user_info_dc->num_sids; i++) {
+                       char *sid_string;
+                       const char *sid_dn;
+                       DATA_BLOB sid_blob;
                        
-                       group_string = dom_sid_string(tmp_ctx,
-                                                     server_info->domain_groups[i]);
-                       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(group_string, server_info);
+                       sid_string = dom_sid_string(tmp_ctx,
+                                                     &user_info_dc->sids[i]);
+                       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(sid_string, user_info_dc);
                        
-                       group_dn = talloc_asprintf(tmp_ctx, "<SID=%s>", group_string);
-                       talloc_free(group_string);
-                       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(group_dn, server_info);
-                       group_blob = data_blob_string_const(group_dn);
+                       sid_dn = talloc_asprintf(tmp_ctx, "<SID=%s>", sid_string);
+                       talloc_free(sid_string);
+                       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(sid_dn, user_info_dc);
+                       sid_blob = data_blob_string_const(sid_dn);
                        
                        /* This function takes in memberOf values and expands
                         * them, as long as they meet the filter - so only
-                        * builtin groups */
-                       nt_status = authsam_expand_nested_groups(auth_context->sam_ctx, &group_blob, true, filter,
-                                                                tmp_ctx, &groupSIDs, &num_groupSIDs);
+                        * builtin groups
+                        *
+                        * We already have the SID in the token, so set
+                        * 'only childs' flag to true */
+                       nt_status = dsdb_expand_nested_groups(sam_ctx, &sid_blob, true, filter,
+                                                             tmp_ctx, &sids, &num_sids);
                        if (!NT_STATUS_IS_OK(nt_status)) {
                                talloc_free(tmp_ctx);
                                return nt_status;
@@ -184,12 +136,9 @@ _PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
        }
 
        nt_status = security_token_create(session_info,
-                                         auth_context ? auth_context->event_ctx : NULL,
-                                         auth_context ? auth_context->lp_ctx : NULL,
-                                         server_info->account_sid,
-                                         server_info->primary_group_sid,
-                                         num_groupSIDs,
-                                         groupSIDs,
+                                         lp_ctx,
+                                         num_sids,
+                                         sids,
                                          session_info_flags,
                                          &session_info->security_token);
        NT_STATUS_NOT_OK_RETURN_AND_FREE(nt_status, tmp_ctx);
@@ -202,6 +151,44 @@ _PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
+/* Produce a session_info for an arbitary DN or principal in the local
+ * DB, assuming the local DB holds all the groups
+ *
+ * Supply either a principal or a DN
+ */
+NTSTATUS authsam_get_session_info_principal(TALLOC_CTX *mem_ctx,
+                                           struct loadparm_context *lp_ctx,
+                                           struct ldb_context *sam_ctx,
+                                           const char *principal,
+                                           struct ldb_dn *user_dn,
+                                           uint32_t session_info_flags,
+                                           struct auth_session_info **session_info)
+{
+       NTSTATUS nt_status;
+       struct auth_user_info_dc *user_info_dc;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       if (!tmp_ctx) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       nt_status = authsam_get_user_info_dc_principal(tmp_ctx, lp_ctx, sam_ctx,
+                                                     principal, user_dn,
+                                                     &user_info_dc);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               talloc_free(tmp_ctx);
+               return nt_status;
+       }
+
+       nt_status = auth_generate_session_info(tmp_ctx, lp_ctx, sam_ctx,
+                                              user_info_dc, session_info_flags,
+                                              session_info);
+
+       if (NT_STATUS_IS_OK(nt_status)) {
+               talloc_steal(mem_ctx, *session_info);
+       }
+       talloc_free(tmp_ctx);
+       return nt_status;
+}
+
 /**
  * prints a struct auth_session_info security token to debug output.
  */