r11789: - add the start of a SMB2 server
authorStefan Metzmacher <metze@samba.org>
Fri, 18 Nov 2005 14:13:49 +0000 (14:13 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:46:28 +0000 (13:46 -0500)
- it does Negprot and SessionSetup yet
  the rest returns NT_STATUS_NOT_IMPLEMENTED
- it's off by default, enable with:
  smbsrv:enable smb2 = yes
- negotition in the SMB Negprot isn't supported yet
- it's only tested with smbtorture SMB2-CONNECT
  not with vista as client

metze
(This used to be commit 08b31d5f618d2e416cb9812ad3a49754cd7212b8)

source4/include/structs.h
source4/smb_server/config.mk
source4/smb_server/smb2/config.mk [new file with mode: 0644]
source4/smb_server/smb2/fileio.c [new file with mode: 0644]
source4/smb_server/smb2/negprot.c [new file with mode: 0644]
source4/smb_server/smb2/receive.c [new file with mode: 0644]
source4/smb_server/smb2/sesssetup.c [new file with mode: 0644]
source4/smb_server/smb2/smb2_server.h [new file with mode: 0644]
source4/smb_server/smb2/tcon.c [new file with mode: 0644]
source4/smb_server/smb_server.c

index 7a546f905627043264a02b9b8899e46069c4a1d4..68f7f9af1444ece693874400d5bd256c7dc50f70 100644 (file)
@@ -146,14 +146,19 @@ struct reg_diff_file;
 struct rap_NetShareEnum;
 struct rap_NetServerEnum2;
 
-struct smbsrv_request;
-struct smbsrv_tcon;
-struct smb_signing_context;
-struct smbsrv_connection;
 struct auth_context;
 struct auth_method_context;
+
+struct smb_signing_context;
+
+struct smbsrv_session;
+struct smbsrv_tcon;
+struct smbsrv_connection;
+
+struct smbsrv_request;
 struct request_buffer;
 
+struct smb2srv_request;
 struct smb2_request_buffer;
 
 struct ntvfs_context;
index 1dd2632890f0e535f5502555128a20b363a13e85..192692df5b38f0439c5dcd0b8ed71f30952c37ec 100644 (file)
@@ -10,8 +10,11 @@ ADD_OBJ_FILES = \
                session.o \
                management.o
 REQUIRED_SUBSYSTEMS = \
-               LIBPACKET SMB_PROTOCOL
+               LIBPACKET \
+               SMB_PROTOCOL \
+               SMB2_PROTOCOL
 # End SUBSYSTEM SMB
 #######################
 
 include smb/config.mk
+include smb2/config.mk
diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk
new file mode 100644 (file)
index 0000000..105b646
--- /dev/null
@@ -0,0 +1,14 @@
+#######################
+# Start SUBSYSTEM SMB2_PROTOCOL
+[SUBSYSTEM::SMB2_PROTOCOL]
+INIT_OBJ_FILES = \
+               receive.o
+ADD_OBJ_FILES = \
+               negprot.o \
+               sesssetup.o \
+               tcon.o \
+               fileio.o
+REQUIRED_SUBSYSTEMS = \
+               NTVFS LIBPACKET LIBCLI_SMB2
+# End SUBSYSTEM SMB2_PROTOCOL
+#######################
diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c
new file mode 100644 (file)
index 0000000..63b02de
--- /dev/null
@@ -0,0 +1,74 @@
+/* 
+   Unix SMB2 implementation.
+   
+   Copyright (C) Stefan Metzmacher     2005
+   
+   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
+   (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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
+#include "smb_server/smb2/smb2_server.h"
+
+void smb2srv_create_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_close_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_read_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_write_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_cancel_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_find_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_notify_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_getinfo_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_setinfo_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_break_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
diff --git a/source4/smb_server/smb2/negprot.c b/source4/smb_server/smb2/negprot.c
new file mode 100644 (file)
index 0000000..630f38b
--- /dev/null
@@ -0,0 +1,177 @@
+/* 
+   Unix SMB2 implementation.
+   
+   Copyright (C) Andrew Bartlett       2001-2005
+   Copyright (C) Stefan Metzmacher     2005
+   
+   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
+   (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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "auth/auth.h"
+#include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
+#include "smb_server/smb_server.h"
+#include "smb_server/smb2/smb2_server.h"
+#include "smbd/service_stream.h"
+
+static NTSTATUS smb2srv_negprot_secblob(struct smb2srv_request *req, DATA_BLOB *_blob)
+{
+       struct gensec_security *gensec_security;
+       DATA_BLOB null_data_blob = data_blob(NULL, 0);
+       DATA_BLOB blob;
+       NTSTATUS nt_status;
+       struct cli_credentials *server_credentials;
+
+       nt_status = gensec_server_start(req, &gensec_security,
+                                       req->smb_conn->connection->event.ctx);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               DEBUG(0, ("Failed to start GENSEC: %s\n", nt_errstr(nt_status)));
+               smbsrv_terminate_connection(req->smb_conn, "Failed to start GENSEC\n");
+               return nt_status;
+       }
+
+       server_credentials = cli_credentials_init(req);
+       if (!server_credentials) {
+               smbsrv_terminate_connection(req->smb_conn, "Failed to init server credentials\n");
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       cli_credentials_set_conf(server_credentials);
+       nt_status = cli_credentials_set_machine_account(server_credentials);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               DEBUG(10, ("Failed to obtain server credentials, perhaps a standalone server?: %s\n", nt_errstr(nt_status)));
+               talloc_free(server_credentials);
+               server_credentials = NULL;
+       }
+
+       req->smb_conn->negotiate.server_credentials = talloc_steal(req->smb_conn, server_credentials);
+
+       gensec_set_target_service(gensec_security, "cifs");
+
+       gensec_set_credentials(gensec_security, server_credentials);
+
+       nt_status = gensec_start_mech_by_oid(gensec_security, GENSEC_OID_SPNEGO);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               DEBUG(0, ("Failed to start SPNEGO: %s\n", nt_errstr(nt_status)));
+               smbsrv_terminate_connection(req->smb_conn, "Failed to start SPNEGO\n");
+               return nt_status;
+       }
+
+       nt_status = gensec_update(gensec_security, req, null_data_blob, &blob);
+       if (!NT_STATUS_IS_OK(nt_status) && !NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               DEBUG(0, ("Failed to get SPNEGO to give us the first token: %s\n", nt_errstr(nt_status)));
+               smbsrv_terminate_connection(req->smb_conn, "Failed to start SPNEGO - no first token\n");
+               return nt_status;
+       }
+
+       *_blob = blob;
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS smb2srv_negprot_backend(struct smb2srv_request *req, struct smb2_negprot *io)
+{
+       NTSTATUS status;
+       struct timeval current_time;
+       struct timeval boot_time;
+
+       current_time = timeval_current(); /* TODO: handle timezone?! */
+       boot_time = timeval_current(); /* TODO: fix me */
+
+       io->out._pad            = 0;
+       io->out.unknown2        = 0x06;
+       ZERO_STRUCT(io->out.sessid);
+       io->out.unknown3        = 0x0d;
+       io->out.unknown4        = 0x00;
+       io->out.unknown5        = 0x01;
+       io->out.unknown6        = 0x01;
+       io->out.unknown7        = 0x01;
+       io->out.current_time    = timeval_to_nttime(&current_time);
+       io->out.boot_time       = timeval_to_nttime(&boot_time);
+       status = smb2srv_negprot_secblob(req, &io->out.secblob);
+       NT_STATUS_NOT_OK_RETURN(status);
+       io->out.unknown9        = 0x204d4c20;
+
+       return NT_STATUS_OK;
+}
+
+static void smb2srv_negprot_send(struct smb2srv_request *req, struct smb2_negprot *io)
+{
+       NTSTATUS status;
+
+       if (NT_STATUS_IS_ERR(req->status)) {
+               smb2srv_send_error(req, req->status); /* TODO: is this correct? */
+               return;
+       }
+
+       status = smb2srv_setup_reply(req, 0x40, io->out.secblob.length);
+       if (!NT_STATUS_IS_OK(status)) {
+               smbsrv_terminate_connection(req->smb_conn, nt_errstr(status));
+               talloc_free(req);
+               return;
+       }
+
+       SIVAL(req->out.hdr, SMB2_HDR_STATUS, NT_STATUS_V(req->status));
+
+       SSVAL(req->out.body, 0x02, io->out._pad);
+       SIVAL(req->out.body, 0x04, io->out.unknown2);
+       memcpy(req->out.body+0x08, io->out.sessid, 16);
+       SIVAL(req->out.body, 0x18, io->out.unknown3);
+       SSVAL(req->out.body, 0x1C, io->out.unknown4);
+       SIVAL(req->out.body, 0x1E, io->out.unknown5);
+       SIVAL(req->out.body, 0x22, io->out.unknown6);
+       SSVAL(req->out.body, 0x26, io->out.unknown7);
+       push_nttime(req->out.body, 0x28, io->out.current_time);
+       push_nttime(req->out.body, 0x30, io->out.boot_time);
+       status = smb2_push_o16s16_blob(&req->out, 0x38, io->out.secblob);
+       if (!NT_STATUS_IS_OK(status)) {
+               smbsrv_terminate_connection(req->smb_conn, nt_errstr(status));
+               talloc_free(req);
+               return;
+       }
+
+       SIVAL(req->out.body, 0x3C, io->out.unknown9);
+
+       smb2srv_send_reply(req);
+}
+
+void smb2srv_negprot_recv(struct smb2srv_request *req)
+{
+       struct smb2_negprot *io;
+
+       if (req->in.body_size < 0x26) {
+               smb2srv_send_error(req,  NT_STATUS_FOOBAR);
+               return;
+       }
+
+       io = talloc(req, struct smb2_negprot);
+       if (!io) {
+               smbsrv_terminate_connection(req->smb_conn, nt_errstr(NT_STATUS_NO_MEMORY));
+               talloc_free(req);
+               return;
+       }
+
+       io->in.unknown1 = SVAL(req->in.body, 0x02);
+       memcpy(io->in.unknown2, req->in.body + 0x04, 0x20);
+       io->in.unknown3 = SVAL(req->in.body, 0x24);
+
+       req->status = smb2srv_negprot_backend(req, io);
+
+       if (req->control_flags & SMB2SRV_REQ_CTRL_FLAG_NOT_REPLY) {
+               talloc_free(req);
+               return;
+       }
+       smb2srv_negprot_send(req, io);
+}
diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c
new file mode 100644 (file)
index 0000000..87b480e
--- /dev/null
@@ -0,0 +1,269 @@
+/* 
+   Unix SMB2 implementation.
+   
+   Copyright (C) Andrew Tridgell       2005
+   Copyright (C) Stefan Metzmacher     2005
+   
+   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
+   (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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "system/time.h"
+#include "smbd/service_stream.h"
+#include "libcli/smb2/smb2.h"
+#include "smb_server/smb_server.h"
+#include "smb_server/smb2/smb2_server.h"
+#include "lib/stream/packet.h"
+
+
+static struct smb2srv_request *smb2srv_init_request(struct smbsrv_connection *smb_conn)
+{
+       struct smb2srv_request *req;
+
+       req = talloc_zero(smb_conn, struct smb2srv_request);
+       if (!req) return NULL;
+
+       req->smb_conn = smb_conn;
+
+       return req;
+}
+
+NTSTATUS smb2srv_setup_reply(struct smb2srv_request *req, uint_t body_fixed_size, uint_t body_dynamic_size)
+{
+       req->out.size           = SMB2_HDR_BODY+NBT_HDR_SIZE+body_fixed_size;
+
+       req->out.allocated      = req->out.size + body_dynamic_size;
+       req->out.buffer         = talloc_size(req, req->out.allocated);
+       NT_STATUS_HAVE_NO_MEMORY(req->out.buffer);
+
+       req->out.hdr            = req->out.buffer       + NBT_HDR_SIZE;
+       req->out.body           = req->out.hdr          + SMB2_HDR_BODY;
+       req->out.body_size      = body_fixed_size;
+       req->out.dynamic        = (body_dynamic_size ? req->out.body + body_fixed_size : NULL);
+
+       SIVAL(req->out.hdr, 0,                SMB2_MAGIC);
+       SSVAL(req->out.hdr, SMB2_HDR_LENGTH,  SMB2_HDR_BODY);
+       SSVAL(req->out.hdr, SMB2_HDR_PAD1,    0);
+       SIVAL(req->out.hdr, SMB2_HDR_STATUS,  0);
+       SSVAL(req->out.hdr, SMB2_HDR_OPCODE,  SVAL(req->in.hdr, SMB2_HDR_OPCODE));
+       SSVAL(req->out.hdr, SMB2_HDR_PAD2,    0);
+       SIVAL(req->out.hdr, SMB2_HDR_FLAGS,   0x00000001);
+       SIVAL(req->out.hdr, SMB2_HDR_UNKNOWN, 0);
+       SBVAL(req->out.hdr, SMB2_HDR_SEQNUM,  req->seqnum);
+       SIVAL(req->out.hdr, SMB2_HDR_PID,     IVAL(req->in.hdr, SMB2_HDR_PID));
+       SIVAL(req->out.hdr, SMB2_HDR_TID,     IVAL(req->in.hdr, SMB2_HDR_TID));
+       SBVAL(req->out.hdr, SMB2_HDR_UID,     BVAL(req->in.hdr, SMB2_HDR_UID));
+       memset(req->out.hdr+SMB2_HDR_SIG, 0, 16);
+
+       /* set the length of the fixed body part and +1 if there's a dynamic part also */
+       SSVAL(req->out.body, 0, body_fixed_size + (body_dynamic_size?1:0));
+
+       /* 
+        * if we have a dynamic part, make sure the first byte
+        * which is always be part of the packet is initialized
+        */
+       if (body_dynamic_size) {
+               SCVAL(req->out.dynamic, 0, 0);
+       }
+
+       return NT_STATUS_OK;
+}
+
+void smb2srv_send_reply(struct smb2srv_request *req)
+{
+       DATA_BLOB blob;
+       NTSTATUS status;
+
+       if (req->out.size > NBT_HDR_SIZE) {
+               _smb_setlen(req->out.buffer, req->out.size - NBT_HDR_SIZE);
+       }
+
+       blob = data_blob_const(req->out.buffer, req->out.size);
+       status = packet_send(req->smb_conn->packet, blob);
+       if (!NT_STATUS_IS_OK(status)) {
+               smbsrv_terminate_connection(req->smb_conn, nt_errstr(status));
+       }
+       talloc_free(req);
+}
+
+void smb2srv_send_error(struct smb2srv_request *req, NTSTATUS error)
+{
+       NTSTATUS status;
+
+       status = smb2srv_setup_reply(req, 8, 1);
+       if (!NT_STATUS_IS_OK(status)) {
+               smbsrv_terminate_connection(req->smb_conn, nt_errstr(status));
+               talloc_free(req);
+               return;
+       }
+
+       SIVAL(req->out.hdr, SMB2_HDR_STATUS, NT_STATUS_V(error));
+
+       SSVAL(req->out.body, 0x02, 0);
+       SIVAL(req->out.body, 0x04, 0);
+
+       smb2srv_send_reply(req);
+}
+
+static NTSTATUS smb2srv_reply(struct smb2srv_request *req)
+{
+       uint16_t opcode;
+
+       opcode          = SVAL(req->in.hdr, SMB2_HDR_OPCODE);
+       req->seqnum     = BVAL(req->in.hdr, SMB2_HDR_SEQNUM);
+
+       errno = 0;
+
+       switch (opcode) {
+       case SMB2_OP_NEGPROT:
+               smb2srv_negprot_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_SESSSETUP:
+               smb2srv_sesssetup_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_TCON:
+               smb2srv_tcon_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_TDIS:
+               smb2srv_tdis_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_CREATE:
+               smb2srv_create_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_CLOSE:
+               smb2srv_close_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_READ:
+               smb2srv_read_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_WRITE:
+               smb2srv_write_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_CANCEL:
+               smb2srv_cancel_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_FIND:
+               smb2srv_find_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_NOTIFY:
+               smb2srv_notify_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_GETINFO:
+               smb2srv_getinfo_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_SETINFO:
+               smb2srv_setinfo_recv(req);
+               return NT_STATUS_OK;
+       case SMB2_OP_BREAK:
+               smb2srv_break_recv(req);
+               return NT_STATUS_OK;
+       }
+
+       DEBUG(1,("Invalid SMB2 opcode: 0x%04X\n", opcode));
+       smbsrv_terminate_connection(req->smb_conn, "Invalid SMB2 opcode");
+       return NT_STATUS_OK;
+}
+
+NTSTATUS smbsrv_recv_smb2_request(void *private, DATA_BLOB blob)
+{
+       struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection);
+       struct smb2srv_request *req;
+       uint32_t protocol_version;
+       uint16_t buffer_code;
+       uint32_t dynamic_size;
+
+       /* see if its a special NBT packet */
+       if (CVAL(blob.data,0) != 0) {
+               DEBUG(2,("Special NBT packet on SMB2 connection"));
+               smbsrv_terminate_connection(smb_conn, "Special NBT packet on SMB2 connection");
+               return NT_STATUS_OK;
+       }
+
+       if (blob.length < (NBT_HDR_SIZE + SMB2_MIN_SIZE)) {
+               DEBUG(2,("Invalid SMB2 packet length count %d\n", blob.length));
+               smbsrv_terminate_connection(smb_conn, "Invalid SMB2 packet");
+               return NT_STATUS_OK;
+       }
+
+       protocol_version = IVAL(blob.data, NBT_HDR_SIZE);
+
+       if (protocol_version != SMB2_MAGIC) {
+               DEBUG(2,("Invalid SMB packet: protocl prefix: 0x%08X\n", protocol_version));
+               smbsrv_terminate_connection(smb_conn, "NON-SMB2 packet");
+               return NT_STATUS_OK;
+       }
+
+       req = smb2srv_init_request(smb_conn);
+       NT_STATUS_HAVE_NO_MEMORY(req);
+
+       req->in.buffer          = talloc_steal(req, blob.data);
+       req->in.size            = blob.length;
+       req->request_time       = timeval_current();
+       req->in.allocated       = req->in.size;
+
+       req->in.hdr             = req->in.buffer+ NBT_HDR_SIZE;
+       req->in.body            = req->in.hdr   + SMB2_HDR_BODY;
+       req->in.body_size       = req->in.size  - (SMB2_HDR_BODY+NBT_HDR_SIZE);
+       req->in.dynamic         = NULL;
+
+       buffer_code             = SVAL(req->in.body, 0);
+       dynamic_size            = req->in.body_size - (buffer_code & ~1);
+
+       if (dynamic_size != 0 && (buffer_code & 1)) {
+               req->in.dynamic = req->in.body + (buffer_code & ~1);
+               if (smb2_oob(&req->in, req->in.dynamic, dynamic_size)) {
+                       DEBUG(1,("SMB2 request invalid dynamic size 0x%x\n", 
+                                dynamic_size));
+                       smb2srv_send_error(req, NT_STATUS_INVALID_PARAMETER);
+                       return NT_STATUS_OK;
+               }
+       }
+
+       /* 
+        * TODO: - make sure the length field is 64
+        *       - make sure it's a request
+        */
+
+       return smb2srv_reply(req);
+}
+
+/*
+ * init the SMB2 protocol related stuff
+ */
+NTSTATUS smbsrv_init_smb2_connection(struct smbsrv_connection *smb_conn)
+{
+       NTSTATUS status;
+
+       /* now initialise a few default values associated with this smb socket */
+       smb_conn->negotiate.max_send = 0xFFFF;
+
+       /* this is the size that w2k uses, and it appears to be important for
+          good performance */
+       smb_conn->negotiate.max_recv = lp_max_xmit();
+
+       smb_conn->negotiate.zone_offset = get_time_zone(time(NULL));
+
+       smb_conn->config.security = SEC_USER;
+       smb_conn->config.nt_status_support = True;
+
+       status = smbsrv_init_sessions(smb_conn, UINT64_MAX);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       status = smbsrv_init_tcons(smb_conn, UINT32_MAX);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       return NT_STATUS_OK;
+       
+}
diff --git a/source4/smb_server/smb2/sesssetup.c b/source4/smb_server/smb2/sesssetup.c
new file mode 100644 (file)
index 0000000..af0c074
--- /dev/null
@@ -0,0 +1,185 @@
+/* 
+   Unix SMB2 implementation.
+   
+   Copyright (C) Andrew Bartlett       2001-2005
+   Copyright (C) Stefan Metzmacher     2005
+   
+   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
+   (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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "auth/auth.h"
+#include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
+#include "smb_server/smb_server.h"
+#include "smb_server/smb2/smb2_server.h"
+#include "smbd/service_stream.h"
+
+struct smb2srv_session {
+       struct smb2srv_session *prev,*next;
+       uint64_t uid;
+       struct gensec_security *gensec_ctx;
+       struct auth_session_info *session_info;
+};
+
+static NTSTATUS smb2srv_sesssetup_backend(struct smb2srv_request *req, struct smb2_session_setup *io)
+{
+       NTSTATUS status = NT_STATUS_ACCESS_DENIED;
+       struct smbsrv_session *smb_sess = NULL;
+       struct auth_session_info *session_info = NULL;
+       uint64_t vuid;
+
+       io->out._pad    = 0;
+       io->out.uid     = 0;
+       io->out.secblob = data_blob(NULL, 0);
+
+       vuid = BVAL(req->in.hdr, SMB2_HDR_UID);
+
+       /* TODO: we're stricter than the SMB version till we have
+        *       SMB2-CONTEXT test
+        */
+       if (vuid == 0) {
+               struct gensec_security *gensec_ctx;
+
+               status = gensec_server_start(req, &gensec_ctx,
+                                            req->smb_conn->connection->event.ctx);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(1, ("Failed to start GENSEC server code: %s\n", nt_errstr(status)));
+                       return status;
+               }
+
+               gensec_set_credentials(gensec_ctx, req->smb_conn->negotiate.server_credentials);
+
+               gensec_set_target_service(gensec_ctx, "cifs");
+
+               gensec_want_feature(gensec_ctx, GENSEC_FEATURE_SESSION_KEY);
+
+               status = gensec_start_mech_by_oid(gensec_ctx, GENSEC_OID_SPNEGO);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(1, ("Failed to start GENSEC SPNEGO server code: %s\n", nt_errstr(status)));
+                       return status;
+               }
+
+               /* allocate a new session */
+               smb_sess = smbsrv_session_new(req->smb_conn, gensec_ctx);
+       } else {
+               /* lookup an existing session */
+               smb_sess = smbsrv_session_find_sesssetup(req->smb_conn, vuid);
+       }
+
+       if (!smb_sess) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       if (!smb_sess->gensec_ctx) {
+               status = NT_STATUS_INTERNAL_ERROR;
+               DEBUG(1, ("Internal ERROR: no gensec_ctx on session: %s\n", nt_errstr(status)));
+               goto failed;
+       }
+
+       status = gensec_update(smb_sess->gensec_ctx, req, io->in.secblob, &io->out.secblob);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               io->out.uid = smb_sess->vuid;
+               return status;
+       } else if (!NT_STATUS_IS_OK(status)) {
+               goto failed;
+       }
+
+       status = gensec_session_info(smb_sess->gensec_ctx, &session_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto failed;
+       }
+               
+       /* Ensure this is marked as a 'real' vuid, not one
+        * simply valid for the session setup leg */
+       status = smbsrv_session_sesssetup_finished(smb_sess, session_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto failed;
+       }
+       req->session = smb_sess;
+
+       io->out.uid = smb_sess->vuid;
+       return status;
+
+failed:
+       talloc_free(smb_sess);
+       return auth_nt_status_squash(status);
+}
+
+static void smb2srv_sesssetup_send(struct smb2srv_request *req, struct smb2_session_setup *io)
+{
+       NTSTATUS status;
+
+       if (NT_STATUS_IS_ERR(req->status) && !NT_STATUS_EQUAL(req->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               smb2srv_send_error(req, req->status);
+               return;
+       }
+
+       status = smb2srv_setup_reply(req, 0x08, io->out.secblob.length);
+       if (!NT_STATUS_IS_OK(status)) {
+               smbsrv_terminate_connection(req->smb_conn, nt_errstr(status));
+               talloc_free(req);
+               return;
+       }
+
+       SIVAL(req->out.hdr, SMB2_HDR_STATUS, NT_STATUS_V(req->status));
+       SBVAL(req->out.hdr, SMB2_HDR_UID,    io->out.uid);
+
+       SSVAL(req->out.body, 0x02, io->out._pad);
+       status = smb2_push_o16s16_blob(&req->out, 0x04, io->out.secblob);
+       if (!NT_STATUS_IS_OK(status)) {
+               smbsrv_terminate_connection(req->smb_conn, nt_errstr(status));
+               talloc_free(req);
+               return;
+       }
+
+       smb2srv_send_reply(req);
+}
+
+void smb2srv_sesssetup_recv(struct smb2srv_request *req)
+{
+       struct smb2_session_setup *io;
+       NTSTATUS status;
+
+       if (req->in.body_size < 0x10) {
+               smb2srv_send_error(req,  NT_STATUS_FOOBAR);
+               return;
+       }
+
+       io = talloc(req, struct smb2_session_setup);
+       if (!io) {
+               smbsrv_terminate_connection(req->smb_conn, nt_errstr(NT_STATUS_NO_MEMORY));
+               talloc_free(req);
+               return;
+       }
+
+       io->in._pad     = SVAL(req->in.body, 0x02);
+       io->in.unknown2 = IVAL(req->in.body, 0x04);
+       io->in.unknown3 = IVAL(req->in.body, 0x08);
+       status = smb2_pull_o16s16_blob(&req->in, io, req->in.body+0x0C, &io->in.secblob);
+       if (!NT_STATUS_IS_OK(status)) {
+               smbsrv_terminate_connection(req->smb_conn, nt_errstr(status));
+               talloc_free(req);
+               return;
+       }
+
+       req->status = smb2srv_sesssetup_backend(req, io);
+
+       if (req->control_flags & SMB2SRV_REQ_CTRL_FLAG_NOT_REPLY) {
+               talloc_free(req);
+               return;
+       }
+       smb2srv_sesssetup_send(req, io);
+}
diff --git a/source4/smb_server/smb2/smb2_server.h b/source4/smb_server/smb2/smb2_server.h
new file mode 100644 (file)
index 0000000..913c7f2
--- /dev/null
@@ -0,0 +1,50 @@
+/* 
+   Unix SMB2 implementation.
+   
+   Copyright (C) Stefan Metzmacher            2005
+   
+   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
+   (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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/* the context for a single SMB2 request. This is passed to any request-context 
+   functions */
+struct smb2srv_request {
+       /* the smbsrv_connection needs a list of requests queued for send */
+       struct smb2srv_request *next, *prev;
+
+       /* the server_context contains all context specific to this SMB socket */
+       struct smbsrv_connection *smb_conn;
+
+       /* the smbsrv_session for the request */
+       struct smbsrv_session *session;
+
+       /* the smbsrv_tcon for the request */
+       struct smbsrv_tcon *tcon;
+
+       /* the system time when the request arrived */
+       struct timeval request_time;
+
+       /* for matching request and reply */
+       uint64_t seqnum;
+
+       /* the status the backend returned */
+       NTSTATUS status;
+
+#define SMB2SRV_REQ_CTRL_FLAG_NOT_REPLY (1<<0)
+       uint32_t control_flags;
+
+       struct smb2_request_buffer in;
+       struct smb2_request_buffer out;
+};
diff --git a/source4/smb_server/smb2/tcon.c b/source4/smb_server/smb2/tcon.c
new file mode 100644 (file)
index 0000000..af9632e
--- /dev/null
@@ -0,0 +1,34 @@
+/* 
+   Unix SMB2 implementation.
+   
+   Copyright (C) Stefan Metzmacher     2005
+   
+   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
+   (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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
+#include "smb_server/smb2/smb2_server.h"
+
+void smb2srv_tcon_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
+
+void smb2srv_tdis_recv(struct smb2srv_request *req)
+{
+       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+}
index 3385e88d4a54c5dc137e0bb7cd9ed83c75b032ab..f439bce06143be95a306d7fa42a0c01a7e93a874 100644 (file)
@@ -27,6 +27,7 @@
 #include "smb_server/smb_server.h"
 #include "lib/messaging/irpc.h"
 #include "lib/stream/packet.h"
+#include "libcli/smb2/smb2.h"
 
 static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
 {
@@ -56,6 +57,12 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
                NT_STATUS_NOT_OK_RETURN(status);
                packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request);
                return smbsrv_recv_smb_request(smb_conn, blob);
+       case SMB2_MAGIC:
+               if (!lp_parm_bool(-1, "smbsrv", "enable smb2", False)) break;
+               status = smbsrv_init_smb2_connection(smb_conn);
+               NT_STATUS_NOT_OK_RETURN(status);
+               packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request);
+               return smbsrv_recv_smb2_request(smb_conn, blob);
        }
 
        DEBUG(2,("Invalid SMB packet: protocl prefix: 0x%08X\n", protocol_version));