s3:utils: let smbstatus report anonymous signing/encryption explicitly
[samba.git] / source4 / auth / session.c
index 112eac95d84aec38c4a60c526a7cff1058f8846a..9c9d8c4aaffdb3339f52836227ea3de36d203662 100644 (file)
@@ -1,8 +1,8 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Authentication utility functions
    Copyright (C) Andrew Tridgell 1992-1998
-   Copyright (C) Andrew Bartlett 2001
+   Copyright (C) Andrew Bartlett 2001-2010
    Copyright (C) Jeremy Allison 2000-2001
    Copyright (C) Rafal Szczesniak 2002
    Copyright (C) Stefan Metzmacher 2005
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program 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.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
+#include "auth/credentials/credentials.h"
+#include "auth/credentials/credentials_krb5.h"
 #include "libcli/security/security.h"
+#include "libcli/security/claims-conversions.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/claims.h"
+#include "librpc/gen_ndr/ndr_claims.h"
 #include "dsdb/samdb/samdb.h"
-#include "auth/credentials/credentials.h"
-#include "param/param.h"
 #include "auth/session_proto.h"
+#include "system/kerberos.h"
+#include <gssapi/gssapi.h>
+#include "libcli/wbclient/wbclient.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
 
-_PUBLIC_ struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx, 
-                                           struct loadparm_context *lp_ctx) 
+_PUBLIC_ struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx,
+                                           struct loadparm_context *lp_ctx)
 {
        NTSTATUS nt_status;
        struct auth_session_info *session_info = NULL;
@@ -42,295 +52,777 @@ _PUBLIC_ struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx,
        return session_info;
 }
 
