ntlmssp: Add ntlmssp_blob_matches_magic()
[amitay/samba.git] / source3 / smbd / smb2_sesssetup.c
index faf7bd3db311b7dd886863424f5b7e8f89182330..30e65c21371e2ef044c6cb72573e0150cafff580 100644 (file)
@@ -3,6 +3,7 @@
    Core SMB2 server
 
    Copyright (C) Stefan Metzmacher 2009
+   Copyright (C) Jeremy Allison 2010
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
-
-static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *req,
+#include "../libcli/smb/smb_common.h"
+#include "../libcli/auth/spnego.h"
+#include "../libcli/auth/ntlmssp.h"
+#include "../auth/gensec/gensec.h"
+#include "ntlmssp_wrap.h"
+#include "../librpc/gen_ndr/krb5pac.h"
+#include "libads/kerberos_proto.h"
+#include "../lib/util/asn1.h"
+#include "auth.h"
+#include "../lib/tsocket/tsocket.h"
+#include "../libcli/security/security.h"
+
+static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
                                        uint64_t in_session_id,
                                        uint8_t in_security_mode,
                                        DATA_BLOB in_security_buffer,
@@ -30,11 +42,11 @@ static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *req,
                                        DATA_BLOB *out_security_buffer,
                                        uint64_t *out_session_id);
 
-NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *req)
+NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *smb2req)
 {
        const uint8_t *inhdr;
        const uint8_t *inbody;
-       int i = req->current_idx;
+       int i = smb2req->current_idx;
        uint8_t *outhdr;
        DATA_BLOB outbody;
        DATA_BLOB outdyn;
@@ -51,36 +63,36 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *req)
        DATA_BLOB out_security_buffer;
        NTSTATUS status;
 
-       inhdr = (const uint8_t *)req->in.vector[i+0].iov_base;
+       inhdr = (const uint8_t *)smb2req->in.vector[i+0].iov_base;
 
