summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-11-28 19:54:46 +0100
committerVolker Lendecke <vl@samba.org>2008-12-08 22:09:33 +0100
commit2bd8a6e21ed9e52373bc04b12e2d4b80881edb8b (patch)
tree99dec8a7eef3f88c3d5f461e6d93f3c504f51299
parent7fbb64d726f23da49cd2f07e1a678ed575b70bfa (diff)
downloadsamba-2bd8a6e21ed9e52373bc04b12e2d4b80881edb8b.tar.gz
samba-2bd8a6e21ed9e52373bc04b12e2d4b80881edb8b.tar.bz2
samba-2bd8a6e21ed9e52373bc04b12e2d4b80881edb8b.zip
Add infrastructure to transfer winbindd_request/response asynchronously
-rw-r--r--source3/Makefile.in1
-rw-r--r--source3/winbindd/winbindd_proto.h21
-rw-r--r--source3/winbindd/winbindd_reqtrans.c561
3 files changed, 583 insertions, 0 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 83e94a4382..bf79a7dfda 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1036,6 +1036,7 @@ IDMAP_ADEX_OBJ = \
WINBINDD_OBJ1 = \
winbindd/winbindd.o \
+ winbindd/winbindd_reqtrans.o \
winbindd/winbindd_user.o \
winbindd/winbindd_group.o \
winbindd/winbindd_util.o \
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 9de385e3b3..3869ac5771 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -67,6 +67,27 @@ void winbind_check_sighup(const char *lfile);
void winbind_check_sigterm(bool in_parent);
int main(int argc, char **argv, char **envp);
+/* The following definitions come from winbindd/winbindd_reqtrans.c */
+
+struct async_req *wb_req_read_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ int fd, size_t max_extra_data);
+NTSTATUS wb_req_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+ struct winbindd_request **preq);
+struct async_req *wb_req_write_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev, int fd,
+ struct winbindd_request *wb_req);
+NTSTATUS wb_req_write_recv(struct async_req *req);
+
+struct async_req *wb_resp_read_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev, int fd);
+NTSTATUS wb_resp_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+ struct winbindd_response **presp);
+struct async_req *wb_resp_write_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev, int fd,
+ struct winbindd_response *wb_resp);
+NTSTATUS wb_resp_write_recv(struct async_req *req);
+
/* The following definitions come from winbindd/winbindd_ads.c */
diff --git a/source3/winbindd/winbindd_reqtrans.c b/source3/winbindd/winbindd_reqtrans.c
new file mode 100644
index 0000000000..e9901e173f
--- /dev/null
+++ b/source3/winbindd/winbindd_reqtrans.c
@@ -0,0 +1,561 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Async transfer of winbindd_request and _response structs
+
+ Copyright (C) Volker Lendecke 2008
+
+ 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 "winbindd.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_WINBIND
+
+struct req_read_state {
+ struct winbindd_request *wb_req;
+ struct event_context *ev;
+ size_t max_extra_data;
+ int fd;
+};
+
+static void wb_req_read_len(struct async_req *subreq);
+static void wb_req_read_main(struct async_req *subreq);
+static void wb_req_read_extra(struct async_req *subreq);
+
+struct async_req *wb_req_read_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ int fd, size_t max_extra_data)
+{
+ struct async_req *result, *subreq;
+ struct req_read_state *state;
+
+ result = async_req_new(mem_ctx, ev);
+ if (result == NULL) {
+ return NULL;
+ }
+
+ state = talloc(result, struct req_read_state);
+ if (state == NULL) {
+ goto nomem;
+ }
+ result->private_data = state;
+
+ state->fd = fd;
+ state->ev = ev;
+ state->max_extra_data = max_extra_data;
+ state->wb_req = talloc(state, struct winbindd_request);
+ if (state->wb_req == NULL) {
+ goto nomem;
+ }
+
+ subreq = recvall_send(state, ev, state->fd, &(state->wb_req->length),
+ sizeof(state->wb_req->length), 0);
+ if (subreq == NULL) {
+ goto nomem;
+ }
+
+ subreq->async.fn = wb_req_read_len;
+ subreq->async.priv = result;
+ return result;
+
+ nomem:
+ TALLOC_FREE(result);
+ return NULL;
+}
+
+static void wb_req_read_len(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ struct req_read_state *state = talloc_get_type_abort(
+ req->private_data, struct req_read_state);
+ NTSTATUS status;
+
+ status = recvall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+
+ if (state->wb_req->length != sizeof(struct winbindd_request)) {
+ DEBUG(0, ("wb_req_read_len: Invalid request size received: "
+ "%d (expected %d)\n", (int)state->wb_req->length,
+ (int)sizeof(struct winbindd_request)));
+ async_req_error(req, NT_STATUS_INVALID_BUFFER_SIZE);
+ return;
+ }
+
+ subreq = recvall_send(
+ req, state->ev, state->fd, (uint32 *)(state->wb_req)+1,
+ sizeof(struct winbindd_request) - sizeof(uint32), 0);
+ if (subreq == NULL) {
+ async_req_error(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+
+ subreq->async.fn = wb_req_read_main;
+ subreq->async.priv = req;
+}
+
+static void wb_req_read_main(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ struct req_read_state *state = talloc_get_type_abort(
+ req->private_data, struct req_read_state);
+ NTSTATUS status;
+
+ status = recvall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+
+ if ((state->max_extra_data != 0)
+ && (state->wb_req->extra_len > state->max_extra_data)) {
+ DEBUG(3, ("Got request with %d bytes extra data on "
+ "unprivileged socket\n",
+ (int)state->wb_req->extra_len));
+ async_req_error(req, NT_STATUS_INVALID_BUFFER_SIZE);
+ return;
+ }
+
+ if (state->wb_req->extra_len == 0) {
+ async_req_done(req);
+ return;
+ }
+
+ state->wb_req->extra_data.data = TALLOC_ARRAY(
+ state->wb_req, char, state->wb_req->extra_len + 1);
+ if (state->wb_req->extra_data.data == NULL) {
+ async_req_error(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+ state->wb_req->extra_data.data[state->wb_req->extra_len] = 0;
+
+ subreq = recvall_send(
+ req, state->ev, state->fd, state->wb_req->extra_data.data,
+ state->wb_req->extra_len, 0);
+ if (subreq == NULL) {
+ async_req_error(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+
+ subreq->async.fn = wb_req_read_extra;
+ subreq->async.priv = req;
+}
+
+static void wb_req_read_extra(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ NTSTATUS status;
+
+ status = recvall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+ async_req_done(req);
+}
+
+
+NTSTATUS wb_req_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+ struct winbindd_request **preq)
+{
+ struct req_read_state *state = talloc_get_type_abort(
+ req->private_data, struct req_read_state);
+
+ SMB_ASSERT(req->state >= ASYNC_REQ_DONE);
+ if (req->state == ASYNC_REQ_ERROR) {
+ return req->status;
+ }
+
+ *preq = talloc_move(mem_ctx, &state->wb_req);
+ return NT_STATUS_OK;
+}
+
+struct req_write_state {
+ struct winbindd_request *wb_req;
+ struct event_context *ev;
+ int fd;
+};
+
+static void wb_req_write_main(struct async_req *subreq);
+static void wb_req_write_extra(struct async_req *subreq);
+
+struct async_req *wb_req_write_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev, int fd,
+ struct winbindd_request *wb_req)
+{
+ struct async_req *result, *subreq;
+ struct req_write_state *state;
+
+ result = async_req_new(mem_ctx, ev);
+ if (result == NULL) {
+ return NULL;
+ }
+
+ state = talloc(result, struct req_write_state);
+ if (state == NULL) {
+ goto nomem;
+ }
+ result->private_data = state;
+
+ state->fd = fd;
+ state->ev = ev;
+ state->wb_req = wb_req;
+
+ subreq = sendall_send(state, state->ev, state->fd, state->wb_req,
+ sizeof(struct winbindd_request), 0);
+ if (subreq == NULL) {
+ goto nomem;
+ }
+
+ subreq->async.fn = wb_req_write_main;
+ subreq->async.priv = result;
+ return result;
+
+ nomem:
+ TALLOC_FREE(result);
+ return NULL;
+}
+
+static void wb_req_write_main(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ struct req_write_state *state = talloc_get_type_abort(
+ req->private_data, struct req_write_state);
+ NTSTATUS status;
+
+ status = sendall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+
+ if (state->wb_req->extra_len == 0) {
+ async_req_done(req);
+ return;
+ }
+
+ subreq = sendall_send(state, state->ev, state->fd,
+ state->wb_req->extra_data.data,
+ state->wb_req->extra_len, 0);
+ if (subreq == NULL) {
+ async_req_error(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+
+ subreq->async.fn = wb_req_write_extra;
+ subreq->async.priv = req;
+}
+
+static void wb_req_write_extra(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ NTSTATUS status;
+
+ status = sendall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+
+ async_req_done(req);
+}
+
+NTSTATUS wb_req_write_recv(struct async_req *req)
+{
+ SMB_ASSERT(req->state >= ASYNC_REQ_DONE);
+ if (req->state == ASYNC_REQ_ERROR) {
+ return req->status;
+ }
+
+ return NT_STATUS_OK;
+}
+
+struct resp_read_state {
+ struct winbindd_response *wb_resp;
+ struct event_context *ev;
+ size_t max_extra_data;
+ int fd;
+};
+
+static void wb_resp_read_len(struct async_req *subreq);
+static void wb_resp_read_main(struct async_req *subreq);
+static void wb_resp_read_extra(struct async_req *subreq);
+
+struct async_req *wb_resp_read_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev, int fd)
+{
+ struct async_req *result, *subreq;
+ struct resp_read_state *state;
+
+ result = async_req_new(mem_ctx, ev);
+ if (result == NULL) {
+ return NULL;
+ }
+
+ state = talloc(result, struct resp_read_state);
+ if (state == NULL) {
+ goto nomem;
+ }
+ result->private_data = state;
+
+ state->fd = fd;
+ state->ev = ev;
+ state->wb_resp = talloc(state, struct winbindd_response);
+ if (state->wb_resp == NULL) {
+ goto nomem;
+ }
+
+ subreq = recvall_send(state, ev, state->fd, &(state->wb_resp->length),
+ sizeof(state->wb_resp->length), 0);
+ if (subreq == NULL) {
+ goto nomem;
+ }
+
+ subreq->async.fn = wb_resp_read_len;
+ subreq->async.priv = result;
+ return result;
+
+ nomem:
+ TALLOC_FREE(result);
+ return NULL;
+}
+
+static void wb_resp_read_len(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ struct resp_read_state *state = talloc_get_type_abort(
+ req->private_data, struct resp_read_state);
+ NTSTATUS status;
+
+ status = recvall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+
+ if (state->wb_resp->length < sizeof(struct winbindd_response)) {
+ DEBUG(0, ("wb_resp_read_len: Invalid response size received: "
+ "%d (expected at least%d)\n",
+ (int)state->wb_resp->length,
+ (int)sizeof(struct winbindd_response)));
+ async_req_error(req, NT_STATUS_INVALID_BUFFER_SIZE);
+ return;
+ }
+
+ subreq = recvall_send(
+ req, state->ev, state->fd, (uint32 *)(state->wb_resp)+1,
+ sizeof(struct winbindd_response) - sizeof(uint32), 0);
+ if (subreq == NULL) {
+ async_req_error(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+
+ subreq->async.fn = wb_resp_read_main;
+ subreq->async.priv = req;
+}
+
+static void wb_resp_read_main(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ struct resp_read_state *state = talloc_get_type_abort(
+ req->private_data, struct resp_read_state);
+ NTSTATUS status;
+ size_t extra_len;
+
+ status = recvall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+
+ extra_len = state->wb_resp->length - sizeof(struct winbindd_response);
+ if (extra_len == 0) {
+ async_req_done(req);
+ return;
+ }
+
+ state->wb_resp->extra_data.data = TALLOC_ARRAY(
+ state->wb_resp, char, extra_len+1);
+ if (state->wb_resp->extra_data.data == NULL) {
+ async_req_error(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+ ((char *)state->wb_resp->extra_data.data)[extra_len] = 0;
+
+ subreq = recvall_send(
+ req, state->ev, state->fd, state->wb_resp->extra_data.data,
+ extra_len, 0);
+ if (subreq == NULL) {
+ async_req_error(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+
+ subreq->async.fn = wb_resp_read_extra;
+ subreq->async.priv = req;
+}
+
+static void wb_resp_read_extra(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ NTSTATUS status;
+
+ status = recvall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+ async_req_done(req);
+}
+
+
+NTSTATUS wb_resp_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+ struct winbindd_response **presp)
+{
+ struct resp_read_state *state = talloc_get_type_abort(
+ req->private_data, struct resp_read_state);
+
+ SMB_ASSERT(req->state >= ASYNC_REQ_DONE);
+ if (req->state == ASYNC_REQ_ERROR) {
+ return req->status;
+ }
+
+ *presp = talloc_move(mem_ctx, &state->wb_resp);
+ return NT_STATUS_OK;
+}
+
+struct resp_write_state {
+ struct winbindd_response *wb_resp;
+ struct event_context *ev;
+ int fd;
+};
+
+static void wb_resp_write_main(struct async_req *subreq);
+static void wb_resp_write_extra(struct async_req *subreq);
+
+struct async_req *wb_resp_write_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev, int fd,
+ struct winbindd_response *wb_resp)
+{
+ struct async_req *result, *subreq;
+ struct resp_write_state *state;
+
+ result = async_req_new(mem_ctx, ev);
+ if (result == NULL) {
+ return NULL;
+ }
+
+ state = talloc(result, struct resp_write_state);
+ if (state == NULL) {
+ goto nomem;
+ }
+ result->private_data = state;
+
+ state->fd = fd;
+ state->ev = ev;
+ state->wb_resp = wb_resp;
+
+ subreq = sendall_send(state, state->ev, state->fd, state->wb_resp,
+ sizeof(struct winbindd_response), 0);
+ if (subreq == NULL) {
+ goto nomem;
+ }
+
+ subreq->async.fn = wb_resp_write_main;
+ subreq->async.priv = result;
+ return result;
+
+ nomem:
+ TALLOC_FREE(result);
+ return NULL;
+}
+
+static void wb_resp_write_main(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ struct resp_write_state *state = talloc_get_type_abort(
+ req->private_data, struct resp_write_state);
+ NTSTATUS status;
+
+ status = sendall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+
+ if (state->wb_resp->length == sizeof(struct winbindd_response)) {
+ async_req_done(req);
+ return;
+ }
+
+ subreq = sendall_send(
+ state, state->ev, state->fd,
+ state->wb_resp->extra_data.data,
+ state->wb_resp->length - sizeof(struct winbindd_response), 0);
+ if (subreq == 0) {
+ async_req_error(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+
+ subreq->async.fn = wb_resp_write_extra;
+ subreq->async.priv = req;
+}
+
+static void wb_resp_write_extra(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ NTSTATUS status;
+
+ status = sendall_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_error(req, status);
+ return;
+ }
+
+ async_req_done(req);
+}
+
+NTSTATUS wb_resp_write_recv(struct async_req *req)
+{
+ SMB_ASSERT(req->state >= ASYNC_REQ_DONE);
+ if (req->state == ASYNC_REQ_ERROR) {
+ return req->status;
+ }
+
+ return NT_STATUS_OK;
+}