More error reporting

[mech_eap.orig] / accept_sec_context.c

diff --git a/accept_sec_context.c b/accept_sec_context.c
index 86327eb..e75abd0 100644 (file)
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -43,7 +43,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor,
 #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)
@@ -107,6 +107,10 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
     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,
@@ -150,6 +154,9 @@ eapGssSmAcceptIdentity(OM_uint32 *minor,
     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,
@@ -237,6 +244,9 @@ setAcceptorIdentity(OM_uint32 *minor,
     return GSS_S_COMPLETE;
 }
 
+/*
+ * Allocate a RadSec handle
+ */
 static OM_uint32
 createRadiusHandle(OM_uint32 *minor,
                    gss_cred_id_t cred,
@@ -297,6 +307,9 @@ fail:
     return gssEapRadiusMapError(minor, err);
 }
 
+/*
+ * Process a EAP response from the initiator.
+ */
 static OM_uint32
 eapGssSmAcceptAuthenticate(OM_uint32 *minor,
                            gss_ctx_id_t ctx,
@@ -366,11 +379,12 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor,
         major = GSS_S_CONTINUE_NEEDED;
         break;
     case PW_AUTHENTICATION_REJECT:
-        *minor = GSSEAP_PEER_AUTH_FAILURE;
+        *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;
@@ -378,14 +392,17 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor,
 
     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;
@@ -472,6 +489,37 @@ makeErrorToken(OM_uint32 *minor,
     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.
+     */
+    switch (minorStatus) {
+    case GSSEAP_WRONG_SIZE:
+    case GSSEAP_WRONG_MECH:
+    case GSSEAP_BAD_TOK_HEADER:
+    case GSSEAP_BAD_DIRECTION:
+    case GSSEAP_WRONG_TOK_ID:
+    case GSSEAP_CRIT_EXT_UNAVAILABLE:
+    case GSSEAP_MISSING_REQUIRED_EXT:
+    case GSSEAP_KEY_UNAVAILABLE:
+    case GSSEAP_KEY_TOO_SHORT:
+    case GSSEAP_RADIUS_AUTH_FAILURE:
+    case GSSEAP_UNKNOWN_RADIUS_CODE:
+    case GSSEAP_MISSING_EAP_REQUEST:
+        break;
+    default:
+        if (IS_RADIUS_ERROR(minorStatus))
+            /* Squash RADIUS error codes */
+            minorStatus = GSSEAP_GENERIC_RADIUS_ERROR;
+        else
+            /* Don't return system error codes */
+            return GSS_S_COMPLETE;
+    }
+
+    minorStatus -= ERROR_TABLE_BASE_eapg;
+
     store_uint32_be(majorStatus, &errorData[0]);
     store_uint32_be(minorStatus, &errorData[4]);
 
@@ -595,7 +643,7 @@ gss_accept_sec_context(OM_uint32 *minor,
                                    input_chan_bindings,
                                    &innerOutputToken);
         if (GSS_ERROR(major)) {
-            /* Generate an error token */
+            /* Possibly generate an error token */
             tmpMajor = makeErrorToken(&tmpMinor, major, *minor, &innerOutputToken);
             if (GSS_ERROR(tmpMajor)) {
                 major = tmpMajor;