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
- the Free Software Foundation; either version 2 of the License, or
+ 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,
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, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "libcli/smb2/smb2_calls.h"
#include "libcli/composite/composite.h"
#include "auth/gensec/gensec.h"
+#include "param/param.h"
-/*
+/**
initialise a smb2_session structure
*/
struct smb2_session *smb2_session_init(struct smb2_transport *transport,
- TALLOC_CTX *parent_ctx, BOOL primary)
+ struct loadparm_context *lp_ctx,
+ TALLOC_CTX *parent_ctx, bool primary)
{
struct smb2_session *session;
NTSTATUS status;
/* prepare a gensec context for later use */
status = gensec_client_start(session, &session->gensec,
- session->transport->socket->event.ctx);
+ session->transport->socket->event.ctx,
+ lp_ctx);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(session);
return NULL;
return session;
}
-/*
+/**
send a session setup request
*/
struct smb2_request *smb2_session_setup_send(struct smb2_session *session,
NTSTATUS status;
req = smb2_request_init(session->transport, SMB2_OP_SESSSETUP,
- 0x10, io->in.secblob.length);
+ 0x18, true, io->in.secblob.length);
if (req == NULL) return NULL;
- SBVAL(req->out.hdr, SMB2_HDR_UID, session->uid);
- SSVAL(req->out.body, 0x02, 0); /* pad */
- SIVAL(req->out.body, 0x04, io->in.unknown2);
- SIVAL(req->out.body, 0x08, io->in.unknown3);
+ SBVAL(req->out.hdr, SMB2_HDR_SESSION_ID, session->uid);
+ SCVAL(req->out.body, 0x02, io->in.vc_number);
+ SCVAL(req->out.body, 0x03, io->in.security_mode);
+ SIVAL(req->out.body, 0x04, io->in.capabilities);
+ SIVAL(req->out.body, 0x08, io->in.channel);
+ SBVAL(req->out.body, 0x10, io->in.previous_sessionid);
req->session = session;
}
-/*
+/**
recv a session setup reply
*/
NTSTATUS smb2_session_setup_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx,
return smb2_request_destroy(req);
}
- SMB2_CHECK_PACKET_RECV(req, 0x08, True);
+ SMB2_CHECK_PACKET_RECV(req, 0x08, true);
- io->out._pad = SVAL(req->in.body, 0x02);
- io->out.uid = BVAL(req->in.hdr, SMB2_HDR_UID);
+ io->out.session_flags = SVAL(req->in.body, 0x02);
+ io->out.uid = BVAL(req->in.hdr, SMB2_HDR_SESSION_ID);
status = smb2_pull_o16s16_blob(&req->in, mem_ctx, req->in.body+0x04, &io->out.secblob);
if (!NT_STATUS_IS_OK(status)) {
*/
static void session_request_handler(struct smb2_request *req)
{
- struct composite_context *c = talloc_get_type(req->async.private,
+ struct composite_context *c = talloc_get_type(req->async.private_data,
struct composite_context);
struct smb2_session_state *state = talloc_get_type(c->private_data,
struct smb2_session_state);
session_key_err = gensec_session_key(session->gensec, &session_key);
if (NT_STATUS_IS_OK(session_key_err)) {
- session->session_key = session_key;
- }
+ session->transport->signing.session_key = session_key;
+ }
}
session->uid = state->io.out.uid;
}
state->req->async.fn = session_request_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
return;
}
return;
}
+ if (session->transport->signing.doing_signing) {
+ if (session->transport->signing.session_key.length != 16) {
+ DEBUG(2,("Wrong session key length %u for SMB2 signing\n",
+ (unsigned)session->transport->signing.session_key.length));
+ composite_error(c, NT_STATUS_ACCESS_DENIED);
+ return;
+ }
+ session->transport->signing.signing_started = true;
+ }
+
composite_done(c);
}
struct composite_context *c;
struct smb2_session_state *state;
- c = talloc_zero(session, struct composite_context);
+ c = composite_create(session, session->transport->socket->event.ctx);
if (c == NULL) return NULL;
state = talloc(c, struct smb2_session_state);
- if (state == NULL) {
- c->status = NT_STATUS_NO_MEMORY;
- goto failed;
- }
-
- c->state = COMPOSITE_STATE_IN_PROGRESS;
+ if (composite_nomem(state, c)) return c;
c->private_data = state;
- c->event_ctx = session->transport->socket->event.ctx;
ZERO_STRUCT(state->io);
- state->io.in._pad = 0x0;
- state->io.in.unknown2 = 0xF;
- state->io.in.unknown3 = 0x00;
+ state->io.in.vc_number = 0;
+ if (session->transport->signing.doing_signing) {
+ state->io.in.security_mode =
+ SMB2_NEGOTIATE_SIGNING_ENABLED | SMB2_NEGOTIATE_SIGNING_REQUIRED;
+ }
+ state->io.in.capabilities = 0;
+ state->io.in.channel = 0;
+ state->io.in.previous_sessionid = 0;
c->status = gensec_set_credentials(session->gensec, credentials);
- if (!NT_STATUS_IS_OK(c->status)) {
- goto failed;
- }
+ if (!composite_is_ok(c)) return c;
c->status = gensec_set_target_hostname(session->gensec,
session->transport->socket->hostname);
- if (!NT_STATUS_IS_OK(c->status)) {
- goto failed;
- }
+ if (!composite_is_ok(c)) return c;
c->status = gensec_set_target_service(session->gensec, "cifs");
- if (!NT_STATUS_IS_OK(c->status)) {
- goto failed;
- }
+ if (!composite_is_ok(c)) return c;
c->status = gensec_start_mech_by_oid(session->gensec, GENSEC_OID_SPNEGO);
- if (!NT_STATUS_IS_OK(c->status)) {
- goto failed;
- }
+ if (!composite_is_ok(c)) return c;
c->status = gensec_update(session->gensec, c,
session->transport->negotiate.secblob,
&state->io.in.secblob);
if (!NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
- goto failed;
+ composite_error(c, c->status);
+ return c;
}
state->gensec_status = c->status;
state->req = smb2_session_setup_send(session, &state->io);
- if (state->req == NULL) {
- c->status = NT_STATUS_NO_MEMORY;
- goto failed;
- }
-
- state->req->async.fn = session_request_handler;
- state->req->async.private = c;
-
- return c;
-
-failed:
- composite_error(c, c->status);
+ composite_continue_smb2(c, state->req, session_request_handler, c);
return c;
}
git.samba.org / ab / samba.git / .git / blobdiff