From 138121c51638634639dd264f514bbbb84bcf2f60 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 5 Jan 2012 17:15:14 +0100 Subject: s3-libsmb: split out auth_generic client functions into auth_generic.c Signed-off-by: Stefan Metzmacher --- source3/Makefile.in | 1 + source3/include/auth_generic.h | 2 + source3/libsmb/auth_generic.c | 154 +++++++++++++++++++++++++++++++++++++++++ source3/libsmb/ntlmssp_wrap.c | 129 +--------------------------------- source3/wscript_build | 7 +- 5 files changed, 164 insertions(+), 129 deletions(-) create mode 100644 source3/libsmb/auth_generic.c diff --git a/source3/Makefile.in b/source3/Makefile.in index a6324b0171..c3dbd31e8e 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -555,6 +555,7 @@ LIBSMB_OBJ0 = \ ../libcli/auth/ntlm_check.o \ libsmb/ntlmssp.o \ libsmb/ntlmssp_wrap.o \ + libsmb/auth_generic.o \ ../auth/gensec/gensec.o \ ../auth/gensec/gensec_start.o \ ../auth/gensec/gensec_util.o \ diff --git a/source3/include/auth_generic.h b/source3/include/auth_generic.h index faea6106ad..96b07cd8f7 100644 --- a/source3/include/auth_generic.h +++ b/source3/include/auth_generic.h @@ -45,4 +45,6 @@ NTSTATUS auth_generic_client_start_by_authtype(struct auth_generic_state *ans, uint8_t auth_type, uint8_t auth_level); +extern const struct gensec_security_ops gensec_ntlmssp3_client_ops; + #endif /* _AUTH_GENERIC_ */ diff --git a/source3/libsmb/auth_generic.c b/source3/libsmb/auth_generic.c new file mode 100644 index 0000000000..42669f7232 --- /dev/null +++ b/source3/libsmb/auth_generic.c @@ -0,0 +1,154 @@ +/* + NLTMSSP wrappers + + Copyright (C) Andrew Tridgell 2001 + Copyright (C) Andrew Bartlett 2001-2003,2011 + + 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 . +*/ + +#include "includes.h" +#include "auth/ntlmssp/ntlmssp.h" +#include "auth_generic.h" +#include "auth/gensec/gensec.h" +#include "auth/credentials/credentials.h" +#include "librpc/rpc/dcerpc.h" +#include "lib/param/param.h" + +NTSTATUS auth_generic_set_username(struct auth_generic_state *ans, + const char *user) +{ + cli_credentials_set_username(ans->credentials, user, CRED_SPECIFIED); + return NT_STATUS_OK; +} + +NTSTATUS auth_generic_set_domain(struct auth_generic_state *ans, + const char *domain) +{ + cli_credentials_set_domain(ans->credentials, domain, CRED_SPECIFIED); + return NT_STATUS_OK; +} + +NTSTATUS auth_generic_set_password(struct auth_generic_state *ans, + const char *password) +{ + cli_credentials_set_password(ans->credentials, password, CRED_SPECIFIED); + return NT_STATUS_OK; +} + +NTSTATUS auth_generic_client_prepare(TALLOC_CTX *mem_ctx, struct auth_generic_state **auth_generic_state) +{ + struct auth_generic_state *ans; + NTSTATUS nt_status; + + struct gensec_settings *gensec_settings; + struct loadparm_context *lp_ctx; + + ans = talloc_zero(mem_ctx, struct auth_generic_state); + if (!ans) { + DEBUG(0,("auth_generic_start: talloc failed!\n")); + return NT_STATUS_NO_MEMORY; + } + + lp_ctx = loadparm_init_s3(ans, loadparm_s3_context()); + if (lp_ctx == NULL) { + DEBUG(10, ("loadparm_init_s3 failed\n")); + TALLOC_FREE(ans); + return NT_STATUS_INVALID_SERVER_STATE; + } + + gensec_settings = lpcfg_gensec_settings(ans, lp_ctx); + if (lp_ctx == NULL) { + DEBUG(10, ("lpcfg_gensec_settings failed\n")); + TALLOC_FREE(ans); + return NT_STATUS_NO_MEMORY; + } + + gensec_settings->backends = talloc_zero_array(gensec_settings, struct gensec_security_ops *, 2); + if (gensec_settings->backends == NULL) { + TALLOC_FREE(ans); + return NT_STATUS_NO_MEMORY; + } + + gensec_settings->backends[0] = &gensec_ntlmssp3_client_ops; + + nt_status = gensec_client_start(ans, &ans->gensec_security, gensec_settings); + + if (!NT_STATUS_IS_OK(nt_status)) { + TALLOC_FREE(ans); + return nt_status; + } + + ans->credentials = cli_credentials_init(ans); + if (!ans->credentials) { + TALLOC_FREE(ans); + return NT_STATUS_NO_MEMORY; + } + + cli_credentials_guess(ans->credentials, lp_ctx); + + talloc_unlink(ans, lp_ctx); + talloc_unlink(ans, gensec_settings); + + *auth_generic_state = ans; + return NT_STATUS_OK; +} + +NTSTATUS auth_generic_client_start(struct auth_generic_state *ans, const char *oid) +{ + NTSTATUS status; + + /* Transfer the credentials to gensec */ + status = gensec_set_credentials(ans->gensec_security, ans->credentials); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(1, ("Failed to set GENSEC credentials: %s\n", + nt_errstr(status))); + return status; + } + talloc_unlink(ans, ans->credentials); + ans->credentials = NULL; + + status = gensec_start_mech_by_oid(ans->gensec_security, + oid); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + return NT_STATUS_OK; +} + +NTSTATUS auth_generic_client_start_by_authtype(struct auth_generic_state *ans, + uint8_t auth_type, + uint8_t auth_level) +{ + NTSTATUS status; + + /* Transfer the credentials to gensec */ + status = gensec_set_credentials(ans->gensec_security, ans->credentials); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(1, ("Failed to set GENSEC credentials: %s\n", + nt_errstr(status))); + return status; + } + talloc_unlink(ans, ans->credentials); + ans->credentials = NULL; + + status = gensec_start_mech_by_authtype(ans->gensec_security, + auth_type, auth_level); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + return NT_STATUS_OK; +} diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c index 36508129ae..1dda3fb3e4 100644 --- a/source3/libsmb/ntlmssp_wrap.c +++ b/source3/libsmb/ntlmssp_wrap.c @@ -26,27 +26,6 @@ #include "librpc/rpc/dcerpc.h" #include "lib/param/param.h" -NTSTATUS auth_generic_set_username(struct auth_generic_state *ans, - const char *user) -{ - cli_credentials_set_username(ans->credentials, user, CRED_SPECIFIED); - return NT_STATUS_OK; -} - -NTSTATUS auth_generic_set_domain(struct auth_generic_state *ans, - const char *domain) -{ - cli_credentials_set_domain(ans->credentials, domain, CRED_SPECIFIED); - return NT_STATUS_OK; -} - -NTSTATUS auth_generic_set_password(struct auth_generic_state *ans, - const char *password) -{ - cli_credentials_set_password(ans->credentials, password, CRED_SPECIFIED); - return NT_STATUS_OK; -} - static NTSTATUS gensec_ntlmssp3_client_update(struct gensec_security *gensec_security, TALLOC_CTX *out_mem_ctx, struct tevent_context *ev, @@ -132,7 +111,7 @@ static const char *gensec_ntlmssp3_client_oids[] = { NULL }; -static const struct gensec_security_ops gensec_ntlmssp3_client_ops = { +const struct gensec_security_ops gensec_ntlmssp3_client_ops = { .name = "ntlmssp3_client", .sasl_name = GENSEC_SASL_NAME_NTLMSSP, /* "NTLM" */ .auth_type = DCERPC_AUTH_TYPE_NTLMSSP, @@ -152,109 +131,3 @@ static const struct gensec_security_ops gensec_ntlmssp3_client_ops = { .enabled = true, .priority = GENSEC_NTLMSSP }; - -NTSTATUS auth_generic_client_prepare(TALLOC_CTX *mem_ctx, struct auth_generic_state **auth_generic_state) -{ - struct auth_generic_state *ans; - NTSTATUS nt_status; - - struct gensec_settings *gensec_settings; - struct loadparm_context *lp_ctx; - - ans = talloc_zero(mem_ctx, struct auth_generic_state); - if (!ans) { - DEBUG(0,("auth_generic_start: talloc failed!\n")); - return NT_STATUS_NO_MEMORY; - } - - lp_ctx = loadparm_init_s3(ans, loadparm_s3_context()); - if (lp_ctx == NULL) { - DEBUG(10, ("loadparm_init_s3 failed\n")); - TALLOC_FREE(ans); - return NT_STATUS_INVALID_SERVER_STATE; - } - - gensec_settings = lpcfg_gensec_settings(ans, lp_ctx); - if (lp_ctx == NULL) { - DEBUG(10, ("lpcfg_gensec_settings failed\n")); - TALLOC_FREE(ans); - return NT_STATUS_NO_MEMORY; - } - - gensec_settings->backends = talloc_zero_array(gensec_settings, struct gensec_security_ops *, 2); - if (gensec_settings->backends == NULL) { - TALLOC_FREE(ans); - return NT_STATUS_NO_MEMORY; - } - - gensec_settings->backends[0] = &gensec_ntlmssp3_client_ops; - - nt_status = gensec_client_start(ans, &ans->gensec_security, gensec_settings); - - if (!NT_STATUS_IS_OK(nt_status)) { - TALLOC_FREE(ans); - return nt_status; - } - - ans->credentials = cli_credentials_init(ans); - if (!ans->credentials) { - TALLOC_FREE(ans); - return NT_STATUS_NO_MEMORY; - } - - cli_credentials_guess(ans->credentials, lp_ctx); - - talloc_unlink(ans, lp_ctx); - talloc_unlink(ans, gensec_settings); - - *auth_generic_state = ans; - return NT_STATUS_OK; -} - -NTSTATUS auth_generic_client_start(struct auth_generic_state *ans, const char *oid) -{ - NTSTATUS status; - - /* Transfer the credentials to gensec */ - status = gensec_set_credentials(ans->gensec_security, ans->credentials); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(1, ("Failed to set GENSEC credentials: %s\n", - nt_errstr(status))); - return status; - } - talloc_unlink(ans, ans->credentials); - ans->credentials = NULL; - - status = gensec_start_mech_by_oid(ans->gensec_security, - oid); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - - return NT_STATUS_OK; -} - -NTSTATUS auth_generic_client_start_by_authtype(struct auth_generic_state *ans, - uint8_t auth_type, - uint8_t auth_level) -{ - NTSTATUS status; - - /* Transfer the credentials to gensec */ - status = gensec_set_credentials(ans->gensec_security, ans->credentials); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(1, ("Failed to set GENSEC credentials: %s\n", - nt_errstr(status))); - return status; - } - talloc_unlink(ans, ans->credentials); - ans->credentials = NULL; - - status = gensec_start_mech_by_authtype(ans->gensec_security, - auth_type, auth_level); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - - return NT_STATUS_OK; -} diff --git a/source3/wscript_build b/source3/wscript_build index c6f7424067..12e6fb9195 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -815,9 +815,14 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP', deps='LIBSMB_ERR NDR_NTLMSSP NTLMSSP_COMMON gensec', vars=locals()) +bld.SAMBA3_SUBSYSTEM('auth_generic', + source='libsmb/auth_generic.c', + deps='LIBNTLMSSP gensec', + vars=locals()) + bld.SAMBA3_LIBRARY('libsmb', source=LIBSMB_SRC, - deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT cli_smb_common util_cmdline tevent', + deps='LIBNTLMSSP auth_generic CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT cli_smb_common util_cmdline tevent', vars=locals(), private_library=True) -- cgit