#include "gssapiP_eap.h"
-static OM_uint32
-acceptReadyCommon(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
-{
- OM_uint32 major;
-
- major = sequenceInit(minor,
- &ctx->seqState, ctx->recvSeq,
- ((ctx->gssFlags & GSS_C_REPLAY_FLAG) != 0),
- ((ctx->gssFlags & GSS_C_SEQUENCE_FLAG) != 0),
- TRUE);
- if (GSS_ERROR(major))
- return major;
-
- return GSS_S_COMPLETE;
-}
-
-
/*
* Mark a context as ready for cryptographic operations
*/
ctx->encryptionType = ENCTYPE_NULL;
}
- return acceptReadyCommon(minor, ctx, cred);
+ major = sequenceInit(minor,
+ &ctx->seqState, ctx->recvSeq,
+ ((ctx->gssFlags & GSS_C_REPLAY_FLAG) != 0),
+ ((ctx->gssFlags & GSS_C_SEQUENCE_FLAG) != 0),
+ TRUE);
+ if (GSS_ERROR(major))
+ return major;
+
+ return GSS_S_COMPLETE;
}
static OM_uint32
}
ctx->state = EAP_STATE_KRB_REAUTH_CRED;
+
return GSS_S_CONTINUE_NEEDED;
}
OM_uint32 timeRec)
{
OM_uint32 major, tmpMinor;
- gss_buffer_set_t keyData = GSS_C_NO_BUFFER_SET;
- gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
+ gss_buffer_desc authData = GSS_C_EMPTY_BUFFER;
- if (!oidEqual(mech, gss_mech_krb5)) {
- major = GSS_S_BAD_MECH;
- goto cleanup;
- }
-
- major = gssInquireSecContextByOid(minor, ctx->kerberosCtx,
- GSS_C_INQ_SSPI_SESSION_KEY, &keyData);
+ major = gssEapGlueToMechName(minor, initiator, &ctx->initiatorName);
if (GSS_ERROR(major))
goto cleanup;
- {
- gss_OID_desc oid;
- int suffix;
-
- oid.length = keyData->elements[1].length;
- oid.elements = keyData->elements[1].value;
-
- /* GSS_KRB5_SESSION_KEY_ENCTYPE_OID */
- major = decomposeOid(minor,
- "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x04",
- 10, &oid, &suffix);
- if (GSS_ERROR(major))
- goto cleanup;
-
- ctx->encryptionType = suffix;
- }
-
- {
- krb5_context krbContext = NULL;
- krb5_keyblock key;
-
- GSSEAP_KRB_INIT(&krbContext);
-
- KRB_KEY_LENGTH(&key) = keyData->elements[0].length;
- KRB_KEY_DATA(&key) = keyData->elements[0].value;
- KRB_KEY_TYPE(&key) = ctx->encryptionType;
-
- *minor = krb5_copy_keyblock_contents(krbContext,
- &key, &ctx->rfc3961Key);
- if (*minor != 0) {
- major = GSS_S_FAILURE;
- goto cleanup;
- }
- }
-
- major = rfc3961ChecksumTypeForKey(minor, &ctx->rfc3961Key,
- &ctx->checksumType);
+ major = gssKrbExtractAuthzDataFromSecContext(minor, ctx->kerberosCtx,
+ KRB5_AUTHDATA_RADIUS_AVP,
+ &authData);
if (GSS_ERROR(major))
goto cleanup;
- major = gssDisplayName(minor, initiator, &nameBuf, NULL);
- if (GSS_ERROR(major))
- goto cleanup;
-
- major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
- &ctx->initiatorName);
+ major = gssEapImportAttrContext(minor, &authData, ctx->initiatorName);
if (GSS_ERROR(major))
goto cleanup;
goto cleanup;
}
- if (timeRec != GSS_C_INDEFINITE)
- ctx->expiryTime = time(NULL) + timeRec;
-
- major = acceptReadyCommon(minor, ctx, cred);
+ major = gssEapReauthComplete(minor, ctx, cred, mech, timeRec);
if (GSS_ERROR(major))
goto cleanup;
ctx->state = EAP_STATE_ESTABLISHED;
- ctx->mechanismUsed = GSS_EAP_MECHANISM;
cleanup:
- gss_release_buffer_set(&tmpMinor, &keyData);
- gss_release_buffer(&tmpMinor, &nameBuf);
+ gss_release_buffer(&tmpMinor, &authData);
return major;
}
if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type))
duplicateOid(&tmpMinor, ctx->mechanismUsed, mech_type);
}
- if (innerOutputToken.length != 0) {
+ if (innerOutputToken.value != NULL) {
tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken,
sm->outputTokenType, output_token);
if (GSS_ERROR(tmpMajor)) {
* contexts.
*/
if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) {
+ assert((ctx->flags & CTX_FLAG_KRB_REAUTH_GSS) == 0);
+
major = gssEapExportPartialContext(minor, ctx, &partialCtx);
if (GSS_ERROR(major))
goto cleanup;
* acceptor contexts.
*/
if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) {
+ assert((ctx->flags & CTX_FLAG_KRB_REAUTH_GSS) == 0);
+
major = gssEapImportPartialContext(minor, &p, &remain, ctx);
if (GSS_ERROR(major))
return major;
return GSS_S_BAD_STATUS;
}
+static int
+canReauthP(gss_cred_id_t cred)
+{
+ return (cred != GSS_C_NO_CREDENTIAL &&
+ cred->krbCred != GSS_C_NO_CREDENTIAL &&
+ cred->expiryTime > time(NULL));
+}
+
+static OM_uint32
+initReadyKrb(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ const gss_name_t target,
+ const gss_OID mech,
+ OM_uint32 timeRec)
+{
+ OM_uint32 major;
+
+ major = gssEapGlueToMechName(minor, target, &ctx->acceptorName);
+ if (GSS_ERROR(major))
+ return major;
+
+ major = gssEapDuplicateName(minor, cred->name, &ctx->initiatorName);
+ if (GSS_ERROR(major))
+ return major;
+
+ major = gssEapReauthComplete(minor, ctx, cred, mech, timeRec);
+ if (GSS_ERROR(major))
+ return major;
+
+ ctx->state = EAP_STATE_ESTABLISHED;
+
+ return GSS_S_COMPLETE;
+}
+
+static OM_uint32
+eapGssSmInitGssReauth(OM_uint32 *minor,
+ gss_cred_id_t cred,
+ gss_ctx_id_t ctx,
+ gss_name_t target,
+ gss_OID mech,
+ OM_uint32 reqFlags,
+ OM_uint32 timeReq,
+ gss_channel_bindings_t chanBindings,
+ gss_buffer_t inputToken,
+ gss_buffer_t outputToken)
+{
+ OM_uint32 major, tmpMinor;
+ gss_name_t mechTarget = GSS_C_NO_NAME;
+ gss_OID actualMech = GSS_C_NO_OID;
+ OM_uint32 timeRec;
+
+ assert(cred != GSS_C_NO_CREDENTIAL);
+
+ ctx->flags |= CTX_FLAG_KRB_REAUTH_GSS;
+
+ major = gssEapMechToGlueName(minor, target, &mechTarget);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ major = gssInitSecContext(minor,
+ cred->krbCred,
+ &ctx->kerberosCtx,
+ mechTarget,
+ (gss_OID)gss_mech_krb5,
+ reqFlags,
+ timeReq,
+ chanBindings,
+ inputToken,
+ &actualMech,
+ outputToken,
+ &ctx->gssFlags,
+ &timeRec);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+cleanup:
+ gssReleaseName(&tmpMinor, &mechTarget);
+
+ return major;
+}
+
static struct gss_eap_initiator_sm {
enum gss_eap_token_type inputTokenType;
enum gss_eap_token_type outputTokenType;
gss_buffer_t,
gss_buffer_t);
} eapGssInitiatorSm[] = {
- { TOK_TYPE_NONE, TOK_TYPE_EAP_RESP, eapGssSmInitIdentity },
- { TOK_TYPE_EAP_REQ, TOK_TYPE_EAP_RESP, eapGssSmInitAuthenticate },
- { TOK_TYPE_NONE, TOK_TYPE_GSS_CB, eapGssSmInitGssChannelBindings },
- { TOK_TYPE_KRB_CRED,TOK_TYPE_NONE, eapGssSmInitKrbReauthCred },
- { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmInitEstablished },
+ { TOK_TYPE_NONE, TOK_TYPE_EAP_RESP, eapGssSmInitIdentity },
+ { TOK_TYPE_EAP_REQ, TOK_TYPE_EAP_RESP, eapGssSmInitAuthenticate },
+ { TOK_TYPE_NONE, TOK_TYPE_GSS_CB, eapGssSmInitGssChannelBindings },
+ { TOK_TYPE_KRB_CRED,TOK_TYPE_NONE, eapGssSmInitKrbReauthCred },
+ { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmInitEstablished },
+ { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmInitGssReauth },
};
OM_uint32
ctx->flags |= CTX_FLAG_INITIATOR;
+ if (canReauthP(cred))
+ ctx->state = EAP_STATE_KRB_REAUTH_GSS;
+
*context_handle = ctx;
}
* Fast reauthentication support for EAP GSS.
*/
-#define KRB5_AUTHDATA_RADIUS_AVP 513
-
krb5_error_code
krb5_encrypt_tkt_part(krb5_context, const krb5_keyblock *, krb5_ticket *);
gss_cred_id_t cred,
gss_buffer_t credBuf)
{
- OM_uint32 major = GSS_S_COMPLETE, code;
+ OM_uint32 major = GSS_S_COMPLETE;
+ krb5_error_code code;
krb5_context krbContext = NULL;
krb5_ticket ticket = { 0 };
krb5_keyblock session, acceptorKey = { 0 };
code = getAcceptorKey(krbContext, ctx, cred,
&ticket.server, &acceptorKey);
- if (code != 0)
+ if (code == KRB5_KT_NOTFOUND) {
+ gss_buffer_desc emptyToken = { 0, "" };
+
+ /*
+ * If we can't produce the KRB-CRED message, we need to
+ * return an empty (not NULL) token to the caller so we
+ * don't change the number of authentication legs.
+ */
+ return duplicateBuffer(minor, &emptyToken, credBuf);
+ } else if (code != 0)
goto cleanup;
enc_part.flags = TKT_FLG_INITIAL;
krbDataToGssBuffer(credsData, credBuf);
cleanup:
- *minor = code;
-
if (ticket.enc_part.ciphertext.data != NULL)
GSSEAP_FREE(ticket.enc_part.ciphertext.data);
-
krb5_free_keyblock_contents(krbContext, &session);
krb5_free_keyblock_contents(krbContext, &acceptorKey);
- gss_release_buffer(&code, &attrBuf);
+ gss_release_buffer(minor, &attrBuf);
krb5_free_data(krbContext, ticketData);
krb5_auth_con_free(krbContext, authContext);
if (credsData != NULL)
GSSEAP_FREE(credsData);
- if (major == GSS_S_COMPLETE)
- major = *minor ? GSS_S_FAILURE : GSS_S_COMPLETE;
+ if (major == GSS_S_COMPLETE) {
+ *minor = code;
+ major = code != 0 ? GSS_S_FAILURE : GSS_S_COMPLETE;
+ }
return major;
}
krb5_auth_context authContext = NULL;
krb5_data credData = { 0 };
krb5_creds **creds = NULL;
+ krb5_principal canonPrinc;
int i;
if (credBuf->length == 0 || cred == GSS_C_NO_CREDENTIAL)
if (creds == NULL || creds[0] == NULL)
goto cleanup;
+ code = krb5_copy_principal(krbContext, creds[0]->client, &canonPrinc);
+ goto cleanup;
+
+ krb5_free_principal(krbContext, cred->name->krbPrincipal);
+ cred->name->krbPrincipal = canonPrinc;
+
+ cred->expiryTime = creds[0]->times.endtime;
+
code = krb5_cc_new_unique(krbContext, "MEMORY", NULL, &cred->krbCredCache);
if (code != 0)
goto cleanup;
gss_buffer_t output_name_buffer,
gss_OID *output_name_type);
+static OM_uint32 (*gssImportNameNext)(
+ OM_uint32 *minor,
+ gss_buffer_t buffer,
+ gss_OID nameType,
+ gss_name_t *outputName);
+
+static OM_uint32 (*gssKrbExtractAuthzDataFromSecContextNext)(
+ OM_uint32 *minor,
+ const gss_ctx_id_t context_handle,
+ int ad_type,
+ gss_buffer_t ad_data);
+
OM_uint32
gssEapReauthInitialize(OM_uint32 *minor)
{
gssReleaseNameNext = dlsym(RTLD_NEXT, "gss_release_name");
gssInquireSecContextByOidNext = dlsym(RTLD_NEXT, "gss_inquire_sec_context_by_oid");
gssDeleteSecContextNext = dlsym(RTLD_NEXT, "gss_delete_sec_context");
+ gssDisplayNameNext = dlsym(RTLD_NEXT, "gss_display_name");
+ gssImportNameNext = dlsym(RTLD_NEXT, "gss_import_name");
+ gssKrbExtractAuthzDataFromSecContextNext = dlsym(RTLD_NEXT, "gsskrb5_extract_authz_data_from_sec_context");
return GSS_S_COMPLETE;
}
return gssDeleteSecContextNext(minor, context_handle, output_token);
}
-OM_uint32
+static OM_uint32
gssDisplayName(OM_uint32 *minor,
gss_name_t name,
gss_buffer_t buffer,
return gssDisplayNameNext(minor, name, buffer, name_type);
}
+static OM_uint32
+gssImportName(OM_uint32 *minor,
+ gss_buffer_t buffer,
+ gss_OID name_type,
+ gss_name_t *name)
+{
+ if (gssImportNameNext == NULL)
+ return GSS_S_UNAVAILABLE;
+
+ return gssImportNameNext(minor, buffer, name_type, name);
+}
+
OM_uint32
gssInquireSecContextByOid(OM_uint32 *minor,
const gss_ctx_id_t context_handle,
return gssInquireSecContextByOidNext(minor, context_handle,
desired_object, data_set);
}
+
+OM_uint32
+gssKrbExtractAuthzDataFromSecContext(OM_uint32 *minor,
+ const gss_ctx_id_t ctx,
+ int ad_type,
+ gss_buffer_t ad_data)
+{
+ if (gssKrbExtractAuthzDataFromSecContextNext == NULL)
+ return GSS_S_UNAVAILABLE;
+
+ return gssKrbExtractAuthzDataFromSecContext(minor, ctx, ad_type, ad_data);
+}
+
+OM_uint32
+gssEapGlueToMechName(OM_uint32 *minor,
+ gss_name_t glueName,
+ gss_name_t *pMechName)
+{
+ OM_uint32 major, tmpMinor;
+ gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
+
+ *pMechName = GSS_C_NO_NAME;
+
+ major = gssDisplayName(minor, glueName, &nameBuf, NULL);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
+ pMechName);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+cleanup:
+ gss_release_buffer(&tmpMinor, &nameBuf);
+
+ return major;
+}
+
+OM_uint32
+gssEapMechToGlueName(OM_uint32 *minor,
+ gss_name_t mechName,
+ gss_name_t *pGlueName)
+{
+ OM_uint32 major, tmpMinor;
+ gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
+
+ *pGlueName = GSS_C_NO_NAME;
+
+ major = gssEapDisplayName(minor, mechName, &nameBuf, NULL);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ major = gssImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
+ pGlueName);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+cleanup:
+ gss_release_buffer(&tmpMinor, &nameBuf);
+
+ return major;
+}
+
+OM_uint32
+gssEapReauthComplete(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ const gss_OID mech,
+ OM_uint32 timeRec)
+{
+ OM_uint32 major, tmpMinor;
+ gss_buffer_set_t keyData = GSS_C_NO_BUFFER_SET;
+
+ if (!oidEqual(mech, gss_mech_krb5)) {
+ major = GSS_S_BAD_MECH;
+ goto cleanup;
+ }
+
+ major = gssInquireSecContextByOid(minor, ctx->kerberosCtx,
+ GSS_C_INQ_SSPI_SESSION_KEY, &keyData);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ {
+ gss_OID_desc oid;
+ int suffix;
+
+ oid.length = keyData->elements[1].length;
+ oid.elements = keyData->elements[1].value;
+
+ /* GSS_KRB5_SESSION_KEY_ENCTYPE_OID */
+ major = decomposeOid(minor,
+ "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x04",
+ 10, &oid, &suffix);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ ctx->encryptionType = suffix;
+ }
+
+ {
+ krb5_context krbContext = NULL;
+ krb5_keyblock key;
+
+ GSSEAP_KRB_INIT(&krbContext);
+
+ KRB_KEY_LENGTH(&key) = keyData->elements[0].length;
+ KRB_KEY_DATA(&key) = keyData->elements[0].value;
+ KRB_KEY_TYPE(&key) = ctx->encryptionType;
+
+ *minor = krb5_copy_keyblock_contents(krbContext,
+ &key, &ctx->rfc3961Key);
+ if (*minor != 0) {
+ major = GSS_S_FAILURE;
+ goto cleanup;
+ }
+ }
+
+ major = rfc3961ChecksumTypeForKey(minor, &ctx->rfc3961Key,
+ &ctx->checksumType);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ if (timeRec != GSS_C_INDEFINITE)
+ ctx->expiryTime = time(NULL) + timeRec;
+
+ major = sequenceInit(minor,
+ &ctx->seqState, ctx->recvSeq,
+ ((ctx->gssFlags & GSS_C_REPLAY_FLAG) != 0),
+ ((ctx->gssFlags & GSS_C_SEQUENCE_FLAG) != 0),
+ TRUE);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ ctx->mechanismUsed = GSS_EAP_MECHANISM;
+ major = GSS_S_COMPLETE;
+
+cleanup:
+ gss_release_buffer_set(&tmpMinor, &keyData);
+
+ return major;
+}
+
#ifndef _UTIL_REAUTH_H_
#define _UTIL_REAUTH_H_ 1
+#define KRB5_AUTHDATA_RADIUS_AVP 513
+
OM_uint32
gssInitSecContext(OM_uint32 *minor,
gss_cred_id_t cred,
gss_buffer_t output_token);
OM_uint32
-gssDisplayName(OM_uint32 *minor,
- gss_name_t name,
- gss_buffer_t buffer,
- gss_OID *name_type);
-
-OM_uint32
gssInquireSecContextByOid(OM_uint32 *minor,
const gss_ctx_id_t context_handle,
const gss_OID desired_object,
gss_buffer_set_t *data_set);
OM_uint32
+gssKrbExtractAuthzDataFromSecContext(OM_uint32 *minor,
+ const gss_ctx_id_t ctx,
+ int ad_type,
+ gss_buffer_t ad_data);
+
+OM_uint32
gssEapMakeReauthCreds(OM_uint32 *minor,
gss_ctx_id_t ctx,
gss_cred_id_t cred,
gss_cred_id_t cred,
gss_buffer_t credBuf);
+
+OM_uint32
+gssEapGlueToMechName(OM_uint32 *minor,
+ gss_name_t glueName,
+ gss_name_t *pMechName);
+
+OM_uint32
+gssEapMechToGlueName(OM_uint32 *minor,
+ gss_name_t mechName,
+ gss_name_t *pGlueName);
+
+OM_uint32
+gssEapReauthComplete(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ const gss_OID mech,
+ OM_uint32 timeRec);
+
#endif /* _UTIL_REAUTH_H_ */
projects / cyrus-sasl.git / commitdiff