sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s4:winbind: convert wb_sam_logon_send/recv to tevent_req

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2012-08-24 13:15:42 +02:00
parent d3756d8738
commit 0ccdaa940a
3 changed files with 137 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source4/winbind/wb_irpc.c
View File

@ -30,7 +30,7 @@ struct wb_irpc_SamLogon_state {
struct winbind_SamLogon *req; struct winbind_SamLogon *req;
}; };
static void wb_irpc_SamLogon_callback(struct composite_context *ctx); static void wb_irpc_SamLogon_callback(struct tevent_req *subreq);
static NTSTATUS wb_irpc_SamLogon(struct irpc_message *msg, static NTSTATUS wb_irpc_SamLogon(struct irpc_message *msg,
struct winbind_SamLogon *req) struct winbind_SamLogon *req)
@ -38,7 +38,7 @@ static NTSTATUS wb_irpc_SamLogon(struct irpc_message *msg,
struct wbsrv_service *service = talloc_get_type(msg->private_data, struct wbsrv_service *service = talloc_get_type(msg->private_data,
struct wbsrv_service); struct wbsrv_service);
struct wb_irpc_SamLogon_state *s; struct wb_irpc_SamLogon_state *s;
struct composite_context *ctx; struct tevent_req *subreq;
DEBUG(5, ("wb_irpc_SamLogon called\n")); DEBUG(5, ("wb_irpc_SamLogon called\n"));
@ -48,25 +48,28 @@ static NTSTATUS wb_irpc_SamLogon(struct irpc_message *msg,
s->msg = msg; s->msg = msg;
s->req = req; s->req = req;
ctx = wb_sam_logon_send(msg, service, req); subreq = wb_sam_logon_send(s,
NT_STATUS_HAVE_NO_MEMORY(ctx); service->task->event_ctx,
service, req);
NT_STATUS_HAVE_NO_MEMORY(subreq);
ctx->async.fn = wb_irpc_SamLogon_callback; tevent_req_set_callback(subreq, wb_irpc_SamLogon_callback, s);
ctx->async.private_data = s;
msg->defer_reply = true; msg->defer_reply = true;
return NT_STATUS_OK; return NT_STATUS_OK;
} }
static void wb_irpc_SamLogon_callback(struct composite_context *ctx) static void wb_irpc_SamLogon_callback(struct tevent_req *subreq)
{ {
struct wb_irpc_SamLogon_state *s = talloc_get_type(ctx->async.private_data, struct wb_irpc_SamLogon_state *s =
struct wb_irpc_SamLogon_state); tevent_req_callback_data(subreq,
struct wb_irpc_SamLogon_state);
NTSTATUS status; NTSTATUS status;
DEBUG(5, ("wb_irpc_SamLogon_callback called\n")); DEBUG(5, ("wb_irpc_SamLogon_callback called\n"));
status = wb_sam_logon_recv(ctx, s, s->req); status = wb_sam_logon_recv(subreq, s, s->req);
TALLOC_FREE(subreq);
irpc_send_reply(s->msg, status); irpc_send_reply(s->msg, status);
} }

21
source4/winbind/wb_pam_auth.c
View File

