mirror of
https://github.com/samba-team/samba.git
synced 2025-03-11 16:58:40 +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)
96 lines
2.2 KiB
C
96 lines
2.2 KiB
C
/*
|
|
Unix SMB/CIFS Implementation.
|
|
|
|
ldap client side header
|
|
|
|
Copyright (C) Andrew Tridgell 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 "libcli/ldap/ldap.h"
|
|
|
|
enum ldap_request_state { LDAP_REQUEST_SEND=1, LDAP_REQUEST_PENDING=2, LDAP_REQUEST_DONE=3, LDAP_REQUEST_ERROR=4 };
|
|
|
|
/* this is the handle that the caller gets when an async ldap message
|
|
is sent */
|
|
struct ldap_request {
|
|
struct ldap_request *next, *prev;
|
|
struct ldap_connection *conn;
|
|
|
|
enum ldap_request_tag type;
|
|
int messageid;
|
|
enum ldap_request_state state;
|
|
|
|
int num_replies;
|
|
struct ldap_message **replies;
|
|
|
|
NTSTATUS status;
|
|
DATA_BLOB data;
|
|
struct {
|
|
void (*fn)(struct ldap_request *);
|
|
void *private_data;
|
|
} async;
|
|
|
|
struct timed_event *time_event;
|
|
};
|
|
|
|
|
|
/* main context for a ldap client connection */
|
|
struct ldap_connection {
|
|
struct socket_context *sock;
|
|
char *host;
|
|
uint16_t port;
|
|
BOOL ldaps;
|
|
|
|
const char *auth_dn;
|
|
const char *simple_pw;
|
|
|
|
struct {
|
|
char *url;
|
|
int max_retries;
|
|
int retries;
|
|
time_t previous;
|
|
} reconnect;
|
|
|
|
struct {
|
|
enum { LDAP_BIND_SIMPLE, LDAP_BIND_SASL } type;
|
|
void *creds;
|
|
} bind;
|
|
|
|
/* next message id to assign */
|
|
unsigned next_messageid;
|
|
|
|
/* Outstanding LDAP requests that have not yet been replied to */
|
|
struct ldap_request *pending;
|
|
|
|
/* Let's support SASL */
|
|
struct gensec_security *gensec;
|
|
|
|
/* the default timeout for messages */
|
|
int timeout;
|
|
|
|
/* last error message */
|
|
char *last_error;
|
|
|
|
struct {
|
|
struct event_context *event_ctx;
|
|
struct fd_event *fde;
|
|
} event;
|
|
|
|
struct packet_context *packet;
|
|
};
|