svn commit: samba r17342 - in branches/SAMBA_4_0/source: librpc
librpc/idl winbind
metze at samba.org
metze at samba.org
Mon Jul 31 15:38:19 GMT 2006
Author: metze
Date: 2006-07-31 15:38:18 +0000 (Mon, 31 Jul 2006)
New Revision: 17342
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17342
Log:
implement a SamLogon via IRPC in samba4's winbind
metze
Added:
branches/SAMBA_4_0/source/librpc/idl/winbind.idl
branches/SAMBA_4_0/source/winbind/wb_irpc.c
branches/SAMBA_4_0/source/winbind/wb_sam_logon.c
Modified:
branches/SAMBA_4_0/source/librpc/config.mk
branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
branches/SAMBA_4_0/source/winbind/config.mk
branches/SAMBA_4_0/source/winbind/wb_server.c
branches/SAMBA_4_0/source/winbind/wb_server.h
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk 2006-07-31 14:05:08 UTC (rev 17341)
+++ branches/SAMBA_4_0/source/librpc/config.mk 2006-07-31 15:38:18 UTC (rev 17342)
@@ -329,6 +329,13 @@
OBJ_FILES = gen_ndr/ndr_winsrepl.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
+[LIBRARY::NDR_WINBIND]
+VERSION = 0.0.1
+SO_VERSION = 0
+OBJ_FILES = gen_ndr/ndr_winbind.o
+PUBLIC_HEADERS = gen_ndr/winbind.h
+PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON
+
librpc/gen_ndr/tables.c: $(IDL_NDR_PARSE_H_FILES)
@echo Generating librpc/gen_ndr/tables.c
@$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_PARSE_H_FILES) > librpc/gen_ndr/tables.x
Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2006-07-31 14:05:08 UTC (rev 17341)
+++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2006-07-31 15:38:18 UTC (rev 17342)
@@ -118,7 +118,7 @@
netr_ChallengeResponse lm;
} netr_NetworkInfo;
- typedef [switch_type(uint16)] union {
+ typedef [public,switch_type(uint16)] union {
[case(1)] netr_PasswordInfo *password;
[case(2)] netr_NetworkInfo *network;
[case(3)] netr_PasswordInfo *password;
@@ -221,7 +221,7 @@
lsa_String unknown4;
} netr_PacInfo;
- typedef [switch_type(uint16)] union {
+ typedef [public,switch_type(uint16)] union {
[case(2)] netr_SamInfo2 *sam2;
[case(3)] netr_SamInfo3 *sam3;
[case(4)] netr_PacInfo *pac;
Added: branches/SAMBA_4_0/source/librpc/idl/winbind.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/winbind.idl 2006-07-31 14:05:08 UTC (rev 17341)
+++ branches/SAMBA_4_0/source/librpc/idl/winbind.idl 2006-07-31 15:38:18 UTC (rev 17342)
@@ -0,0 +1,40 @@
+/*
+ winbind IRPC interface
+*/
+
+#include "idl_types.h"
+
+[
+ uuid("245f3e6b-3c5d-6e21-3a2d-2a3d645b7221"),
+ version(1.0),
+ pointer_default(unique),
+ pointer_default_top(unique),
+ depends(netlogon)
+]
+
+interface winbind
+{
+ declare [switch_type(uint16)] union netr_LogonLevel;
+ declare [switch_type(uint16)] union netr_Validation;
+
+ /* a call to get runtime informations */
+ void winbind_information(/* TODO */);
+
+ /*
+ * a call to trigger some internal events,
+ * for use in torture tests...
+ */
+ NTSTATUS winbind_remote_control(/* TODO */);
+
+ /*
+ * do a netr_LogonSamLogon() against the right DC
+ */
+ NTSTATUS winbind_SamLogon(
+ [in] uint16 logon_level,
+ [in] [switch_is(logon_level)] netr_LogonLevel logon,
+ [in] uint16 validation_level,
+ [out] [switch_is(validation_level)] netr_Validation validation,
+ [out] uint8 authoritative,
+ [in,out] uint32 flags
+ );
+}
Modified: branches/SAMBA_4_0/source/winbind/config.mk
===================================================================
--- branches/SAMBA_4_0/source/winbind/config.mk 2006-07-31 14:05:08 UTC (rev 17341)
+++ branches/SAMBA_4_0/source/winbind/config.mk 2006-07-31 15:38:18 UTC (rev 17342)
@@ -8,6 +8,7 @@
PRIVATE_PROTO_HEADER = wb_proto.h
OBJ_FILES = \
wb_server.o \
+ wb_irpc.o \
wb_samba3_protocol.o \
wb_samba3_cmd.o \
wb_init_domain.o \
@@ -22,9 +23,15 @@
wb_cmd_userdomgroups.o \
wb_cmd_usersids.o \
wb_cmd_list_trustdom.o \
- wb_pam_auth.o
-PUBLIC_DEPENDENCIES = WB_HELPER RPC_NDR_LSA RPC_NDR_SAMR process_model \
- PAM_ERRORS
+ wb_pam_auth.o \
+ wb_sam_logon.o
+PUBLIC_DEPENDENCIES = \
+ WB_HELPER \
+ NDR_WINBIND \
+ process_model \
+ RPC_NDR_LSA \
+ RPC_NDR_SAMR \
+ PAM_ERRORS
# End SUBSYSTEM WINBIND
#######################
Added: branches/SAMBA_4_0/source/winbind/wb_irpc.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_irpc.c 2006-07-31 14:05:08 UTC (rev 17341)
+++ branches/SAMBA_4_0/source/winbind/wb_irpc.c 2006-07-31 15:38:18 UTC (rev 17342)
@@ -0,0 +1,86 @@
+/*
+ Unix SMB/CIFS implementation.
+ Main winbindd irpc handlers
+
+ Copyright (C) Stefan Metzmacher 2006
+
+ 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 "winbind/wb_server.h"
+#include "lib/messaging/irpc.h"
+#include "libcli/composite/composite.h"
+#include "librpc/gen_ndr/ndr_winbind.h"
+#include "smbd/service_task.h"
+
+struct wb_irpc_SamLogon_state {
+ struct irpc_message *msg;
+ struct winbind_SamLogon *req;
+};
+
+static void wb_irpc_SamLogon_callback(struct composite_context *ctx);
+
+static NTSTATUS wb_irpc_SamLogon(struct irpc_message *msg,
+ struct winbind_SamLogon *req)
+{
+ struct wbsrv_service *service = talloc_get_type(msg->private,
+ struct wbsrv_service);
+ struct wb_irpc_SamLogon_state *s;
+ struct composite_context *ctx;
+
+ DEBUG(5, ("wb_irpc_SamLogon called\n"));
+
+ s = talloc(msg, struct wb_irpc_SamLogon_state);
+ NT_STATUS_HAVE_NO_MEMORY(s);
+
+ s->msg = msg;
+ s->req = req;
+
+ ctx = wb_sam_logon_send(msg, service, req);
+ NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+ ctx->async.fn = wb_irpc_SamLogon_callback;
+ ctx->async.private_data = s;
+
+ msg->defer_reply = True;
+ return NT_STATUS_OK;
+}
+
+static void wb_irpc_SamLogon_callback(struct composite_context *ctx)
+{
+ struct wb_irpc_SamLogon_state *s = talloc_get_type(ctx->async.private_data,
+ struct wb_irpc_SamLogon_state);
+ NTSTATUS status;
+
+ DEBUG(5, ("wb_irpc_SamLogon_callback called\n"));
+
+ status = wb_sam_logon_recv(ctx, s, s->req);
+
+ irpc_send_reply(s->msg, status);
+}
+
+NTSTATUS wbsrv_init_irpc(struct wbsrv_service *service)
+{
+ NTSTATUS status;
+
+ irpc_add_name(service->task->msg_ctx, "winbind_server");
+
+ status = IRPC_REGISTER(service->task->msg_ctx, winbind, WINBIND_SAMLOGON,
+ wb_irpc_SamLogon, service);
+ NT_STATUS_NOT_OK_RETURN(status);
+
+ return NT_STATUS_OK;
+}
Added: branches/SAMBA_4_0/source/winbind/wb_sam_logon.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_sam_logon.c 2006-07-31 14:05:08 UTC (rev 17341)
+++ branches/SAMBA_4_0/source/winbind/wb_sam_logon.c 2006-07-31 15:38:18 UTC (rev 17342)
@@ -0,0 +1,168 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Do a netr_LogonSamLogon to a remote DC
+
+ Copyright (C) Volker Lendecke 2005
+ Copyright (C) Andrew Bartlett <abartlet at samba.org> 2005
+ Copyright (C) Stefan Metzmacher 2006
+
+ 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 "libcli/composite/composite.h"
+#include "winbind/wb_server.h"
+#include "smbd/service_task.h"
+#include "libcli/auth/credentials.h"
+#include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/winbind.h"
+
+struct wb_sam_logon_state {
+ struct composite_context *ctx;
+
+ struct winbind_SamLogon *req;
+
+ struct creds_CredentialState *creds_state;
+ struct netr_Authenticator auth1, auth2;
+
+ TALLOC_CTX *r_mem_ctx;
+ struct netr_LogonSamLogon r;
+};
+
+static void wb_sam_logon_recv_domain(struct composite_context *ctx);
+static void wb_sam_logon_recv_samlogon(struct rpc_request *req);
+
+/*
+ Find the connection to the DC (or find an existing connection)
+*/
+struct composite_context *wb_sam_logon_send(TALLOC_CTX *mem_ctx,
+ struct wbsrv_service *service,
+ struct winbind_SamLogon *req)
+{
+ struct composite_context *c, *creq;
+ struct wb_sam_logon_state *s;
+
+ c = composite_create(mem_ctx, service->task->event_ctx);
+ if (!c) return NULL;
+
+ s = talloc_zero(c, struct wb_sam_logon_state);
+ if (composite_nomem(s, c)) return c;
+ s->ctx = c;
+ s->req = req;
+
+ c->private_data = s;
+
+ creq = wb_sid2domain_send(s, service, service->primary_sid);
+ composite_continue(c, creq, wb_sam_logon_recv_domain, s);
+ return c;
+}
+
+/*
+ Finish the connection to the DC
+ Send of a SamLogon request to authenticate a user.
+*/
+static void wb_sam_logon_recv_domain(struct composite_context *creq)
+{
+ struct wb_sam_logon_state *s = talloc_get_type(creq->async.private_data,
+ struct wb_sam_logon_state);
+ struct rpc_request *req;
+ struct wbsrv_domain *domain;
+
+ s->ctx->status = wb_sid2domain_recv(creq, &domain);
+ if (!composite_is_ok(s->ctx)) return;
+
+ s->creds_state = cli_credentials_get_netlogon_creds(domain->schannel_creds);
+ creds_client_authenticator(s->creds_state, &s->auth1);
+
+ s->r.in.server_name = talloc_asprintf(s, "\\\\%s",
+ dcerpc_server_name(domain->netlogon_pipe));
+ if (composite_nomem(s->r.in.server_name, s->ctx)) return;
+
+ s->r.in.computer_name = cli_credentials_get_workstation(domain->schannel_creds);
+ 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;
+
+ /*
+ * use a new talloc context for the LogonSamLogon call
+ * 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
+ * the s->r.out.validation
+ */
+ s->r_mem_ctx = talloc_new(s);
+ if (composite_nomem(s->r_mem_ctx, s->ctx)) return;
+
+ req = dcerpc_netr_LogonSamLogon_send(domain->netlogon_pipe, s->r_mem_ctx, &s->r);
+ composite_continue_rpc(s->ctx, req, wb_sam_logon_recv_samlogon, s);
+}
+
+/*
+ NTLM Authentication
+
+ Check the SamLogon reply and decrypt the session keys
+*/
+static void wb_sam_logon_recv_samlogon(struct rpc_request *req)
+{
+ struct wb_sam_logon_state *s = talloc_get_type(req->async.private,
+ struct wb_sam_logon_state);
+
+ s->ctx->status = dcerpc_ndr_request_recv(req);
+ if (!composite_is_ok(s->ctx)) return;
+
+ s->ctx->status = s->r.out.result;
+ if (!composite_is_ok(s->ctx)) return;
+
+ if ((s->r.out.return_authenticator == NULL) ||
+ (!creds_client_check(s->creds_state,
+ &s->r.out.return_authenticator->cred))) {
+ DEBUG(0, ("Credentials check failed!\n"));
+ composite_error(s->ctx, NT_STATUS_ACCESS_DENIED);
+ return;
+ }
+
+ /* Decrypt the session keys before we reform the info3, so the
+ * person on the other end of winbindd pipe doesn't have to.
+ * They won't have the encryption key anyway */
+ creds_decrypt_samlogon(s->creds_state,
+ s->r.in.validation_level,
+ &s->r.out.validation);
+
+ composite_done(s->ctx);
+}
+
+NTSTATUS wb_sam_logon_recv(struct composite_context *c,
+ TALLOC_CTX *mem_ctx,
+ struct winbind_SamLogon *req)
+{
+ struct wb_sam_logon_state *s = talloc_get_type(c->private_data,
+ struct wb_sam_logon_state);
+ NTSTATUS status = composite_wait(c);
+
+ if (NT_STATUS_IS_OK(status)) {
+ talloc_steal(mem_ctx, s->r_mem_ctx);
+ req->out.validation = s->r.out.validation;
+ req->out.authoritative = 1;
+ req->out.flags = 0;
+ }
+
+ talloc_free(s);
+ return status;
+}
Modified: branches/SAMBA_4_0/source/winbind/wb_server.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_server.c 2006-07-31 14:05:08 UTC (rev 17341)
+++ branches/SAMBA_4_0/source/winbind/wb_server.c 2006-07-31 15:38:18 UTC (rev 17342)
@@ -177,6 +177,9 @@
listen_socket);
if (!NT_STATUS_IS_OK(status)) goto listen_failed;
+ status = wbsrv_init_irpc(service);
+ if (!NT_STATUS_IS_OK(status)) goto irpc_failed;
+
return;
listen_failed:
@@ -184,6 +187,11 @@
listen_socket->socket_path, nt_errstr(status)));
task_server_terminate(task, nt_errstr(status));
return;
+irpc_failed:
+ DEBUG(0,("wbsrv_init_irpc() failed - %s\n",
+ nt_errstr(status)));
+ task_server_terminate(task, nt_errstr(status));
+ return;
nomem:
task_server_terminate(task, nt_errstr(NT_STATUS_NO_MEMORY));
return;
Modified: branches/SAMBA_4_0/source/winbind/wb_server.h
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_server.h 2006-07-31 14:05:08 UTC (rev 17341)
+++ branches/SAMBA_4_0/source/winbind/wb_server.h 2006-07-31 15:38:18 UTC (rev 17342)
@@ -145,6 +145,7 @@
struct netr_LMSessionKey;
struct netr_UserSessionKey;
+struct winbind_SamLogon;
#include "winbind/wb_async_helpers.h"
#include "winbind/wb_proto.h"
More information about the samba-cvs
mailing list