TODO s3:smbd: add smbXsrv_session infrastructure
authorStefan Metzmacher <metze@samba.org>
Thu, 15 Dec 2011 13:45:56 +0000 (14:45 +0100)
committerStefan Metzmacher <metze@samba.org>
Thu, 10 May 2012 16:34:10 +0000 (18:34 +0200)
metze

source3/Makefile.in
source3/smbd/globals.h
source3/smbd/server.c
source3/smbd/smbXsrv_session.c [new file with mode: 0644]
source3/wscript_build

index f3cb4350d6e47c45c5713ba906b869db9709dfd8..dcdf6ea15998b6ed19c78bda52832e1a55d8cfd8 100644 (file)
@@ -974,6 +974,7 @@ SMBD_OBJ_SRV = smbd/server_reload.o \
               smbd/smb2_setinfo.o \
               smbd/smb2_break.o \
               librpc/gen_ndr/ndr_smbXsrv.o \
+              smbd/smbXsrv_session.o \
               $(MANGLE_OBJ) @VFS_STATIC@
 
 SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
index b9336daeb9e115e6044c7f8db311101da1145370..5b07c381965504a4ec8019088f29130f16e0359b 100644 (file)
@@ -19,6 +19,7 @@
 */
 
 #include "system/select.h"
+#include "librpc/gen_ndr/smbXsrv.h"
 
 #if defined(WITH_AIO)
 struct aio_extra;
@@ -326,6 +327,18 @@ bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req,
                        char *private_data,
                        size_t priv_len);
 
