mirror of
https://github.com/samba-team/samba.git
synced 2025-01-26 10:04:02 +03:00
2eb3d68062
GENSEC, and to pull SCHANNEL into GENSEC, by making it less 'special'. GENSEC now no longer has it's own handling of 'set username' etc, instead it uses cli_credentials calls. In order to link the credentails code right though Samba, a lot of interfaces have changed to remove 'username, domain, password' arguments, and these have been replaced with a single 'struct cli_credentials'. In the session setup code, a new parameter 'workgroup' contains the client/server current workgroup, which seems unrelated to the authentication exchange (it was being filled in from the auth info). This allows in particular kerberos to only call back for passwords when it actually needs to perform the kinit. The kerberos code has been modified not to use the SPNEGO provided 'principal name' (in the mechListMIC), but to instead use the name the host was connected to as. This better matches Microsoft behaviour, is more secure and allows better use of standard kerberos functions. To achieve this, I made changes to our socket code so that the hostname (before name resolution) is now recorded on the socket. In schannel, most of the code from librpc/rpc/dcerpc_schannel.c is now in libcli/auth/schannel.c, and it looks much more like a standard GENSEC module. The actual sign/seal code moved to libcli/auth/schannel_sign.c in a previous commit. The schannel credentails structure is now merged with the rest of the credentails, as many of the values (username, workstation, domain) where already present there. This makes handling this in a generic manner much easier, as there is no longer a custom entry-point. The auth_domain module continues to be developed, but is now just as functional as auth_winbind. The changes here are consequential to the schannel changes. The only removed function at this point is the RPC-LOGIN test (simulating the load of a WinXP login), which needs much more work to clean it up (it contains copies of too much code from all over the torture suite, and I havn't been able to penetrate its 'structure'). Andrew Bartlett (This used to be commit 2301a4b38a21aa60917973451687063d83d18d66)
350 lines
8.9 KiB
C
350 lines
8.9 KiB
C
/*
|
|
Unix SMB/CIFS implementation.
|
|
|
|
SMB client socket context management functions
|
|
|
|
Copyright (C) Andrew Tridgell 1994-2005
|
|
Copyright (C) James Myers 2003 <myersjj@samba.org>
|
|
|
|
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 "lib/events/events.h"
|
|
#include "libcli/raw/libcliraw.h"
|
|
#include "libcli/composite/composite.h"
|
|
#include "lib/socket/socket.h"
|
|
|
|
/*
|
|
this private structure is used during async connection handling
|
|
*/
|
|
struct clisocket_connect {
|
|
int port_num;
|
|
int *iports;
|
|
struct smbcli_socket *sock;
|
|
const char *dest_host_addr;
|
|
const char *dest_hostname;
|
|
};
|
|
|
|
|
|
/*
|
|
create a smbcli_socket context
|
|
The event_ctx is optional - if not supplied one will be created
|
|
*/
|
|
struct smbcli_socket *smbcli_sock_init(TALLOC_CTX *mem_ctx,
|
|
struct event_context *event_ctx)
|
|
{
|
|
struct smbcli_socket *sock;
|
|
|
|
sock = talloc_zero(mem_ctx, struct smbcli_socket);
|
|
if (!sock) {
|
|
return NULL;
|
|
}
|
|
|
|
if (event_ctx) {
|
|
sock->event.ctx = talloc_reference(sock, event_ctx);
|
|
} else {
|
|
sock->event.ctx = event_context_init(sock);
|
|
}
|
|
if (sock->event.ctx == NULL) {
|
|
talloc_free(sock);
|
|
return NULL;
|
|
}
|
|
|
|
return sock;
|
|
}
|
|
|
|
static NTSTATUS smbcli_sock_connect_one(struct smbcli_socket *sock,
|
|
const char *hostaddr, int port,
|
|
struct composite_context *c);
|
|
|
|
/*
|
|
handle socket write events during an async connect. These happen when the OS
|
|
has either completed the connect() or has returned an error
|
|
*/
|
|
static void smbcli_sock_connect_handler(struct event_context *ev, struct fd_event *fde,
|
|
uint16_t flags, void *private)
|
|
{
|
|
struct composite_context *c = talloc_get_type(private, struct composite_context);
|
|
struct clisocket_connect *conn = talloc_get_type(c->private, struct clisocket_connect);
|
|
int i;
|
|
|
|
c->status = socket_connect_complete(conn->sock->sock, 0);
|
|
if (NT_STATUS_IS_OK(c->status)) {
|
|
socket_set_option(conn->sock->sock, lp_socket_options(), NULL);
|
|
conn->sock->hostname = talloc_strdup(conn->sock, conn->dest_hostname);
|
|
c->state = SMBCLI_REQUEST_DONE;
|
|
if (c->async.fn) {
|
|
c->async.fn(c);
|
|
}
|
|
return;
|
|
}
|
|
|
|
/* that port failed - try the next port */
|
|
for (i=conn->port_num+1;conn->iports[i];i++) {
|
|
conn->port_num = i;
|
|
c->status = smbcli_sock_connect_one(conn->sock,
|
|
conn->dest_host_addr,
|
|
conn->iports[i], c);
|
|
if (NT_STATUS_IS_OK(c->status) ||
|
|
NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
|
|
return;
|
|
}
|
|
}
|
|
|
|
c->state = SMBCLI_REQUEST_ERROR;
|
|
if (c->async.fn) {
|
|
c->async.fn(c);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
try to connect to the given address/port
|
|
*/
|
|
static NTSTATUS smbcli_sock_connect_one(struct smbcli_socket *sock,
|
|
const char *hostaddr, int port,
|
|
struct composite_context *c)
|
|
{
|
|
NTSTATUS status;
|
|
|
|
if (sock->sock) {
|
|
talloc_free(sock->sock);
|
|
sock->sock = NULL;
|
|
}
|
|
talloc_free(sock->event.fde);
|
|
|
|
status = socket_create("ip", SOCKET_TYPE_STREAM, &sock->sock, 0);
|
|
if (!NT_STATUS_IS_OK(status)) {
|
|
return status;
|
|
}
|
|
|
|
talloc_steal(sock, sock->sock);
|
|
|
|
/* we initially look for write - see the man page on
|
|
non-blocking connect */
|
|
sock->event.fde = event_add_fd(sock->event.ctx, sock, socket_get_fd(sock->sock),
|
|
EVENT_FD_WRITE, smbcli_sock_connect_handler, c);
|
|
|
|
sock->port = port;
|
|
set_blocking(socket_get_fd(sock->sock), False);
|
|
|
|
return socket_connect(sock->sock, NULL, 0, hostaddr, port, 0);
|
|
}
|
|
|
|
|
|
/*
|
|
connect a smbcli_socket context to an IP/port pair
|
|
if port is 0 then choose 445 then 139
|
|
|
|
this is the async send side of the interface
|
|
*/
|
|
struct composite_context *smbcli_sock_connect_send(struct smbcli_socket *sock,
|
|
const char *host_addr, int port,
|
|
const char *host_name)
|
|
{
|
|
struct composite_context *c;
|
|
struct clisocket_connect *conn;
|
|
int i;
|
|
|
|
c = talloc_zero(sock, struct composite_context);
|
|
if (c == NULL) return NULL;
|
|
|
|
c->event_ctx = sock->event.ctx;
|
|
|
|
conn = talloc(c, struct clisocket_connect);
|
|
if (conn == NULL) goto failed;
|
|
|
|
conn->sock = sock;
|
|
|
|
/* work out what ports we will try */
|
|
if (port == 0) {
|
|
const char **ports = lp_smb_ports();
|
|
for (i=0;ports[i];i++) /* noop */ ;
|
|
conn->iports = talloc_array(c, int, i+1);
|
|
if (conn->iports == NULL) goto failed;
|
|
for (i=0;ports[i];i++) {
|
|
conn->iports[i] = atoi(ports[i]);
|
|
}
|
|
conn->iports[i] = 0;
|
|
} else {
|
|
conn->iports = talloc_array(c, int, 2);
|
|
if (conn->iports == NULL) goto failed;
|
|
conn->iports[0] = port;
|
|
conn->iports[1] = 0;
|
|
}
|
|
|
|
conn->dest_host_addr = talloc_strdup(c, host_addr);
|
|
if (conn->dest_host_addr == NULL) goto failed;
|
|
|
|
conn->dest_hostname = talloc_strdup(c, host_name);
|
|
if (conn->dest_hostname == NULL) goto failed;
|
|
|
|
c->private = conn;
|
|
c->state = SMBCLI_REQUEST_SEND;
|
|
|
|
/* startup the connect process for each port in turn until one
|
|
succeeds or tells us that it is pending */
|
|
for (i=0;conn->iports[i];i++) {
|
|
conn->port_num = i;
|
|
conn->sock->port = conn->iports[i];
|
|
c->status = smbcli_sock_connect_one(sock,
|
|
conn->dest_host_addr,
|
|
conn->iports[i], c);
|
|
if (NT_STATUS_IS_OK(c->status) ||
|
|
NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
|
|
return c;
|
|
}
|
|
}
|
|
|
|
c->state = SMBCLI_REQUEST_ERROR;
|
|
return c;
|
|
|
|
failed:
|
|
talloc_free(c);
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
finish a smbcli_sock_connect_send() operation
|
|
*/
|
|
NTSTATUS smbcli_sock_connect_recv(struct composite_context *c)
|
|
{
|
|
NTSTATUS status;
|
|
status = composite_wait(c);
|
|
talloc_free(c);
|
|
return status;
|
|
}
|
|
|
|
/*
|
|
connect a smbcli_socket context to an IP/port pair
|
|
if port is 0 then choose the ports listed in smb.conf (normally 445 then 139)
|
|
|
|
sync version of the function
|
|
*/
|
|
NTSTATUS smbcli_sock_connect(struct smbcli_socket *sock, const char *host_addr, int port,
|
|
const char *host_name)
|
|
{
|
|
struct composite_context *c;
|
|
|
|
c = smbcli_sock_connect_send(sock, host_addr, port, host_name);
|
|
if (c == NULL) {
|
|
return NT_STATUS_NO_MEMORY;
|
|
}
|
|
|
|
return smbcli_sock_connect_recv(c);
|
|
}
|
|
|
|
|
|
/****************************************************************************
|
|
mark the socket as dead
|
|
****************************************************************************/
|
|
void smbcli_sock_dead(struct smbcli_socket *sock)
|
|
{
|
|
if (sock->sock != NULL) {
|
|
talloc_free(sock->sock);
|
|
sock->sock = NULL;
|
|
}
|
|
}
|
|
|
|
/****************************************************************************
|
|
Set socket options on a open connection.
|
|
****************************************************************************/
|
|
void smbcli_sock_set_options(struct smbcli_socket *sock, const char *options)
|
|
{
|
|
socket_set_option(sock->sock, options, NULL);
|
|
}
|
|
|
|
/****************************************************************************
|
|
Write to socket. Return amount written.
|
|
****************************************************************************/
|
|
ssize_t smbcli_sock_write(struct smbcli_socket *sock, const uint8_t *data, size_t len)
|
|
{
|
|
NTSTATUS status;
|
|
DATA_BLOB blob;
|
|
size_t nsent;
|
|
|
|
if (sock->sock == NULL) {
|
|
errno = EIO;
|
|
return -1;
|
|
}
|
|
|
|
blob.data = discard_const(data);
|
|
blob.length = len;
|
|
|
|
status = socket_send(sock->sock, &blob, &nsent, 0);
|
|
if (NT_STATUS_IS_ERR(status)) {
|
|
return -1;
|
|
}
|
|
|
|
return nsent;
|
|
}
|
|
|
|
|
|
/****************************************************************************
|
|
Read from socket. return amount read
|
|
****************************************************************************/
|
|
ssize_t smbcli_sock_read(struct smbcli_socket *sock, uint8_t *data, size_t len)
|
|
{
|
|
NTSTATUS status;
|
|
size_t nread;
|
|
|
|
if (sock->sock == NULL) {
|
|
errno = EIO;
|
|
return -1;
|
|
}
|
|
|
|
status = socket_recv(sock->sock, data, len, &nread, 0);
|
|
if (NT_STATUS_IS_ERR(status)) {
|
|
return -1;
|
|
}
|
|
|
|
return nread;
|
|
}
|
|
|
|
|
|
/****************************************************************************
|
|
resolve a hostname and connect
|
|
****************************************************************************/
|
|
BOOL smbcli_sock_connect_byname(struct smbcli_socket *sock, const char *host, int port)
|
|
{
|
|
int name_type = NBT_NAME_SERVER;
|
|
const char *address;
|
|
NTSTATUS status;
|
|
struct nbt_name nbt_name;
|
|
char *name, *p;
|
|
|
|
name = talloc_strdup(sock, host);
|
|
|
|
/* allow hostnames of the form NAME#xx and do a netbios lookup */
|
|
if ((p = strchr(name, '#'))) {
|
|
name_type = strtol(p+1, NULL, 16);
|
|
*p = 0;
|
|
}
|
|
|
|
nbt_name.name = name;
|
|
nbt_name.type = name_type;
|
|
nbt_name.scope = NULL;
|
|
|
|
status = resolve_name(&nbt_name, sock, &address);
|
|
if (!NT_STATUS_IS_OK(status)) {
|
|
return False;
|
|
}
|
|
|
|
status = smbcli_sock_connect(sock, address, port, name);
|
|
|
|
return NT_STATUS_IS_OK(status);
|
|
}
|