mirror of
https://github.com/samba-team/samba.git
synced 2025-02-07 01:58:28 +03:00
ba07fa43d0
contexts from the application layer into the socket layer. This improves a number of correctness aspects, as we now allow LDAP packets to cross multiple SASL packets. It should also make it much easier to write async LDAP tests from windows clients, as they use SASL by default. It is also vital to allowing OpenLDAP clients to use GSSAPI against Samba4, as it negotiates a rather small SASL buffer size. This patch mirrors the earlier work done to move TLS into the socket layer. Unusual in this pstch is the extra read callback argument I take. As SASL is a layer on top of a socket, it is entirely possible for the SASL layer to drain a socket dry, but for the caller not to have read all the decrypted data. This would leave the system without an event to restart the read (as the socket is dry). As such, I re-invoke the read handler from a timed callback, which should trigger on the next running of the event loop. I believe that the TLS code does require a similar callback. In trying to understand why this is required, imagine a SASL-encrypted LDAP packet in the following formation: +-----------------+---------------------+ | SASL Packet #1 | SASL Packet #2 | ----------------------------------------+ | LDAP Packet #1 | LDAP Packet #2 | ----------------------------------------+ In the old code, this was illegal, but it is perfectly standard SASL-encrypted LDAP. Without the callback, we would read and process the first LDAP packet, and the SASL code would have read the second SASL packet (to decrypt enough data for the LDAP packet), and no data would remain on the socket. Without data on the socket, read events stop. That is why I add timed events, until the SASL buffer is drained. Another approach would be to add a hack to the event system, to have it pretend there remained data to read off the network (but that is ugly). In improving the code, to handle more real-world cases, I've been able to remove almost all the special-cases in the testnonblock code. The only special case is that we must use a deterministic partial packet when calling send, rather than a random length. (1 + n/2). This is needed because of the way the SASL and TLS code works, and the 'resend on failure' requirements. Andrew Bartlett (This used to be commit 5d7c9c12cb2b39673172a357092b80cd814850b0)
201 lines
7.2 KiB
C
201 lines
7.2 KiB
C
/*
|
|
Unix SMB/CIFS implementation.
|
|
Socket functions
|
|
Copyright (C) Stefan Metzmacher 2004
|
|
|
|
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.
|
|
*/
|
|
|
|
#ifndef _SAMBA_SOCKET_H
|
|
#define _SAMBA_SOCKET_H
|
|
|
|
#include "lib/events/events.h"
|
|
|
|
struct socket_context;
|
|
|
|
enum socket_type {
|
|
SOCKET_TYPE_STREAM,
|
|
SOCKET_TYPE_DGRAM
|
|
};
|
|
|
|
struct socket_address {
|
|
const char *family;
|
|
char *addr;
|
|
int port;
|
|
struct sockaddr *sockaddr;
|
|
size_t sockaddrlen;
|
|
};
|
|
|
|
struct socket_ops {
|
|
const char *name;
|
|
|
|
NTSTATUS (*fn_init)(struct socket_context *sock);
|
|
|
|
/* client ops */
|
|
NTSTATUS (*fn_connect)(struct socket_context *sock,
|
|
const struct socket_address *my_address,
|
|
const struct socket_address *server_address,
|
|
uint32_t flags);
|
|
|
|
/* complete a non-blocking connect */
|
|
NTSTATUS (*fn_connect_complete)(struct socket_context *sock,
|
|
uint32_t flags);
|
|
|
|
/* server ops */
|
|
NTSTATUS (*fn_listen)(struct socket_context *sock,
|
|
const struct socket_address *my_address,
|
|
int queue_size, uint32_t flags);
|
|
NTSTATUS (*fn_accept)(struct socket_context *sock,
|
|
struct socket_context **new_sock);
|
|
|
|
/* general ops */
|
|
NTSTATUS (*fn_recv)(struct socket_context *sock, void *buf,
|
|
size_t wantlen, size_t *nread);
|
|
NTSTATUS (*fn_send)(struct socket_context *sock,
|
|
const DATA_BLOB *blob, size_t *sendlen);
|
|
|
|
NTSTATUS (*fn_sendto)(struct socket_context *sock,
|
|
const DATA_BLOB *blob, size_t *sendlen,
|
|
const struct socket_address *dest_addr);
|
|
NTSTATUS (*fn_recvfrom)(struct socket_context *sock,
|
|
void *buf, size_t wantlen, size_t *nread,
|
|
TALLOC_CTX *addr_ctx, struct socket_address **src_addr);
|
|
NTSTATUS (*fn_pending)(struct socket_context *sock, size_t *npending);
|
|
|
|
void (*fn_close)(struct socket_context *sock);
|
|
|
|
NTSTATUS (*fn_set_option)(struct socket_context *sock, const char *option, const char *val);
|
|
|
|
char *(*fn_get_peer_name)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
|
|
struct socket_address *(*fn_get_peer_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
|
|
struct socket_address *(*fn_get_my_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
|
|
|
|
int (*fn_get_fd)(struct socket_context *sock);
|
|
};
|
|
|
|
enum socket_state {
|
|
SOCKET_STATE_UNDEFINED,
|
|
|
|
SOCKET_STATE_CLIENT_START,
|
|
SOCKET_STATE_CLIENT_CONNECTED,
|
|
SOCKET_STATE_CLIENT_STARTTLS,
|
|
SOCKET_STATE_CLIENT_ERROR,
|
|
|
|
SOCKET_STATE_SERVER_LISTEN,
|
|
SOCKET_STATE_SERVER_CONNECTED,
|
|
SOCKET_STATE_SERVER_STARTTLS,
|
|
SOCKET_STATE_SERVER_ERROR
|
|
};
|
|
|
|
#define SOCKET_FLAG_BLOCK 0x00000001
|
|
#define SOCKET_FLAG_PEEK 0x00000002
|
|
#define SOCKET_FLAG_TESTNONBLOCK 0x00000004
|
|
#define SOCKET_FLAG_ENCRYPT 0x00000008 /* This socket
|
|
* implementation requires
|
|
* that re-sends be
|
|
* consistant, because it
|
|
* is encrypting data.
|
|
* This modifies the
|
|
* TESTNONBLOCK case */
|
|
|
|
struct socket_context {
|
|
enum socket_type type;
|
|
enum socket_state state;
|
|
uint32_t flags;
|
|
|
|
int fd;
|
|
|
|
void *private_data;
|
|
const struct socket_ops *ops;
|
|
const char *backend_name;
|
|
};
|
|
|
|
|
|
/* prototypes */
|
|
NTSTATUS socket_create_with_ops(TALLOC_CTX *mem_ctx, const struct socket_ops *ops,
|
|
struct socket_context **new_sock,
|
|
enum socket_type type, uint32_t flags);
|
|
NTSTATUS socket_create(const char *name, enum socket_type type,
|
|
struct socket_context **new_sock, uint32_t flags);
|
|
NTSTATUS socket_connect(struct socket_context *sock,
|
|
const struct socket_address *my_address,
|
|
const struct socket_address *server_address,
|
|
uint32_t flags);
|
|
NTSTATUS socket_connect_complete(struct socket_context *sock, uint32_t flags);
|
|
NTSTATUS socket_listen(struct socket_context *sock,
|
|
const struct socket_address *my_address,
|
|
int queue_size, uint32_t flags);
|
|
NTSTATUS socket_accept(struct socket_context *sock, struct socket_context **new_sock);
|
|
NTSTATUS socket_recv(struct socket_context *sock, void *buf,
|
|
size_t wantlen, size_t *nread);
|
|
NTSTATUS socket_recvfrom(struct socket_context *sock, void *buf,
|
|
size_t wantlen, size_t *nread,
|
|
TALLOC_CTX *addr_ctx, struct socket_address **src_addr);
|
|
NTSTATUS socket_send(struct socket_context *sock,
|
|
const DATA_BLOB *blob, size_t *sendlen);
|
|
NTSTATUS socket_sendto(struct socket_context *sock,
|
|
const DATA_BLOB *blob, size_t *sendlen,
|
|
const struct socket_address *dest_addr);
|
|
NTSTATUS socket_pending(struct socket_context *sock, size_t *npending);
|
|
NTSTATUS socket_set_option(struct socket_context *sock, const char *option, const char *val);
|
|
char *socket_get_peer_name(struct socket_context *sock, TALLOC_CTX *mem_ctx);
|
|
struct socket_address *socket_get_peer_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
|
|
struct socket_address *socket_get_my_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
|
|
int socket_get_fd(struct socket_context *sock);
|
|
NTSTATUS socket_dup(struct socket_context *sock);
|
|
struct socket_address *socket_address_from_strings(TALLOC_CTX *mem_ctx,
|
|
const char *type,
|
|
const char *host,
|
|
int port);
|
|
struct socket_address *socket_address_from_sockaddr(TALLOC_CTX *mem_ctx,
|
|
struct sockaddr *sockaddr,
|
|
size_t addrlen);
|
|
const struct socket_ops *socket_getops_byname(const char *name, enum socket_type type);
|
|
BOOL allow_access(TALLOC_CTX *mem_ctx,
|
|
const char **deny_list, const char **allow_list,
|
|
const char *cname, const char *caddr);
|
|
BOOL socket_check_access(struct socket_context *sock,
|
|
const char *service_name,
|
|
const char **allow_list, const char **deny_list);
|
|
|
|
struct composite_context *socket_connect_send(struct socket_context *sock,
|
|
struct socket_address *my_address,
|
|
struct socket_address *server_address,
|
|
uint32_t flags,
|
|
struct event_context *event_ctx);
|
|
NTSTATUS socket_connect_recv(struct composite_context *ctx);
|
|
NTSTATUS socket_connect_ev(struct socket_context *sock,
|
|
struct socket_address *my_address,
|
|
struct socket_address *server_address,
|
|
uint32_t flags, struct event_context *ev);
|
|
|
|
struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx,
|
|
const char *server_address,
|
|
int num_server_ports,
|
|
uint16_t *server_ports,
|
|
struct event_context *event_ctx);
|
|
NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
|
|
TALLOC_CTX *mem_ctx,
|
|
struct socket_context **result,
|
|
uint16_t *port);
|
|
NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address,
|
|
int num_server_ports, uint16_t *server_ports,
|
|
struct event_context *event_ctx,
|
|
struct socket_context **result,
|
|
uint16_t *port);
|
|
void set_socket_options(int fd, const char *options);
|
|
|
|
#endif /* _SAMBA_SOCKET_H */
|