Author: metze Date: 2006-07-27 10:03:54 +0000 (Thu, 27 Jul 2006) New Revision: 17268
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17268 Log: change the smb2 session setup to use the new gensec_update_send/recv() api metze Modified: branches/SAMBA_4_0/source/smb_server/smb2/sesssetup.c Changeset: Modified: branches/SAMBA_4_0/source/smb_server/smb2/sesssetup.c =================================================================== --- branches/SAMBA_4_0/source/smb_server/smb2/sesssetup.c 2006-07-27 10:02:21 UTC (rev 17267) +++ branches/SAMBA_4_0/source/smb_server/smb2/sesssetup.c 2006-07-27 10:03:54 UTC (rev 17268) @@ -28,11 +28,78 @@ #include "smb_server/smb2/smb2_server.h" #include "smbd/service_stream.h" -static NTSTATUS smb2srv_sesssetup_backend(struct smb2srv_request *req, union smb_sesssetup *io) +static void smb2srv_sesssetup_send(struct smb2srv_request *req, union smb_sesssetup *io) { + uint16_t unknown1; + + if (NT_STATUS_IS_OK(req->status)) { + unknown1 = 0x0003; + } else if (NT_STATUS_EQUAL(req->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { + unknown1 = 0x0002; + } else { + smb2srv_send_error(req, req->status); + return; + } + + SMB2SRV_CHECK(smb2srv_setup_reply(req, 0x08, True, io->smb2.out.secblob.length)); + + SSVAL(req->out.hdr, SMB2_HDR_UNKNOWN1, unknown1); + SBVAL(req->out.hdr, SMB2_HDR_UID, io->smb2.out.uid); + + SSVAL(req->out.body, 0x02, io->smb2.out._pad); + SMB2SRV_CHECK(smb2_push_o16s16_blob(&req->out, 0x04, io->smb2.out.secblob)); + + smb2srv_send_reply(req); +} + +struct smb2srv_sesssetup_callback_ctx { + struct smb2srv_request *req; + union smb_sesssetup *io; + struct smbsrv_session *smb_sess; +}; + +static void smb2srv_sesssetup_callback(struct gensec_update_request *greq, void *private_data) +{ + struct smb2srv_sesssetup_callback_ctx *ctx = talloc_get_type(private_data, + struct smb2srv_sesssetup_callback_ctx); + struct smb2srv_request *req = ctx->req; + union smb_sesssetup *io = ctx->io; + struct smbsrv_session *smb_sess = ctx->smb_sess;; + struct auth_session_info *session_info = NULL; NTSTATUS status; + + status = gensec_update_recv(greq, req, &io->smb2.out.secblob); + if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { + goto done; + } else if (!NT_STATUS_IS_OK(status)) { + goto failed; + } + + status = gensec_session_info(smb_sess->gensec_ctx, &session_info); + if (!NT_STATUS_IS_OK(status)) { + goto failed; + } + + /* Ensure this is marked as a 'real' vuid, not one + * simply valid for the session setup leg */ + status = smbsrv_session_sesssetup_finished(smb_sess, session_info); + if (!NT_STATUS_IS_OK(status)) { + goto failed; + } + req->session = smb_sess; + +done: + io->smb2.out.uid = smb_sess->vuid; +failed: + req->status = auth_nt_status_squash(status); + smb2srv_sesssetup_send(req, io); +} + +static void smb2srv_sesssetup_backend(struct smb2srv_request *req, union smb_sesssetup *io) +{ + NTSTATUS status; + struct smb2srv_sesssetup_callback_ctx *callback_ctx; struct smbsrv_session *smb_sess = NULL; - struct auth_session_info *session_info = NULL; uint64_t vuid; io->smb2.out._pad = 0; @@ -51,7 +118,7 @@ req->smb_conn->connection->event.ctx); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Failed to start GENSEC server code: %s\n", nt_errstr(status))); - return status; + goto failed; } gensec_set_credentials(gensec_ctx, req->smb_conn->negotiate.server_credentials); @@ -63,12 +130,15 @@ status = gensec_start_mech_by_oid(gensec_ctx, GENSEC_OID_SPNEGO); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Failed to start GENSEC SPNEGO server code: %s\n", nt_errstr(status))); - return status; + goto failed; } /* allocate a new session */ smb_sess = smbsrv_session_new(req->smb_conn, gensec_ctx); - NT_STATUS_HAVE_NO_MEMORY(smb_sess); + if (!smb_sess) { + status = NT_STATUS_INSUFFICIENT_RESOURCES; + goto failed; + } status = smbsrv_smb2_init_tcons(smb_sess); if (!NT_STATUS_IS_OK(status)) { goto failed; @@ -79,7 +149,8 @@ } if (!smb_sess) { - return NT_STATUS_USER_SESSION_DELETED; + status = NT_STATUS_USER_SESSION_DELETED; + goto failed; } if (!smb_sess->gensec_ctx) { @@ -88,59 +159,23 @@ goto failed; } - status = gensec_update(smb_sess->gensec_ctx, req, io->smb2.in.secblob, &io->smb2.out.secblob); - if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { - io->smb2.out.uid = smb_sess->vuid; - return status; - } else if (!NT_STATUS_IS_OK(status)) { - goto failed; - } + callback_ctx = talloc(req, struct smb2srv_sesssetup_callback_ctx); + if (!callback_ctx) goto nomem; + callback_ctx->req = req; + callback_ctx->io = io; + callback_ctx->smb_sess = smb_sess; - status = gensec_session_info(smb_sess->gensec_ctx, &session_info); - if (!NT_STATUS_IS_OK(status)) { - goto failed; - } - - /* Ensure this is marked as a 'real' vuid, not one - * simply valid for the session setup leg */ - status = smbsrv_session_sesssetup_finished(smb_sess, session_info); - if (!NT_STATUS_IS_OK(status)) { - goto failed; - } - req->session = smb_sess; - - io->smb2.out.uid = smb_sess->vuid; - return status; - + gensec_update_send(smb_sess->gensec_ctx, io->smb2.in.secblob, + smb2srv_sesssetup_callback, callback_ctx); + return; +nomem: + status = NT_STATUS_NO_MEMORY; failed: talloc_free(smb_sess); - return auth_nt_status_squash(status); + req->status = auth_nt_status_squash(status); + smb2srv_sesssetup_send(req, io); } -static void smb2srv_sesssetup_send(struct smb2srv_request *req, union smb_sesssetup *io) -{ - uint16_t unknown1; - - if (NT_STATUS_IS_OK(req->status)) { - unknown1 = 0x0003; - } else if (NT_STATUS_EQUAL(req->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { - unknown1 = 0x0002; - } else { - smb2srv_send_error(req, req->status); - return; - } - - SMB2SRV_CHECK(smb2srv_setup_reply(req, 0x08, True, io->smb2.out.secblob.length)); - - SSVAL(req->out.hdr, SMB2_HDR_UNKNOWN1, unknown1); - SBVAL(req->out.hdr, SMB2_HDR_UID, io->smb2.out.uid); - - SSVAL(req->out.body, 0x02, io->smb2.out._pad); - SMB2SRV_CHECK(smb2_push_o16s16_blob(&req->out, 0x04, io->smb2.out.secblob)); - - smb2srv_send_reply(req); -} - void smb2srv_sesssetup_recv(struct smb2srv_request *req) { union smb_sesssetup *io; @@ -155,12 +190,7 @@ SMB2SRV_CHECK(smb2_pull_o16s16_blob(&req->in, io, req->in.body+0x0C, &io->smb2.in.secblob)); io->smb2.in.unknown4 = BVAL(req->in.body, 0x10); - req->status = smb2srv_sesssetup_backend(req, io); - if (req->control_flags & SMB2SRV_REQ_CTRL_FLAG_NOT_REPLY) { - talloc_free(req); - return; - } - smb2srv_sesssetup_send(req, io); + smb2srv_sesssetup_backend(req, io); } static NTSTATUS smb2srv_logoff_backend(struct smb2srv_request *req)
