sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3-ntlmssp Split calls to gensec plugin into prepare and start

Browse Source 
GENSEC has the concept of starting the GENSEC subsystem before starting the
actual mechansim.  Between these two stages is when most context methods
are called, to specify credentials and features.

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Andrew Bartlett 2011-07-26 10:01:39 +10:00
parent 643d05826c
commit 902df83680
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/auth/auth.c
View File

@ -462,8 +462,9 @@ static NTSTATUS make_auth_context_text_list(TALLOC_CTX *mem_ctx,
/* Look for the first module to provide a start_gensec hook, and set that if provided */
for (method = (*auth_context)->auth_method_list; method; method = method->next) {
if (method->start_gensec) {
(*auth_context)->start_gensec = method->start_gensec;
if (method->prepare_gensec && method->gensec_start_mech_by_oid) {
(*auth_context)->prepare_gensec = method->prepare_gensec;
(*auth_context)->gensec_start_mech_by_oid = method->gensec_start_mech_by_oid;
break;
}
}

14
source3/auth/auth_ntlmssp.c
View File

@ -212,14 +212,20 @@ NTSTATUS auth_ntlmssp_start(const struct tsocket_address *remote_address,
return nt_status;
}
if (auth_context->start_gensec) {
nt_status = auth_context->start_gensec(ans, GENSEC_OID_NTLMSSP, &ans->gensec_security);
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;
} else {
*auth_ntlmssp_state = ans;
return NT_STATUS_OK;
nt_status = auth_context->gensec_start_mech_by_oid(ans->gensec_security, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(nt_status)) {
TALLOC_FREE(ans);
return nt_status;
} else {
*auth_ntlmssp_state = ans;
return NT_STATUS_OK;
}
}
}

16
source3/auth/auth_samba4.c
View File

@ -97,8 +97,8 @@ static NTSTATUS check_samba4_security(const struct auth_context *auth_context,
/* Hook to allow GENSEC to handle blob-based authentication
* mechanisms, without directly linking the mechansim code */
static NTSTATUS start_gensec(TALLOC_CTX *mem_ctx, const char *oid_string,
struct gensec_security **gensec_context)
static NTSTATUS prepare_gensec(TALLOC_CTX *mem_ctx,
struct gensec_security **gensec_context)
{
NTSTATUS status;
struct loadparm_context *lp_ctx;
@ -165,15 +165,8 @@ static NTSTATUS start_gensec(TALLOC_CTX *mem_ctx, const char *oid_string,
gensec_want_feature(gensec_ctx, GENSEC_FEATURE_SESSION_KEY);
gensec_want_feature(gensec_ctx, GENSEC_FEATURE_UNIX_TOKEN);
status = gensec_start_mech_by_oid(gensec_ctx, oid_string);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("Failed to start GENSEC %s server code: %s\n",
gensec_get_name_by_oid(gensec_ctx, oid_string), nt_errstr(status)));
TALLOC_FREE(frame);
return status;
}
*gensec_context = gensec_ctx;
TALLOC_FREE(frame);
return status;
}
@ -192,7 +185,8 @@ static NTSTATUS auth_init_samba4(struct auth_context *auth_context,
}
result->name = "samba4";
result->auth = check_samba4_security;
result->start_gensec = start_gensec;
result->prepare_gensec = prepare_gensec;
result->gensec_start_mech_by_oid = gensec_start_mech_by_oid;
*auth_method = result;
return NT_STATUS_OK;

9
source3/include/auth.h
View File

@ -96,8 +96,9 @@ struct auth_context {
struct auth_serversupplied_info **server_info);
NTSTATUS (*nt_status_squash)(NTSTATUS nt_status);
NTSTATUS (*start_gensec)(TALLOC_CTX *mem_ctx, const char *oid_string,
NTSTATUS (*prepare_gensec)(TALLOC_CTX *mem_ctx,
struct gensec_security **gensec_context);
NTSTATUS (*gensec_start_mech_by_oid)(struct gensec_security *gensec_context, const char *oid_string);
};
typedef struct auth_methods
@ -119,10 +120,10 @@ typedef struct auth_methods
void **my_private_data,
TALLOC_CTX *mem_ctx);
/* Optional method allowing this module to provide a way to get a gensec context */
NTSTATUS (*start_gensec)(TALLOC_CTX *mem_ctx, const char *oid_string,
/* Optional methods allowing this module to provide a way to get a gensec context */
NTSTATUS (*prepare_gensec)(TALLOC_CTX *mem_ctx,
struct gensec_security **gensec_context);
NTSTATUS (*gensec_start_mech_by_oid)(struct gensec_security *gensec_context, const char *oid_string);
/* Used to keep tabs on things like the cli for SMB server authentication */
void *private_data;