#include "smbprofile.h"
#include "../lib/util/bitmap.h"
#include "../librpc/gen_ndr/krb5pac.h"
+#include "lib/iov_buf.h"
#include "auth.h"
static void smbd_smb2_connection_handler(struct tevent_context *ev,
struct tevent_fd *fde,
uint16_t flags,
void *private_data);
-static NTSTATUS smbd_smb2_flush_send_queue(struct smbd_server_connection *sconn);
+static NTSTATUS smbd_smb2_flush_send_queue(struct smbXsrv_connection *xconn);
static const struct smbd_smb2_dispatch_table {
uint16_t opcode;
return true;
}
-static NTSTATUS smbd_initialize_smb2(struct smbd_server_connection *sconn)
+static NTSTATUS smbd_initialize_smb2(struct smbXsrv_connection *xconn)
{
- TALLOC_FREE(sconn->smb1.fde);
-
- sconn->smb2.send_queue = NULL;
-
- sconn->smb2.seqnum_low = 0;
- sconn->smb2.seqnum_range = 1;
- sconn->smb2.credits_granted = 1;
- sconn->smb2.max_credits = lp_smb2_max_credits();
- sconn->smb2.credits_bitmap = bitmap_talloc(sconn,
- sconn->smb2.max_credits);
- if (sconn->smb2.credits_bitmap == NULL) {
+ TALLOC_FREE(xconn->transport.fde);
+
+ xconn->smb2.credits.seq_low = 0;
+ xconn->smb2.credits.seq_range = 1;
+ xconn->smb2.credits.granted = 1;
+ xconn->smb2.credits.max = lp_smb2_max_credits();
+ xconn->smb2.credits.bitmap = bitmap_talloc(xconn,
+ xconn->smb2.credits.max);
+ if (xconn->smb2.credits.bitmap == NULL) {
return NT_STATUS_NO_MEMORY;
}
- sconn->smb2.fde = tevent_add_fd(sconn->ev_ctx,
- sconn,
- sconn->sock,
+ xconn->transport.fde = tevent_add_fd(xconn->ev_ctx,
+ xconn,
+ xconn->transport.sock,
TEVENT_FD_READ,
smbd_smb2_connection_handler,
- sconn);
- if (sconn->smb2.fde == NULL) {
+ xconn);
+ if (xconn->transport.fde == NULL) {
return NT_STATUS_NO_MEMORY;
}
/* Ensure child is set to non-blocking mode */
- set_blocking(sconn->sock, false);
+ set_blocking(xconn->transport.sock, false);
return NT_STATUS_OK;
}
return req;
}
-static NTSTATUS smbd_smb2_inbuf_parse_compound(struct smbXsrv_connection *conn,
+static NTSTATUS smbd_smb2_inbuf_parse_compound(struct smbXsrv_connection *xconn,
NTTIME now,
uint8_t *buf,
size_t buflen,
NTSTATUS status;
size_t enc_len;
- if (conn->protocol < PROTOCOL_SMB2_24) {
+ if (xconn->protocol < PROTOCOL_SMB2_24) {
DEBUG(10, ("Got SMB2_TRANSFORM header, "
"but dialect[0x%04X] is used\n",
- conn->smb2.server.dialect));
+ xconn->smb2.server.dialect));
goto inval;
}
- if (!(conn->smb2.server.capabilities & SMB2_CAP_ENCRYPTION)) {
+ if (xconn->smb2.server.cipher == 0) {
DEBUG(10, ("Got SMB2_TRANSFORM header, "
"but not negotiated "
"client[0x%08X] server[0x%08X]\n",
- conn->smb2.client.capabilities,
- conn->smb2.server.capabilities));
+ xconn->smb2.client.capabilities,
+ xconn->smb2.server.capabilities));
goto inval;
}
goto inval;
}
- status = smb2srv_session_lookup(conn, uid, now, &s);
+ status = smb2srv_session_lookup(xconn, uid, now, &s);
if (s == NULL) {
DEBUG(1, ("invalid session[%llu] in "
"SMB2_TRANSFORM header\n",
tf_iov[1].iov_len = enc_len;
status = smb2_signing_decrypt_pdu(s->global->decryption_key,
- conn->protocol,
+ xconn->smb2.server.cipher,
tf_iov, 2);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(iov_alloc);
return NT_STATUS_INVALID_PARAMETER;
}
-static NTSTATUS smbd_smb2_request_create(struct smbd_server_connection *sconn,
- uint8_t *inbuf, size_t size,
+static NTSTATUS smbd_smb2_request_create(struct smbXsrv_connection *xconn,
+ const uint8_t *_inpdu, size_t size,
struct smbd_smb2_request **_req)
{
+ struct smbd_server_connection *sconn = xconn->client->sconn;
struct smbd_smb2_request *req;
uint32_t protocol_version;
+ uint8_t *inpdu = NULL;
const uint8_t *inhdr = NULL;
uint16_t cmd;
uint32_t next_command_ofs;
NTSTATUS status;
NTTIME now;
- if (size < (4 + SMB2_HDR_BODY + 2)) {
+ if (size < (SMB2_HDR_BODY + 2)) {
DEBUG(0,("Invalid SMB2 packet length count %ld\n", (long)size));
return NT_STATUS_INVALID_PARAMETER;
}
- inhdr = inbuf + 4;
+ inhdr = _inpdu;
protocol_version = IVAL(inhdr, SMB2_HDR_PROTOCOL_ID);
if (protocol_version != SMB2_MAGIC) {
return NT_STATUS_INVALID_PARAMETER;
}
- req = smbd_smb2_request_allocate(sconn);
+ req = smbd_smb2_request_allocate(xconn);
if (req == NULL) {
return NT_STATUS_NO_MEMORY;
}
req->sconn = sconn;
+ req->xconn = xconn;
- talloc_steal(req, inbuf);
+ inpdu = talloc_memdup(req, _inpdu, size);
+ if (inpdu == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
req->request_time = timeval_current();
now = timeval_to_nttime(&req->request_time);
- status = smbd_smb2_inbuf_parse_compound(sconn->conn,
+ status = smbd_smb2_inbuf_parse_compound(xconn,
now,
- inbuf + NBT_HDR_SIZE,
- size - NBT_HDR_SIZE,
+ inpdu,
+ size,
req, &req->in.vector,
&req->in.vector_count);
if (!NT_STATUS_IS_OK(status)) {
return NT_STATUS_OK;
}
-static bool smb2_validate_sequence_number(struct smbd_server_connection *sconn,
+static bool smb2_validate_sequence_number(struct smbXsrv_connection *xconn,
uint64_t message_id, uint64_t seq_id)
{
- struct bitmap *credits_bm = sconn->smb2.credits_bitmap;
+ struct bitmap *credits_bm = xconn->smb2.credits.bitmap;
unsigned int offset;
+ uint64_t seq_tmp;
- if (seq_id < sconn->smb2.seqnum_low) {
+ seq_tmp = xconn->smb2.credits.seq_low;
+ if (seq_id < seq_tmp) {
DEBUG(0,("smb2_validate_sequence_number: bad message_id "
"%llu (sequence id %llu) "
"(granted = %u, low = %llu, range = %u)\n",
(unsigned long long)message_id,
(unsigned long long)seq_id,
- (unsigned int)sconn->smb2.credits_granted,
- (unsigned long long)sconn->smb2.seqnum_low,
- (unsigned int)sconn->smb2.seqnum_range));
+ (unsigned int)xconn->smb2.credits.granted,
+ (unsigned long long)xconn->smb2.credits.seq_low,
+ (unsigned int)xconn->smb2.credits.seq_range));
return false;
}
- if (seq_id >= sconn->smb2.seqnum_low + sconn->smb2.seqnum_range) {
+ seq_tmp += xconn->smb2.credits.seq_range;
+ if (seq_id >= seq_tmp) {
DEBUG(0,("smb2_validate_sequence_number: bad message_id "
"%llu (sequence id %llu) "
"(granted = %u, low = %llu, range = %u)\n",
(unsigned long long)message_id,
(unsigned long long)seq_id,
- (unsigned int)sconn->smb2.credits_granted,
- (unsigned long long)sconn->smb2.seqnum_low,
- (unsigned int)sconn->smb2.seqnum_range));
+ (unsigned int)xconn->smb2.credits.granted,
+ (unsigned long long)xconn->smb2.credits.seq_low,
+ (unsigned int)xconn->smb2.credits.seq_range));
return false;
}
- offset = seq_id % sconn->smb2.max_credits;
+ offset = seq_id % xconn->smb2.credits.max;
if (bitmap_query(credits_bm, offset)) {
DEBUG(0,("smb2_validate_sequence_number: duplicate message_id "
"(bm offset %u)\n",
(unsigned long long)message_id,
(unsigned long long)seq_id,
- (unsigned int)sconn->smb2.credits_granted,
- (unsigned long long)sconn->smb2.seqnum_low,
- (unsigned int)sconn->smb2.seqnum_range,
+ (unsigned int)xconn->smb2.credits.granted,
+ (unsigned long long)xconn->smb2.credits.seq_low,
+ (unsigned int)xconn->smb2.credits.seq_range,
offset));
return false;
}
/* Mark the message_ids as seen in the bitmap. */
bitmap_set(credits_bm, offset);
- if (seq_id != sconn->smb2.seqnum_low) {
+ if (seq_id != xconn->smb2.credits.seq_low) {
return true;
}
while (bitmap_query(credits_bm, offset)) {
DEBUG(10,("smb2_validate_sequence_number: clearing "
"id %llu (position %u) from bitmap\n",
- (unsigned long long)(sconn->smb2.seqnum_low),
+ (unsigned long long)(xconn->smb2.credits.seq_low),
offset));
bitmap_clear(credits_bm, offset);
- sconn->smb2.seqnum_low += 1;
- sconn->smb2.seqnum_range -= 1;
- offset = sconn->smb2.seqnum_low % sconn->smb2.max_credits;
+ xconn->smb2.credits.seq_low += 1;
+ xconn->smb2.credits.seq_range -= 1;
+ offset = xconn->smb2.credits.seq_low % xconn->smb2.credits.max;
}
return true;
}
-static bool smb2_validate_message_id(struct smbd_server_connection *sconn,
- const uint8_t *inhdr)
+static bool smb2_validate_message_id(struct smbXsrv_connection *xconn,
+ const uint8_t *inhdr)
{
uint64_t message_id = BVAL(inhdr, SMB2_HDR_MESSAGE_ID);
uint16_t opcode = SVAL(inhdr, SMB2_HDR_OPCODE);
return true;
}
- if (sconn->smb2.supports_multicredit) {
+ if (xconn->smb2.credits.multicredit) {
credit_charge = SVAL(inhdr, SMB2_HDR_CREDIT_CHARGE);
credit_charge = MAX(credit_charge, 1);
}
"seqnum low/range: %llu/%llu\n",
(unsigned long long) message_id,
(unsigned long long) credit_charge,
- (unsigned long long) sconn->smb2.credits_granted,
- (unsigned long long) sconn->smb2.seqnum_low,
- (unsigned long long) sconn->smb2.seqnum_range));
+ (unsigned long long) xconn->smb2.credits.granted,
+ (unsigned long long) xconn->smb2.credits.seq_low,
+ (unsigned long long) xconn->smb2.credits.seq_range));
- if (sconn->smb2.credits_granted < credit_charge) {
+ if (xconn->smb2.credits.granted < credit_charge) {
DEBUG(0, ("smb2_validate_message_id: client used more "
"credits than granted, mid %llu, charge %llu, "
"credits_granted %llu, "
"seqnum low/range: %llu/%llu\n",
(unsigned long long) message_id,
(unsigned long long) credit_charge,
- (unsigned long long) sconn->smb2.credits_granted,
- (unsigned long long) sconn->smb2.seqnum_low,
- (unsigned long long) sconn->smb2.seqnum_range));
+ (unsigned long long) xconn->smb2.credits.granted,
+ (unsigned long long) xconn->smb2.credits.seq_low,
+ (unsigned long long) xconn->smb2.credits.seq_range));
return false;
}
credit_charge,
(unsigned long long)id));
- ok = smb2_validate_sequence_number(sconn, message_id, id);
+ ok = smb2_validate_sequence_number(xconn, message_id, id);
if (!ok) {
return false;
}
}
/* substract used credits */
- sconn->smb2.credits_granted -= credit_charge;
+ xconn->smb2.credits.granted -= credit_charge;
return true;
}
return NT_STATUS_INVALID_PARAMETER;
}
- if (!smb2_validate_message_id(req->sconn, inhdr)) {
+ if (!smb2_validate_message_id(req->xconn, inhdr)) {
return NT_STATUS_INVALID_PARAMETER;
}
}
return NT_STATUS_OK;
}
-static void smb2_set_operation_credit(struct smbd_server_connection *sconn,
- const struct iovec *in_vector,
- struct iovec *out_vector)
+static void smb2_set_operation_credit(struct smbXsrv_connection *xconn,
+ const struct iovec *in_vector,
+ struct iovec *out_vector)
{
const uint8_t *inhdr = (const uint8_t *)in_vector->iov_base;
uint8_t *outhdr = (uint8_t *)out_vector->iov_base;
* Which means we would grant more credits
* for client which use multi credit requests.
*/
- current_max_credits = sconn->smb2.max_credits / 16;
+ current_max_credits = xconn->smb2.credits.max / 16;
current_max_credits = MAX(current_max_credits, 1);
- if (sconn->smb2.supports_multicredit) {
+ if (xconn->smb2.credits.multicredit) {
credit_charge = SVAL(inhdr, SMB2_HDR_CREDIT_CHARGE);
credit_charge = MAX(credit_charge, 1);
}
out_flags = IVAL(outhdr, SMB2_HDR_FLAGS);
out_status = NT_STATUS(IVAL(outhdr, SMB2_HDR_STATUS));
- SMB_ASSERT(sconn->smb2.max_credits >= sconn->smb2.credits_granted);
+ SMB_ASSERT(xconn->smb2.credits.max >= xconn->smb2.credits.granted);
- if (sconn->smb2.max_credits < credit_charge) {
- smbd_server_connection_terminate(sconn,
+ if (xconn->smb2.credits.max < credit_charge) {
+ smbd_server_connection_terminate(xconn,
"client error: credit charge > max credits\n");
return;
}
additional_credits = MIN(additional_credits, additional_max);
credits_granted = credit_charge + additional_credits;
- } else if (sconn->smb2.credits_granted == 0) {
+ } else if (xconn->smb2.credits.granted == 0) {
/*
* Make sure the client has always at least one credit
*/
* this makes sure the client consumes the lowest sequence
* number, before we can grant additional credits.
*/
- credits_possible = UINT64_MAX - sconn->smb2.seqnum_low;
+ credits_possible = UINT64_MAX - xconn->smb2.credits.seq_low;
if (credits_possible > 0) {
/* remove UINT64_MAX */
credits_possible -= 1;
}
credits_possible = MIN(credits_possible, current_max_credits);
- credits_possible -= sconn->smb2.seqnum_range;
+ credits_possible -= xconn->smb2.credits.seq_range;
credits_granted = MIN(credits_granted, credits_possible);
SSVAL(outhdr, SMB2_HDR_CREDIT, credits_granted);
- sconn->smb2.credits_granted += credits_granted;
- sconn->smb2.seqnum_range += credits_granted;
+ xconn->smb2.credits.granted += credits_granted;
+ xconn->smb2.credits.seq_range += credits_granted;
DEBUG(10,("smb2_set_operation_credit: requested %u, charge %u, "
"granted %u, current possible/max %u/%u, "
(unsigned int)credits_granted,
(unsigned int)credits_possible,
(unsigned int)current_max_credits,
- (unsigned int)sconn->smb2.credits_granted,
- (unsigned int)sconn->smb2.max_credits,
- (unsigned long long)sconn->smb2.seqnum_low,
- (unsigned int)sconn->smb2.seqnum_range));
+ (unsigned int)xconn->smb2.credits.granted,
+ (unsigned int)xconn->smb2.credits.max,
+ (unsigned long long)xconn->smb2.credits.seq_low,
+ (unsigned int)xconn->smb2.credits.seq_range));
}
static void smb2_calculate_credits(const struct smbd_smb2_request *inreq,
struct iovec *outhdr_v = SMBD_SMB2_IDX_HDR_IOV(outreq,out,idx);
uint8_t *outhdr = (uint8_t *)outhdr_v->iov_base;
- smb2_set_operation_credit(outreq->sconn, inhdr_v, outhdr_v);
+ smb2_set_operation_credit(outreq->xconn, inhdr_v, outhdr_v);
/* To match Windows, count up what we
just granted. */
static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req)
{
+ struct smbXsrv_connection *xconn = req->xconn;
TALLOC_CTX *mem_ctx;
struct iovec *vector;
int count;
/* setup the length of the NBT packet */
smb2_setup_nbt_length(req->out.vector, req->out.vector_count);
- DLIST_ADD_END(req->sconn->smb2.requests, req, struct smbd_smb2_request *);
+ DLIST_ADD_END(xconn->smb2.requests, req, struct smbd_smb2_request *);
return NT_STATUS_OK;
}
-void smbd_server_connection_terminate_ex(struct smbd_server_connection *sconn,
+void smbd_server_connection_terminate_ex(struct smbXsrv_connection *xconn,
const char *reason,
const char *location)
{
int count = req->out.vector_count;
int i;
- newreq = smbd_smb2_request_allocate(req->sconn);
+ newreq = smbd_smb2_request_allocate(req->xconn);
if (!newreq) {
return NULL;
}
newreq->sconn = req->sconn;
+ newreq->xconn = req->xconn;
newreq->session = req->session;
newreq->do_encryption = req->do_encryption;
newreq->do_signing = req->do_signing;
static NTSTATUS smb2_send_async_interim_response(const struct smbd_smb2_request *req)
{
- struct smbd_server_connection *sconn = req->sconn;
- struct smbXsrv_connection *conn = req->sconn->conn;
+ struct smbXsrv_connection *xconn = req->xconn;
int first_idx = 1;
struct iovec *firsttf = NULL;
struct iovec *outhdr_v = NULL;
*/
if (firsttf->iov_len == SMB2_TF_HDR_SIZE) {
status = smb2_signing_encrypt_pdu(req->first_key,
- conn->protocol,
+ xconn->smb2.server.cipher,
firsttf,
nreq->out.vector_count - first_idx);
if (!NT_STATUS_IS_OK(status)) {
}
} else if (req->last_key.length > 0) {
status = smb2_signing_sign_pdu(req->last_key,
- conn->protocol,
+ xconn->protocol,
outhdr_v,
SMBD_SMB2_NUM_IOV_PER_REQ - 1);
if (!NT_STATUS_IS_OK(status)) {
nreq->queue_entry.mem_ctx = nreq;
nreq->queue_entry.vector = nreq->out.vector;
nreq->queue_entry.count = nreq->out.vector_count;
- DLIST_ADD_END(nreq->sconn->smb2.send_queue, &nreq->queue_entry, NULL);
- nreq->sconn->smb2.send_queue_len++;
+ DLIST_ADD_END(xconn->smb2.send_queue, &nreq->queue_entry, NULL);
+ xconn->smb2.send_queue_len++;
- status = smbd_smb2_flush_send_queue(sconn);
+ status = smbd_smb2_flush_send_queue(xconn);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
}
struct smbd_smb2_request_pending_state {
- struct smbd_server_connection *sconn;
struct smbd_smb2_send_queue queue_entry;
uint8_t buf[NBT_HDR_SIZE + SMB2_TF_HDR_SIZE + SMB2_HDR_BODY + 0x08 + 1];
struct iovec vector[1 + SMBD_SMB2_NUM_IOV_PER_REQ];
return NT_STATUS_OK;
}
+static DATA_BLOB smbd_smb2_signing_key(struct smbXsrv_session *session,
+ struct smbXsrv_connection *xconn)
+{
+ struct smbXsrv_channel_global0 *c = NULL;
+ NTSTATUS status;
+ DATA_BLOB key = data_blob_null;
+
+ status = smbXsrv_session_find_channel(session, xconn, &c);
+ if (NT_STATUS_IS_OK(status)) {
+ key = c->signing_key;
+ }
+
+ if (key.length == 0) {
+ key = session->global->signing_key;
+ }
+
+ return key;
+}
+
static void smbd_smb2_request_pending_timer(struct tevent_context *ev,
struct tevent_timer *te,
struct timeval current_time,
struct smbd_smb2_request *req =
talloc_get_type_abort(private_data,
struct smbd_smb2_request);
- struct smbd_server_connection *sconn = req->sconn;
+ struct smbXsrv_connection *xconn = req->xconn;
struct smbd_smb2_request_pending_state *state = NULL;
uint8_t *outhdr = NULL;
const uint8_t *inhdr = NULL;
* of this fact sometime when refactoring. JRA.
*/
- state = talloc_zero(req->sconn, struct smbd_smb2_request_pending_state);
+ state = talloc_zero(req->xconn, struct smbd_smb2_request_pending_state);
if (state == NULL) {
- smbd_server_connection_terminate(req->sconn,
+ smbd_server_connection_terminate(xconn,
nt_errstr(NT_STATUS_NO_MEMORY));
return;
}
- state->sconn = req->sconn;
tf = state->buf + NBT_HDR_SIZE;
tf_len = SMB2_TF_HDR_SIZE;
/* Ensure we correctly go through crediting. Grant
the credits now, and zero credits on the final
response. */
- smb2_set_operation_credit(req->sconn,
+ smb2_set_operation_credit(req->xconn,
SMBD_SMB2_IN_HDR_IOV(req),
&state->vector[1+SMBD_SMB2_HDR_IOV_OFS]);
if (req->do_encryption) {
struct smbXsrv_session *x = req->session;
- struct smbXsrv_connection *conn = x->connection;
DATA_BLOB encryption_key = x->global->encryption_key;
status = smb2_signing_encrypt_pdu(encryption_key,
- conn->protocol,
+ xconn->smb2.server.cipher,
&state->vector[1+SMBD_SMB2_TF_IOV_OFS],
SMBD_SMB2_NUM_IOV_PER_REQ);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(req->sconn,
+ smbd_server_connection_terminate(xconn,
nt_errstr(status));
return;
}
} else if (req->do_signing) {
struct smbXsrv_session *x = req->session;
- struct smbXsrv_connection *conn = x->connection;
- DATA_BLOB signing_key = x->global->channels[0].signing_key;
+ DATA_BLOB signing_key = smbd_smb2_signing_key(x, xconn);
status = smb2_signing_sign_pdu(signing_key,
- conn->protocol,
+ xconn->protocol,
&state->vector[1+SMBD_SMB2_HDR_IOV_OFS],
SMBD_SMB2_NUM_IOV_PER_REQ - 1);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(req->sconn,
+ smbd_server_connection_terminate(xconn,
nt_errstr(status));
return;
}
state->queue_entry.mem_ctx = state;
state->queue_entry.vector = state->vector;
state->queue_entry.count = ARRAY_SIZE(state->vector);
- DLIST_ADD_END(sconn->smb2.send_queue, &state->queue_entry, NULL);
- sconn->smb2.send_queue_len++;
+ DLIST_ADD_END(xconn->smb2.send_queue, &state->queue_entry, NULL);
+ xconn->smb2.send_queue_len++;
- status = smbd_smb2_flush_send_queue(sconn);
+ status = smbd_smb2_flush_send_queue(xconn);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn,
+ smbd_server_connection_terminate(xconn,
nt_errstr(status));
return;
}
static NTSTATUS smbd_smb2_request_process_cancel(struct smbd_smb2_request *req)
{
- struct smbd_server_connection *sconn = req->sconn;
+ struct smbXsrv_connection *xconn = req->xconn;
struct smbd_smb2_request *cur;
const uint8_t *inhdr;
uint32_t flags;
* we don't need the request anymore
* cancel requests never have a response
*/
- DLIST_REMOVE(req->sconn->smb2.requests, req);
+ DLIST_REMOVE(xconn->smb2.requests, req);
TALLOC_FREE(req);
- for (cur = sconn->smb2.requests; cur; cur = cur->next) {
+ for (cur = xconn->smb2.requests; cur; cur = cur->next) {
const uint8_t *outhdr;
uint64_t message_id;
uint64_t async_id;
req->last_session_id = 0;
/* lookup an existing session */
- status = smb2srv_session_lookup(req->sconn->conn,
+ status = smb2srv_session_lookup(req->xconn,
in_session_id, now,
&session);
if (session) {
return NT_STATUS_INVALID_HANDLE;
}
- if (in_session_id != req->sconn->conn->last_session_id) {
- req->sconn->conn->last_session_id = in_session_id;
+ if (in_session_id != req->xconn->client->last_session_id) {
+ req->xconn->client->last_session_id = in_session_id;
set_current_user_info(session_info->unix_info->sanitized_username,
session_info->unix_info->unix_name,
session_info->info->domain_name);
NTSTATUS smbd_smb2_request_verify_creditcharge(struct smbd_smb2_request *req,
uint32_t data_length)
{
+ struct smbXsrv_connection *xconn = req->xconn;
uint16_t needed_charge;
uint16_t credit_charge = 1;
const uint8_t *inhdr;
inhdr = SMBD_SMB2_IN_HDR_PTR(req);
- if (req->sconn->smb2.supports_multicredit) {
+ if (xconn->smb2.credits.multicredit) {
credit_charge = SVAL(inhdr, SMB2_HDR_CREDIT_CHARGE);
credit_charge = MAX(credit_charge, 1);
}
NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
{
- struct smbXsrv_connection *conn = req->sconn->conn;
+ struct smbXsrv_connection *xconn = req->xconn;
const struct smbd_smb2_dispatch_table *call = NULL;
const struct iovec *intf_v = SMBD_SMB2_IN_TF_IOV(req);
const uint8_t *inhdr;
inhdr = SMBD_SMB2_IN_HDR_PTR(req);
+ DO_PROFILE_INC(request);
+
/* TODO: verify more things */
flags = IVAL(inhdr, SMB2_HDR_FLAGS);
smb2_opcode_name(opcode),
(unsigned long long)mid));
- if (conn->protocol >= PROTOCOL_SMB2_02) {
+ if (xconn->protocol >= PROTOCOL_SMB2_02) {
/*
* once the protocol is negotiated
* SMB2_OP_NEGPROT is not allowed anymore
encryption_required = x->global->encryption_required;
if (opcode == SMB2_OP_SESSSETUP &&
- x->global->channels[0].signing_key.length) {
+ x->global->signing_key.length > 0) {
signing_required = true;
}
}
if (req->do_encryption) {
signing_required = false;
} else if (signing_required || (flags & SMB2_HDR_FLAG_SIGNED)) {
- DATA_BLOB signing_key;
+ DATA_BLOB signing_key = data_blob_null;
if (x == NULL) {
/*
return smbd_smb2_request_error(req, status);
}
- signing_key = x->global->channels[0].signing_key;
+ signing_key = smbd_smb2_signing_key(x, xconn);
/*
* If we have a signing key, we should
}
status = smb2_signing_check_pdu(signing_key,
- conn->protocol,
+ xconn->protocol,
SMBD_SMB2_IN_HDR_IOV(req),
SMBD_SMB2_NUM_IOV_PER_REQ - 1);
if (!NT_STATUS_IS_OK(status)) {
SMB_ASSERT(call->need_tcon);
}
+#define _INBYTES(_r) \
+ iov_buflen(SMBD_SMB2_IN_HDR_IOV(_r), SMBD_SMB2_NUM_IOV_PER_REQ-1)
+
switch (opcode) {
case SMB2_OP_NEGPROT:
- {
- START_PROFILE(smb2_negprot);
- return_value = smbd_smb2_request_process_negprot(req);
- END_PROFILE(smb2_negprot);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_negprot, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_negprot(req);
break;
case SMB2_OP_SESSSETUP:
- {
- START_PROFILE(smb2_sesssetup);
- return_value = smbd_smb2_request_process_sesssetup(req);
- END_PROFILE(smb2_sesssetup);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_sesssetup, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_sesssetup(req);
break;
case SMB2_OP_LOGOFF:
- {
- START_PROFILE(smb2_logoff);
- return_value = smbd_smb2_request_process_logoff(req);
- END_PROFILE(smb2_logoff);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_logoff, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_logoff(req);
break;
case SMB2_OP_TCON:
- {
- START_PROFILE(smb2_tcon);
- return_value = smbd_smb2_request_process_tcon(req);
- END_PROFILE(smb2_tcon);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_tcon, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_tcon(req);
break;
case SMB2_OP_TDIS:
- {
- START_PROFILE(smb2_tdis);
- return_value = smbd_smb2_request_process_tdis(req);
- END_PROFILE(smb2_tdis);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_tdis, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_tdis(req);
break;
case SMB2_OP_CREATE:
- {
- START_PROFILE(smb2_create);
- return_value = smbd_smb2_request_process_create(req);
- END_PROFILE(smb2_create);
+ if (req->subreq == NULL) {
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_create, profile_p,
+ req->profile, _INBYTES(req));
+ } else {
+ SMBPROFILE_IOBYTES_ASYNC_SET_BUSY(req->profile);
}
+ return_value = smbd_smb2_request_process_create(req);
break;
case SMB2_OP_CLOSE:
- {
- START_PROFILE(smb2_close);
- return_value = smbd_smb2_request_process_close(req);
- END_PROFILE(smb2_close);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_close, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_close(req);
break;
case SMB2_OP_FLUSH:
- {
- START_PROFILE(smb2_flush);
- return_value = smbd_smb2_request_process_flush(req);
- END_PROFILE(smb2_flush);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_flush, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_flush(req);
break;
case SMB2_OP_READ:
- {
- START_PROFILE(smb2_read);
- return_value = smbd_smb2_request_process_read(req);
- END_PROFILE(smb2_read);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_read, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_read(req);
break;
case SMB2_OP_WRITE:
- {
- START_PROFILE(smb2_write);
- return_value = smbd_smb2_request_process_write(req);
- END_PROFILE(smb2_write);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_write, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_write(req);
break;
case SMB2_OP_LOCK:
- {
- START_PROFILE(smb2_lock);
- return_value = smbd_smb2_request_process_lock(req);
- END_PROFILE(smb2_lock);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_lock, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_lock(req);
break;
case SMB2_OP_IOCTL:
- {
- START_PROFILE(smb2_ioctl);
- return_value = smbd_smb2_request_process_ioctl(req);
- END_PROFILE(smb2_ioctl);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_ioctl, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_ioctl(req);
break;
case SMB2_OP_CANCEL:
- {
- START_PROFILE(smb2_cancel);
- return_value = smbd_smb2_request_process_cancel(req);
- END_PROFILE(smb2_cancel);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_cancel, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_cancel(req);
+ SMBPROFILE_IOBYTES_ASYNC_END(req->profile, 0);
break;
case SMB2_OP_KEEPALIVE:
- {
- START_PROFILE(smb2_keepalive);
- return_value = smbd_smb2_request_process_keepalive(req);
- END_PROFILE(smb2_keepalive);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_keepalive, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_keepalive(req);
break;
case SMB2_OP_FIND:
- {
- START_PROFILE(smb2_find);
- return_value = smbd_smb2_request_process_find(req);
- END_PROFILE(smb2_find);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_find, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_find(req);
break;
case SMB2_OP_NOTIFY:
- {
- START_PROFILE(smb2_notify);
- return_value = smbd_smb2_request_process_notify(req);
- END_PROFILE(smb2_notify);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_notify, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_notify(req);
break;
case SMB2_OP_GETINFO:
- {
- START_PROFILE(smb2_getinfo);
- return_value = smbd_smb2_request_process_getinfo(req);
- END_PROFILE(smb2_getinfo);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_getinfo, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_getinfo(req);
break;
case SMB2_OP_SETINFO:
- {
- START_PROFILE(smb2_setinfo);
- return_value = smbd_smb2_request_process_setinfo(req);
- END_PROFILE(smb2_setinfo);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_setinfo, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_setinfo(req);
break;
case SMB2_OP_BREAK:
- {
- START_PROFILE(smb2_break);
- return_value = smbd_smb2_request_process_break(req);
- END_PROFILE(smb2_break);
- }
+ SMBPROFILE_IOBYTES_ASYNC_START(smb2_break, profile_p,
+ req->profile, _INBYTES(req));
+ return_value = smbd_smb2_request_process_break(req);
break;
default:
static NTSTATUS smbd_smb2_request_reply(struct smbd_smb2_request *req)
{
- struct smbd_server_connection *sconn = req->sconn;
- struct smbXsrv_connection *conn = req->sconn->conn;
+ struct smbXsrv_connection *xconn = req->xconn;
int first_idx = 1;
struct iovec *firsttf = SMBD_SMB2_IDX_TF_IOV(req,out,first_idx);
struct iovec *outhdr = SMBD_SMB2_OUT_HDR_IOV(req);
* with the last signing key we remembered.
*/
status = smb2_signing_sign_pdu(req->last_key,
- conn->protocol,
+ xconn->protocol,
lasthdr,
SMBD_SMB2_NUM_IOV_PER_REQ - 1);
if (!NT_STATUS_IS_OK(status)) {
data_blob_clear_free(&req->last_key);
}
+ SMBPROFILE_IOBYTES_ASYNC_END(req->profile,
+ iov_buflen(outhdr, SMBD_SMB2_NUM_IOV_PER_REQ-1));
+
req->current_idx += SMBD_SMB2_NUM_IOV_PER_REQ;
if (req->current_idx < req->out.vector_count) {
if (req->do_signing && firsttf->iov_len == 0) {
struct smbXsrv_session *x = req->session;
- DATA_BLOB signing_key = x->global->channels[0].signing_key;
+ DATA_BLOB signing_key = smbd_smb2_signing_key(x, xconn);
/*
* we need to remember the signing key
*/
if (firsttf->iov_len == SMB2_TF_HDR_SIZE) {
status = smb2_signing_encrypt_pdu(req->first_key,
- conn->protocol,
+ xconn->smb2.server.cipher,
firsttf,
req->out.vector_count - first_idx);
if (!NT_STATUS_IS_OK(status)) {
}
} else if (req->do_signing) {
struct smbXsrv_session *x = req->session;
- DATA_BLOB signing_key = x->global->channels[0].signing_key;
+ DATA_BLOB signing_key = smbd_smb2_signing_key(x, xconn);
status = smb2_signing_sign_pdu(signing_key,
- conn->protocol,
+ xconn->protocol,
outhdr,
SMBD_SMB2_NUM_IOV_PER_REQ - 1);
if (!NT_STATUS_IS_OK(status)) {
* We're done with this request -
* move it off the "being processed" queue.
*/
- DLIST_REMOVE(req->sconn->smb2.requests, req);
+ DLIST_REMOVE(xconn->smb2.requests, req);
req->queue_entry.mem_ctx = req;
req->queue_entry.vector = req->out.vector;
req->queue_entry.count = req->out.vector_count;
- DLIST_ADD_END(req->sconn->smb2.send_queue, &req->queue_entry, NULL);
- req->sconn->smb2.send_queue_len++;
+ DLIST_ADD_END(xconn->smb2.send_queue, &req->queue_entry, NULL);
+ xconn->smb2.send_queue_len++;
- status = smbd_smb2_flush_send_queue(sconn);
+ status = smbd_smb2_flush_send_queue(xconn);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
return NT_STATUS_OK;
}
-static NTSTATUS smbd_smb2_request_next_incoming(struct smbd_server_connection *sconn);
+static NTSTATUS smbd_smb2_request_next_incoming(struct smbXsrv_connection *xconn);
void smbd_smb2_request_dispatch_immediate(struct tevent_context *ctx,
struct tevent_immediate *im,
{
struct smbd_smb2_request *req = talloc_get_type_abort(private_data,
struct smbd_smb2_request);
- struct smbd_server_connection *sconn = req->sconn;
+ struct smbXsrv_connection *xconn = req->xconn;
NTSTATUS status;
TALLOC_FREE(im);
status = smbd_smb2_request_dispatch(req);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn, nt_errstr(status));
+ smbd_server_connection_terminate(xconn, nt_errstr(status));
return;
}
- status = smbd_smb2_request_next_incoming(sconn);
+ status = smbd_smb2_request_next_incoming(xconn);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn, nt_errstr(status));
+ smbd_server_connection_terminate(xconn, nt_errstr(status));
return;
}
}
DATA_BLOB *info,
const char *location)
{
+ struct smbXsrv_connection *xconn = req->xconn;
DATA_BLOB body;
DATA_BLOB _dyn;
uint8_t *outhdr = SMBD_SMB2_OUT_HDR_PTR(req);
size_t ret;
errno = 0;
- ret = drain_socket(req->sconn->sock, unread_bytes);
+ ret = drain_socket(xconn->transport.sock, unread_bytes);
if (ret != unread_bytes) {
NTSTATUS error;
}
-struct smbd_smb2_send_oplock_break_state {
- struct smbd_server_connection *sconn;
+struct smbd_smb2_send_break_state {
struct smbd_smb2_send_queue queue_entry;
uint8_t nbt_hdr[NBT_HDR_SIZE];
- uint8_t buf[SMB2_TF_HDR_SIZE + SMB2_HDR_BODY + 0x18];
+ uint8_t tf[SMB2_TF_HDR_SIZE];
+ uint8_t hdr[SMB2_HDR_BODY];
struct iovec vector[1+SMBD_SMB2_NUM_IOV_PER_REQ];
+ uint8_t body[1];
};
-NTSTATUS smbd_smb2_send_oplock_break(struct smbd_server_connection *sconn,
+static NTSTATUS smbd_smb2_send_break(struct smbXsrv_connection *xconn,
struct smbXsrv_session *session,
struct smbXsrv_tcon *tcon,
- struct smbXsrv_open *op,
- uint8_t oplock_level)
+ const uint8_t *body,
+ size_t body_len)
{
- struct smbd_smb2_send_oplock_break_state *state;
- struct smbXsrv_connection *conn = sconn->conn;
- uint8_t *tf;
- size_t tf_len;
- uint8_t *hdr;
- uint8_t *body;
- size_t body_len;
- uint8_t *dyn;
- size_t dyn_len;
- bool do_encryption = session->global->encryption_required;
+ struct smbd_smb2_send_break_state *state;
+ bool do_encryption = false;
+ uint64_t session_wire_id = 0;
uint64_t nonce_high = 0;
uint64_t nonce_low = 0;
NTSTATUS status;
+ size_t statelen;
- if (tcon->global->encryption_required) {
- do_encryption = true;
+ if (session != NULL) {
+ session_wire_id = session->global->session_wire_id;
+ do_encryption = session->global->encryption_required;
+ if (tcon->global->encryption_required) {
+ do_encryption = true;
+ }
}
- state = talloc_zero(sconn, struct smbd_smb2_send_oplock_break_state);
+ statelen = offsetof(struct smbd_smb2_send_break_state, body) +
+ body_len;
+
+ state = talloc_zero_size(xconn, statelen);
if (state == NULL) {
return NT_STATUS_NO_MEMORY;
}
- state->sconn = sconn;
-
- tf = state->buf;
- tf_len = SMB2_TF_HDR_SIZE;
- hdr = tf + tf_len;
- body = hdr + SMB2_HDR_BODY;
- body_len = 0x18;
- dyn = body + body_len;
- dyn_len = 0;
+ talloc_set_name_const(state, "struct smbd_smb2_send_break_state");
if (do_encryption) {
nonce_high = session->nonce_high;
}
}
- SIVAL(tf, SMB2_TF_PROTOCOL_ID, SMB2_TF_MAGIC);
- SBVAL(tf, SMB2_TF_NONCE+0, nonce_low);
- SBVAL(tf, SMB2_TF_NONCE+8, nonce_high);
- SBVAL(tf, SMB2_TF_SESSION_ID, session->global->session_wire_id);
-
- SIVAL(hdr, 0, SMB2_MAGIC);
- SSVAL(hdr, SMB2_HDR_LENGTH, SMB2_HDR_BODY);
- SSVAL(hdr, SMB2_HDR_EPOCH, 0);
- SIVAL(hdr, SMB2_HDR_STATUS, 0);
- SSVAL(hdr, SMB2_HDR_OPCODE, SMB2_OP_BREAK);
- SSVAL(hdr, SMB2_HDR_CREDIT, 0);
- SIVAL(hdr, SMB2_HDR_FLAGS, SMB2_HDR_FLAG_REDIRECT);
- SIVAL(hdr, SMB2_HDR_NEXT_COMMAND, 0);
- SBVAL(hdr, SMB2_HDR_MESSAGE_ID, UINT64_MAX);
- SIVAL(hdr, SMB2_HDR_PID, 0);
- SIVAL(hdr, SMB2_HDR_TID, 0);
- SBVAL(hdr, SMB2_HDR_SESSION_ID, 0);
- memset(hdr+SMB2_HDR_SIGNATURE, 0, 16);
-
- SSVAL(body, 0x00, body_len);
+ SIVAL(state->tf, SMB2_TF_PROTOCOL_ID, SMB2_TF_MAGIC);
+ SBVAL(state->tf, SMB2_TF_NONCE+0, nonce_low);
+ SBVAL(state->tf, SMB2_TF_NONCE+8, nonce_high);
+ SBVAL(state->tf, SMB2_TF_SESSION_ID, session_wire_id);
- SCVAL(body, 0x02, oplock_level);
- SCVAL(body, 0x03, 0); /* reserved */
- SIVAL(body, 0x04, 0); /* reserved */
- SBVAL(body, 0x08, op->global->open_persistent_id);
- SBVAL(body, 0x10, op->global->open_volatile_id);
+ SIVAL(state->hdr, 0, SMB2_MAGIC);
+ SSVAL(state->hdr, SMB2_HDR_LENGTH, SMB2_HDR_BODY);
+ SSVAL(state->hdr, SMB2_HDR_EPOCH, 0);
+ SIVAL(state->hdr, SMB2_HDR_STATUS, 0);
+ SSVAL(state->hdr, SMB2_HDR_OPCODE, SMB2_OP_BREAK);
+ SSVAL(state->hdr, SMB2_HDR_CREDIT, 0);
+ SIVAL(state->hdr, SMB2_HDR_FLAGS, SMB2_HDR_FLAG_REDIRECT);
+ SIVAL(state->hdr, SMB2_HDR_NEXT_COMMAND, 0);
+ SBVAL(state->hdr, SMB2_HDR_MESSAGE_ID, UINT64_MAX);
+ SIVAL(state->hdr, SMB2_HDR_PID, 0);
+ SIVAL(state->hdr, SMB2_HDR_TID, 0);
+ SBVAL(state->hdr, SMB2_HDR_SESSION_ID, 0);
+ memset(state->hdr+SMB2_HDR_SIGNATURE, 0, 16);
state->vector[0] = (struct iovec) {
.iov_base = state->nbt_hdr,
};
if (do_encryption) {
- state->vector[1+SMBD_SMB2_TF_IOV_OFS].iov_base = tf;
- state->vector[1+SMBD_SMB2_TF_IOV_OFS].iov_len = tf_len;
+ state->vector[1+SMBD_SMB2_TF_IOV_OFS] = (struct iovec) {
+ .iov_base = state->tf,
+ .iov_len = sizeof(state->tf)
+ };
} else {
- state->vector[1+SMBD_SMB2_TF_IOV_OFS].iov_base = NULL;
- state->vector[1+SMBD_SMB2_TF_IOV_OFS].iov_len = 0;
+ state->vector[1+SMBD_SMB2_TF_IOV_OFS] = (struct iovec) {
+ .iov_base = NULL,
+ .iov_len = 0
+ };
}
- state->vector[1+SMBD_SMB2_HDR_IOV_OFS].iov_base = hdr;
- state->vector[1+SMBD_SMB2_HDR_IOV_OFS].iov_len = SMB2_HDR_BODY;
+ state->vector[1+SMBD_SMB2_HDR_IOV_OFS] = (struct iovec) {
+ .iov_base = state->hdr,
+ .iov_len = sizeof(state->hdr)
+ };
- state->vector[1+SMBD_SMB2_BODY_IOV_OFS].iov_base = body;
- state->vector[1+SMBD_SMB2_BODY_IOV_OFS].iov_len = body_len;
+ memcpy(state->body, body, body_len);
- state->vector[1+SMBD_SMB2_DYN_IOV_OFS].iov_base = dyn;
- state->vector[1+SMBD_SMB2_DYN_IOV_OFS].iov_len = dyn_len;
+ state->vector[1+SMBD_SMB2_BODY_IOV_OFS] = (struct iovec) {
+ .iov_base = state->body,
+ .iov_len = body_len /* no sizeof(state->body) .. :-) */
+ };
+
+ /*
+ * state->vector[1+SMBD_SMB2_DYN_IOV_OFS] is NULL by talloc_zero above
+ */
smb2_setup_nbt_length(state->vector, 1 + SMBD_SMB2_NUM_IOV_PER_REQ);
DATA_BLOB encryption_key = session->global->encryption_key;
status = smb2_signing_encrypt_pdu(encryption_key,
- conn->protocol,
+ xconn->smb2.server.cipher,
&state->vector[1+SMBD_SMB2_TF_IOV_OFS],
SMBD_SMB2_NUM_IOV_PER_REQ);
if (!NT_STATUS_IS_OK(status)) {
state->queue_entry.mem_ctx = state;
state->queue_entry.vector = state->vector;
state->queue_entry.count = ARRAY_SIZE(state->vector);
- DLIST_ADD_END(state->sconn->smb2.send_queue, &state->queue_entry, NULL);
- state->sconn->smb2.send_queue_len++;
+ DLIST_ADD_END(xconn->smb2.send_queue, &state->queue_entry, NULL);
+ xconn->smb2.send_queue_len++;
- status = smbd_smb2_flush_send_queue(sconn);
+ status = smbd_smb2_flush_send_queue(xconn);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
return NT_STATUS_OK;
}
+NTSTATUS smbd_smb2_send_oplock_break(struct smbXsrv_connection *xconn,
+ struct smbXsrv_session *session,
+ struct smbXsrv_tcon *tcon,
+ struct smbXsrv_open *op,
+ uint8_t oplock_level)
+{
+ uint8_t body[0x18];
+
+ SSVAL(body, 0x00, sizeof(body));
+ SCVAL(body, 0x02, oplock_level);
+ SCVAL(body, 0x03, 0); /* reserved */
+ SIVAL(body, 0x04, 0); /* reserved */
+ SBVAL(body, 0x08, op->global->open_persistent_id);
+ SBVAL(body, 0x10, op->global->open_volatile_id);
+
+ return smbd_smb2_send_break(xconn, session, tcon, body, sizeof(body));
+}
+
+NTSTATUS smbd_smb2_send_lease_break(struct smbXsrv_connection *xconn,
+ uint16_t new_epoch,
+ uint32_t lease_flags,
+ struct smb2_lease_key *lease_key,
+ uint32_t current_lease_state,
+ uint32_t new_lease_state)
+{
+ uint8_t body[0x2c];
+
+ SSVAL(body, 0x00, sizeof(body));
+ SSVAL(body, 0x02, new_epoch);
+ SIVAL(body, 0x04, lease_flags);
+ SBVAL(body, 0x08, lease_key->data[0]);
+ SBVAL(body, 0x10, lease_key->data[1]);
+ SIVAL(body, 0x18, current_lease_state);
+ SIVAL(body, 0x1c, new_lease_state);
+ SIVAL(body, 0x20, 0); /* BreakReason, MUST be 0 */
+ SIVAL(body, 0x24, 0); /* AccessMaskHint, MUST be 0 */
+ SIVAL(body, 0x28, 0); /* ShareMaskHint, MUST be 0 */
+
+ return smbd_smb2_send_break(xconn, NULL, NULL, body, sizeof(body));
+}
+
static bool is_smb2_recvfile_write(struct smbd_smb2_request_read_state *state)
{
NTSTATUS status;
file_id_persistent = BVAL(body, 0x10);
file_id_volatile = BVAL(body, 0x18);
- status = smb2srv_open_lookup(state->req->sconn->conn,
+ status = smb2srv_open_lookup(state->req->xconn,
file_id_persistent,
file_id_volatile,
0, /* now */
return true;
}
-static NTSTATUS smbd_smb2_request_next_incoming(struct smbd_server_connection *sconn)
+static NTSTATUS smbd_smb2_request_next_incoming(struct smbXsrv_connection *xconn)
{
- struct smbd_smb2_request_read_state *state = &sconn->smb2.request_read_state;
+ struct smbd_server_connection *sconn = xconn->client->sconn;
+ struct smbd_smb2_request_read_state *state = &xconn->smb2.request_read_state;
size_t max_send_queue_len;
size_t cur_send_queue_len;
- if (!NT_STATUS_IS_OK(sconn->status)) {
+ if (!NT_STATUS_IS_OK(xconn->transport.status)) {
/*
* we're not supposed to do any io
*/
return NT_STATUS_OK;
}
- max_send_queue_len = MAX(1, sconn->smb2.max_credits/16);
- cur_send_queue_len = sconn->smb2.send_queue_len;
+ max_send_queue_len = MAX(1, xconn->smb2.credits.max/16);
+ cur_send_queue_len = xconn->smb2.send_queue_len;
if (cur_send_queue_len > max_send_queue_len) {
/*
/* ask for the next request */
ZERO_STRUCTP(state);
- state->req = smbd_smb2_request_allocate(sconn);
+ state->req = smbd_smb2_request_allocate(xconn);
if (state->req == NULL) {
return NT_STATUS_NO_MEMORY;
}
state->req->sconn = sconn;
+ state->req->xconn = xconn;
state->min_recv_size = lp_min_receive_file_size();
- TEVENT_FD_READABLE(sconn->smb2.fde);
+ TEVENT_FD_READABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
-void smbd_smb2_first_negprot(struct smbd_server_connection *sconn,
- uint8_t *inbuf, size_t size)
+void smbd_smb2_first_negprot(struct smbXsrv_connection *xconn,
+ const uint8_t *inpdu, size_t size)
{
+ struct smbd_server_connection *sconn = xconn->client->sconn;
NTSTATUS status;
struct smbd_smb2_request *req = NULL;
DEBUG(10,("smbd_smb2_first_negprot: packet length %u\n",
(unsigned int)size));
- status = smbd_initialize_smb2(sconn);
+ status = smbd_initialize_smb2(xconn);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn, nt_errstr(status));
+ smbd_server_connection_terminate(xconn, nt_errstr(status));
return;
}
- status = smbd_smb2_request_create(sconn, inbuf, size, &req);
+ status = smbd_smb2_request_create(xconn, inpdu, size, &req);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn, nt_errstr(status));
+ smbd_server_connection_terminate(xconn, nt_errstr(status));
return;
}
status = smbd_smb2_request_validate(req);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn, nt_errstr(status));
+ smbd_server_connection_terminate(xconn, nt_errstr(status));
return;
}
status = smbd_smb2_request_setup_out(req);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn, nt_errstr(status));
+ smbd_server_connection_terminate(xconn, nt_errstr(status));
return;
}
+#ifdef WITH_PROFILE
+ /*
+ * this was already counted at the SMB1 layer =>
+ * smbd_smb2_request_dispatch() should not count it twice.
+ */
+ if (profile_p->request_stats.count > 0) {
+ profile_p->request_stats.count--;
+ }
+#endif
status = smbd_smb2_request_dispatch(req);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn, nt_errstr(status));
+ smbd_server_connection_terminate(xconn, nt_errstr(status));
return;
}
- status = smbd_smb2_request_next_incoming(sconn);
+ status = smbd_smb2_request_next_incoming(xconn);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn, nt_errstr(status));
+ smbd_server_connection_terminate(xconn, nt_errstr(status));
return;
}
return sys_errno;
}
-static NTSTATUS smbd_smb2_flush_send_queue(struct smbd_server_connection *sconn)
+static NTSTATUS smbd_smb2_flush_send_queue(struct smbXsrv_connection *xconn)
{
int ret;
int err;
bool retry;
- if (sconn->smb2.send_queue == NULL) {
- TEVENT_FD_NOT_WRITEABLE(sconn->smb2.fde);
+ if (xconn->smb2.send_queue == NULL) {
+ TEVENT_FD_NOT_WRITEABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
- while (sconn->smb2.send_queue != NULL) {
- struct smbd_smb2_send_queue *e = sconn->smb2.send_queue;
+ while (xconn->smb2.send_queue != NULL) {
+ struct smbd_smb2_send_queue *e = xconn->smb2.send_queue;
if (e->sendfile_header != NULL) {
+ NTSTATUS status = NT_STATUS_INTERNAL_ERROR;
size_t size = 0;
size_t i = 0;
uint8_t *buf;
e->sendfile_header->data = buf;
e->sendfile_header->length = size;
+ e->sendfile_status = &status;
e->count = 0;
- sconn->smb2.send_queue_len--;
- DLIST_REMOVE(sconn->smb2.send_queue, e);
+ xconn->smb2.send_queue_len--;
+ DLIST_REMOVE(xconn->smb2.send_queue, e);
/*
* This triggers the sendfile path via
* the destructor.
*/
talloc_free(e->mem_ctx);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
continue;
}
- ret = writev(sconn->sock, e->vector, e->count);
+ ret = writev(xconn->transport.sock, e->vector, e->count);
if (ret == 0) {
/* propagate end of file */
return NT_STATUS_INTERNAL_ERROR;
err = socket_error_from_errno(ret, errno, &retry);
if (retry) {
/* retry later */
- TEVENT_FD_WRITEABLE(sconn->smb2.fde);
+ TEVENT_FD_WRITEABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
if (err != 0) {
if (e->count > 0) {
/* we have more to write */
- TEVENT_FD_WRITEABLE(sconn->smb2.fde);
+ TEVENT_FD_WRITEABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
- sconn->smb2.send_queue_len--;
- DLIST_REMOVE(sconn->smb2.send_queue, e);
+ xconn->smb2.send_queue_len--;
+ DLIST_REMOVE(xconn->smb2.send_queue, e);
talloc_free(e->mem_ctx);
}
return NT_STATUS_OK;
}
-static NTSTATUS smbd_smb2_io_handler(struct smbd_server_connection *sconn,
+static NTSTATUS smbd_smb2_io_handler(struct smbXsrv_connection *xconn,
uint16_t fde_flags)
{
- struct smbd_smb2_request_read_state *state = &sconn->smb2.request_read_state;
+ struct smbd_server_connection *sconn = xconn->client->sconn;
+ struct smbd_smb2_request_read_state *state = &xconn->smb2.request_read_state;
struct smbd_smb2_request *req = NULL;
size_t min_recvfile_size = UINT32_MAX;
int ret;
NTSTATUS status;
NTTIME now;
- if (!NT_STATUS_IS_OK(sconn->status)) {
+ if (!NT_STATUS_IS_OK(xconn->transport.status)) {
/*
* we're not supposed to do any io
*/
- TEVENT_FD_NOT_READABLE(sconn->smb2.fde);
- TEVENT_FD_NOT_WRITEABLE(sconn->smb2.fde);
+ TEVENT_FD_NOT_READABLE(xconn->transport.fde);
+ TEVENT_FD_NOT_WRITEABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
if (fde_flags & TEVENT_FD_WRITE) {
- status = smbd_smb2_flush_send_queue(sconn);
+ status = smbd_smb2_flush_send_queue(xconn);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
}
if (state->req == NULL) {
- TEVENT_FD_NOT_READABLE(sconn->smb2.fde);
+ TEVENT_FD_NOT_READABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
state->vector.iov_len = NBT_HDR_SIZE;
}
- ret = readv(sconn->sock, &state->vector, 1);
+ ret = readv(xconn->transport.sock, &state->vector, 1);
if (ret == 0) {
/* propagate end of file */
return NT_STATUS_END_OF_FILE;
err = socket_error_from_errno(ret, errno, &retry);
if (retry) {
/* retry later */
- TEVENT_FD_READABLE(sconn->smb2.fde);
+ TEVENT_FD_READABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
if (err != 0) {
state->vector.iov_base = (void *)base;
state->vector.iov_len -= ret;
/* we have more to read */
- TEVENT_FD_READABLE(sconn->smb2.fde);
+ TEVENT_FD_READABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
req->request_time = timeval_current();
now = timeval_to_nttime(&req->request_time);
- status = smbd_smb2_inbuf_parse_compound(req->sconn->conn,
+ status = smbd_smb2_inbuf_parse_compound(xconn,
now,
state->pktbuf,
state->pktlen,
check_log_size();
}
- status = smbd_smb2_request_next_incoming(sconn);
+ status = smbd_smb2_request_next_incoming(xconn);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
uint16_t flags,
void *private_data)
{
- struct smbd_server_connection *sconn =
+ struct smbXsrv_connection *xconn =
talloc_get_type_abort(private_data,
- struct smbd_server_connection);
+ struct smbXsrv_connection);
NTSTATUS status;
- status = smbd_smb2_io_handler(sconn, flags);
+ status = smbd_smb2_io_handler(xconn, flags);
if (!NT_STATUS_IS_OK(status)) {
- smbd_server_connection_terminate(sconn, nt_errstr(status));
+ smbd_server_connection_terminate(xconn, nt_errstr(status));
return;
}
}