X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=plugins%2Fgs2.c;h=3304968942d14de02d0da6b5bb10428d014b604a;hb=f0bbf08a25286e6af9c806164e6366699cb7862b;hp=98039d8f4081b549aced1dd0b78949476fad9bc0;hpb=91445422e7343fdcbf658eba841a4e28f8e744e8;p=cyrus-sasl.git diff --git a/plugins/gs2.c b/plugins/gs2.c index 98039d8..3304968 100644 --- a/plugins/gs2.c +++ b/plugins/gs2.c @@ -128,11 +128,10 @@ typedef struct context { static gss_OID_set gs2_mechs = GSS_C_NO_OID_SET; -static int gs2_ask_user_info(context_t *context, - sasl_client_params_t *params, - char **realms, int nrealm, - sasl_interact_t **prompt_need, - sasl_out_params_t *oparams); +static int gs2_get_init_creds(context_t *context, + sasl_client_params_t *params, + sasl_interact_t **prompt_need, + sasl_out_params_t *oparams); static int gs2_verify_initial_message(context_t *text, sasl_server_params_t *sparams, @@ -156,7 +155,8 @@ static int gs2_make_message(context_t *text, static int gs2_get_mech_attrs(const sasl_utils_t *utils, const gss_OID mech, unsigned int *security_flags, - unsigned int *features); + unsigned int *features, + const unsigned long **prompts); static int gs2_indicate_mechs(const sasl_utils_t *utils); @@ -245,11 +245,6 @@ sasl_gs2_free_context_contents(context_t *text) text->authzid = NULL; } - if (text->mechanism != NULL) { - gss_release_oid(&min_stat, &text->mechanism); - text->mechanism = GSS_C_NO_OID; - } - gss_release_buffer(&min_stat, &text->gss_cbindings.application_data); if (text->out_buf != NULL) { @@ -345,7 +340,6 @@ gs2_server_mech_step(void *conn_context, gss_buffer_desc short_name_buf = GSS_C_EMPTY_BUFFER; gss_name_t without = GSS_C_NO_NAME; gss_OID_set_desc mechs; - gss_OID actual_mech = GSS_C_NO_OID; OM_uint32 out_flags = 0; int ret = 0, equal = 0; int initialContextToken = (text->gss_ctx == GSS_C_NO_CONTEXT); @@ -417,7 +411,7 @@ gs2_server_mech_step(void *conn_context, &input_token, &text->gss_cbindings, &text->client_name, - &actual_mech, + NULL, &output_token, &out_flags, &text->lifetime, @@ -426,7 +420,7 @@ gs2_server_mech_step(void *conn_context, sasl_gs2_log(text->utils, maj_stat, min_stat); text->utils->seterror(text->utils->conn, SASL_NOLOG, "GS2 Failure: gss_accept_sec_context"); - ret = SASL_BADAUTH; + ret = (maj_stat == GSS_S_BAD_BINDINGS) ? SASL_BADBINDING : SASL_BADAUTH; goto cleanup; } @@ -451,10 +445,6 @@ gs2_server_mech_step(void *conn_context, assert(maj_stat == GSS_S_COMPLETE); - if (!g_OID_equal(text->mechanism, actual_mech)) { - ret = SASL_WRONGMECH; - goto cleanup; - } if ((out_flags & GSS_C_SEQUENCE_FLAG) == 0) { ret = SASL_BADAUTH; goto cleanup; @@ -478,14 +468,14 @@ gs2_server_mech_step(void *conn_context, GSS_C_NT_USER_NAME, &without); if (GSS_ERROR(maj_stat)) { - ret = SASL_BADAUTH; + ret = SASL_FAIL; goto cleanup; } maj_stat = gss_compare_name(&min_stat, text->client_name, without, &equal); if (GSS_ERROR(maj_stat)) { - ret = SASL_BADAUTH; + ret = SASL_FAIL; goto cleanup; } @@ -549,7 +539,6 @@ cleanup: gss_release_buffer(&min_stat, &short_name_buf); gss_release_buffer(&min_stat, &output_token); gss_release_name(&min_stat, &without); - gss_release_oid(&min_stat, &actual_mech); if (ret == SASL_OK && maj_stat != GSS_S_COMPLETE) { sasl_gs2_seterror(text->utils, maj_stat, min_stat); @@ -634,7 +623,8 @@ gs2_server_plug_alloc(const sasl_utils_t *utils, ret = gs2_get_mech_attrs(utils, mech, &splug->security_flags, - &splug->features); + &splug->features, + NULL); if (ret != SASL_OK) return ret; @@ -705,7 +695,6 @@ static int gs2_client_mech_step(void *conn_context, gss_buffer_desc name_buf = GSS_C_EMPTY_BUFFER; OM_uint32 maj_stat = GSS_S_FAILURE, min_stat = 0; OM_uint32 req_flags, ret_flags; - gss_OID actual_mech = GSS_C_NO_OID; int ret = SASL_FAIL; int initialContextToken; @@ -713,45 +702,10 @@ static int gs2_client_mech_step(void *conn_context, *clientoutlen = 0; if (text->gss_ctx == GSS_C_NO_CONTEXT) { - ret = gs2_ask_user_info(text, params, NULL, 0, prompt_need, oparams); + ret = gs2_get_init_creds(text, params, prompt_need, oparams); if (ret != SASL_OK) goto cleanup; - if (params->gss_creds == GSS_C_NO_CREDENTIAL && - text->password != NULL && text->password->len != 0) { - gss_buffer_desc password_buf; - gss_buffer_desc name_buf; - gss_OID_set_desc mechs; - - name_buf.length = strlen(oparams->authid); - name_buf.value = (void *)oparams->authid; - - password_buf.length = text->password->len; - password_buf.value = text->password->data; - - mechs.count = 1; - mechs.elements = (gss_OID)text->mechanism; - - maj_stat = gss_import_name(&min_stat, - &name_buf, - GSS_C_NT_USER_NAME, - &text->client_name); - if (GSS_ERROR(maj_stat)) - goto cleanup; - - maj_stat = gss_acquire_cred_with_password(&min_stat, - text->client_name, - &password_buf, - GSS_C_INDEFINITE, - &mechs, - GSS_C_INITIATE, - &text->client_creds, - NULL, - &text->lifetime); - if (GSS_ERROR(maj_stat)) - goto cleanup; - } - initialContextToken = 1; } else initialContextToken = 0; @@ -773,10 +727,10 @@ static int gs2_client_mech_step(void *conn_context, snprintf(name_buf.value, name_buf.length + 1, "%s@%s", params->service, params->serverFQDN); - maj_stat = gss_import_name (&min_stat, - &name_buf, - GSS_C_NT_HOSTBASED_SERVICE, - &text->server_name); + maj_stat = gss_import_name(&min_stat, + &name_buf, + GSS_C_NT_HOSTBASED_SERVICE, + &text->server_name); params->utils->free(name_buf.value); name_buf.value = NULL; @@ -858,17 +812,13 @@ static int gs2_client_mech_step(void *conn_context, &text->client_name, NULL, &text->lifetime, - &actual_mech, + NULL, &ret_flags, /* flags */ NULL, NULL); if (GSS_ERROR(maj_stat)) goto cleanup; - if (!g_OID_equal(text->mechanism, actual_mech)) { - ret = SASL_WRONGMECH; - goto cleanup; - } if ((ret_flags & req_flags) != req_flags) { maj_stat = SASL_BADAUTH; goto cleanup; @@ -892,7 +842,6 @@ static int gs2_client_mech_step(void *conn_context, cleanup: gss_release_buffer(&min_stat, &output_token); gss_release_buffer(&min_stat, &name_buf); - gss_release_oid(&min_stat, &actual_mech); if (ret == SASL_OK && maj_stat != GSS_S_COMPLETE) { sasl_gs2_seterror(text->utils, maj_stat, min_stat); @@ -935,10 +884,6 @@ static int gs2_client_mech_new(void *glob_context, return SASL_OK; } -static const unsigned long gs2_required_prompts[] = { - SASL_CB_LIST_END -}; - static int gs2_client_plug_alloc(const sasl_utils_t *utils, void *plug, @@ -953,7 +898,8 @@ gs2_client_plug_alloc(const sasl_utils_t *utils, ret = gs2_get_mech_attrs(utils, mech, &cplug->security_flags, - &cplug->features); + &cplug->features, + &cplug->required_prompts); if (ret != SASL_OK) return ret; @@ -968,7 +914,6 @@ gs2_client_plug_alloc(const sasl_utils_t *utils, cplug->mech_step = gs2_client_mech_step; cplug->mech_dispose = gs2_common_mech_dispose; cplug->mech_free = gs2_common_mech_free; - cplug->required_prompts = gs2_required_prompts; return SASL_OK; } @@ -1061,7 +1006,7 @@ gs2_save_cbindings(context_t *text, return SASL_OK; } -#define CHECK_REMAIN(n) do { if (remain < (n)) return SASL_BADAUTH; } while (0) +#define CHECK_REMAIN(n) do { if (remain < (n)) return SASL_BADPROT; } while (0) /* * Verify gs2-header, save authzid and channel bindings to context. @@ -1102,7 +1047,7 @@ gs2_verify_initial_message(context_t *text, CHECK_REMAIN(1); /* = */ remain--; if (*p++ != '=') - return SASL_BADAUTH; + return SASL_BADPROT; ret = gs2_unescape_authzid(text->utils, &p, &remain, &text->cbindingname); if (ret != SASL_OK) @@ -1121,7 +1066,7 @@ gs2_verify_initial_message(context_t *text, CHECK_REMAIN(1); /* , */ remain--; if (*p++ != ',') - return SASL_BADAUTH; + return SASL_BADPROT; /* authorization identity */ if (remain > 1 && memcmp(p, "a=", 2) == 0) { @@ -1138,7 +1083,7 @@ gs2_verify_initial_message(context_t *text, CHECK_REMAIN(1); /* , */ remain--; if (*p++ != ',') - return SASL_BADAUTH; + return SASL_BADPROT; buf.length = inlen - remain; buf.value = (void *)in; @@ -1325,6 +1270,10 @@ gs2_make_message(context_t *text, return SASL_OK; } +static const unsigned long gs2_required_prompts[] = { + SASL_CB_LIST_END +}; + /* * Map GSS mechanism attributes to SASL ones */ @@ -1332,10 +1281,11 @@ static int gs2_get_mech_attrs(const sasl_utils_t *utils, const gss_OID mech, unsigned int *security_flags, - unsigned int *features) + unsigned int *features, + const unsigned long **prompts) { OM_uint32 major, minor; - int present, ret; + int present; gss_OID_set attrs = GSS_C_NO_OID_SET; major = gss_inquire_attrs_for_mech(&minor, mech, &attrs, NULL); @@ -1347,13 +1297,13 @@ gs2_get_mech_attrs(const sasl_utils_t *utils, *security_flags = SASL_SEC_NOPLAINTEXT | SASL_SEC_NOACTIVE; *features = SASL_FEAT_WANT_CLIENT_FIRST | SASL_FEAT_CHANNEL_BINDING; + if (prompts != NULL) + *prompts = gs2_required_prompts; #define MA_PRESENT(a) (gss_test_oid_set_member(&minor, (gss_OID)(a), \ attrs, &present) == GSS_S_COMPLETE && \ present) - ret = SASL_OK; - if (MA_PRESENT(GSS_C_MA_PFS)) *security_flags |= SASL_SEC_FORWARD_SECRECY; if (!MA_PRESENT(GSS_C_MA_AUTH_INIT_ANON)) @@ -1362,11 +1312,14 @@ gs2_get_mech_attrs(const sasl_utils_t *utils, *security_flags |= SASL_SEC_PASS_CREDENTIALS; if (MA_PRESENT(GSS_C_MA_AUTH_TARG)) *security_flags |= SASL_SEC_MUTUAL_AUTH; + if (MA_PRESENT(GSS_C_MA_AUTH_INIT_INIT) && prompts != NULL) + *prompts = NULL; if (MA_PRESENT(GSS_C_MA_ITOK_FRAMED)) *features |= SASL_FEAT_GSS_FRAMING; gss_release_oid_set(&minor, &attrs); - return ret; + + return SASL_OK; } /* @@ -1535,47 +1488,179 @@ gs2_escape_authzid(const sasl_utils_t *utils, return SASL_OK; } +#define GOT_CREDS(text, params) ((text)->client_creds != NULL || (params)->gss_creds != NULL) + static int -gs2_ask_user_info(context_t *text, - sasl_client_params_t *params, - char **realms __attribute__((unused)), - int nrealm __attribute__((unused)), - sasl_interact_t **prompt_need, - sasl_out_params_t *oparams) +gs2_get_init_creds(context_t *text, + sasl_client_params_t *params, + sasl_interact_t **prompt_need, + sasl_out_params_t *oparams) { int result = SASL_OK; const char *authid = NULL, *userid = NULL; int user_result = SASL_OK; int auth_result = SASL_OK; int pass_result = SASL_OK; + OM_uint32 maj_stat, min_stat; + gss_OID_set_desc mechs; + gss_buffer_desc cred_authid = GSS_C_EMPTY_BUFFER; + + mechs.count = 1; + mechs.elements = (gss_OID)text->mechanism; - /* try to get the authid */ + /* + * Determine the authentication identity from the application supplied + * GSS credential, the default GSS credential, and the application + * supplied identity, in that order. + */ if (oparams->authid == NULL) { - auth_result = _plug_get_authid(params->utils, &authid, prompt_need); + assert(text->client_name == GSS_C_NO_NAME); - if (auth_result != SASL_OK && auth_result != SASL_INTERACT) { - return auth_result; + if (!GOT_CREDS(text, params)) { + maj_stat = gss_acquire_cred(&min_stat, + GSS_C_NO_NAME, + GSS_C_INDEFINITE, + &mechs, + GSS_C_INITIATE, + &text->client_creds, + NULL, + &text->lifetime); + } else + maj_stat = GSS_S_COMPLETE; + + if (maj_stat == GSS_S_COMPLETE) { + maj_stat = gss_inquire_cred(&min_stat, + params->gss_creds + ? (gss_cred_id_t)params->gss_creds + : text->client_creds, + &text->client_name, + NULL, + NULL, + NULL); + if (GSS_ERROR(maj_stat)) + goto cleanup; + } else if (maj_stat != GSS_S_CRED_UNAVAIL) + goto cleanup; + + if (text->client_name != GSS_C_NO_NAME) { + maj_stat = gss_display_name(&min_stat, + text->client_name, + &cred_authid, + NULL); + if (GSS_ERROR(maj_stat)) + goto cleanup; + + authid = cred_authid.value; + } else { + auth_result = _plug_get_authid(params->utils, &authid, prompt_need); + if (auth_result != SASL_OK && auth_result != SASL_INTERACT) { + result = auth_result; + goto cleanup; + } } } - /* try to get the userid */ + /* + * Get the authorization identity. + */ if (oparams->user == NULL) { user_result = _plug_get_userid(params->utils, &userid, prompt_need); - if (user_result != SASL_OK && user_result != SASL_INTERACT) { - return user_result; + result = user_result; + goto cleanup; } } - /* try to get the password */ - if (text->password == NULL) { - pass_result = _plug_get_password(params->utils, &text->password, - &text->free_password, prompt_need); - if (pass_result != SASL_OK && pass_result != SASL_INTERACT) { - return pass_result; + if (auth_result == SASL_OK && user_result == SASL_OK && + oparams->authid == NULL) { + if (userid == NULL || userid[0] == '\0') { + result = params->canon_user(params->utils->conn, authid, 0, + SASL_CU_AUTHID | SASL_CU_AUTHZID, + oparams); + } else { + result = params->canon_user(params->utils->conn, + authid, 0, SASL_CU_AUTHID, oparams); + if (result != SASL_OK) + goto cleanup; + + result = params->canon_user(params->utils->conn, + userid, 0, SASL_CU_AUTHZID, oparams); + if (result != SASL_OK) + goto cleanup; } + + assert(oparams->authid != NULL); } + /* + * If the application has provided an authentication identity, parse it. + */ + if (text->client_name == GSS_C_NO_NAME && oparams->authid != NULL) { + gss_buffer_desc name_buf; + + name_buf.length = strlen(oparams->authid); + name_buf.value = (void *)oparams->authid; + + maj_stat = gss_import_name(&min_stat, + &name_buf, + GSS_C_NT_USER_NAME, + &text->client_name); + if (GSS_ERROR(maj_stat)) + goto cleanup; + } + + /* + * Armed with the authentication identity, try to get a credential without + * a password. + */ + if (!GOT_CREDS(text, params) && text->client_name != GSS_C_NO_NAME) { + maj_stat = gss_acquire_cred(&min_stat, + text->client_name, + GSS_C_INDEFINITE, + &mechs, + GSS_C_INITIATE, + &text->client_creds, + NULL, + &text->lifetime); + if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CRED_UNAVAIL) + goto cleanup; + } + + /* + * If that failed, try to get a credential with a password. + */ + if (!GOT_CREDS(text, params)) { + if (text->password == NULL) { + pass_result = _plug_get_password(params->utils, &text->password, + &text->free_password, prompt_need); + if (pass_result != SASL_OK && pass_result != SASL_INTERACT) { + result = pass_result; + goto cleanup; + } + } + + if (text->password != NULL) { + gss_buffer_desc password_buf; + + password_buf.length = text->password->len; + password_buf.value = text->password->data; + + maj_stat = gss_acquire_cred_with_password(&min_stat, + text->client_name, + &password_buf, + GSS_C_INDEFINITE, + &mechs, + GSS_C_INITIATE, + &text->client_creds, + NULL, + &text->lifetime); + if (GSS_ERROR(maj_stat)) + goto cleanup; + } + } + + maj_stat = GSS_S_COMPLETE; + /* free prompts we got */ if (prompt_need && *prompt_need) { params->utils->free(*prompt_need); @@ -1585,7 +1670,6 @@ gs2_ask_user_info(context_t *text, /* if there are prompts not filled in */ if (user_result == SASL_INTERACT || auth_result == SASL_INTERACT || pass_result == SASL_INTERACT) { - /* make the prompt list */ result = _plug_make_prompts(params->utils, prompt_need, @@ -1600,28 +1684,18 @@ gs2_ask_user_info(context_t *text, NULL, NULL, NULL, NULL, NULL, NULL); - if (result == SASL_OK) return SASL_INTERACT; - - return result; + if (result == SASL_OK) + result = SASL_INTERACT; } - if (oparams->authid == NULL) { - if (userid == NULL || userid[0] == '\0') { - result = params->canon_user(params->utils->conn, authid, 0, - SASL_CU_AUTHID | SASL_CU_AUTHZID, - oparams); - } else { - result = params->canon_user(params->utils->conn, - authid, 0, SASL_CU_AUTHID, oparams); - if (result != SASL_OK) return result; - - result = params->canon_user(params->utils->conn, - userid, 0, SASL_CU_AUTHZID, oparams); - } - if (result != SASL_OK) - return result; +cleanup: + if (result == SASL_OK && maj_stat != GSS_S_COMPLETE) { + sasl_gs2_seterror(text->utils, maj_stat, min_stat); + result = SASL_FAIL; } + gss_release_buffer(&min_stat, &cred_authid); + return result; } @@ -1635,7 +1709,7 @@ sasl_gs2_seterror_(const sasl_utils_t *utils, OM_uint32 maj, OM_uint32 min, int ret; char *out = NULL; unsigned int len, curlen = 0; - const char prefix[] = "GSSAPI Error: "; + const char prefix[] = "GS2 Error: "; len = sizeof(prefix); ret = _plug_buf_alloc(utils, &out, &curlen, 256);