#include "gssapiP_eap.h"
-#define RC_CONFIG_FILE SYSCONFDIR "/radiusclient/radiusclient.conf"
-
/*
* Mark a context as ready for cryptographic operations
*/
static OM_uint32
-acceptReady(OM_uint32 *minor, gss_ctx_id_t ctx)
+acceptReady(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
{
- OM_uint32 major;
+ OM_uint32 major, tmpMinor;
VALUE_PAIR *vp;
gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
if (GSS_ERROR(major))
return major;
+ gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
+
vp = rc_avpair_get(ctx->acceptorCtx.avps, PW_USER_NAME, 0);
if (vp != NULL) {
nameBuf.length = vp->lvalue;
nameBuf.value = vp->strvalue;
- } else if (ctx->initiatorName == GSS_C_NO_NAME) {
+ } else {
ctx->gssFlags |= GSS_C_ANON_FLAG;
}
- if (nameBuf.length != 0 || ctx->initiatorName == GSS_C_NO_NAME) {
- major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
- &ctx->initiatorName);
- if (GSS_ERROR(major))
- return major;
- }
+ major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
+ &ctx->initiatorName);
+ if (GSS_ERROR(major))
+ return major;
+
+ ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx);
- vp = rc_avpair_get(ctx->acceptorCtx.avps, PW_MSCHAP2_SUCCESS, 0);
+ vp = rc_avpair_get(ctx->acceptorCtx.avps,
+ VENDOR_ATTR_MS_MPPE_SEND_KEY,
+ VENDOR_ID_MICROSOFT);
if (ctx->encryptionType != ENCTYPE_NULL && vp != NULL) {
major = gssEapDeriveRfc3961Key(minor,
(unsigned char *)vp->strvalue,
* material it seems confusing to the caller to advertise this.
*/
ctx->gssFlags &= ~(GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG);
+ ctx->encryptionType = ENCTYPE_NULL;
}
major = sequenceInit(minor,
gss_buffer_t outputToken)
{
OM_uint32 major;
- rc_handle *rh;
union {
struct eap_hdr pdu;
unsigned char data[5];
} pkt;
gss_buffer_desc pktBuffer;
- char *config = RC_CONFIG_FILE;
if (inputToken != GSS_C_NO_BUFFER && inputToken->length != 0)
return GSS_S_DEFECTIVE_TOKEN;
assert(ctx->acceptorCtx.radHandle == NULL);
- if (cred != GSS_C_NO_CREDENTIAL && cred->radiusConfigFile != NULL)
- config = cred->radiusConfigFile;
-
- rh = ctx->acceptorCtx.radHandle = rc_read_config(config);
- if (rh == NULL) {
- *minor = errno;
- return GSS_S_FAILURE;
- }
+ major = gssEapRadiusAllocHandle(minor, cred, &ctx->acceptorCtx.radHandle);
+ if (GSS_ERROR(major))
+ return major;
- if (rc_read_dictionary(rh, rc_conf_str(rh, "dictionary")) != 0) {
- *minor = errno;
- return GSS_S_FAILURE;
- }
+ assert(ctx->acceptorName == GSS_C_NO_NAME);
- if (ctx->acceptorName == GSS_C_NO_NAME &&
- cred != GSS_C_NO_CREDENTIAL &&
- cred->name != GSS_C_NO_NAME) {
- major = gss_duplicate_name(minor, cred->name, &ctx->acceptorName);
+ if (cred != GSS_C_NO_CREDENTIAL && cred->name != GSS_C_NO_NAME) {
+ major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName);
if (GSS_ERROR(major))
return major;
}
}
static OM_uint32
-importInitiatorIdentity(OM_uint32 *minor,
- gss_ctx_id_t ctx,
- gss_buffer_t inputToken,
- gss_buffer_t nameBuf)
+setAcceptorIdentity(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ VALUE_PAIR **avps)
{
OM_uint32 major, tmpMinor;
- struct eap_hdr *pdu = (struct eap_hdr *)inputToken->value;
- unsigned char *pos = (unsigned char *)(pdu + 1);
- gss_name_t name;
+ gss_buffer_desc nameBuf;
+ krb5_principal krbPrinc;
+
+ /* Awaits further specification */
+ if (ctx->acceptorName == GSS_C_NO_NAME)
+ return GSS_S_COMPLETE;
+
+ krbPrinc = ctx->acceptorName->krbPrincipal;
+ assert(krbPrinc != NULL);
- assert(pdu->code == EAP_CODE_RESPONSE);
- assert(pos[0] == EAP_TYPE_IDENTITY);
+ if (krbPrinc->length < 2)
+ return GSS_S_BAD_NAME;
- nameBuf->value = pos + 1;
- nameBuf->length = inputToken->length - sizeof(*pdu) - 1;
+ nameBuf.value = krbPrinc->data[0].data;
+ nameBuf.length = krbPrinc->data[0].length;
- major = gssEapImportName(minor, nameBuf, GSS_C_NT_USER_NAME, &name);
+ major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps,
+ VENDOR_ATTR_GSS_ACCEPTOR_SERVICE_NAME,
+ VENDOR_ID_UKERNA,
+ &nameBuf);
if (GSS_ERROR(major))
return major;
- gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
- ctx->initiatorName = name;
+ nameBuf.value = krbPrinc->data[1].data;
+ nameBuf.length = krbPrinc->data[2].length;
+
+ major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps,
+ VENDOR_ATTR_GSS_ACCEPTOR_HOST_NAME,
+ VENDOR_ID_UKERNA,
+ &nameBuf);
+ if (GSS_ERROR(major))
+ return major;
+
+ if (krbPrinc->realm.data != NULL) {
+ nameBuf.value = krbPrinc->realm.data;
+ nameBuf.length = krbPrinc->realm.length;
+
+ major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps,
+ VENDOR_ATTR_GSS_ACCEPTOR_REALM_NAME,
+ VENDOR_ID_UKERNA,
+ &nameBuf);
+ if (GSS_ERROR(major))
+ return major;
+ }
return GSS_S_COMPLETE;
}
if (inputToken->length > sizeof(*pdu) &&
pdu->code == EAP_CODE_RESPONSE &&
pos[0] == EAP_TYPE_IDENTITY) {
- major = importInitiatorIdentity(minor, ctx, inputToken, &nameBuf);
+ /*
+ * XXX TODO do we really need to set User-Name? FreeRADIUS does
+ * not appear to require it.
+ */
+ major = addAvpFromBuffer(minor, rh, &send, PW_USER_NAME, 0, &nameBuf);
if (GSS_ERROR(major))
goto cleanup;
- major = addAvpFromBuffer(minor, rh, &send, PW_USER_NAME, &nameBuf);
+ major = setAcceptorIdentity(minor, ctx, &send);
if (GSS_ERROR(major))
goto cleanup;
}
- major = addAvpFromBuffer(minor, rh, &send, PW_EAP_MESSAGE, inputToken);
+ major = addAvpFromBuffer(minor, rh, &send, PW_EAP_MESSAGE, 0, inputToken);
if (GSS_ERROR(major))
goto cleanup;
- if (ctx->acceptorCtx.lastStatus == PW_ACCESS_CHALLENGE) {
- major = addAvpFromBuffer(minor, rh, &send, PW_STATE,
+ if (ctx->acceptorCtx.lastStatus == CHALLENGE_RC) {
+ major = addAvpFromBuffer(minor, rh, &send, PW_STATE, 0,
&ctx->acceptorCtx.state);
if (GSS_ERROR(major))
goto cleanup;
}
code = rc_auth(rh, 0, send, &received, msgBuffer);
- if (code != 0) {
- *minor = errno;
+ switch (code) {
+ case OK_RC:
+ case CHALLENGE_RC:
+ major = GSS_S_CONTINUE_NEEDED;
+ break;
+ case TIMEOUT_RC:
major = GSS_S_UNAVAILABLE;
+ break;
+ case REJECT_RC:
+ major = GSS_S_DEFECTIVE_CREDENTIAL;
+ break;
+ default:
+ major = GSS_S_FAILURE;
goto cleanup;
}
- ctx->acceptorCtx.lastStatus = code;
-
- if (code == OK_RC || code == PW_ACCESS_CHALLENGE) {
- major = getBufferFromAvps(minor, received, PW_EAP_MESSAGE, outputToken);
- if (GSS_ERROR(major))
- goto cleanup;
+ if (GSS_ERROR(major))
+ goto cleanup;
- if (code == PW_ACCESS_CHALLENGE) {
- major = getBufferFromAvps(minor, received, PW_STATE,
- &ctx->acceptorCtx.state);
- if (GSS_ERROR(major))
- goto cleanup;
- }
+ ctx->acceptorCtx.lastStatus = code;
- major = GSS_S_CONTINUE_NEEDED;
- } else {
- major = GSS_S_FAILURE;
+ major = getBufferFromAvps(minor, received, PW_EAP_MESSAGE, 0,
+ outputToken, TRUE);
+ if ((major == GSS_S_UNAVAILABLE && code != OK_RC) ||
+ GSS_ERROR(major))
goto cleanup;
- }
- if (code == OK_RC) {
+ if (code == CHALLENGE_RC) {
+ major = getBufferFromAvps(minor, received, PW_STATE, 0,
+ &ctx->acceptorCtx.state, TRUE);
+ if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major))
+ goto cleanup;
+ } else {
ctx->acceptorCtx.avps = received;
received = NULL;
- major = acceptReady(minor, ctx);
+ major = acceptReady(minor, ctx, cred);
if (GSS_ERROR(major))
goto cleanup;
ctx->state = EAP_STATE_GSS_CHANNEL_BINDINGS;
- major = GSS_S_CONTINUE_NEEDED;
}
+ major = GSS_S_CONTINUE_NEEDED;
+
cleanup:
if (received != NULL)
rc_avpair_free(received);
if (major == GSS_S_COMPLETE) {
if (src_name != NULL && ctx->initiatorName != GSS_C_NO_NAME) {
- major = gss_duplicate_name(&tmpMinor, ctx->initiatorName, src_name);
+ major = gssEapDuplicateName(&tmpMinor, ctx->initiatorName, src_name);
if (GSS_ERROR(major))
goto cleanup;
}
if (time_rec != NULL)
- gss_context_time(&tmpMinor, ctx, time_rec);
+ gssEapContextTime(&tmpMinor, ctx, time_rec);
}
assert(ctx->state == EAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);
projects / moonshot.git / blobdiff