[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Sun May 13 10:00:04 MDT 2012
The branch, master has been updated
via 8f887ce s3:smb2_sesssetup: make the top level code async using
via 1b8645b s3:smb2_sesssetup: add smbd_smb2_session_setup_send/recv as wrapper
via 70ac2cc s3:smb2_sesssetup: pass down in_flags to smbd_smb2_session_setup()
via 7b359bc s3:smb2_sesssetup: pass down in_previous_session_id to all layers
from 073666e lib/socket_wrapper only enable python_socket and socket.py with socket_wrapper
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8f887ce1643fccf14944b05f41fee5c8e29502cd
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat May 12 10:20:55 2012 +0200
s3:smb2_sesssetup: make the top level code async using
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Sun May 13 17:59:39 CEST 2012 on sn-devel-104
commit 1b8645b4c830efc2f2c577dc1f43db151bc400a0
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat May 12 10:16:41 2012 +0200
s3:smb2_sesssetup: add smbd_smb2_session_setup_send/recv as wrapper
This just adds smbd_smb2_session_setup_send/recv as wrapper to
the sync smbd_smb2_session_setup function.
This will allow us to change to top level code to work async,
then we can have a 2nd step where we remove the sync
smbd_smb2_session_setup function.
metze
commit 70ac2cc831c870c14d479cf845677f141b2eb85d
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat May 12 09:48:19 2012 +0200
s3:smb2_sesssetup: pass down in_flags to smbd_smb2_session_setup()
metze
commit 7b359bc6154a4656f40837720e9147d590717102
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 18 15:00:06 2012 +0200
s3:smb2_sesssetup: pass down in_previous_session_id to all layers
metze
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smb2_sesssetup.c | 198 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 176 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 9a750ee..2dafa06 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -27,33 +27,38 @@
#include "auth.h"
#include "../lib/tsocket/tsocket.h"
#include "../libcli/security/security.h"
+#include "../lib/util/tevent_ntstatus.h"
-static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
+static struct tevent_req *smbd_smb2_session_setup_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct smbd_smb2_request *smb2req,
uint64_t in_session_id,
+ uint8_t in_flags,
uint8_t in_security_mode,
- DATA_BLOB in_security_buffer,
+ uint64_t in_previous_session_id,
+ DATA_BLOB in_security_buffer);
+static NTSTATUS smbd_smb2_session_setup_recv(struct tevent_req *req,
uint16_t *out_session_flags,
+ TALLOC_CTX *mem_ctx,
DATA_BLOB *out_security_buffer,
uint64_t *out_session_id);
+static void smbd_smb2_request_sesssetup_done(struct tevent_req *subreq);
+
NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *smb2req)
{
const uint8_t *inhdr;
const uint8_t *inbody;
int i = smb2req->current_idx;
- uint8_t *outhdr;
- DATA_BLOB outbody;
- DATA_BLOB outdyn;
uint64_t in_session_id;
+ uint8_t in_flags;
uint8_t in_security_mode;
+ uint64_t in_previous_session_id;
uint16_t in_security_offset;
uint16_t in_security_length;
DATA_BLOB in_security_buffer;
- uint16_t out_session_flags;
- uint64_t out_session_id;
- uint16_t out_security_offset;
- DATA_BLOB out_security_buffer = data_blob_null;
NTSTATUS status;
+ struct tevent_req *subreq;
status = smbd_smb2_request_verify_sizes(smb2req, 0x19);
if (!NT_STATUS_IS_OK(status)) {
@@ -62,8 +67,15 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *smb2req)
inhdr = (const uint8_t *)smb2req->in.vector[i+0].iov_base;
inbody = (const uint8_t *)smb2req->in.vector[i+1].iov_base;
+ in_session_id = BVAL(inhdr, SMB2_HDR_SESSION_ID);
+
+ in_flags = CVAL(inbody, 0x02);
+ in_security_mode = CVAL(inbody, 0x03);
+ /* Capabilities = IVAL(inbody, 0x04) */
+ /* Channel = IVAL(inbody, 0x08) */
in_security_offset = SVAL(inbody, 0x0C);
in_security_length = SVAL(inbody, 0x0E);
+ in_previous_session_id = BVAL(inbody, 0x10);
if (in_security_offset != (SMB2_HDR_BODY + smb2req->in.vector[i+1].iov_len)) {
return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
@@ -73,22 +85,57 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *smb2req)
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 *)smb2req->in.vector[i+2].iov_base;
in_security_buffer.length = in_security_length;
- status = smbd_smb2_session_setup(smb2req,
- in_session_id,
- in_security_mode,
- in_security_buffer,
- &out_session_flags,
- &out_security_buffer,
- &out_session_id);
+ subreq = smbd_smb2_session_setup_send(smb2req,
+ smb2req->sconn->ev_ctx,
+ smb2req,
+ in_session_id,
+ in_flags,
+ in_security_mode,
+ in_previous_session_id,
+ in_security_buffer);
+ if (subreq == NULL) {
+ return smbd_smb2_request_error(smb2req, NT_STATUS_NO_MEMORY);
+ }
+ tevent_req_set_callback(subreq, smbd_smb2_request_sesssetup_done, smb2req);
+
+ return smbd_smb2_request_pending_queue(smb2req, subreq, 500);
+}
+
+static void smbd_smb2_request_sesssetup_done(struct tevent_req *subreq)
+{
+ struct smbd_smb2_request *smb2req =
+ tevent_req_callback_data(subreq,
+ struct smbd_smb2_request);
+ int i = smb2req->current_idx;
+ uint8_t *outhdr;
+ DATA_BLOB outbody;
+ DATA_BLOB outdyn;
+ uint16_t out_session_flags;
+ uint64_t out_session_id;
+ uint16_t out_security_offset;
+ DATA_BLOB out_security_buffer = data_blob_null;
+ NTSTATUS status;
+ NTSTATUS error; /* transport error */
+
+ status = smbd_smb2_session_setup_recv(subreq,
+ &out_session_flags,
+ smb2req,
+ &out_security_buffer,
+ &out_session_id);
+ TALLOC_FREE(subreq);
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(smb2req, status);
+ error = smbd_smb2_request_error(smb2req, status);
+ if (!NT_STATUS_IS_OK(error)) {
+ smbd_server_connection_terminate(smb2req->sconn,
+ nt_errstr(error));
+ return;
+ }
+ return;
}
out_security_offset = SMB2_HDR_BODY + 0x08;
@@ -97,7 +144,13 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *smb2req)
outbody = data_blob_talloc(smb2req->out.vector, NULL, 0x08);
if (outbody.data == NULL) {
- return smbd_smb2_request_error(smb2req, NT_STATUS_NO_MEMORY);
+ error = smbd_smb2_request_error(smb2req, NT_STATUS_NO_MEMORY);
+ if (!NT_STATUS_IS_OK(error)) {
+ smbd_server_connection_terminate(smb2req->sconn,
+ nt_errstr(error));
+ return;
+ }
+ return;
}
SBVAL(outhdr, SMB2_HDR_SESSION_ID, out_session_id);
@@ -112,8 +165,13 @@ NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *smb2req)
outdyn = out_security_buffer;
- return smbd_smb2_request_done_ex(smb2req, status, outbody, &outdyn,
- __location__);
+ error = smbd_smb2_request_done_ex(smb2req, status, outbody, &outdyn,
+ __location__);
+ if (!NT_STATUS_IS_OK(error)) {
+ smbd_server_connection_terminate(smb2req->sconn,
+ nt_errstr(error));
+ return;
+ }
}
static int smbd_smb2_session_destructor(struct smbd_smb2_session *session)
@@ -143,6 +201,7 @@ static int smbd_smb2_session_destructor(struct smbd_smb2_session *session)
static NTSTATUS smbd_smb2_auth_generic_return(struct smbd_smb2_session *session,
struct smbd_smb2_request *smb2req,
uint8_t in_security_mode,
+ uint64_t in_previous_session_id,
DATA_BLOB in_security_buffer,
uint16_t *out_session_flags,
uint64_t *out_session_id)
@@ -218,6 +277,7 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbd_smb2_session *session,
static NTSTATUS smbd_smb2_auth_generic(struct smbd_smb2_session *session,
struct smbd_smb2_request *smb2req,
uint8_t in_security_mode,
+ uint64_t in_previous_session_id,
DATA_BLOB in_security_buffer,
uint16_t *out_session_flags,
DATA_BLOB *out_security_buffer,
@@ -275,6 +335,7 @@ static NTSTATUS smbd_smb2_auth_generic(struct smbd_smb2_session *session,
return smbd_smb2_auth_generic_return(session,
smb2req,
in_security_mode,
+ in_previous_session_id,
in_security_buffer,
out_session_flags,
out_session_id);
@@ -282,7 +343,9 @@ static NTSTATUS smbd_smb2_auth_generic(struct smbd_smb2_session *session,
static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
uint64_t in_session_id,
+ uint8_t in_flags,
uint8_t in_security_mode,
+ uint64_t in_previous_session_id,
DATA_BLOB in_security_buffer,
uint16_t *out_session_flags,
DATA_BLOB *out_security_buffer,
@@ -339,12 +402,103 @@ static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
return smbd_smb2_auth_generic(session,
smb2req,
in_security_mode,
+ in_previous_session_id,
in_security_buffer,
out_session_flags,
out_security_buffer,
out_session_id);
}
+struct smbd_smb2_session_setup_state {
+ struct tevent_context *ev;
+ struct smbd_smb2_request *smb2req;
+ uint64_t in_session_id;
+ uint8_t in_flags;
+ uint8_t in_security_mode;
+ uint64_t in_previous_session_id;
+ DATA_BLOB in_security_buffer;
+ uint16_t out_session_flags;
+ DATA_BLOB out_security_buffer;
+ uint64_t out_session_id;
+};
+
+static struct tevent_req *smbd_smb2_session_setup_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct smbd_smb2_request *smb2req,
+ uint64_t in_session_id,
+ uint8_t in_flags,
+ uint8_t in_security_mode,
+ uint64_t in_previous_session_id,
+ DATA_BLOB in_security_buffer)
+{
+ struct tevent_req *req;
+ struct smbd_smb2_session_setup_state *state;
+ NTSTATUS status;
+
+ req = tevent_req_create(mem_ctx, &state,
+ struct smbd_smb2_session_setup_state);
+ if (req == NULL) {
+ return NULL;
+ }
+ state->ev = ev;
+ state->smb2req = smb2req;
+ state->in_session_id = in_session_id;
+ state->in_flags = in_flags;
+ state->in_security_mode = in_security_mode;
+ state->in_previous_session_id = in_previous_session_id;
+ state->in_security_buffer = in_security_buffer;
+
+ status = smbd_smb2_session_setup(smb2req,
+ in_session_id,
+ in_flags,
+ in_security_mode,
+ in_previous_session_id,
+ in_security_buffer,
+ &state->out_session_flags,
+ &state->out_security_buffer,
+ &state->out_session_id);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) ||
+ NT_STATUS_IS_OK(status))
+ {
+ talloc_steal(state, state->out_security_buffer.data);
+ }
+ if (tevent_req_nterror(req, status)) {
+ return tevent_req_post(req, ev);
+ }
+
+ tevent_req_done(req);
+ return tevent_req_post(req, ev);
+}
+
+static NTSTATUS smbd_smb2_session_setup_recv(struct tevent_req *req,
+ uint16_t *out_session_flags,
+ TALLOC_CTX *mem_ctx,
+ DATA_BLOB *out_security_buffer,
+ uint64_t *out_session_id)
+{
+ struct smbd_smb2_session_setup_state *state =
+ tevent_req_data(req,
+ struct smbd_smb2_session_setup_state);
+ NTSTATUS status;
+
+ if (tevent_req_is_nterror(req, &status)) {
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+ tevent_req_received(req);
+ return status;
+ }
+ } else {
+ status = NT_STATUS_OK;
+ }
+
+ *out_session_flags = state->out_session_flags;
+ *out_security_buffer = state->out_security_buffer;
+ *out_session_id = state->out_session_id;
+
+ talloc_steal(mem_ctx, out_security_buffer->data);
+ tevent_req_received(req);
+ return status;
+}
+
NTSTATUS smbd_smb2_request_process_logoff(struct smbd_smb2_request *req)
{
NTSTATUS status;
--
Samba Shared Repository
More information about the samba-cvs
mailing list