-_PUBLIC_ NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx, 
-                                    struct loadparm_context *lp_ctx,
-                                    struct auth_session_info **_session_info) 
+_PUBLIC_ NTSTATUS auth_generate_security_token(TALLOC_CTX *mem_ctx,
+                                              struct loadparm_context *lp_ctx, /* Optional, if you don't want privileges */
+                                              struct ldb_context *sam_ctx, /* Optional, if you don't want local groups */
+                                              const struct auth_user_info_dc *user_info_dc,
+                                              const struct auth_user_info_dc *device_info_dc,
+                                              const struct auth_claims auth_claims,
+                                              uint32_t session_info_flags,
+                                              struct security_token **_security_token)
 {
+       struct security_token *security_token = NULL;
        NTSTATUS nt_status;
-       struct auth_serversupplied_info *server_info = NULL;
-       struct auth_session_info *session_info = NULL;
-       TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
-       
-       nt_status = auth_anonymous_server_info(mem_ctx,
-                                              lp_netbios_name(lp_ctx),
-                                              &server_info);
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               talloc_free(mem_ctx);
-               return nt_status;
+       uint32_t i;
+       uint32_t num_sids = 0;
+       uint32_t num_device_sids = 0;
+       const char *filter = NULL;
+       struct auth_SidAttr *sids = NULL;
+       struct auth_SidAttr *device_sids = NULL;
+
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       if (tmp_ctx == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       /* references the server_info into the session_info */
-       nt_status = auth_generate_session_info(parent_ctx, lp_ctx, server_info, &session_info);
-       talloc_free(mem_ctx);
+       sids = talloc_array(tmp_ctx, struct auth_SidAttr, user_info_dc->num_sids);
+       if (sids == NULL) {
+               TALLOC_FREE(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       NT_STATUS_NOT_OK_RETURN(nt_status);
+       num_sids = user_info_dc->num_sids;
 
-       session_info->credentials = cli_credentials_init(session_info);
-       if (!session_info->credentials) {
-               return NT_STATUS_NO_MEMORY;
+       for (i=0; i < user_info_dc->num_sids; i++) {
+               sids[i] = user_info_dc->sids[i];
        }
 
-       cli_credentials_set_conf(session_info->credentials, lp_ctx);
-       cli_credentials_set_anonymous(session_info->credentials);
-       
-       *_session_info = session_info;
+       /*
+        * Finally add the "standard" sids.
+        * The only difference between guest and "anonymous"
+        * is the addition of Authenticated_Users.
+        */
+
+       if (session_info_flags & AUTH_SESSION_INFO_DEFAULT_GROUPS) {
+               sids = talloc_realloc(tmp_ctx, sids, struct auth_SidAttr, num_sids + 2);
+               if (sids == NULL) {
+                       TALLOC_FREE(tmp_ctx);
+                       return NT_STATUS_NO_MEMORY;
+               }
 
-       return NT_STATUS_OK;
-}
+               sid_copy(&sids[num_sids].sid, &global_sid_World);
+               sids[num_sids].attrs = SE_GROUP_DEFAULT_FLAGS;
+               num_sids++;
 
-_PUBLIC_ NTSTATUS auth_anonymous_server_info(TALLOC_CTX *mem_ctx, 
-                                   const char *netbios_name,
-                                   struct auth_serversupplied_info **_server_info) 
-{
-       struct auth_serversupplied_info *server_info;
-       server_info = talloc(mem_ctx, struct auth_serversupplied_info);
-       NT_STATUS_HAVE_NO_MEMORY(server_info);
+               sid_copy(&sids[num_sids].sid, &global_sid_Network);
+               sids[num_sids].attrs = SE_GROUP_DEFAULT_FLAGS;
+               num_sids++;
+       }
 
-       server_info->account_sid = dom_sid_parse_talloc(server_info, SID_NT_ANONYMOUS);
-       NT_STATUS_HAVE_NO_MEMORY(server_info->account_sid);
+       if (session_info_flags & AUTH_SESSION_INFO_AUTHENTICATED) {
+               sids = talloc_realloc(tmp_ctx, sids, struct auth_SidAttr, num_sids + 1);
+               if (sids == NULL) {
+                       TALLOC_FREE(tmp_ctx);
+                       return NT_STATUS_NO_MEMORY;
+               }
 
-       /* is this correct? */
-       server_info->primary_group_sid = dom_sid_parse_talloc(server_info, SID_BUILTIN_GUESTS);
-       NT_STATUS_HAVE_NO_MEMORY(server_info->primary_group_sid);
+               sid_copy(&sids[num_sids].sid, &global_sid_Authenticated_Users);
+               sids[num_sids].attrs = SE_GROUP_DEFAULT_FLAGS;
+               num_sids++;
+       }
 
-       server_info->n_domain_groups = 0;
-       server_info->domain_groups = NULL;
+       if (session_info_flags & AUTH_SESSION_INFO_NTLM) {
+               sids = talloc_realloc(tmp_ctx, sids, struct auth_SidAttr, num_sids + 1);
+               if (sids == NULL) {
+                       TALLOC_FREE(tmp_ctx);
+                       return NT_STATUS_NO_MEMORY;
+               }
 
-       /* annoying, but the Anonymous really does have a session key, 
-          and it is all zeros! */
-       server_info->user_session_key = data_blob_talloc(server_info, NULL, 16);
-       NT_STATUS_HAVE_NO_MEMORY(server_info->user_session_key.data);
+               if (!dom_sid_parse(SID_NT_NTLM_AUTHENTICATION, &sids[num_sids].sid)) {
+                       TALLOC_FREE(tmp_ctx);
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+               sids[num_sids].attrs = SE_GROUP_DEFAULT_FLAGS;
+               num_sids++;
+       }
 
-       server_info->lm_session_key = data_blob_talloc(server_info, NULL, 16);
-       NT_STATUS_HAVE_NO_MEMORY(server_info->lm_session_key.data);
 
-       data_blob_clear(&server_info->user_session_key);
-       data_blob_clear(&server_info->lm_session_key);
+       if (num_sids > PRIMARY_USER_SID_INDEX && dom_sid_equal(&global_sid_Anonymous, &sids[PRIMARY_USER_SID_INDEX].sid)) {
+               /* Don't expand nested groups of system, anonymous etc*/
+       } else if (num_sids > PRIMARY_USER_SID_INDEX && dom_sid_equal(&global_sid_System, &sids[PRIMARY_USER_SID_INDEX].sid)) {
+               /* Don't expand nested groups of system, anonymous etc*/
+       } else if (sam_ctx != NULL) {
+               filter = talloc_asprintf(tmp_ctx, "(&(objectClass=group)(groupType:"LDB_OID_COMPARATOR_AND":=%u))",
+                                        GROUP_TYPE_BUILTIN_LOCAL_GROUP);
+
+               /* Search for each group in the token */
+               for (i = 0; i < num_sids; i++) {
+                       struct dom_sid_buf buf;
+                       const char *sid_dn;
+                       DATA_BLOB sid_blob;
+
+                       sid_dn = talloc_asprintf(
+                               tmp_ctx,
+                               "<SID=%s>",
+                               dom_sid_str_buf(&sids[i].sid, &buf));
+                       if (sid_dn == NULL) {
+                               TALLOC_FREE(tmp_ctx);
+                               return NT_STATUS_NO_MEMORY;
+                       }
+                       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
+                        *
+                        * 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;
+                       }
+               }
+       }
 
-       server_info->account_name = talloc_strdup(server_info, "ANONYMOUS LOGON");
-       NT_STATUS_HAVE_NO_MEMORY(server_info->account_name);
+       if (device_info_dc != NULL) {
+               /*
+                * Make a copy of the device SIDs in case we need to add extra SIDs on
+                * the end. One can never have too much copying.
+                */
+               num_device_sids = device_info_dc->num_sids;
+               device_sids = talloc_array(tmp_ctx,
+                                   struct auth_SidAttr,
+                                   num_device_sids);
+               if (device_sids == NULL) {
+                       TALLOC_FREE(tmp_ctx);
+                       return NT_STATUS_NO_MEMORY;
+               }
 
-       server_info->domain_name = talloc_strdup(server_info, "NT AUTHORITY");
-       NT_STATUS_HAVE_NO_MEMORY(server_info->domain_name);
+               for (i = 0; i < num_device_sids; i++) {
+                       device_sids[i] = device_info_dc->sids[i];
+               }
 
-       server_info->full_name = talloc_strdup(server_info, "Anonymous Logon");
-       NT_STATUS_HAVE_NO_MEMORY(server_info->full_name);
+               if (session_info_flags & AUTH_SESSION_INFO_DEVICE_DEFAULT_GROUPS) {
+                       device_sids = talloc_realloc(tmp_ctx,
+                                                    device_sids,
+                                                    struct auth_SidAttr,
+                                                    num_device_sids + 2);
+                       if (device_sids == NULL) {
+                               TALLOC_FREE(tmp_ctx);
+                               return NT_STATUS_NO_MEMORY;
+                       }
 
-       server_info->logon_script = talloc_strdup(server_info, "");
-       NT_STATUS_HAVE_NO_MEMORY(server_info->logon_script);
+                       device_sids[num_device_sids++] = (struct auth_SidAttr) {
+                               .sid = global_sid_World,
+                               .attrs = SE_GROUP_DEFAULT_FLAGS,
+                       };
+                       device_sids[num_device_sids++] = (struct auth_SidAttr) {
+                               .sid = global_sid_Network,
+                               .attrs = SE_GROUP_DEFAULT_FLAGS,
+                       };
+               }
 
-       server_info->profile_path = talloc_strdup(server_info, "");
-       NT_STATUS_HAVE_NO_MEMORY(server_info->profile_path);
+               if (session_info_flags & AUTH_SESSION_INFO_DEVICE_AUTHENTICATED) {
+                       device_sids = talloc_realloc(tmp_ctx,
+                                                    device_sids,
+                                                    struct auth_SidAttr,
+                                                    num_device_sids + 1);
+                       if (device_sids == NULL) {
+                               TALLOC_FREE(tmp_ctx);
+                               return NT_STATUS_NO_MEMORY;
+                       }
 
-       server_info->home_directory = talloc_strdup(server_info, "");
-       NT_STATUS_HAVE_NO_MEMORY(server_info->home_directory);
+                       device_sids[num_device_sids++] = (struct auth_SidAttr) {
+                               .sid = global_sid_Authenticated_Users,
+                               .attrs = SE_GROUP_DEFAULT_FLAGS,
+                       };
+               }
+       }
 
-       server_info->home_drive = talloc_strdup(server_info, "");
-       NT_STATUS_HAVE_NO_MEMORY(server_info->home_drive);
+       nt_status = security_token_create(mem_ctx,
+                                         lp_ctx,
+                                         num_sids,
+                                         sids,
+                                         num_device_sids,
+                                         device_sids,
+                                         auth_claims,
+                                         session_info_flags,
+                                         &security_token);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               TALLOC_FREE(tmp_ctx);
+               return nt_status;
+       }
 
-       server_info->logon_server = talloc_strdup(server_info, netbios_name);
-       NT_STATUS_HAVE_NO_MEMORY(server_info->logon_server);
+       talloc_steal(mem_ctx, security_token);
+       *_security_token = security_token;
+       talloc_free(tmp_ctx);
+       return NT_STATUS_OK;
+}
 
-       server_info->last_logon = 0;
-       server_info->last_logoff = 0;
-       server_info->acct_expiry = 0;
-       server_info->last_password_change = 0;
-       server_info->allow_password_change = 0;
-       server_info->force_password_change = 0;
+_PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
+                                            struct loadparm_context *lp_ctx, /* Optional, if you don't want privileges */
+                                            struct ldb_context *sam_ctx, /* Optional, if you don't want local groups */
+                                            const 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;
 
-       server_info->logon_count = 0;
-       server_info->bad_password_count = 0;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
 
-       server_info->acct_flags = ACB_NORMAL;
+       session_info = talloc_zero(tmp_ctx, struct auth_session_info);
+       if (session_info == NULL) {
+               TALLOC_FREE(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       server_info->authenticated = false;
+       session_info->info = talloc_reference(session_info, user_info_dc->info);
+       if (session_info->info == NULL) {
+               TALLOC_FREE(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       session_info->torture = talloc_zero(session_info, struct auth_user_info_torture);
+       if (session_info->torture == NULL) {
+               TALLOC_FREE(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+       session_info->torture->num_dc_sids = user_info_dc->num_sids;
+       session_info->torture->dc_sids = talloc_reference(session_info, user_info_dc->sids);
+       if (session_info->torture->dc_sids == NULL) {
+               TALLOC_FREE(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       *_server_info = server_info;
+       /* unless set otherwise, the session key is the user session
+        * key from the auth subsystem */
+       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 && user_info_dc->user_session_key.length) {
+               TALLOC_FREE(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
 
+       nt_status = auth_generate_security_token(session_info,
+                                                lp_ctx,
+                                                sam_ctx,
+                                                user_info_dc,
+                                                NULL /*device_info_dc */,
+                                                (struct auth_claims) {},
+                                                session_info_flags,
+                                                &session_info->security_token);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               TALLOC_FREE(tmp_ctx);
+               return nt_status;
+       }
+
+       session_info->unique_session_token = GUID_random();
+
+       session_info->credentials = NULL;
+
+       session_info->ticket_type = user_info_dc->ticket_type;
+
+       talloc_steal(mem_ctx, session_info);
+       *_session_info = session_info;
+       talloc_free(tmp_ctx);
        return NT_STATUS_OK;
 }
 
-_PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx, 
-                                   struct loadparm_context *lp_ctx,
-                                   struct auth_serversupplied_info *server_info, 
-                                   struct auth_session_info **_session_info) 
+
+/* Fill out the auth_session_info with a cli_credentials based on the
+ * auth_session_info we were forwarded over named pipe forwarding.
+ *
+ * NOTE: The structure members of session_info_transport are stolen
+ * with talloc_move() into auth_session_info for long term use
+ */
+struct auth_session_info *auth_session_info_from_transport(TALLOC_CTX *mem_ctx,
+                                                          struct auth_session_info_transport *session_info_transport,
+                                                          struct loadparm_context *lp_ctx,
+                                                          const char **reason)
 {
        struct auth_session_info *session_info;
-       NTSTATUS nt_status;
+       session_info = talloc_steal(mem_ctx, session_info_transport->session_info);
+       /*
+        * This is to allow us to check the type of this pointer using
+        * talloc_get_type()
+        */
+       talloc_set_name(session_info, "struct auth_session_info");
+#ifdef HAVE_GSS_IMPORT_CRED
+       if (session_info_transport->exported_gssapi_credentials.length) {
+               struct cli_credentials *creds;
+               OM_uint32 minor_status;
+               gss_buffer_desc cred_token;
+               gss_cred_id_t cred_handle;
+               const char *error_string;
+               int ret;
+               bool ok;
+
+               DEBUG(10, ("Delegated credentials supplied by client\n"));
+
+               cred_token.value = session_info_transport->exported_gssapi_credentials.data;
+               cred_token.length = session_info_transport->exported_gssapi_credentials.length;
+
+               ret = gss_import_cred(&minor_status,
+                                     &cred_token,
+                                     &cred_handle);
+               if (ret != GSS_S_COMPLETE) {
+                       *reason = "Internal error in gss_import_cred()";
+                       return NULL;
+               }
 
-       session_info = talloc(mem_ctx, struct auth_session_info);
-       NT_STATUS_HAVE_NO_MEMORY(session_info);
+               creds = cli_credentials_init(session_info);
+               if (!creds) {
+                       *reason = "Out of memory in cli_credentials_init()";
+                       return NULL;
+               }
+               session_info->credentials = creds;
 
-       session_info->server_info = talloc_reference(session_info, server_info);
+               ok = cli_credentials_set_conf(creds, lp_ctx);
+               if (!ok) {
+                       *reason = "Failed to load smb.conf";
+                       return NULL;
+               }
 
-       /* unless set otherwise, the session key is the user session
-        * key from the auth subsystem */ 
-       session_info->session_key = server_info->user_session_key;
+               /* Just so we don't segfault trying to get at a username */
+               cli_credentials_set_anonymous(creds);
+
+               ret = cli_credentials_set_client_gss_creds(creds,
+                                                          lp_ctx,
+                                                          cred_handle,
+                                                          CRED_SPECIFIED,
+                                                          &error_string);
+               if (ret) {
+                       *reason = talloc_asprintf(mem_ctx,
+                                                 "Failed to set pipe forwarded "
+                                                 "creds: %s\n", error_string);
+                       return NULL;
+               }
 
-       nt_status = security_token_create(session_info,
-                                         lp_ctx,
-                                         server_info->account_sid,
-                                         server_info->primary_group_sid,
-                                         server_info->n_domain_groups,
-                                         server_info->domain_groups,
-                                         server_info->authenticated,
-                                         &session_info->security_token);
-       NT_STATUS_NOT_OK_RETURN(nt_status);
+               /* This credential handle isn't useful for password
+                * authentication, so ensure nobody tries to do that */
+               cli_credentials_set_kerberos_state(creds,
+                                                  CRED_USE_KERBEROS_REQUIRED,
+                                                  CRED_SPECIFIED);
 
-       session_info->credentials = NULL;
+       }
+#endif
+       return session_info;
+}
 
-       *_session_info = session_info;
+
+/* Create a auth_session_info_transport from an auth_session_info.
+ *
+ * NOTE: Members of the auth_session_info_transport structure are
+ * talloc_referenced() into this structure, and should not be changed.
+ */
+NTSTATUS auth_session_info_transport_from_session(TALLOC_CTX *mem_ctx,
+                                                 struct auth_session_info *session_info,
+                                                 struct tevent_context *event_ctx,
+                                                 struct loadparm_context *lp_ctx,
+                                                 struct auth_session_info_transport **transport_out)
+{
+
+       struct auth_session_info_transport *session_info_transport
+               = talloc_zero(mem_ctx, struct auth_session_info_transport);
+       if (!session_info_transport) {
+               return NT_STATUS_NO_MEMORY;
+       };
+       session_info_transport->session_info = talloc_reference(session_info_transport, session_info);
+       if (!session_info_transport->session_info) {
+               return NT_STATUS_NO_MEMORY;
+       };
+#ifdef HAVE_GSS_EXPORT_CRED
+       if (session_info->credentials) {
+               struct gssapi_creds_container *gcc;
+               OM_uint32 gret;
+               OM_uint32 minor_status;
+               gss_buffer_desc cred_token;
+               const char *error_string;
+               int ret;
+
+               ret = cli_credentials_get_client_gss_creds(session_info->credentials,
+                                                          event_ctx,
+                                                          lp_ctx,
+                                                          &gcc, &error_string);
+               if (ret != 0) {
+                       *transport_out = session_info_transport;
+                       return NT_STATUS_OK;
+               }
+
+               gret = gss_export_cred(&minor_status,
+                                      gcc->creds,
+                                      &cred_token);
+               if (gret != GSS_S_COMPLETE) {
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+
+               if (cred_token.length) {
+                       session_info_transport->exported_gssapi_credentials
+                               = data_blob_talloc(session_info_transport,
+                                                  cred_token.value,
+                                                  cred_token.length);
+                       gss_release_buffer(&minor_status, &cred_token);
+                       NT_STATUS_HAVE_NO_MEMORY(session_info_transport->exported_gssapi_credentials.data);
+               }
+       }
+#endif
+       *transport_out = session_info_transport;
        return NT_STATUS_OK;
 }
 
+
+/* Produce a session_info for an arbitrary 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.
  */
-void auth_session_info_debug(int dbg_lev, 
+void auth_session_info_debug(int dbg_lev,
                             const struct auth_session_info *session_info)
 {
        if (!session_info) {
                DEBUG(dbg_lev, ("Session Info: (NULL)\n"));
-               return; 
+               return;
        }
 
-       security_token_debug(dbg_lev, session_info->security_token);
+       security_token_debug(DBGC_AUTH, dbg_lev,
+                            session_info->security_token);
 }
 
-/**
- * Make a server_info struct from the info3 returned by a domain logon 
+NTSTATUS encode_claims_set(TALLOC_CTX *mem_ctx,
+                          struct CLAIMS_SET *claims_set,
+                          DATA_BLOB *claims_blob)
+{
+       TALLOC_CTX *tmp_ctx = NULL;
+       enum ndr_err_code ndr_err;
+       struct CLAIMS_SET_NDR *claims_set_info = NULL;
+       struct CLAIMS_SET_METADATA *metadata = NULL;
+       struct CLAIMS_SET_METADATA_NDR *metadata_ndr = NULL;
+
+       if (claims_blob == NULL) {
+               return NT_STATUS_INVALID_PARAMETER_3;
+       }
+
+       tmp_ctx = talloc_new(mem_ctx);
+       if (tmp_ctx == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       metadata_ndr = talloc(tmp_ctx, struct CLAIMS_SET_METADATA_NDR);
+       if (metadata_ndr == NULL) {
+               talloc_free(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       metadata = talloc(metadata_ndr, struct CLAIMS_SET_METADATA);
+       if (metadata == NULL) {
+               talloc_free(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       claims_set_info = talloc(metadata, struct CLAIMS_SET_NDR);
+       if (claims_set_info == NULL) {
+               talloc_free(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       *metadata_ndr = (struct CLAIMS_SET_METADATA_NDR) {
+               .claims.metadata = metadata,
+       };
+
+       *metadata = (struct CLAIMS_SET_METADATA) {
+               .claims_set = claims_set_info,
+               .compression_format = CLAIMS_COMPRESSION_FORMAT_XPRESS_HUFF,
+       };
+
+       *claims_set_info = (struct CLAIMS_SET_NDR) {
+               .claims.claims = claims_set,
+       };
+
+       ndr_err = ndr_push_struct_blob(claims_blob, mem_ctx, metadata_ndr,
+                                      (ndr_push_flags_fn_t)ndr_push_CLAIMS_SET_METADATA_NDR);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               NTSTATUS nt_status = ndr_map_error2ntstatus(ndr_err);
+               DBG_ERR("CLAIMS_SET_METADATA_NDR push failed: %s\n",
+                       nt_errstr(nt_status));
+
+               talloc_free(tmp_ctx);
+               return nt_status;
+       }
+
+       talloc_free(tmp_ctx);
+       return NT_STATUS_OK;
+}
+
+/*
+ * Construct a ‘claims_data’ structure from a claims blob, such as is found in a
+ * PAC.
  */
-_PUBLIC_ NTSTATUS make_server_info_netlogon_validation(TALLOC_CTX *mem_ctx,
-                                             const char *account_name,
-                                             uint16_t validation_level,
-                                             union netr_Validation *validation,
-                                             struct auth_serversupplied_info **_server_info)
+NTSTATUS claims_data_from_encoded_claims_set(TALLOC_CTX *claims_data_ctx,
+                                            const DATA_BLOB *encoded_claims_set,
+                                            struct claims_data **out)
 {
-       struct auth_serversupplied_info *server_info;
-       struct netr_SamBaseInfo *base = NULL;
-       int i;
-
-       switch (validation_level) {
-       case 2:
-               if (!validation || !validation->sam2) {
-                       return NT_STATUS_INVALID_PARAMETER;
-               }
-               base = &validation->sam2->base;
-               break;
-       case 3:
-               if (!validation || !validation->sam3) {
-                       return NT_STATUS_INVALID_PARAMETER;
-               }
-               base = &validation->sam3->base;
-               break;
-       case 6:
-               if (!validation || !validation->sam6) {
-                       return NT_STATUS_INVALID_PARAMETER;
+       struct claims_data *claims_data = NULL;
+       DATA_BLOB data = {};
+
+       if (out == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       *out = NULL;
+
+       claims_data = talloc(claims_data_ctx, struct claims_data);
+       if (claims_data == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (encoded_claims_set != NULL) {
+               /*
+                * We make a copy of the data, for it might not be
+                * talloc‐allocated — we might have obtained it directly with
+                * krb5_pac_get_buffer().
+                */
+               data = data_blob_dup_talloc(claims_data, *encoded_claims_set);
+               if (data.length != encoded_claims_set->length) {
+                       talloc_free(claims_data);
+                       return NT_STATUS_NO_MEMORY;
                }
-               base = &validation->sam6->base;
-               break;
-       default:
-               return NT_STATUS_INVALID_LEVEL;
        }
 
-       server_info = talloc(mem_ctx, struct auth_serversupplied_info);
-       NT_STATUS_HAVE_NO_MEMORY(server_info);
+       *claims_data = (struct claims_data) {
+               .encoded_claims_set = data,
+               .flags = CLAIMS_DATA_ENCODED_CLAIMS_PRESENT,
+       };
 
-       /*
-          Here is where we should check the list of
-          trusted domains, and verify that the SID 
-          matches.
-       */
-       server_info->account_sid = dom_sid_add_rid(server_info, base->domain_sid, base->rid);
-       NT_STATUS_HAVE_NO_MEMORY(server_info->account_sid);
+       *out = claims_data;
 
+       return NT_STATUS_OK;
+}
 
-       server_info->primary_group_sid = dom_sid_add_rid(server_info, base->domain_sid, base->primary_gid);
-       NT_STATUS_HAVE_NO_MEMORY(server_info->primary_group_sid);
+/*
+ * Construct a ‘claims_data’ structure from a talloc‐allocated claims set, such
+ * as we might build from searching the database. If this function returns
+ * successfully, it assumes ownership of the claims set.
+ */
+NTSTATUS claims_data_from_claims_set(TALLOC_CTX *claims_data_ctx,
+                                    struct CLAIMS_SET *claims_set,
+                                    struct claims_data **out)
+{
+       struct claims_data *claims_data = NULL;
 
-       server_info->n_domain_groups = base->groups.count;
-       if (base->groups.count) {
-               server_info->domain_groups = talloc_array(server_info, struct dom_sid*, base->groups.count);
-               NT_STATUS_HAVE_NO_MEMORY(server_info->domain_groups);
-       } else {
-               server_info->domain_groups = NULL;
+       if (out == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       for (i = 0; i < base->groups.count; i++) {
-               server_info->domain_groups[i] = dom_sid_add_rid(server_info, base->domain_sid, base->groups.rids[i].rid);
-               NT_STATUS_HAVE_NO_MEMORY(server_info->domain_groups[i]);
+       *out = NULL;
+
+       claims_data = talloc(claims_data_ctx, struct claims_data);
+       if (claims_data == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
+       *claims_data = (struct claims_data) {
+               .claims_set = talloc_steal(claims_data, claims_set),
+               .flags = CLAIMS_DATA_CLAIMS_PRESENT,
+       };
 
-       /* Copy 'other' sids.  We need to do sid filtering here to
-          prevent possible elevation of privileges.  See:
+       *out = claims_data;
 
-           http://www.microsoft.com/windows2000/techinfo/administration/security/sidfilter.asp
-         */
+       return NT_STATUS_OK;
+}
 
-       if (validation_level == 3) {
-               struct dom_sid **dgrps = server_info->domain_groups;
-               size_t sidcount = server_info->n_domain_groups + validation->sam3->sidcount;
-               size_t n_dgrps = server_info->n_domain_groups;
+/*
+ * From a ‘claims_data’ structure, return an encoded claims blob that can be put
+ * into a PAC.
+ */
+NTSTATUS claims_data_encoded_claims_set(TALLOC_CTX *mem_ctx,
+                                       struct claims_data *claims_data,
+                                       DATA_BLOB *encoded_claims_set_out)
+{
+       uint8_t *data = NULL;
+       size_t len;
 
-               if (validation->sam3->sidcount > 0) {
-                       dgrps = talloc_realloc(server_info, dgrps, struct dom_sid*, sidcount);
-                       NT_STATUS_HAVE_NO_MEMORY(dgrps);
+       if (encoded_claims_set_out == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-                       for (i = 0; i < validation->sam3->sidcount; i++) {
-                               dgrps[n_dgrps + i] = talloc_reference(dgrps, validation->sam3->sids[i].sid);
-                       }
+       *encoded_claims_set_out = data_blob_null;
+
+       if (claims_data == NULL) {
+               return NT_STATUS_OK;
+       }
+
+       if (!(claims_data->flags & CLAIMS_DATA_ENCODED_CLAIMS_PRESENT)) {
+               NTSTATUS status;
+
+               /* See whether we have a claims set that we can encode. */
+               if (!(claims_data->flags & CLAIMS_DATA_CLAIMS_PRESENT)) {
+                       return NT_STATUS_OK;
+               }
+
+               status = encode_claims_set(claims_data,
+                                          claims_data->claims_set,
+                                          &claims_data->encoded_claims_set);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+
+               claims_data->flags |= CLAIMS_DATA_ENCODED_CLAIMS_PRESENT;
+       }
+
+       if (claims_data->encoded_claims_set.data != NULL) {
+               data = talloc_reference(mem_ctx, claims_data->encoded_claims_set.data);
+               if (data == NULL) {
+                       return NT_STATUS_NO_MEMORY;
                }
+       }
+       len = claims_data->encoded_claims_set.length;
+
+       *encoded_claims_set_out = data_blob_const(data, len);
+       return NT_STATUS_OK;
+}
 
-               server_info->n_domain_groups = sidcount;
-               server_info->domain_groups = dgrps;
+/*
+ * From a ‘claims_data’ structure, return an array of security claims that can
+ * be put in a security token for access checks.
+ */
+NTSTATUS claims_data_security_claims(TALLOC_CTX *mem_ctx,
+                                    struct claims_data *claims_data,
+                                    struct CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 **security_claims_out,
+                                    uint32_t *n_security_claims_out)
+{
+       struct CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 *security_claims = NULL;
+       uint32_t n_security_claims;
+       NTSTATUS status;
+
+       if (security_claims_out == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-               /* Where are the 'global' sids?... */
+       if (n_security_claims_out == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if (base->account_name.string) {
-               server_info->account_name = talloc_reference(server_info, base->account_name.string);
-       } else {
-               server_info->account_name = talloc_strdup(server_info, account_name);
-               NT_STATUS_HAVE_NO_MEMORY(server_info->account_name);
+       *security_claims_out = NULL;
+       *n_security_claims_out = 0;
+
+       if (claims_data == NULL) {
+               return NT_STATUS_OK;
        }
 
-       server_info->domain_name = talloc_reference(server_info, base->domain.string);
-       server_info->full_name = talloc_reference(server_info, base->full_name.string);
-       server_info->logon_script = talloc_reference(server_info, base->logon_script.string);
-       server_info->profile_path = talloc_reference(server_info, base->profile_path.string);
-       server_info->home_directory = talloc_reference(server_info, base->home_directory.string);
-       server_info->home_drive = talloc_reference(server_info, base->home_drive.string);
-       server_info->logon_server = talloc_reference(server_info, base->logon_server.string);
-       server_info->last_logon = base->last_logon;
-       server_info->last_logoff = base->last_logoff;
-       server_info->acct_expiry = base->acct_expiry;
-       server_info->last_password_change = base->last_password_change;
-       server_info->allow_password_change = base->allow_password_change;
-       server_info->force_password_change = base->force_password_change;
-       server_info->logon_count = base->logon_count;
-       server_info->bad_password_count = base->bad_password_count;
-       server_info->acct_flags = base->acct_flags;
+       if (!(claims_data->flags & CLAIMS_DATA_SECURITY_CLAIMS_PRESENT)) {
+               struct CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 *decoded_claims = NULL;
+               uint32_t n_decoded_claims = 0;
 
-       server_info->authenticated = true;
+               /* See whether we have a claims set that we can convert. */
+               if (!(claims_data->flags & CLAIMS_DATA_CLAIMS_PRESENT)) {
 
-       /* ensure we are never given NULL session keys */
+                       /*
+                        * See whether we have an encoded claims set that we can
+                        * decode.
+                        */
+                       if (!(claims_data->flags & CLAIMS_DATA_ENCODED_CLAIMS_PRESENT)) {
+                               /* We don’t have anything. */
+                               return NT_STATUS_OK;
+                       }
 
-       if (all_zero(base->key.key, sizeof(base->key.key))) {
-               server_info->user_session_key = data_blob(NULL, 0);
-       } else {
-               server_info->user_session_key = data_blob_talloc(server_info, base->key.key, sizeof(base->key.key));
-               NT_STATUS_HAVE_NO_MEMORY(server_info->user_session_key.data);
+                       /* Decode an existing claims set. */
+
+                       if (claims_data->encoded_claims_set.length) {
+                               TALLOC_CTX *tmp_ctx = NULL;
+                               struct CLAIMS_SET_METADATA_NDR claims;
+                               const struct CLAIMS_SET_METADATA *metadata = NULL;
+                               enum ndr_err_code ndr_err;
+
+                               tmp_ctx = talloc_new(claims_data);
+                               if (tmp_ctx == NULL) {
+                                       return NT_STATUS_NO_MEMORY;
+                               }
+
+                               ndr_err = ndr_pull_struct_blob(&claims_data->encoded_claims_set,
+                                                              tmp_ctx,
+                                                              &claims,
+                                                              (ndr_pull_flags_fn_t)ndr_pull_CLAIMS_SET_METADATA_NDR);
+                               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                                       status = ndr_map_error2ntstatus(ndr_err);
+                                       DBG_ERR("Failed to parse encoded claims set: %s\n",
+                                               nt_errstr(status));
+                                       talloc_free(tmp_ctx);
+                                       return status;
+                               }
+
+                               metadata = claims.claims.metadata;
+                               if (metadata != NULL) {
+                                       struct CLAIMS_SET_NDR *claims_set_ndr = metadata->claims_set;
+                                       if (claims_set_ndr != NULL) {
+                                               struct CLAIMS_SET **claims_set = &claims_set_ndr->claims.claims;
+
+                                               claims_data->claims_set = talloc_move(claims_data, claims_set);
+                                       }
+                               }
+
+                               talloc_free(tmp_ctx);
+                       }
+
+                       claims_data->flags |= CLAIMS_DATA_CLAIMS_PRESENT;
+               }
+
+               /*
+                * Convert the decoded claims set to the security attribute
+                * claims format.
+                */
+               status = token_claims_to_claims_v1(claims_data,
+                                                  claims_data->claims_set,
+                                                  &decoded_claims,
+                                                  &n_decoded_claims);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+
+               claims_data->security_claims = decoded_claims;
+               claims_data->n_security_claims = n_decoded_claims;
+
+               claims_data->flags |= CLAIMS_DATA_SECURITY_CLAIMS_PRESENT;
        }
 
-       if (all_zero(base->LMSessKey.key, sizeof(base->LMSessKey.key))) {
-               server_info->lm_session_key = data_blob(NULL, 0);
-       } else {
-               server_info->lm_session_key = data_blob_talloc(server_info, base->LMSessKey.key, sizeof(base->LMSessKey.key));
-               NT_STATUS_HAVE_NO_MEMORY(server_info->lm_session_key.data);
+       if (claims_data->security_claims != NULL) {
+               security_claims = talloc_reference(mem_ctx, claims_data->security_claims);
+               if (security_claims == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
        }
+       n_security_claims = claims_data->n_security_claims;
+
+       *security_claims_out = security_claims;
+       *n_security_claims_out = n_security_claims;
 
-       *_server_info = server_info;
        return NT_STATUS_OK;
 }
-
-