diff options
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/auth/auth_generic.c | 189 | ||||
| -rw-r--r-- | source3/auth/auth_ntlmssp.c | 158 | ||||
| -rw-r--r-- | source3/auth/wscript_build | 2 | ||||
| -rw-r--r-- | source3/include/ntlmssp_wrap.h | 2 |
5 files changed, 194 insertions, 159 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index cf7c5aeafe..1abf96ec1e 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -908,7 +908,7 @@ AUTH_OBJ = auth/auth.o @AUTH_STATIC@ auth/auth_util.o auth/token_util.o \ auth/user_info.o \ auth/user_util.o \ auth/user_krb5.o \ - auth/auth_compat.o auth/auth_ntlmssp.o \ + auth/auth_compat.o auth/auth_ntlmssp.o auth/auth_generic.o \ $(PLAINTEXT_AUTH_OBJ) $(SLCACHE_OBJ) $(DCUTIL_OBJ) MANGLE_OBJ = smbd/mangle.o smbd/mangle_hash.o smbd/mangle_hash2.o diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c new file mode 100644 index 0000000000..47723d57bb --- /dev/null +++ b/source3/auth/auth_generic.c @@ -0,0 +1,189 @@ +/* + Unix SMB/Netbios implementation. + Version 3.0 + handle NLTMSSP, server side + + 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 <http://www.gnu.org/licenses/>. +*/ + +#include "includes.h" +#include "auth.h" +#include "../auth/ntlmssp/ntlmssp.h" +#include "ntlmssp_wrap.h" +#include "../librpc/gen_ndr/netlogon.h" +#include "../librpc/gen_ndr/dcerpc.h" +#include "../lib/tsocket/tsocket.h" +#include "auth/gensec/gensec.h" +#include "librpc/rpc/dcerpc.h" +#include "lib/param/param.h" + +NTSTATUS auth_generic_prepare(const struct tsocket_address *remote_address, + struct auth_generic_state **auth_ntlmssp_state) +{ + struct auth_context *auth_context; + struct auth_generic_state *ans; + NTSTATUS nt_status; + + ans = talloc_zero(NULL, struct auth_generic_state); + if (!ans) { + DEBUG(0,("auth_ntlmssp_start: talloc failed!\n")); + return NT_STATUS_NO_MEMORY; + } + + nt_status = make_auth_context_subsystem(talloc_tos(), &auth_context); + if (!NT_STATUS_IS_OK(nt_status)) { + TALLOC_FREE(ans); + return nt_status; + } + + ans->auth_context = talloc_steal(ans, auth_context); + + if (auth_context->prepare_gensec) { + nt_status = auth_context->prepare_gensec(ans, + &ans->gensec_security); + if (!NT_STATUS_IS_OK(nt_status)) { + TALLOC_FREE(ans); + return nt_status; + } + *auth_ntlmssp_state = ans; + return NT_STATUS_OK; + } else { + struct gensec_settings *gensec_settings; + struct loadparm_context *lp_ctx; + + 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; + } + + nt_status = gensec_server_start(ans, gensec_settings, + NULL, &ans->gensec_security); + + if (!NT_STATUS_IS_OK(nt_status)) { + TALLOC_FREE(ans); + return nt_status; + } + talloc_unlink(ans, lp_ctx); + talloc_unlink(ans, gensec_settings); + } + + nt_status = gensec_set_remote_address(ans->gensec_security, + remote_address); + if (!NT_STATUS_IS_OK(nt_status)) { + TALLOC_FREE(ans); + return nt_status; + } + + *auth_ntlmssp_state = ans; + return NT_STATUS_OK; +} + +NTSTATUS auth_generic_start(struct auth_generic_state *auth_ntlmssp_state, const char *oid) +{ + struct gensec_ntlmssp_context *gensec_ntlmssp; + NTSTATUS status; + + if (auth_ntlmssp_state->auth_context->gensec_start_mech_by_oid) { + return auth_ntlmssp_state->auth_context->gensec_start_mech_by_oid( + auth_ntlmssp_state->gensec_security, oid); + } + + if (strcmp(oid, GENSEC_OID_NTLMSSP) != 0) { + return NT_STATUS_NOT_IMPLEMENTED; + } + + status = gensec_start_mech_by_ops(auth_ntlmssp_state->gensec_security, + &gensec_ntlmssp3_server_ops); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + gensec_ntlmssp = + talloc_get_type_abort(auth_ntlmssp_state->gensec_security->private_data, + struct gensec_ntlmssp_context); + + gensec_ntlmssp->auth_context = talloc_move(gensec_ntlmssp, &auth_ntlmssp_state->auth_context); + + return NT_STATUS_OK; +} + +NTSTATUS auth_generic_authtype_start(struct auth_generic_state *auth_ntlmssp_state, + uint8_t auth_type, uint8_t auth_level) +{ + struct gensec_ntlmssp_context *gensec_ntlmssp; + NTSTATUS status; + + if (auth_ntlmssp_state->auth_context->gensec_start_mech_by_authtype) { + return auth_ntlmssp_state->auth_context->gensec_start_mech_by_authtype( + auth_ntlmssp_state->gensec_security, + auth_type, auth_level); + } + + if (auth_type != DCERPC_AUTH_TYPE_NTLMSSP) { + /* The caller will then free the auth_ntlmssp_state, + * undoing what was done in auth_generic_prepare(). + * + * We can't do that logic here, as + * auth_ntlmssp_want_feature() may have been called in + * between. + */ + return NT_STATUS_NOT_IMPLEMENTED; + } + + gensec_want_feature(auth_ntlmssp_state->gensec_security, + GENSEC_FEATURE_DCE_STYLE); + gensec_want_feature(auth_ntlmssp_state->gensec_security, + GENSEC_FEATURE_ASYNC_REPLIES); + if (auth_level == DCERPC_AUTH_LEVEL_INTEGRITY) { + gensec_want_feature(auth_ntlmssp_state->gensec_security, + GENSEC_FEATURE_SIGN); + } else if (auth_level == DCERPC_AUTH_LEVEL_PRIVACY) { + gensec_want_feature(auth_ntlmssp_state->gensec_security, + GENSEC_FEATURE_SIGN); + gensec_want_feature(auth_ntlmssp_state->gensec_security, + GENSEC_FEATURE_SEAL); + } else if (auth_level == DCERPC_AUTH_LEVEL_CONNECT) { + /* Default features */ + } else { + DEBUG(2,("auth_level %d not supported in DCE/RPC authentication\n", + auth_level)); + return NT_STATUS_INVALID_PARAMETER; + } + + status = gensec_start_mech_by_ops(auth_ntlmssp_state->gensec_security, + &gensec_ntlmssp3_server_ops); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + gensec_ntlmssp = + talloc_get_type_abort(auth_ntlmssp_state->gensec_security->private_data, + struct gensec_ntlmssp_context); + + gensec_ntlmssp->auth_context = talloc_move(gensec_ntlmssp, &auth_ntlmssp_state->auth_context); + + return NT_STATUS_OK; +} diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c index 6ca6be7c89..a0deada9b8 100644 --- a/source3/auth/auth_ntlmssp.c +++ b/source3/auth/auth_ntlmssp.c @@ -210,76 +210,6 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, return nt_status; } -NTSTATUS auth_generic_prepare(const struct tsocket_address *remote_address, - struct auth_generic_state **auth_ntlmssp_state) -{ - struct auth_context *auth_context; - struct auth_generic_state *ans; - NTSTATUS nt_status; - - ans = talloc_zero(NULL, struct auth_generic_state); - if (!ans) { - DEBUG(0,("auth_ntlmssp_start: talloc failed!\n")); - return NT_STATUS_NO_MEMORY; - } - - nt_status = make_auth_context_subsystem(talloc_tos(), &auth_context); - if (!NT_STATUS_IS_OK(nt_status)) { - TALLOC_FREE(ans); - return nt_status; - } - - ans->auth_context = talloc_steal(ans, auth_context); - - if (auth_context->prepare_gensec) { - nt_status = auth_context->prepare_gensec(ans, - &ans->gensec_security); - if (!NT_STATUS_IS_OK(nt_status)) { - TALLOC_FREE(ans); - return nt_status; - } - *auth_ntlmssp_state = ans; - return NT_STATUS_OK; - } else { - struct gensec_settings *gensec_settings; - struct loadparm_context *lp_ctx; - - 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; - } - - nt_status = gensec_server_start(ans, gensec_settings, - NULL, &ans->gensec_security); - - if (!NT_STATUS_IS_OK(nt_status)) { - TALLOC_FREE(ans); - return nt_status; - } - talloc_unlink(ans, lp_ctx); - talloc_unlink(ans, gensec_settings); - } - - nt_status = gensec_set_remote_address(ans->gensec_security, - remote_address); - if (!NT_STATUS_IS_OK(nt_status)) { - TALLOC_FREE(ans); - return nt_status; - } - - *auth_ntlmssp_state = ans; - return NT_STATUS_OK; -} - static NTSTATUS gensec_ntlmssp3_server_start(struct gensec_security *gensec_security) { NTSTATUS nt_status; @@ -349,7 +279,7 @@ static const char *gensec_ntlmssp3_server_oids[] = { NULL }; -static const struct gensec_security_ops gensec_ntlmssp3_server_ops = { +const struct gensec_security_ops gensec_ntlmssp3_server_ops = { .name = "ntlmssp3_server", .sasl_name = GENSEC_SASL_NAME_NTLMSSP, /* "NTLM" */ .auth_type = DCERPC_AUTH_TYPE_NTLMSSP, @@ -371,89 +301,3 @@ static const struct gensec_security_ops gensec_ntlmssp3_server_ops = { .priority = GENSEC_NTLMSSP }; -NTSTATUS auth_generic_start(struct auth_generic_state *auth_ntlmssp_state, const char *oid) -{ - struct gensec_ntlmssp_context *gensec_ntlmssp; - NTSTATUS status; - - if (auth_ntlmssp_state->auth_context->gensec_start_mech_by_oid) { - return auth_ntlmssp_state->auth_context->gensec_start_mech_by_oid( - auth_ntlmssp_state->gensec_security, oid); - } - - if (strcmp(oid, GENSEC_OID_NTLMSSP) != 0) { - return NT_STATUS_NOT_IMPLEMENTED; - } - - status = gensec_start_mech_by_ops(auth_ntlmssp_state->gensec_security, - &gensec_ntlmssp3_server_ops); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - - gensec_ntlmssp = - talloc_get_type_abort(auth_ntlmssp_state->gensec_security->private_data, - struct gensec_ntlmssp_context); - - gensec_ntlmssp->auth_context = talloc_move(gensec_ntlmssp, &auth_ntlmssp_state->auth_context); - - return NT_STATUS_OK; -} - -NTSTATUS auth_generic_authtype_start(struct auth_generic_state *auth_ntlmssp_state, - uint8_t auth_type, uint8_t auth_level) -{ - struct gensec_ntlmssp_context *gensec_ntlmssp; - NTSTATUS status; - - if (auth_ntlmssp_state->auth_context->gensec_start_mech_by_authtype) { - return auth_ntlmssp_state->auth_context->gensec_start_mech_by_authtype( - auth_ntlmssp_state->gensec_security, - auth_type, auth_level); - } - - if (auth_type != DCERPC_AUTH_TYPE_NTLMSSP) { - /* The caller will then free the auth_ntlmssp_state, - * undoing what was done in auth_generic_prepare(). - * - * We can't do that logic here, as - * auth_ntlmssp_want_feature() may have been called in - * between. - */ - return NT_STATUS_NOT_IMPLEMENTED; - } - - gensec_want_feature(auth_ntlmssp_state->gensec_security, - GENSEC_FEATURE_DCE_STYLE); - gensec_want_feature(auth_ntlmssp_state->gensec_security, - GENSEC_FEATURE_ASYNC_REPLIES); - if (auth_level == DCERPC_AUTH_LEVEL_INTEGRITY) { - gensec_want_feature(auth_ntlmssp_state->gensec_security, - GENSEC_FEATURE_SIGN); - } else if (auth_level == DCERPC_AUTH_LEVEL_PRIVACY) { - gensec_want_feature(auth_ntlmssp_state->gensec_security, - GENSEC_FEATURE_SIGN); - gensec_want_feature(auth_ntlmssp_state->gensec_security, - GENSEC_FEATURE_SEAL); - } else if (auth_level == DCERPC_AUTH_LEVEL_CONNECT) { - /* Default features */ - } else { - DEBUG(2,("auth_level %d not supported in DCE/RPC authentication\n", - auth_level)); - return NT_STATUS_INVALID_PARAMETER; - } - - status = gensec_start_mech_by_ops(auth_ntlmssp_state->gensec_security, - &gensec_ntlmssp3_server_ops); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - - gensec_ntlmssp = - talloc_get_type_abort(auth_ntlmssp_state->gensec_security->private_data, - struct gensec_ntlmssp_context); - - gensec_ntlmssp->auth_context = talloc_move(gensec_ntlmssp, &auth_ntlmssp_state->auth_context); - - return NT_STATUS_OK; -} diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build index 9fdc27d619..4894e352da 100644 --- a/source3/auth/wscript_build +++ b/source3/auth/wscript_build @@ -12,7 +12,7 @@ AUTH_NETLOGOND_SRC = 'auth_netlogond.c' AUTH_SRC = '''auth.c user_krb5.c - auth_compat.c auth_ntlmssp.c''' + auth_compat.c auth_ntlmssp.c auth_generic.c''' bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL', source='token_util.c', diff --git a/source3/include/ntlmssp_wrap.h b/source3/include/ntlmssp_wrap.h index 4d791c335a..fb98309ab9 100644 --- a/source3/include/ntlmssp_wrap.h +++ b/source3/include/ntlmssp_wrap.h @@ -23,6 +23,8 @@ struct gensec_security; +extern const struct gensec_security_ops gensec_ntlmssp3_server_ops; + struct auth_generic_state { /* used only by server implementation */ struct auth_context *auth_context; |