+struct smbXsrv_session_table {
+       struct {
+               struct db_context *db_ctx;
+               uint32_t lowest_id;
+               uint32_t highest_id;
+               uint32_t num_sessions;
+       } local;
+       struct {
+               struct db_context *db_ctx;
+       } global;
+};
+
 struct smbXsrv_connection {
        struct smbd_server_connection *sconn;
 
@@ -337,8 +350,25 @@ struct smbXsrv_connection {
        struct messaging_context *msg_ctx;
 
        enum protocol_types protocol;
+
+       struct smbXsrv_session_table session_table;
 };
 
+NTSTATUS smbXsrv_session_global_init(void);
+NTSTATUS smbXsrv_session_create(struct smbXsrv_connection *conn,
+                               NTTIME now,
+                               struct smbXsrv_session **_session);
+NTSTATUS smbXsrv_session_update(struct smbXsrv_session *session);
+
+NTSTATUS smb1srv_session_table_init(struct smbXsrv_connection *conn);
+NTSTATUS smb1srv_session_lookup(struct smbXsrv_session_table *table,
+                               uint16_t vuid, NTTIME now,
+                               struct smbXsrv_session **session);
+NTSTATUS smb2srv_session_table_init(struct smbXsrv_connection *conn);
+NTSTATUS smb2srv_session_lookup(struct smbXsrv_session_table *table,
+                               uint64_t session_id, NTTIME now,
+                               struct smbXsrv_session **session);
+
 struct smbd_smb2_request {
        struct smbd_smb2_request *prev, *next;
 
index 363203e51584540735856e1f86b8adf34cc6119b..204c911a2a212d6a065cae148a2b5875ec926aaf 100644 (file)
@@ -1393,6 +1393,10 @@ extern void build_options(bool screen);
        if (!sessionid_init()) {
                exit(1);
        }
+       status = smbXsrv_session_global_init();
+       if (!NT_STATUS_IS_OK(status)) {
+               exit(1);
+       }
 
        if (!connections_init(True))
                exit(1);
diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c
new file mode 100644 (file)
index 0000000..28aff00
--- /dev/null
@@ -0,0 +1,754 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Copyright (C) Stefan Metzmacher 2011-2012
+   Copyright (C) Michael Adam 2012
+
+   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 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "smbd/smbd.h"
+#include "smbd/globals.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_rbt.h"
+#include "dbwrap/dbwrap_open.h"
+#include "session.h"
+#include "auth.h"
+#include "../lib/tsocket/tsocket.h"
+#include "../libcli/security/security.h"
+#include "messages.h"
+#include "lib/util/util_tdb.h"
+#include "librpc/gen_ndr/ndr_smbXsrv.h"
+
+static struct db_context *smbXsrv_session_global_db_ctx = NULL;
+
+NTSTATUS smbXsrv_session_global_init(void)
+{
+       const char *global_path = NULL;
+       struct db_context *db_ctx = NULL;
+
+       if (smbXsrv_session_global_db_ctx != NULL) {
+               return NT_STATUS_OK;
+       }
+
+       /*
+        * This contains secret information like session keys!
+        */
+       global_path = lock_path("smbXsrv_session_global.tdb");
+
+       db_ctx = db_open(NULL, global_path,
+                        0, /* hash_size */
+                        TDB_DEFAULT |
+                        TDB_CLEAR_IF_FIRST |
+                        TDB_INCOMPATIBLE_HASH,
+                        O_RDWR | O_CREAT, 0600,
+                        DBWRAP_LOCK_ORDER_1);
+       if (db_ctx == NULL) {
+               NTSTATUS status;
+
+               status = map_nt_error_from_unix_common(errno);
+
+               return status;
+       }
+
+       smbXsrv_session_global_db_ctx = db_ctx;
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS smbXsrv_session_table_init(struct smbXsrv_connection *conn,
+                                          uint32_t lowest_id,
+                                          uint32_t highest_id)
+{
+       struct smbXsrv_session_table *table = &conn->session_table;
+       NTSTATUS status;
+
+       ZERO_STRUCTP(table);
+       table->local.db_ctx = db_open_rbt(conn);
+       if (table->local.db_ctx == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       table->local.lowest_id = lowest_id;
+       table->local.highest_id = highest_id;
+
+       status = smbXsrv_session_global_init();
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       table->global.db_ctx = smbXsrv_session_global_db_ctx;
+
+       return NT_STATUS_OK;
+}
+
+struct smb1srv_session_local_allocate_state {
+       const uint32_t lowest_id;
+       const uint32_t highest_id;
+       uint32_t last_id;
+       uint32_t useable_id;
+       NTSTATUS status;
+};
+
+static int smb1srv_session_local_allocate_traverse(struct db_record *rec,
+                                                  void *private_data)
+{
+       struct smb1srv_session_local_allocate_state *state =
+               (struct smb1srv_session_local_allocate_state *)private_data;
+       TDB_DATA key = dbwrap_record_get_key(rec);
+       uint32_t id = 0;
+
+       if (key.dsize != sizeof(uint32_t)) {
+               //TODO errno?
+               state->status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+               return -1;
+       }
+
+       /*
+        * NOTE:
+        * We need big endian so that dbwrap_rbt's memcmp
+        * has the same result as integer comparison between the uint32_t
+        * values.
+        *
+        * TODO: implement string based key
+        */
+       id = RIVAL(key.dptr, 0);
+
+       if (id <= state->last_id) {
+               //TODO errno?
+               state->status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+               return -1;
+       }
+       state->last_id = id;
+
+       if (id > state->useable_id) {
+               state->status = NT_STATUS_OK;
+               return -1;
+       }
+
+       state->useable_id +=1;
+       return 0;
+}
+
+static NTSTATUS smb1srv_session_local_allocate_id(struct db_context *db,
+                                                 uint32_t lowest_id,
+                                                 uint32_t highest_id,
+                                                 TALLOC_CTX *mem_ctx,
+                                                 struct db_record **_rec,
+                                                 uint32_t *_id)
+{
+       struct smb1srv_session_local_allocate_state state = {
+               .lowest_id = lowest_id,
+               .highest_id = highest_id,
+               .last_id = 0,
+               .useable_id = lowest_id,
+               .status = NT_STATUS_INTERNAL_ERROR,
+       };
+       uint32_t i;
+       uint32_t range;
+       NTSTATUS status;
+       int count = 0;
+
+       *_rec = NULL;
+       *_id = 0;
+
+       if (lowest_id > highest_id) {
+               return NT_STATUS_INSUFFICIENT_RESOURCES;
+       }
+
+       range = (highest_id - lowest_id) + 1;
+
+       for (i = 0; i < range; i++) {
+               uint32_t id;
+               uint8_t key_buf[sizeof(uint32_t)];
+               TDB_DATA key;
+               TDB_DATA val;
+               struct db_record *rec = NULL;
+
+               id = generate_random() % range;
+               id += lowest_id;
+
+               if (id < lowest_id) {
+                       id = lowest_id;
+               }
+               if (id > highest_id) {
+                       id = highest_id;
+               }
+
+               RSIVAL(key_buf, 0, id);
+               key = make_tdb_data(key_buf, sizeof(key_buf));
+
+               rec = dbwrap_fetch_locked(db, mem_ctx, key);
+               if (rec == NULL) {
+                       return NT_STATUS_INSUFFICIENT_RESOURCES;
+               }
+
+               val = dbwrap_record_get_value(rec);
+               if (val.dsize != 0) {
+                       TALLOC_FREE(rec);
+                       continue;
+               }
+
+               *_rec = rec;
+               *_id = id;
+               return NT_STATUS_OK;
+       }
+
+       status = dbwrap_traverse_read(db, smb1srv_session_local_allocate_traverse,
+                                     &state, &count);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_DB_CORRUPTION)) {
+               /*
+                * Here we really expect NT_STATUS_INTERNAL_DB_CORRUPTION!
+                *
+                * If we get anything else it is an error, because it
+                * means we did not manage to find a free slot in
+                * the db.
+                */
+               return NT_STATUS_INSUFFICIENT_RESOURCES;
+       }
+
+       if (NT_STATUS_IS_OK(state.status)) {
+               uint32_t id;
+               uint8_t key_buf[sizeof(uint32_t)];
+               TDB_DATA key;
+               TDB_DATA val;
+               struct db_record *rec = NULL;
+
+               id = state.useable_id;
+
+               RSIVAL(key_buf, 0, id);
+               key = make_tdb_data(key_buf, sizeof(key_buf));
+
+               rec = dbwrap_fetch_locked(db, mem_ctx, key);
+               if (rec == NULL) {
+                       return NT_STATUS_INSUFFICIENT_RESOURCES;
+               }
+
+               val = dbwrap_record_get_value(rec);
+               if (val.dsize != 0) {
+                       TALLOC_FREE(rec);
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+
+               *_rec = rec;
+               *_id = id;
+               return NT_STATUS_OK;
+       }
+
+       return state.status;
+}
+
+struct smbXsrv_session_local_fetch_state {
+       struct smbXsrv_session *session;
+       NTSTATUS status;
+};
+
+static void smbXsrv_session_local_fetch_parser(TDB_DATA key, TDB_DATA data,
+                                              void *private_data)
+{
+       struct smbXsrv_session_local_fetch_state *state =
+               (struct smbXsrv_session_local_fetch_state *)private_data;
+       void *ptr;
+
+       if (data.dsize != sizeof(ptr)) {
+               state->status = NT_STATUS_INTERNAL_DB_ERROR;
+               return;
+       }
+
+       memcpy(&ptr, data.dptr, data.dsize);
+       state->session = talloc_get_type_abort(ptr, struct smbXsrv_session);
+       state->status = NT_STATUS_OK;
+}
+
+static NTSTATUS smbXsrv_session_local_lookup(struct smbXsrv_session_table *table,
+                                            uint32_t session_local_id,
+                                            NTTIME now,
+                                            struct smbXsrv_session **_session)
+{
+       struct smbXsrv_session_local_fetch_state state = {
+               .session = NULL,
+               .status = NT_STATUS_INTERNAL_ERROR,
+       };
+       uint8_t key_buf[sizeof(uint32_t)];
+       TDB_DATA key;
+       NTSTATUS status;
+
+       *_session = NULL;
+
+       if (table->local.db_ctx == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       RSIVAL(key_buf, 0, session_local_id);
+       key = make_tdb_data(key_buf, sizeof(key_buf));
+
+       status = dbwrap_parse_record(table->local.db_ctx, key,
+                                    smbXsrv_session_local_fetch_parser,
+                                    &state);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+               return NT_STATUS_USER_SESSION_DELETED;
+       } else if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+       if (!NT_STATUS_IS_OK(state.status)) {
+               return state.status;
+       }
+
+       if (!NT_STATUS_IS_OK(state.session->status)) {
+               *_session = state.session;
+               return state.session->status;
+       }
+
+       if (now > state.session->global->expiration_time) {
+               state.session->status = NT_STATUS_NETWORK_SESSION_EXPIRED;
+       }
+
+       *_session = state.session;
+       return state.session->status;
+}
+
+static int smbXsrv_session_global_destructor(struct smbXsrv_session_global0 *global)
+{
+       return 0;
+}
+
+static NTSTATUS smbXsrv_session_global_allocate(struct db_context *db,
+                                       TALLOC_CTX *mem_ctx,
+                                       struct smbXsrv_session_global0 **_global)
+{
+       uint32_t i;
+       struct smbXsrv_session_global0 *global = NULL;
+
+       *_global = NULL;
+
+       global = talloc_zero(mem_ctx, struct smbXsrv_session_global0);
+       if (global == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       talloc_set_destructor(global, smbXsrv_session_global_destructor);
+
+       for (i = 0; i < UINT32_MAX; i++) {
+               uint32_t id;
+               uint8_t key_buf[sizeof(uint32_t)];
+               TDB_DATA key;
+               TDB_DATA val;
+
+               id = generate_random();
+               if (id >= UINT16_MAX) {
+                       id = id & UINT16_MAX;
+               }
+               if (id == 0) {
+                       id++;
+               }
+               if (id == UINT32_MAX) {
+                       id--;
+               }
+
+               RSIVAL(key_buf, 0, id);
+               key = make_tdb_data(key_buf, sizeof(key_buf));
+
+               global->db_rec = dbwrap_fetch_locked(db, mem_ctx, key);
+               if (global->db_rec == NULL) {
+                       talloc_free(global);
+                       return NT_STATUS_INSUFFICIENT_RESOURCES;
+               }
+
+               val = dbwrap_record_get_value(global->db_rec);
+               if (val.dsize != 0) {
+                       TALLOC_FREE(global->db_rec);
+                       continue;
+               }
+
+               global->session_global_id = id;
+
+               *_global = global;
+               return NT_STATUS_OK;
+       }
+
+       /* should not be reached */
+       talloc_free(global);
+       return NT_STATUS_INTERNAL_ERROR;
+}
+
+static NTSTATUS smbXsrv_session_global_store(struct smbXsrv_connection *sconn,
+                                            struct smbXsrv_session_global0 *global)
+{
+       struct smbXsrv_session_globalB global_blob;
+       DATA_BLOB blob = data_blob_null;
+       TDB_DATA val;
+       NTSTATUS status;
+       enum ndr_err_code ndr_err;
+
+       /*
+        * TODO: if we use other versions than '0'
+        * we would add glue code here, that would be able to
+        * store the information in the old format.
+        */
+
+       if (global->db_rec == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       val = dbwrap_record_get_value(global->db_rec);
+
+       ZERO_STRUCT(global_blob);
+       global_blob.version = 0;
+       if (val.dsize >= 8) {
+               global_blob.seqnum = IVAL(val.dptr, 4);
+       }
+       global_blob.seqnum += 1;
+       global_blob.info.info0 = global;
+
+       ndr_err = ndr_push_struct_blob(&blob, global->db_rec, &global_blob,
+                       (ndr_push_flags_fn_t)ndr_push_smbXsrv_session_globalB);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               //status = ndr_err_code;
+               TALLOC_FREE(global->db_rec);
+               //TODO status = map
+               return status;
+       }
+
+       val = make_tdb_data(blob.data, blob.length);
+       status = dbwrap_record_store(global->db_rec, val, TDB_REPLACE);
+       TALLOC_FREE(global->db_rec);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       return NT_STATUS_OK;
+}
+
+struct smbXsrv_session_global_fetch_state {
+       TALLOC_CTX *mem_ctx;
+       struct smbXsrv_session_global *session;
+       NTSTATUS status;
+};
+
+static void smbXsrv_session_global_fetch_parser(TDB_DATA key, TDB_DATA data,
+                                              void *private_data)
+{
+       struct smbXsrv_session_global_fetch_state *state =
+               (struct smbXsrv_session_global_fetch_state *)private_data;
+
+       state->status = NT_STATUS_NOT_IMPLEMENTED;
+}
+
+static NTSTATUS smbXsrv_session_global_lookup(struct smbXsrv_session_table *table,
+                                             uint32_t session_global_id,
+                                             TALLOC_CTX *mem_ctx,
+                                             struct smbXsrv_session_global **_session)
+{
+       struct smbXsrv_session_global_fetch_state state = {
+               .mem_ctx = mem_ctx,
+               .session = NULL,
+               .status = NT_STATUS_INTERNAL_ERROR,
+       };
+       TDB_DATA key;
+       uint8_t key_buf[sizeof(uint32_t)];
+       NTSTATUS status;
+
+       *_session = NULL;
+
+       if (table->global.db_ctx == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       /* TODO: key as string */
+       RSIVAL(key_buf, 0, session_global_id);
+       key = make_tdb_data(key_buf, sizeof(key_buf));
+
+       status = dbwrap_parse_record(table->global.db_ctx, key,
+                                    smbXsrv_session_global_fetch_parser, &state);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+               return NT_STATUS_USER_SESSION_DELETED;
+       } else if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+       if (!NT_STATUS_IS_OK(state.status)) {
+               return state.status;
+       }
+
+       *_session = state.session;
+       return NT_STATUS_OK;
+}
+
+static int smbXsrv_session_destructor(struct smbXsrv_session *session)
+{
+       struct smbXsrv_session_table *table;
+       struct db_record *local_rec = NULL;
+       struct db_record *global_rec = NULL;
+       NTSTATUS status;
+
+       if (session->connection == NULL) {
+               return 0;
+       }
+
+       table = &session->connection->session_table;
+       session->connection = NULL;
+
+       local_rec = session->db_rec;
+       session->db_rec = NULL;
+       if (local_rec == NULL) {
+               uint8_t key_buf[sizeof(uint32_t)];
+               TDB_DATA key;
+
+               RSIVAL(key_buf, 0, session->local_id);
+               key = make_tdb_data(key_buf, sizeof(key_buf));
+
+               local_rec = dbwrap_fetch_locked(table->local.db_ctx,
+                                               session, key);
+       }
+
+       if (local_rec != NULL) {
+               status = dbwrap_record_delete(local_rec);
+       }
+
+       global_rec = session->global->db_rec;
+       session->global->db_rec = NULL;
+       if (global_rec == NULL) {
+               uint8_t key_buf[sizeof(uint32_t)];
+               TDB_DATA key;
+
+               RSIVAL(key_buf, 0, session->global->session_global_id);
+               key = make_tdb_data(key_buf, sizeof(key_buf));
+
+               global_rec = dbwrap_fetch_locked(table->global.db_ctx,
+                                                session->global, key);
+       }
+
+       if (global_rec != NULL) {
+               status = dbwrap_record_delete(global_rec);
+       }
+       TALLOC_FREE(session->global);
+
+       return 0;
+}
+
+NTSTATUS smbXsrv_session_create(struct smbXsrv_connection *conn,
+                               NTTIME now,
+                               struct smbXsrv_session **_session)
+{
+       struct smbXsrv_session_table *table = &conn->session_table;
+       uint32_t max_sessions = table->local.highest_id - table->local.lowest_id;
+       struct db_record *local_rec = NULL;
+       struct smbXsrv_session *session = NULL;
+       void *ptr = NULL;
+       TDB_DATA val;
+       struct smbXsrv_session_global0 *global = NULL;
+       struct smbXsrv_channel_global0 *channels = NULL;
+       NTSTATUS status;
+
+       //system("sleep 999999");
+
+       if (table->local.num_sessions >= max_sessions) {
+               return NT_STATUS_INSUFFICIENT_RESOURCES;
+               // TODO smb1 return NT_STATUS_TOO_MANY_SESSIONS;
+       }
+
+       session = talloc_zero(conn, struct smbXsrv_session);
+       if (session == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       session->status = NT_STATUS_MORE_PROCESSING_REQUIRED;
+       session->connection = conn;
+
+       status = smbXsrv_session_global_allocate(table->global.db_ctx,
+                                                session,
+                                                &global);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(session);
+               return status;
+       }
+       session->global = global;
+
+       talloc_set_destructor(session, smbXsrv_session_destructor);
+
+       if (conn->protocol >= PROTOCOL_SMB2_02) {
+               uint64_t id = global->session_global_id;
+               uint8_t key_buf[sizeof(uint32_t)];
+               TDB_DATA key;
+
+               global->session_wire_id = id;
+               //global->session_wire_id |= (id << 32) & 0xFFFFFFFF00000000ULL;
+
+               session->local_id = global->session_global_id;
+
+               RSIVAL(key_buf, 0, session->local_id);
+               key = make_tdb_data(key_buf, sizeof(key_buf));
+
+               local_rec = dbwrap_fetch_locked(table->local.db_ctx,
+                                               session, key);
+               if (local_rec == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               val = dbwrap_record_get_value(local_rec);
+               if (val.dsize != 0) {
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+       } else {
+
+               status = smb1srv_session_local_allocate_id(table->local.db_ctx,
+                                                       table->local.lowest_id,
+                                                       table->local.highest_id,
+                                                       session,
+                                                       &local_rec,
+                                                       &session->local_id);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+
+               global->session_wire_id = session->local_id;
+       }
+
+       ptr = session;
+       val = make_tdb_data((uint8_t const *)&ptr, sizeof(ptr));
+       status = dbwrap_record_store(local_rec, val, TDB_REPLACE);
+       TALLOC_FREE(local_rec);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(session);
+               return status;
+       }
+
+       global->creation_time = now;
+       global->expiration_time = UINT64_MAX;//NTTIME_INFINITY;
+
+       global->num_channels = 1;
+       channels = talloc_zero_array(global,
+                                    struct smbXsrv_channel_global0,
+                                    global->num_channels);
+       if (channels == NULL) {
+               talloc_free(session);
+               return NT_STATUS_NO_MEMORY;
+       }
+       global->channels = channels;
+
+       channels[0].server_id = messaging_server_id(conn->msg_ctx);
+       channels[0].local_address = tsocket_address_string(conn->local_address,
+                                                          channels);
+       if (channels[0].local_address == NULL) {
+               talloc_free(session);
+               return NT_STATUS_NO_MEMORY;
+       }
+       channels[0].remote_address = tsocket_address_string(conn->remote_address,
+                                                           channels);
+       if (channels[0].remote_address == NULL) {
+               talloc_free(session);
+               return NT_STATUS_NO_MEMORY;
+       }
+       channels[0].remote_name = talloc_strdup(channels, conn->remote_hostname);
+       if (channels[0].remote_name == NULL) {
+               talloc_free(session);
+               return NT_STATUS_NO_MEMORY;
+       }
+       channels[0].signing_key = data_blob_null;
+
+       status = smbXsrv_session_global_store(conn,
+                                             global);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(session);
+               return status;
+       }
+
+       {
+               struct smbXsrv_sessionB session_blob;
+
+               ZERO_STRUCT(session_blob);
+               session_blob.version = 0;
+               session_blob.info.info0 = session;
+
+               NDR_PRINT_DEBUG(smbXsrv_sessionB, &session_blob);
+       }
+
+       *_session = session;
+       return NT_STATUS_OK;
+}
+
+NTSTATUS smbXsrv_session_update(struct smbXsrv_session *session)
+{
+       struct smbXsrv_session_table *table = &session->connection->session_table;
+       NTSTATUS status;
+       uint8_t key_buf[sizeof(uint32_t)];
+       TDB_DATA key;
+
+       if (session->global->db_rec != NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       RSIVAL(key_buf, 0, session->global->session_global_id);
+       key = make_tdb_data(key_buf, sizeof(key_buf));
+
+       session->global->db_rec = dbwrap_fetch_locked(table->global.db_ctx,
+                                                     session->global, key);
+       if (session->global->db_rec == NULL) {
+               // TODO proper return code?
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = smbXsrv_session_global_store(session->connection,
+                                             session->global);
+       if (!NT_STATUS_IS_OK(status)) {
+               /* debug */
+               return status;
+       }
+
+       {
+               struct smbXsrv_sessionB session_blob;
+
+               ZERO_STRUCT(session_blob);
+               session_blob.version = 0;
+               session_blob.info.info0 = session;
+
+               NDR_PRINT_DEBUG(smbXsrv_sessionB, &session_blob);
+       }
+
+       return NT_STATUS_OK;
+}
+
+NTSTATUS smb1srv_session_table_init(struct smbXsrv_connection *conn)
+{
+       /*
+        * Allow a range from 100..65534.
+        */
+       return smbXsrv_session_table_init(conn, 100, UINT16_MAX - 1);
+}
+
+NTSTATUS smb1srv_session_lookup(struct smbXsrv_session_table *table,
+                               uint16_t vuid, NTTIME now,
+                               struct smbXsrv_session **session)
+{
+       uint32_t local_id = vuid;
+
+       return smbXsrv_session_local_lookup(table, local_id, now, session);
+}
+
+NTSTATUS smb2srv_session_table_init(struct smbXsrv_connection *conn)
+{
+       /*
+        * For now use the same range as SMB1.
+        *
+        * Allow a range from 100..65534.
+        */
+       return smbXsrv_session_table_init(conn, 100, UINT16_MAX - 1);
+}
+
+NTSTATUS smb2srv_session_lookup(struct smbXsrv_session_table *table,
+                               uint64_t session_id, NTTIME now,
+                               struct smbXsrv_session **session)
+{
+       uint32_t local_id = session_id & UINT32_MAX;
+
+       return smbXsrv_session_local_lookup(table, local_id, now, session);
+}
+
index f908d3e05bcf759706c609ad13a60ef05e560cff..05d64898a9ed25d103a64ada22aea37a58c89827 100755 (executable)
@@ -385,6 +385,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/smb2_getinfo.c
                smbd/smb2_setinfo.c
                smbd/smb2_break.c
+               smbd/smbXsrv_session.c
                smbd/server_exit.c
                ${MANGLE_SRC}'''