@ -54,7 +54,7 @@ struct pam_auth_crap_state {
* NTLM authentication. * NTLM authentication.
*/ */
static void pam_auth_crap_recv_logon(struct composite_context *ctx); static void pam_auth_crap_recv_logon(struct tevent_req *subreq);
struct composite_context *wb_cmd_pam_auth_crap_send(TALLOC_CTX *mem_ctx, struct composite_context *wb_cmd_pam_auth_crap_send(TALLOC_CTX *mem_ctx,
struct wbsrv_service *service, struct wbsrv_service *service,
@ -66,10 +66,11 @@ struct composite_context *wb_cmd_pam_auth_crap_send(TALLOC_CTX *mem_ctx,
DATA_BLOB nt_resp, DATA_BLOB nt_resp,
DATA_BLOB lm_resp) DATA_BLOB lm_resp)
{ {
struct composite_context *result, *ctx; struct composite_context *result;
struct pam_auth_crap_state *state; struct pam_auth_crap_state *state;
struct netr_NetworkInfo *ninfo; struct netr_NetworkInfo *ninfo;
DATA_BLOB tmp_nt_resp, tmp_lm_resp; DATA_BLOB tmp_nt_resp, tmp_lm_resp;
struct tevent_req *subreq;
result = composite_create(mem_ctx, service->task->event_ctx); result = composite_create(mem_ctx, service->task->event_ctx);
if (result == NULL) goto failed; if (result == NULL) goto failed;
@ -113,10 +114,11 @@ struct composite_context *wb_cmd_pam_auth_crap_send(TALLOC_CTX *mem_ctx,
state->unix_username = NULL; state->unix_username = NULL;
ctx = wb_sam_logon_send(mem_ctx, service, state->req); subreq = wb_sam_logon_send(state,
if (ctx == NULL) goto failed; service->task->event_ctx,
service, state->req);
composite_continue(result, ctx, pam_auth_crap_recv_logon, state); if (subreq == NULL) goto failed;
tevent_req_set_callback(subreq, pam_auth_crap_recv_logon, state);
return result; return result;
failed: failed:
@ -129,16 +131,17 @@ struct composite_context *wb_cmd_pam_auth_crap_send(TALLOC_CTX *mem_ctx,
Send of a SamLogon request to authenticate a user. Send of a SamLogon request to authenticate a user.
*/ */
static void pam_auth_crap_recv_logon(struct composite_context *ctx) static void pam_auth_crap_recv_logon(struct tevent_req *subreq)
{ {
DATA_BLOB tmp_blob; DATA_BLOB tmp_blob;
enum ndr_err_code ndr_err; enum ndr_err_code ndr_err;
struct netr_SamBaseInfo *base; struct netr_SamBaseInfo *base;
struct pam_auth_crap_state *state = struct pam_auth_crap_state *state =
talloc_get_type(ctx->async.private_data, tevent_req_callback_data(subreq,
struct pam_auth_crap_state); struct pam_auth_crap_state);
state->ctx->status = wb_sam_logon_recv(ctx, state, state->req); state->ctx->status = wb_sam_logon_recv(subreq, state, state->req);
TALLOC_FREE(subreq);
if (!composite_is_ok(state->ctx)) return; if (!composite_is_ok(state->ctx)) return;
ndr_err = ndr_push_struct_blob( ndr_err = ndr_push_struct_blob(

183
source4/winbind/wb_sam_logon.c
View File

@ -22,6 +22,8 @@
*/ */
#include "includes.h" #include "includes.h"
#include <tevent.h>
#include "../lib/util/tevent_ntstatus.h"
#include "libcli/composite/composite.h" #include "libcli/composite/composite.h"
#include "winbind/wb_server.h" #include "winbind/wb_server.h"
#include "smbd/service_task.h" #include "smbd/service_task.h"
@ -31,7 +33,7 @@
#include "librpc/gen_ndr/winbind.h" #include "librpc/gen_ndr/winbind.h"
struct wb_sam_logon_state { struct wb_sam_logon_state {
struct composite_context *ctx; struct tevent_context *ev;
struct winbind_SamLogon *req; struct winbind_SamLogon *req;
@ -48,77 +50,98 @@ static void wb_sam_logon_recv_samlogon(struct tevent_req *subreq);
/* /*
Find the connection to the DC (or find an existing connection) Find the connection to the DC (or find an existing connection)
*/ */
struct composite_context *wb_sam_logon_send(TALLOC_CTX *mem_ctx, struct tevent_req *wb_sam_logon_send(TALLOC_CTX *mem_ctx,
struct wbsrv_service *service, struct tevent_context *ev,
struct winbind_SamLogon *req) struct wbsrv_service *service,
struct winbind_SamLogon *_req)
{ {
struct composite_context *c, *creq; struct tevent_req *req;
struct wb_sam_logon_state *s; struct wb_sam_logon_state *state;
struct composite_context *csubreq;
c = composite_create(mem_ctx, service->task->event_ctx); req = tevent_req_create(mem_ctx, &state,
if (!c) return NULL; struct wb_sam_logon_state);
if (req == NULL) {
return NULL;
}
state->ev = ev;
state->req = _req;
s = talloc_zero(c, struct wb_sam_logon_state); csubreq = wb_sid2domain_send(state, service, service->primary_sid);
if (composite_nomem(s, c)) return c; if (tevent_req_nomem(csubreq, req)) {
s->ctx = c; return tevent_req_post(req, ev);
s->req = req; }
csubreq->async.fn = wb_sam_logon_recv_domain;
csubreq->async.private_data = req;
c->private_data = s; return req;
creq = wb_sid2domain_send(s, service, service->primary_sid);
composite_continue(c, creq, wb_sam_logon_recv_domain, s);
return c;
} }
/* /*
Having finished making the connection to the DC Having finished making the connection to the DC
Send of a SamLogon request to authenticate a user. Send of a SamLogon request to authenticate a user.
*/ */
static void wb_sam_logon_recv_domain(struct composite_context *creq) static void wb_sam_logon_recv_domain(struct composite_context *csubreq)
{ {
struct wb_sam_logon_state *s = talloc_get_type(creq->async.private_data, struct tevent_req *req =
struct wb_sam_logon_state); talloc_get_type_abort(csubreq->async.private_data,
struct tevent_req);
struct wb_sam_logon_state *state =
tevent_req_data(req,
struct wb_sam_logon_state);
struct wbsrv_domain *domain; struct wbsrv_domain *domain;
struct tevent_req *subreq; struct tevent_req *subreq;
NTSTATUS status;
s->ctx->status = wb_sid2domain_recv(creq, &domain); status = wb_sid2domain_recv(csubreq, &domain);
if (!composite_is_ok(s->ctx)) return; if (tevent_req_nterror(req, status)) {
return;
}
s->creds_state = cli_credentials_get_netlogon_creds(domain->libnet_ctx->cred); state->creds_state = cli_credentials_get_netlogon_creds(domain->libnet_ctx->cred);
netlogon_creds_client_authenticator(s->creds_state, &s->auth1); netlogon_creds_client_authenticator(state->creds_state, &state->auth1);
s->r.in.server_name = talloc_asprintf(s, "\\\\%s", state->r.in.server_name = talloc_asprintf(state, "\\\\%s",
dcerpc_server_name(domain->netlogon_pipe)); dcerpc_server_name(domain->netlogon_pipe));
if (composite_nomem(s->r.in.server_name, s->ctx)) return; if (tevent_req_nomem(state->r.in.server_name, req)) {
return;
s->r.in.computer_name = cli_credentials_get_workstation(domain->libnet_ctx->cred); }
s->r.in.credential = &s->auth1;
s->r.in.return_authenticator = &s->auth2;
s->r.in.logon_level = s->req->in.logon_level;
s->r.in.logon = &s->req->in.logon;
s->r.in.validation_level = s->req->in.validation_level;
s->r.out.return_authenticator = NULL;
s->r.out.validation = talloc(s, union netr_Validation);
if (composite_nomem(s->r.out.validation, s->ctx)) return;
s->r.out.authoritative = talloc(s, uint8_t);
if (composite_nomem(s->r.out.authoritative, s->ctx)) return;
state->r.in.computer_name = cli_credentials_get_workstation(domain->libnet_ctx->cred);
state->r.in.credential = &state->auth1;
state->r.in.return_authenticator = &state->auth2;
state->r.in.logon_level = state->req->in.logon_level;
state->r.in.logon = &state->req->in.logon;
state->r.in.validation_level = state->req->in.validation_level;
state->r.out.return_authenticator = NULL;
state->r.out.validation = talloc(state, union netr_Validation);
if (tevent_req_nomem(state->r.out.validation, req)) {
return;
}
state->r.out.authoritative = talloc(state, uint8_t);
if (tevent_req_nomem(state->r.out.authoritative, req)) {
return;
}
/* /*
* use a new talloc context for the LogonSamLogon call * use a new talloc context for the LogonSamLogon call
* because then we can just to a talloc_steal on this context * because then we can just to a talloc_steal on this context
* in the final _recv() function to give the caller all the content of * in the final _recv() function to give the caller all the content of
* the s->r.out.validation * the state->r.out.validation
*/ */
s->r_mem_ctx = talloc_new(s); state->r_mem_ctx = talloc_new(state);
if (composite_nomem(s->r_mem_ctx, s->ctx)) return; if (tevent_req_nomem(state->r_mem_ctx, req)) {
return;
}
subreq = dcerpc_netr_LogonSamLogon_r_send(s, subreq = dcerpc_netr_LogonSamLogon_r_send(state,
s->ctx->event_ctx, state->ev,
domain->netlogon_pipe->binding_handle, domain->netlogon_pipe->binding_handle,
&s->r); &state->r);
if (composite_nomem(subreq, s->ctx)) return; if (tevent_req_nomem(subreq, req)) {
tevent_req_set_callback(subreq, wb_sam_logon_recv_samlogon, s); return;
}
tevent_req_set_callback(subreq, wb_sam_logon_recv_samlogon, req);
} }
/* /*
@ -128,48 +151,66 @@ static void wb_sam_logon_recv_domain(struct composite_context *creq)
*/ */
static void wb_sam_logon_recv_samlogon(struct tevent_req *subreq) static void wb_sam_logon_recv_samlogon(struct tevent_req *subreq)
{ {
struct wb_sam_logon_state *s = tevent_req_callback_data(subreq, struct tevent_req *req =
struct wb_sam_logon_state); tevent_req_callback_data(subreq,
struct tevent_req);
struct wb_sam_logon_state *state =
tevent_req_data(req,
struct wb_sam_logon_state);
NTSTATUS status;
bool ok;
s->ctx->status = dcerpc_netr_LogonSamLogon_r_recv(subreq, s->r_mem_ctx); status = dcerpc_netr_LogonSamLogon_r_recv(subreq, state->r_mem_ctx);
TALLOC_FREE(subreq); TALLOC_FREE(subreq);
if (!composite_is_ok(s->ctx)) return; if (tevent_req_nterror(req, status)) {
return;
}
s->ctx->status = s->r.out.result; if (tevent_req_nterror(req, state->r.out.result)) {
if (!composite_is_ok(s->ctx)) return; return;
}
if ((s->r.out.return_authenticator == NULL) || if (state->r.out.return_authenticator == NULL) {
(!netlogon_creds_client_check(s->creds_state, tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
&s->r.out.return_authenticator->cred))) { return;
}
ok = netlogon_creds_client_check(state->creds_state,
&state->r.out.return_authenticator->cred);
if (!ok) {
DEBUG(0, ("Credentials check failed!\n")); DEBUG(0, ("Credentials check failed!\n"));
composite_error(s->ctx, NT_STATUS_ACCESS_DENIED); tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
return; return;
} }
/* Decrypt the session keys before we reform the info3, so the /* Decrypt the session keys before we reform the info3, so the
* person on the other end of winbindd pipe doesn't have to. * person on the other end of winbindd pipe doesn't have to.
* They won't have the encryption key anyway */ * They won't have the encryption key anyway */
netlogon_creds_decrypt_samlogon(s->creds_state, netlogon_creds_decrypt_samlogon(state->creds_state,
s->r.in.validation_level, state->r.in.validation_level,
s->r.out.validation); state->r.out.validation);
composite_done(s->ctx); tevent_req_done(req);
} }
NTSTATUS wb_sam_logon_recv(struct composite_context *c, NTSTATUS wb_sam_logon_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
struct winbind_SamLogon *req) struct winbind_SamLogon *_req)
{ {
struct wb_sam_logon_state *s = talloc_get_type(c->private_data, struct wb_sam_logon_state *state =
struct wb_sam_logon_state); tevent_req_data(req,
NTSTATUS status = composite_wait(c); struct wb_sam_logon_state);
NTSTATUS status;
if (NT_STATUS_IS_OK(status)) { if (tevent_req_is_nterror(req, &status)) {
talloc_steal(mem_ctx, s->r_mem_ctx); tevent_req_received(req);
req->out.validation = *s->r.out.validation; return status;
req->out.authoritative = 1;
} }
talloc_free(s); talloc_steal(mem_ctx, state->r_mem_ctx);
return status; _req->out.validation = *state->r.out.validation;
_req->out.authoritative = 1;
tevent_req_received(req);
return NT_STATUS_OK;
} }