-       if (req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) {
-               return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+       if (smb2req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) {
+               return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
-       inbody = (const uint8_t *)req->in.vector[i+1].iov_base;
+       inbody = (const uint8_t *)smb2req->in.vector[i+1].iov_base;
 
        body_size = SVAL(inbody, 0x00);
        if (body_size != expected_body_size) {
-               return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+               return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
        in_security_offset = SVAL(inbody, 0x0C);
        in_security_length = SVAL(inbody, 0x0E);
 
        if (in_security_offset != (SMB2_HDR_BODY + (body_size & 0xFFFFFFFE))) {
-               return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+               return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
-       if (in_security_length > req->in.vector[i+2].iov_len) {
-               return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+       if (in_security_length > smb2req->in.vector[i+2].iov_len) {
+               return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
        in_session_id = BVAL(inhdr, SMB2_HDR_SESSION_ID);
        in_security_mode = CVAL(inbody, 0x03);
-       in_security_buffer.data = (uint8_t *)req->in.vector[i+2].iov_base;
+       in_security_buffer.data = (uint8_t *)smb2req->in.vector[i+2].iov_base;
        in_security_buffer.length = in_security_length;
 
-       status = smbd_smb2_session_setup(req,
+       status = smbd_smb2_session_setup(smb2req,
                                         in_session_id,
                                         in_security_mode,
                                         in_security_buffer,
@@ -90,16 +102,16 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *req)
        if (!NT_STATUS_IS_OK(status) &&
            !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
                status = nt_status_squash(status);
-               return smbd_smb2_request_error(req, status);
+               return smbd_smb2_request_error(smb2req, status);
        }
 
        out_security_offset = SMB2_HDR_BODY + 0x08;
 
-       outhdr = (uint8_t *)req->out.vector[i].iov_base;
+       outhdr = (uint8_t *)smb2req->out.vector[i].iov_base;
 
-       outbody = data_blob_talloc(req->out.vector, NULL, 0x08);
+       outbody = data_blob_talloc(smb2req->out.vector, NULL, 0x08);
        if (outbody.data == NULL) {
-               return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
+               return smbd_smb2_request_error(smb2req, NT_STATUS_NO_MEMORY);
        }
 
        SBVAL(outhdr, SMB2_HDR_SESSION_ID, out_session_id);
@@ -114,12 +126,13 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *req)
 
        outdyn = out_security_buffer;
 
-       return smbd_smb2_request_done_ex(req, status, outbody, &outdyn);
+       return smbd_smb2_request_done_ex(smb2req, status, outbody, &outdyn,
+                                        __location__);
 }
 
 static int smbd_smb2_session_destructor(struct smbd_smb2_session *session)
 {
-       if (session->conn == NULL) {
+       if (session->sconn == NULL) {
                return 0;
        }
 
@@ -128,160 +141,308 @@ static int smbd_smb2_session_destructor(struct smbd_smb2_session *session)
                talloc_free(session->tcons.list);
        }
 
-       idr_remove(session->conn->smb2.sessions.idtree, session->vuid);
-       DLIST_REMOVE(session->conn->smb2.sessions.list, session);
+       idr_remove(session->sconn->smb2.sessions.idtree, session->vuid);
+       DLIST_REMOVE(session->sconn->smb2.sessions.list, session);
+       invalidate_vuid(session->sconn, session->vuid);
 
        session->vuid = 0;
        session->status = NT_STATUS_USER_SESSION_DELETED;
-       session->conn = NULL;
+       session->sconn = NULL;
 
        return 0;
 }
 
-static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *req,
-                                       uint64_t in_session_id,
+#ifdef HAVE_KRB5
+static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
+                                       struct smbd_smb2_request *smb2req,
                                        uint8_t in_security_mode,
-                                       DATA_BLOB in_security_buffer,
+                                       const DATA_BLOB *secblob,
+                                       const char *mechOID,
                                        uint16_t *out_session_flags,
                                        DATA_BLOB *out_security_buffer,
                                        uint64_t *out_session_id)
 {
-       struct smbd_smb2_session *session;
+       DATA_BLOB ap_rep = data_blob_null;
+       DATA_BLOB ap_rep_wrapped = data_blob_null;
+       DATA_BLOB ticket = data_blob_null;
+       DATA_BLOB session_key = data_blob_null;
+       DATA_BLOB secblob_out = data_blob_null;
+       uint8 tok_id[2];
+       struct PAC_LOGON_INFO *logon_info = NULL;
+       char *principal = NULL;
+       char *user = NULL;
+       char *domain = NULL;
+       struct passwd *pw = NULL;
        NTSTATUS status;
+       char *real_username;
+       bool username_was_mapped = false;
+       bool map_domainuser_to_guest = false;
 
-       *out_session_flags = 0;
-       *out_session_id = 0;
+       if (!spnego_parse_krb5_wrap(talloc_tos(), *secblob, &ticket, tok_id)) {
+               status = NT_STATUS_LOGON_FAILURE;
+               goto fail;
+       }
 
-       if (in_session_id == 0) {
-               int id;
+       status = ads_verify_ticket(smb2req, lp_realm(), 0, &ticket,
+                                  &principal, &logon_info, &ap_rep,
+                                  &session_key, true);
 
-               /* create a new session */
-               session = talloc_zero(req->conn, struct smbd_smb2_session);
-               if (session == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-               session->status = NT_STATUS_MORE_PROCESSING_REQUIRED;
-               id = idr_get_new_random(req->conn->smb2.sessions.idtree,
-                                       session,
-                                       req->conn->smb2.sessions.limit);
-               if (id == -1) {
-                       return NT_STATUS_INSUFFICIENT_RESOURCES;
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1,("smb2: Failed to verify incoming ticket with error %s!\n",
+                       nt_errstr(status)));
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_TIME_DIFFERENCE_AT_DC)) {
+                       status = NT_STATUS_LOGON_FAILURE;
                }
-               session->vuid = id;
+               goto fail;
+       }
 
-               session->tcons.idtree = idr_init(session);
-               if (session->tcons.idtree == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-               session->tcons.limit = 0x0000FFFE;
-               session->tcons.list = NULL;
+       status = get_user_from_kerberos_info(talloc_tos(),
+                                            session->sconn->remote_hostname,
+                                            principal, logon_info,
+                                            &username_was_mapped,
+                                            &map_domainuser_to_guest,
+                                            &user, &domain,
+                                            &real_username, &pw);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
 
-               DLIST_ADD_END(req->conn->smb2.sessions.list, session,
-                             struct smbd_smb2_session *);
-               session->conn = req->conn;
-               talloc_set_destructor(session, smbd_smb2_session_destructor);
-       } else {
-               void *p;
+       /* save the PAC data if we have it */
+       if (logon_info) {
+               netsamlogon_cache_store(user, &logon_info->info3);
+       }
 
-               /* lookup an existing session */
-               p = idr_find(req->conn->smb2.sessions.idtree, in_session_id);
-               if (p == NULL) {
-                       return NT_STATUS_USER_SESSION_DELETED;
-               }
-               session = talloc_get_type_abort(p, struct smbd_smb2_session);
+       /* setup the string used by %U */
+       sub_set_smb_name(real_username);
+
+       /* reload services so that the new %U is taken into account */
+       reload_services(smb2req->sconn->msg_ctx, smb2req->sconn->sock, true);
+
+       status = make_session_info_krb5(session,
+                                       user, domain, real_username, pw,
+                                       logon_info, map_domainuser_to_guest,
+                                       username_was_mapped,
+                                       &session_key,
+                                       &session->session_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("smb2: make_server_info_krb5 failed\n"));
+               goto fail;
        }
 
-       if (NT_STATUS_IS_OK(session->status)) {
-               return NT_STATUS_REQUEST_NOT_ACCEPTED;
+       if ((in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) ||
+            lp_server_signing() == Required) {
+               session->do_signing = true;
        }
 
-       if (session->auth_ntlmssp_state == NULL) {
-               status = auth_ntlmssp_start(&session->auth_ntlmssp_state);
-               if (!NT_STATUS_IS_OK(status)) {
-                       TALLOC_FREE(session);
-                       return status;
-               }
+       if (security_session_user_level(session->session_info, NULL) < SECURITY_USER) {
+               /* we map anonymous to guest internally */
+               *out_session_flags |= SMB2_SESSION_FLAG_IS_GUEST;
+               *out_session_flags |= SMB2_SESSION_FLAG_IS_NULL;
+               /* force no signing */
+               session->do_signing = false;
        }
 
-       if (in_security_buffer.data[0] == ASN1_APPLICATION(0)) {
-               DATA_BLOB secblob_in;
-               DATA_BLOB chal_out;
-               char *kerb_mech = NULL;
+       session->session_key = session->session_info->session_key;
 
-               status = parse_spnego_mechanisms(in_security_buffer,
-                               &secblob_in, &kerb_mech);
-               if (!NT_STATUS_IS_OK(status)) {
-                       TALLOC_FREE(session);
-                       return nt_status_squash(status);
-               }
+       session->compat_vuser = talloc_zero(session, user_struct);
+       if (session->compat_vuser == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
+       }
+       session->compat_vuser->auth_ntlmssp_state = NULL;
+       session->compat_vuser->homes_snum = -1;
+       session->compat_vuser->session_info = session->session_info;
+       session->compat_vuser->session_keystr = NULL;
+       session->compat_vuser->vuid = session->vuid;
+       DLIST_ADD(session->sconn->smb1.sessions.validated_users, session->compat_vuser);
 
-               /* For now, just SPNEGO NTLMSSP - krb5 goes here later.. */
-               status = auth_ntlmssp_update(session->auth_ntlmssp_state,
-                                            secblob_in,
-                                            &chal_out);
+       if (security_session_user_level(session->session_info, NULL) >= SECURITY_USER) {
+               session->compat_vuser->homes_snum =
+                       register_homes_share(session->session_info->unix_info->unix_name);
+       }
 
-               if (!NT_STATUS_IS_OK(status) &&
-                               !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-                       auth_ntlmssp_end(&session->auth_ntlmssp_state);
-                       TALLOC_FREE(session);
-                       return nt_status_squash(status);
-               }
+       if (!session_claim(session->sconn, session->compat_vuser)) {
+               DEBUG(1, ("smb2: Failed to claim session "
+                       "for vuid=%d\n",
+                       session->compat_vuser->vuid));
+               goto fail;
+       }
 
-               *out_security_buffer = spnego_gen_auth_response(&chal_out,
-                                status, OID_NTLMSSP);
+       session->status = NT_STATUS_OK;
 
-               *out_session_id = session->vuid;
-               return status;
-       } else if (in_security_buffer.data[0] == ASN1_CONTEXT(1)) {
-               DATA_BLOB auth = data_blob_null;
-               DATA_BLOB auth_out = data_blob_null;
+       /*
+        * we attach the session to the request
+        * so that the response can be signed
+        */
+       smb2req->session = session;
+       if (session->do_signing) {
+               smb2req->do_signing = true;
+       }
 
-               /* its an auth packet */
-               if (!spnego_parse_auth(in_security_buffer, &auth)) {
-                       TALLOC_FREE(session);
-                       return NT_STATUS_LOGON_FAILURE;
-               }
-               /* For now, just SPNEGO NTLMSSP - krb5 goes here later.. */
-               status = auth_ntlmssp_update(session->auth_ntlmssp_state,
-                                            auth,
-                                            &auth_out);
-               if (!NT_STATUS_IS_OK(status)) {
-                       auth_ntlmssp_end(&session->auth_ntlmssp_state);
-                       TALLOC_FREE(session);
-                       return nt_status_squash(status);
-               }
+       global_client_caps |= (CAP_LEVEL_II_OPLOCKS|CAP_STATUS32);
+        status = NT_STATUS_OK;
+
+       /* wrap that up in a nice GSS-API wrapping */
+       ap_rep_wrapped = spnego_gen_krb5_wrap(talloc_tos(), ap_rep,
+                               TOK_ID_KRB_AP_REP);
+
+       secblob_out = spnego_gen_auth_response(
+                                       talloc_tos(),
+                                       &ap_rep_wrapped,
+                                       status,
+                                       mechOID);
+
+       *out_security_buffer = data_blob_talloc(smb2req,
+                                               secblob_out.data,
+                                               secblob_out.length);
+       if (secblob_out.data && out_security_buffer->data == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
+       }
 
-               *out_security_buffer = spnego_gen_auth_response(&auth_out,
-                                status, NULL);
+       data_blob_free(&ap_rep);
+       data_blob_free(&ap_rep_wrapped);
+       data_blob_free(&ticket);
+       data_blob_free(&session_key);
+       data_blob_free(&secblob_out);
 
-               *out_session_id = session->vuid;
-       } else if (strncmp((char *)(in_security_buffer.data), "NTLMSSP", 7) == 0) {
+       *out_session_id = session->vuid;
 
-               /* RAW NTLMSSP */
-               status = auth_ntlmssp_update(session->auth_ntlmssp_state,
-                                            in_security_buffer,
-                                            out_security_buffer);
+       return NT_STATUS_OK;
 
-               if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-                       *out_session_id = session->vuid;
-                       return status;
+  fail:
+
+       data_blob_free(&ap_rep);
+       data_blob_free(&ap_rep_wrapped);
+       data_blob_free(&ticket);
+       data_blob_free(&session_key);
+       data_blob_free(&secblob_out);
+
+       ap_rep_wrapped = data_blob_null;
+       secblob_out = spnego_gen_auth_response(
+                                       talloc_tos(),
+                                       &ap_rep_wrapped,
+                                       status,
+                                       mechOID);
+
+       *out_security_buffer = data_blob_talloc(smb2req,
+                                               secblob_out.data,
+                                               secblob_out.length);
+       data_blob_free(&secblob_out);
+       return status;
+}
+#endif
+
+static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session,
+                                       struct smbd_smb2_request *smb2req,
+                                       uint8_t in_security_mode,
+                                       DATA_BLOB in_security_buffer,
+                                       uint16_t *out_session_flags,
+                                       DATA_BLOB *out_security_buffer,
+                                       uint64_t *out_session_id)
+{
+       DATA_BLOB secblob_in = data_blob_null;
+       DATA_BLOB chal_out = data_blob_null;
+       char *kerb_mech = NULL;
+       NTSTATUS status;
+
+       /* Ensure we have no old NTLM state around. */
+       TALLOC_FREE(session->auth_ntlmssp_state);
+
+       status = parse_spnego_mechanisms(talloc_tos(), in_security_buffer,
+                       &secblob_in, &kerb_mech);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto out;
+       }
+
+#ifdef HAVE_KRB5
+       if (kerb_mech && ((lp_security()==SEC_ADS) ||
+                               USE_KERBEROS_KEYTAB) ) {
+               status = smbd_smb2_session_setup_krb5(session,
+                               smb2req,
+                               in_security_mode,
+                               &secblob_in,
+                               kerb_mech,
+                               out_session_flags,
+                               out_security_buffer,
+                               out_session_id);
+
+               goto out;
+       }
+#endif
+
+       if (kerb_mech) {
+               /* The mechtoken is a krb5 ticket, but
+                * we need to fall back to NTLM. */
+
+               DEBUG(3,("smb2: Got krb5 ticket in SPNEGO "
+                       "but set to downgrade to NTLMSSP\n"));
+
+               status = NT_STATUS_MORE_PROCESSING_REQUIRED;
+       } else {
+               /* Fall back to NTLMSSP. */
+               status = auth_ntlmssp_prepare(session->sconn->remote_address,
+                                           &session->auth_ntlmssp_state);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto out;
                }
+
+               auth_ntlmssp_want_feature(session->auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY);
+
+               status = auth_ntlmssp_start(session->auth_ntlmssp_state);
                if (!NT_STATUS_IS_OK(status)) {
-                       auth_ntlmssp_end(&session->auth_ntlmssp_state);
-                       TALLOC_FREE(session);
-                       return nt_status_squash(status);
+                       goto out;
                }
-               *out_session_id = session->vuid;
+
+               status = auth_ntlmssp_update(session->auth_ntlmssp_state,
+                                            talloc_tos(),
+                                            secblob_in,
+                                            &chal_out);
        }
 
-       /* TODO: setup session key for signing */
+       if (!NT_STATUS_IS_OK(status) &&
+                       !NT_STATUS_EQUAL(status,
+                               NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               goto out;
+       }
+
+       *out_security_buffer = spnego_gen_auth_response(smb2req,
+                                               &chal_out,
+                                               status,
+                                               OID_NTLMSSP);
+       if (out_security_buffer->data == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto out;
+       }
+       *out_session_id = session->vuid;
+
+  out:
 
+       data_blob_free(&secblob_in);
+       data_blob_free(&chal_out);
+       TALLOC_FREE(kerb_mech);
+       if (!NT_STATUS_IS_OK(status) &&
+                       !NT_STATUS_EQUAL(status,
+                               NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               TALLOC_FREE(session->auth_ntlmssp_state);
+               TALLOC_FREE(session);
+       }
+       return status;
+}
+
+static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct smbd_smb2_session *session,
+                                       struct smbd_smb2_request *smb2req,
+                                       uint8_t in_security_mode,
+                                       DATA_BLOB in_security_buffer,
+                                       uint16_t *out_session_flags,
+                                       uint64_t *out_session_id)
+{
        if ((in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) ||
            lp_server_signing() == Required) {
                session->do_signing = true;
        }
 
-       if (session->auth_ntlmssp_state->server_info->guest) {
+       if (security_session_user_level(session->session_info, NULL) < SECURITY_USER) {
                /* we map anonymous to guest internally */
                *out_session_flags |= SMB2_SESSION_FLAG_IS_GUEST;
                *out_session_flags |= SMB2_SESSION_FLAG_IS_NULL;
@@ -289,32 +450,35 @@ static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *req,
                session->do_signing = false;
        }
 
-       session->server_info = session->auth_ntlmssp_state->server_info;
-       data_blob_free(&session->server_info->user_session_key);
-       session->server_info->user_session_key =
-                       data_blob_talloc(
-                       session->server_info,
-                       session->auth_ntlmssp_state->ntlmssp_state->session_key.data,
-                       session->auth_ntlmssp_state->ntlmssp_state->session_key.length);
-       if (session->auth_ntlmssp_state->ntlmssp_state->session_key.length > 0) {
-               if (session->server_info->user_session_key.data == NULL) {
-                       TALLOC_FREE(session);
-                       return NT_STATUS_NO_MEMORY;
-               }
-       }
-       session->session_key = session->server_info->user_session_key;
+       session->session_key = session->session_info->session_key;
 
        session->compat_vuser = talloc_zero(session, user_struct);
        if (session->compat_vuser == NULL) {
+               TALLOC_FREE(session->auth_ntlmssp_state);
                TALLOC_FREE(session);
                return NT_STATUS_NO_MEMORY;
        }
        session->compat_vuser->auth_ntlmssp_state = session->auth_ntlmssp_state;
        session->compat_vuser->homes_snum = -1;
-       session->compat_vuser->server_info = session->server_info;
+       session->compat_vuser->session_info = session->session_info;
        session->compat_vuser->session_keystr = NULL;
        session->compat_vuser->vuid = session->vuid;
-       DLIST_ADD(session->conn->smb1.sessions.validated_users, session->compat_vuser);
+       DLIST_ADD(session->sconn->smb1.sessions.validated_users, session->compat_vuser);
+
+       if (security_session_user_level(session->session_info, NULL) >= SECURITY_USER) {
+               session->compat_vuser->homes_snum =
+                       register_homes_share(session->session_info->unix_info->unix_name);
+       }
+
+       if (!session_claim(session->sconn, session->compat_vuser)) {
+               DEBUG(1, ("smb2: Failed to claim session "
+                       "for vuid=%d\n",
+                       session->compat_vuser->vuid));
+               TALLOC_FREE(session->auth_ntlmssp_state);
+               TALLOC_FREE(session);
+               return NT_STATUS_LOGON_FAILURE;
+       }
+
 
        session->status = NT_STATUS_OK;
 
@@ -322,44 +486,305 @@ static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *req,
         * we attach the session to the request
         * so that the response can be signed
         */
-       req->session = session;
+       smb2req->session = session;
        if (session->do_signing) {
-               req->do_signing = true;
+               smb2req->do_signing = true;
        }
 
+       global_client_caps |= (CAP_LEVEL_II_OPLOCKS|CAP_STATUS32);
+
        *out_session_id = session->vuid;
-       return status;
+
+       return NT_STATUS_OK;
 }
 
-NTSTATUS smbd_smb2_request_check_session(struct smbd_smb2_request *req)
+static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
+                                       struct smbd_smb2_request *smb2req,
+                                       uint8_t in_security_mode,
+                                       DATA_BLOB in_security_buffer,
+                                       uint16_t *out_session_flags,
+                                       DATA_BLOB *out_security_buffer,
+                                       uint64_t *out_session_id)
+{
+       DATA_BLOB auth = data_blob_null;
+       DATA_BLOB auth_out = data_blob_null;
+       NTSTATUS status;
+
+       if (!spnego_parse_auth(talloc_tos(), in_security_buffer, &auth)) {
+               TALLOC_FREE(session);
+               return NT_STATUS_LOGON_FAILURE;
+       }
+
+       if (auth.data[0] == ASN1_APPLICATION(0)) {
+               /* Might be a second negTokenTarg packet */
+               DATA_BLOB secblob_in = data_blob_null;
+               char *kerb_mech = NULL;
+
+               status = parse_spnego_mechanisms(talloc_tos(),
+                               in_security_buffer,
+                               &secblob_in, &kerb_mech);
+               if (!NT_STATUS_IS_OK(status)) {
+                       TALLOC_FREE(session);
+                       return status;
+               }
+
+#ifdef HAVE_KRB5
+               if (kerb_mech && ((lp_security()==SEC_ADS) ||
+                                       USE_KERBEROS_KEYTAB) ) {
+                       status = smbd_smb2_session_setup_krb5(session,
+                                       smb2req,
+                                       in_security_mode,
+                                       &secblob_in,
+                                       kerb_mech,
+                                       out_session_flags,
+                                       out_security_buffer,
+                                       out_session_id);
+
+                       data_blob_free(&secblob_in);
+                       TALLOC_FREE(kerb_mech);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               TALLOC_FREE(session);
+                       }
+                       return status;
+               }
+#endif
+
+               /* Can't blunder into NTLMSSP auth if we have
+                * a krb5 ticket. */
+
+               if (kerb_mech) {
+                       DEBUG(3,("smb2: network "
+                               "misconfiguration, client sent us a "
+                               "krb5 ticket and kerberos security "
+                               "not enabled\n"));
+                       TALLOC_FREE(session);
+                       data_blob_free(&secblob_in);
+                       TALLOC_FREE(kerb_mech);
+                       return NT_STATUS_LOGON_FAILURE;
+               }
+
+               data_blob_free(&secblob_in);
+       }
+
+       if (session->auth_ntlmssp_state == NULL) {
+               status = auth_ntlmssp_prepare(session->sconn->remote_address,
+                                           &session->auth_ntlmssp_state);
+               if (!NT_STATUS_IS_OK(status)) {
+                       data_blob_free(&auth);
+                       TALLOC_FREE(session);
+                       return status;
+               }
+
+               auth_ntlmssp_want_feature(session->auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY);
+
+               status = auth_ntlmssp_start(session->auth_ntlmssp_state);
+               if (!NT_STATUS_IS_OK(status)) {
+                       data_blob_free(&auth);
+                       TALLOC_FREE(session);
+                       return status;
+               }
+       }
+
+       status = auth_ntlmssp_update(session->auth_ntlmssp_state,
+                                    talloc_tos(), auth,
+                                    &auth_out);
+       /* If status is NT_STATUS_OK then we need to get the token.
+        * Map to guest is now internal to auth_ntlmssp */
+       if (NT_STATUS_IS_OK(status)) {
+               status = auth_ntlmssp_session_info(session,
+                                                  session->auth_ntlmssp_state,
+                                                  &session->session_info);
+       }
+
+       if (!NT_STATUS_IS_OK(status) &&
+                       !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               TALLOC_FREE(session->auth_ntlmssp_state);
+               data_blob_free(&auth);
+               TALLOC_FREE(session);
+               return status;
+       }
+
+       data_blob_free(&auth);
+
+       *out_security_buffer = spnego_gen_auth_response(smb2req,
+                               &auth_out, status, NULL);
+
+       if (out_security_buffer->data == NULL) {
+               TALLOC_FREE(session->auth_ntlmssp_state);
+               TALLOC_FREE(session);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       *out_session_id = session->vuid;
+
+       if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               return NT_STATUS_MORE_PROCESSING_REQUIRED;
+       }
+
+       /* We're done - claim the session. */
+       return smbd_smb2_common_ntlmssp_auth_return(session,
+                                               smb2req,
+                                               in_security_mode,
+                                               in_security_buffer,
+                                               out_session_flags,
+                                               out_session_id);
+}
+
+static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session,
+                                       struct smbd_smb2_request *smb2req,
+                                       uint8_t in_security_mode,
+                                       DATA_BLOB in_security_buffer,
+                                       uint16_t *out_session_flags,
+                                       DATA_BLOB *out_security_buffer,
+                                       uint64_t *out_session_id)
+{
+       NTSTATUS status;
+
+       if (session->auth_ntlmssp_state == NULL) {
+               status = auth_ntlmssp_prepare(session->sconn->remote_address,
+                                           &session->auth_ntlmssp_state);
+               if (!NT_STATUS_IS_OK(status)) {
+                       TALLOC_FREE(session);
+                       return status;
+               }
+
+               auth_ntlmssp_want_feature(session->auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY);
+
+               if (session->sconn->use_gensec_hook) {
+                       status = auth_generic_start(session->auth_ntlmssp_state, GENSEC_OID_SPNEGO);
+               } else {
+                       status = auth_ntlmssp_start(session->auth_ntlmssp_state);
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       TALLOC_FREE(session);
+                       return status;
+               }
+       }
+
+       /* RAW NTLMSSP */
+       status = auth_ntlmssp_update(session->auth_ntlmssp_state,
+                                    smb2req,
+                                    in_security_buffer,
+                                    out_security_buffer);
+
+       if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               *out_session_id = session->vuid;
+               return status;
+       }
+
+       status = auth_ntlmssp_session_info(session,
+                                          session->auth_ntlmssp_state,
+                                          &session->session_info);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(session->auth_ntlmssp_state);
+               TALLOC_FREE(session);
+               return status;
+       }
+       *out_session_id = session->vuid;
+
+       return smbd_smb2_common_ntlmssp_auth_return(session,
+                                               smb2req,
+                                               in_security_mode,
+                                               in_security_buffer,
+                                               out_session_flags,
+                                               out_session_id);
+}
+
+static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
+                                       uint64_t in_session_id,
+                                       uint8_t in_security_mode,
+                                       DATA_BLOB in_security_buffer,
+                                       uint16_t *out_session_flags,
+                                       DATA_BLOB *out_security_buffer,
+                                       uint64_t *out_session_id)
 {
-       const uint8_t *inhdr;
-       int i = req->current_idx;
-       uint64_t in_session_id;
-       void *p;
        struct smbd_smb2_session *session;
 
-       inhdr = (const uint8_t *)req->in.vector[i+0].iov_base;
+       *out_session_flags = 0;
+       *out_session_id = 0;
 
-       in_session_id = BVAL(inhdr, SMB2_HDR_SESSION_ID);
+       if (in_session_id == 0) {
+               int id;
 
-       /* lookup an existing session */
-       p = idr_find(req->conn->smb2.sessions.idtree, in_session_id);
-       if (p == NULL) {
-               return NT_STATUS_USER_SESSION_DELETED;
+               /* create a new session */
+               session = talloc_zero(smb2req->sconn, struct smbd_smb2_session);
+               if (session == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               session->status = NT_STATUS_MORE_PROCESSING_REQUIRED;
+               id = idr_get_new_random(smb2req->sconn->smb2.sessions.idtree,
+                                       session,
+                                       smb2req->sconn->smb2.sessions.limit);
+               if (id == -1) {
+                       return NT_STATUS_INSUFFICIENT_RESOURCES;
+               }
+               session->vuid = id;
+
+               session->tcons.idtree = idr_init(session);
+               if (session->tcons.idtree == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               session->tcons.limit = 0x0000FFFE;
+               session->tcons.list = NULL;
+
+               DLIST_ADD_END(smb2req->sconn->smb2.sessions.list, session,
+                             struct smbd_smb2_session *);
+               session->sconn = smb2req->sconn;
+               talloc_set_destructor(session, smbd_smb2_session_destructor);
+       } else {
+               void *p;
+
+               /* lookup an existing session */
+               p = idr_find(smb2req->sconn->smb2.sessions.idtree, in_session_id);
+               if (p == NULL) {
+                       return NT_STATUS_USER_SESSION_DELETED;
+               }
+               session = talloc_get_type_abort(p, struct smbd_smb2_session);
        }
-       session = talloc_get_type_abort(p, struct smbd_smb2_session);
 
-       if (!NT_STATUS_IS_OK(session->status)) {
-               return NT_STATUS_ACCESS_DENIED;
+       if (NT_STATUS_IS_OK(session->status)) {
+               return NT_STATUS_REQUEST_NOT_ACCEPTED;
        }
 
-       set_current_user_info(session->server_info->sanitized_username,
-                             session->server_info->unix_name,
-                             pdb_get_domain(session->server_info->sam_account));
+       /* Handle either raw NTLMSSP or hand off the whole blob to
+        * GENSEC.  The processing at this layer is essentially
+        * identical regardless.  In particular, both rely only on the
+        * status code (not the contents of the packet) and do not
+        * wrap the result */
+       if (session->sconn->use_gensec_hook
+           || ntlmssp_blob_matches_magic(&in_security_buffer)) {
+               return smbd_smb2_raw_ntlmssp_auth(session,
+                                               smb2req,
+                                               in_security_mode,
+                                               in_security_buffer,
+                                               out_session_flags,
+                                               out_security_buffer,
+                                               out_session_id);
+       } else if (in_security_buffer.data[0] == ASN1_APPLICATION(0)) {
+               return smbd_smb2_spnego_negotiate(session,
+                                               smb2req,
+                                               in_security_mode,
+                                               in_security_buffer,
+                                               out_session_flags,
+                                               out_security_buffer,
+                                               out_session_id);
+       } else if (in_security_buffer.data[0] == ASN1_CONTEXT(1)) {
+               return smbd_smb2_spnego_auth(session,
+                                               smb2req,
+                                               in_security_mode,
+                                               in_security_buffer,
+                                               out_session_flags,
+                                               out_security_buffer,
+                                               out_session_id);
+       }
 
-       req->session = session;
-       return NT_STATUS_OK;
+       /* Unknown packet type. */
+       DEBUG(1,("Unknown packet type %u in smb2 sessionsetup\n",
+               (unsigned int)in_security_buffer.data[0] ));
+       TALLOC_FREE(session->auth_ntlmssp_state);
+       TALLOC_FREE(session);
+       return NT_STATUS_LOGON_FAILURE;
 }
 
 NTSTATUS smbd_smb2_request_process_logoff(struct smbd_smb2_request *req)