* SUCH DAMAGE.
*/
+/*
+ * Establish a security context on the acceptor (server). These functions
+ * wrap around libradsec and (thus) talk to a RADIUS server or proxy.
+ */
+
#include "gssapiP_eap.h"
#ifdef GSSEAP_ENABLE_REAUTH
#endif
/*
- * Mark a context as ready for cryptographic operations
+ * Mark an acceptor context as ready for cryptographic operations
*/
static OM_uint32
acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
if (GSS_ERROR(major))
return major;
- ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx);
-
major = gssEapRadiusGetRawAvp(minor, ctx->acceptorCtx.vps,
PW_MS_MPPE_SEND_KEY, VENDORPEC_MS, &vp);
- if (GSS_ERROR(major))
- return major;
+ if (GSS_ERROR(major)) {
+ *minor = GSSEAP_KEY_UNAVAILABLE;
+ return GSS_S_UNAVAILABLE;
+ }
major = gssEapDeriveRfc3961Key(minor,
vp->vp_octets,
if (GSS_ERROR(major))
return major;
+ major = gssEapCreateAttrContext(minor, cred, ctx,
+ &ctx->initiatorName->attrCtx,
+ &ctx->expiryTime);
+ if (GSS_ERROR(major))
+ return major;
+
+ *minor = 0;
return GSS_S_COMPLETE;
}
+/*
+ * Emit a identity EAP request to force the initiator (peer) to identify
+ * itself.
+ */
static OM_uint32
eapGssSmAcceptIdentity(OM_uint32 *minor,
gss_ctx_id_t ctx,
} pkt;
gss_buffer_desc pktBuffer;
- if (inputToken != GSS_C_NO_BUFFER && inputToken->length != 0)
+ if (inputToken != GSS_C_NO_BUFFER && inputToken->length != 0) {
+ *minor = GSSEAP_WRONG_SIZE;
return GSS_S_DEFECTIVE_TOKEN;
+ }
assert(ctx->acceptorName == GSS_C_NO_NAME);
if (GSS_ERROR(major))
return major;
- ctx->state = EAP_STATE_AUTHENTICATE;
+ ctx->state = GSSEAP_STATE_AUTHENTICATE;
+ *minor = 0;
return GSS_S_CONTINUE_NEEDED;
}
+/*
+ * Pass the asserted acceptor identity to the authentication server.
+ */
static OM_uint32
setAcceptorIdentity(OM_uint32 *minor,
gss_ctx_id_t ctx,
gss_buffer_desc nameBuf;
krb5_context krbContext = NULL;
krb5_principal krbPrinc;
- struct rs_handle *rh = ctx->acceptorCtx.radHandle;
+ struct rs_context *rc = ctx->acceptorCtx.radContext;
- assert(rh != NULL);
+ assert(rc != NULL);
- /* Awaits further specification */
- if (ctx->acceptorName == GSS_C_NO_NAME)
+ if (ctx->acceptorName == GSS_C_NO_NAME) {
+ *minor = 0;
return GSS_S_COMPLETE;
+ }
+
+ if ((ctx->acceptorName->flags & NAME_FLAG_SERVICE) == 0) {
+ *minor = GSSEAP_BAD_SERVICE_NAME;
+ return GSS_S_BAD_NAME;
+ }
GSSEAP_KRB_INIT(&krbContext);
krbPrinc = ctx->acceptorName->krbPrincipal;
assert(krbPrinc != NULL);
-
- if (krb5_princ_size(krbContext, krbPrinc) < 2)
- return GSS_S_BAD_NAME;
+ assert(KRB_PRINC_LENGTH(krbPrinc) >= 2);
/* Acceptor-Service-Name */
- krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 0), &nameBuf);
+ krbPrincComponentToGssBuffer(krbPrinc, 0, &nameBuf);
- major = gssEapRadiusAddAvp(minor, rh, vps,
+ major = gssEapRadiusAddAvp(minor, vps,
PW_GSS_ACCEPTOR_SERVICE_NAME,
VENDORPEC_UKERNA,
&nameBuf);
return major;
/* Acceptor-Host-Name */
- krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1), &nameBuf);
+ krbPrincComponentToGssBuffer(krbPrinc, 1, &nameBuf);
- major = gssEapRadiusAddAvp(minor, rh, vps,
+ major = gssEapRadiusAddAvp(minor, vps,
PW_GSS_ACCEPTOR_HOST_NAME,
VENDORPEC_UKERNA,
&nameBuf);
if (GSS_ERROR(major))
return major;
- if (krb5_princ_size(krbContext, krbPrinc) > 2) {
+ if (KRB_PRINC_LENGTH(krbPrinc) > 2) {
/* Acceptor-Service-Specific */
krb5_principal_data ssiPrinc = *krbPrinc;
char *ssi;
- krb5_princ_size(krbContext, &ssiPrinc) -= 2;
- krb5_princ_name(krbContext, &ssiPrinc) += 2;
+ KRB_PRINC_LENGTH(&ssiPrinc) -= 2;
+ KRB_PRINC_NAME(&ssiPrinc) += 2;
*minor = krb5_unparse_name_flags(krbContext, &ssiPrinc,
KRB5_PRINCIPAL_UNPARSE_NO_REALM, &ssi);
nameBuf.value = ssi;
nameBuf.length = strlen(ssi);
- major = gssEapRadiusAddAvp(minor, rh, vps,
+ major = gssEapRadiusAddAvp(minor, vps,
PW_GSS_ACCEPTOR_SERVICE_SPECIFIC,
VENDORPEC_UKERNA,
&nameBuf);
krb5_free_unparsed_name(krbContext, ssi);
}
- krbDataToGssBuffer(krb5_princ_realm(krbContext, krbPrinc), &nameBuf);
+ krbPrincRealmToGssBuffer(krbPrinc, &nameBuf);
if (nameBuf.length != 0) {
/* Acceptor-Realm-Name */
- major = gssEapRadiusAddAvp(minor, rh, vps,
+ major = gssEapRadiusAddAvp(minor, vps,
PW_GSS_ACCEPTOR_REALM_NAME,
VENDORPEC_UKERNA,
&nameBuf);
return major;
}
+ *minor = 0;
+ return GSS_S_COMPLETE;
+}
+
+/*
+ * Allocate a RadSec handle
+ */
+static OM_uint32
+createRadiusHandle(OM_uint32 *minor,
+ gss_cred_id_t cred,
+ gss_ctx_id_t ctx)
+{
+ struct gss_eap_acceptor_ctx *actx = &ctx->acceptorCtx;
+ const char *configFile = RS_CONFIG_FILE;
+ const char *configStanza = "gss-eap";
+ struct rs_alloc_scheme ralloc;
+ struct rs_error *err;
+
+ assert(actx->radContext == NULL);
+ assert(actx->radConn == NULL);
+
+ if (rs_context_create(&actx->radContext, RS_DICT_FILE) != 0) {
+ *minor = GSSEAP_RADSEC_CONTEXT_FAILURE;
+ return GSS_S_FAILURE;
+ }
+
+ if (cred != GSS_C_NO_CREDENTIAL) {
+ if (cred->radiusConfigFile != NULL)
+ configFile = cred->radiusConfigFile;
+ if (cred->radiusConfigStanza != NULL)
+ configStanza = cred->radiusConfigStanza;
+ }
+
+ ralloc.calloc = GSSEAP_CALLOC;
+ ralloc.malloc = GSSEAP_MALLOC;
+ ralloc.free = GSSEAP_FREE;
+ ralloc.realloc = GSSEAP_REALLOC;
+
+ rs_context_set_alloc_scheme(actx->radContext, &ralloc);
+
+ if (rs_context_read_config(actx->radContext, configFile) != 0) {
+ err = rs_err_ctx_pop(actx->radContext);
+ goto fail;
+ }
+
+ if (rs_conn_create(actx->radContext, &actx->radConn, configStanza) != 0) {
+ err = rs_err_conn_pop(actx->radConn);
+ goto fail;
+ }
+
+ if (actx->radServer != NULL) {
+ if (rs_conn_select_server(actx->radConn, actx->radServer) != 0) {
+ err = rs_err_conn_pop(actx->radConn);
+ goto fail;
+ }
+ }
+
+ *minor = 0;
return GSS_S_COMPLETE;
+
+fail:
+ return gssEapRadiusMapError(minor, err);
}
+/*
+ * Process a EAP response from the initiator.
+ */
static OM_uint32
eapGssSmAcceptAuthenticate(OM_uint32 *minor,
gss_ctx_id_t ctx,
gss_buffer_t outputToken)
{
OM_uint32 major, tmpMinor;
- struct rs_handle *rh;
struct rs_connection *rconn;
struct rs_request *request = NULL;
struct rs_packet *req = NULL, *resp = NULL;
struct radius_packet *frreq, *frresp;
int sendAcceptorIdentity = 0;
- if (ctx->acceptorCtx.radHandle == NULL) {
+ if (ctx->acceptorCtx.radContext == NULL) {
/* May be NULL from an imported partial context */
- major = gssEapRadiusAllocConn(minor, cred, ctx);
+ major = createRadiusHandle(minor, cred, ctx);
if (GSS_ERROR(major))
goto cleanup;
sendAcceptorIdentity = 1;
}
- rh = ctx->acceptorCtx.radHandle;
rconn = ctx->acceptorCtx.radConn;
if (rs_packet_create_acc_request(rconn, &req, NULL, NULL) != 0) {
goto cleanup;
}
- major = gssEapRadiusAddAvp(minor, rh, &frreq->vps,
+ major = gssEapRadiusAddAvp(minor, &frreq->vps,
PW_EAP_MESSAGE, 0, inputToken);
if (GSS_ERROR(major))
goto cleanup;
if (ctx->acceptorCtx.state.length != 0) {
- major = gssEapRadiusAddAvp(minor, rh, &frreq->vps, PW_STATE, 0,
+ major = gssEapRadiusAddAvp(minor, &frreq->vps, PW_STATE, 0,
&ctx->acceptorCtx.state);
if (GSS_ERROR(major))
goto cleanup;
major = GSS_S_CONTINUE_NEEDED;
break;
case PW_AUTHENTICATION_REJECT:
+ *minor = GSSEAP_RADIUS_AUTH_FAILURE;
major = GSS_S_DEFECTIVE_CREDENTIAL;
goto cleanup;
break;
default:
+ *minor = GSSEAP_UNKNOWN_RADIUS_CODE;
major = GSS_S_FAILURE;
goto cleanup;
break;
major = gssEapRadiusGetAvp(minor, frresp->vps, PW_EAP_MESSAGE, 0,
outputToken, TRUE);
- if ((major == GSS_S_UNAVAILABLE && frresp->code != PW_AUTHENTICATION_ACK) ||
- GSS_ERROR(major))
+ if (major == GSS_S_UNAVAILABLE && frresp->code == PW_ACCESS_CHALLENGE) {
+ *minor = GSSEAP_MISSING_EAP_REQUEST;
+ major = GSS_S_DEFECTIVE_TOKEN;
+ goto cleanup;
+ } else if (GSS_ERROR(major))
goto cleanup;
if (frresp->code == PW_ACCESS_CHALLENGE) {
major = gssEapRadiusGetAvp(minor, frresp->vps, PW_STATE, 0,
&ctx->acceptorCtx.state, TRUE);
- if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major))
+ if (GSS_ERROR(major) && *minor != GSSEAP_NO_SUCH_ATTR)
goto cleanup;
} else {
ctx->acceptorCtx.vps = frresp->vps;
frresp->vps = NULL;
+ rs_conn_destroy(ctx->acceptorCtx.radConn);
+ ctx->acceptorCtx.radConn = NULL;
+
major = acceptReadyEap(minor, ctx, cred);
if (GSS_ERROR(major))
goto cleanup;
- ctx->state = EAP_STATE_EXTENSIONS_REQ;
+ ctx->state = GSSEAP_STATE_EXTENSIONS_REQ;
}
+ *minor = 0;
major = GSS_S_CONTINUE_NEEDED;
cleanup:
}
static OM_uint32
-acceptGssChannelBindings(OM_uint32 *minor,
- gss_ctx_id_t ctx,
- gss_cred_id_t cred,
- gss_buffer_t inputToken,
- gss_channel_bindings_t chanBindings)
-{
- OM_uint32 major, tmpMinor;
- gss_iov_buffer_desc iov[2];
-
- iov[0].type = GSS_IOV_BUFFER_TYPE_DATA | GSS_IOV_BUFFER_FLAG_ALLOCATE;
- iov[0].buffer.length = 0;
- iov[0].buffer.value = NULL;
-
- iov[1].type = GSS_IOV_BUFFER_TYPE_STREAM;
- iov[1].buffer = *inputToken;
-
- major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL,
- iov, 2, TOK_TYPE_WRAP);
- if (GSS_ERROR(major))
- return major;
-
- if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS &&
- !bufferEqual(&iov[0].buffer, &chanBindings->application_data)) {
- major = GSS_S_BAD_BINDINGS;
- } else {
- major = GSS_S_CONTINUE_NEEDED;
- }
-
- gss_release_buffer(&tmpMinor, &iov[0].buffer);
-
- return major;
-}
-
-static OM_uint32
eapGssSmAcceptExtensionsReq(OM_uint32 *minor,
gss_ctx_id_t ctx,
gss_cred_id_t cred,
{
OM_uint32 major;
- outputToken->length = 0;
- outputToken->value = NULL;
-
- major = acceptGssChannelBindings(minor, ctx, cred, inputToken,
- chanBindings);
+ major = gssEapVerifyExtensions(minor, cred, ctx, chanBindings, inputToken);
if (GSS_ERROR(major))
return major;
- ctx->state = EAP_STATE_EXTENSIONS_RESP;
+ outputToken->length = 0;
+ outputToken->value = NULL;
+
+ ctx->state = GSSEAP_STATE_EXTENSIONS_RESP;
+ *minor = 0;
return GSS_S_CONTINUE_NEEDED;
}
gss_channel_bindings_t chanBindings,
gss_buffer_t outputToken)
{
- OM_uint32 major, tmpMinor;
- gss_buffer_desc credsToken = GSS_C_EMPTY_BUFFER;
+ OM_uint32 major;
-#ifdef GSSEAP_ENABLE_REAUTH
- /*
- * If we're built with fast reauthentication enabled, then
- * fabricate a ticket from the initiator to ourselves.
- * Otherwise return an empty token.
- */
- major = gssEapMakeReauthCreds(minor, ctx, cred, &credsToken);
+ major = gssEapMakeExtensions(minor, cred, ctx, chanBindings, outputToken);
if (GSS_ERROR(major))
return major;
-#else
- credsToken.value = "";
-#endif /* GSSEAP_ENABLE_REAUTH */
-
- major = duplicateBuffer(minor, &credsToken, outputToken);
- if (GSS_ERROR(major)) {
- gss_release_buffer(&tmpMinor, &credsToken);
- return major;
- }
-#ifdef GSSEAP_ENABLE_REAUTH
- gss_release_buffer(&tmpMinor, &credsToken);
-#endif
-
- ctx->state = EAP_STATE_ESTABLISHED;
+ ctx->state = GSSEAP_STATE_ESTABLISHED;
+ *minor = 0;
return GSS_S_COMPLETE;
}
gss_buffer_t outputToken)
{
/* Called with already established context */
- *minor = EINVAL;
+ *minor = GSSEAP_CONTEXT_ESTABLISHED;
return GSS_S_BAD_STATUS;
}
+static OM_uint32
+makeErrorToken(OM_uint32 *minor,
+ OM_uint32 majorStatus,
+ OM_uint32 minorStatus,
+ gss_buffer_t outputToken)
+{
+ unsigned char errorData[8];
+ gss_buffer_desc errorBuffer;
+
+ assert(GSS_ERROR(majorStatus));
+
+ /*
+ * Only return error codes that the initiator could have caused,
+ * to avoid information leakage.
+ */
+ if (IS_RADIUS_ERROR(minorStatus)) {
+ /* Squash RADIUS error codes */
+ minorStatus = GSSEAP_RADIUS_PROT_FAILURE;
+ } else if (!IS_WIRE_ERROR(minorStatus)) {
+ /* Don't return non-wire error codes */
+ return GSS_S_COMPLETE;
+ }
+
+ minorStatus -= ERROR_TABLE_BASE_eapg;
+
+ store_uint32_be(majorStatus, &errorData[0]);
+ store_uint32_be(minorStatus, &errorData[4]);
+
+ errorBuffer.length = sizeof(errorData);
+ errorBuffer.value = errorData;
+
+ return duplicateBuffer(minor, &errorBuffer, outputToken);
+}
+
static struct gss_eap_acceptor_sm {
enum gss_eap_token_type inputTokenType;
enum gss_eap_token_type outputTokenType;
gss_channel_bindings_t,
gss_buffer_t);
} eapGssAcceptorSm[] = {
- { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptIdentity },
- { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptAuthenticate },
- { TOK_TYPE_EXT_REQ, TOK_TYPE_NONE, eapGssSmAcceptExtensionsReq },
- { TOK_TYPE_NONE, TOK_TYPE_EXT_RESP, eapGssSmAcceptExtensionsResp },
- { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished },
+ { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptIdentity },
+ { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptAuthenticate },
+ { TOK_TYPE_EXT_REQ, TOK_TYPE_NONE, eapGssSmAcceptExtensionsReq },
+ { TOK_TYPE_NONE, TOK_TYPE_EXT_RESP, eapGssSmAcceptExtensionsResp },
+ { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished },
+ { TOK_TYPE_NONE, TOK_TYPE_CONTEXT_ERR, NULL },
#ifdef GSSEAP_ENABLE_REAUTH
- { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth },
+ { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth },
#endif
};
output_token->value = NULL;
if (input_token == GSS_C_NO_BUFFER || input_token->length == 0) {
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
GSSEAP_MUTEX_LOCK(&cred->mutex);
if ((cred->flags & CRED_FLAG_ACCEPT) == 0) {
+ *minor = GSSEAP_CRED_USAGE_MISMATCH;
major = GSS_S_NO_CRED;
goto cleanup;
}
goto cleanup;
if (!gssEapCredAvailable(cred, ctx->mechanismUsed)) {
+ *minor = GSSEAP_CRED_MECH_MISMATCH;
major = GSS_S_BAD_MECH;
goto cleanup;
}
* machine and process Kerberos GSS messages instead.
*/
if (tokType == TOK_TYPE_GSS_REAUTH && initialContextToken) {
- ctx->state = EAP_STATE_KRB_REAUTH_GSS;
+ ctx->state = GSSEAP_STATE_KRB_REAUTH;
} else
#endif
if (tokType != sm->inputTokenType) {
+ *minor = GSSEAP_WRONG_TOK_ID;
major = GSS_S_DEFECTIVE_TOKEN;
goto cleanup;
}
&innerInputToken,
input_chan_bindings,
&innerOutputToken);
- if (GSS_ERROR(major))
- goto cleanup;
+ if (GSS_ERROR(major)) {
+ /* Possibly generate an error token */
+ tmpMajor = makeErrorToken(&tmpMinor, major, *minor, &innerOutputToken);
+ if (GSS_ERROR(tmpMajor)) {
+ major = tmpMajor;
+ goto cleanup;
+ }
+
+ sm = &eapGssAcceptorSm[GSSEAP_STATE_ERROR];
+ goto send_token;
+ }
} while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.length == 0);
if (mech_type != NULL) {
if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type))
duplicateOid(&tmpMinor, ctx->mechanismUsed, mech_type);
}
- if (innerOutputToken.value != NULL) {
- tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken,
- sm->outputTokenType, output_token);
- if (GSS_ERROR(tmpMajor)) {
- major = tmpMajor;
- *minor = tmpMinor;
- goto cleanup;
- }
- }
if (ret_flags != NULL)
*ret_flags = ctx->gssFlags;
if (delegated_cred_handle != NULL)
if (GSS_ERROR(major))
goto cleanup;
}
- if (time_rec != NULL)
- gssEapContextTime(&tmpMinor, ctx, time_rec);
+ if (time_rec != NULL) {
+ major = gssEapContextTime(&tmpMinor, ctx, time_rec);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ }
}
- assert(ctx->state == EAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);
+ assert(ctx->state == GSSEAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);
+
+send_token:
+ if (innerOutputToken.value != NULL) {
+ tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken,
+ sm->outputTokenType, output_token);
+ if (GSS_ERROR(tmpMajor)) {
+ major = tmpMajor;
+ *minor = tmpMinor;
+ goto cleanup;
+ }
+ }
cleanup:
if (cred != GSS_C_NO_CREDENTIAL)
if (GSS_ERROR(major))
return major;
- ctx->state = EAP_STATE_ESTABLISHED;
+ ctx->state = GSSEAP_STATE_ESTABLISHED;
+ *minor = 0;
return GSS_S_COMPLETE;
}
gss_OID mech = GSS_C_NO_OID;
OM_uint32 gssFlags, timeRec = GSS_C_INDEFINITE;
- ctx->flags |= CTX_FLAG_KRB_REAUTH_GSS;
+ ctx->flags |= CTX_FLAG_KRB_REAUTH;
if (cred != GSS_C_NO_CREDENTIAL)
krbCred = cred->krbCred;
projects / mech_eap.orig / blobdiff